diff -c mandigo-1.14/README.txt mandigo-1.15/README.txt
*** mandigo-1.14/README.txt	2007-03-15 19:09:20.000000000 -0400
--- mandigo-1.15/README.txt	2007-04-02 08:55:56.000000000 -0400
***************
*** 103,108 ****
--- 103,109 ----
  Icelandic:  Karl Kristjansson
  Italian:    Sebastiano Cannata
  Japanese:   Mitsuhiro Kanda
+ Malay:      Intan Keristina
  Maltese:    James C
  Norwegian:  Torbjorn Blystad
  Polish:     Mateusz Baran
***************
*** 131,136 ****
--- 132,145 ----
  
  === CHANGELOG ==========================================================================
  
+ 1.15
+ + added an option to display EM tags as italics
+ + language: Malay (ms)
+ * reverted php short tags to standard tags
+ * fixed previous/next navigation links on the home page
+ * fixed various alignment issues
+ * fixed some incompatibilities with earlier versions of WordPress
+ 
  1.14
  + added an option to use background patterns
  + added an option to set header navigation alignment
***************
*** 139,145 ****
  + language: Icelandic (is_IS)
  + language: Maltese (mt_MT)
  * fixed the (lastminute) css warning in the header
! * pages in sidebar are now displayed according to menu_order
  
  1.13.1
  * fixed an issue which caused sidebars to overflow when the second sidebar was too long 
--- 148,154 ----
  + language: Icelandic (is_IS)
  + language: Maltese (mt_MT)
  * fixed the (lastminute) css warning in the header
! * pages in sidebar are now sorted according to menu_order
  
  1.13.1
  * fixed an issue which caused sidebars to overflow when the second sidebar was too long 
diff -c mandigo-1.14/functions.php mandigo-1.15/functions.php
*** mandigo-1.14/functions.php	2007-03-15 15:12:06.000000000 -0400
--- mandigo-1.15/functions.php	2007-04-02 08:52:52.000000000 -0400
***************
*** 99,133 ****
  			mandigo_set_exclude_pages(implode(",",$exclude));
  			mandigo_set_bgcolor($_POST['bgcolor']);
  			mandigo_set_wp($_POST['wp']);
! 			mandigo_set_bool('mandigo_scheme_random'       ,$_POST['random']     );
! 			mandigo_set_bool('mandigo_headoverlay'         ,$_POST['headoverlay']);
! 			mandigo_set_bool('mandigo_bold_links'          ,$_POST['boldlinks']  );
! 			mandigo_set_bool('mandigo_1024'                ,$_POST['wide']       );
! 			mandigo_set_bool('mandigo_nofloat'             ,$_POST['nofloat']    );
! 			mandigo_set_bool('mandigo_footer_stats'        ,$_POST['footstats']  );
! 			mandigo_set_bool('mandigo_3columns'            ,$_POST['col3']       );
! 			mandigo_set_bool('mandigo_sidebar1_left'       ,$_POST['sidebar1']   );
! 			mandigo_set_bool('mandigo_sidebar2_left'       ,$_POST['sidebar2']   );
! 			mandigo_set_bool('mandigo_headnav_left'        ,$_POST['headnavleft']);
! 			mandigo_set_bool('mandigo_wptog'               ,$_POST['wptog']);
  			mandigo_set_bool('mandigo_always_show_sidebars',$_POST['alwayssidebars']);
  		}
! 		$current        = get_option('mandigo_scheme');
! 		$headoverlay    = get_option('mandigo_headoverlay');
! 		$dates          = get_option('mandigo_dates');
  		$exclude        = split(",",get_option('mandigo_exclude_pages'));
