diff -c mandigo-1.12/README.txt mandigo-1.13/README.txt
*** mandigo-1.12/README.txt	2007-02-28 21:26:38.000000000 -0500
--- mandigo-1.13/README.txt	2007-03-08 20:38:06.000000000 -0500
***************
*** 58,71 ****
  - Images are also left-floated by default. To override this, add the 'nofloat' class to 
    your img tags.
  
! If you enjoy this theme, please consider doing some of the following things:
  - let me know and send an email to tom@onehertz.com
  - rate the theme and leave a comment on the Theme Viewer:
    http://themes.wordpress.net/columns/2-columns/1378/
  - bookmark it on del.icio.us:
    http://del.icio.us/search/?p=mandigo+theme
  
! Thank you!
  
  
  === LOCALIZATION =======================================================================
--- 58,80 ----
  - 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 
! the bottom. The sidebars can be displayed on either side of the reading area. The 
! top/bottom bars are most useful to display some kind of static content (using text 
! widgets), or recent posts/comments.
! 
! If you're still not using widgets (you should!), you can find more information about 
! them here: http://automattic.com/code/widgets/
! 
! If you enjoy this theme, please consider doing some (all) of the following things:
  - let me know and send an email to tom@onehertz.com
  - rate the theme and leave a comment on the Theme Viewer:
    http://themes.wordpress.net/columns/2-columns/1378/
  - bookmark it on del.icio.us:
    http://del.icio.us/search/?p=mandigo+theme
  
! Thank you for choosing Mandigo!
  
  
  === LOCALIZATION =======================================================================
***************
*** 83,101 ****
  
  === TRANSLATION CREDITS ================================================================
  
! Czech:     Milan Tucek
! Danish:    Daniel Noesgaard Rasmussen
! Dutch:     Ramsy de Vos
! French:    Michel Bibal
! German:    Michael Nickel
! Hungarian: Horvath Zoltan
! Italian:   Sebastiano Cannata
! Japanese:  Mitsuhiro Kanda
! Norwegian: Torbjorn Blystad
! Slovak:    Marek
! Spanish:   Juan Luis Perez Perez
! Swedish:   Ulf Wrede
! Turkish:   Mert Yabul
  
  Do not see your language listed here? If you are interested in helping with translation,
  please let me know by sending an email to tom@onehertz.com
--- 92,115 ----
  
  === TRANSLATION CREDITS ================================================================
  
! Chinese:    Charles Low
! Czech:      Milan Tucek
! Danish:     Daniel Noesgaard Rasmussen
! Dutch:      Ramsy de Vos
! French:     Michel Bibal
! German:     Michael Nickel
! Hungarian:  Horvath Zoltan
! Italian:    Sebastiano Cannata
! Japanese:   Mitsuhiro Kanda
! Norwegian:  Torbjorn Blystad
! Polish:     Mateusz Baran
! Portuguese: Oscar Nogueira Neto
! Russian:    Michael Dolgov
! Serbian:    Aleksandar Duric
! Slovak:     Marek
! Spanish:    Juan Luis Perez Perez
! Swedish:    Ulf Wrede
! Turkish:    Mert Yabul
  
  Do not see your language listed here? If you are interested in helping with translation,
  please let me know by sending an email to tom@onehertz.com
***************
*** 114,119 ****
--- 128,142 ----
  
  === CHANGELOG ==========================================================================
  
+ 1.13
+ + added the 3-column layout
+ + added options to move the sidebars left/right
+ + language: Brazilian Portuguese (pt_BR)
+ + language: Polish (pl_PL)
+ + language: Russian (ru_RU)
+ + language: Serbian (sr_CS)
+ + language: Simplified Chinese (zh_CN)
+ 
  1.12
  + added Top and Bottom widgets bars
  + language: Czech (cs_CZ)
diff -c mandigo-1.12/archive.php mandigo-1.13/archive.php
*** mandigo-1.12/archive.php	2007-02-27 23:07:35.000000000 -0500
--- mandigo-1.13/archive.php	2007-03-08 17:26:21.000000000 -0500
***************
*** 1,4 ****
! <?php get_header(); ?>
  
  	<div id="content" class="narrowcolumn">
  
--- 1,10 ----
! <?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">
  
***************
*** 72,77 ****
  
  	</div>
  
- <?php get_sidebar(); ?>
- 
  <?php get_footer(); ?>
