<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>archives.php</filename>
    </added>
    <added>
      <filename>links.php</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,31 +1,31 @@
-&lt;?php get_header(); ?&gt;
-
-&lt;div id=&quot;primary&quot; class=&quot;single-post&quot;&gt;
-	&lt;div class=&quot;inside&quot;&gt;
-		&lt;div class=&quot;primary&quot;&gt;
-			&lt;h1&gt;&lt;?php _e('Page not found') ?&gt;&lt;/h1&gt;
-			&lt;p&gt;&lt;?php _e(&quot;It looks like there's a problem with the page you're trying to get to. If you're looking for something in particular, try using the search form below, or by browsing the archives.&quot;) ?&gt;&lt;/p&gt;
-			
-			&lt;h2&gt;&lt;?php _e('Search this site:') ?&gt;&lt;/h2&gt;
-			&lt;?php include (TEMPLATEPATH . '/searchform.php'); ?&gt;
-			
-			&lt;h2&gt;&lt;?php _e('Archives by month:') ?&gt;&lt;/h2&gt;
-			&lt;ul&gt;
-				&lt;?php wp_get_archives('type=monthly'); ?&gt;
-			&lt;/ul&gt;
-	
-			&lt;h2&gt;&lt;?php _e('Archives by subject:') ?&gt;&lt;/h2&gt;
-			&lt;ul&gt;
-				 &lt;?php wp_list_cats(); ?&gt;
-			&lt;/ul&gt;
-		&lt;/div&gt;
-		&lt;div class=&quot;secondary&quot;&gt;
-			&lt;h2&gt;&lt;?php _e('Why am I seeing this?') ?&gt;&lt;/h2&gt;
-			&lt;p&gt;&lt;?php _e(&quot;You requested a page that doesn't exist on this site any more. This could be caused by a link you followed that was out of date, by a typing in the wrong address in the address bar, or simply because the post has been deleted.&quot;) ?&gt;&lt;/p&gt;
-		&lt;/div&gt;
-		&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
-	&lt;/div&gt;
-&lt;/div&gt;
-&lt;?php get_sidebar(); ?&gt;
-
+&lt;?php get_header(); ?&gt;
+
+&lt;div id=&quot;primary&quot; class=&quot;single-post&quot;&gt;
+	&lt;div class=&quot;inside&quot;&gt;
+		&lt;div class=&quot;primary&quot;&gt;
+			&lt;h1&gt;Page not found&lt;/h1&gt;
+			&lt;p&gt;It looks like there's a problem with the page you're trying to get to. If you're looking for something in particular, try using the search form below, or by browsing the archives.&lt;/p&gt;
+			
+			&lt;h2&gt;Search this site:&lt;/h2&gt;
+			&lt;?php include (TEMPLATEPATH . '/searchform.php'); ?&gt;
+			
+			&lt;h2&gt;Archives by month:&lt;/h2&gt;
+			&lt;ul&gt;
+				&lt;?php wp_get_archives('type=monthly'); ?&gt;
+			&lt;/ul&gt;
+	
+			&lt;h2&gt;Archives by subject:&lt;/h2&gt;
+			&lt;ul&gt;
+				 &lt;?php wp_list_cats(); ?&gt;
+			&lt;/ul&gt;
+		&lt;/div&gt;
+		&lt;div class=&quot;secondary&quot;&gt;
+			&lt;h2&gt;Why am I seeing this?&lt;/h2&gt;
+			&lt;p&gt;You requested a page that doesn't exist on this site any more. This could be caused by a link you followed that was out of date, by a typing in the wrong address in the address bar, or simply because the post has been deleted.&lt;/p&gt;
+		&lt;/div&gt;
+		&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
+	&lt;/div&gt;
+&lt;/div&gt;
+&lt;?php get_sidebar(); ?&gt;
+
 &lt;?php get_footer(); ?&gt;
\ No newline at end of file</diff>
      <filename>404.php</filename>
    </modified>
    <modified>
      <filename>admin/js/builder.js</filename>
    </modified>
    <modified>
      <filename>admin/js/controls.js</filename>
    </modified>
    <modified>
      <filename>admin/js/dragdrop.js</filename>
    </modified>
    <modified>
      <filename>admin/js/effects.js</filename>
    </modified>
    <modified>
      <filename>admin/js/prototype.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,72 +1,77 @@
-&lt;?php get_header(); ?&gt;
-
-	&lt;div id=&quot;primary&quot; class=&quot;single-post&quot;&gt;
-	&lt;div class=&quot;inside&quot;&gt;
-		&lt;div class=&quot;primary&quot;&gt;
-
-			&lt;?php if (have_posts()) : ?&gt;
-	
-			&lt;?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?&gt;
-			&lt;?php /* If this is a category archive */ if (is_category()) { ?&gt;				
-			&lt;h1&gt;&lt;?php _e(&quot;Archive for the&quot;) ?&gt; '&lt;?php echo single_cat_title(); ?&gt;' &lt;?php _e(&quot;category&quot;) ?&gt;&lt;/h1&gt;
-			
-			&lt;?php /* If this is a daily archive */ } elseif (is_day()) { ?&gt;
-			&lt;h1&gt;&lt;?php _e(&quot;Archive for&quot;)?&gt; &lt;?php the_time('F jS, Y'); ?&gt;&lt;/h1&gt;
-			
-		 &lt;?php /* If this is a monthly archive */ } elseif (is_month()) { ?&gt;
-			&lt;h1&gt;&lt;?php _e(&quot;Archive for&quot;) ?&gt; &lt;?php the_time('F, Y'); ?&gt;&lt;/h1&gt;
-	
-			&lt;?php /* If this is a yearly archive */ } elseif (is_year()) { ?&gt;
-			&lt;h1&gt;&lt;?php _e(&quot;Archive for&quot;) ?&gt; &lt;?php the_time('Y'); ?&gt;&lt;/h1&gt;
-			
-			&lt;?php /* If this is a search */ } elseif (is_search()) { ?&gt;
-			&lt;h1&gt;&lt;?php _e(&quot;Search Results&quot;) ?&gt;&lt;/h1&gt;
-			
-			&lt;?php /* If this is an author archive */ } elseif (is_author()) { ?&gt;
-			&lt;h1&gt;&lt;?php _e(&quot;Author Archive&quot;) ?&gt;&lt;/h1&gt;
-	
-			&lt;?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) &amp;&amp; !empty($_GET['paged'])) { ?&gt;
-			&lt;h1&gt;&lt;?php _e(&quot;Blog Archives&quot;) ?&gt;&lt;/h1&gt;
-	
-			&lt;?php } ?&gt;
-
-		 &lt;ul class=&quot;dates&quot;&gt;
-		 	&lt;?php while (have_posts()) : the_post(); ?&gt;
-			&lt;li&gt;
-				&lt;span class=&quot;date&quot;&gt;&lt;?php the_time( $hemingway-&gt;date_format() . '.y' ) ?&gt;&lt;/span&gt;
-				&lt;a href=&quot;&lt;?php the_permalink() ?&gt;&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt; 
-				 &lt;?php _e(&quot;posted in&quot;) ?&gt;
-				&lt;?php the_category(', ') ?&gt;  		 
-			&lt;/li&gt;
-		
-			&lt;?php endwhile; ?&gt;
-		&lt;/ul&gt;
-		
-		&lt;div class=&quot;navigation&quot;&gt;
-			&lt;div class=&quot;left&quot;&gt;&lt;?php next_posts_link('&amp;laquo; Previous Entries') ?&gt;&lt;/div&gt;
-			&lt;div class=&quot;right&quot;&gt;&lt;?php previous_posts_link('Next Entries &amp;raquo;') ?&gt;&lt;/div&gt;
-		&lt;/div&gt;
-
-	
-	&lt;?php else : ?&gt;
-
-		&lt;h1&gt;Not Found&lt;/h1&gt;
-
-	&lt;?php endif; ?&gt;
-		
-	&lt;/div&gt;
-	
-	&lt;div class=&quot;secondary&quot;&gt;
-		&lt;h2&gt;&lt;?php _e(&quot;About the archives&quot;) ?&gt;&lt;/h2&gt;
-		&lt;div class=&quot;featured&quot;&gt;
-			&lt;p&gt;&lt;?php _e(&quot;Welcome to the archives here at&quot;) ?&gt; &lt;?php bloginfo('name'); ?&gt;. &lt;?php _e(&quot;Have a look around&quot;) ?&gt;.&lt;/p&gt;
-			
-		&lt;/div&gt;
-	&lt;/div&gt;
-	&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
-	&lt;/div&gt;
-	&lt;/div&gt;
-
-&lt;?php get_sidebar(); ?&gt;
-
-&lt;?php get_footer(); ?&gt;
\ No newline at end of file
+&lt;?php get_header(); ?&gt;
+&lt;?php is_tag(); ?&gt;
+
+	&lt;div id=&quot;primary&quot; class=&quot;single-post&quot;&gt;
+	&lt;div class=&quot;inside&quot;&gt;
+		&lt;div class=&quot;primary&quot;&gt;
+
+			&lt;?php if (have_posts()) : ?&gt;
+	
+			&lt;?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?&gt;
+			&lt;?php /* If this is a category archive */ if (is_category()) { ?&gt;
+			&lt;h1&gt;Archive for the '&lt;?php single_cat_title(); ?&gt;' Category&lt;/h1&gt;
+
+			&lt;?php /* If this is a tag archive */ } elseif (is_tag()) { ?&gt;
+			&lt;h1&gt;Archive for the '&lt;?php single_tag_title(); ?&gt;' Tag&lt;/h1&gt;
+			
+			&lt;?php /* If this is a daily archive */ } elseif (is_day()) { ?&gt;
+			&lt;h1&gt;Archive for &lt;?php the_time('F jS, Y'); ?&gt;&lt;/h1&gt;
+			
+		 &lt;?php /* If this is a monthly archive */ } elseif (is_month()) { ?&gt;
+			&lt;h1&gt;Archive for &lt;?php the_time('F, Y'); ?&gt;&lt;/h1&gt;
+	
+			&lt;?php /* If this is a yearly archive */ } elseif (is_year()) { ?&gt;
+			&lt;h1&gt;Archive for &lt;?php the_time('Y'); ?&gt;&lt;/h1&gt;
+			
+			&lt;?php /* If this is a search */ } elseif (is_search()) { ?&gt;
+			&lt;h1&gt;Search Results&lt;/h1&gt;
+			
+			&lt;?php /* If this is an author archive */ } elseif (is_author()) { ?&gt;
+			&lt;h1&gt;Author Archive&lt;/h1&gt;
+	
+			&lt;?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) &amp;&amp; !empty($_GET['paged'])) { ?&gt;
+			&lt;h1&gt;Blog Archives&lt;/h1&gt;
+	
+			&lt;?php } ?&gt;
+
+		 &lt;ul class=&quot;dates&quot;&gt;
+		 	&lt;?php while (have_posts()) : the_post(); ?&gt;
+			&lt;li&gt;
+				&lt;span class=&quot;date&quot;&gt;&lt;?php the_time('m.j.y') ?&gt;&lt;/span&gt;
+				&lt;a href=&quot;&lt;?php the_permalink() ?&gt;&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt; 
+				 posted in 
+				&lt;?php the_category(', ') ?&gt;
+				&lt;?php if (is_callable('the_tags')) the_tags('tagged ', ', '); ?&gt;
+			&lt;/li&gt;
+		
+			&lt;?php endwhile; ?&gt;
+		&lt;/ul&gt;
+		
+		&lt;div class=&quot;navigation&quot;&gt;
+			&lt;div class=&quot;left&quot;&gt;&lt;?php next_posts_link('&amp;laquo; Previous Entries') ?&gt;&lt;/div&gt;
+			&lt;div class=&quot;right&quot;&gt;&lt;?php previous_posts_link('Next Entries &amp;raquo;') ?&gt;&lt;/div&gt;
+		&lt;/div&gt;
+
+	
+	&lt;?php else : ?&gt;
+
+		&lt;h1&gt;Not Found&lt;/h1&gt;
+
+	&lt;?php endif; ?&gt;
+		
+	&lt;/div&gt;
+	
+	&lt;div class=&quot;secondary&quot;&gt;
+		&lt;h2&gt;About the archives&lt;/h2&gt;
+		&lt;div class=&quot;featured&quot;&gt;
+			&lt;p&gt;Welcome to the archives here at &lt;?php bloginfo('name'); ?&gt;. Have a look around.&lt;/p&gt;
+			
+		&lt;/div&gt;
+	&lt;/div&gt;
+	&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
+	&lt;/div&gt;
+	&lt;/div&gt;
+
+&lt;?php get_sidebar(); ?&gt;
+
+&lt;?php get_footer(); ?&gt;</diff>
      <filename>archive.php</filename>
    </modified>
    <modified>
      <diff>@@ -10,7 +10,7 @@
 		&lt;/div&gt;
 &lt;?php $attachment_link = get_the_attachment_link($post-&gt;ID, true, array(450, 800)); // This also populates the iconsize for the next line ?&gt;
 &lt;?php $_post = &amp;get_post($post-&gt;ID); $classname = ($_post-&gt;iconsize[0] &lt;= 128 ? 'small' : '') . 'attachment'; // This lets us style narrow icons specially ?&gt;
-		&lt;div class=&quot;post&quot; id=&quot;post-&lt;?php the_ID(); ?&gt;&quot;&gt;
+		&lt;div &lt;?php post_class(); ?&gt; id=&quot;post-&lt;?php the_ID(); ?&gt;&quot;&gt;
 			&lt;h2&gt;&lt;a href=&quot;&lt;?php echo get_permalink($post-&gt;post_parent); ?&gt;&quot; rev=&quot;attachment&quot;&gt;&lt;?php echo get_the_title($post-&gt;post_parent); ?&gt;&lt;/a&gt; &amp;raquo; &lt;a href=&quot;&lt;?php echo get_permalink() ?&gt;&quot; rel=&quot;bookmark&quot; title=&quot;Permanent Link: &lt;?php the_title(); ?&gt;&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt;&lt;/h2&gt;
 			&lt;div class=&quot;entrytext&quot;&gt;
 				&lt;p class=&quot;&lt;?php echo $classname; ?&gt;&quot;&gt;&lt;?php echo $attachment_link; ?&gt;&lt;br /&gt;&lt;?php echo basename($post-&gt;guid); ?&gt;&lt;/p&gt;
@@ -27,7 +27,7 @@
 							http://binarybonsai.com/archives/2004/08/17/time-since-plugin/ */
 							/* $entry_datetime = abs(strtotime($post-&gt;post_date) - (60*120)); echo time_since($entry_datetime); echo ' ago'; */ ?&gt; 
 						on &lt;?php the_time('l, F jS, Y') ?&gt; at &lt;?php the_time() ?&gt;
