diff -c mandigo-1.21/README.txt mandigo-1.22/README.txt
*** mandigo-1.21/README.txt	2007-05-28 13:06:56.000000000 -0400
--- mandigo-1.22/README.txt	2007-06-06 16:53:20.000000000 -0400
***************
*** 140,167 ****
  
  === TRANSLATION CREDITS ================================================================
  
! Chinese:    Charles Low
! Czech:      Milan Tucek
! Danish:     Daniel Noesgaard Rasmussen
! Dutch:      Ramsy de Vos
! French:     Michel Bibal
! German:     Michael Nickel
! Greek:      Andrew Kontokanis
! Hungarian:  Horvath Zoltan
! Icelandic:  Karl Kristjansson
! Italian:    Sebastiano Cannata
! Japanese:   Mitsuhiro Kanda
! Malay:      Intan Keristina
! Maltese:    James Cauchi
! Norwegian:  Torbjorn Blystad
! Polish:     Mateusz Baran
! Portuguese: Oscar Nogueira Neto
! Russian:    Michael Dolgov
! Serbian:    Aleksandar Duric
! Slovak:     Marek, Marian Trnka
! Spanish:    Juan Luis Perez Perez
! Swedish:    Ulf Wrede, Johan
! Turkish:    Mert Yabul
  
  .po files are available at http://www.onehertz.com/portfolio/wordpress/mandigo/l10n/
  
--- 140,168 ----
  
  === TRANSLATION CREDITS ================================================================
  
! Bahasa Indonesia: Benny Wu
! Chinese:          Charles Low
! Czech:            Milan Tucek
! Danish:           Daniel Noesgaard Rasmussen
! Dutch:            Ramsy de Vos
! French:           Michel Bibal
! German:           Michael Nickel
! Greek:            Andrew Kontokanis
! Hungarian:        Horvath Zoltan
! Icelandic:        Karl Kristjansson
! Italian:          Sebastiano Cannata
! Japanese:         Mitsuhiro Kanda
! Malay:            Intan Keristina
! Maltese:          James Cauchi
! Norwegian:        Torbjorn Blystad
! Polish:           Mateusz Baran
! Portuguese:       Oscar Nogueira Neto
! Russian:          Michael Dolgov
! Serbian:          Aleksandar Duric
! Slovak:           Marek, Marian Trnka
! Spanish:          Juan Luis Perez Perez
! Swedish:          Ulf Wrede, Johan
! Turkish:          Mert Yabul
  
  .po files are available at http://www.onehertz.com/portfolio/wordpress/mandigo/l10n/
  
***************
*** 182,192 ****
  
  === CHANGELOG ==========================================================================
  
  1.21
  + added an option to number comments
  + added options to hide the blog name and description
  + added options to set the background pattern attachment/repeat/position
! + added an option to reduce the size font for the blog name (useful for looong titles)
  + added an option to disable the border around images
  * background patterns now have their own subdirectory, if you are using one, you will 
    have to move it to images/patterns/
--- 183,206 ----
  
  === CHANGELOG ==========================================================================
  
+ 1.22
+ + language: Bahasa Indonesia (id_ID)
+ + added an option to add a drop shadow to the blog name and tagline
+ + added an option to display full search results
+ + added a new HTML Insert container which displays before the content area
+ + the name of the author now links to the author archives
+ * custom header images would not work if the installation path contained spaces
+ * columns are now displayed in a table, this should fix a lot of recurrent issues
+ * the widecolumn class now spans the whole layout
+ * finally made a decent archives page
+ * images in attachments view mode are not floated anymore
+ * Mandigo can now be installed in a directory of arbitrary depth
+ 
  1.21
  + added an option to number comments
  + added options to hide the blog name and description
  + added options to set the background pattern attachment/repeat/position
! + added an option to reduce the font size for the blog name (useful for looong titles)
  + added an option to disable the border around images
  * background patterns now have their own subdirectory, if you are using one, you will 
    have to move it to images/patterns/
diff -c mandigo-1.21/archive.php mandigo-1.22/archive.php
*** mandigo-1.21/archive.php	2007-04-07 11:59:10.000000000 -0400
--- mandigo-1.22/archive.php	2007-06-06 14:38:38.000000000 -0400
***************
*** 1,35 ****
  <?php 
! 	get_header(); 
! 	include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('mandigo_1024') && get_option('mandigo_3columns')) {
  		include (TEMPLATEPATH . '/sidebar2.php');
  	}
  ?>
  
! 	<div id="content" class="narrowcolumn">
  
! 		<?php if (have_posts()) : ?>
! 
! 		 <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
! <?php /* If this is a category archive */ if (is_category()) { ?>
  		<h2 class="pagetitle"><?php printf(__('Archive for the %s Category','mandigo'),single_cat_title('',false)); ?></h2>
  
!  	  <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
  		<h2 class="pagetitle"><?php printf(__('Archive for %s','mandigo'),get_the_time(__('F jS, Y','mandigo'))); ?></h2>
  
! 	 <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
  		<h2 class="pagetitle"><?php printf(__('Archive for %s','mandigo'),get_the_time(__('F, Y','mandigo'))); ?></h2>
  
! 		<?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
  		<h2 class="pagetitle"><?php printf(__('Archive for %s','mandigo'),get_the_time('Y')); ?></h2>
  
! 	  <?php /* If this is a search */ } elseif (is_search()) { ?>
  		<h2 class="pagetitle"><?php _e('Search Results','mandigo'); ?></h2>
  
! 	  <?php /* If this is an author archive */ } elseif (is_author()) { ?>
  		<h2 class="pagetitle"><?php _e('Author Archive','mandigo'); ?></h2>
  
! 		<?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
  		<h2 class="pagetitle"><?php _e('Blog Archives','mandigo'); ?></h2>
  
  		<?php } ?>
--- 1,34 ----
  <?php 
! 	get_header();
! 	if (get_option('mandigo_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('mandigo_1024') && get_option('mandigo_3columns') && get_option('mandigo_sidebar2_left')) {
  		include (TEMPLATEPATH . '/sidebar2.php');
  	}
  ?>
+ 	<td id="content" class="narrowcolumn">
  
! 	<?php if (have_posts()) : ?>
  
! 		<?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
! 		<?php if (is_category()) { ?>
  		<h2 class="pagetitle"><?php printf(__('Archive for the %s Category','mandigo'),single_cat_title('',false)); ?></h2>
  
! 		<?php } elseif (is_day()) { ?>
  		<h2 class="pagetitle"><?php printf(__('Archive for %s','mandigo'),get_the_time(__('F jS, Y','mandigo'))); ?></h2>
  
! 		<?php } elseif (is_month()) { ?>
  		<h2 class="pagetitle"><?php printf(__('Archive for %s','mandigo'),get_the_time(__('F, Y','mandigo'))); ?></h2>
  
! 		<?php } elseif (is_year()) { ?>
  		<h2 class="pagetitle"><?php printf(__('Archive for %s','mandigo'),get_the_time('Y')); ?></h2>
  
! 		<?php } elseif (is_search()) { ?>
  		<h2 class="pagetitle"><?php _e('Search Results','mandigo'); ?></h2>
  
! 		<?php } elseif (is_author()) { ?>
  		<h2 class="pagetitle"><?php _e('Author Archive','mandigo'); ?></h2>
  
! 		<?php } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
  		<h2 class="pagetitle"><?php _e('Blog Archives','mandigo'); ?></h2>
  
  		<?php } ?>