! 		$boldlinks      = get_option('mandigo_bold_links');
! 		$bgcolor        = get_option('mandigo_bgcolor');
! 		$wide           = get_option('mandigo_1024');
! 		$nofloat        = get_option('mandigo_nofloat');
! 		$footstats      = get_option('mandigo_footer_stats');
! 		$col3           = get_option('mandigo_3columns');
! 		$sidebar1       = get_option('mandigo_sidebar1_left');
! 		$sidebar2       = get_option('mandigo_sidebar2_left');
! 		$headnavleft    = get_option('mandigo_headnav_left');
! 		$wptog          = get_option('mandigo_wptog');
! 		$wp             = get_option('mandigo_wp');
! 		$alwayssidebars = get_option('mandigo_always_show_sidebars');
  
  		$pages = & get_pages('sort_column=menu_order');
  		foreach ( $pages as $page ) {
--- 99,135 ----
  			mandigo_set_exclude_pages(implode(",",$exclude));
  			mandigo_set_bgcolor($_POST['bgcolor']);
  			mandigo_set_wp($_POST['wp']);
! 			mandigo_set_bool('mandigo_scheme_random'       ,$_POST['random']        );
! 			mandigo_set_bool('mandigo_headoverlay'         ,$_POST['headoverlay']   );
! 			mandigo_set_bool('mandigo_bold_links'          ,$_POST['boldlinks']     );
! 			mandigo_set_bool('mandigo_1024'                ,$_POST['wide']          );
! 			mandigo_set_bool('mandigo_nofloat'             ,$_POST['nofloat']       );
! 			mandigo_set_bool('mandigo_footer_stats'        ,$_POST['footstats']     );
! 			mandigo_set_bool('mandigo_3columns'            ,$_POST['col3']          );
! 			mandigo_set_bool('mandigo_sidebar1_left'       ,$_POST['sidebar1']      );
! 			mandigo_set_bool('mandigo_sidebar2_left'       ,$_POST['sidebar2']      );
! 			mandigo_set_bool('mandigo_headnav_left'        ,$_POST['headnavleft']   );
! 			mandigo_set_bool('mandigo_wptog'               ,$_POST['wptog']         );
  			mandigo_set_bool('mandigo_always_show_sidebars',$_POST['alwayssidebars']);
+ 			mandigo_set_bool('mandigo_em_italics'          ,$_POST['em']            );
  		}
! 		$current        = get_option('mandigo_scheme'                  );
! 		$headoverlay    = get_option('mandigo_headoverlay'             );
! 		$dates          = get_option('mandigo_dates'                   );
  		$exclude        = split(",",get_option('mandigo_exclude_pages'));