--- 78,81 ----
diff -c mandigo-1.12/blue.css mandigo-1.13/blue.css
*** mandigo-1.12/blue.css	2007-02-14 16:29:09.000000000 -0500
--- mandigo-1.13/blue.css	2007-03-08 13:38:24.000000000 -0500
***************
*** 1,6 ****
  a, h2 a:hover, h3 a:hover, .entry p a:visited { color: #2E8FC6; }
  a:hover { color: #0F3461; }
- #sidebar li { list-style-image: url(images/blue/star.gif); }
  .cal { background: #1C5B9E url(images/blue/cal_bg.jpg) repeat-x; }
  
  .calborder { 
--- 1,5 ----
Binary files mandigo-1.12/es_ES.mo and mandigo-1.13/es_ES.mo differ
diff -c mandigo-1.12/footer.php mandigo-1.13/footer.php
*** mandigo-1.12/footer.php	2007-02-25 22:07:45.000000000 -0500
--- mandigo-1.13/footer.php	2007-03-08 20:33:12.000000000 -0500
***************
*** 2,8 ****
  
    Hi,
  
!   Please DO NOT remove the link to my website from the footer. I have been working hard to make this theme and you have downloaded it for FREE. This is all I ask from you in return for Mandigo which didn't cost you a cent.
  
    Thank you.
  
--- 2,11 ----
  
    Hi,
  
!   Please DO NOT remove the link to my website from the footer. I have
!   been working hard to make this theme and you have downloaded it for
!   FREE. This is all I ask from you in return for Mandigo which didn't
!   cost you a cent.
  
    Thank you.
  
***************
*** 23,27 ****
--- 26,39 ----
  </div>
  
  		<?php wp_footer(); ?>
+ <script type="text/javascript">
+   cnt = document.getElementById("content" );
+   sb1 = document.getElementById("sidebar1");
+   sb2 = document.getElementById("sidebar2");
+   if (sb1 && cnt.clientHeight < sb1.clientHeight) {
+     if (sb2) { cnt.style.height = (sb1.clientHeight>sb2.clientHeight?sb1.clientHeight:sb2.clientHeight) +'px'; }
+     else { cnt.style.height = sb1.clientHeight +'px'; }
+   }
+ </script>
  </body>
  </html>
diff -c mandigo-1.12/functions.php mandigo-1.13/functions.php
*** mandigo-1.12/functions.php	2007-02-28 20:13:04.000000000 -0500
--- mandigo-1.13/functions.php	2007-03-08 17:29:17.000000000 -0500
***************
*** 1,6 ****
--- 1,7 ----
  <?php
  if (function_exists('register_sidebar')) {
  	register_sidebar();
+ 	register_sidebar();
  	register_sidebar(array('name'=>'Mandigo Top'));
  	register_sidebar(array('name'=>'Mandigo Bottom'));
  }
***************
*** 28,34 ****
  			</li>
  <?php
  }
! if (function_exists('register_sidebar_widget')) register_sidebar_widget(__('Search','mandigo'),'widget_mandigo_search');
  
  
  
--- 29,35 ----
  			</li>
  <?php
  }
! if (function_exists('register_sidebar_widget')) register_sidebar_widget('Search','widget_mandigo_search');
  
  
  
***************
*** 41,47 ****
  			</li>
  <?php
  }
! if (function_exists('register_sidebar_widget')) register_sidebar_widget(__('Calendar'),'widget_mandigo_calendar');
  
  
  
--- 42,48 ----
  			</li>
  <?php
  }
! if (function_exists('register_sidebar_widget')) register_sidebar_widget('Calendar','widget_mandigo_calendar');
  
  
  
***************
*** 63,69 ****
  				</li>
  <?php
  }
! if (function_exists('register_sidebar_widget')) register_sidebar_widget(__('Meta','mandigo'),'widget_mandigo_meta');
  
  
  
--- 64,70 ----
  				</li>
  <?php
  }
! if (function_exists('register_sidebar_widget')) register_sidebar_widget('Meta','widget_mandigo_meta');
  
  
  
***************
*** 71,77 ****
  // ADMIN
  add_action('admin_menu', 'add_mandigo_options_page');
  add_action('admin_menu', 'add_mandigo_readme_page');
