diff -c mandigo-1.20.1/README.txt mandigo-1.21/README.txt
*** mandigo-1.20.1/README.txt	2007-05-24 13:12:26.000000000 -0400
--- mandigo-1.21/README.txt	2007-05-28 11:02:34.000000000 -0400
***************
*** 47,56 ****
  Presentation, Theme Options subpanel in the Administration interface.
  
  ** Image Classes:
! - Images in posts are surrounded by a border by default. To override this behaviour, 
!   simply add the 'noborder' class to your img tags.
  - Images are also left-floated by default. To override this, add the 'nofloat' class to 
!   your img tags.
  
  ** Widgets Support:
  Mandigo supports up to four widgets bars: two on the sides, one at the top and one at 
--- 47,57 ----
  Presentation, Theme Options subpanel in the Administration interface.
  
  ** Image Classes:
! - Images in posts are surrounded by a border by default. While it is possible to disable
!   them throughout the theme using the appropriate option, you can also override this 
!   behaviour on certain images by adding the 'noborder' class to the img tag.
  - Images are also left-floated by default. To override this, add the 'nofloat' class to 
!   your img tags, or use the appropriate option.
  
  ** Widgets Support:
  Mandigo supports up to four widgets bars: two on the sides, one at the top and one at 
***************
*** 181,189 ****
  
  === CHANGELOG ==========================================================================
  
  1.20.1
  * fixed the 3-column layout option not being read by the stylesheet's fallback method
! * fixed boolean options for WPMU
  * fixed the footer gap issue for good
  
  1.20
--- 182,203 ----
  
  === 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/
+ * fixed the issue with overlapping images in page view
+ * fixed list bullets in posts which were displayed off stage in IE
+ * fixed the overlapping footer bug in IE7 (hi Randy)
+ * fixed more footer gap issues
+ * the footer should also be resize-proof now
+ 
  1.20.1
  * fixed the 3-column layout option not being read by the stylesheet's fallback method
! * fixed the parsing of boolean options for WPMU
  * fixed the footer gap issue for good
  
  1.20
diff -c mandigo-1.20.1/footer.php mandigo-1.21/footer.php
*** mandigo-1.20.1/footer.php	2007-05-22 09:12:06.000000000 -0400
--- mandigo-1.21/footer.php	2007-05-27 20:00:12.000000000 -0400
***************
*** 45,60 ****
    sb1 = document.getElementById("sidebar1");
    sb2 = document.getElementById("sidebar2");
  
!   heightfix = function() { if (sb1) cen.style.height = Math.max(sb1.clientHeight+sb1.offsetTop,cnt.clientHeight+cnt.offsetTop,(sb2?sb2.clientHeight+sb2.offsetTop:0))-cen.offsetTop +'px'; }
!   heightfix(); window.onload = heightfix;
!   
    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); }
!   imgloaded = function(t) {
!     if (t.clientWidth > maxw) { t.style.width = maxw+'px'; }
!     setTimeout("heightfix()",100);
!   }
  
    imgs = document.getElementsByTagName("img");
    for (i=0;i<imgs.length;i++) {
--- 45,63 ----
    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); }