-						and is filed under &lt;?php the_category(', ') ?&gt;.
+						and is filed under &lt;?php the_category(', ') ?&gt;&lt;?php if (is_callable('the_tags')) the_tags(' with tags ', ', '); ?&gt;.
 						You can follow any responses to this entry through the &lt;?php comments_rss_link('RSS 2.0'); ?&gt; feed. 
 						
 						&lt;?php if (('open' == $post-&gt; comment_status) &amp;&amp; ('open' == $post-&gt;ping_status)) {</diff>
      <filename>attachment.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,7 +1,8 @@
-&lt;h2&gt;About&lt;/h2&gt;
-&lt;?php query_posts('pagename=about'); ?&gt;
-&lt;?php if (have_posts()) : ?&gt;
-&lt;?php while (have_posts()) : the_post(); ?&gt;
-&lt;?php the_content(); ?&gt;
-&lt;?php endwhile; ?&gt;
-&lt;?php endif; ?&gt;
+
+&lt;?php query_posts('pagename=about'); ?&gt;
+&lt;?php if (have_posts()) : ?&gt;
+&lt;?php while (have_posts()) : the_post(); ?&gt;
+&lt;h2&gt;About &lt;?php edit_post_link('Edit', '&lt;small&gt;(', ')&lt;/small&gt;'); ?&gt;&lt;/h2&gt;
+&lt;?php the_content(); ?&gt;
+&lt;?php endwhile; ?&gt;
+&lt;?php endif; ?&gt;</diff>
      <filename>blocks/about_page.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,3 +1,3 @@
-&lt;ul class=&quot;blogroll&quot;&gt;
-	&lt;?php get_links_list(1, '&lt;h2&gt;', '&lt;/h2&gt;'); ?&gt;
-&lt;/ul&gt;
+&lt;ul class=&quot;blogroll&quot;&gt;
+	&lt;?php wp_list_bookmarks(); ?&gt;
+&lt;/ul&gt;</diff>
      <filename>blocks/blogroll.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-&lt;h2&gt;Categories&lt;/h2&gt;
-&lt;ul class=&quot;counts&quot;&gt;
-	&lt;?php wp_list_cats('sort_column=name&amp;optioncount=1&amp;hierarchical=0'); ?&gt;
-&lt;/ul&gt;
+&lt;h2&gt;Categories&lt;/h2&gt;
+&lt;ul class=&quot;counts&quot;&gt;
+	&lt;?php wp_list_cats('sort_column=name&amp;optioncount=1&amp;hierarchical=0'); ?&gt;
+&lt;/ul&gt;</diff>
      <filename>blocks/category_listing.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-&lt;h2&gt;Monthly Archives&lt;/h2&gt;
-&lt;ul class=&quot;counts&quot;&gt;
-	&lt;?php wp_get_archives('type=monthly&amp;limit=12&amp;show_post_count=1'); ?&gt;
-&lt;/ul&gt;
+&lt;h2&gt;Monthly Archives&lt;/h2&gt;
+&lt;ul class=&quot;counts&quot;&gt;
+	&lt;?php wp_get_archives('type=monthly&amp;limit=12&amp;show_post_count=1'); ?&gt;
+&lt;/ul&gt;</diff>
      <filename>blocks/monthly_archives.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-&lt;h2&gt;Pages&lt;/h2&gt;
-&lt;ul class=&quot;pages&quot;&gt;
-&lt;?php wp_list_pages('title_li='); ?&gt; 
-&lt;/ul&gt;
+&lt;h2&gt;Pages&lt;/h2&gt;
+&lt;ul class=&quot;pages&quot;&gt;
+&lt;?php wp_list_pages('title_li='); ?&gt; 
+&lt;/ul&gt;</diff>
      <filename>blocks/pages.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,10 +1,10 @@
-&lt;h2&gt;Recently&lt;/h2&gt;
-&lt;ul class=&quot;dates&quot;&gt;
-	&lt;?php
-		// I love Wordpress so
-		query_posts('showposts=10');
-	?&gt;
-	&lt;?php if (have_posts()) : while (have_posts()) : the_post(); ?&gt;
-	&lt;li&gt;&lt;a href=&quot;&lt;?php the_permalink() ?&gt;&quot;&gt;&lt;span class=&quot;date&quot;&gt;&lt;?php the_time( $hemingway-&gt;date_format() ) ?&gt;&lt;/span&gt; &lt;?php the_title() ?&gt; &lt;/a&gt;&lt;/li&gt;
-	&lt;?php endwhile; endif; ?&gt;
-&lt;/ul&gt;
+&lt;h2&gt;Recently&lt;/h2&gt;
+&lt;ul class=&quot;dates&quot;&gt;
+	&lt;?php
+		// I love WordPress so
+		query_posts('showposts=10');
+	?&gt;
+	&lt;?php if (have_posts()) : while (have_posts()) : the_post(); ?&gt;
+	&lt;li&gt;&lt;a href=&quot;&lt;?php the_permalink() ?&gt;&quot;&gt;&lt;span class=&quot;date&quot;&gt;&lt;?php the_time('m.d') ?&gt;&lt;/span&gt; &lt;?php the_title() ?&gt; &lt;/a&gt;&lt;/li&gt;
+	&lt;?php endwhile; endif; ?&gt;
+&lt;/ul&gt;</diff>
      <filename>blocks/recent_entries.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,95 +1,96 @@
-&lt;?php // Do not delete these lines
-	if ('comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
-		die ('Please do not load this page directly. Thanks!');
-
-        if (!empty($post-&gt;post_password)) { // if there's a password
-            if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post-&gt;post_password) {  // and it doesn't match the cookie
-				?&gt;
-				
-				&lt;p class=&quot;nocomments&quot;&gt;&lt;?php _e(&quot;This post is password protected. Enter the password to view comments&quot;) ?&gt;.&lt;p&gt;
-				
-				&lt;?php
-				return;
-            }
-        }
-
-		/* This variable is for alternating comment background */
-		$oddcomment = 'alt';
-?&gt;
-
-&lt;? global $hemingway ?&gt;
-
-&lt;?php if ($comments) : ?&gt;
-
-	&lt;ol id=&quot;comments&quot;&gt;
-
-	&lt;?php foreach ($comments as $comment) : ?&gt;
-		&lt;li id=&quot;comment-&lt;?php comment_ID() ?&gt;&quot;&gt;
-			&lt;cite&gt;
-				&lt;span class=&quot;author&quot;&gt;&lt;?php comment_author_link() ?&gt;&lt;/span&gt;
-				&lt;span class=&quot;date&quot;&gt;&lt;?php comment_date( $hemingway-&gt;date_format() . '.y' ) ?&gt; / &lt;?php comment_date('ga') ?&gt;&lt;/span&gt;
-			&lt;/cite&gt;
-			&lt;div class=&quot;content&quot;&gt;
-				&lt;?php if ($comment-&gt;comment_approved == '0') : ?&gt;
-				&lt;em&gt;&lt;?php _e(&quot;Your comment is awaiting moderation&quot;) ?&gt;.&lt;/em&gt;
-				&lt;?php endif; ?&gt;
-				&lt;?php comment_text() ?&gt;
-			&lt;/div&gt;
-			&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
-		&lt;/li&gt;
-
-
-	&lt;?php /* Changes every other comment to a different class */	
-		if ('alt' == $oddcomment) $oddcomment = '';
-		else $oddcomment = 'alt';
-	?&gt;
-
-	&lt;?php endforeach; /* end for each comment */ ?&gt;
-
-	&lt;/ol&gt;
-
- &lt;?php else : // this is displayed if there are no comments so far ?&gt;
-
-  &lt;?php if ('open' == $post-&gt;comment_status) : ?&gt; 
-		&lt;!-- If comments are open, but there are no comments. --&gt;
-		
-	 &lt;?php else : // comments are closed ?&gt;
-		&lt;!-- If comments are closed. --&gt;
-		&lt;p class=&quot;nocomments&quot;&gt;&lt;?php _e(&quot;Comments are closed&quot;) ?&gt;.&lt;/p&gt;
-		
-	&lt;?php endif; ?&gt;
-&lt;?php endif; ?&gt;
-
-
-&lt;?php if ('open' == $post-&gt;comment_status) : ?&gt;
-
-		&lt;div id=&quot;comment-form&quot;&gt;
-				&lt;h3 class=&quot;formhead&quot;&gt;&lt;?php _e(&quot;Have your say&quot;) ?&gt;&lt;/h3&gt;
-				&lt;p&gt;&lt;small&gt;&lt;strong&gt;XHTML:&lt;/strong&gt; &lt;?php _e(&quot;You can use these tags&quot;) ?&gt;: &lt;?php echo allowed_tags(); ?&gt;&lt;/small&gt;&lt;/p&gt;
-				&lt;?php if ( get_option('comment_registration') &amp;&amp; !$user_ID ) : ?&gt;
-				&lt;p&gt;&lt;?php _e(&quot;You must be&quot;) ?&gt; &lt;a href=&quot;&lt;?php echo get_option('siteurl'); ?&gt;/wp-login.php?redirect_to=&lt;?php the_permalink(); ?&gt;&quot;&gt;&lt;?php _e(&quot;logged in&quot;) ?&gt;&lt;/a&gt; &lt;?php _e(&quot;to post a comment&quot;) ?&gt;.&lt;/p&gt;
-				&lt;?php else : ?&gt;
-				&lt;form action=&quot;&lt;?php echo get_option('siteurl'); ?&gt;/wp-comments-post.php&quot; method=&quot;post&quot; id=&quot;commentform&quot;&gt;
-				&lt;?php if ( $user_ID ) : ?&gt;
-				&lt;p&gt;&lt;?php _e(&quot;Logged in as&quot;) ?&gt; &lt;a href=&quot;&lt;?php echo get_option('siteurl'); ?&gt;/wp-admin/profile.php&quot;&gt;&lt;?php echo $user_identity; ?&gt;&lt;/a&gt;. &lt;a href=&quot;&lt;?php echo get_option('siteurl'); ?&gt;/wp-login.php?action=logout&quot; title=&quot;Log out of this account&quot;&gt;&lt;?php _e(&quot;Logout&quot;) ?&gt; &amp;raquo;&lt;/a&gt;&lt;/p&gt;
-				&lt;?php else : ?&gt;
-				
-				&lt;input type=&quot;text&quot; name=&quot;author&quot; id=&quot;author&quot; value=&quot;&lt;?php echo $comment_author; ?&gt;&quot; class=&quot;textfield&quot; tabindex=&quot;1&quot; /&gt;&lt;label class=&quot;text&quot;&gt;&lt;?php _e(&quot;Name&quot;) ?&gt;&lt;?php if ($req) echo &quot; (required)&quot;; ?&gt;&lt;/label&gt;&lt;br /&gt;
-				&lt;input type=&quot;text&quot; name=&quot;email&quot; id=&quot;email&quot; value=&quot;&lt;?php echo $comment_author_email; ?&gt;&quot; class=&quot;textfield&quot; tabindex=&quot;2&quot; /&gt;&lt;label class=&quot;text&quot;&gt;&lt;?php _e(&quot;Email&quot;) ?&gt;&lt;?php if ($req) echo &quot; (required)&quot;; ?&gt;&lt;/label&gt;&lt;br /&gt;
-				&lt;input type=&quot;text&quot; name=&quot;url&quot; id=&quot;url&quot; value=&quot;&lt;?php echo $comment_author_url; ?&gt;&quot; class=&quot;textfield&quot; tabindex=&quot;3&quot; /&gt;&lt;label class=&quot;text&quot;&gt;&lt;?php _e(&quot;Website&quot;) ?&gt;&lt;/label&gt;&lt;br /&gt;
-				
-				&lt;?php endif; ?&gt;
-				
-				&lt;textarea name=&quot;comment&quot; id=&quot;comment&quot; class=&quot;commentbox&quot; tabindex=&quot;4&quot;&gt;&lt;/textarea&gt;
-				&lt;div class=&quot;formactions&quot;&gt;
-					&lt;span style=&quot;visibility:hidden&quot;&gt;Safari hates me&lt;/span&gt;
-					&lt;input type=&quot;submit&quot; name=&quot;submit&quot; tabindex=&quot;5&quot; class=&quot;submit&quot; value=&quot;Add your comment&quot; /&gt;
-				&lt;/div&gt;
-				&lt;input type=&quot;hidden&quot; name=&quot;comment_post_ID&quot; value=&quot;&lt;?php echo $id; ?&gt;&quot; /&gt;
-				&lt;?php do_action('comment_form', $post-&gt;ID); ?&gt;
-				&lt;/form&gt;
-			&lt;/div&gt;
-
-&lt;?php endif; // If registration required and not logged in ?&gt;
-
-&lt;?php endif; // if you delete this the sky will fall on your head ?&gt;
+&lt;?php // Do not delete these lines
+	if ('comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
+		die ('Please do not load this page directly. Thanks!');
+
+        if (!empty($post-&gt;post_password)) { // if there's a password
+            if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post-&gt;post_password) {  // and it doesn't match the cookie
+				?&gt;
+				
+				&lt;p class=&quot;nocomments&quot;&gt;This post is password protected. Enter the password to view comments.&lt;p&gt;
+				
+				&lt;?php
+				return;
+            }
+        }
+
+		/* This variable is for alternating comment background */
+		$oddcomment = 'alt';
+?&gt;
+
+&lt;!-- You can start editing here. --&gt;
+
+&lt;?php if ($comments) : ?&gt;
+
+	&lt;ol id=&quot;comments&quot; class=&quot;commentlist&quot;&gt;
+
+	&lt;?php foreach ($comments as $comment) : ?&gt;
+		&lt;li id=&quot;comment-&lt;?php comment_ID() ?&gt;&quot;&gt;
+			&lt;cite&gt;
+                		&lt;span class=&quot;avatarspan&quot;&gt;&lt;?php echo get_avatar( $comment, 32 ); ?&gt;&lt;/span&gt;
+				&lt;span class=&quot;author&quot;&gt;&lt;?php comment_author_link() ?&gt;&lt;/span&gt;
+				&lt;span class=&quot;date&quot;&gt;&lt;?php comment_date('n.j.y') ?&gt; / &lt;?php comment_date('ga') ?&gt;&lt;/span&gt;
+			&lt;/cite&gt;
+			&lt;div class=&quot;content&quot;&gt;
+				&lt;?php if ($comment-&gt;comment_approved == '0') : ?&gt;
+				&lt;em&gt;Your comment is awaiting moderation.&lt;/em&gt;
+				&lt;?php endif; ?&gt;
+				&lt;?php comment_text() ?&gt;
+			&lt;/div&gt;
+			&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
+		&lt;/li&gt;
+
+
+	&lt;?php /* Changes every other comment to a different class */	
+		if ('alt' == $oddcomment) $oddcomment = '';
+		else $oddcomment = 'alt';
+	?&gt;
+
+	&lt;?php endforeach; /* end for each comment */ ?&gt;
+
+	&lt;/ol&gt;
+
+ &lt;?php else : // this is displayed if there are no comments so far ?&gt;
+
+  &lt;?php if ('open' == $post-&gt;comment_status) : ?&gt; 
+		&lt;!-- If comments are open, but there are no comments. --&gt;
+		
+	 &lt;?php elseif (!is_page()) : // comments are closed ?&gt;
+		&lt;!-- If comments are closed. --&gt;
+		&lt;p class=&quot;nocomments&quot;&gt;Comments are closed.&lt;/p&gt;
+		
+	&lt;?php endif; ?&gt;
+&lt;?php endif; ?&gt;
+
+
+&lt;?php if ('open' == $post-&gt;comment_status) : ?&gt;
+
+		&lt;div id=&quot;comment-form&quot;&gt;
+				&lt;h3 class=&quot;formhead&quot;&gt;Have your say&lt;/h3&gt;
+				&lt;p&gt;&lt;small&gt;&lt;strong&gt;XHTML:&lt;/strong&gt; You can use these tags: &lt;?php echo allowed_tags(); ?&gt;&lt;/small&gt;&lt;/p&gt;
+				&lt;?php if ( get_option('comment_registration') &amp;&amp; !$user_ID ) : ?&gt;
+				&lt;p&gt;You must be &lt;a href=&quot;&lt;?php echo get_option('siteurl'); ?&gt;/wp-login.php?redirect_to=&lt;?php the_permalink(); ?&gt;&quot;&gt;logged in&lt;/a&gt; to post a comment.&lt;/p&gt;
+				&lt;?php else : ?&gt;
+				&lt;form action=&quot;&lt;?php echo get_option('siteurl'); ?&gt;/wp-comments-post.php&quot; method=&quot;post&quot; id=&quot;commentform&quot;&gt;
+				&lt;?php if ( $user_ID ) : ?&gt;
+				&lt;p&gt;Logged in as &lt;a href=&quot;&lt;?php echo get_option('siteurl'); ?&gt;/wp-admin/profile.php&quot;&gt;&lt;?php echo $user_identity; ?&gt;&lt;/a&gt;. &lt;a href=&quot;&lt;?php echo get_option('siteurl'); ?&gt;/wp-login.php?action=logout&quot; title=&quot;Log out of this account&quot;&gt;Logout &amp;raquo;&lt;/a&gt;&lt;/p&gt;
+				&lt;?php else : ?&gt;
+				
+				&lt;input type=&quot;text&quot; name=&quot;author&quot; id=&quot;author&quot; value=&quot;&lt;?php echo $comment_author; ?&gt;&quot; class=&quot;textfield&quot; tabindex=&quot;1&quot; /&gt;&lt;label class=&quot;text&quot;&gt;Name&lt;?php if ($req) echo &quot; (required)&quot;; ?&gt;&lt;/label&gt;&lt;br /&gt;
+				&lt;input type=&quot;text&quot; name=&quot;email&quot; id=&quot;email&quot; value=&quot;&lt;?php echo $comment_author_email; ?&gt;&quot; class=&quot;textfield&quot; tabindex=&quot;2&quot; /&gt;&lt;label class=&quot;text&quot;&gt;Email&lt;?php if ($req) echo &quot; (required)&quot;; ?&gt;&lt;/label&gt;&lt;br /&gt;
+				&lt;input type=&quot;text&quot; name=&quot;url&quot; id=&quot;url&quot; value=&quot;&lt;?php echo $comment_author_url; ?&gt;&quot; class=&quot;textfield&quot; tabindex=&quot;3&quot; /&gt;&lt;label class=&quot;text&quot;&gt;Website&lt;/label&gt;&lt;br /&gt;
+				
+				&lt;?php endif; ?&gt;
+				
+				&lt;textarea name=&quot;comment&quot; id=&quot;comment&quot; class=&quot;commentbox&quot; tabindex=&quot;4&quot;&gt;&lt;/textarea&gt;
+				&lt;div class=&quot;formactions&quot;&gt;
+					&lt;span style=&quot;visibility:hidden&quot;&gt;Safari hates me&lt;/span&gt;
+					&lt;input type=&quot;submit&quot; name=&quot;submit&quot; tabindex=&quot;5&quot; class=&quot;submit&quot; value=&quot;Add your comment&quot; /&gt;
+				&lt;/div&gt;
+				&lt;input type=&quot;hidden&quot; name=&quot;comment_post_ID&quot; value=&quot;&lt;?php echo $id; ?&gt;&quot; /&gt;
+				&lt;?php do_action('comment_form', $post-&gt;ID); ?&gt;
+				&lt;/form&gt;
+			&lt;/div&gt;
+
+&lt;?php endif; // If registration required and not logged in ?&gt;
+
+&lt;?php endif; // if you delete this the sky will fall on your head ?&gt;</diff>
      <filename>comments.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,20 +1,20 @@
-&lt;?php global $hemingway ?&gt;
-&lt;hr class=&quot;hide&quot; /&gt;
-	&lt;div id=&quot;ancillary&quot;&gt;
-		&lt;div class=&quot;inside&quot;&gt;
-			&lt;div class=&quot;block first&quot;&gt;
-				&lt;?php $hemingway-&gt;get_block_output('block_1'); ?&gt;
-			&lt;/div&gt;
-			
-			&lt;div class=&quot;block&quot;&gt;
-				&lt;?php $hemingway-&gt;get_block_output('block_2'); ?&gt;
-			&lt;/div&gt;
-			
-			&lt;div class=&quot;block&quot;&gt;
-				&lt;?php $hemingway-&gt;get_block_output('block_3'); ?&gt;
-			&lt;/div&gt;
-			
-			&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
-		&lt;/div&gt;
-	&lt;/div&gt;
+&lt;?php global $hemingway ?&gt;
+&lt;hr class=&quot;hide&quot; /&gt;
+	&lt;div id=&quot;ancillary&quot;&gt;
+		&lt;div class=&quot;inside&quot;&gt;
+			&lt;div class=&quot;block first&quot;&gt;
+				&lt;?php $hemingway-&gt;get_block_output('block_1'); ?&gt;
+			&lt;/div&gt;
+			
+			&lt;div class=&quot;block&quot;&gt;
+				&lt;?php $hemingway-&gt;get_block_output('block_2'); ?&gt;
+			&lt;/div&gt;
+			
+			&lt;div class=&quot;block&quot;&gt;
+				&lt;?php $hemingway-&gt;get_block_output('block_3'); ?&gt;
+			&lt;/div&gt;
+			
+			&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
+		&lt;/div&gt;
+	&lt;/div&gt;
 	&lt;!-- [END] #ancillary --&gt;	
\ No newline at end of file</diff>
      <filename>dynamic_sidebar.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,17 +1,16 @@
-
-&lt;hr class=&quot;hide&quot; /&gt;
-	&lt;div id=&quot;footer&quot;&gt;
-		&lt;div class=&quot;inside&quot;&gt;
-			&lt;?php
-				// You are not required to keep this link back to Warpspire, but if you wouldn't mind, leaving it in would make my day.
-			?&gt;
-			&lt;p class=&quot;copyright&quot;&gt;&lt;?php _e(&quot;Powered by&quot;) ?&gt; &lt;a href=&quot;http://warpspire.com/hemingway&quot;&gt;Hemingway&lt;/a&gt; &lt;?php _e(&quot;flavored&quot;) ?&gt; &lt;a href=&quot;http://wordpress.org&quot;&gt;Wordpress&lt;/a&gt;.&lt;/p&gt;
-			&lt;p class=&quot;attributes&quot;&gt;&lt;a href=&quot;feed:&lt;?php bloginfo('rss2_url'); ?&gt;&quot;&gt;&lt;?php _e(&quot;Entries&quot;) ?&gt; RSS&lt;/a&gt; &lt;a href=&quot;feed:&lt;?php bloginfo('comments_rss2_url'); ?&gt;&quot;&gt;&lt;?php _e(&quot;Comments&quot;) ?&gt; RSS&lt;/a&gt;&lt;?php wp_register('',''); ?&gt;&lt;/p&gt;
-		&lt;/div&gt;
-	&lt;/div&gt;
-	&lt;!-- [END] #footer --&gt;	
-
-	&lt;!-- &lt;?php echo get_num_queries(); ?&gt; queries. &lt;?php timer_stop(1); ?&gt; seconds. --&gt;
-	&lt;?php wp_footer(); ?&gt;
-&lt;/body&gt;
-&lt;/html&gt;
+
+&lt;hr class=&quot;hide&quot; /&gt;
+	&lt;div id=&quot;footer&quot;&gt;
+		&lt;div class=&quot;inside&quot;&gt;
+			&lt;?php
+				// You are not required to keep this link back to Warpspire, but if you wouldn't mind, leaving it in would make my day.
+			?&gt;
+			&lt;p class=&quot;copyright&quot;&gt;&lt;a href=&quot;http://wordpress.com/&quot; rel=&quot;generator&quot;&gt;Get a free blog at WordPress.com&lt;/a&gt; | Theme: &lt;a href=&quot;http://warpspire.com/hemingway&quot; rel=&quot;designer&quot;&gt;Hemingway&lt;/a&gt;.&lt;/p&gt;
+			&lt;p class=&quot;attributes&quot;&gt;&lt;a href=&quot;&lt;?php bloginfo('rss2_url'); ?&gt;&quot;&gt;Entries RSS&lt;/a&gt; &lt;a href=&quot;&lt;?php bloginfo('comments_rss2_url'); ?&gt;&quot;&gt;Comments RSS&lt;/a&gt;&lt;/p&gt;
+		&lt;/div&gt;
+	&lt;/div&gt;
+	&lt;!-- [END] #footer --&gt;	
+
+	&lt;?php wp_footer(); ?&gt;
+&lt;/body&gt;
+&lt;/html&gt;</diff>
      <filename>footer.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,647 +1,497 @@
-&lt;?php
-class Hemingway
-	{
-		
-		var $raw_blocks;
-		var $available_blocks;
-		var $style;
-		var $version;
-		
-		function add_available_block($block_name, $block_ref)
-			{
-
-				$blocks = $this-&gt;available_blocks;
-				
-				if (!$blocks[$block_ref]){
-					$blocks[$block_ref] = $block_name;
-					update_option('hem_available_blocks', $blocks);
-					wp_cache_flush();
-				}
-				
-			}
-		
-		function get_available_blocks()
-			// This function returns an array of available blocks
-			// in the format of $arr[block_ref] = block_name
-			{				
-				$this-&gt;available_blocks = get_option('hem_available_blocks');
-				return $this-&gt;available_blocks;
-			}
-		
-		function get_block_contents($block_place)
-			// Returns an array of block_refs in specififed block
-			{
-				if (!$this-&gt;raw_blocks){
-					$this-&gt;raw_blocks = get_option('hem_blocks');
-				}
-				return $this-&gt;raw_blocks[$block_place];
-			}
-		
-		function add_block_to_place($block_place, $block_ref)
-			{
-				$block_contents = $this-&gt;get_block_contents($block_place);
-				if (in_array($block_ref, $block_contents))
-					return true;
-				
-				$block_contents[] = $block_ref;	
-				$this-&gt;raw_blocks[$block_place] = $block_contents;
-				update_option('hem_blocks', $this-&gt;raw_blocks);
-				wp_cache_flush(); // I was having caching issues
-				return true;
-			}
-			
-		function remove_block_in_place($block_place, $block_ref)
-			{
-				$block_contents = $this-&gt;get_block_contents($block_place);
-				if (!in_array($block_ref, $block_contents))
-					return true;
-				$key = array_search($block_ref, $block_contents);
-				unset($block_contents[$key]);
-				$this-&gt;raw_blocks[$block_place] = $block_contents;
-				update_option('hem_blocks', $this-&gt;raw_blocks);
-				wp_cache_flush(); // I was having caching issues
-				return true;
-			}
-			
-			// Templating functions
-			
-			function get_block_output($block_place)
-				{
-					global $hemingway;
-					$blocks = $this-&gt;get_block_contents($block_place);
-					foreach($blocks as $key =&gt; $block ){
-						include (TEMPLATEPATH . '/blocks/' . $block . '.php');
-					}
-				}
-				
-			function get_style(){
-				$this-&gt;style = get_option('hem_style');
-			}
-			
-			function date_format($slashes = false){
-				global $hemingway_options;
-				if ($slashes)
-					return $hemingway_options['international_dates'] == 1 ? 'd/m' : 'm/d'; 
-				else
-					return $hemingway_options['international_dates'] == 1 ? 'd.m' : 'm.d'; 
-			}
-			
-			// Excerpt cutting. I'd love to use the_excerpt_reloaded, but needless licensing prohibits me from doing so
-			function excerpt(){
-				echo $this-&gt;get_excerpt();
-			}
-			
-			function get_excerpt(){
-				global $post;
-				
-				$max_length = 75; // Maximum words.
-				
-				// If they've manually put in an excerpt, let it go!
-				if ($post-&gt;post_excerpt) return $post-&gt;post_excerpt;
-				
-				// Check to see if it's a password protected post
-				if ($post-&gt;post_password) {
-						if ($_COOKIE['wp-postpass_'.COOKIEHASH] != $post-&gt;post_password) {
-								if(is_feed()) {
-										return __('This is a protected post');
-								} else {
-										return  get_the_password_form();
-								}
-						}
-				}
-				
-				if( strpos($post-&gt;post_content, '&lt;!--more--&gt;') ) { // There's a more link
-            $temp_ex = explode('&lt;!--more--&gt;', $post-&gt;post_content, 2);
-            $excerpt =  $temp_ex[0];
-        } else {
-            $temp_ex = explode(' ', $post-&gt;post_content);  // Split up the spaces
-						$length = count($temp_ex) &lt; $max_length ? count($temp_ex) : $max_length;
-						for ($i=0; $i&lt;$length; $i++) $excerpt .= $temp_ex[$i] . ' ';
-        }
-        
-				
-				$excerpt = balanceTags($excerpt);
-				$excerpt = apply_filters('the_excerpt', $excerpt);
-				
-				return $excerpt;
-				
-			}
-	}
-	
-$hemingway = new Hemingway();
-
-$hemingway-&gt;version = &quot;0.17&quot;;
-// Options
-
-$default_blocks = Array(
-	'recent_entries' =&gt; 'Recent Entries',
-	'about_page' =&gt; 'About Page',
-	'category_listing' =&gt; 'Category Listing',
-	'blogroll' =&gt; 'Blogroll',
-	'pages' =&gt; 'Pages',
-	'monthly_archives' =&gt; 'Monthly Archives',
-	'related_posts' =&gt; 'Recent Entries',
-	'flickr_rss' =&gt; 'Flickr RSS'
-);
-
-$default_block_locations = Array(
-	'block_1' =&gt; Array('about_page'),
-	'block_2' =&gt; Array('recent_entries'),
-	'block_3' =&gt; Array('category_listing'),
-	'block_4' =&gt; Array(),
-	'block_5' =&gt; Array(),
-	'block_6' =&gt; Array()
-);
-
-$default_options = Array(
-	'international_dates' =&gt; 0
-);
-
-if (!get_option('hem_version') || get_option('hem_version') &lt; $hemingway-&gt;version){
-	// Hemingway isn't installed, so we'll need to add options
-	if (!get_option('hem_version') )
-		add_option('hem_version', $hemingway-&gt;version, 'Hemingway Version installed');
-	else
-		update_option('hem_version', $hemingway-&gt;version);
-		
-	if (!get_option('hem_available_blocks') ) 
-		add_option('hem_available_blocks', $default_blocks, 'A list of available blocks for Hemingway');
-	
-	if (!get_option('hem_blocks') ) 
-		add_option('hem_blocks', $default_block_locations, 'An array of blocks and their contents');
-	
-	if (!get_option('hem_style') )
-		add_option('hem_style', '', 'Location of custom style sheet');
-		
-	if (!get_option('hem_options') )
-		add_option('hem_options', $default_options, 'Location of custom style sheet');
-		
-	wp_cache_flush(); // I was having caching issues
-}
-
-// Stuff
-
-add_action ('admin_menu', 'hemingway_menu');
-
-$hem_loc = '../themes/' . basename(dirname($file)); 
-
-$hemingway-&gt;get_available_blocks();
-$hemingway-&gt;get_style();
-$hemingway_options = get_option('hem_options');
-
-// Ajax Stuff
-
-if ($_GET['hem_action'] == 'add_block'){
-	auth_redirect(); // Make sure they're logged in
-	$block_ref = $_GET['block_ref'];
-	$block_place = $_GET['block_place'];
-	
-	$block_name = $hemingway-&gt;available_blocks[$block_ref];
-	
-	$hemingway-&gt;add_block_to_place($block_place, $block_ref);
-
-	ob_end_clean(); // Kill preceding output
-	$output = '&lt;ul&gt;';
-	foreach($hemingway-&gt;get_block_contents($block_place) as $key =&gt; $block_ref){
-			$block_name = $hemingway-&gt;available_blocks[$block_ref];
-			$output .= '&lt;li&gt;' . $block_name . ' &lt;a href=&quot;#&quot; class=&quot;remove&quot; onclick=&quot;remove_block(\'' . $block_place . '\', \'' . $block_ref . '\'); return false&quot;&gt;remove&lt;/a&gt;&lt;/li&gt;';
-	}
-	$output .= '&lt;/ul&gt;';
-	echo $output;
-	exit(); // Kill any more output
-}
-
-if ($_GET['hem_action'] == 'remove_block'){
-	auth_redirect(); // Make sure they're logged in
-	$block_ref = $_GET['block_ref'];
-	$block_place = $_GET['block_place'];
-	
-	$hemingway-&gt;remove_block_in_place($block_place, $block_ref);
-
-	ob_end_clean(); // Kill preceding output
-	$output = '&lt;ul&gt;';
-	foreach($hemingway-&gt;get_block_contents($block_place) as $key =&gt; $block_ref){
-			$block_name = $hemingway-&gt;available_blocks[$block_ref];
-			$output .= '&lt;li&gt;' . $block_name . ' &lt;a href=&quot;#&quot; class=&quot;remove&quot; onclick=&quot;remove_block(\'' . $block_place . '\', \'' . $block_ref . '\'); return false&quot;&gt;remove&lt;/a&gt;&lt;/li&gt;';
-	}
-	$output .= '&lt;/ul&gt;';
-	echo $output;
-	exit(); // Kill any more output
-}
-
-
-function hemingway_menu() {
-	add_submenu_page('themes.php', 'Hemingway Options', 'Hemingway Options', 5, $hem_loc . 'functions.php', 'menu');
-}
-
-function menu() {
-
-	global $hem_loc, $hemingway, $message;
-	
-	if ($_POST['custom_styles']){
-		update_option('hem_style', $_POST['custom_styles']);
-		wp_cache_flush();
-		$hemingway-&gt;get_style();
-		$message  = 'Styles updated!';
-	}
-	
-	if ($_POST['block_ref']){
-		$hemingway-&gt;add_available_block($_POST['display_name'], $_POST['block_ref']);
-		$hemingway-&gt;get_available_blocks();
-		$message = 'Block added!';
-	}
-	
-	if ($_POST['reset'] == 1){
-		delete_option('hem_style');
-		delete_option('hem_blocks');
-		delete_option('hem_available_blocks');
-		delete_option('hem_version');
-		$message = 'Settings removed.';
-	}
-	
-	if ($_POST['misc_options']){
-		$hemingway_options['international_dates'] = $_POST['international_dates'];
-		update_option('hem_options', $hemingway_options);
-		wp_cache_flush();
-		$message  = 'Options updated!';
-	}
-
-
-?&gt;
-&lt;!--
-Okay, so I don't honestly know how legit this is, but I want a more intuitive interface
-so I'm going to import scriptaculous. There's a good chance this is going to mess stuff up
-for some people :)
---&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
-&lt;?php include (TEMPLATEPATH . '/admin/js/prototype.js'); ?&gt;
-&lt;?php include (TEMPLATEPATH . '/admin/js/dragdrop.js'); ?&gt;
-&lt;?php include (TEMPLATEPATH . '/admin/js/effects.js'); ?&gt;
-&lt;/script&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
-	function remove_block(block_place, block_ref){
-		url = 'themes.php?page=functions.php&amp;hem_action=remove_block&amp;block_place=' + block_place + '&amp;block_ref=' + block_ref;
-		new Ajax.Updater(block_place, url, 
-				{
-					evalScripts:true, asynchronous:true,
-					onComplete : function(request){
-						$('dropmessage').innerHTML = &quot;&lt;p&gt;Block removed!&lt;/p&gt;&quot;;
-						Effect.Appear('dropmessage', { queue: 'front' });
-						Effect.Fade('dropmessage', { queue: 'end' });
-					}
-				}
-		)
-	}
-&lt;/script&gt;
-&lt;style&gt;
-	.block{
-		width:200px;
-		height:200px;
-		border: 1px solid #bbb;
-		background-color: #f0f8ff;
-		float:left;
-		margin:20px 1em 20px 0;
-		padding:10px;
-		display:inline;
-	}
-	.block ul{
-		padding:0;
-		margin:0;
-	}
-	.block ul li{
-		margin:0 0 5px 0;
-		list-style-type:none;
-		border:1px solid #DDD;
-		background:#FbFbFb;
-		padding:4px 10px;
-		position:relative;
-	}
-	.block ul li a.remove{
-		position:absolute;
-		right:10px;
-		top:6px;
-		display:block;
-		text-decoration:none;
-		font-size:1px;
-		width:14px;
-		height:14px;
-		text-indent:-9999px;
-		background:url(&lt;?php bloginfo('stylesheet_directory'); ?&gt;/admin/images/icon_delete.gif) 0 0 no-repeat #FFF;
-		border:none;
-	}
-	* html .block ul li a.remove{ right:15px; }
-	.block-active{
-		border:1px solid #333;
-		background:#F2F8FF;
-	}
-	
-	#addables li{
-		list-style-type:none;
-		margin:1em 1em 1em 0;
-		background:#F5F5F5;
-		border:1px solid #CCC;
-		padding:3px;
-		width:215px;
-		float:left;
-		cursor:move;
-	}
-	ul#addables{
-		margin:0;
-		padding:0;
-		width:720px;
-		position:relative;
-	}
-&lt;/style&gt;
-
-
-
-
-&lt;? if($message) : ?&gt;
-&lt;div id=&quot;message&quot; class=&quot;updated fade&quot;&gt;&lt;p&gt;&lt;?=$message?&gt;&lt;/p&gt;&lt;/div&gt;
-&lt;? endif; ?&gt;
-&lt;div id=&quot;dropmessage&quot; class=&quot;updated&quot; style=&quot;display:none;&quot;&gt;&lt;/div&gt;
-&lt;div class=&quot;wrap&quot; style=&quot;position:relative;&quot;&gt;
-
-&lt;? if (get_option('hem_version')) : ?&gt;
-
-
-&lt;h2&gt;&lt;?php _e('Hemingway Options'); ?&gt;&lt;/h2&gt;
-
-&lt;h3&gt;Custom Styles&lt;/h3&gt;
-&lt;p&gt;Select a style from the dropdown below to customize hemingway with a special style.&lt;/p&gt;
-&lt;form name=&quot;dofollow&quot; action=&quot;&quot; method=&quot;post&quot;&gt;
-  &lt;input type=&quot;hidden&quot; name=&quot;page_options&quot; value=&quot;'dofollow_timeout'&quot; /&gt;
-	&lt;select name=&quot;custom_styles&quot;&gt;
-	&lt;option value=&quot;none&quot;&lt;?php if ($hemingway-&gt;style == 'none') echo 'selected=&quot;selected&quot;'; ?&gt;&gt;No Custom Style&lt;/option&gt;
-	&lt;?php
-		$scheme_dir = @ dir(ABSPATH . '/wp-content/themes/' . get_template() . '/styles');
-	
-		if ($scheme_dir) {
-			while(($file = $scheme_dir-&gt;read()) !== false) {
-					if (!preg_match('|^\.+$|', $file) &amp;&amp; preg_match('|\.css$|', $file)) 
-					$scheme_files[] = $file;
-				}
-			}
-			if ($scheme_dir || $scheme_files) {
-				foreach($scheme_files as $scheme_file) {
-				if ($scheme_file == $hemingway-&gt;style){
-					$selected = ' selected=&quot;selected&quot;';
-				}else{
-					$selected = &quot;&quot;;
-				}
-				echo '&lt;option value=&quot;' . $scheme_file . '&quot;' . $selected . '&gt;' . $scheme_file . '&lt;/option&gt;';
-			}
-		} 
-		?&gt;
-	&lt;/select&gt;
-
-	&lt;input type=&quot;submit&quot; value=&quot;Save&quot; /&gt;
-&lt;/form&gt;
-
-&lt;h3&gt;Hemingway's Bottombar&amp;trade;&lt;/h3&gt;
-&lt;p&gt;Drag and drop the different blocks into their place below. After you drag the block to the area, it will update with the new contents automatically.&lt;/p&gt;
-&lt;ul id=&quot;addables&quot;&gt;
-	&lt;? foreach($hemingway-&gt;available_blocks as $ref =&gt; $name) : ?&gt;
-	&lt;li id=&quot;&lt;?= $ref ?&gt;&quot; class=&quot;blocks&quot;&gt;&lt;?= $name ?&gt;&lt;/li&gt;
-	&lt;script type=&quot;text/javascript&quot;&gt;new Draggable('&lt;?= $ref ?&gt;', {revert:true})&lt;/script&gt;
-	&lt;? endforeach; ?&gt;
-&lt;/ul&gt;
-
-&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
-
-&lt;div class=&quot;block&quot; id=&quot;block_1&quot;&gt;
-	&lt;ul&gt;
-		&lt;? 
-		foreach($hemingway-&gt;get_block_contents('block_1') as $key =&gt; $block_ref) :
-			$block_name = $hemingway-&gt;available_blocks[$block_ref];
-		?&gt;
-			&lt;li&gt;&lt;?= $block_name ?&gt; &lt;a href=&quot;#&quot; class=&quot;remove&quot; onclick=&quot;remove_block('block_1', '&lt;?=$block_ref?&gt;'); return false&quot;&gt;remove&lt;/a&gt;&lt;/li&gt;
-		&lt;? endforeach; ?&gt;
-	&lt;/ul&gt;
-&lt;/div&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
-Droppables.add(
-	'block_1', {
-		accept:'blocks', 
-		onDrop:function(element){
-			new Ajax.Updater('block_1', 'themes.php?page=functions.php&amp;hem_action=add_block&amp;block_place=block_1&amp;block_ref=' + element.id, 
-				{
-					evalScripts:true, asynchronous:true,
-					onComplete : function(request){
-						$('dropmessage').innerHTML = &quot;&lt;p&gt;Block added!&lt;/p&gt;&quot;;
-						Effect.Appear('dropmessage', { queue: 'front' });
-						Effect.Fade('dropmessage', { queue: 'end' });
-					}
-				}
-			)
-		}, 
-		hoverclass:'block-active'
-	}
-)
-&lt;/script&gt;
-
-&lt;div class=&quot;block&quot; id=&quot;block_2&quot;&gt;
-	&lt;ul&gt;
-		&lt;? 
-		foreach($hemingway-&gt;get_block_contents('block_2') as $key =&gt; $block_ref) :
-			$block_name = $hemingway-&gt;available_blocks[$block_ref];
-		?&gt;
-			&lt;li&gt;&lt;?= $block_name ?&gt; &lt;a href=&quot;#&quot; class=&quot;remove&quot; onclick=&quot;remove_block('block_2', '&lt;?=$block_ref?&gt;'); return false&quot;&gt;remove&lt;/a&gt;&lt;/li&gt;
-		&lt;? endforeach; ?&gt;
-	&lt;/ul&gt;
-&lt;/div&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
-Droppables.add(
-	'block_2', {
-		accept:'blocks', 
-		onDrop:function(element){
-			new Ajax.Updater('block_2', 'themes.php?page=functions.php&amp;hem_action=add_block&amp;block_place=block_2&amp;block_ref=' + element.id, 
-				{
-					evalScripts:true, asynchronous:true,
-					onComplete : function(request){
-						$('dropmessage').innerHTML = &quot;&lt;p&gt;Block added!&lt;/p&gt;&quot;;
-						Effect.Appear('dropmessage', { queue: 'front' });
-						Effect.Fade('dropmessage', { queue: 'end' });
-					}
-				}
-			)
-		}, 
-		hoverclass:'block-active'
-	}
-)
-&lt;/script&gt;
-
-&lt;div class=&quot;block&quot; id=&quot;block_3&quot;&gt;
-	&lt;ul&gt;
-		&lt;? 
-		foreach($hemingway-&gt;get_block_contents('block_3') as $key =&gt; $block_ref) :
-			$block_name = $hemingway-&gt;available_blocks[$block_ref];
-		?&gt;
-			&lt;li&gt;&lt;?= $block_name ?&gt; &lt;a href=&quot;#&quot; class=&quot;remove&quot; onclick=&quot;remove_block('block_3', '&lt;?=$block_ref?&gt;'); return false&quot;&gt;remove&lt;/a&gt;&lt;/li&gt;
-		&lt;? endforeach; ?&gt;
-	&lt;/ul&gt;
-&lt;/div&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
-Droppables.add(
-	'block_3', {
-		accept:'blocks', 
-		onDrop:function(element){
-			new Ajax.Updater('block_3', 'themes.php?page=functions.php&amp;hem_action=add_block&amp;block_place=block_3&amp;block_ref=' + element.id, 
-				{
-					evalScripts:true, asynchronous:true,
-					onComplete : function(request){
-						$('dropmessage').innerHTML = &quot;&lt;p&gt;Block added!&lt;/p&gt;&quot;;
-						Effect.Appear('dropmessage', { queue: 'front' });
-						Effect.Fade('dropmessage', { queue: 'end' });
-					}
-				}
-			)
-		}, 
-		hoverclass:'block-active'
-	}
-)
-&lt;/script&gt;
-
-&lt;!-- Maybe later...
-
-
-&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
-
-&lt;div class=&quot;block&quot; id=&quot;block_4&quot;&gt;
-	Block 4
-	&lt;ul&gt;
-		&lt;? 
-		foreach($hemingway-&gt;get_block_contents('block_4') as $key =&gt; $block_ref) :
-			$block_name = $hemingway-&gt;available_blocks[$block_ref];
-		?&gt;
-			&lt;li&gt;&lt;?= $block_name ?&gt; (&lt;a href=&quot;#&quot; onclick=&quot;remove_block('block_4', '&lt;?=$block_ref?&gt;');&quot;&gt;remove&lt;/a&gt;)&lt;/li&gt;
-		&lt;? endforeach; ?&gt;
-	&lt;/ul&gt;
-&lt;/div&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
-Droppables.add(
-	'block_4', {
-		accept:'blocks', 
-		onDrop:function(element){
-			new Ajax.Updater('block_4', 'themes.php?page=functions.php&amp;hem_action=add_block&amp;block_place=block_4&amp;block_ref=' + element.id, 
-				{
-					evalScripts:true, asynchronous:true
-				}
-			)
-		}, 
-		hoverclass:'block-active'
-	}
-)
-&lt;/script&gt;
-
-&lt;div class=&quot;block&quot; id=&quot;block_5&quot;&gt;
-	Block 5
-	&lt;ul&gt;
-		&lt;? 
-		foreach($hemingway-&gt;get_block_contents('block_5') as $key =&gt; $block_ref) :
-			$block_name = $hemingway-&gt;available_blocks[$block_ref];
-		?&gt;
-			&lt;li&gt;&lt;?= $block_name ?&gt; (&lt;a href=&quot;#&quot; onclick=&quot;remove_block('block_5', '&lt;?=$block_ref?&gt;');&quot;&gt;remove&lt;/a&gt;)&lt;/li&gt;
-		&lt;? endforeach; ?&gt;
-	&lt;/ul&gt;
-&lt;/div&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
-Droppables.add(
-	'block_5', {
-		accept:'blocks', 
-		onDrop:function(element){
-			new Ajax.Updater('block_5', 'themes.php?page=functions.php&amp;hem_action=add_block&amp;block_place=block_5&amp;block_ref=' + element.id, 
-				{
-					evalScripts:true, asynchronous:true
-				}
-			)
-		}, 
-		hoverclass:'block-active'
-	}
-)
-&lt;/script&gt;
-
-&lt;div class=&quot;block&quot; id=&quot;block_6&quot;&gt;
-	Block 6
-	&lt;ul&gt;
-		&lt;? 
-		foreach($hemingway-&gt;get_block_contents('block_6') as $key =&gt; $block_ref) :
-			$block_name = $hemingway-&gt;available_blocks[$block_ref];
-		?&gt;
-			&lt;li&gt;&lt;?= $block_name ?&gt; (&lt;a href=&quot;#&quot; onclick=&quot;remove_block('block_6', '&lt;?=$block_ref?&gt;');&quot;&gt;remove&lt;/a&gt;)&lt;/li&gt;
-		&lt;? endforeach; ?&gt;
-	&lt;/ul&gt;
-&lt;/div&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
-Droppables.add(
-	'block_6', {
-		accept:'blocks', 
-		onDrop:function(element){
-			new Ajax.Updater('block_6', 'themes.php?page=functions.php&amp;hem_action=add_block&amp;block_place=block_6&amp;block_ref=' + element.id, 
-				{
-					evalScripts:true, asynchronous:true
-				}
-			)
-		}, 
-		hoverclass:'block-active'
-	}
-)
-&lt;/script&gt;
---&gt;
-
-&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
-
-	&lt;?php
-		$blocks_dir = @ dir(ABSPATH . '/wp-content/themes/' . get_template() . '/blocks');
-	
-		if ($blocks_dir) {
-			while(($file = $blocks_dir-&gt;read()) !== false) {
-					if (!preg_match('|^\.+$|', $file) &amp;&amp; preg_match('|\.php$|', $file)) 
-					$blocks_files[] = $file;
-				}
-			}
-			if ($blocks_dir || $blocks_files) {
-				foreach($blocks_files as $blocks_file) {
-				$block_ref = preg_replace('/\.php/', '', $blocks_file);
-				if (!array_key_exists($block_ref, $hemingway-&gt;available_blocks)){
-				?&gt;
-				&lt;h3&gt;You have uninstalled blocks!&lt;/h3&gt;
-				&lt;p&gt;Give the block &lt;strong&gt;&lt;?=$block_ref ?&gt;&lt;/strong&gt; a display name (such as &quot;About Page&quot;)&lt;/p&gt;
-				&lt;form action=&quot;&quot; name=&quot;dofollow&quot; method=&quot;post&quot;&gt;
-					&lt;input type=&quot;hidden&quot; name=&quot;block_ref&quot; value=&quot;&lt;?=$block_ref?&gt;&quot; /&gt;
-					&lt;?=$block_ref ?&gt; : &lt;input type=&quot;text&quot; name=&quot;display_name&quot; /&gt;
-					&lt;input type=&quot;submit&quot; value=&quot;Save&quot; /&gt;
-				&lt;/form&gt;
-				&lt;?
-				}
-			}
-		} 
-		?&gt;
-
-
-&lt;h3&gt;Miscellaneous Options&lt;/h3&gt;
-&lt;form name=&quot;dofollow&quot; action=&quot;&quot; method=&quot;post&quot;&gt;
-&lt;input type=&quot;hidden&quot; name=&quot;misc_options&quot; value=&quot;1&quot; /&gt;
-&lt;p&gt;&lt;label&gt;&lt;input type=&quot;checkbox&quot; value=&quot;1&quot; name=&quot;international_dates&quot; &lt;? if ($hemingway_options['international_dates'] == 1) echo &quot;checked=\&quot;checked\&quot;&quot;; ?&gt; /&gt; Use international dates? (day/month/year)&lt;/label&gt;&lt;/p&gt;
-&lt;p&gt;&lt;input type=&quot;submit&quot; value=&quot;Save my options&quot; /&gt;&lt;/p&gt;
-&lt;/form&gt;
-
-&lt;h3&gt;Reset / Uninstall&lt;/h3&gt;
-&lt;form action=&quot;&quot; method=&quot;post&quot; onsubmit=&quot;return confirm('Are you sure you want to reset all of your settings?')&quot;&gt;
-&lt;input type=&quot;hidden&quot; name=&quot;reset&quot; value=&quot;1&quot; /&gt;
-&lt;p&gt;If you would like to reset or uninstall Hemingway, push this button. It will erase all of your preferences. &lt;input type=&quot;submit&quot; value=&quot;Reset&quot; /&gt;&lt;/p&gt;
-&lt;/form&gt;
-
-&lt;? else: ?&gt;
-&lt;p&gt;Thank you for using Hemingway!  There's two reasons you might be seeing this:&lt;/p&gt;
-&lt;ol&gt;
-	&lt;li&gt;You've just installed Hemingway for the first time: If this is the case, simply reload this page or click on Hemingway Options again and you'll be on your way!&lt;/li&gt;
-	&lt;li&gt;You've just uninstalled Hemingway or reset your options. If you'd like to keep using Hemingway, reload this page or click on Hemingway Options again.&lt;/li&gt;
-&lt;/ol&gt;
-&lt;? endif; ?&gt;
-
-&lt;/div&gt;
-
-&lt;?php
-}
-?&gt;
\ No newline at end of file
+&lt;?php
+
+$themecolors = array(
+	'bg' =&gt; '000000',
+	'text' =&gt; 'bfbfbf',
+	'link' =&gt; 'ffffff',
+	'border' =&gt; '000000'
+	);
+
+// this varies but the single page content width seems to be 607px max
+$content_width = 600;
+
+class Hemingway
+	{
+		
+		var $raw_blocks;
+		var $available_blocks;
+		var $style;
+		var $version;
+		
+		function add_available_block($block_name, $block_ref)
+			{
+
+				$blocks = $this-&gt;available_blocks;
+				
+				if (!$blocks[$block_ref]){
+					$blocks[$block_ref] = $block_name;
+					update_option('hem_available_blocks', $blocks);
+					wp_cache_flush();
+				}
+				
+			}
+		
+		function get_available_blocks()
+			// This function returns an array of available blocks
+			// in the format of $arr[block_ref] = block_name
+			{				
+				$this-&gt;available_blocks = get_option('hem_available_blocks');
+				return $this-&gt;available_blocks;
+			}
+		
+		function get_block_contents($block_place)
+			// Returns an array of block_refs in specififed block
+			{
+				if (!$this-&gt;raw_blocks){
+					$this-&gt;raw_blocks = get_option('hem_blocks');
+				}
+				return $this-&gt;raw_blocks[$block_place];
+			}
+		
+		function add_block_to_place($block_place, $block_ref)
+			{
+				$block_contents = $this-&gt;get_block_contents($block_place);
+				if (in_array($block_ref, $block_contents))
+					return true;
+				
+				$block_contents[] = $block_ref;	
+				$this-&gt;raw_blocks[$block_place] = $block_contents;
+				update_option('hem_blocks', $this-&gt;raw_blocks);
+				wp_cache_flush(); // I was having caching issues
+				return true;
+			}
+			
+		function remove_block_in_place($block_place, $block_ref)
+			{
+				$block_contents = $this-&gt;get_block_contents($block_place);
+				if (!in_array($block_ref, $block_contents))
+					return true;
+				$key = array_search($block_ref, $block_contents);
+				unset($block_contents[$key]);
+				$this-&gt;raw_blocks[$block_place] = $block_contents;
+				update_option('hem_blocks', $this-&gt;raw_blocks);
+				wp_cache_flush(); // I was having caching issues
+				return true;
+			}
+			
+			// Templating functions
+			
+			function get_block_output($block_place)
+				{
+					$blocks = $this-&gt;get_block_contents($block_place);
+					foreach($blocks as $key =&gt; $block ){
+						include (TEMPLATEPATH . '/blocks/' . $block . '.php');
+					}
+				}
+				
+			function get_style(){
+				$this-&gt;style = get_option('hem_style');
+			}
+	}
+	
+$hemingway = new Hemingway();
+$hemingway-&gt;get_available_blocks();
+$hemingway-&gt;get_style();
+
+$hemingway-&gt;version = &quot;0.13&quot;;
+// Options
+
+$default_blocks = Array(
+	'recent_entries' =&gt; 'Recent Entries',
+	'about_page' =&gt; 'About Page',
+	'category_listing' =&gt; 'Category Listing',
+	'blogroll' =&gt; 'Blogroll',
+	'pages' =&gt; 'Pages',
+	'monthly_archives' =&gt; 'Monthly Archives'
+);
+
+$default_block_locations = Array(
+	'block_1' =&gt; Array('about_page'),
+	'block_2' =&gt; Array('recent_entries'),
+	'block_3' =&gt; Array('category_listing'),
+	'block_4' =&gt; Array(),
+	'block_5' =&gt; Array(),
+	'block_6' =&gt; Array()
+);
+
+if (!get_option('hem_version') || get_option('hem_version') &lt; $hemingway-&gt;version){
+	// Hemingway isn't installed, so we'll need to add options
+	if (!get_option('hem_version') )
+		add_option('hem_version', $hemingway-&gt;version, 'Hemingway Version installed');
+	else
+		update_option('hem_version', $hemingway-&gt;version);
+		
+	if (!get_option('hem_available_blocks') ) 
+		add_option('hem_available_blocks', $default_blocks, 'A list of available blocks for Hemingway');
+	
+	if (!get_option('hem_blocks') ) 
+		add_option('hem_blocks', $default_block_locations, 'An array of blocks and their contents');
+	
+	if (!get_option('hem_style') )
+		add_option('hem_style', '', 'Location of custom style sheet');
+}
+// Ajax Stuff
+
+if ($_GET['hem_action'] == 'add_block'){
+	
+	$block_ref = $_GET['block_ref'];
+	$block_place = $_GET['block_place'];
+	
+	$block_name = $hemingway-&gt;available_blocks[$block_ref];
+	
+	$hemingway-&gt;add_block_to_place($block_place, $block_ref);
+
+	ob_end_clean(); // Kill preceding output
+	$output = '&lt;ul&gt;';
+	foreach($hemingway-&gt;get_block_contents($block_place) as $key =&gt; $block_ref){
+			$block_name = $hemingway-&gt;available_blocks[$block_ref];
+			$output .= '&lt;li&gt;' . $block_name . ' (&lt;a href=&quot;#&quot; onclick=&quot;remove_block(\'' . $block_place . '\', \'' . $block_ref . '\');&quot;&gt;remove&lt;/a&gt;)&lt;/li&gt;';
+	}
+	$output .= '&lt;/ul&gt;';
+	echo $output;
+	exit(); // Kill any more output
+}
+
+if ($_GET['hem_action'] == 'remove_block'){
+	
+	$block_ref = $_GET['block_ref'];
+	$block_place = $_GET['block_place'];
+	
+	$hemingway-&gt;remove_block_in_place($block_place, $block_ref);
+
+	ob_end_clean(); // Kill preceding output
+	$output = '&lt;ul&gt;';
+	foreach($hemingway-&gt;get_block_contents($block_place) as $key =&gt; $block_ref){
+			$block_name = $hemingway-&gt;available_blocks[$block_ref];
+			$output .= '&lt;li&gt;' . $block_name . ' (&lt;a href=&quot;#&quot; onclick=&quot;remove_block(\'' . $block_place . '\', \'' . $block_ref . '\');&quot;&gt;remove&lt;/a&gt;)&lt;/li&gt;';
+	}
+	$output .= '&lt;/ul&gt;';
+	echo $output;
+	exit(); // Kill any more output
+}
+
+if ($_POST['custom_styles']){
+	update_option('hem_style', $_POST['custom_styles']);
+	wp_cache_flush();
+	$message  = 'Styles updated!';
+}
+
+if ($_POST['block_ref']){
+	$hemingway-&gt;add_available_block($_POST['display_name'], $_POST['block_ref']);
+	$hemingway-&gt;get_available_blocks();
+	$message = 'Block added!';
+}
+
+// Stuff
+
+add_action ('admin_menu', 'hemingway_menu');
+
+$hem_loc = '../themes/' . basename(dirname($file)); 
+
+function hemingway_scripts() {
+	$dir = get_bloginfo('template_directory');
+	wp_enqueue_script('prototype');
+	wp_enqueue_script('dragdrop', $dir . '/admin/js/dragdrop.js', false, 1);
+	wp_enqueue_script('effects', $dir . '/admin/js/effects.js', false, 1);
+}
+
+function hemingway_menu() {
+	$page = add_submenu_page('themes.php', 'Hemingway Options', 'Hemingway Options', 5, $hem_loc . 'functions.php', 'menu');
+	add_action('load-' . $page, 'hemingway_scripts');
+}
+
+function menu() {
+global $hem_loc, $hemingway, $message;
+?&gt;
+&lt;!--
+Okay, so I don't honestly know how legit this is, but I want a more intuitive interface
+so I'm going to import scriptaculous. There's a good chance this is going to mess stuff up
+for some people :)
+--&gt;
+&lt;script type=&quot;text/javascript&quot;&gt;
+	function remove_block(block_place, block_ref){
+		url = 'themes.php?page=functions.php&amp;hem_action=remove_block&amp;block_place=' + block_place + '&amp;block_ref=' + block_ref;
+		new Ajax.Updater(block_place, url, 
+				{
+					evalScripts:true, asynchronous:true
+				}
+		)
+	}
+&lt;/script&gt;
+&lt;style&gt;
+	.block{
+		width:200px;
+		height:200px;
+		border:1px solid #CCC;
+		float:left;
+		margin:20px 1em 20px 0;
+		padding:10px;
+		display:inline;
+	}
+	.block ul{
+		padding:0;
+		margin:0;
+	}
+	.block ul li{
+		margin:0 0 5px 0;
+		list-style-type:none;
+	}
+	.block-active{
+		border:1px solid #333;
+		background:#F2F8FF;
+	}
+	
+	#addables li{
+		list-style-type:none;
+		margin:1em 1em 1em 0;
+		background:#EAEAEA;
+		border:1px solid #DDD;
+		padding:3px;
+		width:215px;
+		float:left;
+		cursor:move;
+	}
+	ul#addables{
+		margin:0;
+		padding:0;
+		width:720px;
+		position:relative;
+	}
+&lt;/style&gt;
+
+
+
+
+&lt;? if($message) : ?&gt;
+&lt;div id=&quot;message&quot; class=&quot;updated fade&quot;&gt;&lt;p&gt;&lt;?=$message?&gt;&lt;/p&gt;&lt;/div&gt;
+&lt;? endif; ?&gt;
+
+&lt;div class=&quot;wrap&quot; style=&quot;position:relative;&quot;&gt;
+&lt;h2&gt;&lt;?php _e('Hemingway Options'); ?&gt;&lt;/h2&gt;
+
+&lt;h3&gt;Color Options&lt;/h3&gt;
+&lt;p&gt;Choose a primary color for your site:&lt;/p&gt;
+&lt;form name=&quot;dofollow&quot; action=&quot;&quot; method=&quot;post&quot;&gt;
+  &lt;input type=&quot;hidden&quot; name=&quot;page_options&quot; value=&quot;'dofollow_timeout'&quot; /&gt;
+
+  &lt;p&gt;&lt;label&gt;&lt;input name=&quot;custom_styles&quot; type=&quot;radio&quot; value=&quot;none&quot; &lt;?php if ($hemingway-&gt;style == 'none') echo 'checked=&quot;checked&quot;'; ?&gt; /&gt; 
+  Black&lt;/label&gt;&lt;/p&gt;
+  &lt;p&gt;&lt;label&gt;&lt;input name=&quot;custom_styles&quot; type=&quot;radio&quot; value=&quot;white.css&quot; &lt;?php if ($hemingway-&gt;style == 'white.css') echo 'checked=&quot;checked&quot;'; ?&gt; /&gt; White&lt;/label&gt;&lt;/p&gt;
+
+	&lt;input type=&quot;submit&quot; value=&quot;Update Color &amp;raquo;&quot; /&gt;
+&lt;/form&gt;
+
+&lt;h3&gt;Hemingway's Bottombar&amp;trade;&lt;/h3&gt;
+&lt;p&gt;Drag and drop the different blocks into their place below. After you drag the block to the area, it will update with the new contents automatically.&lt;/p&gt;
+
+&lt;ul id=&quot;addables&quot;&gt;
+	&lt;? foreach($hemingway-&gt;available_blocks as $ref =&gt; $name) : ?&gt;
+	&lt;li id=&quot;&lt;?= $ref ?&gt;&quot; class=&quot;blocks&quot;&gt;&lt;?= $name ?&gt;&lt;/li&gt;
+	&lt;script type=&quot;text/javascript&quot;&gt;new Draggable('&lt;?= $ref ?&gt;', {revert:true})&lt;/script&gt;
+	&lt;? endforeach; ?&gt;
+&lt;/ul&gt;
+
+&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
+
+&lt;div class=&quot;block&quot; id=&quot;block_1&quot;&gt;
+	&lt;ul&gt;
+		&lt;? 
+		foreach($hemingway-&gt;get_block_contents('block_1') as $key =&gt; $block_ref) :
+			$block_name = $hemingway-&gt;available_blocks[$block_ref];
+		?&gt;
+			&lt;li&gt;&lt;?= $block_name ?&gt; (&lt;a href=&quot;#&quot; onclick=&quot;remove_block('block_1', '&lt;?=$block_ref?&gt;');&quot;&gt;remove&lt;/a&gt;)&lt;/li&gt;
+		&lt;? endforeach; ?&gt;
+	&lt;/ul&gt;
+&lt;/div&gt;
+&lt;script type=&quot;text/javascript&quot;&gt;
+Droppables.add(
+	'block_1', {
+		accept:'blocks', 
+		onDrop:function(element){
+			new Ajax.Updater('block_1', 'themes.php?page=functions.php&amp;hem_action=add_block&amp;block_place=block_1&amp;block_ref=' + element.id, 
+				{
+					evalScripts:true, asynchronous:true
+				}
+			)
+		}, 
+		hoverclass:'block-active'
+	}
+)
+&lt;/script&gt;
+
+&lt;div class=&quot;block&quot; id=&quot;block_2&quot;&gt;
+	&lt;ul&gt;
+		&lt;? 
+		foreach($hemingway-&gt;get_block_contents('block_2') as $key =&gt; $block_ref) :
+			$block_name = $hemingway-&gt;available_blocks[$block_ref];
+		?&gt;
+			&lt;li&gt;&lt;?= $block_name ?&gt; (&lt;a href=&quot;#&quot; onclick=&quot;remove_block('block_2', '&lt;?=$block_ref?&gt;');&quot;&gt;remove&lt;/a&gt;)&lt;/li&gt;
+		&lt;? endforeach; ?&gt;
+	&lt;/ul&gt;
+&lt;/div&gt;
+&lt;script type=&quot;text/javascript&quot;&gt;
+Droppables.add(
+	'block_2', {
+		accept:'blocks', 
+		onDrop:function(element){
+			new Ajax.Updater('block_2', 'themes.php?page=functions.php&amp;hem_action=add_block&amp;block_place=block_2&amp;block_ref=' + element.id, 
+				{
+					evalScripts:true, asynchronous:true
+				}
+			)
+		}, 
+		hoverclass:'block-active'
+	}
+)
+&lt;/script&gt;
+
+&lt;div class=&quot;block&quot; id=&quot;block_3&quot;&gt;
+	&lt;ul&gt;
+		&lt;? 
+		foreach($hemingway-&gt;get_block_contents('block_3') as $key =&gt; $block_ref) :
+			$block_name = $hemingway-&gt;available_blocks[$block_ref];
+		?&gt;
+			&lt;li&gt;&lt;?= $block_name ?&gt; (&lt;a href=&quot;#&quot; onclick=&quot;remove_block('block_3', '&lt;?=$block_ref?&gt;');&quot;&gt;remove&lt;/a&gt;)&lt;/li&gt;
+		&lt;? endforeach; ?&gt;
+	&lt;/ul&gt;
+&lt;/div&gt;
+&lt;script type=&quot;text/javascript&quot;&gt;
+Droppables.add(
+	'block_3', {
+		accept:'blocks', 
+		onDrop:function(element){
+			new Ajax.Updater('block_3', 'themes.php?page=functions.php&amp;hem_action=add_block&amp;block_place=block_3&amp;block_ref=' + element.id, 
+				{
+					evalScripts:true, asynchronous:true
+				}
+			)
+		}, 
+		hoverclass:'block-active'
+	}
+)
+&lt;/script&gt;
+
+&lt;!-- Maybe later...
+
+
+&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
+
+&lt;div class=&quot;block&quot; id=&quot;block_4&quot;&gt;
+	Block 4
+	&lt;ul&gt;
+		&lt;? 
+		foreach($hemingway-&gt;get_block_contents('block_4') as $key =&gt; $block_ref) :
+			$block_name = $hemingway-&gt;available_blocks[$block_ref];
+		?&gt;
+			&lt;li&gt;&lt;?= $block_name ?&gt; (&lt;a href=&quot;#&quot; onclick=&quot;remove_block('block_4', '&lt;?=$block_ref?&gt;');&quot;&gt;remove&lt;/a&gt;)&lt;/li&gt;
+		&lt;? endforeach; ?&gt;
+	&lt;/ul&gt;
+&lt;/div&gt;
+&lt;script type=&quot;text/javascript&quot;&gt;
+Droppables.add(
+	'block_4', {
+		accept:'blocks', 
+		onDrop:function(element){
+			new Ajax.Updater('block_4', 'themes.php?page=functions.php&amp;hem_action=add_block&amp;block_place=block_4&amp;block_ref=' + element.id, 
+				{
+					evalScripts:true, asynchronous:true
+				}
+			)
+		}, 
+		hoverclass:'block-active'
+	}
+)
+&lt;/script&gt;
+
+&lt;div class=&quot;block&quot; id=&quot;block_5&quot;&gt;
+	Block 5
+	&lt;ul&gt;
+		&lt;? 
+		foreach($hemingway-&gt;get_block_contents('block_5') as $key =&gt; $block_ref) :
+			$block_name = $hemingway-&gt;available_blocks[$block_ref];
+		?&gt;
+			&lt;li&gt;&lt;?= $block_name ?&gt; (&lt;a href=&quot;#&quot; onclick=&quot;remove_block('block_5', '&lt;?=$block_ref?&gt;');&quot;&gt;remove&lt;/a&gt;)&lt;/li&gt;
+		&lt;? endforeach; ?&gt;
+	&lt;/ul&gt;
+&lt;/div&gt;
+&lt;script type=&quot;text/javascript&quot;&gt;
+Droppables.add(
+	'block_5', {
+		accept:'blocks', 
+		onDrop:function(element){
+			new Ajax.Updater('block_5', 'themes.php?page=functions.php&amp;hem_action=add_block&amp;block_place=block_5&amp;block_ref=' + element.id, 
+				{
+					evalScripts:true, asynchronous:true
+				}
+			)
+		}, 
+		hoverclass:'block-active'
+	}
+)
+&lt;/script&gt;
+
+&lt;div class=&quot;block&quot; id=&quot;block_6&quot;&gt;
+	Block 6
+	&lt;ul&gt;
+		&lt;? 
+		foreach($hemingway-&gt;get_block_contents('block_6') as $key =&gt; $block_ref) :
+			$block_name = $hemingway-&gt;available_blocks[$block_ref];
+		?&gt;
+			&lt;li&gt;&lt;?= $block_name ?&gt; (&lt;a href=&quot;#&quot; onclick=&quot;remove_block('block_6', '&lt;?=$block_ref?&gt;');&quot;&gt;remove&lt;/a&gt;)&lt;/li&gt;
+		&lt;? endforeach; ?&gt;
+	&lt;/ul&gt;
+&lt;/div&gt;
+&lt;script type=&quot;text/javascript&quot;&gt;
+Droppables.add(
+	'block_6', {
+		accept:'blocks', 
+		onDrop:function(element){
+			new Ajax.Updater('block_6', 'themes.php?page=functions.php&amp;hem_action=add_block&amp;block_place=block_6&amp;block_ref=' + element.id, 
+				{
+					evalScripts:true, asynchronous:true
+				}
+			)
+		}, 
+		hoverclass:'block-active'
+	}
+)
+&lt;/script&gt;
+--&gt;
+
+&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
+
+	&lt;?php
+		$blocks_dir = @ dir(ABSPATH . '/wp-content/themes/' . get_template() . '/blocks');
+	
+		if ($blocks_dir) {
+			while(($file = $blocks_dir-&gt;read()) !== false) {
+					if (!preg_match('|^\.+$|', $file) &amp;&amp; preg_match('|\.php$|', $file)) 
+					$blocks_files[] = $file;
+				}
+			}
+			if ($blocks_dir || $blocks_files) {
+				foreach($blocks_files as $blocks_file) {
+				$block_ref = preg_replace('/\.php/', '', $blocks_file);
+				if (!array_key_exists($block_ref, $hemingway-&gt;available_blocks)){
+				?&gt;
+				&lt;h3&gt;You have uninstalled blocks!&lt;/h3&gt;
+				&lt;p&gt;Give the block &lt;strong&gt;&lt;?=$block_ref ?&gt;&lt;/strong&gt; a display name (such as &quot;About Page&quot;)&lt;/p&gt;
+				&lt;form action=&quot;&quot; name=&quot;dofollow&quot; method=&quot;post&quot;&gt;
+					&lt;input type=&quot;hidden&quot; name=&quot;block_ref&quot; value=&quot;&lt;?=$block_ref?&gt;&quot; /&gt;
+					&lt;?=$block_ref ?&gt; : &lt;input type=&quot;text&quot; name=&quot;display_name&quot; /&gt;
+					&lt;input type=&quot;submit&quot; value=&quot;Save&quot; /&gt;
+				&lt;/form&gt;
+				&lt;?
+				}
+			}
+		} 
+		?&gt;
+
+
+
+
+&lt;/div&gt;
+
+&lt;?php
+}
+?&gt;</diff>
      <filename>functions.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,40 +1,39 @@
-&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;
-&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot;&gt;
-
-&lt;head profile=&quot;http://gmpg.org/xfn/11&quot;&gt;
-&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;&lt;?php bloginfo('html_type'); ?&gt;; charset=&lt;?php bloginfo('charset'); ?&gt;&quot; /&gt;
-
-&lt;title&gt;&lt;?php bloginfo('name'); ?&gt; &lt;?php if ( is_single() ) { ?&gt; &amp;raquo; Blog Archive &lt;?php } ?&gt; &lt;?php wp_title(); ?&gt;&lt;/title&gt;
-
-&lt;meta name=&quot;generator&quot; content=&quot;WordPress &lt;?php bloginfo('version'); ?&gt;&quot; /&gt; &lt;!-- leave this for stats --&gt;
-
-&lt;link rel=&quot;stylesheet&quot; href=&quot;&lt;?php bloginfo('stylesheet_url'); ?&gt;&quot; type=&quot;text/css&quot; media=&quot;screen&quot; /&gt;
-
-&lt;?php
-	global $hemingway;
-	if ($hemingway-&gt;style != 'none') :
-?&gt;
-&lt;link rel=&quot;stylesheet&quot; href=&quot;&lt;?php bloginfo('stylesheet_directory'); ?&gt;/styles/&lt;?= $hemingway-&gt;style ?&gt;&quot; type=&quot;text/css&quot; media=&quot;screen&quot; /&gt;
-
-&lt;?php endif; ?&gt;
-
-&lt;link rel=&quot;alternate&quot; type=&quot;application/rss+xml&quot; title=&quot;&lt;?php bloginfo('name'); ?&gt; RSS Feed&quot; href=&quot;&lt;?php bloginfo('rss2_url'); ?&gt;&quot; /&gt;
-&lt;link rel=&quot;pingback&quot; href=&quot;&lt;?php bloginfo('pingback_url'); ?&gt;&quot; /&gt;
-
-&lt;?php wp_head(); ?&gt;
-&lt;/head&gt;
-&lt;body&gt;
-	&lt;div id=&quot;header&quot;&gt;
-		&lt;div class=&quot;inside&quot;&gt;
-			&lt;div id=&quot;search&quot;&gt;
-				&lt;form method=&quot;get&quot; id=&quot;sform&quot; action=&quot;&lt;?php bloginfo('home'); ?&gt;/&quot;&gt;
- 					&lt;div class=&quot;searchimg&quot;&gt;&lt;/div&gt;
-					&lt;input type=&quot;text&quot; id=&quot;q&quot; value=&quot;&lt;?php echo wp_specialchars($s, 1); ?&gt;&quot; name=&quot;s&quot; size=&quot;15&quot; /&gt;
-				&lt;/form&gt;
-			&lt;/div&gt;
-			
-			&lt;h2&gt;&lt;a href=&quot;&lt;?php echo get_settings('home'); ?&gt;/&quot;&gt;&lt;?php bloginfo('name'); ?&gt;&lt;/a&gt;&lt;/h2&gt;
-			&lt;p class=&quot;description&quot;&gt;&lt;?php bloginfo('description'); ?&gt;&lt;/p&gt;
-		&lt;/div&gt;
-	&lt;/div&gt;
-	&lt;!-- [END] #header --&gt;
\ No newline at end of file
+&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;
+&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; &lt;?php language_attributes(); ?&gt;&gt;
+
+&lt;head profile=&quot;http://gmpg.org/xfn/11&quot;&gt;
+&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;&lt;?php bloginfo('html_type'); ?&gt;; charset=&lt;?php bloginfo('charset'); ?&gt;&quot; /&gt;
+&lt;title&gt;&lt;?php wp_title(); ?&gt; &lt;?php bloginfo('name'); ?&gt;&lt;/title&gt;
+
+&lt;meta name=&quot;generator&quot; content=&quot;WordPress.com&quot; /&gt; &lt;!-- leave this for stats --&gt;
+
+&lt;link rel=&quot;stylesheet&quot; href=&quot;&lt;?php bloginfo('stylesheet_url'); ?&gt;&quot; type=&quot;text/css&quot; media=&quot;screen&quot; /&gt;
+
+&lt;?php
+	global $hemingway;
+	if ($hemingway-&gt;style and $hemingway-&gt;style != 'none') :
+?&gt;
+&lt;link rel=&quot;stylesheet&quot; href=&quot;&lt;?php bloginfo('stylesheet_directory'); ?&gt;/styles/&lt;?= $hemingway-&gt;style ?&gt;&quot; type=&quot;text/css&quot; media=&quot;screen&quot; /&gt;
+
+&lt;?php endif; ?&gt;
+
+&lt;link rel=&quot;alternate&quot; type=&quot;application/rss+xml&quot; title=&quot;&lt;?php bloginfo('name'); ?&gt; RSS Feed&quot; href=&quot;&lt;?php bloginfo('rss2_url'); ?&gt;&quot; /&gt;
+&lt;link rel=&quot;pingback&quot; href=&quot;&lt;?php bloginfo('pingback_url'); ?&gt;&quot; /&gt;
+
+&lt;?php wp_head(); ?&gt;
+&lt;/head&gt;
+&lt;body&gt;
+	&lt;div id=&quot;header&quot;&gt;
+		&lt;div class=&quot;inside&quot;&gt;
+			&lt;div id=&quot;search&quot;&gt;
+				&lt;form method=&quot;get&quot; id=&quot;sform&quot; action=&quot;&lt;?php bloginfo('home'); ?&gt;/&quot;&gt;
+ 					&lt;div class=&quot;searchimg&quot;&gt;&lt;/div&gt;
+					&lt;input type=&quot;text&quot; id=&quot;q&quot; value=&quot;&lt;?php echo wp_specialchars($s, 1); ?&gt;&quot; name=&quot;s&quot; size=&quot;15&quot; /&gt;
+				&lt;/form&gt;
+			&lt;/div&gt;
+			
+			&lt;h2&gt;&lt;a href=&quot;&lt;?php echo get_settings('home'); ?&gt;/&quot;&gt;&lt;?php bloginfo('name'); ?&gt;&lt;/a&gt;&lt;/h2&gt;
+			&lt;p class=&quot;description&quot;&gt;&lt;?php bloginfo('description'); ?&gt;&lt;/p&gt;
+		&lt;/div&gt;
+	&lt;/div&gt;
+	&lt;!-- [END] #header --&gt;</diff>
      <filename>header.php</filename>
    </modified>
    <modified>
      <filename>images/archives.gif</filename>
    </modified>
    <modified>
      <filename>images/footer_black.gif</filename>
    </modified>
    <modified>
      <filename>images/kyle-header.jpg</filename>
    </modified>
    <modified>
      <filename>images/readon_black.gif</filename>
    </modified>
    <modified>
      <filename>images/search.gif</filename>
    </modified>
    <modified>
      <filename>images/spinner.gif</filename>
    </modified>
    <modified>
      <filename>images/trackback_pingback.gif</filename>
    </modified>
    <modified>
      <diff>@@ -1,42 +1,44 @@
-&lt;?php get_header(); ?&gt;
-
-
-	&lt;div id=&quot;primary&quot; class=&quot;twocol-stories&quot;&gt;
-		&lt;div class=&quot;inside&quot;&gt;
-			&lt;?php
-				// Here is the call to only make two posts show up on the homepage REGARDLESS of your options in the control panel
-				// Remove this line if you wish to use the default behaviour.
-				// TODO: Provide documentation for allowing many posts on the homepage &amp; CSS style guidelines
-				query_posts('showposts=2');
-			?&gt;
-			&lt;?php if (have_posts()) : ?&gt;
-				&lt;?php $first = true; ?&gt;
-				&lt;?php while (have_posts()) : the_post(); ?&gt;
-					&lt;div class=&quot;story&lt;?php if($first == true) echo &quot; first&quot; ?&gt;&quot;&gt;
-						&lt;h3&gt;&lt;a href=&quot;&lt;?php the_permalink() ?&gt;&quot; rel=&quot;bookmark&quot; title=&quot;Permanent Link to &lt;?php the_title(); ?&gt;&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt;&lt;/h3&gt;
-						&lt;?php $hemingway-&gt;excerpt() ?&gt;
-						&lt;div class=&quot;details&quot;&gt;
-							&lt;? _e('Posted at') ?&gt; &lt;?php the_time('ga \o\n ' . $hemingway-&gt;date_format(true) . '/y') ?&gt; | &lt;?php comments_popup_link('no comments', '1 comment', '% comments'); ?&gt; | &lt;?php _e(&quot;Filed under&quot;) ?&gt;: &lt;?php the_category(', ') ?&gt; &lt;span class=&quot;read-on&quot;&gt;&lt;a href=&quot;&lt;?php the_permalink() ?&gt;&quot;&gt;&lt;?php _e(&quot;read on&quot;) ?&gt;&lt;/a&gt;&lt;/span&gt;
-						&lt;/div&gt;
-					&lt;/div&gt;
-					&lt;?php $first = false; ?&gt;
-				&lt;?php endwhile; ?&gt;
-		&lt;/div&gt;
-				
-			&lt;?php else : ?&gt;
-		
-				&lt;h2 class=&quot;center&quot;&gt;&lt;?php _e(&quot;Not Found&quot;) ?&gt;&lt;/h2&gt;
-				&lt;p class=&quot;center&quot;&gt;&lt;?php _e(&quot;Sorry, but you are looking for something that isn't here.&quot;) ?&gt;&lt;/p&gt;
-				&lt;?php include (TEMPLATEPATH . &quot;/searchform.php&quot;); ?&gt;
-		
-			&lt;?php endif; ?&gt;
-				
-			&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
-	&lt;/div&gt;
-	&lt;!-- [END] #primary --&gt;
-
-
-
-&lt;?php get_sidebar(); ?&gt;
-
-&lt;?php get_footer(); ?&gt;
+&lt;?php get_header(); ?&gt;
+
+
+	&lt;div id=&quot;primary&quot; class=&quot;twocol-stories&quot;&gt;
+		&lt;div class=&quot;inside&quot;&gt;
+			&lt;?php
+				// Here is the call to only make two posts show up on the homepage REGARDLESS of your options in the control panel
+				query_posts('showposts=2');
+			?&gt;
+			&lt;?php if (have_posts()) : ?&gt;
+				&lt;?php $first = true; ?&gt;
+				&lt;?php while (have_posts()) : the_post(); ?&gt;
+					&lt;?php if($count &lt; 2) { ?&gt;
+					&lt;?php $count++; ?&gt;
+					&lt;div class=&quot;story&lt;?php if($first == true) echo &quot; first&quot; ?&gt;&quot;&gt;
+						&lt;h3&gt;&lt;a href=&quot;&lt;?php the_permalink() ?&gt;&quot; rel=&quot;bookmark&quot; title=&quot;Permanent Link to &lt;?php the_title(); ?&gt;&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt;&lt;/h3&gt;
+						&lt;?php the_excerpt() ?&gt;
+						&lt;div class=&quot;details&quot;&gt;
+							Posted at &lt;?php the_time('ga \o\n n/j/y') ?&gt; | &lt;?php comments_popup_link('no comments;', '1 comment', '% comments'); ?&gt; | Filed Under: &lt;?php the_category(', ') ?&gt; | &lt;?php if (is_callable('the_tags')) the_tags('Tagged: ', ', ', ' | '); ?&gt; &lt;span class=&quot;read-on&quot;&gt;&lt;a href=&quot;&lt;?php the_permalink() ?&gt;&quot;&gt;read on&lt;/a&gt;&lt;/span&gt;
+						&lt;/div&gt;
+					&lt;/div&gt;
+					&lt;?php $first = false; ?&gt;
+					&lt;?php } ?&gt;
+				&lt;?php endwhile; ?&gt;
+		&lt;/div&gt;
+				
+			&lt;?php else : ?&gt;
+		
+				&lt;h2 class=&quot;center&quot;&gt;Not Found&lt;/h2&gt;
+				&lt;p class=&quot;center&quot;&gt;Sorry, but you are looking for something that isn't here.&lt;/p&gt;
+				&lt;?php include (TEMPLATEPATH . &quot;/searchform.php&quot;); ?&gt;
+		
+			&lt;?php endif; ?&gt;
+				
+			&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
+		&lt;/div&gt;
+	&lt;/div&gt;
+	&lt;!-- [END] #primary --&gt;
+
+
+
+&lt;?php get_sidebar(); ?&gt;
+
+&lt;?php get_footer(); ?&gt;</diff>
      <filename>index.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,18 +1,36 @@
-&lt;?php get_header(); ?&gt;
-
-	&lt;div id=&quot;primary&quot;&gt;
-	&lt;div class=&quot;inside&quot;&gt;
-
-    &lt;?php if (have_posts()) : while (have_posts()) : the_post(); ?&gt;
-		&lt;h1&gt;&lt;?php the_title(); ?&gt;&lt;/h1&gt;
-				&lt;?php the_content('&lt;p class=&quot;serif&quot;&gt;' . _('Read the rest of this page') . ' &amp;raquo;&lt;/p&gt;'); ?&gt;
-	
-				&lt;?php link_pages('&lt;p&gt;&lt;strong&gt;' . _('Pages') . ':&lt;/strong&gt; ', '&lt;/p&gt;', 'number'); ?&gt;
-	  &lt;?php endwhile; endif; ?&gt;
-	&lt;?php edit_post_link(_('Edit this entry.'), '&lt;p&gt;', '&lt;/p&gt;'); ?&gt;
-	&lt;/div&gt;
-	&lt;/div&gt;
-
-&lt;?php get_sidebar(); ?&gt;
-
-&lt;?php get_footer(); ?&gt;
\ No newline at end of file
+&lt;?php get_header(); ?&gt;
+
+	&lt;div id=&quot;primary&quot;&gt;
+	&lt;div class=&quot;inside&quot;&gt;
+
+	&lt;?php if (have_posts()) : while (have_posts()) : the_post(); ?&gt;
+		&lt;h1&gt;&lt;?php the_title(); ?&gt;&lt;/h1&gt;
+		&lt;?php the_content('&lt;p class=&quot;serif&quot;&gt;Read the rest of this page &amp;raquo;&lt;/p&gt;'); ?&gt;
+	
+		&lt;?php link_pages('&lt;p&gt;&lt;strong&gt;Pages:&lt;/strong&gt; ', '&lt;/p&gt;', 'number'); ?&gt;
+		&lt;br class=&quot;clear&quot; /&gt;
+		&lt;?php edit_post_link('Edit this entry.', '&lt;p&gt;', '&lt;/p&gt;'); ?&gt;
+
+	&lt;?php endwhile; endif; ?&gt;
+	&lt;/div&gt;
+	&lt;/div&gt;
+
+	&lt;hr class=&quot;hide&quot; /&gt;
+	&lt;div id=&quot;secondary&quot;&gt;
+		&lt;div class=&quot;inside&quot;&gt;
+			
+			&lt;?php if ('open' == $post-&gt; comment_status) {
+				// Comments are open ?&gt;
+				&lt;div class=&quot;comment-head&quot;&gt;
+					&lt;h2&gt;&lt;?php comments_number('No comments','1 Comment','% Comments'); ?&gt;&lt;/h2&gt;
+					&lt;span class=&quot;details&quot;&gt;&lt;a href=&quot;#comment-form&quot;&gt;Jump to comment form&lt;/a&gt; | &lt;?php comments_rss_link('comments rss'); ?&gt; &lt;a href=&quot;#what-is-comment-rss&quot; class=&quot;help&quot;&gt;[?]&lt;/a&gt; &lt;?php if ('open' == $post-&gt;ping_status): ?&gt;| &lt;a href=&quot;&lt;?php trackback_url(true); ?&gt;&quot;&gt;trackback uri&lt;/a&gt; &lt;a href=&quot;#what-is-trackback&quot; class=&quot;help&quot;&gt;[?]&lt;/a&gt;&lt;?php endif; ?&gt;&lt;/span&gt;
+				&lt;/div&gt;
+			&lt;?php } elseif ('open' != $post-&gt; comment_status) { ?&gt;
+			&lt;?php } ?&gt;
+			
+			&lt;?php comments_template(); ?&gt;
+	&lt;/div&gt;
+	&lt;/div&gt;
+&lt;?php get_sidebar(); ?&gt;
+
+&lt;?php get_footer(); ?&gt;</diff>
      <filename>page.php</filename>
    </modified>
    <modified>
      <filename>screenshot.png</filename>
    </modified>
    <modified>
      <diff>@@ -1,58 +1,56 @@
-&lt;?php get_header(); ?&gt;
-
-	&lt;div id=&quot;primary&quot; class=&quot;single-post&quot;&gt;
-	&lt;div class=&quot;inside&quot;&gt;
-		&lt;div class=&quot;primary&quot;&gt;
-
-	&lt;?php if (have_posts()) : ?&gt;
-
-		&lt;h1&gt;Search Results&lt;/h1&gt;
-		
-		&lt;ul class=&quot;dates&quot;&gt;
-		 	&lt;?php while (have_posts()) : the_post(); ?&gt;
-			&lt;li&gt;
-				&lt;span class=&quot;date&quot;&gt;&lt;?php the_time( $hemingway-&gt;date_format() . '.y' ) ?&gt;&lt;/span&gt;
-				&lt;a href=&quot;&lt;?php the_permalink() ?&gt;&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt; 
-				 &lt;?php _e('posted in') ?&gt; 
-				&lt;?php the_category(', ') ?&gt;  
-			&lt;/li&gt;
-			&lt;?php $results++; ?&gt;
-			&lt;?php endwhile; ?&gt;
-		&lt;/ul&gt;
-		
-		&lt;div class=&quot;navigation&quot;&gt;
-			&lt;div class=&quot;left&quot;&gt;&lt;?php next_posts_link('&amp;laquo; ' . _('Previous Entries')) ?&gt;&lt;/div&gt;
-			&lt;div class=&quot;right&quot;&gt;&lt;?php previous_posts_link(_('Next Entries') . ' &amp;raquo;') ?&gt;&lt;/div&gt;
-		&lt;/div&gt;
-	
-	&lt;?php else : ?&gt;
-
-		&lt;h1&gt;&lt;?php _e(&quot;No posts found&quot;) ?&gt;.&lt;/h1&gt;
-		&lt;h2&gt;&lt;?php _e(&quot;Try something new&quot;) ?&gt;:&lt;/h2&gt;
-		
-		&lt;?php include (TEMPLATEPATH . '/searchform.php'); ?&gt;
-
-	&lt;?php endif; ?&gt;
-		
-	&lt;/div&gt;
-	
-	&lt;div class=&quot;secondary&quot;&gt;
-		&lt;h2&gt;Search&lt;/h2&gt;
-		&lt;div class=&quot;featured&quot;&gt;
-			&lt;p&gt;&lt;?php _e(&quot;You searched for&quot;) ?&gt; &amp;ldquo;&lt;?php echo wp_specialchars($s, 1); ?&gt;&amp;rdquo; at &lt;?php bloginfo('name'); ?&gt;.
-			&lt;?php
-				if (!$results) _e(&quot;There were no results. Try again with a new term.&quot;);
-				elseif (1 == $results) _e(&quot;There was one result found. It must be your lucky day!&quot;);
-				else echo __(&quot;There were&quot;) . &quot; &quot; . $results . &quot; &quot; . __(&quot;results found.&quot;);
-			?&gt;
-			&lt;/p&gt;
-			
-		&lt;/div&gt;
-	&lt;/div&gt;
-	&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
-	&lt;/div&gt;
-	&lt;/div&gt;
-
-&lt;?php get_sidebar(); ?&gt;
-
-&lt;?php get_footer(); ?&gt;
\ No newline at end of file
+&lt;?php get_header(); ?&gt;
+
+	&lt;div id=&quot;primary&quot; class=&quot;single-post&quot;&gt;
+	&lt;div class=&quot;inside&quot;&gt;
+		&lt;div class=&quot;primary&quot;&gt;
+
+	&lt;?php if (have_posts()) : ?&gt;
+
+		&lt;h1&gt;Search Results&lt;/h1&gt;
+		
+		&lt;ul class=&quot;dates&quot;&gt;
+		 	&lt;?php while (have_posts()) : the_post(); ?&gt;
+			&lt;li&gt;
+				&lt;span class=&quot;date&quot;&gt;&lt;?php the_time('n.j.y') ?&gt;&lt;/span&gt;
+				&lt;a href=&quot;&lt;?php the_permalink() ?&gt;&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt; 
+				 posted in 
+				&lt;?php the_category(', ') ?&gt;  
+				&lt;?php if (is_callable('the_tags')) the_tags('tagged ', ', '); ?&gt;
+			&lt;/li&gt;
+			&lt;?php $results++; ?&gt;
+			&lt;?php endwhile; ?&gt;
+		&lt;/ul&gt;
+		
+		&lt;div class=&quot;navigation&quot;&gt;
+			&lt;div class=&quot;left&quot;&gt;&lt;?php next_posts_link('&amp;laquo; Previous Entries') ?&gt;&lt;/div&gt;
+			&lt;div class=&quot;right&quot;&gt;&lt;?php previous_posts_link('Next Entries &amp;raquo;') ?&gt;&lt;/div&gt;
+		&lt;/div&gt;
+	
+	&lt;?php else : ?&gt;
+
+		&lt;h1&gt;No posts found. Try a different search?&lt;/h1&gt;
+
+	&lt;?php endif; ?&gt;
+		
+	&lt;/div&gt;
+	
+	&lt;div class=&quot;secondary&quot;&gt;
+		&lt;h2&gt;Search&lt;/h2&gt;
+		&lt;div class=&quot;featured&quot;&gt;
+			&lt;p&gt;You searched for &amp;ldquo;&lt;?php echo wp_specialchars($s, 1); ?&gt;&amp;rdquo; at &lt;?php bloginfo('name'); ?&gt;. There were
+			&lt;?php
+				if (!$results) echo &quot;no results, better luck next time.&quot;;
+				elseif (1 == $results) echo &quot;one result found. It must be your lucky day.&quot;;
+				else echo $results . &quot; results found.&quot;;
+			?&gt;
+			&lt;/p&gt;
+			
+		&lt;/div&gt;
+	&lt;/div&gt;
+	&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
+	&lt;/div&gt;
+	&lt;/div&gt;
+
+&lt;?php get_sidebar(); ?&gt;
+
+&lt;?php get_footer(); ?&gt;</diff>
      <filename>search.php</filename>
    </modified>
    <modified>
      <filename>searchform.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,7 +1,7 @@
-&lt;?php
-include (TEMPLATEPATH . '/dynamic_sidebar.php'); 
-
-// If you want to ignore the Theme Options handling of the sidebar and just do it yourself
-// Use this one instead of the above
-// include (TEMPLATEPATH . '/static_sidebar.php'); 
+&lt;?php 
+include (TEMPLATEPATH . '/dynamic_sidebar.php'); 
+
+// If you want to ignore the Theme Options handling of the sidebar and just do it yourself
+// Use this one instead of the above
+// include (TEMPLATEPATH . '/static_sidebar.php'); 
 ?&gt;
\ No newline at end of file</diff>
      <filename>sidebar.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,57 +1,64 @@
-&lt;?php get_header(); ?&gt;
-
-	&lt;div id=&quot;primary&quot; class=&quot;single-post&quot;&gt;
-		&lt;div class=&quot;inside&quot;&gt;
-			&lt;?php if (have_posts()) : while (have_posts()) : the_post(); ?&gt;
-			&lt;div class=&quot;primary&quot;&gt;
-				&lt;h1&gt;&lt;?php the_title(); ?&gt;&lt;/h1&gt;
-				&lt;?php the_content('&lt;p class=&quot;serif&quot;&gt;' . __('Read the rest of this entry') . ' &amp;raquo;&lt;/p&gt;'); ?&gt;
-			&lt;/div&gt;
-			&lt;hr class=&quot;hide&quot; /&gt;
-			&lt;div class=&quot;secondary&quot;&gt;
-				&lt;h2&gt;About this entry&lt;/h2&gt;
-				&lt;div class=&quot;featured&quot;&gt;
-					&lt;p&gt;&lt;?php _e(&quot;You're currently reading&quot;) ?&gt; &amp;ldquo;&lt;?php the_title(); ?&gt;,&amp;rdquo; &lt;?php _e(&quot;an entry on&quot;) ?&gt; &lt;?php bloginfo('name'); ?&gt;&lt;/p&gt;
-					&lt;dl&gt;
-						&lt;dt&gt;&lt;?php _e(&quot;Published&quot;) ?&gt;:&lt;/dt&gt;
-						&lt;dd&gt;&lt;?php the_time( $hemingway-&gt;date_format() . '.y' ) ?&gt; / &lt;?php the_time('ga') ?&gt;&lt;/dd&gt;
-					&lt;/dl&gt;
-					&lt;dl&gt;
-						&lt;dt&gt;Category:&lt;/dt&gt;
-						&lt;dd&gt;&lt;?php the_category(', ') ?&gt;&lt;/dd&gt;
-					&lt;/dl&gt;
-					&lt;?php edit_post_link(__('Edit this entry') . '.', '&lt;dl&gt;&lt;dt&gt;' . __('Edit') . ':&lt;/dt&gt;&lt;dd&gt; ', '&lt;/dd&gt;&lt;/dl&gt;'); ?&gt;
-				&lt;/div&gt;
-			&lt;/div&gt;
-			&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
-		&lt;/div&gt;
-	&lt;/div&gt;
-	&lt;!-- [END] #primary --&gt;
-	
-	&lt;hr class=&quot;hide&quot; /&gt;
-	&lt;div id=&quot;secondary&quot;&gt;
-		&lt;div class=&quot;inside&quot;&gt;
-			
-			&lt;?php if ('open' == $post-&gt; comment_status) {
-				// Comments are open ?&gt;
-				&lt;div class=&quot;comment-head&quot;&gt;
-					&lt;h2&gt;&lt;?php comments_number('No comments','1 Comment','% Comments'); ?&gt;&lt;/h2&gt;
-					&lt;span class=&quot;details&quot;&gt;&lt;a href=&quot;#comment-form&quot;&gt;&lt;?php _e(&quot;Jump to comment form&quot;) ?&gt;&lt;/a&gt; | &lt;?php comments_rss_link('comments rss'); ?&gt; &lt;a href=&quot;#what-is-comment-rss&quot; class=&quot;help&quot;&gt;[?]&lt;/a&gt; &lt;?php if ('open' == $post-&gt;ping_status): ?&gt;| &lt;a href=&quot;&lt;?php trackback_url(true); ?&gt;&quot;&gt;trackback uri&lt;/a&gt; &lt;a href=&quot;#what-is-trackback&quot; class=&quot;help&quot;&gt;[?]&lt;/a&gt;&lt;?php endif; ?&gt;&lt;/span&gt;
-				&lt;/div&gt;
-			&lt;?php } elseif ('open' != $post-&gt; comment_status) {
-				// Neither Comments, nor Pings are open ?&gt;
-				&lt;div class=&quot;comment-head&quot;&gt;
-					&lt;h2&gt;&lt;?php _e(&quot;Comments are closed&quot;) ?&gt;&lt;/h2&gt;
-					&lt;span class=&quot;details&quot;&gt;&lt;?php _e(&quot;Comments are currently closed on this entry&quot;) ?&gt;.&lt;/span&gt;
-				&lt;/div&gt;	
-			&lt;?php } ?&gt;
-			
-			&lt;?php comments_template(); ?&gt;
-			
-			&lt;?php endwhile; else: ?&gt;
-			&lt;p&gt;&lt;?php _e(&quot;Sorry, no posts matched your criteria&quot;) ?&gt;.&lt;/p&gt;
-			&lt;?php endif; ?&gt;
-		&lt;/div&gt;
-	&lt;/div&gt;
-&lt;?php get_sidebar(); ?&gt;
-&lt;?php get_footer(); ?&gt;
+&lt;?php get_header(); ?&gt;
+
+	&lt;div id=&quot;primary&quot; class=&quot;single-post&quot;&gt;
+		&lt;div class=&quot;inside&quot;&gt;
+			&lt;?php if (have_posts()) : while (have_posts()) : the_post(); ?&gt;
+			&lt;div class=&quot;primary&quot;&gt;
+				&lt;h1&gt;&lt;?php the_title(); ?&gt;&lt;/h1&gt;
+				&lt;?php the_content('&lt;p class=&quot;serif&quot;&gt;Read the rest of this entry &amp;raquo;&lt;/p&gt;'); ?&gt;
+				&lt;?php wp_link_pages(); ?&gt;
+			&lt;/div&gt;
+			&lt;hr class=&quot;hide&quot; /&gt;
+			&lt;div class=&quot;secondary&quot;&gt;
+				&lt;h2&gt;About this entry&lt;/h2&gt;
+				&lt;div class=&quot;featured&quot;&gt;
+					&lt;p&gt;You&amp;rsquo;re currently reading &amp;ldquo;&lt;?php the_title(); ?&gt;,&amp;rdquo; an entry on &lt;?php bloginfo('name'); ?&gt;&lt;/p&gt;
+					&lt;dl&gt;
+						&lt;dt&gt;Published:&lt;/dt&gt;
+						&lt;dd&gt;&lt;?php the_time('n.j.y') ?&gt; / &lt;?php the_time('ga') ?&gt;&lt;/dd&gt;
+					&lt;/dl&gt;
+					&lt;dl&gt;
+						&lt;dt&gt;Category:&lt;/dt&gt;
+						&lt;dd&gt;&lt;?php the_category(', ') ?&gt;&lt;/dd&gt;
+					&lt;/dl&gt;
+					&lt;?php if (is_callable('the_tags')) : ?&gt;
+					&lt;dl&gt;
+						&lt;dt&gt;Tags:&lt;/dt&gt;
+						&lt;dd&gt;&lt;?php the_tags(''); ?&gt;&lt;/dd&gt;
+					&lt;/dl&gt;
+					&lt;?php endif; ?&gt;
+					&lt;?php edit_post_link('Edit this entry.', '&lt;dl&gt;&lt;dt&gt;Edit:&lt;/dt&gt;&lt;dd&gt; ', '&lt;/dd&gt;&lt;/dl&gt;'); ?&gt;
+				&lt;/div&gt;
+			&lt;/div&gt;
+			&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
+		&lt;/div&gt;
+	&lt;/div&gt;
+	&lt;!-- [END] #primary --&gt;
+	
+	&lt;hr class=&quot;hide&quot; /&gt;
+	&lt;div id=&quot;secondary&quot;&gt;
+		&lt;div class=&quot;inside&quot;&gt;
+			
+			&lt;?php if ('open' == $post-&gt; comment_status) {
+				// Comments are open ?&gt;
+				&lt;div class=&quot;comment-head&quot;&gt;
+					&lt;h2&gt;&lt;?php comments_number('No comments','1 Comment','% Comments'); ?&gt;&lt;/h2&gt;
+					&lt;span class=&quot;details&quot;&gt;&lt;a href=&quot;#comment-form&quot;&gt;Jump to comment form&lt;/a&gt; | &lt;?php comments_rss_link('comments rss'); ?&gt; &lt;a href=&quot;#what-is-comment-rss&quot; class=&quot;help&quot;&gt;[?]&lt;/a&gt; &lt;?php if ('open' == $post-&gt;ping_status): ?&gt;| &lt;a href=&quot;&lt;?php trackback_url(true); ?&gt;&quot;&gt;trackback uri&lt;/a&gt; &lt;a href=&quot;#what-is-trackback&quot; class=&quot;help&quot;&gt;[?]&lt;/a&gt;&lt;?php endif; ?&gt;&lt;/span&gt;
+				&lt;/div&gt;
+			&lt;?php } elseif ('open' != $post-&gt; comment_status) {
+				// Neither Comments, nor Pings are open ?&gt;
+				&lt;div class=&quot;comment-head&quot;&gt;
+					&lt;h2&gt;Comments are closed&lt;/h2&gt;
+					&lt;span class=&quot;details&quot;&gt;Comments are currently closed on this entry.&lt;/span&gt;
+				&lt;/div&gt;	
+			&lt;?php } ?&gt;
+			
+			&lt;?php comments_template(); ?&gt;
+			
+			&lt;?php endwhile; else: ?&gt;
+			&lt;p&gt;Sorry, no posts matched your criteria.&lt;/p&gt;
+			&lt;?php endif; ?&gt;
+		&lt;/div&gt;
+	&lt;/div&gt;
+&lt;?php get_sidebar(); ?&gt;
+&lt;?php get_footer(); ?&gt;</diff>
      <filename>single.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,37 +1,37 @@
-&lt;hr class=&quot;hide&quot; /&gt;
-	&lt;div id=&quot;ancillary&quot;&gt;
-		&lt;div class=&quot;inside&quot;&gt;
-			&lt;div class=&quot;block first&quot;&gt;
-				&lt;h2&gt;&lt;?php _e(&quot;About&quot;) ?&gt;&lt;/h2&gt;
-				&lt;?php query_posts('pagename=about'); ?&gt;
-				&lt;?php if (have_posts()) : ?&gt;
-				&lt;?php while (have_posts()) : the_post(); ?&gt;
-				&lt;?php the_content(); ?&gt;
-				&lt;?php endwhile; ?&gt;
-				&lt;?php endif; ?&gt;
-			&lt;/div&gt;
-			
-			&lt;div class=&quot;block&quot;&gt;
-				&lt;h2&gt;&lt;?php _e(&quot;Recently&quot;) ?&gt;&lt;/h2&gt;
-				&lt;ul class=&quot;dates&quot;&gt;
-					&lt;?php
-						// I love Wordpress so
-						query_posts('showposts=10');
-					?&gt;
-					&lt;?php if (have_posts()) : while (have_posts()) : the_post(); ?&gt;
-					&lt;li&gt;&lt;a href=&quot;&lt;?php the_permalink() ?&gt;&quot;&gt;&lt;span class=&quot;date&quot;&gt;&lt;?php the_time( $hemingway-&gt;date_format() ) ?&gt;&lt;/span&gt; &lt;?php the_title() ?&gt; &lt;/a&gt;&lt;/li&gt;
-					&lt;?php endwhile; endif; ?&gt;
-				&lt;/ul&gt;
-			&lt;/div&gt;
-			
-			&lt;div class=&quot;block&quot;&gt;
-				&lt;h2&gt;&lt;?php _e(&quot;Categories&quot;) ?&gt;&lt;/h2&gt;
-				&lt;ul class=&quot;counts&quot;&gt;
-					&lt;?php wp_list_cats('sort_column=name&amp;optioncount=1&amp;hierarchical=0'); ?&gt;
-				&lt;/ul&gt;
-			&lt;/div&gt;
-			
-			&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
-		&lt;/div&gt;
-	&lt;/div&gt;
+&lt;hr class=&quot;hide&quot; /&gt;
+	&lt;div id=&quot;ancillary&quot;&gt;
+		&lt;div class=&quot;inside&quot;&gt;
+			&lt;div class=&quot;block first&quot;&gt;
+				&lt;h2&gt;About&lt;/h2&gt;
+				&lt;?php query_posts('pagename=about'); ?&gt;
+				&lt;?php if (have_posts()) : ?&gt;
+				&lt;?php while (have_posts()) : the_post(); ?&gt;
+				&lt;?php the_content(); ?&gt;
+				&lt;?php endwhile; ?&gt;
+				&lt;?php endif; ?&gt;
+			&lt;/div&gt;
+			
+			&lt;div class=&quot;block&quot;&gt;
+				&lt;h2&gt;Recently&lt;/h2&gt;
+				&lt;ul class=&quot;dates&quot;&gt;
+					&lt;?php
+						// I love WordPress so
+						query_posts('showposts=10');
+					?&gt;
+					&lt;?php if (have_posts()) : while (have_posts()) : the_post(); ?&gt;
+					&lt;li&gt;&lt;a href=&quot;&lt;?php the_permalink() ?&gt;&quot;&gt;&lt;span class=&quot;date&quot;&gt;&lt;?php the_time('m.j') ?&gt;&lt;/span&gt; &lt;?php the_title() ?&gt; &lt;/a&gt;&lt;/li&gt;
+					&lt;?php endwhile; endif; ?&gt;
+				&lt;/ul&gt;
+			&lt;/div&gt;
+			
+			&lt;div class=&quot;block&quot;&gt;
+				&lt;h2&gt;Categories&lt;/h2&gt;
+				&lt;ul class=&quot;counts&quot;&gt;
+					&lt;?php wp_list_cats('sort_column=name&amp;optioncount=1&amp;hierarchical=0'); ?&gt;
+				&lt;/ul&gt;
+			&lt;/div&gt;
+			
+			&lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
+		&lt;/div&gt;
+	&lt;/div&gt;
 	&lt;!-- [END] #ancillary --&gt;	
\ No newline at end of file</diff>
      <filename>static_sidebar.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,579 +1,643 @@
-/*  
-Theme Name: Hemingway
-Theme URI: http://warpspire.com/hemingway
-Description: Hemingway is a simple weblog theme by &lt;a href=&quot;http://warpspire.com&quot;&gt;Kyle Neath&lt;/a&gt; aimed at giving bloggers a great platform on which to customize.  If you'd like to learn more about Hemingway, &lt;a href=&quot;http://warpspire.com/hemingway&quot;&gt;head on over to Warpspire&lt;/a&gt; or ask a question in the &lt;a href=&quot;http://support.warpspire.com/discussions/hemingway&quot;&gt;official support forums.&lt;/a&gt; &lt;br /&gt;&lt;strong&gt;This theme requires WordPress 2.0+&lt;/strong&gt;&lt;/a&gt;.
-Version: 0.19
-Author: Kyle Neath
-Author URI: http://warpspire.com
-*/
-
-
-
-/*-----------------------------------------------------------------------------------------------
-  Global Styles
------------------------------------------------------------------------------------------------*/
-
-* {
-	padding:0;
-	margin:0;
-}
-h1, h2, h3, h4, h5, h6, p, pre, blockquote, label, ul, ol, dl, fieldset, address { margin:1em 0; }
-li, dd { margin-left:5%; }
-fieldset { padding: .5em; }
-select option{ padding:0 5px; }
-
-.hide, .print-logo, .close-button{ display:none; }
-.left{ float:left; }
-.right{ float:right; }
-.clear{ clear:both; height:1px; font-size:1px; line-height:1px; }
-a img{ border:none; }
-
-/*-----------------------------------------------------------------------------------------------
-  Layout / Base Page Styling
------------------------------------------------------------------------------------------------*/
-
-body{
-	background:#272727;
-	color:#BFBFBF;
-	font-size:11px;
-	font-family:&quot;Lucida Grande&quot;, &quot;Lucida Sans Unicode&quot;, &quot;Lucida Sans&quot;, Verdana, Arial, sans-serif;
-}
-
-/* This class sets the width and position for all rows */
-.inside{
-	width:80%;
-	min-width:65em;
-	max-width:85em;
-	margin:0 auto;
-}
-
-a{
-	color:#FFF;
-}
-
-h1{
-	color:#CCC;
-	font-size:1.5em;
-	font-weight:normal;
-	margin:1.5em 0;
-}
-
-h2, h3{
-	font-size:1.15em;
-	color:#FFF;
-	font-weight:normal;
-}
-#primary h2{
-	color:#CCC;
-}
-
-p{
-	line-height:1.75em;
-}
-
-ul li{
-	list-style-type:square;
-	margin:0.5em 0 0.5em 2em;
-}
-
-blockquote{
-	margin-left:1em;
-	padding-left:1em;
-	border-left:2px solid #CCC;
-	color:#CCC;
-}
-
-pre{
-	width:100%;
-	padding:1em 0;
-	overflow:auto;
-	border-top:1px dotted #333;
-	border-bottom:1px dotted #333;
-}
-
-table{
-	width:100%;
-	border-spacing:2px;
-	margin:1.5em 0;
-}
-table th, table td{ padding:0.3em 0.75em }
-table th{
-	background:#CCC;
-	color:#000;
-	text-align:left;
-}
-table td{
-	background:#333;
-	color:#FFF;
-}
-table caption{
-	text-align:left;
-	color:#FFF;
-	margin-bottom:-1em;
-	margin-top:1em;
-}
-
-.rule{
-	border-top:1px solid #CCC;
-	height:1px;
-	font-size:1px;
-	line-height:1px;
-	margin:1.5em 0;
-}
-
-/*-----------------------------------------------------------------------------------------------
-  Header
------------------------------------------------------------------------------------------------*/
-#header{
-	background:#000;
-}
-#header .inside{
-	padding:3em 0;
-}
-
-#header h2{
-	font-size:2.25em;
-	margin:0 0.5em 0 0;
-	padding:0 0.5em 0.25em 0;
-	border-right:1px solid #808080;
-	float:left;
-}
-#header h2 a{ text-decoration:none; }
-
-#header p{
-	padding:1em 0;
-	margin:0;
-	line-height:1em;
-}
-
-/*-----------------------------------------------------------------------------------------------
-  Primary Items
------------------------------------------------------------------------------------------------*/
-
-#primary{
-	background:#000;
-	padding:1px 0 2em 0;
-	color:#808080;
-}
-
-#primary.onecol-stories .primary{
-	float:left;
-	width:50%;
-}
-#primary.onecol-stories .secondary{
-	float:right;
-	width:40%;
-	margin:0 0 0 10%;
-}
-
-#primary.twocol-stories .story{
-	float:left;
-	width:48%;
-	margin:0 0 0 4%;
-	display:inline;
-}
-* html #primary.twocol-stories .story{
-	margin-left:2%;
-}
-#primary.twocol-stories .first, * html #primary.twocol-stories .first{
-	margin:0 0 0 0;
-}
-
-.story h3{
-	font-size:1.15em;
-	margin:0 0 1.5em 0;
-	font-weight:normal;
-	color:#CCC;
-}
-.story h3 a{
-	color:#CCC;
-	text-decoration:none;
-	border-bottom:1px dotted #666;
-}
-
-.story .details{
-	margin:1em 0;
-	text-align:right;
-	border-top:1px solid #333;
-	padding:0.5em 0;
-	font-size:0.95em;
-	color:#666;
-}
-.story .details .read-on{
-	background:url(images/readon_black.gif) 100% 60% no-repeat;
-	padding-right:20px;
-	display:block;
-}
-.story .details a{
-	color:#666;
-	text-decoration:none;
-}
-.story .details a:hover{ color:#FFF; }
-
-/* Single Post Styles */
-
-#primary .primary{
-	float:right;
-	width:65%;
-}
-#primary .secondary{
-	float:right;
-	width:30%;
-	margin-right:5%;
-	padding-top:0.65em;
-	display:inline;
-}
-* html #primary .secondary{ margin-right:3%; }
-
-.secondary .featured p{
-	border-bottom:1px solid #333333;
-	border-top: 1px solid #333333;
-	padding:0.5em 0 0.6em 0;
-	line-height:1.5em;
-	margin:1em 0 0 0;
-}
-.secondary .featured dl{
-	margin:0 0;
-	border-bottom:1px solid #333333;
-	padding:0.5em 0 0.6em 0;
-}
-.secondary dt{
-	display:inline;
-	margin:0;
-	padding:0;
-	color:#AAA;
-}
-.secondary dd{
-	display:inline;
-	margin:0;
-	padding:0;
-}
-.secondary dd a{ color:#808080; }
-.secondary dd a:hover{ color:#FFF; }
-
-.single-post h1, .single-post h2{ margin-top:0; }
-
-/*-----------------------------------------------------------------------------------------------
-	Secondary Items
------------------------------------------------------------------------------------------------*/
-
-#secondary{
-	background:#0C0C0C;
-	padding:1px 2em;
-	border-top:1px solid #1C1C1C;
-}
-
-.comment-head{
-	border-bottom:1px solid #1C1C1C;
-	padding:0.8em 2em 1.0em 2em;
-}
-.comment-head h2{
-	font-size:1.5em;
-	margin:0;
-}
-.comment-head a{
-	text-decoration:none;
-	color:#868686;
-}
-.comment-head .details{
-	font-size:0.95em;
-}
-
-ol#comments{
-	list-style-type:none;
-	margin:2em 0;
-}
-ol#comments li{
-	list-style-type:none;
-	margin:2em 0;
-}
-
-#comments cite{
-	float:left;
-	width:31%;
-	font-style:normal;
-	text-align:right;
-}
-* html #comments cite{ width:30.6%; }
-#comments cite span{
-	display:block;
-}
-#comments cite .author{ font-size:1.2em; }
-#comments cite .author a{
-	text-decoration:none;
-}
-#comments cite .admin-tools{
-	margin:5px 0;
-}
-#comments cite .admin-tools a{
-	float:right;
-	margin:0 5px;
-	padding:0px 3px 3px;
-	background:#666;
-	border:1px solid #999;
-	text-decoration:none;
-}
-#primary .secondary .admin-tools{ margin:1em 0; }
-
-#preview{
-	margin:1em 0;
-	padding:0.5em;
-	border:1px solid #333;
-}
-#preview p{ margin:1em 0 0 0; }
-#errors{ color:#FF0000; font-weight:bold; }
-
-#comments .pingback cite .author{
-	display:block;
-	padding-top:68px;
-	background:url(images/trackback_pingback.gif) 100% 0 no-repeat;
-}
-
-#comments .content{
-	float:left;
-	width:60%;
-	margin-left:1.9%;
-	border-left:1px solid #868686;
-	padding: 0 0 0 2%;
-}
-#comments .content p{
-	margin:0 0 1em 0;
-}
-#comments .content h3{
-	margin:0;
-	font-size:1em;
-}
-
-#comment-form{
-	margin:5em 0 5em 35.4%;
-	width:36em;
-}
-input.textfield{
-	width: 15em;
-	margin:5px 0;
-}
-textarea.commentbox{
-	width:28em;
-	height:10em;
-	padding:0.25em;
-	margin:5px 0;
-	font-size:1.25em;
-	font-family:Arial, Helvetica, sans-serif;
-}
-label.text{
-	position:relative;
-	left:0.5em;
-	top:-0.5em;
-}
-.formactions input.submit{ 
-	float:right; 
-	margin:-1em 0 0 0;
-	padding:0 0.5em;
-}
-.formactions .spinner{
-	float:right;
-	margin:-8px -20px 0 0;
-}
-
-/*-----------------------------------------------------------------------------------------------
-  Ancillary Items
------------------------------------------------------------------------------------------------*/
-
-#ancillary{
-	padding:2em 0 0 0;
-}
-#ancillary .block{
-	float:left;
-	width: 30%;
-	margin:0 0 0 5%;
-}
-* html #ancillary .block{
-	margin-left:3.9%;
-}
-#ancillary .twice-length{ width:65%; }
-#ancillary .thrice-length{ width:100%; }
-#ancillary .first, * html #ancillary .first{
-	clear:both;
-	margin:0;
-}
-#ancillary .block-separator{
-	clear:both;
-	height:2.5em;
-}
-
-#ancillary .block h2, #ancillary .block h3{
-	margin:0 0 2em 0;
-}
-
-ul.dates, ul.counts, ul.blogroll ul, ul.pages{
-	list-style-type:none;
-	margin:1.5em 0 2em 0;
-	border-top:1px solid #3D3D3D;
-}
-ul.dates li, ul.counts li, ul.blogroll ul li, ul.pages li{
-	list-style-type:none;
-	margin:0;
-	padding:0.5em 0;
-	border-bottom:1px solid #3D3D3D;
-}
-ul.dates .date{
-	color:#858585;
-	padding:0 1.5em 0 0;
-}
-
-ul.counts .count{
-	float:right;
-	color:#858585;
-}
-
-ul.dates a, ul.counts a, ul.blogroll a, ul.pages a{
-	color:#BFBFBF;
-	text-decoration:none;
-}
-ul.dates a:hover, ul.dates a:hover .date, ul.counts a:hover, ul.counts a:hover .count, ul.blogroll a:hover, ul.pages a:hover{ 
-	color:#FFF;
-}
-
-ul.blogroll{ margin-top:0; }
-ul.blogroll li{
-	list-style-type:none;
-	margin:0;
-}
-
-ul.pages ul{
-	margin:0;
-}
-ul.pages ul li{
-	border:none;
-	margin-left:2em;
-	list-style-type:square;
-}
-/*-----------------------------------------------------------------------------------------------
-  Foooter
------------------------------------------------------------------------------------------------*/
-
-#footer{
-	clear:both;
-	color:#939393;
-	margin:2em 0 3em 0;
-}
-#footer .inside{
-	background:url(images/footer_black.gif) 50% 0 repeat-x;
-	padding:1em 0;
-}
-#footer p{
-	margin:0;
-	font-size:0.95em;
-}
-#footer p.copyright{ float:left; }
-#footer p.attributes{ float:right; }
-#footer p.attributes a{
-	padding:0 0 0 1em;
-	text-decoration:none;
-	color:#525252;
-}
-#footer p.attributes a:hover{
-	color:#FFF;
-}
-
-/*-----------------------------------------------------------------------------------------------
-  Search
------------------------------------------------------------------------------------------------*/
-
-#search{
-	float:right;
-	width:200px;
-	margin:1em 0 0 0;
-	opacity:0.4;
-	text-align:right;
-}
-#search:hover{
-  opacity:1.0;
-}
-#search .searchimg{
-	float:left;
-	width:14px;
-	height:13px;
-	background:url(images/search.gif) 0 0 no-repeat;
-	position:relative;
-	top:4px;
-}
-#search input{ 
-	width:175px; 
-	font-size: 0.85em; 
-	background:#CCC;
-	margin-top:2px;
-}
-#search input:focus{
-	background:#FFF;
-}
-
-#searchform{
-	margin:1em 0;
-}
-
-#searchform #s{
-	background:#222;
-	border:none;
-	border-bottom:1px solid #333;
-	width:30em;
-	color:#666666;
-	padding:0.25em;
-}
-
-#searchform #searchsubmit{
-	background:#000;
-	color:#666;
-	border:none;
-	font-size:0.9em;
-	text-transform:uppercase;
-	letter-spacing:0.25em;
-}
-
-/* Legacy Typo CSS */
-
-#search-results{
-	width:30%;
-	background:#333;
-	padding:0 0 0 0;
-	float:right;
-	-moz-opacity:0.9;
-	border-top:1em solid #000;
-}
-#search-results h3{
-	font-weight:bold;
-	text-align:left;
-	margin:0;
-	padding:0 0 1em 0;
-	background:#000;
-	
-}
-#search-results small{
-	display:block;
-	text-align:left;
-	font-size:0.9em;
-	padding:0.5em 1em 0.7em 1em;
-	border-top:1px solid #666;
-	border-bottom:1px solid #555;
-}
-#search-results small a{
-	color:#CCC;
-}
-#search-results ul li{
-	list-style-type:none;
-	padding:0 1em 0.5em 1em;
-	margin:0.5em 0;
-}
-#search-results ul li:hover{
-	background:#202020;
-}
-#search-result ul{ margin:0; }
-#search-results ul li a{
-	text-decoration:none;
-	border-bottom:1px dotted #CCC;
-}
-
-#search img.archives-icon{
-	margin:0 7px 0 0;
-	top:1px;
-}
\ No newline at end of file
+/*  
+Theme Name: Hemingway
+Theme URI: http://warpspire.com/hemingway
+Description: A staggered-column theme with excerpts on the front and a customizable footer.
+Version: 0.1 ALPHA-wpcom
+Author: Kyle Neath
+Author URI: http://warpspire.com
+Tags: black, dark, custom colors, theme options, two columns, bottom widgets, fixed width
+*/
+
+
+
+/*-----------------------------------------------------------------------------------------------
+  Global Styles
+-----------------------------------------------------------------------------------------------*/
+
+* {
+	padding:0;
+	margin:0;
+}
+h1, h2, h3, h4, h5, h6, p, pre, blockquote, label, ul, ol, dl, fieldset, address { margin:1em 0; }
+li, dd { margin-left:5%; }
+fieldset { padding: .5em; }
+select option{ padding:0 5px; }
+select, option { color:black; }
+.hide, .print-logo, .close-button{ display:none; }
+.left{ float:left; }
+.right{ float:right; }
+.clear{ clear:both; height:1px; font-size:1px; line-height:1px; }
+a img{ border:none; }
+
+/*-----------------------------------------------------------------------------------------------
+  Layout / Base Page Styling
+-----------------------------------------------------------------------------------------------*/
+
+body{
+	background:#272727;
+	color:#BFBFBF;
+	font-size:11px;
+	font-family:&quot;Lucida Grande&quot;, &quot;Lucida Sans Unicode&quot;, &quot;Lucida Sans&quot;, Verdana, Arial, sans-serif;
+}
+
+/* This class sets the width and position for all rows */
+.inside{
+	width:80%;
+	min-width:65em;
+	max-width:85em;
+	margin:0 auto;
+}
+
+a{
+	color:#FFF;
+}
+
+h1{
+	color:#CCC;
+	font-size:1.5em;
+	font-weight:normal;
+	margin:1.5em 0;
+}
+
+h2, h3{
+	font-size:1.15em;
+	color:#FFF;
+	font-weight:normal;
+}
+#primary h2{
+	color:#CCC;
+}
+
+p{
+	line-height:1.75em;
+}
+
+#primary ul li{
+	list-style-type:square;
+	margin:0.5em 0 0.5em 2em;
+}
+
+blockquote{
+	margin-left:1em;
+	padding-left:1em;
+	border-left:2px solid #CCC;
+	color:#CCC;
+}
+
+pre{
+	width:100%;
+	padding:1em 0;
+	overflow:auto;
+	border-top:1px dotted #333;
+	border-bottom:1px dotted #333;
+}
+
+table{
+	width:100%;
+	border-spacing:2px;
+	margin:1.5em 0;
+}
+table th, table td{ padding:0.3em 0.75em }
+table th{
+	background:#CCC;
+	color:#000;
+	text-align:left;
+}
+table td{
+	background:#333;
+	color:#FFF;
+}
+table caption{
+	text-align:left;
+	color:#FFF;
+	margin-bottom:-1em;
+	margin-top:1em;
+}
+
+.rule{
+	border-top:1px solid #CCC;
+	height:1px;
+	font-size:1px;
+	line-height:1px;
+	margin:1.5em 0;
+}
+
+/*-----------------------------------------------------------------------------------------------
+  Header
+-----------------------------------------------------------------------------------------------*/
+#header{
+	background:#000;
+}
+#header .inside{
+	padding:3em 0;
+}
+
+#header h2{
+	font-size:2.25em;
+	margin:0 0.5em 0 0;
+	padding:0 0.5em 0.25em 0;
+	border-right:1px solid #808080;
+	float:left;
+}
+#header h2 a{ text-decoration:none; }
+
+#header p{
+	padding:1em 0;
+	margin:0;
+	line-height:1em;
+}
+
+/*-----------------------------------------------------------------------------------------------
+  Primary Items
+-----------------------------------------------------------------------------------------------*/
+
+#primary{
+	background:#000;
+	padding:1px 0 2em 0;
+	color:#808080;
+}
+
+#primary.onecol-stories .primary{
+	float:left;
+	width:50%;
+}
+#primary.onecol-stories .secondary{
+	float:right;
+	width:40%;
+	margin:0 0 0 10%;
+}
+
+#primary.twocol-stories .story{
+	float:left;
+	width:48%;
+	margin:0 0 0 4%;
+	display:inline;
+}
+* html #primary.twocol-stories .story{
+	margin-left:2%;
+}
+#primary.twocol-stories .first, * html #primary.twocol-stories .first{
+	margin:0 0 0 0;
+}
+
+.story h3{
+	font-size:1.15em;
+	margin:0 0 1.5em 0;
+	font-weight:normal;
+	color:#CCC;
+}
+.story h3 a{
+	color:#CCC;
+	text-decoration:none;
+	border-bottom:1px dotted #666;
+}
+
+.story .details{
+	margin:1em 0;
+	text-align:right;
+	border-top:1px solid #333;
+	padding:0.5em 0;
+	font-size:0.95em;
+	color:#4D4D4D;
+}
+.story .details .read-on{
+	background:url(images/readon_black.gif) 100% 60% no-repeat;
+	padding-right:20px;
+}
+.story .details a{
+	color:#4D4D4D;
+	text-decoration:none;
+}
+.story .details a:hover{ color:#FFF; }
+
+/* Single Post Styles */
+
+#primary .primary{
+	float:right;
+	width:65%;
+}
+#primary .secondary{
+	float:right;
+	width:30%;
+	margin-right:5%;
+	padding-top:0.65em;
+	display:inline;
+}
+* html #primary .secondary{ margin-right:4%; }
+
+.secondary .featured p{
+	border-bottom:1px solid #333333;
+	border-top: 1px solid #333333;
+	padding:0.5em 0 0.6em 0;
+	line-height:1.5em;
+	margin:1em 0 0 0;
+}
+.secondary .featured dl{
+	margin:0 0;
+	border-bottom:1px solid #333333;
+	padding:0.5em 0 0.6em 0;
+}
+.secondary dt{
+	display:inline;
+	margin:0;
+	padding:0;
+	color:#AAA;
+}
+.secondary dd{
+	display:inline;
+	margin:0;
+	padding:0;
+}
+.secondary dd a{ color:#808080; }
+.secondary dd a:hover{ color:#FFF; }
+
+.single-post h1, .single-post h2{ margin-top:0; }
+
+/*-----------------------------------------------------------------------------------------------
+	Secondary Items
+-----------------------------------------------------------------------------------------------*/
+
+#secondary{
+	background:#0C0C0C;
+	padding:1px 2em;
+	border-top:1px solid #1C1C1C;
+}
+
+.comment-head{
+	border-bottom:1px solid #1C1C1C;
+	padding:0.8em 2em 1.0em 2em;
+}
+.comment-head h2{
+	font-size:1.5em;
+	margin:0;
+}
+.comment-head a{
+	text-decoration:none;
+	color:#868686;
+}
+.comment-head .details{
+	font-size:0.95em;
+}
+
+ol#comments{
+	list-style-type:none;
+	margin:2em 0;
+}
+ol#comments li{
+	list-style-type:none;
+	margin:2em 0;
+}
+
+ol#comments li .avatar {
+	border: 1px solid #222;
+	padding: 2px;
+}
+
+#comments cite{
+	float:left;
+	width:31%;
+	font-style:normal;
+	text-align:right;
+}
+* html #comments cite{ width:30.6%; }
+#comments cite span{
+	display:block;
+}
+#comments cite span.avatarspan{ float: left; }
+#comments cite .author{ font-size:1.2em; }
+#comments cite .author a{
+	text-decoration:none;
+}
+#comments cite .admin-tools{
+	margin:5px 0;
+}
+#comments cite .admin-tools a{
+	float:right;
+	margin:0 5px;
+	padding:0px 3px 3px;
+	background:#666;
+	border:1px solid #999;
+	text-decoration:none;
+}
+#primary .secondary .admin-tools{ margin:1em 0; }
+
+#preview{
+	margin:1em 0;
+	padding:0.5em;
+	border:1px solid #333;
+}
+#preview p{ margin:1em 0 0 0; }
+#errors{ color:#FF0000; font-weight:bold; }
+
+#comments .pingback cite .author{
+	display:block;
+	padding-top:68px;
+	background:url(images/trackback_pingback.gif) 100% 0 no-repeat;
+}
+
+#comments .content{
+	float:left;
+	width:60%;
+	margin-left:1.9%;
+	border-left:1px solid #868686;
+	padding: 0 0 0 2%;
+}
+#comments .content p{
+	margin:0 0 1em 0;
+}
+#comments .content h3{
+	margin:0;
+	font-size:1em;
+}
+
+#comment-form{
+	margin:5em 0 5em 35.4%;
+	width:36em;
+}
+input.textfield{
+	width: 15em;
+	margin:5px 0;
+}
+textarea.commentbox{
+	width:28em;
+	height:10em;
+	padding:0.25em;
+	margin:5px 0;
+	font-size:1.25em;
+	font-family:Arial, Helvetica, sans-serif;
+}
+
+label.text{
+	position:relative;
+	left:0.5em;
+	top:-0.5em;
+}
+.formactions input.submit{ 
+	float:right; 
+	margin:-1em 0 0 0;
+	padding:0 0.5em;
+}
+.formactions .spinner{
+	float:right;
+	margin:-8px -20px 0 0;
+}
+
+/*-----------------------------------------------------------------------------------------------
+  Ancillary Items
+-----------------------------------------------------------------------------------------------*/
+
+#ancillary{
+	padding:2em 0 0 0;
+}
+#ancillary .block{
+	float:left;
+	width: 30%;
+	margin:0 0 0 5%;
+}
+#ancillary .twice-length{ width:65%; }
+#ancillary .thrice-length{ width:100%; }
+* html #ancillary .block{
+	margin:0 0 0 4%;
+}
+#ancillary .first, * html #ancillary .first{
+	clear:both;
+	margin:0;
+}
+#ancillary .block-separator{
+	clear:both;
+	height:2.5em;
+}
+
+#ancillary .block h2, #ancillary .block h3{
+	margin:0 0 2em 0;
+}
+
+ul.dates, ul.counts, ul.blogroll ul, ul.pages{
+	list-style-type:none;
+	margin:1.5em 0 2em 0;
+	border-top:1px solid #3D3D3D;
+}
+ul.dates li, ul.counts li, ul.blogroll ul li, ul.pages li{
+	list-style-type:none;
+	margin:0;
+	padding:0.5em 0;
+	border-bottom:1px solid #3D3D3D;
+}
+ul.dates .date{
+	color:#858585;
+	padding:0 1.5em 0 0;
+}
+
+ul.counts .count{
+	float:right;
+	color:#858585;
+}
+
+ul.dates a, ul.counts a, ul.blogroll a, ul.pages a{
+	color:#BFBFBF;
+	text-decoration:none;
+}
+ul.dates a:hover, ul.dates a:hover .date, ul.counts a:hover, ul.counts a:hover .count, ul.blogroll a:hover, ul.pages a:hover{ 
+	color:#FFF;
+}
+
+ul.blogroll{ margin-top:0; }
+ul.blogroll li{
+	list-style-type:none;
+	margin:0;
+}
+
+ul.pages ul{
+	margin:0;
+}
+ul.pages ul li{
+	border:none;
+	margin-left:2em;
+	list-style-type:square;
+}
+/*-----------------------------------------------------------------------------------------------
+  Foooter
+-----------------------------------------------------------------------------------------------*/
+
+#footer{
+	clear:both;
+	color:#939393;
+	margin:2em 0 3em 0;
+}
+#footer .inside{
+	background:url(images/footer_black.gif) 50% 0 repeat-x;
+	padding:1em 0;
+}
+#footer p{
+	margin:0;
+	font-size:0.95em;
+}
+#footer p.copyright{ float:left; }
+#footer p.attributes{ float:right; }
+#footer p.attributes a{
+	padding:0 0 0 1em;
+	text-decoration:none;
+	color:#525252;
+}
+#footer p.attributes a:hover{
+	color:#FFF;
+}
+
+/*-----------------------------------------------------------------------------------------------
+  Search
+-----------------------------------------------------------------------------------------------*/
+
+#search{
+	float:right;
+	width:200px;
+	margin:1em 0 0 0;
+	-moz-opacity:0.4;
+	text-align:right;
+}
+#search:hover{
+	-moz-opacity:1.0;
+}
+#search .searchimg{
+	float:left;
+	width:14px;
+	height:13px;
+	background:url(images/search.gif) 0 0 no-repeat;
+	position:relative;
+	top:4px;
+}
+#search input{ 
+	width:175px; 
+	font-size: 0.85em; 
+	background:#CCC;
+	margin-top:2px;
+}
+#search input:focus{
+	background:#FFF;
+}
+
+#searchform{
+	margin:1em 0;
+}
+
+#searchform #s{
+	background:#222;
+	border:none;
+	border-bottom:1px solid #333;
+	width:30em;
+	color:#666666;
+	padding:0.25em;
+}
+
+#searchform #searchsubmit{
+	background:#000;
+	color:#666;
+	border:none;
+	font-size:0.9em;
+	text-transform:uppercase;
+	letter-spacing:0.25em;
+}
+
+/* Legacy Typo CSS */
+
+#search-results{
+	width:30%;
+	background:#333;
+	padding:0 0 0 0;
+	float:right;
+	-moz-opacity:0.9;
+	border-top:1em solid #000;
+}
+#search-results h3{
+	font-weight:bold;
+	text-align:left;
+	margin:0;
+	padding:0 0 1em 0;
+	background:#000;
+	
+}
+#search-results small{
+	display:block;
+	text-align:left;
+	font-size:0.9em;
+	padding:0.5em 1em 0.7em 1em;
+	border-top:1px solid #666;
+	border-bottom:1px solid #555;
+}
+#search-results small a{
+	color:#CCC;
+}
+#search-results ul li{
+	list-style-type:none;
+	padding:0 1em 0.5em 1em;
+	margin:0.5em 0;
+}
+#search-results ul li:hover{
+	background:#202020;
+}
+#search-result ul{ margin:0; }
+#search-results ul li a{
+	text-decoration:none;
+	border-bottom:1px dotted #CCC;
+}
+
+#search img.archives-icon{
+	margin:0 7px 0 0;
+	top:1px;
+}
+
+img.centered, img.aligncenter {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+img.alignright {
+	padding: 4px;
+	margin: 0 0 2px 7px;
+	display: inline;
+}
+
+img.alignleft {
+	padding: 4px;
+	margin: 0 7px 2px 0;
+	display: inline;
+}
+
+.alignright {
+	float: right;
+}
+
+.alignleft {
+	float: left;
+}
+.aligncenter, div.aligncenter {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+.wp-caption {
+	border: 1px solid #ddd;
+	text-align: center;
+	background-color: #f3f3f3;
+	padding-top: 4px;
+	margin: 10px;
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+.wp-caption img {
+	margin: 0;
+	padding: 0;
+	border: 0 none;
+}
+
+.wp-caption p.wp-caption-text {
+	font-size: 11px;
+	color: #000;
+	line-height: 17px;
+	padding: 0 4px 5px;
+	margin: 0;
+}</diff>
      <filename>style.css</filename>
    </modified>
    <modified>
      <diff>@@ -1,17 +1,17 @@
-/*****************
-  This is your playground. Customize Hemingway to your hearts extent. 
-*****************
-
-/* LAYOUT WIDTH */
-
-/* Example for a fluid layout:
-.inside{
-	width:95%;
-}
-*/
-
-/* Example for a static layout:
-.inside{
-	width:800px;
-}
+/*****************
+  This is your playground. Customize Hemingway to your hearts extent. 
+*****************
+
+/* LAYOUT WIDTH */
+
+/* Example for a fluid layout:
+.inside{
+	width:95%;
+}
+*/
+
+/* Example for a static layout:
+.inside{
+	width:800px;
+}
 */
\ No newline at end of file</diff>
      <filename>styles/user_styles.css</filename>
    </modified>
    <modified>
      <diff>@@ -1,91 +1,85 @@
-body, #primary{
-	color:#444;
-}
-#header, #primary{
-	background:#FFF;
-}
-
-#secondary{
-	background:#F3F3F3;
-}
-
-body, #ancillary{
-	background:#E5E5E5;
-}
-#ancillary{
-	border-top:1px solid #D5D5D5;
-}
-
-a, .story .details a, .story .details a:hover{
-	color:#000;
-}
-.story .details a:hover{
-	text-decoration:underline;
-}
-.story .details{ border-top:1px solid #7F7F7F; }
-
-h1, h2, h3{ color:#000; }
-
-#primary h2{ color:#333; }
-
-blockquote{ color:#333; }
-
-table th{ color:#FFF; background:#333; }
-table td{ color:#000; background:#EAEAEA; }
-
-#header h2{ border-right:1px solid #7F7F7F; }
-
-.secondary .featured p{
-	border-bottom:1px solid #CCC;
-	border-top: 1px solid #CCC;
-}
-.secondary .featured dl{
-	border-bottom:1px solid #CCC;
-}
-.secondary dd a{ color:#7F7F7F; }
-.secondary dd a:hover{ color:#000; }
-
-
-.secondary .featured dt{
-	color:#333;
-}
-#primary .story h2, #primary .primary h2, #primary .single-story .primary h3, .story h3, .story h3 a{
-	color:#333;
-}
-
-#secondary{
-	border-top:1px solid #E3E3E3;
-}
-.comment-head{
-	border-bottom:1px solid #E3E3E3;
-}
-
-ul.dates, ul.counts, ul.blogroll li ul, ul.pages{
-	border-top:1px solid #C2C2C2;
-}
-ul.dates li, ul.counts li, ul.blogroll li ul li, ul.pages li{
-	border-bottom:1px solid #C2C2C2;
-}
-ul.dates .date, ul.counts .count{
-	color:#7A7A7A;
-}
-ul.dates a, ul.counts a, ul.blogroll a, ul.pages a{
-	color:#404040;
-}
-ul.dates a:hover, ul.dates a:hover .date, ul.counts a:hover, ul.counts a:hover .count, ul.blogroll a:hover, ul.pages a:hover{ color:#000; }
-
-#footer{ color: #666; }
-#footer a, #footer p.attributes a{
-	color:#333;
-}
-#footer a:hover, #footer p.attributes a:hover{ color:#000; }
-
-
-/* Images */
-
-#footer .inside{
-	background:url(white/footer.gif) 50% 0 repeat-x;
-}
-#search .searchimg{
-	background:url(white/search.gif) 0 0 no-repeat;
-}
\ No newline at end of file
+body{
+	color:#444;
+}
+#header, #primary{
+	background:#FFF;
+}
+
+#secondary{
+	background:#F3F3F3;
+}
+
+body, #ancillary{
+	background:#D8D8D8;
+}
+
+a, .story .details a, .story .details a:hover{
+	color:#000;
+}
+.story .details a:hover{
+	text-decoration:underline;
+}
+.story .details{ border-top:1px solid #7F7F7F; }
+
+h1, h2, h3{ color:#000; }
+
+#primary h2{ color:#333; }
+
+blockquote{ color:#333; }
+
+table th{ color:#FFF; background:#333; }
+table td{ color:#000; background:#EAEAEA; }
+
+#header h2{ border-right:1px solid #7F7F7F; }
+.secondary dd a:hover {
+	color: #000;
+}
+.secondary .featured p{
+	border-bottom:1px solid #CCC;
+	border-top: 1px solid #CCC;
+}
+.secondary .featured dl{
+	border-bottom:1px solid #CCC;
+}
+.secondary .featured dt{
+	color:#333;
+}
+#primary .story h2, #primary .primary h2, #primary .single-story .primary h3, .story h3, .story h3 a{
+	color:#333;
+}
+
+#secondary{
+	border-top:1px solid #E3E3E3;
+}
+.comment-head{
+	border-bottom:1px solid #E3E3E3;
+}
+
+ul.dates, ul.counts, ul.blogroll li ul, ul.pages{
+	border-top:1px solid #C2C2C2;
+}
+ul.dates li, ul.counts li, ul.blogroll li ul li, ul.pages li{
+	border-bottom:1px solid #C2C2C2;
+}
+ul.dates .date, ul.counts .count{
+	color:#7A7A7A;
+}
+ul.dates a, ul.counts a, ul.blogroll a, ul.pages a{
+	color:#404040;
+}
+ul.dates a:hover, ul.dates a:hover .date, ul.counts a:hover, ul.counts a:hover .count, ul.blogroll a:hover, ul.pages a:hover{ color:#000; }
+
+#footer a, #footer p.attributes a{
+	color:#333;
+}
+#footer a:hover, #footer p.attributes a:hover{ color:#000; }
+
+
+/* Images */
+
+#footer .inside{
+	background:url(white/footer.gif) 50% 0 repeat-x;
+}
+#search .searchimg{
+	background:url(white/search.gif) 0 0 no-repeat;
+}</diff>
      <filename>styles/white.css</filename>
    </modified>
    <modified>
      <filename>styles/white/footer.gif</filename>
    </modified>
    <modified>
      <filename>styles/white/search.gif</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>admin/images/icon_delete.gif</filename>
    </removed>
    <removed>
      <filename>blocks/flickr_rss.php</filename>
    </removed>
    <removed>
      <filename>blocks/related_posts.php</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>291a62b54840be95b11adbe3af82da58c49b6cec</id>
    </parent>
  </parents>
  <author>
    <name>Kyle Neath</name>
    <email>kneath@gmail.com</email>
  </author>
  <url>http://github.com/kneath/hemingway/commit/dd7091b49313a232e1d744ec2d1cb64e9ecfa228</url>
  <id>dd7091b49313a232e1d744ec2d1cb64e9ecfa228</id>
  <committed-date>2009-01-26T00:55:36-08:00</committed-date>
  <authored-date>2009-01-26T00:55:30-08:00</authored-date>
  <message>Blindly commit updates from the wordpress.com team. Thanks!</message>
  <tree>c793508828d8ed0985b78a39123c3a0000ea01ed</tree>
  <committer>
    <name>Kyle Neath</name>
    <email>kneath@gmail.com</email>
  </committer>
</commit>