! function add_mandigo_options_page() { add_theme_page('Theme Options', 'Theme Options', 'edit_themes', basename(__FILE__), 'mandigo_options_page'); }
  function add_mandigo_readme_page()  { add_theme_page('README', 'README', 'switch_themes', '', 'mandigo_readme_page'); }
  function mandigo_set_scheme($value)        { update_option('mandigo_scheme',        $value); }
  function mandigo_set_bool($var,$value)     { update_option($var,                    $value); }
--- 72,78 ----
  // ADMIN
  add_action('admin_menu', 'add_mandigo_options_page');
  add_action('admin_menu', 'add_mandigo_readme_page');
! function add_mandigo_options_page() { add_theme_page('Theme Options', '<img src="'. get_bloginfo('template_directory') .'/images/attention_catcher.png" /> Theme Options', 'edit_themes', basename(__FILE__), 'mandigo_options_page'); }
  function add_mandigo_readme_page()  { add_theme_page('README', 'README', 'switch_themes', '', 'mandigo_readme_page'); }
  function mandigo_set_scheme($value)        { update_option('mandigo_scheme',        $value); }
  function mandigo_set_bool($var,$value)     { update_option($var,                    $value); }
***************
*** 102,107 ****
--- 103,111 ----
  			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']  );
  		}
  		$current     = get_option('mandigo_scheme');
  		$headoverlay = get_option('mandigo_headoverlay');