!   imgloaded    = function(t) { if (t.clientWidth > maxw) t.style.width  = maxw+'px'; }
  
    imgs = document.getElementsByTagName("img");
    for (i=0;i<imgs.length;i++) {
diff -c mandigo-1.20.1/functions.php mandigo-1.21/functions.php
*** mandigo-1.20.1/functions.php	2007-05-24 12:53:18.000000000 -0400
--- mandigo-1.21/functions.php	2007-05-27 22:13:44.000000000 -0400
***************
*** 10,15 ****
--- 10,16 ----
    // Set default values
    if (!get_option('mandigo_scheme'       )) update_option('mandigo_scheme'       ,'blue'   );
    if (!get_option('mandigo_bgcolor'      )) update_option('mandigo_bgcolor'      ,'#44484F');
+   if (!get_option('mandigo_wp_repeat'    )) update_option('mandigo_wp_repeat'    ,'repeat');
  
  
    // some global vars
***************
*** 46,51 ****
--- 47,53 ----
  
    // META WIDGET
    function widget_mandigo_meta() {
+     global $wpmu;
      $options = get_option('widget_meta');
  ?>
  				<li><h2><?php echo ($options['title'] ? $options['title'] : __('Meta','mandigo')); ?></h2>
***************
*** 53,59 ****
--- 55,65 ----
  				<ul>
  					<?php wp_register(); ?>
  					<li><?php wp_loginout(); ?></li>
+ <?php if ($wpmu): ?>
+ 					<li><a href="http://mu.wordpress.org/" title="Powered by WordPress MU, state-of-the-art semantic personal publishing platform.">WordPress MU</a></li>
+ <?php else: ?>
  					<li><a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform.">WordPress</a></li>
+ <?php endif; ?>
  					<li><a href="http://www.onehertz.com/portfolio/wordpress/" title="Other WordPress themes by the same author" target="_blank">Mandigo theme</a></li>
  					<?php wp_meta(); ?>
  				</ul>
***************
*** 112,117 ****
--- 118,131 ----
          mandigo_set_var('stroke'              ,$_POST['stroke']        );
          mandigo_set_var('headers_random'      ,$_POST['randomheaders'] );
          mandigo_set_var('slim_header'         ,$_POST['slimheader']    );
+         mandigo_set_var('hide_blogname'       ,$_POST['hideblogname']  );
+         mandigo_set_var('hide_blogdesc'       ,$_POST['hideblogdesc']  );
+         mandigo_set_var('noborder'            ,$_POST['noborder']      );
+         mandigo_set_var('small_title'         ,$_POST['smalltitle']    );
+         mandigo_set_var('wp_fixed'            ,$_POST['wpfixed']       );
+         mandigo_set_var('wp_repeat'           ,$_POST['wprepeat']      );
+         mandigo_set_var('wp_position'         ,$_POST['wpposition']    );
+         mandigo_set_var('number_comments'     ,$_POST['numbercomments']);
        }
        $exclude        = split(",",get_option('mandigo_exclude_pages'));
        $scheme         = get_option('mandigo_scheme'                  );
***************
*** 122,127 ****
--- 136,143 ----
        $headnavleft    = get_option('mandigo_headnav_left'            );
        $wp             = get_option('mandigo_wp'                      );
        $stroke         = get_option('mandigo_stroke'                  );
+       $wp_fixed       = get_option('mandigo_wp_fixed'                );
+       $wp_repeat      = get_option('mandigo_wp_repeat'               );
  
        $pages = & get_pages('sort_column=menu_order');
        foreach ($pages as $page) {
***************
*** 137,142 ****
--- 153,159 ----
  	
  		<form name="mandigo_options_form" method="post" action="?page=functions.php">
  		<input type="hidden" name="updated" value="1" />
+ 		<p class="submit"><input type="submit" name="Submit" value="'.__('Update Options &raquo;').'"/></p>
  		
  		<fieldset class="options">
  		<legend>Color Scheme</legend>
***************
*** 151,158 ****
  
  		<label><b>Background</b></label><br />
  		Background color: <input type="text" name="bgcolor" value="'. get_option('mandigo_bgcolor') .'" /> <a href="#" onclick="javascript:document.forms.mandigo_options_form.bgcolor.value=\'#44484F\';">restore default</a><br /><br />
! 		<input type="checkbox" name="wptog" '. (get_option('mandigo_wptog') && $wp ? 'checked="checked"' : '') .' /> Use the following file as the background pattern:<br />
! 		'. get_bloginfo('template_directory') .'/images/<input type="text" name="wp" value="'. $wp .'" size="30" /><br /><br />
  		</fieldset>
  
  
--- 168,206 ----
  
  		<label><b>Background</b></label><br />
  		Background color: <input type="text" name="bgcolor" value="'. get_option('mandigo_bgcolor') .'" /> <a href="#" onclick="javascript:document.forms.mandigo_options_form.bgcolor.value=\'#44484F\';">restore default</a><br /><br />
! 		<input type="checkbox" name="wptog" '. (get_option('mandigo_wptog') && $wp ? 'checked="checked"' : '') .' /> Use the following image file as the background pattern:<br />
! 		<table border=0>
! 			<tr>
! 				<td align="right">images/patterns/</td>
! 				<td>
! 					<input type="text" name="wp" value="'. $wp .'" size="30" />
! 				</td>
! 			</tr>
! 			<tr>
! 				<td align="right">Attachment :</td>
! 				<td>
! 					<input type="radio" name="wpfixed" value="0" '. ($wp_fixed ? '' : 'checked="checked"') .' />scroll &nbsp; 
! 					<input type="radio" name="wpfixed" value="1" '. ($wp_fixed ? 'checked="checked"' : '') .' />fixed
! 				</td>
! 			</tr>
! 			<tr>
! 				<td align="right">Repeat :</td>
! 				<td>
! 					<select name="wprepeat">
! 						<option value="repeat" '.    ($wp_repeat == 'repeat'    ? 'selected' : '') .'>both horizontally and vertically</option>
! 						<option value="repeat-x" '.  ($wp_repeat == 'repeat-x'  ? 'selected' : '') .'>horizontally only</option>
! 						<option value="repeat-y" '.  ($wp_repeat == 'repeat-y'  ? 'selected' : '') .'>vertically only</option>
! 						<option value="no-repeat" '. ($wp_repeat == 'no-repeat' ? 'selected' : '') .'>do not repeat</option>
! 					</select>
! 				</td>
! 			</tr>
! 			<tr>
! 				<td align="right">Position :</td>
! 				<td>
! 					<input type="text" name="wpposition" value="'. get_option('mandigo_wp_position') .'" size="30" /> <a href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-position" target="_blank">help</a>
! 				</td>
! 			</tr>
! 		</table>
  		</fieldset>
  
  
***************
*** 162,173 ****
  		<input type="checkbox" name="col3" '. (get_option('mandigo_3columns') ? 'checked="checked"' : '') .' /> 3-column layout (previous option must be enabled)<br />
  		<input type="checkbox" name="alwayssidebars" '. (get_option('mandigo_always_show_sidebars') ? 'checked="checked"' : '') .' /> Show sidebars even in single post view<br /><br />
  		<label><b>Sidebars position</b></label><br/>
! 		First sidebar : &nbsp; &nbsp;
! 		<input type="radio" name="sidebar1" value="1"  '. ($sidebar1 ? 'checked="checked"' : '') .' />left &nbsp; 
! 		<input type="radio" name="sidebar1" value="0"  '. ($sidebar1 ? '' : 'checked="checked"') .' />right<br />
! 		Second sidebar : 
! 		<input type="radio" name="sidebar2" value="1"  '. ($sidebar2 ? 'checked="checked"' : '') .' />left &nbsp; 
! 		<input type="radio" name="sidebar2" value="0"  '. ($sidebar2 ? '' : 'checked="checked"') .' />right<br /><br />
  		</fieldset>
  
  
--- 210,231 ----
  		<input type="checkbox" name="col3" '. (get_option('mandigo_3columns') ? 'checked="checked"' : '') .' /> 3-column layout (previous option must be enabled)<br />
  		<input type="checkbox" name="alwayssidebars" '. (get_option('mandigo_always_show_sidebars') ? 'checked="checked"' : '') .' /> Show sidebars even in single post view<br /><br />
  		<label><b>Sidebars position</b></label><br/>
! 		<table border=0>
! 			<tr>
! 				<td align="right">First sidebar :</td>
! 				<td>
! 					<input type="radio" name="sidebar1" value="1"  '. ($sidebar1 ? 'checked="checked"' : '') .' />left &nbsp; 
! 					<input type="radio" name="sidebar1" value="0"  '. ($sidebar1 ? '' : 'checked="checked"') .' />right
! 				</td>
! 			</tr>
! 			<tr>
! 				<td align="right">Second sidebar :</td>
! 				<td>
! 					<input type="radio" name="sidebar2" value="1"  '. ($sidebar2 ? 'checked="checked"' : '') .' />left &nbsp; 
! 					<input type="radio" name="sidebar2" value="0"  '. ($sidebar2 ? '' : 'checked="checked"') .' />right
! 				</td>
! 			</tr>
! 		</table>
  		</fieldset>
  
  
***************
*** 181,192 ****
  		<cite>It is also possible to use a different image on each page (per-page header images). Please consult the <a href="themes.php?page=README">README page</a> for more information.</cite><br /><br />
  
  		<label><b>Blog Name &amp; Description</b></label><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 />
  
  		<label><b>Page Navigation Overlay</b></label><br />
!                 This options overlays a translucent black stripe on the header for better readability.<br/><br/>
  		<input type="radio" name="headoverlay" value="0"  '. ($headoverlay ? '' : 'checked="checked"') .' /><img src="'. get_bloginfo('template_directory') .'/option-headoverlay-off.jpg" alt="off" /> &nbsp; 
  		<input type="radio" name="headoverlay" value="1"  '. ($headoverlay ? 'checked="checked"' : '') .' /><img src="'. get_bloginfo('template_directory') .'/option-headoverlay-on.jpg"  alt="on"  /><br /><br />
  
--- 239,253 ----
  		<cite>It is also possible to use a different image on each page (per-page header images). Please consult the <a href="themes.php?page=README">README page</a> for more information.</cite><br /><br />
  
  		<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 />
  
  		<label><b>Page Navigation Overlay</b></label><br />
!                 Apply a translucent black stripe to the header for better readability.<br/><br/>
  		<input type="radio" name="headoverlay" value="0"  '. ($headoverlay ? '' : 'checked="checked"') .' /><img src="'. get_bloginfo('template_directory') .'/option-headoverlay-off.jpg" alt="off" /> &nbsp; 
  		<input type="radio" name="headoverlay" value="1"  '. ($headoverlay ? 'checked="checked"' : '') .' /><img src="'. get_bloginfo('template_directory') .'/option-headoverlay-on.jpg"  alt="on"  /><br /><br />
  
***************
*** 198,203 ****
--- 259,268 ----
  		<fieldset class="options">
  		<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/>
  		<input type="checkbox" name="boldlinks" '. (get_option('mandigo_bold_links') ? 'checked="checked"' : '') .' /> Display all links in bold for better readability<br /><br />
  					
***************
*** 206,212 ****
  		<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="nofloat" '. (get_option('mandigo_nofloat') ? 'checked="checked"' : '') .' /> Do not float images<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
  		</fieldset>
--- 271,277 ----
  		<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="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
  		</fieldset>
diff -c mandigo-1.20.1/header.php mandigo-1.21/header.php
*** mandigo-1.20.1/header.php	2007-05-22 09:11:32.000000000 -0400
--- mandigo-1.21/header.php	2007-05-27 14:17:10.000000000 -0400
***************
*** 52,65 ****
  
  <div id="header">
  	<div id="headerimg">
  		<h1><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
! <?php if ($stroke): ?>
  		<span class="h1 text-stroke-tl"><?php bloginfo('name'); ?></span>
  		<span class="h1 text-stroke-tr"><?php bloginfo('name'); ?></span>
  		<span class="h1 text-stroke-bl"><?php bloginfo('name'); ?></span>
  		<span class="h1 text-stroke-br"><?php bloginfo('name'); ?></span>
! <?php endif; ?>
! <?php if (get_bloginfo('description')): ?>
  		<div class="description">
  			<h6><?php bloginfo('description'); ?></h6>
  <?php if ($stroke): ?>
--- 52,69 ----
  
  <div id="header">
  	<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 ($stroke): ?>
  		<span class="h1 text-stroke-tl"><?php bloginfo('name'); ?></span>
  		<span class="h1 text-stroke-tr"><?php bloginfo('name'); ?></span>
  		<span class="h1 text-stroke-bl"><?php bloginfo('name'); ?></span>
  		<span class="h1 text-stroke-br"><?php bloginfo('name'); ?></span>
! <?php
!     endif;
!   endif;
!   if (!get_option('mandigo_hide_blogdesc') && get_bloginfo('description')):
! ?>
  		<div class="description">
  			<h6><?php bloginfo('description'); ?></h6>
  <?php if ($stroke): ?>
Common subdirectories: mandigo-1.20.1/images and mandigo-1.21/images
diff -c mandigo-1.20.1/page.php mandigo-1.21/page.php
*** mandigo-1.20.1/page.php	2007-05-07 15:42:04.000000000 -0400
--- mandigo-1.21/page.php	2007-05-27 16:58:12.000000000 -0400
***************
*** 1,5 ****
  <?php 
! 	get_header(); 
  	include (TEMPLATEPATH . '/sidebar.php');
  	if (get_option('mandigo_1024') && get_option('mandigo_3columns')) {
  		include (TEMPLATEPATH . '/sidebar2.php');
--- 1,5 ----
  <?php 
! 	get_header();
  	include (TEMPLATEPATH . '/sidebar.php');
  	if (get_option('mandigo_1024') && get_option('mandigo_3columns')) {
  		include (TEMPLATEPATH . '/sidebar2.php');
***************
*** 16,21 ****
--- 16,22 ----
  
  				<?php link_pages('<p><strong>'. __('Pages','mandigo') .':</strong> ', '</p>', 'number'); ?>
  
+ 			<div style="clear: both;"></div>
  			</div>
  		</div>
  	  <?php endwhile; endif; ?>
diff -c mandigo-1.20.1/style.css mandigo-1.21/style.css
*** mandigo-1.20.1/style.css	2007-05-24 12:52:42.000000000 -0400
--- mandigo-1.21/style.css	2007-05-27 14:26:20.000000000 -0400
***************
*** 2,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.20.1
  Author: t0mmmmmmm
  Author URI: http://www.onehertz.com/portfolio/wordpress/
  */
--- 2,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/
  */
diff -c mandigo-1.20.1/style.css.php mandigo-1.21/style.css.php
*** mandigo-1.20.1/style.css.php	2007-05-24 13:11:28.000000000 -0400
--- mandigo-1.21/style.css.php	2007-05-27 20:01:48.000000000 -0400
***************
*** 7,13 ****
    if (defined('DB_USER')) {
      $dbh = @mysql_connect(DB_HOST, DB_USER, DB_PASSWORD);
      @mysql_select_db(DB_NAME,$dbh);
!     $r = @mysql_query("SELECT option_name,option_value FROM ". $table_prefix ."options WHERE option_name REGEXP '^mandigo_(1024|sidebar[12]_left|3columns|wp(tog)?|em_italics|bgcolor|nofloat|headnav_left|scheme|slim_header)|stylesheet|siteurl';",$dbh);
      while ($a = @mysql_fetch_row($r)) {
        if ($a[1] == 'on')  $a[1] = 1;
        if ($a[1] == 'off') $a[1] = 0;
--- 7,13 ----
    if (defined('DB_USER')) {
      $dbh = @mysql_connect(DB_HOST, DB_USER, DB_PASSWORD);
      @mysql_select_db(DB_NAME,$dbh);
!     $r = @mysql_query("SELECT option_name,option_value FROM ". $table_prefix ."options WHERE option_name REGEXP '^mandigo_(1024|sidebar[12]_left|3columns|wp(tog|_(fixed|repeat|position))?|em_italics|bgcolor|no(float|border)|headnav_left|scheme|slim_header|small_title|number_comments)|stylesheet|siteurl';",$dbh);
      while ($a = @mysql_fetch_row($r)) {
        if ($a[1] == 'on')  $a[1] = 1;
        if ($a[1] == 'off') $a[1] = 0;
***************
*** 22,42 ****
    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');
!     $mandigo_sidebar1_left = get_option('mandigo_sidebar1_left');
!     $mandigo_sidebar2_left = get_option('mandigo_sidebar2_left');
!     $mandigo_headnav_left  = get_option('mandigo_headnav_left');
!     $mandigo_wptog         = get_option('mandigo_wptog');
!     $mandigo_wp            = get_option('mandigo_wp');
!     $mandigo_1024          = get_option('mandigo_1024');
!     $mandigo_nofloat       = get_option('mandigo_nofloat');
!     $mandigo_bgcolor       = get_option('mandigo_bgcolor');
!     $mandigo_scheme        = get_option('mandigo_scheme');
!     $mandigo_slim_header   = get_option('mandigo_slim_header');
!     $stylesheet_directory  = get_bloginfo('stylesheet_directory');
!     foreach (array('em_italics','3columns','sidebar1_left','sidebar2_left','wptog','1024','nofloat','slim_header') as $a) {
        $a = 'mandigo_'. $a;
        if ($$a == 'on')  $$a = 1;
        if ($$a == 'off') $$a = 0;
--- 22,48 ----
    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');
!     $mandigo_sidebar1_left   = get_option('mandigo_sidebar1_left');
!     $mandigo_sidebar2_left   = get_option('mandigo_sidebar2_left');
!     $mandigo_headnav_left    = get_option('mandigo_headnav_left');
!     $mandigo_wptog           = get_option('mandigo_wptog');
!     $mandigo_wp              = get_option('mandigo_wp');
!     $mandigo_1024            = get_option('mandigo_1024');
!     $mandigo_nofloat         = get_option('mandigo_nofloat');
!     $mandigo_bgcolor         = get_option('mandigo_bgcolor');
!     $mandigo_scheme          = get_option('mandigo_scheme');
!     $mandigo_slim_header     = get_option('mandigo_slim_header');
!     $mandigo_noborder        = get_option('mandigo_noborder');
!     $mandigo_small_title     = get_option('mandigo_small_title');
!     $mandigo_wp_fixed        = get_option('mandigo_wp_fixed');
!     $mandigo_wp_repeat       = get_option('mandigo_wp_repeat');
!     $mandigo_wp_position     = get_option('mandigo_wp_position');
!     $mandigo_number_comments = get_option('mandigo_number_comments');
!     $stylesheet_directory    = get_bloginfo('stylesheet_directory');
!     foreach (array('em_italics','3columns','sidebar1_left','sidebar2_left','wptog','1024','nofloat','slim_header','noborder','small_title','wp_fixed','wp_repeat','wp_position','number_comments') as $a) {
        $a = 'mandigo_'. $a;
        if ($$a == 'on')  $$a = 1;
        if ($$a == 'off') $$a = 0;
***************
*** 76,82 ****
  }
  
  h1, .h1 {
!   font-size: 4em;
    letter-spacing: -.05em; 
  }
  
--- 82,88 ----
  }
  
  h1, .h1 {
!   font-size: <?php echo ($mandigo_small_title ? 3 : 4); ?>em;
    letter-spacing: -.05em; 
  }
  
***************
*** 142,154 ****
  }
  
  em {
! <?php if ($mandigo_em_italics): ?>
    font-style: italic;
    font-weight: normal;
! <?php else: ?>
    font-style: normal;
    font-weight: bold;
! <?php endif; ?>
  }
  
  acronym, abbr, span.caps {
--- 148,160 ----
  }
  
  em {
!   <?php if ($mandigo_em_italics): ?>
    font-style: italic;
    font-weight: normal;
!   <?php else: ?>
    font-style: normal;
    font-weight: bold;
!   <?php endif; ?>
  }
  
  acronym, abbr, span.caps {
***************
*** 183,201 ****
  p { margin: 1em 0; }
  
  body {
!   background: <?php echo $mandigo_bgcolor; ?> <?php echo ($mandigo_wptog && $mandigo_wp ? 'url('. $stylesheet_directory .'/images/'. $mandigo_wp .')' : ''); ?>;
    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%;
--- 189,219 ----
  p { margin: 1em 0; }
  
  body {
!   background-color: <?php echo $mandigo_bgcolor; ?>;
!   <?php if ($mandigo_wptog && $mandigo_wp): ?>
!   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%;
***************
*** 211,217 ****
  
  #footer {
    background: url(images/<?php echo ($ie ? '1x1.gif' : 'foot'. ($mandigo_1024 ? '-1024' : '') .'.png'); ?>);
! <?php if ($ie): ?>  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/foot<?php echo ($mandigo_1024 ? '-1024' : ''); ?>.png', sizingMethod='scale');<?php endif; ?>
    border: none;
  }
  
--- 229,237 ----
  
  #footer {
    background: url(images/<?php echo ($ie ? '1x1.gif' : 'foot'. ($mandigo_1024 ? '-1024' : '') .'.png'); ?>);
!   <?php if ($ie): ?>
!   filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/foot<?php echo ($mandigo_1024 ? '-1024' : ''); ?>.png', sizingMethod='scale');
!   <?php endif; ?>
    border: none;
  }
  
***************
*** 232,240 ****
    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; }
--- 252,260 ----
    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; }
***************
*** 291,305 ****
    padding: 10px 0 0 0;
    text-align: center;
  }
- <?php if ($ie): ?>
  
  #footer a { position: relative; }
  <?php endif; ?>
  /* End Structure */
  
  
  /* Begin Headers */
! h1, .h1 { padding-top: 15px; }
  
  h2.pagetitle {
    margin-top: 30px;
--- 311,325 ----
    padding: 10px 0 0 0;
    text-align: center;
  }
  
+ <?php if ($ie): ?>
  #footer a { position: relative; }
  <?php endif; ?>
  /* End Structure */
  
  
  /* Begin Headers */
! h1, .h1 { padding-top:  <?php echo ($mandigo_small_title ? 25 : 15); ?>px; }
  
  h2.pagetitle {
    margin-top: 30px;
***************
*** 336,344 ****
--- 356,366 ----
  .entry img {
    float: <?php echo ($mandigo_nofloat ? 'none' : 'left'); ?>;
    margin: 3px 10px;
+   <?php if (!$mandigo_noborder): ?>
    background: #fff;
    border: 1px solid #333;
    padding: 3px;
+   <?php endif; ?>
  }
  
  .entry img.wp-smiley {
***************
*** 375,390 ****
  
  
  /* Begin Lists */
! html>body .entry ul {
    margin-left: 0;
-   padding: 0 0 0 20px;
    list-style: none;
    list-style-type: circle;
  } 
  
! html>body .entry li { margin: 7px 0 8px 5px; }
! 
! .entry ol { padding: 0 0 0 20px; }
  
  .postdata ul, .postmetadata li {
    display: inline;
--- 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;
***************
*** 470,481 ****
    padding: 10px;
  }
  
! .commentlist { text-align: justify; }
  
  .commentlist li {
!   margin: 15px 0 3px;
!   padding: 5px 10px 3px;
!   list-style: none;
  }
  
  .commentlist p { margin: 10px 5px 10px 0; }
--- 491,507 ----
    padding: 10px;
  }
  
! .commentlist {
!   text-align: justify;
!   <?php if ($mandigo_number_comments): ?>
!   margin-left: 3em;
!   <?php endif; ?>
! }
  
  .commentlist li {
!   margin: 15px 0 3px 0;
!   padding: 5px 10px 3px 10px;
!   list-style: <?php echo ($mandigo_number_comments ? 'decimal outside' : 'none'); ?>;
  }
  
  .commentlist p { margin: 10px 5px 10px 0; }
***************
*** 651,657 ****
  
  .head_overlay {
    background: url(images/<?php echo ($ie ? '1x1.gif' : 'head_overlay.png'); ?>);
! <?php if ($ie): ?>  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/head_overlay.png', sizingMethod='scale');<?php endif; ?>
  }
  
  #rss {
--- 677,685 ----
  
  .head_overlay {
    background: url(images/<?php echo ($ie ? '1x1.gif' : 'head_overlay.png'); ?>);
!   <?php if ($ie): ?>
!   filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/head_overlay.png', sizingMethod='scale');
!   <?php endif; ?>
  }
  
  #rss {
***************
*** 671,674 ****
  
  .googlemap img { background: inherit; }
  /* End Various Tags & Classes*/
- 
--- 699,701 ----