***************
*** 51,57 ****
                                          </div>
                                          </div>
                                          <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','mandigo'),the_title('','',false)); ?>"><?php the_title(); ?></a></h3>
!                                         <small><?php printf(__('Posted by: %s in %s','mandigo'),get_the_author(),get_the_category_list(', ')) ?><?php edit_post_link('<img src="' . get_bloginfo('stylesheet_directory') . '/images/'. get_option('mandigo_scheme') .'/edit.gif" alt="'. __('Edit this post','mandigo') .'" /> '. __('Edit','mandigo'), ' - ', ''); ?>  </small>
                                  </div>
  
  				<div class="entry">
--- 50,56 ----
                                          </div>
                                          </div>
                                          <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','mandigo'),the_title('','',false)); ?>"><?php the_title(); ?></a></h3>
!                                         <small><?php printf(__('Posted by: %s in %s','mandigo'),'<a href="'. get_author_posts_url(get_the_author_ID()) .'" title="'. sprintf(__("Posts by %s"), attribute_escape(get_the_author())).' ">'. get_the_author() .'</a>',get_the_category_list(', ')) ?><?php edit_post_link('<img src="' . get_bloginfo('stylesheet_directory') . '/images/'. get_option('mandigo_scheme') .'/edit.gif" alt="'. __('Edit this post','mandigo') .'" /> '. __('Edit','mandigo'), ' - ', ''); ?>  </small>
                                  </div>
  
  				<div class="entry">
***************
*** 76,81 ****
  
  	<?php endif; ?>
  
! 	</div>
  
! <?php get_footer(); ?>
--- 75,87 ----
  
  	<?php endif; ?>
  
! 	</td>
  