***************
*** 112,117 ****
--- 116,124 ----
  		$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');
  
  		$pages = & get_pages('sort_column=menu_order');
  		foreach ( $pages as $page ) {
***************
*** 142,149 ****
  		</fieldset>
  <br />
  		<fieldset class="options">
! 		<label><b>Theme Width</b></label><br/>
! 		<input type="checkbox" name="wide" '. ($wide ? 'checked="checked"' : '') .' /> Use the 1024px theme look instead of the default 800px one<br /><br /> 
  					
  		<legend>Miscellaneous Options</legend>
  		<label><b>Page Navigation Overlay</b></label><br />
--- 149,163 ----
  		</fieldset>
  <br />
  		<fieldset class="options">
! 		<label><b>Theme Width &amp; Columns</b></label><br/>
! 		<input type="checkbox" name="wide" '. ($wide ? 'checked="checked"' : '') .' /> Use the 1024px theme look instead of the default 800px one<br />
! 		<input type="checkbox" name="col3" '. ($col3 ? 'checked="checked"' : '') .' /> 3-column layout (previous option needs to be enabled)<br />
! 		First sidebar position: 
! 		<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 position: 
! 		<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 />
  					
  		<legend>Miscellaneous Options</legend>
  		<label><b>Page Navigation Overlay</b></label><br />
diff -c mandigo-1.12/green.css mandigo-1.13/green.css
*** mandigo-1.12/green.css	2007-02-14 16:32:03.000000000 -0500
--- mandigo-1.13/green.css	2007-03-08 13:38:17.000000000 -0500
***************
*** 2,8 ****
  h2 a:hover, h3 a:hover { color: #3DB306; }
  .entry p a { border-bottom: 1px dotted #206E01; }
  .entry p a:hover { border-bottom: 1px solid #206E01; text-decoration: none; }
- #sidebar li { list-style-image: url(images/green/star.gif); }
  #wp-calendar a { font-weight: bold; }
  .cal { background: #4CB306 url(images/green/cal_bg.jpg) repeat-x; }
  
--- 2,7 ----
Common subdirectories: mandigo-1.12/images and mandigo-1.13/images
diff -c mandigo-1.12/index.php mandigo-1.13/index.php
*** mandigo-1.12/index.php	2007-02-28 20:28:03.000000000 -0500
--- mandigo-1.13/index.php	2007-03-08 15:47:26.000000000 -0500
***************
*** 1,5 ****
! <?php get_header(); ?>
  	<div id="content" class="narrowcolumn">
  	<?php if (function_exists('dynamic_sidebar')): ?>
  	<ul class="inline-widgets">
  		<?php dynamic_sidebar('Mandigo Top'); ?>
--- 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 (function_exists('dynamic_sidebar')): ?>
  	<ul class="inline-widgets">
  		<?php dynamic_sidebar('Mandigo Top'); ?>
***************
*** 57,62 ****
  	<?php endif; ?>
  	</div>
  
- <?php get_sidebar(); ?>
- 
  <?php get_footer(); ?>
--- 64,67 ----
diff -c mandigo-1.12/orange.css mandigo-1.13/orange.css
*** mandigo-1.12/orange.css	2007-02-14 16:32:08.000000000 -0500
--- mandigo-1.13/orange.css	2007-03-08 13:38:40.000000000 -0500
***************
*** 1,5 ****
  a, h2 a:hover, h3 a:hover, .entry p a:visited { color: #FF9B2A; }
- #sidebar li { list-style-image: url(images/orange/star.gif); }
  #wp-calendar a:hover {
    text-decoration: underline;
  }
--- 1,4 ----
diff -c mandigo-1.12/page.php mandigo-1.13/page.php
*** mandigo-1.12/page.php	2007-02-16 15:38:17.000000000 -0500
--- mandigo-1.13/page.php	2007-03-08 17:25:54.000000000 -0500
***************
*** 1,4 ****
! <?php get_header(); ?>
  
  	<div id="content" class="narrowcolumn">
  
--- 1,10 ----
! <?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">
  
***************
*** 16,21 ****
  	<?php edit_post_link(__('Edit this page','mandigo'), '<p>', '</p>'); ?>
  	</div>
  
- <?php get_sidebar(); ?>
- 
  <?php get_footer(); ?>
\ No newline at end of file
--- 22,25 ----
diff -c mandigo-1.12/pink.css mandigo-1.13/pink.css
*** mandigo-1.12/pink.css	2007-02-14 16:32:12.000000000 -0500
--- mandigo-1.13/pink.css	2007-03-08 13:38:46.000000000 -0500
***************
*** 1,6 ****
  a, h2 a:hover, h3 a:hover, .entry p a:visited { color: #F02B88; }
  a:hover { color: #8B203D; }
- #sidebar li { list-style-image: url(images/pink/star.gif); }
  .cal { background: #C92155 url(images/pink/cal_bg.jpg) repeat-x; }
  
  .calborder { 
--- 1,5 ----
Only in mandigo-1.13: pl_PL.mo
Only in mandigo-1.13: pt_BR.mo
diff -c mandigo-1.12/purple.css mandigo-1.13/purple.css
*** mandigo-1.12/purple.css	2007-02-14 16:32:16.000000000 -0500
--- mandigo-1.13/purple.css	2007-03-08 13:38:50.000000000 -0500
***************
*** 1,6 ****
  a, h2 a:hover, h3 a:hover, .entry p a:visited { color: #B53492; }
  a:hover { color: #7F2D66; }
- #sidebar li { list-style-image: url(images/purple/star.gif); }
  #wp-calendar a { font-weight: bold; }
  .cal { background: #B53492 url(images/purple/cal_bg.jpg) repeat-x; }
  
--- 1,5 ----
diff -c mandigo-1.12/red.css mandigo-1.13/red.css
*** mandigo-1.12/red.css	2007-02-14 16:32:20.000000000 -0500
--- mandigo-1.13/red.css	2007-03-08 13:39:06.000000000 -0500
***************
*** 1,6 ****
  a, h2 a:hover, h3 a:hover, .entry p a:visited { color: #CC1F27; }
  a:hover { color: #6E0F01; }
- #sidebar li { list-style-image: url(images/red/star.gif); }
  .cal { background: #B31706 url(images/red/cal_bg.jpg) repeat-x; }
  
  .calborder { 
--- 1,5 ----
Only in mandigo-1.13: ru_RU.mo
diff -c mandigo-1.12/search.php mandigo-1.13/search.php
*** mandigo-1.12/search.php	2007-02-16 15:39:38.000000000 -0500
--- mandigo-1.13/search.php	2007-03-08 17:26:03.000000000 -0500
***************
*** 1,4 ****
! <?php get_header(); ?>
  
  	<div id="content" class="narrowcolumn">
  
--- 1,10 ----
! <?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">
  
***************
*** 37,42 ****
  
  	</div>
  
- <?php get_sidebar(); ?>
- 
  <?php get_footer(); ?>
\ No newline at end of file
--- 43,46 ----
diff -c mandigo-1.12/sidebar.php mandigo-1.13/sidebar.php
*** mandigo-1.12/sidebar.php	2007-02-27 23:12:05.000000000 -0500
--- mandigo-1.13/sidebar.php	2007-03-08 13:57:52.000000000 -0500
***************
*** 1,5 ****
! 	<ul id="sidebar">
! <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar()) : ?>
  			<?php widget_mandigo_search(); ?>
  
  			<?php widget_mandigo_calendar(); ?>
--- 1,5 ----
! 	<ul class="sidebars" id="sidebar1">
! <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 1')) : ?>
  			<?php widget_mandigo_search(); ?>
  
  			<?php widget_mandigo_calendar(); ?>
***************
*** 41,44 ****
  
  <?php endif; ?>
  	</ul>
- 
--- 41,43 ----
Only in mandigo-1.13: sidebar2.php
Only in mandigo-1.13: sr_CS.mo
diff -c mandigo-1.12/style.css mandigo-1.13/style.css
*** mandigo-1.12/style.css	2007-02-28 21:25:47.000000000 -0500
--- mandigo-1.13/style.css	2007-03-08 20:37:22.000000000 -0500
***************
*** 1,8 ****
  /*  
  Theme Name: Mandigo
  Theme URI: http://www.onehertz.com/portfolio/wordpress/
! Description: Mandigo is an elegant widget-ready two-column Wordpress theme, available in two widths, SEVEN color schemes and thirteen languages!
! Version: 1.12
  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-column Wordpress theme, available in two widths, SEVEN color schemes and eighteen languages!
! Version: 1.13
  Author: t0mmmmmmm
  Author URI: http://www.onehertz.com/portfolio/
  */
diff -c mandigo-1.12/style.css.php mandigo-1.13/style.css.php
*** mandigo-1.12/style.css.php	2007-02-28 20:48:54.000000000 -0500
--- mandigo-1.13/style.css.php	2007-03-08 20:09:04.000000000 -0500
***************
*** 4,12 ****
    status_header(200);
    header('Content-type: text/css');
    $bgcolor = get_option('mandigo_bgcolor');
!   $ie = preg_match("/MSIE [4-6]/",$_SERVER['HTTP_USER_AGENT']);
!   $safari = preg_match("/Safari/",$_SERVER['HTTP_USER_AGENT']);
    $wide = (get_option(mandigo_1024) ? 1 : 0);
  ?>
  
  /* Begin Typography & Colors */
--- 4,15 ----
    status_header(200);
    header('Content-type: text/css');
    $bgcolor = get_option('mandigo_bgcolor');
!   $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']);
    $wide = (get_option(mandigo_1024) ? 1 : 0);
+   $sidebar1 = get_option('mandigo_sidebar1_left');
+   $sidebar2 = (get_option('mandigo_3columns') ? get_option('mandigo_sidebar2_left') : 0);
  ?>
  
  /* Begin Typography & Colors */
***************
*** 88,94 ****
    font-size: 1.6em;
  }
  
! #sidebar h2 {
    font-family: 'Lucida Grande', Verdana, Sans-Serif;
    font-size: 1.2em;
  }
--- 91,97 ----
    font-size: 1.6em;
  }
  
! .sidebars h2 {
    font-family: 'Lucida Grande', Verdana, Sans-Serif;
    font-size: 1.2em;
  }
***************
*** 106,112 ****
    color: #333;
  }
  
! h2, h2 a, h2 a:hover, h2 a:visited, h3, h3 a, h3 a:hover, h3 a:visited, #sidebar h2, #wp-calendar caption, cite {
    text-decoration: none;
  }
  
--- 109,115 ----
    color: #333;
  }
  
! h2, h2 a, h2 a:hover, h2 a:visited, h3, h3 a, h3 a:hover, h3 a:visited, .sidebars h2, #wp-calendar caption, cite {
    text-decoration: none;
  }
  
***************
*** 138,148 ****
    font-weight: normal;
  }
  
! #sidebar {
    font: 1em 'Lucida Grande', Verdana, Arial, Sans-Serif; 
  }
  
! small, #sidebar ul li, #sidebar ol li, .nocomments, .postmetadata, strike {
    color: #777;
  }
  
--- 141,151 ----
    font-weight: normal;
  }
  
! .sidebars {
    font: 1em 'Lucida Grande', Verdana, Arial, Sans-Serif; 
  }
  
! small, .sidebars ul li, .sidebars ol li, .nocomments, .postmetadata, strike {
    color: #777;
  }
  
***************
*** 226,235 ****
  }
  
  .narrowcolumn {
!   float: left;
!   padding: 0 0 20px 35px;
    margin: 0;
!   width: <?=(460+224*$wide)?>px;
  }
  
  .widecolumn {
--- 229,240 ----
  }
  
  .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 {
***************
*** 244,250 ****
    margin: 10px -15px;
    background: #fafafa; 
    border: 1px solid #eee; 
!   height: 1%; /* peekaboo */
    clear: both;
  }
  
--- 249,255 ----
    margin: 10px -15px;
    background: #fafafa; 
    border: 1px solid #eee; 
!   <?php if ($ie||$ie7): ?>height: 1%; /* peekaboo */<?php endif; ?>
    clear: both;
  }
  
***************
*** 295,301 ****
    text-align: center;
  }
  
! #sidebar h2 {
    margin: 5px 0 0;
    padding: 0;
  }