! 		$boldlinks      = get_option('mandigo_bold_links'              );
! 		$bgcolor        = get_option('mandigo_bgcolor'                 );
! 		$wide           = get_option('mandigo_1024'                    );
! 		$nofloat        = get_option('mandigo_nofloat'                 );
! 		$footstats      = get_option('mandigo_footer_stats'            );
! 		$col3           = get_option('mandigo_3columns'                );
! 		$sidebar1       = get_option('mandigo_sidebar1_left'           );
! 		$sidebar2       = get_option('mandigo_sidebar2_left'           );
! 		$headnavleft    = get_option('mandigo_headnav_left'            );
! 		$wptog          = get_option('mandigo_wptog'                   );
! 		$wp             = get_option('mandigo_wp'                      );
! 		$alwayssidebars = get_option('mandigo_always_show_sidebars'    );
! 		$em             = get_option('mandigo_em_italics'              );
  
  		$pages = & get_pages('sort_column=menu_order');
  		foreach ( $pages as $page ) {
***************
*** 152,158 ****
  		<input type="radio" name="scheme" value="orange" ' .($current == 'orange' ? 'checked="checked"' : '') .' /><img src="'. get_bloginfo('template_directory') .'/scheme-orange.jpg" alt="orange" />  &nbsp;
  		<input type="radio" name="scheme" value="teal"   ' .($current == 'teal'   ? 'checked="checked"' : '') .' /><img src="'. get_bloginfo('template_directory') .'/scheme-teal.jpg"   alt="teal"   /><br /><br />
  		<input type="checkbox" name="random" value="1" ' .(get_option('mandigo_scheme_random') ? 'checked="checked"' : '') .' /> I like them all, change schemes randomly!<br /><br />
! 		If you prefer to use your own header image with one of the color schemes, please consult the README page.<br /><br />
  		<label><b>Background</b></label><br />
  		Background color: <input type="text" name="bgcolor" value="'. $bgcolor .'" /><br />
  		<input type="checkbox" name="wptog" '. ($wptog && $wp ? 'checked="checked"' : '') .' /> Use the following file as the background pattern:<br />
--- 154,160 ----
  		<input type="radio" name="scheme" value="orange" ' .($current == 'orange' ? 'checked="checked"' : '') .' /><img src="'. get_bloginfo('template_directory') .'/scheme-orange.jpg" alt="orange" />  &nbsp;
  		<input type="radio" name="scheme" value="teal"   ' .($current == 'teal'   ? 'checked="checked"' : '') .' /><img src="'. get_bloginfo('template_directory') .'/scheme-teal.jpg"   alt="teal"   /><br /><br />
  		<input type="checkbox" name="random" value="1" ' .(get_option('mandigo_scheme_random') ? 'checked="checked"' : '') .' /> I like them all, change schemes randomly!<br /><br />
! 		If you prefer to use your own header image with one of the color schemes, please consult the README page for instructions on how to do so.<br /><br />
  		<label><b>Background</b></label><br />
  		Background color: <input type="text" name="bgcolor" value="'. $bgcolor .'" /><br />
  		<input type="checkbox" name="wptog" '. ($wptog && $wp ? 'checked="checked"' : '') .' /> Use the following file as the background pattern:<br />
***************
*** 201,207 ****
  
  		<label><b>Really miscellaneous options</b></label><br/>
  		<input type="checkbox" name="nofloat" '. ($nofloat ? 'checked="checked"' : '') .' /> Do not float images<br />
! 		<input type="checkbox" name="footstats" '. ($footstats ? 'checked="checked"' : '') .' /> Display rendering time and SQL statistics in the footer
  		</fieldset>
  
  		<p class="submit"><input type="submit" name="Submit" value="'.__('Update Options &raquo;').'"/></p>
--- 203,210 ----
  
  		<label><b>Really miscellaneous options</b></label><br/>
  		<input type="checkbox" name="nofloat" '. ($nofloat ? 'checked="checked"' : '') .' /> Do not float images<br />
! 		<input type="checkbox" name="footstats" '. ($footstats ? 'checked="checked"' : '') .' /> Display rendering time and SQL statistics in the footer<br />
! 		<input type="checkbox" name="em" '. ($em ? 'checked="checked"' : '') .' /> Display &lt;em&gt; tags as italics
  		</fieldset>
  
  		<p class="submit"><input type="submit" name="Submit" value="'.__('Update Options &raquo;').'"/></p>
Common subdirectories: mandigo-1.14/images and mandigo-1.15/images
diff -c mandigo-1.14/index.php mandigo-1.15/index.php
*** mandigo-1.14/index.php	2007-03-13 20:46:16.000000000 -0400
--- mandigo-1.15/index.php	2007-04-02 08:29:14.000000000 -0400
***************
*** 34,59 ****
  					<?php the_content(__('Read the rest of this entry','mandigo') .' &raquo;'); ?>
  				</div>
  
! 				<p class="postmetadata"><img src="<?=get_bloginfo('stylesheet_directory')?>/images/<?=get_option('mandigo_scheme')?>/comments.gif" alt="Comments" /> <?php comments_popup_link(__('No Comments','mandigo'). ' &#187;', __('1 Comment','mandigo'). ' &#187;', __('% Comments','mandigo'). ' &#187;'); ?></p>
  			</div>
  
  		<?php endwhile; ?>
  
- 		<?php
- 			$prev = next_posts_link('&laquo; '. __('Previous Entries','mandigo'));
- 			$next = previous_posts_link(__('Next Entries','mandigo') .' &raquo;');
- 			if ($prev || $next):
- 		?>
  		<div class="navigation">
  			<div class="alignleft"><?php next_posts_link('&laquo; '. __('Previous Entries','mandigo')) ?></div>
  			<div class="alignright"><?php previous_posts_link(__('Next Entries','mandigo') .' &raquo;') ?></div>
  		</div>
- 		<?php endif; ?>
  
  	<?php else : ?>
  
! 		<h2 class="center"><?=__('Not Found','mandigo')?></h2>
! 		<p class="center"><?=__('Sorry, but you are looking for something that isn\'t here.','mandigo')?></p>
  
  	<?php endif; ?>
  
--- 34,53 ----
  					<?php the_content(__('Read the rest of this entry','mandigo') .' &raquo;'); ?>
  				</div>
  
! 				<p class="postmetadata"><img src="<?php echo get_bloginfo('stylesheet_directory'); ?>/images/<?php echo get_option('mandigo_scheme'); ?>/comments.gif" alt="Comments" /> <?php comments_popup_link(__('No Comments','mandigo'). ' &#187;', __('1 Comment','mandigo'). ' &#187;', __('% Comments','mandigo'). ' &#187;'); ?></p>
  			</div>
  
  		<?php endwhile; ?>
  
  		<div class="navigation">
  			<div class="alignleft"><?php next_posts_link('&laquo; '. __('Previous Entries','mandigo')) ?></div>
  			<div class="alignright"><?php previous_posts_link(__('Next Entries','mandigo') .' &raquo;') ?></div>
  		</div>
  
  	<?php else : ?>
  
! 		<h2 class="center"><?php _e('Not Found','mandigo'); ?></h2>
! 		<p class="center"><?php _e('Sorry, but you are looking for something that isn\'t here.','mandigo'); ?></p>
  
  	<?php endif; ?>
  
Only in mandigo-1.15: ms.mo
diff -c mandigo-1.14/sidebar.php mandigo-1.15/sidebar.php
*** mandigo-1.14/sidebar.php	2007-03-14 19:45:11.000000000 -0400
--- mandigo-1.15/sidebar.php	2007-04-02 08:29:37.000000000 -0400
***************
*** 25,33 ****
  
  			<?php } ?>
  