! <?php
! 	if (!get_option('mandigo_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('mandigo_1024') && get_option('mandigo_3columns') && !get_option('mandigo_sidebar2_left')) {
! 		include (TEMPLATEPATH . '/sidebar2.php');
! 	}
! 
! 	get_footer(); 
! ?>
diff -c mandigo-1.21/archives.php mandigo-1.22/archives.php
*** mandigo-1.21/archives.php	2007-04-07 11:53:12.000000000 -0400
--- mandigo-1.22/archives.php	2007-06-06 11:28:50.000000000 -0400
***************
*** 1,25 ****
! <?php
! /*
! Template Name: Archives
! */
  ?>
  
! <?php get_header(); ?>
! 
! <div id="content" class="widecolumn">
! 
! <?php include (TEMPLATEPATH . '/searchform.php'); ?>
  
! <h2><?php _e('Archives by Month','mandigo'); ?>:</h2>
!   <ul>
!     <?php wp_get_archives('type=monthly'); ?>
!   </ul>
  
! <h2><?php _e('Archives by Subject','mandigo'); ?>:</h2>
!   <ul>
!      <?php wp_list_cats(); ?>
!   </ul>
  
! </div>
  
! <?php get_footer(); ?>
--- 1,32 ----
! <?php 
! 	get_header();
! 	if (get_option('mandigo_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('mandigo_1024') && get_option('mandigo_3columns') && get_option('mandigo_sidebar2_left')) {
! 		include (TEMPLATEPATH . '/sidebar2.php');
! 	}
  ?>
+ 	<td id="content" class="narrowcolumn">
  
! 	<h2><?php _e('Search','mandigo'); ?>:</h2>
! 	<?php include (TEMPLATEPATH . '/searchform.php'); ?>
  
! 	<h2><?php _e('Archives by Month','mandigo'); ?>:</h2>
! 	<ul>
! 		<?php wp_get_archives('type=monthly'); ?>
! 	</ul>
! 
! 	<h2><?php _e('Archives by Subject','mandigo'); ?>:</h2>
! 	<ul>
! 		<?php wp_list_cats(); ?>
! 	</ul>
  
! 	</td>
  
! <?php
! 	if (!get_option('mandigo_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('mandigo_1024') && get_option('mandigo_3columns') && !get_option('mandigo_sidebar2_left')) {
! 		include (TEMPLATEPATH . '/sidebar2.php');
! 	}
  
! 	get_footer(); 
! ?>
diff -c mandigo-1.21/attachment.php mandigo-1.22/attachment.php
*** mandigo-1.21/attachment.php	2007-05-17 17:46:54.000000000 -0400
--- mandigo-1.22/attachment.php	2007-06-06 10:49:00.000000000 -0400
***************
*** 2,15 ****
  	get_header();
  	$alwayssidebars = get_option('mandigo_always_show_sidebars');
  	if ($alwayssidebars) {
! 		include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('mandigo_1024') && get_option('mandigo_3columns')) {
  			include (TEMPLATEPATH . '/sidebar2.php');
  		}
  	}
  ?>
! 
! 	<div id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column">
  
    <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
  
--- 2,14 ----
  	get_header();
  	$alwayssidebars = get_option('mandigo_always_show_sidebars');
  	if ($alwayssidebars) {
! 		if (get_option('mandigo_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('mandigo_1024') && get_option('mandigo_3columns') && get_option('mandigo_sidebar2_left')) {
  			include (TEMPLATEPATH . '/sidebar2.php');
  		}
  	}
  ?>
! 	<td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column">
  
    <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
  
***************
*** 57,62 ****
  
  <?php endif; ?>
  
! 	</div>
  
! <?php get_footer(); ?>
--- 56,70 ----
  
  <?php endif; ?>
  
! 	</td>
  
! <?php
! 	if ($alwayssidebars) {
! 		if (!get_option('mandigo_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('mandigo_1024') && get_option('mandigo_3columns') && !get_option('mandigo_sidebar2_left')) {
! 			include (TEMPLATEPATH . '/sidebar2.php');
! 		}
! 	}
! 
! 	get_footer(); 
! ?>
diff -c mandigo-1.21/comments.php mandigo-1.22/comments.php
*** mandigo-1.21/comments.php	2007-04-07 11:57:42.000000000 -0400
--- mandigo-1.22/comments.php	2007-06-06 11:33:22.000000000 -0400
***************
*** 33,39 ****
  			<?php endif; ?>
  			<br />
  
! 			<small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php printf(__('%s at %s','mandigo'),get_comment_date('F jS, Y'),get_comment_time()); ?></a> <?php edit_comment_link('e','',''); ?></small>
  
  			<?php comment_text() ?>
  
--- 33,39 ----
  			<?php endif; ?>
  			<br />
  
! 			<small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php printf(__('%s at %s','mandigo'),get_comment_date('F jS, Y'),get_comment_time()); ?></a> <?php edit_comment_link(__('Edit','mandigo'),' - ',''); ?></small>
  
  			<?php comment_text() ?>
  
diff -c mandigo-1.21/footer.php mandigo-1.22/footer.php
*** mandigo-1.21/footer.php	2007-05-27 20:00:12.000000000 -0400
--- mandigo-1.22/footer.php	2007-06-06 13:31:22.000000000 -0400
***************
*** 14,21 ****
  */
  
    global $wpmu;
-   echo get_option('mandigo_inserts_footer');
  ?>
  </div>
  <div id="footer">
  	<p>
--- 14,23 ----
  */
  
    global $wpmu;
  ?>
+ </tr>
+ </table>
+ <?php echo get_option('mandigo_inserts_footer'); ?>
  </div>
  <div id="footer">
  	<p>
***************
*** 40,59 ****
  <script type="text/javascript">
    hover = function(state,target,img) { document.getElementById(target).src = '<?php bloginfo('stylesheet_directory'); ?>/images/<?php echo get_option('mandigo_scheme'); ?>/' + img +(state ? '_hover' : '') + '.gif'; }
  
-   cen = document.getElementById("main"    );
-   cnt = document.getElementById("content" );
-   sb1 = document.getElementById("sidebar1");
-   sb2 = document.getElementById("sidebar2");
- 
-   getOffsetTop = function(el) {
-     offset = 0;
-     while (!/html|body/i.test(el.tagName)) { offset += el.offsetTop; el = el.offsetParent; }
-     return offset;
-   }
- 
-   heightfix = function() { if (sb1) cen.style.height = Math.max(sb1.clientHeight+sb1.offsetTop,cnt.clientHeight+getOffsetTop(cnt),(sb2?sb2.clientHeight+sb2.offsetTop:0))-getOffsetTop(cen) +'px'; }
-   setInterval("heightfix()",500);
-  
    var maxw = Math.round(.96*<?php echo (-32+490+(get_option('mandigo_1024') ? (get_option('mandigo_3columns') ? -6 : 224) : 0)); ?>);
  
    imgloadevent = function(e) { imgloaded(e ? e.currentTarget : window.event.srcElement); }
--- 42,47 ----
diff -c mandigo-1.21/functions.php mandigo-1.22/functions.php
*** mandigo-1.21/functions.php	2007-05-27 22:13:44.000000000 -0400
--- mandigo-1.22/functions.php	2007-06-06 14:15:02.000000000 -0400
***************
*** 126,131 ****
--- 126,133 ----
          mandigo_set_var('wp_repeat'           ,$_POST['wprepeat']      );
          mandigo_set_var('wp_position'         ,$_POST['wpposition']    );
          mandigo_set_var('number_comments'     ,$_POST['numbercomments']);
+         mandigo_set_var('full_search_results' ,$_POST['fullsearchresults']);
+         mandigo_set_var('drop_shadow'         ,$_POST['dropshadow']    );
        }
        $exclude        = split(",",get_option('mandigo_exclude_pages'));
        $scheme         = get_option('mandigo_scheme'                  );
***************
*** 241,247 ****
  		<label><b>Blog Name &amp; Description</b></label><br />
  		<input type="checkbox" name="smalltitle" '. (get_option('mandigo_small_title') ? 'checked="checked"' : '') .' /> Reduce the size font for the blog name (useful for looong titles)<br /> 
  		<input type="checkbox" name="hideblogname" '. (get_option('mandigo_hide_blogname') ? 'checked="checked"' : '') .' /> Do not display the blog name<br /> 
! 		<input type="checkbox" name="hideblogdesc" '. (get_option('mandigo_hide_blogdesc') ? 'checked="checked"' : '') .' /> Do not display the tagline (blog description)<br /><br />
                  Apply a black stroke to blog name and blog description for better readability on lighter header images.<br/><br/>
  		<input type="radio" name="stroke" value="0"  '. ($stroke ? '' : 'checked="checked"') .' /><img src="'. get_bloginfo('template_directory') .'/option-stroke-off.jpg" alt="off" /> &nbsp; 
  		<input type="radio" name="stroke" value="1"  '. ($stroke ? 'checked="checked"' : '') .' /><img src="'. get_bloginfo('template_directory') .'/option-stroke-on.jpg"  alt="on"  /><br /><br />
--- 243,250 ----
  		<label><b>Blog Name &amp; Description</b></label><br />
  		<input type="checkbox" name="smalltitle" '. (get_option('mandigo_small_title') ? 'checked="checked"' : '') .' /> Reduce the size font for the blog name (useful for looong titles)<br /> 
  		<input type="checkbox" name="hideblogname" '. (get_option('mandigo_hide_blogname') ? 'checked="checked"' : '') .' /> Do not display the blog name<br /> 
! 		<input type="checkbox" name="hideblogdesc" '. (get_option('mandigo_hide_blogdesc') ? 'checked="checked"' : '') .' /> Do not display the tagline (blog description)<br />
! 		<input type="checkbox" name="dropshadow" '. (get_option('mandigo_drop_shadow') ? 'checked="checked"' : '') .' /> Add a drop shadow to blog name and description<br /><br />
                  Apply a black stroke to blog name and blog description for better readability on lighter header images.<br/><br/>
  		<input type="radio" name="stroke" value="0"  '. ($stroke ? '' : 'checked="checked"') .' /><img src="'. get_bloginfo('template_directory') .'/option-stroke-off.jpg" alt="off" /> &nbsp; 
  		<input type="radio" name="stroke" value="1"  '. ($stroke ? 'checked="checked"' : '') .' /><img src="'. get_bloginfo('template_directory') .'/option-stroke-on.jpg"  alt="on"  /><br /><br />
***************
*** 260,266 ****
  		<legend>Miscellaneous Options</legend>
  
  		<label><b>Images</b></label><br/>
! 		<input type="checkbox" name="nofloat" '. (get_option('mandigo_nofloat') ? 'checked="checked"' : '') .' /> Do not float images<br />
  		<input type="checkbox" name="noborder" '. (get_option('mandigo_noborder') ? 'checked="checked"' : '') .' /> Display images without a border<br /><br />
  					
  		<label><b>Readability</b></label><br/>
--- 263,269 ----
  		<legend>Miscellaneous Options</legend>
  
  		<label><b>Images</b></label><br/>
! 		<input type="checkbox" name="nofloat" '. (get_option('mandigo_nofloat') ? 'checked="checked"' : '') .' /> Do not wrap text around images<br />
  		<input type="checkbox" name="noborder" '. (get_option('mandigo_noborder') ? 'checked="checked"' : '') .' /> Display images without a border<br /><br />
  					
  		<label><b>Readability</b></label><br/>
***************
*** 271,276 ****
--- 274,280 ----
  		<input type="radio" name="dates" value="1"  '. ($dates ? 'checked="checked"' : '') .' />month/dd/yyyy<br /><br />
  
  		<label><b>Really miscellaneous options</b></label><br/>
+ 		<input type="checkbox" name="fullsearchresults" '. (get_option('mandigo_full_search_results') ? 'checked="checked"' : '') .' /> Display full search results, not just titles and metadata<br />
  		<input type="checkbox" name="numbercomments" '. (get_option('mandigo_number_comments') ? 'checked="checked"' : '') .' /> Number comments<br />
  		<input type="checkbox" name="footstats" '. (get_option('mandigo_footer_stats') ? 'checked="checked"' : '') .' /> Display rendering time and SQL statistics in the footer<br />
  		<input type="checkbox" name="em" '. (get_option('mandigo_em_italics') ? 'checked="checked"' : '') .' /> Display &lt;em&gt; tags as italics
***************
*** 298,303 ****
--- 302,308 ----
      if (isset($_POST['updated'])) {
        mandigo_set_insert('header',$_POST['header']);
        mandigo_set_insert('body'  ,$_POST['body']  );
+       mandigo_set_insert('top'   ,$_POST['top']   );
        mandigo_set_insert('footer',$_POST['footer']);
      }
  
***************
*** 322,329 ****
                  custom &lt;BODY&gt; tag (<i>useful for onload actions</i>):<br />
  		<textarea name="body" rows=1 style="width: 100%">'. str_replace("\\","",get_option('mandigo_inserts_body')) .'</textarea><br /><br />
  
  		<label><b>footer.php</b></label><br/>
!                 before the "Powered by WordPress" credits, still inside the #main div:<br />
  		<textarea name="footer" rows=7 style="width: 100%">'. str_replace("\\","",get_option('mandigo_inserts_footer')) .'</textarea>
  		</fieldset>
  					
--- 327,337 ----
                  custom &lt;BODY&gt; tag (<i>useful for onload actions</i>):<br />
  		<textarea name="body" rows=1 style="width: 100%">'. str_replace("\\","",get_option('mandigo_inserts_body')) .'</textarea><br /><br />
  
+                 right before the content and sidebars area. This differs from the top widget container in that it displays on all pages, and it spans the whole layout width.<br />
+ 		<textarea name="top" rows=7 style="width: 100%">'. str_replace("\\","",get_option('mandigo_inserts_top')) .'</textarea><br /><br />
+ 
  		<label><b>footer.php</b></label><br/>
!                 before the "Powered by WordPress" credits, still inside the #main div. This differs from the bottom widget container in that it displays on all pages, and it spans the whole layout width.<br />
  		<textarea name="footer" rows=7 style="width: 100%">'. str_replace("\\","",get_option('mandigo_inserts_footer')) .'</textarea>
  		</fieldset>
  					
diff -c mandigo-1.21/header.php mandigo-1.22/header.php
*** mandigo-1.21/header.php	2007-05-27 14:17:10.000000000 -0400
--- mandigo-1.22/header.php	2007-06-06 15:01:16.000000000 -0400
***************
*** 26,32 ****
      }
      if (sizeof($headers)) {
        $noheaderimg = 1;
!       $lastminutecss .= "  #headerimg {   background: url(". get_bloginfo('stylesheet_directory') ."/images/headers/". $headers[array_rand($headers,1)] .") bottom center no-repeat; }\n";
      }
    }
    $stroke = get_option('mandigo_stroke');
--- 26,32 ----
      }
      if (sizeof($headers)) {
        $noheaderimg = 1;
!       $lastminutecss .= "  #headerimg {   background: url(". str_replace(' ','%20',get_bloginfo('stylesheet_directory')) ."/images/headers/". $headers[array_rand($headers,1)] .") bottom center no-repeat; }\n";
      }
    }
    $stroke = get_option('mandigo_stroke');