--- 300,306 ----
    text-align: center;
  }
  
! .sidebars h2 {
    margin: 5px 0 0;
    padding: 0;
  }
***************
*** 391,426 ****
    list-style-image: none;
  }
  
! #sidebar ul, #sidebar ul ol {
    margin: 0;
    padding: 0;
  }
  
! #sidebar li {
    list-style-type: none;
    margin-bottom: 15px;
    margin-left: 25px;
  }
! #sidebar ul li {
    list-style-type: circle;
    list-style-image: none;
  }
  
! #sidebar p, #sidebar select {
    margin: 5px 0 8px;
  }
  
! #sidebar ul, #sidebar ol {
    margin: 5px 0 0 5px;
  }
  
! #sidebar ul ul, #sidebar ol {
    margin: 0 0 0 10px;
  }
  
! ol li, #sidebar ol li { list-style: decimal outside; }
  
! #sidebar ul li, #sidebar ol li {
    margin: 3px 0 0;
    padding: 0;
  }
--- 396,437 ----
    list-style-image: none;
  }
  
! .sidebars li {
!   list-style-image: url(images/<?=get_option('mandigo_scheme')?>/star.gif);
! }
! 
! .sidebars ul, .sidebars ul ol {
    margin: 0;
    padding: 0;
  }
  