! 			<?php wp_list_pages(array('title_li' => '<h2>'. __('Pages','mandigo') .'</h2>','sort_column' => 'menu_order')); ?>
  
! 			<li><h2><?=__('Categories','mandigo')?></h2>
  				<ul>
  				<?php wp_list_cats('sort_column=name&optioncount=1&hide_empty=0&hierarchical=1'); ?>
  				</ul>
--- 25,33 ----
  
  			<?php } ?>
  
! 			<?php wp_list_pages('title_li=<h2>'. __('Pages','mandigo') .'</h2>&sort_column=menu_order'); ?>
  
! 			<li><h2><?php _e('Categories','mandigo'); ?></h2>
  				<ul>
  				<?php wp_list_cats('sort_column=name&optioncount=1&hide_empty=0&hierarchical=1'); ?>
  				</ul>
diff -c mandigo-1.14/single.php mandigo-1.15/single.php
*** mandigo-1.14/single.php	2007-03-15 15:12:42.000000000 -0400
--- mandigo-1.15/single.php	2007-04-02 08:30:22.000000000 -0400
***************
*** 9,15 ****
  	}
  ?>
  
! 	<div id="content" class="<?=($alwayssidebars ? 'narrow' : 'wide')?>column">
  		<div class="navigation">
  			<div class="alignleft"><?php previous_post_link('&laquo; %link') ?></div>
  			<div class="alignright"><?php next_post_link('%link &raquo;') ?></div>
--- 9,15 ----
  	}
  ?>
  
! 	<div id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column">
  		<div class="navigation">
  			<div class="alignleft"><?php previous_post_link('&laquo; %link') ?></div>
  			<div class="alignright"><?php next_post_link('%link &raquo;') ?></div>