***************
*** 54,59 ****
--- 54,62 ----
  	<div id="headerimg">
  <?php if (!get_option('mandigo_hide_blogname')): ?>
  		<h1><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
+   <?php if (get_option('mandigo_drop_shadow')): ?>
+ 		<span class="h1 text-shadow"><?php bloginfo('name'); ?></span>
+   <?php endif; ?>
    <?php if ($stroke): ?>
  		<span class="h1 text-stroke-tl"><?php bloginfo('name'); ?></span>
  		<span class="h1 text-stroke-tr"><?php bloginfo('name'); ?></span>
***************
*** 66,77 ****
  ?>
  		<div class="description">
  			<h6><?php bloginfo('description'); ?></h6>
! <?php if ($stroke): ?>
  			<span class="h6 text-stroke-tl"><?php bloginfo('description'); ?></span>
  			<span class="h6 text-stroke-tr"><?php bloginfo('description'); ?></span>
  			<span class="h6 text-stroke-bl"><?php bloginfo('description'); ?></span>
  			<span class="h6 text-stroke-br"><?php bloginfo('description'); ?></span>
! <?php endif; ?>
  		</div>
  <?php endif; ?>
  		<ul class="pages<?php echo (get_option('mandigo_headoverlay') ? ' head_overlay' : ''); ?>">
--- 69,83 ----
  ?>
  		<div class="description">
  			<h6><?php bloginfo('description'); ?></h6>
!   <?php if (get_option('mandigo_drop_shadow')): ?>
! 			<span class="h6 text-shadow"><?php bloginfo('description'); ?></span>
!   <?php endif; ?>
!   <?php if ($stroke): ?>
  			<span class="h6 text-stroke-tl"><?php bloginfo('description'); ?></span>
  			<span class="h6 text-stroke-tr"><?php bloginfo('description'); ?></span>
  			<span class="h6 text-stroke-bl"><?php bloginfo('description'); ?></span>
  			<span class="h6 text-stroke-br"><?php bloginfo('description'); ?></span>
!   <?php endif; ?>
  		</div>
  <?php endif; ?>
  		<ul class="pages<?php echo (get_option('mandigo_headoverlay') ? ' head_overlay' : ''); ?>">
***************
*** 81,83 ****
--- 87,92 ----
  	</div>
  </div>
  <div id="main">
+ <?php echo get_option('mandigo_inserts_top'); ?>
+ <table>
+ <tr>
Only in mandigo-1.22: id_ID.mo
Common subdirectories: mandigo-1.21/images and mandigo-1.22/images
diff -c mandigo-1.21/index.php mandigo-1.22/index.php
*** mandigo-1.21/index.php	2007-05-22 09:14:26.000000000 -0400
--- mandigo-1.22/index.php	2007-06-06 14:36:28.000000000 -0400
***************
*** 1,11 ****
  <?php 
! 	get_header(); 
! 	include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('mandigo_1024') && get_option('mandigo_3columns')) {
  		include (TEMPLATEPATH . '/sidebar2.php');
  	}
  ?>
! 	<div id="content" class="narrowcolumn">
  
  	<?php if (function_exists('dynamic_sidebar')): ?>
  	<ul class="inline-widgets">
--- 1,11 ----
  <?php 
