diff -c royale-1.2/README.txt royale-1.2.1/README.txt
*** royale-1.2/README.txt	2007-05-22 14:05:24.000000000 -0400
--- royale-1.2.1/README.txt	2007-05-24 14:38:14.000000000 -0400
***************
*** 133,138 ****
--- 133,144 ----
  
  === CHANGELOG ==========================================================================
  
+ 1.2.1
+ * the Event Calendar fixes were not included in the previous release
+ * fixed the 3-column layout option not being read by the stylesheet's fallback method
+ * fixed the parsing of boolean options for WPMU
+ * fixed overlapping images issue in page view
+ 
  1.2
  * tested successfully with WordPress 2.2
  * fixed a bug that would break the color cycling feature when a third-party stylesheet
diff -c royale-1.2/footer.php royale-1.2.1/footer.php
*** royale-1.2/footer.php	2007-05-17 14:59:38.000000000 -0400
--- royale-1.2.1/footer.php	2007-05-24 13:22:24.000000000 -0400
***************
*** 39,48 ****
    cnt = document.getElementById("content" );
    sb1 = document.getElementById("sidebar1");
    sb2 = document.getElementById("sidebar2");
!   if ((sb1 && cnt.clientHeight < sb1.clientHeight) || (sb2 && cnt.clientHeight < sb2.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>
--- 39,47 ----
    cnt = document.getElementById("content" );
    sb1 = document.getElementById("sidebar1");
    sb2 = document.getElementById("sidebar2");
! 
!   heightfix = function() { if (sb1) cnt.style.height = Math.max(sb1.clientHeight,cnt.clientHeight,(sb2?sb2.clientHeight:0))+'px'; }
!   heightfix(); window.onload = heightfix;
  </script>
  </body>
  </html>
Common subdirectories: royale-1.2/images and royale-1.2.1/images
diff -c royale-1.2/page.php royale-1.2.1/page.php
*** royale-1.2/page.php	2007-03-30 10:14:00.000000000 -0400
--- royale-1.2.1/page.php	2007-05-24 13:24:28.000000000 -0400
***************
*** 15,20 ****
--- 15,21 ----
  				<?php link_pages('<p><strong>'. __('Pages','royale') .':</strong> ', '</p>', 'number'); ?>
  
  			</div>
+ 			<div style="clear: both;"></div>
  		</div>
  	  <?php endwhile; endif; ?>
  	<?php edit_post_link(__('Edit this page','royale'), '<p>', '</p>'); ?>
diff -c royale-1.2/sidebar.php royale-1.2.1/sidebar.php
*** royale-1.2/sidebar.php	2007-05-17 16:06:58.000000000 -0400
--- royale-1.2.1/sidebar.php	2007-05-24 14:35:58.000000000 -0400
***************
*** 25,31 ****
  
  			<?php } ?>
  
! 			<?php wp_list_pages(array('title_li' => '<h2>'. str_replace('&','%26',__('Pages','royale')) .'</h2>','sort_column' => 'menu_order')); ?>
  
  			<li><h2><?php _e('Categories','royale'); ?></h2>
  				<ul>
--- 25,31 ----
  
  			<?php } ?>
  
! 			<?php wp_list_pages('title_li=<h2>'. str_replace('&','%26',__('Pages','royale')) .'</h2>&sort_column=menu_order'); ?>
  
  			<li><h2><?php _e('Categories','royale'); ?></h2>
  				<ul>
diff -c royale-1.2/style.css royale-1.2.1/style.css
*** royale-1.2/style.css	2007-05-10 11:49:30.000000000 -0400
--- royale-1.2.1/style.css	2007-05-24 14:31:38.000000000 -0400
***************
*** 2,8 ****
  Theme Name: Royale
  Theme URI: http://www.onehertz.com/portfolio/wordpress/
  Description: An elegant 4x widget-ready two/three-column fluid-width WordPress theme with customizable colors. Royale also has an option to make link color cycle smoothly, and has been translated to 22 languages!
! Version: 1.2
  Author: t0mmmmmmm
  Author URI: http://www.onehertz.com/portfolio/wordpress/
  */
--- 2,8 ----
  Theme Name: Royale
  Theme URI: http://www.onehertz.com/portfolio/wordpress/
  Description: An elegant 4x widget-ready two/three-column fluid-width WordPress theme with customizable colors. Royale also has an option to make link color cycle smoothly, and has been translated to 22 languages!
! Version: 1.2.1
  Author: t0mmmmmmm
  Author URI: http://www.onehertz.com/portfolio/wordpress/
  */
diff -c royale-1.2/style.css.php royale-1.2.1/style.css.php
*** royale-1.2/style.css.php	2007-05-10 09:07:28.000000000 -0400
--- royale-1.2.1/style.css.php	2007-05-24 14:35:46.000000000 -0400
***************
*** 22,28 ****
      if (is_file('wp-blog-header.php')) { require('./wp-blog-header.php'); }
      else                               { require('../../../wp-blog-header.php'); }
      $royale_em_italics      = get_option('royale_em_italics');
!     $royale_3columns        = get_option('royale_3column');
      $royale_sidebar1_left   = get_option('royale_sidebar1_left');
      $royale_sidebar2_left   = get_option('royale_sidebar2_left');
      $royale_nofloat         = get_option('royale_nofloat');
--- 22,28 ----
      if (is_file('wp-blog-header.php')) { require('./wp-blog-header.php'); }
      else                               { require('../../../wp-blog-header.php'); }
      $royale_em_italics      = get_option('royale_em_italics');
!     $royale_3columns        = get_option('royale_3columns');
      $royale_sidebar1_left   = get_option('royale_sidebar1_left');
      $royale_sidebar2_left   = get_option('royale_sidebar2_left');
      $royale_nofloat         = get_option('royale_nofloat');
***************
*** 31,36 ****
--- 31,41 ----
      $royale_rgb2            = get_option('royale_rgb2');
      $royale_bgpattern       = get_option('royale_bgpattern');
      $stylesheet_directory   = get_bloginfo('stylesheet_directory');
+     foreach (array('em_italics','3columns','sidebar1_left','sidebar2_left','nofloat') as $a) {
+       $a = 'royale_'. $a;
+       if ($$a == 'on')  $$a = 1;
+       if ($$a == 'off') $$a = 0;
+     }
      status_header(200);
    }
    header('Content-type: text/css');
***************
*** 183,188 ****
--- 188,201 ----
    text-transform: capitalize;
  }
  
+ /* dirty fix for the event calendar plugin */
+ div#wp-calendar caption { padding-top: 1.5em; }
+ div#wp-calendar .nav {
+   margin: <?php echo ($ie||$ie7||$safari ? ($ie7 ? 0 : '1.5em') .' 0 -1.5em 0' : 0); ?>;
+   position: relative;
+ }
+ /* end */
+ 
  .cal {
    color: #fff;
    text-align: center;