***************
*** 51,61 ****
  
  						<?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
  							// Comments are open, Pings are not ?>
! 							<?=__('You can <a href="#respond">skip to the end</a> and leave a response. Pinging is currently not allowed.','mandigo')?>
  
  						<?php } elseif (!('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
  							// Neither Comments, nor Pings are open ?>
! 							<?=__('Both comments and pings are currently closed.','mandigo')?>
  
  						<?php } edit_post_link(__('Edit this entry.','mandigo'),'',''); ?>
  
--- 51,61 ----
  
  						<?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
  							// Comments are open, Pings are not ?>
! 							<?php _e('You can <a href="#respond">skip to the end</a> and leave a response. Pinging is currently not allowed.','mandigo'); ?>
  
  						<?php } elseif (!('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
  							// Neither Comments, nor Pings are open ?>
! 							<?php _e('Both comments and pings are currently closed.','mandigo'); ?>
  
  						<?php } edit_post_link(__('Edit this entry.','mandigo'),'',''); ?>
  
***************
*** 70,76 ****
  
  	<?php endwhile; else: ?>
  
! 		<p><?=__('Sorry, no posts matched your criteria.','mandigo')?></p>
  
  <?php endif; ?>
  
--- 70,76 ----
  
  	<?php endwhile; else: ?>
  
! 		<p><?php _e('Sorry, no posts matched your criteria.','mandigo'); ?></p>
  
  <?php endif; ?>
  
diff -c mandigo-1.14/style.css mandigo-1.15/style.css
*** mandigo-1.14/style.css	2007-03-14 21:00:24.000000000 -0400
--- mandigo-1.15/style.css	2007-03-18 09:46:43.000000000 -0400
***************
*** 1,8 ****
  /*  
  Theme Name: Mandigo
  Theme URI: http://www.onehertz.com/portfolio/wordpress/
! Description: Mandigo is an elegant widget-ready two/three-column Wordpress theme, available in two widths, SEVEN color schemes and 21 languages!
! Version: 1.14
  Author: t0mmmmmmm
  Author URI: http://www.onehertz.com/portfolio/
  */
--- 1,8 ----
  /*  
  Theme Name: Mandigo
  Theme URI: http://www.onehertz.com/portfolio/wordpress/
! Description: Mandigo is an elegant widget-ready two/three-column Wordpress theme, available in two widths, SEVEN color schemes and 22 languages!
! Version: 1.15
  Author: t0mmmmmmm
  Author URI: http://www.onehertz.com/portfolio/
  */
diff -c mandigo-1.14/style.css.php mandigo-1.15/style.css.php
*** mandigo-1.14/style.css.php	2007-03-15 15:06:19.000000000 -0400
--- mandigo-1.15/style.css.php	2007-04-02 08:54:09.000000000 -0400
***************
*** 14,20 ****
  
  /* Begin Typography & Colors */
  body {
!   background: <?=get_option('mandigo_bgcolor')?> <?=(get_option('mandigo_wptog') && $wp ? 'url('. get_bloginfo('stylesheet_directory') .'/images/'. $wp .')' : '')?>;
    font-size: 62.5%; /* Resets 1em to 10px */
    font-family: Arial, Sans-Serif;
    color: #333;
--- 14,20 ----
  
  /* Begin Typography & Colors */
  body {
!   background: <?php echo get_option('mandigo_bgcolor'); ?> <?php echo (get_option('mandigo_wptog') && $wp ? 'url('. get_bloginfo('stylesheet_directory') .'/images/'. $wp .')' : ''); ?>;
    font-size: 62.5%; /* Resets 1em to 10px */
    font-family: Arial, Sans-Serif;
    color: #333;
***************
*** 22,35 ****
  }
  
  #header {
!   background: url(images/<?=($ie ? '1x1.gif' : 'header'. ($wide ? '-1024' : '') .'.png')?>);
! <?php if ($ie): ?>  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?=get_bloginfo('stylesheet_directory')?>/images/header<?=($wide ? '-1024' : '')?>.png', sizingMethod='scale');<?php endif; ?>
  }
  
  #main {
!   background: url(images/<?=($ie ? '1x1.gif' : 'bg'. ($wide ? '-1024' : '') .'.png')?>);
! <?php if ($ie): ?>  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?=get_bloginfo('stylesheet_directory')?>/images/bg<?=($wide ? '-1024' : '')?>.png', sizingMethod='scale');<?php endif; ?>
!   padding: .1em 0 0 0;
    width: 100%;
  }
  