! 	get_header();
! 	if (get_option('mandigo_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('mandigo_1024') && get_option('mandigo_3columns') && get_option('mandigo_sidebar2_left')) {
  		include (TEMPLATEPATH . '/sidebar2.php');
  	}
  ?>
! 	<td id="content" class="narrowcolumn">
  
  	<?php if (function_exists('dynamic_sidebar')): ?>
  	<ul class="inline-widgets">
***************
*** 27,33 ****
                                          </div>
                                          </div>
                                          <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','mandigo'),the_title('','',false)); ?>"><?php the_title(); ?></a></h2>
!                                         <small><?php printf(__('Posted by: %s in %s','mandigo'),get_the_author(),get_the_category_list(', ')) ?><?php edit_post_link(__('Edit','mandigo'), ' - <img src="' . get_bloginfo('stylesheet_directory') . '/images/'. get_option('mandigo_scheme') .'/edit.gif" alt="'. __('Edit this post','mandigo') .'" /> ', ''); ?>  </small>
                                  </div>
  
  				<div class="entry">
--- 27,33 ----
                                          </div>
                                          </div>
                                          <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','mandigo'),the_title('','',false)); ?>"><?php the_title(); ?></a></h2>
!                                         <small><?php printf(__('Posted by: %s in %s','mandigo'),'<a href="'. get_author_posts_url(get_the_author_ID()) .'" title="'. sprintf(__("Posts by %s"), attribute_escape(get_the_author())).' ">'. get_the_author() .'</a>',get_the_category_list(', ')) ?><?php edit_post_link(__('Edit','mandigo'), ' - <img src="' . get_bloginfo('stylesheet_directory') . '/images/'. get_option('mandigo_scheme') .'/edit.gif" alt="'. __('Edit this post','mandigo') .'" /> ', ''); ?>  </small>
                                  </div>
  
  				<div class="entry">
***************
*** 56,61 ****
  		<?php dynamic_sidebar('Mandigo Bottom'); ?>
  	</ul>
  	<?php endif; ?>
! 	</div>
  
! <?php get_footer(); ?>
--- 56,68 ----
  		<?php dynamic_sidebar('Mandigo Bottom'); ?>
  	</ul>
  	<?php endif; ?>
! 	</td>
  
! <?php
! 	if (!get_option('mandigo_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('mandigo_1024') && get_option('mandigo_3columns') && !get_option('mandigo_sidebar2_left')) {
! 		include (TEMPLATEPATH . '/sidebar2.php');
! 	}
! 
! 	get_footer(); 
! ?>
diff -c mandigo-1.21/page.php mandigo-1.22/page.php
*** mandigo-1.21/page.php	2007-05-27 16:58:12.000000000 -0400
--- mandigo-1.22/page.php	2007-06-04 17:02:56.000000000 -0400
***************
*** 1,12 ****
  <?php 
  	get_header();
! 	include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('mandigo_1024') && get_option('mandigo_3columns')) {
  		include (TEMPLATEPATH . '/sidebar2.php');
  	}
  ?>
! 
! 	<div id="content" class="narrowcolumn">
  
      <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
  		<div class="post" id="post-<?php the_ID(); ?>">
--- 1,11 ----
  <?php 
  	get_header();
! 	if (get_option('mandigo_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('mandigo_1024') && get_option('mandigo_3columns') && get_option('mandigo_sidebar2_left')) {
  		include (TEMPLATEPATH . '/sidebar2.php');
  	}
  ?>
! 	<td id="content" class="narrowcolumn">
  
      <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
  		<div class="post" id="post-<?php the_ID(); ?>">
***************
*** 21,26 ****
  		</div>
  	  <?php endwhile; endif; ?>
  	<?php edit_post_link(__('Edit this page','mandigo'), '<p>', '</p>'); ?>
! 	</div>
  
! <?php get_footer(); ?>
\ No newline at end of file
--- 20,32 ----
  		</div>
  	  <?php endwhile; endif; ?>
  	<?php edit_post_link(__('Edit this page','mandigo'), '<p>', '</p>'); ?>
! 	</td>
  
! <?php
! 	if (!get_option('mandigo_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('mandigo_1024') && get_option('mandigo_3columns') && !get_option('mandigo_sidebar2_left')) {
! 		include (TEMPLATEPATH . '/sidebar2.php');
! 	}
! 
! 	get_footer(); 
! ?>
diff -c mandigo-1.21/search.php mandigo-1.22/search.php
*** mandigo-1.21/search.php	2007-04-07 11:58:10.000000000 -0400
--- mandigo-1.22/search.php	2007-06-06 14:36:00.000000000 -0400
***************
*** 1,12 ****
  <?php 
! 	get_header(); 
! 	include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('mandigo_1024') && get_option('mandigo_3columns')) {
  		include (TEMPLATEPATH . '/sidebar2.php');
  	}
  ?>
! 
! 	<div id="content" class="narrowcolumn">
  
  	<?php if (have_posts()) : ?>
  
--- 1,11 ----
  <?php 
! 	get_header();
! 	if (get_option('mandigo_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('mandigo_1024') && get_option('mandigo_3columns') && get_option('mandigo_sidebar2_left')) {
  		include (TEMPLATEPATH . '/sidebar2.php');
  	}
  ?>
! 	<td id="content" class="narrowcolumn">
  
  	<?php if (have_posts()) : ?>
  
***************
*** 24,30 ****
  				<h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','mandigo'),the_title('','',false)); ?>"><?php the_title(); ?></a></h3>
  				<small><?php the_time('l, F jS, Y') ?></small>
  
! 				<p class="postmetadata"><?php printf(__('Posted by: %s in %s','mandigo'),get_the_author(),get_the_category_list(', ')) ?> | <?php edit_post_link(__('Edit','mandigo'), '', ' | '); ?>  <?php comments_popup_link(__('No Comments','mandigo'). ' &#187;', __('1 Comment','mandigo'). ' &#187;', __('% Comments','mandigo'). ' &#187;'); ?></p>
  			</div>
  
  		<?php endwhile; ?>
--- 23,36 ----
  				<h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','mandigo'),the_title('','',false)); ?>"><?php the_title(); ?></a></h3>
  				<small><?php the_time('l, F jS, Y') ?></small>
  
! 			<?php if (get_option('mandigo_full_search_results')): ?>
! 				<div class="entry">
! 					<?php the_content(__('Read the rest of this entry','mandigo') .' &raquo;'); ?>
! 				</div>
! 				<div style="clear: both"></div>
! 
! 			<?php endif; ?>
! 				<p class="postmetadata"><?php printf(__('Posted by: %s in %s','mandigo'),'<a href="'. get_author_posts_url(get_the_author_ID()) .'" title="'. sprintf(__("Posts by %s"), attribute_escape(get_the_author())).' ">'. get_the_author() .'</a>',get_the_category_list(', ')) ?> | <?php edit_post_link(__('Edit','mandigo'), '', ' | '); ?>  <?php comments_popup_link(__('No Comments','mandigo'). ' &#187;', __('1 Comment','mandigo'). ' &#187;', __('% Comments','mandigo'). ' &#187;'); ?></p>
  			</div>
  
  		<?php endwhile; ?>
***************
*** 41,46 ****
  
  	<?php endif; ?>
  
! 	</div>
  
! <?php get_footer(); ?>
\ No newline at end of file
--- 47,59 ----
  
  	<?php endif; ?>
  
! 	</td>
! 
! <?php
! 	if (!get_option('mandigo_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('mandigo_1024') && get_option('mandigo_3columns') && !get_option('mandigo_sidebar2_left')) {
! 		include (TEMPLATEPATH . '/sidebar2.php');
! 	}
  
! 	get_footer(); 
! ?>
diff -c mandigo-1.21/sidebar.php mandigo-1.22/sidebar.php
*** mandigo-1.21/sidebar.php	2007-05-24 14:25:36.000000000 -0400
--- mandigo-1.22/sidebar.php	2007-06-04 16:35:36.000000000 -0400
***************
*** 1,4 ****
! 	<ul class="sidebars" id="sidebar1">
  <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 1')) : ?>
  			<?php widget_mandigo_search(); ?>
  
--- 1,5 ----
! 	<td id="sidebar1">
! 	<ul class="sidebars">
  <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 1')) : ?>
  			<?php widget_mandigo_search(); ?>
  
***************
*** 40,42 ****
--- 41,44 ----
  
  <?php endif; ?>
  	</ul>
+ 	</td>
diff -c mandigo-1.21/sidebar2.php mandigo-1.22/sidebar2.php
*** mandigo-1.21/sidebar2.php	2007-05-16 10:37:14.000000000 -0400
--- mandigo-1.22/sidebar2.php	2007-06-04 16:35:44.000000000 -0400
***************
*** 1,5 ****
! 	<ul class="sidebars" id="sidebar2">
  <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 2')) : ?>
  			<?php widget_mandigo_meta(); ?>
  <?php endif; ?>
  	</ul>
--- 1,7 ----
! 	<td id="sidebar2">
! 	<ul class="sidebars">
  <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 2')) : ?>
  			<?php widget_mandigo_meta(); ?>
  <?php endif; ?>
  	</ul>
+ 	</td>
diff -c mandigo-1.21/single.php mandigo-1.22/single.php
*** mandigo-1.21/single.php	2007-04-24 21:38:00.000000000 -0400
--- mandigo-1.22/single.php	2007-06-06 14:38:02.000000000 -0400
***************
*** 2,15 ****
  	get_header();
  	$alwayssidebars = get_option('mandigo_always_show_sidebars');
  	if ($alwayssidebars) {
! 		include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('mandigo_1024') && get_option('mandigo_3columns')) {
  			include (TEMPLATEPATH . '/sidebar2.php');
  		}
  	}
  ?>
! 
! 	<div id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column">
  
    <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
  
--- 2,14 ----
  	get_header();
  	$alwayssidebars = get_option('mandigo_always_show_sidebars');
  	if ($alwayssidebars) {
! 		if (get_option('mandigo_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('mandigo_1024') && get_option('mandigo_3columns') && get_option('mandigo_sidebar2_left')) {
  			include (TEMPLATEPATH . '/sidebar2.php');
  		}
  	}
  ?>
! 	<td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column">
  
    <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
  
***************
*** 28,34 ****
                                          </div>
                                          </div>
                                          <h2><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
!                                         <small><?php printf(__('Posted by: %s in %s','mandigo'),get_the_author(),get_the_category_list(', ')) ?></small>
                                  </div>
  
  			<div class="entry">
--- 27,33 ----
                                          </div>
                                          </div>
                                          <h2><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
!                                         <small><?php printf(__('Posted by: %s in %s','mandigo'),'<a href="'. get_author_posts_url(get_the_author_ID()) .'" title="'. sprintf(__("Posts by %s"), attribute_escape(get_the_author())).' ">'. get_the_author() .'</a>',get_the_category_list(', ')) ?></small>
                                  </div>
  
  			<div class="entry">
***************
*** 62,68 ****
  					</small>
  
  				</p>
- 
  			</div>
  		</div>
  
--- 61,66 ----
***************
*** 74,79 ****
  
  <?php endif; ?>
  
! 	</div>
  
! <?php get_footer(); ?>
--- 72,86 ----
  
  <?php endif; ?>
  
! 	</td>
! 
! <?php
! 	if ($alwayssidebars) {
! 		if (!get_option('mandigo_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('mandigo_1024') && get_option('mandigo_3columns') && !get_option('mandigo_sidebar2_left')) {
! 			include (TEMPLATEPATH . '/sidebar2.php');
! 		}
! 	}
  
! 	get_footer(); 
! ?>
diff -c mandigo-1.21/style.css mandigo-1.22/style.css
*** mandigo-1.21/style.css	2007-05-27 14:26:20.000000000 -0400
--- mandigo-1.22/style.css	2007-06-06 11:53:00.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 22 languages!
! Version: 1.21
  Author: t0mmmmmmm
  Author URI: http://www.onehertz.com/portfolio/wordpress/
  */
--- 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 23 languages!
! Version: 1.22
  Author: t0mmmmmmm
  Author URI: http://www.onehertz.com/portfolio/wordpress/
  */
diff -c mandigo-1.21/style.css.php mandigo-1.22/style.css.php
*** mandigo-1.21/style.css.php	2007-05-27 20:01:48.000000000 -0400
--- mandigo-1.22/style.css.php	2007-06-06 15:16:26.000000000 -0400
***************
*** 1,8 ****
  <?php
!   if (file_exists('../../../wpmu-settings.php')) $fb++;
    else
!     if (file_exists('../../../wp-config.php'))
!       eval(preg_replace('/((require|include)(_once)?|define[^\n]+ABSPATH)[^\n]+|<\?php|\?>/','',file_get_contents('../../../wp-config.php')));
  
    if (defined('DB_USER')) {
      $dbh = @mysql_connect(DB_HOST, DB_USER, DB_PASSWORD);
--- 1,15 ----
  <?php
!   error_reporting(0);
!   $fb = 0;
! 
!   $d = 0;
!   while (!file_exists(str_repeat('../',$d).'wp-config.php')) { if (++$d > 99) exit; }
!   $wpconfig = str_repeat('../',$d).'wp-config.php';
! 
!   if (file_exists(str_repeat('../',$d).'wpmu-settings.php')) $fb++;
    else
!     if (file_exists($wpconfig))
!       eval(preg_replace('/((require|include)(_once)?|define[^\n]+ABSPATH)[^\n]+|<\?php|\?>/','',file_get_contents($wpconfig)));
  
    if (defined('DB_USER')) {
      $dbh = @mysql_connect(DB_HOST, DB_USER, DB_PASSWORD);
***************
*** 20,27 ****
    else $fb++;
  
    if ($fb) {
!     if (is_file('wp-blog-header.php')) { require('./wp-blog-header.php'); }
!     else                               { require('../../../wp-blog-header.php'); }
      $mandigo_em_italics      = get_option('mandigo_em_italics');
      $mandigo_scheme_random   = get_option('mandigo_scheme_random');
      $mandigo_3columns        = get_option('mandigo_3columns');
--- 27,33 ----
    else $fb++;
  
    if ($fb) {
!     require($wpconfig);
      $mandigo_em_italics      = get_option('mandigo_em_italics');
      $mandigo_scheme_random   = get_option('mandigo_scheme_random');
      $mandigo_3columns        = get_option('mandigo_3columns');
***************
*** 54,62 ****
    $ie     = preg_match("/MSIE [4-6]/",$_SERVER['HTTP_USER_AGENT']);
    $ie7    = preg_match("/MSIE 7/",    $_SERVER['HTTP_USER_AGENT']);
    $safari = preg_match("/Safari/",    $_SERVER['HTTP_USER_AGENT']);
- 
-   $sidebar1 = $mandigo_sidebar1_left;
-   $sidebar2 = ($mandigo_3columns ? $mandigo_sidebar2_left : 0);
  ?>
  
  /* Begin Typography & Colors */
--- 60,65 ----
***************
*** 194,222 ****
    background-image: url(<?php echo $stylesheet_directory; ?>/images/patterns/<?php echo $mandigo_wp; ?>);
    background-attachment: <?php echo ($mandigo_wp_fixed ? 'fixed' : 'scroll'); ?>;
    background-repeat: <?php echo ($mandigo_wp_repeat ? $mandigo_wp_repeat : 'repeat'); ?>;
!   <?php if (isset($mandigo_wp_position)): ?>
    background-position: <?php echo $mandigo_wp_position; ?>;
!   <?php endif; ?>
    <?php endif; ?>
    text-align: center;
    margin: 0 0 20px 0;
  }
  
  #header {
    background: url(images/<?php echo ($ie ? '1x1.gif' : 'header'. ($mandigo_1024 ? '-1024' : '') .'.png'); ?>);
    <?php if ($ie): ?>
    filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/header<?php echo ($mandigo_1024 ? '-1024' : ''); ?>.png', sizingMethod='scale');
    <?php endif; ?>
  }
  
  #main {
    background: url(images/<?php echo ($ie ? '1x1.gif' : 'bg'. ($mandigo_1024 ? '-1024' : '') .'.png'); ?>);
    <?php if ($ie): ?>
    filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/bg<?php echo ($mandigo_1024 ? '-1024' : ''); ?>.png', sizingMethod='scale');
    <?php endif; ?>
! <?php /* firefox needs a hack */ ?>
!   padding-top: 1px;
!   width: 100%;
  }
  
  .narrowcolumn .postmetadata { text-align: left; }
--- 197,252 ----
    background-image: url(<?php echo $stylesheet_directory; ?>/images/patterns/<?php echo $mandigo_wp; ?>);
    background-attachment: <?php echo ($mandigo_wp_fixed ? 'fixed' : 'scroll'); ?>;
    background-repeat: <?php echo ($mandigo_wp_repeat ? $mandigo_wp_repeat : 'repeat'); ?>;
!     <?php if (isset($mandigo_wp_position)): ?>
    background-position: <?php echo $mandigo_wp_position; ?>;
!     <?php endif; ?>
    <?php endif; ?>
    text-align: center;
    margin: 0 0 20px 0;
  }
  
+ #page {
+   margin: 20px auto;
+   text-align: left;
+   width: <?php echo (763+224*$mandigo_1024); ?>px;
+ }
+ 
  #header {
    background: url(images/<?php echo ($ie ? '1x1.gif' : 'header'. ($mandigo_1024 ? '-1024' : '') .'.png'); ?>);
    <?php if ($ie): ?>
    filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/header<?php echo ($mandigo_1024 ? '-1024' : ''); ?>.png', sizingMethod='scale');
    <?php endif; ?>
+   height: <?php echo (243-($mandigo_slim_header ? 100 : 0)); ?>px;
+   width: <?php echo (763+224*$mandigo_1024); ?>px;
  }
  
+ #headerimg {
+   position: relative;
+   left: 13px; 
+   top: 11px;
+   height: <?php echo (226-($mandigo_slim_header ? 100 : 0)); ?>px;
+   width: <?php echo (737+224*$mandigo_1024); ?>px;
+   <?php if (!isset($_GET['noheaderimg'])): ?>
+   background: url('images/<?php echo $mandigo_scheme; ?>/head<?php echo ($mandigo_1024 ? '-1024' : ''); ?>.jpg') bottom center no-repeat;
+   <?php endif; ?>
+ } 
+ 
+ #headerimg h1, #headerimg .h1, #headerimg .description { padding-left: 15px; }
+ 
  #main {
    background: url(images/<?php echo ($ie ? '1x1.gif' : 'bg'. ($mandigo_1024 ? '-1024' : '') .'.png'); ?>);
    <?php if ($ie): ?>
    filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/bg<?php echo ($mandigo_1024 ? '-1024' : ''); ?>.png', sizingMethod='scale');
    <?php endif; ?>
!   width: <?php echo (763-2*17+224*$mandigo_1024); ?>px;
!   padding: 9px 17px;
! }
! 
! #main table, .narrowcolumn { width: 100%; }
! 
! #main td {
!   vertical-align: top;
!   padding: 0 3px;
  }
  
  .narrowcolumn .postmetadata { text-align: left; }