! .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;
    padding: 0;
  }
***************
*** 435,441 ****
    text-align: center;
  }
  
! #sidebar #searchform #s {
    border: 1px dashed #ddd; 
    width: 140px;
    padding: 2px;
--- 446,452 ----
    text-align: center;
  }
  
! .sidebars #searchform #s {
    border: 1px dashed #ddd; 
    width: 140px;
    padding: 2px;
***************
*** 446,452 ****
    padding: 2px;
  }
  
! #sidebar #searchsubmit, #content #searchsubmit {
    padding: 0;
    position: relative;
    top: 6px;
--- 457,463 ----
    padding: 2px;
  }
  
! .sidebars #searchsubmit, #content #searchsubmit {
    padding: 0;
    position: relative;
    top: 6px;
***************
*** 518,532 ****
  
  
  /* Begin Sidebar */
! #sidebar {
!   margin-left: <?=(522+224*$wide)?>px;
    width: 210px;
    background: #eee;
    border: 1px solid #ddd;
    padding: 5px;
    margin-top: 1em;
  }
- #sidebar form { margin: 0; }
  /* End Sidebar */
  
  
--- 529,554 ----
  
  
  /* Begin Sidebar */
! #sidebar1, #sidebar2 {
    width: 210px;
    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 {
+   margin: 0;
  }
  /* End Sidebar */
  
  
***************
*** 713,717 ****
  .inline-widgets li li {
    list-style-type: circle;
  }
  /* End Various Tags & Classes*/
- 
--- 735,741 ----
  .inline-widgets li li {
    list-style-type: circle;
  }
+ .textwidget {
+   padding-right: 10px;
+ }
  /* End Various Tags & Classes*/
diff -c mandigo-1.12/teal.css mandigo-1.13/teal.css
*** mandigo-1.12/teal.css	2007-02-14 16:32:25.000000000 -0500
--- mandigo-1.13/teal.css	2007-03-08 13:39:12.000000000 -0500
***************
*** 3,9 ****
  .entry p a { border-bottom: 1px dotted #206E01; }
  .entry p a:hover { border-bottom: 1px solid #206E01; text-decoration: none; }
  #wp-calendar a { font-weight: bold; }
- #sidebar li { list-style-image: url(images/teal/star.gif); }
  .cal { background: #00BA9D url(images/teal/cal_bg.jpg) repeat-x; }
  
  .calborder { 
--- 3,8 ----
Only in mandigo-1.13: zh_CN.mo