--- 22,36 ----
  }
  
  #header {
!   background: url(images/<?php echo ($ie ? '1x1.gif' : 'header'. ($wide ? '-1024' : '') .'.png'); ?>);
! <?php if ($ie): ?>  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo get_bloginfo('stylesheet_directory'); ?>/images/header<?php echo ($wide ? '-1024' : ''); ?>.png', sizingMethod='scale');<?php endif; ?>
  }
  
  #main {
!   background: url(images/<?php echo ($ie ? '1x1.gif' : 'bg'. ($wide ? '-1024' : '') .'.png'); ?>);
! <?php if ($ie): ?>  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo get_bloginfo('stylesheet_directory'); ?>/images/bg<?php echo ($wide ? '-1024' : ''); ?>.png', sizingMethod='scale');<?php endif; ?>
! <?php /* firefox needs a hack */ ?>
!   padding: .1px 0 0 0;
    width: 100%;
  }
  
***************
*** 60,67 ****
  }
  
  #footer {
!   background: url(images/<?=($ie ? '1x1.gif' : 'foot'. ($wide ? '-1024' : '') .'.png')?>);
! <?php if ($ie): ?>  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?=get_bloginfo('stylesheet_directory')?>/images/foot<?=($wide ? '-1024' : '')?>.png', sizingMethod='scale');<?php endif; ?>
    border: none;
  }
  
--- 61,68 ----
  }
  
  #footer {
!   background: url(images/<?php echo ($ie ? '1x1.gif' : 'foot'. ($wide ? '-1024' : '') .'.png'); ?>);
! <?php if ($ie): ?>  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo get_bloginfo('stylesheet_directory'); ?>/images/foot<?php echo ($wide ? '-1024' : ''); ?>.png', sizingMethod='scale');<?php endif; ?>
    border: none;
  }
  
***************
*** 160,167 ****
--- 161,173 ----
  }
  
  em {
+ <?php if (get_option('mandigo_em_italics')): ?>
+   font-style: italics;
+   font-weight: normal;
+ <?php else: ?>
    font-style: normal;
    font-weight: bold;
+ <?php endif; ?>
  }
  acronym, abbr, span.caps {
    font-size: 0.9em;
***************
*** 206,219 ****
    margin: 20px auto;
    padding: 0;
    text-align: left;
!   width: <?=(763+224*$wide)?>px;
  }
  
  #header {
    margin: 0; 
    padding: 0; 
    height: 243px; 
!   width: <?=(763+224*$wide)?>px;
  }
  
  #headerimg {
--- 212,225 ----
    margin: 20px auto;
    padding: 0;
    text-align: left;
!   width: <?php echo (763+224*$wide); ?>px;
  }
  
  #header {
    margin: 0; 
    padding: 0; 
    height: 243px; 
!   width: <?php echo (763+224*$wide); ?>px;
  }
  
  #headerimg {
***************
*** 222,229 ****
    left: 13px; 
    top: 11px;
    height: 226px; 
!   width: <?=(737+224*$wide)?>px; 
!   background: url('images/<?=get_option('mandigo_scheme')?>/head<?=($wide ? '-1024' : '')?>.jpg') bottom center no-repeat;
  } 
  
  #headerimg h1, #headerimg .description {
--- 228,235 ----
    left: 13px; 
    top: 11px;
    height: 226px; 