***************
*** 235,298 ****
    border: none;
  }
  
- #page {
-   margin: 20px auto;
-   text-align: left;
-   width: <?php echo (763+224*$mandigo_1024); ?>px;
- }
- 
- #header {
-   height: <?php echo (243-($mandigo_slim_header ? 100 : 0)); ?>px;
-   width: <?php echo (763+224*$mandigo_1024); ?>px;
- }
- 
- #headerimg {
-   position: relative;
-   left: 13px; 
-   top: 11px;
-   height: <?php echo (226-($mandigo_slim_header ? 100 : 0)); ?>px;
-   width: <?php echo (737+224*$mandigo_1024); ?>px;
-   <?php if (!isset($_GET['noheaderimg'])): ?>
-   background: url('images/<?php echo $mandigo_scheme; ?>/head<?php echo ($mandigo_1024 ? '-1024' : ''); ?>.jpg') bottom center no-repeat;
-   <?php endif; ?>
- } 
- 
- #headerimg h1, #headerimg .h1, #headerimg .description { padding-left: 15px; }
- 
- .narrowcolumn {
-   padding: 0 0 20px 0;
-   width: <?php echo (490+($mandigo_1024 ? ($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*$mandigo_1024); ?>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;
  }
  
  .narrowcolumn .postdata { padding-top: 5px; }
  
  .widecolumn .postmetadata { margin: 30px 0; }
  
! .widecolumn .smallattachment {
    text-align: center;
-   float: left;
    width: 128px;
    margin: 5px 5px 5px 0px;
  }
  
! .widecolumn .attachment {
    text-align: center;
    margin: 5px 0px;
  }
--- 265,290 ----
    border: none;
  }
  
  .post {
    text-align: justify;
    padding: 5px 15px;
!   margin: 0 auto 10px auto;
    background: #fafafa; 
    border: 1px solid #eee; 
    <?php if ($ie): ?>height: 1%; /* peekaboo */<?php endif; ?>
  }
  
  .narrowcolumn .postdata { padding-top: 5px; }
  
  .widecolumn .postmetadata { margin: 30px 0; }
  
! .smallattachment {
    text-align: center;
    width: 128px;
    margin: 5px 5px 5px 0px;
  }
  
! .attachment {
    text-align: center;
    margin: 5px 0px;
  }
***************
*** 303,309 ****
    margin: 0 auto;
    width: <?php echo (763+224*$mandigo_1024); ?>px;
    height: 68px;
-   clear: both;
  }
  
  #footer p {