!   width: <?php echo (737+224*$wide); ?>px;
!   background: url('images/<?php echo get_option('mandigo_scheme'); ?>/head<?php echo ($wide ? '-1024' : ''); ?>.jpg') bottom center no-repeat;
  } 
  
  #headerimg h1, #headerimg .description {
***************
*** 231,257 ****
  }
  
  .narrowcolumn {
!   padding: 0 0 20px 17px;
    margin: 0;
!   width: <?=(($ie||$ie7 ? 490 : 460)+($wide ? (get_option('mandigo_3columns') ? -6 : 224) : 0))?>px;
!   margin-left: <?=(20+($sidebar1+$sidebar2)*230)?>px;
!   margin-top: -2px !important;
!   margin-top: 0px;
  }
  
  .widecolumn {
    padding: 10px 0 20px 0;
    margin: 5px 0 0 100px;
!   width: <?=(550+224*$wide)?>px;
  }
  
  .post {
    text-align: justify;
    padding: 5px 15px;
!   margin: 10px -15px;
    background: #fafafa; 
    border: 1px solid #eee; 
!   <?php if ($ie||$ie7): ?>height: 1%; /* peekaboo */<?php endif; ?>
    clear: both;
  }
  
--- 237,261 ----
  }
  
  .narrowcolumn {
!   padding: 0 0 20px 0;
    margin: 0;
!   width: <?php echo (490+($wide ? (get_option('mandigo_3columns') ? -6 : 224) : 0)); ?>px;
!   margin-left: <?php echo (20+($sidebar1+$sidebar2)*230); ?>px;
  }
  
  .widecolumn {
    padding: 10px 0 20px 0;
    margin: 5px 0 0 100px;
!   width: <?php echo (550+224*$wide); ?>px;
  }
  
  .post {
    text-align: justify;
    padding: 5px 15px;
!   margin: 10px auto;
    background: #fafafa; 
    border: 1px solid #eee; 
!   <?php if ($ie): ?>height: 1%; /* peekaboo */<?php endif; ?>
    clear: both;
  }
  
***************
*** 276,282 ****
  #footer {
    padding: 0;
    margin: 0 auto;
!   width: <?=(763+224*$wide)?>px;
    height: 68px;
    clear: both;
  }
--- 280,286 ----
  #footer {
    padding: 0;
    margin: 0 auto;
!   width: <?php echo (763+224*$wide); ?>px;
    height: 68px;
    clear: both;
  }
***************
*** 326,332 ****
  }
  
  .entry img {
!   float: <?=(get_option('mandigo_nofloat') ? 'none' : 'left')?>;
    margin: 3px 10px;
    background: #fff;
    border: 1px solid #333;
--- 330,336 ----
  }
  
  .entry img {
!   float: <?php echo (get_option('mandigo_nofloat') ? 'none' : 'left'); ?>;
    margin: 3px 10px;
    background: #fff;
    border: 1px solid #333;
***************
*** 399,405 ****
  }
  
  .sidebars li {
!   list-style-image: url(images/<?=get_option('mandigo_scheme')?>/star.gif);
  }
  
  .sidebars ul, .sidebars ul ol {
--- 403,409 ----
  }
  
  .sidebars li {
!   list-style-image: url(images/<?php echo get_option('mandigo_scheme'); ?>/star.gif);
  }
  
  .sidebars ul, .sidebars ul ol {
***************
*** 479,490 ****
  }
  
  #commentform textarea {
!   width: 100%;
    padding: 2px;
  }
  
  #commentform #submit {
!   margin: 0;
    float: right;
  }
  /* End Form Elements */
--- 483,494 ----
  }
  
  #commentform textarea {
!   width: 99%;
    padding: 2px;
  }
  
  #commentform #submit {
!   margin: 0 1em 0 0;
    float: right;
  }
  /* End Form Elements */
***************
*** 536,551 ****
    background: #eee;
    border: 1px solid #ddd;
    padding: 5px;