--- 295,300 ----
***************
*** 315,323 ****
--- 306,325 ----
  <?php if ($ie): ?>
  #footer a { position: relative; }
  <?php endif; ?>
+ 
+ .sidebars {
+   width: 200px;
+ }
+ 
+ .sidebars {
+   background: #eee;
+   border: 1px solid #ddd;
+   padding: 5px;
+ }
  /* End Structure */
  
  
+ 
  /* Begin Headers */
  h1, .h1 { padding-top:  <?php echo ($mandigo_small_title ? 25 : 15); ?>px; }
  
***************
*** 326,332 ****
    text-align: center;
  }
  
! .sidebars h2 { margin: 5px 0 0; }
  
  h3.comments { margin: 40px auto 20px; }
  
--- 328,334 ----
    text-align: center;
  }
  
! .sidebars h2 { margin: 5px 0 0 0; }
  
  h3.comments { margin: 40px auto 20px; }
  
***************
*** 337,342 ****
--- 339,345 ----
  
  .h1, .h6 { color: #000; }
  
+ .text-shadow    { position: absolute; top: +2px; left: +2px; color: #333; }
  .text-stroke-tl { position: absolute; top: -1px; left: -1px; }
  .text-stroke-tr { position: absolute; top: -1px; left: +1px; }
  .text-stroke-bl { position: absolute; top: +1px; left: -1px; }
***************
*** 363,378 ****
    <?php endif; ?>
  }
  
  .entry img.wp-smiley {
!   float: none;
    padding: 0;
    margin: 0;
    background: transparent;
-   border: 0;
  }
  
- img.nofloat { float: none; }
- 
  img.noborder {
    background: inherit;
    border: 0;
--- 366,380 ----
    <?php endif; ?>
  }
  
+ img.nofloat, .smallattachment img, .attachment img, entry img.wp-smiley { float: none; }
+ 
  .entry img.wp-smiley {
!   border: 0;
    padding: 0;
    margin: 0;
    background: transparent;
  }
  
  img.noborder {
    background: inherit;
    border: 0;
***************
*** 397,411 ****
  
  
  /* Begin Lists */
! .entry ol, .entry ul { padding: 0 0 0 20px; }
  
! .entry ul {
    margin-left: 0;
    list-style: none;
    list-style-type: circle;
  } 
  
! .entry li { margin: 7px 0 8px 5px; }
  
  .postdata ul, .postmetadata li {
    display: inline;
--- 399,415 ----
  
  
  /* Begin Lists */
! ol, ul { padding: 0 0 0 20px; }
! 
! ol ol, ol ul, ul ul, ul ol { padding: 0 0 0 10px; }
  
! ul {
    margin-left: 0;
    list-style: none;
    list-style-type: circle;
  } 
  
! li { margin: 3px 0 4px 5px; }
  
  .postdata ul, .postmetadata li {
    display: inline;
***************
*** 413,439 ****
    list-style-image: none;
  }
  
- .sidebars li { list-style-image: url(images/<?php echo $mandigo_scheme; ?>/star.gif); }
- 
  .sidebars li {
!   list-style-type: none;
    margin-bottom: 15px;
-   margin-left: 25px;
  }
  .sidebars ul li {
    list-style-type: circle;
    list-style-image: none;
  }
  
! .sidebars p, .sidebars select { margin: 5px 0 8px; }
  
  .sidebars ul, .sidebars ol { margin: 5px 0 0 5px; }
  
  .sidebars ul ul, .sidebars ol { margin: 0 0 0 10px; }
  
! ol li, .sidebars ol li { list-style: decimal outside; }
! 
! .sidebars ul li, .sidebars ol li { margin: 3px 0 0; }
  /* End Entry Lists */
  
  
--- 417,448 ----
    list-style-image: none;
  }
  
  .sidebars li {
!   list-style-image: url(images/<?php echo $mandigo_scheme; ?>/star.gif);
!   margin-left: 21px;
    margin-bottom: 15px;
  }
+ 
+ .sidebars ul, .sidebars ol { padding: 0; }
+ 
  .sidebars ul li {
    list-style-type: circle;
    list-style-image: none;
+   margin: 0;
  }
  
! ol li, .sidebars ol li {
!   list-style: decimal outside;
!   list-style-image: none;
! }
! 
! .sidebars p, .sidebars select { margin: 5px 0 8px 0; }
  
  .sidebars ul, .sidebars ol { margin: 5px 0 0 5px; }
  
  .sidebars ul ul, .sidebars ol { margin: 0 0 0 10px; }
  
! .sidebars ul li, .sidebars ol li { margin: 3px 0 0 0; }
  /* End Entry Lists */
  
  
***************
*** 444,454 ****
--- 453,469 ----
    text-align: center;
  }
  
+ #content #searchform {
+   margin-bottom: 10px;
+   text-align: left;
+ }
+ 
  .sidebars #searchform #s {
    border: 1px dashed #ddd; 
    width: 140px;
    padding: 2px;
  }