!   margin-top: 1em;
    position: absolute;
  }
  
  #sidebar1 {
!   margin-left: <?=(($ie||$ie7 ? 0-(($sidebar1+$sidebar2)*230) : 20)+($sidebar1 ? 0 : (502+224*$wide)))?>px;
  }
  
  #sidebar2 {
!   margin-left: <?=(($ie||$ie7 ? 0-(($sidebar1+$sidebar2)*230) : 20)+($sidebar2 ? ($sidebar1 ? 230 : 0) : (($sidebar1 ? 502 : 272)+224*$wide)))?>px;
  }
  
  .sidebars form {
--- 540,555 ----
    background: #eee;
    border: 1px solid #ddd;
    padding: 5px;
!   margin-top: 10px;
    position: absolute;
  }
  
  #sidebar1 {
!   margin-left: <?php echo (($ie||$ie7 ? 0-(($sidebar1+$sidebar2)*230) : 20)+($sidebar1 ? 0 : (502+224*$wide))); ?>px;
  }
  
  #sidebar2 {
!   margin-left: <?php echo (($ie||$ie7 ? 0-(($sidebar1+$sidebar2)*230) : 20)+($sidebar2 ? ($sidebar1 ? 230 : 0) : (($sidebar1 ? 502 : 272)+224*$wide))); ?>px;
  }
  
  .sidebars form {
***************
*** 557,569 ****
  /* Begin Calendar */
  #wp-calendar {
    empty-cells: show;
!   margin: 0 !important; margin-top: -1.5em<?=($safari ? ' !important;' : '')?>;
    width: 155px;
  }
  
  #wp-calendar caption {
    margin-top: -1.2em;
! <?=($safari ? 'margin-bottom: 1.5em;' : '')?>
  }
  #wp-calendar #next a {
    padding-right: 10px;
--- 561,573 ----
  /* Begin Calendar */
  #wp-calendar {
    empty-cells: show;
!   margin: 0 !important; margin-top: -1.5em<?php echo ($safari ? ' !important;' : ''); ?>;
    width: 155px;
  }
  
  #wp-calendar caption {
    margin-top: -1.2em;
! <?php echo ($safari ? 'margin-bottom: 1.5em;' : ''); ?>
  }
  #wp-calendar #next a {
    padding-right: 10px;
***************
*** 678,684 ****
    left: 0;
    bottom: 10px;
    bottom: 0;
!   text-align: <?=(get_option('mandigo_headnav_left') ? 'left' : 'right')?>;
    padding: .6em 0;
    width: 100%;
  }
--- 682,688 ----
    left: 0;
    bottom: 10px;
    bottom: 0;
!   text-align: <?php echo (get_option('mandigo_headnav_left') ? 'left' : 'right'); ?>;
    padding: .6em 0;
    width: 100%;
  }
***************
*** 711,718 ****
  .postinfo h2, .postinfo h3 { line-height: .9em; }
  
  .head_overlay {
!   background: url(images/<?=($ie ? '1x1.gif' : 'head_overlay.png')?>);
! <?php if ($ie): ?>  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?=get_bloginfo('stylesheet_directory')?>/images/head_overlay.png', sizingMethod='scale');<?php endif; ?>
  }
  
  #rss {
--- 715,722 ----
  .postinfo h2, .postinfo h3 { line-height: .9em; }
  
  .head_overlay {
!   background: url(images/<?php echo ($ie ? '1x1.gif' : 'head_overlay.png'); ?>);
! <?php if ($ie): ?>  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo get_bloginfo('stylesheet_directory'); ?>/images/head_overlay.png', sizingMethod='scale');<?php endif; ?>
  }
  
  #rss {
***************
*** 722,727 ****
--- 726,732 ----
  
  .inline-widgets {
    padding-left: 0;
+   margin: 0;
  }
  .inline-widgets h2, .inline-widgets #wp-calendar caption {
    font-family: 'Trebuchet MS', 'Lucida Grande', Verdana, Arial, Sans-Serif;