+ 
  #content #searchform #s {
    border: 1px dashed #bbb; 
    width: 200px;
***************
*** 464,470 ****
  
  select { width: 130px; }
  
! #commentform { margin-bottom: 1em; }
  
  #commentform input {
    width: 170px;
--- 479,488 ----
  
  select { width: 130px; }
  
! #commentform { 
!   margin-bottom: 1em;
!   width: 99%;
! }
  
  #commentform input {
    width: 170px;
***************
*** 496,501 ****
--- 514,520 ----
    <?php if ($mandigo_number_comments): ?>
    margin-left: 3em;
    <?php endif; ?>
+   margin-bottom: 15px;
  }
  
  .commentlist li {
***************
*** 515,540 ****
  
  
  
- /* Begin Sidebar */
- #sidebar1, #sidebar2 {
-   width: 210px;
-   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*$mandigo_1024))); ?>px;
- }
- 
- #sidebar2 {
-   margin-left: <?php echo (($ie||$ie7 ? 0-(($sidebar1+$sidebar2)*230) : 20)+($sidebar2 ? ($sidebar1 ? 230 : 0) : (($sidebar1 ? 502 : 272)+224*$mandigo_1024))); ?>px;
- }
- /* End Sidebar */
- 
- 
  /* Begin Calendar */
  #wp-calendar {
    empty-cells: show;
--- 534,539 ----
***************
*** 699,701 ****
--- 698,701 ----
  
  .googlemap img { background: inherit; }
  /* End Various Tags & Classes*/
+