<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>image.php</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,10 +1,10 @@
 &lt;?php get_header(); ?&gt;
-    
-    &lt;div id=&quot;content&quot; class=&quot;widecolumn&quot;&gt;
-        &lt;h2 class=&quot;title&quot;&gt;Problem?&lt;/h2&gt;
-        &lt;p&gt;Looks like you have a problem here sir/madam. You sure you have the right place? Maybe you got a little lost? Maybe you're looking for something you're not supposed to find? Either way, just go search for it, it can't hurt.&lt;/p&gt;
-    &lt;/div&gt;
-    
+
+	&lt;div id=&quot;content&quot; class=&quot;widecolumn&quot;&gt;
+		&lt;h2 class=&quot;title&quot;&gt;&lt;?php _e('Problem?', 'chaoticsoul'); ?&gt;&lt;/h2&gt;
+		&lt;p&gt;&lt;?php _e(&quot;Looks like you have a problem here sir/madam. You sure you have the right place? Maybe you got a little lost? Maybe you're looking for something you're not supposed to find? Either way, just go search for it, it can't hurt.&quot;, 'chaoticsoul'); ?&gt;&lt;/p&gt;
+	&lt;/div&gt;
+
 &lt;?php get_sidebar(); ?&gt;
 
-&lt;?php get_footer(); ?&gt;
\ No newline at end of file
+&lt;?php get_footer(); ?&gt;</diff>
      <filename>404.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,54 +1,55 @@
 &lt;?php get_header(); ?&gt;
-    
-    &lt;div id=&quot;content&quot; class=&quot;widecolumn&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;h2 class=&quot;title&quot;&gt;Archive for the '&lt;?php echo single_cat_title(); ?&gt;' Category&lt;/h2&gt;
-        
-        &lt;?php /* If this is a daily archive */ } elseif (is_day()) { ?&gt;
-        &lt;h2 class=&quot;title&quot;&gt;Archive for &lt;?php the_time('F jS, Y'); ?&gt;&lt;/h2&gt;
-        
-        &lt;?php /* If this is a monthly archive */ } elseif (is_month()) { ?&gt;
-        &lt;h2 class=&quot;title&quot;&gt;Archive for &lt;?php the_time('F, Y'); ?&gt;&lt;/h2&gt;
-        
-        &lt;?php /* If this is a yearly archive */ } elseif (is_year()) { ?&gt;
-        &lt;h2 class=&quot;title&quot;&gt;Archive for &lt;?php the_time('Y'); ?&gt;&lt;/h2&gt;
-        
-        &lt;?php /* If this is a search */ } elseif (is_search()) { ?&gt;
-        &lt;h2 class=&quot;title&quot;&gt;Search Results&lt;/h2&gt;
-        
-        &lt;?php /* If this is an author archive */ } elseif (is_author()) { ?&gt;
-        &lt;h2 class=&quot;title&quot;&gt;Author Archive&lt;/h2&gt;
-        
-        &lt;?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) &amp;&amp; !empty($_GET['paged'])) { ?&gt;
-        &lt;h2 class=&quot;title&quot;&gt;Blog Archives&lt;/h2&gt;
-        
-        &lt;?php } ?&gt;
-        
-        &lt;?php while (have_posts()) : the_post(); ?&gt;
-        &lt;div class=&quot;post&quot;&gt;
-            &lt;h2 id=&quot;post-&lt;?php the_ID(); ?&gt;&quot;&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;
-            &amp;bull; &lt;?php the_time('l, F jS, Y') ?&gt;
-            &lt;p class=&quot;postmetadata&quot;&gt;Posted in &lt;?php the_category(', ') ?&gt; | &lt;?php edit_post_link('Edit', '', ' | '); ?&gt;  &lt;?php comments_popup_link('No Comments &amp;#187;', '1 Comment &amp;#187;', '% Comments &amp;#187;'); ?&gt;&lt;/p&gt; 
-        &lt;/div&gt;
-        &lt;br /&gt;
-        &lt;?php endwhile; ?&gt;
-        
-        &lt;div class=&quot;navigation&quot;&gt;
-            &lt;div class=&quot;alignleft&quot;&gt;&lt;?php next_posts_link('&amp;laquo; Previous Entries') ?&gt;&lt;/div&gt;
-            &lt;div class=&quot;alignright&quot;&gt;&lt;?php previous_posts_link('Next Entries &amp;raquo;') ?&gt;&lt;/div&gt;
-        &lt;/div&gt;
-        
-    &lt;?php else : ?&gt;
-        
-        &lt;h2 class=&quot;center&quot;&gt;Not Found&lt;/h2&gt;
-        &lt;?php include (TEMPLATEPATH . '/searchform.php'); ?&gt;
-        
-    &lt;?php endif; ?&gt;
-    &lt;/div&gt;
-    
+	
+	&lt;div id=&quot;content&quot; class=&quot;widecolumn&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;h2 class=&quot;title&quot;&gt;&lt;?php printf(__(&quot;Archive for the '%s' Category&quot;, 'chaoticsoul'), single_cat_title('', false)); ?&gt;&lt;/h2&gt;
+		
+		&lt;?php /* If this is a daily archive */ } elseif (is_day()) { ?&gt;
+		&lt;h2 class=&quot;title&quot;&gt;&lt;?php printf(__('Archive for %s', 'chaoticsoul'), get_the_time('F jS, Y')); ?&gt;&lt;/h2&gt;
+		
+		&lt;?php /* If this is a monthly archive */ } elseif (is_month()) { ?&gt;
+		&lt;h2 class=&quot;title&quot;&gt;&lt;?php printf(__('Archive for %s', 'chaoticsoul'), get_the_time('F, Y')); ?&gt;&lt;/h2&gt;
+		
+		&lt;?php /* If this is a yearly archive */ } elseif (is_year()) { ?&gt;
+		&lt;h2 class=&quot;title&quot;&gt;&lt;?php printf(__('Archive for %s', 'chaoticsoul'), get_the_time('Y')); ?&gt;&lt;/h2&gt;
+		
+		&lt;?php /* If this is a search */ } elseif (is_search()) { ?&gt;
+		&lt;h2 class=&quot;title&quot;&gt;&lt;?php _e('Search Results', 'chaoticsoul'); ?&gt;&lt;/h2&gt;
+		
+		&lt;?php /* If this is an author archive */ } elseif (is_author()) { ?&gt;
+		&lt;h2 class=&quot;title&quot;&gt;&lt;?php _e('Author Archive', 'chaoticsoul'); ?&gt;&lt;/h2&gt;
+		
+		&lt;?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) &amp;&amp; !empty($_GET['paged'])) { ?&gt;
+		&lt;h2 class=&quot;title&quot;&gt;&lt;?php _e('Blog Archives', 'chaoticsoul'); ?&gt;&lt;/h2&gt;
+		
+		&lt;?php } ?&gt;
+
+		&lt;?php while (have_posts()) : the_post(); ?&gt;
+		&lt;div &lt;?php post_class(); ?&gt;&gt;
+			&lt;h2 id=&quot;post-&lt;?php the_ID(); ?&gt;&quot;&gt;&lt;a href=&quot;&lt;?php the_permalink() ?&gt;&quot; rel=&quot;bookmark&quot; title=&quot;&lt;?php printf(__('Permanent Link to %s', 'chaoticsoul'), get_the_title()); ?&gt;&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt;&lt;/h2&gt; &amp;bull; &lt;?php the_time('l, F jS, Y') ?&gt;
+			&amp;bull; &lt;?php the_time(get_option('date_format')) ?&gt; &amp;bull; &lt;?php comments_popup_link(__('No Comments', 'chaoticsoul'), __('1 Comment', 'chaoticsoul'), __('% Comments', 'chaoticsoul')); ?&gt;&lt;?php edit_post_link(__('Edit', 'chaoticsoul'), ' (', ')'); ?&gt;
+			&lt;p class=&quot;postmetadata&quot;&gt;&lt;?php printf(__('Posted in %s', 'chaoticsoul'), get_the_category_list(', ')); ?&gt;&lt;?php the_tags('&lt;br /&gt;' .  __( 'Tags' ) . ': ', ', ', '');  ?&gt;&lt;/p&gt;
+		&lt;/div&gt;
+		
+		&lt;br /&gt;
+		&lt;?php endwhile; ?&gt;
+		
+		&lt;div class=&quot;navigation&quot;&gt;
+			&lt;div class=&quot;alignleft&quot;&gt;&lt;?php next_posts_link(__('&amp;laquo; Previous Entries', 'chaoticsoul')) ?&gt;&lt;/div&gt;
+			&lt;div class=&quot;alignright&quot;&gt;&lt;?php previous_posts_link(__('Next Entries &amp;raquo;', 'chaoticsoul')) ?&gt;&lt;/div&gt;
+		&lt;/div&gt;
+		
+	&lt;?php else : ?&gt;
+		
+		&lt;h2 class=&quot;center&quot;&gt;&lt;?php _e('Not Found', 'chaoticsoul'); ?&gt;&lt;/h2&gt;
+		&lt;?php include (TEMPLATEPATH . '/searchform.php'); ?&gt;
+		
+	&lt;?php endif; ?&gt;
+	&lt;/div&gt;
+	
 &lt;?php get_sidebar(); ?&gt;
 
 &lt;?php get_footer(); ?&gt;
\ No newline at end of file</diff>
      <filename>archive.php</filename>
    </modified>
    <modified>
      <diff>@@ -7,15 +7,15 @@ Template Name: Archives
 &lt;?php get_header(); ?&gt;
 
 &lt;div id=&quot;content&quot; class=&quot;widecolumn&quot;&gt;
-    &lt;h2 class=&quot;title&quot;&gt;Archives by Month:&lt;/h2&gt;
-    &lt;ul class=&quot;archive&quot;&gt;
-        &lt;?php wp_get_archives('type=monthly'); ?&gt;
-    &lt;/ul&gt;
-    
-    &lt;h2 class=&quot;title&quot;&gt;Archives by Subject:&lt;/h2&gt;
-    &lt;ul class=&quot;archive&quot;&gt;
-        &lt;?php wp_list_cats(); ?&gt;
-    &lt;/ul&gt;
+	&lt;h2 class=&quot;title&quot;&gt;&lt;?php _e('Archives by Month:', 'chaoticsoul'); ?&gt;&lt;/h2&gt;
+	&lt;ul class=&quot;archive&quot;&gt;
+		&lt;?php wp_get_archives('type=monthly'); ?&gt;
+	&lt;/ul&gt;
+	
+	&lt;h2 class=&quot;title&quot;&gt;&lt;?php _e('Archives by Subject:', 'chaoticsoul'); ?&gt;&lt;/h2&gt;
+	&lt;ul class=&quot;archive&quot;&gt;
+		&lt;?php wp_list_cats(); ?&gt;
+	&lt;/ul&gt;
 &lt;/div&gt;
 
 &lt;?php get_sidebar(); ?&gt;</diff>
      <filename>archives.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,60 +1,54 @@
 &lt;?php get_header(); ?&gt;
 
-    &lt;div id=&quot;content&quot; class=&quot;widecolumn&quot;&gt;
-    &lt;?php if (have_posts()) : while (have_posts()) : the_post(); ?&gt;
-        
-        &lt;div class=&quot;navigation&quot;&gt;
-            &lt;div class=&quot;alignleft&quot;&gt;&amp;nbsp;&lt;/div&gt;
-            &lt;div class=&quot;alignright&quot;&gt;&amp;nbsp;&lt;/div&gt;
-        &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;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;
-                &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 link_pages('&lt;p&gt;&lt;strong&gt;Pages:&lt;/strong&gt; ', '&lt;/p&gt;', 'number'); ?&gt;
-                &lt;p class=&quot;postmetadata alt&quot;&gt;
-                    &lt;small&gt;
-                        This entry was posted
-                        &lt;?php /* This is commented, because it requires a little adjusting sometimes.
-                            You'll need to download this plugin, and follow the instructions:
-                            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;.
-                        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)) {
-                            // Both Comments and Pings are open ?&gt;
-                            You can &lt;a href=&quot;#respond&quot;&gt;leave a response&lt;/a&gt;, or &lt;a href=&quot;&lt;?php trackback_url(true); ?&gt;&quot; rel=&quot;trackback&quot;&gt;trackback&lt;/a&gt; from your own site.
-                        
-                        &lt;?php } elseif (!('open' == $post-&gt; comment_status) &amp;&amp; ('open' == $post-&gt;ping_status)) {
-                            // Only Pings are Open ?&gt;
-                            Responses are currently closed, but you can &lt;a href=&quot;&lt;?php trackback_url(true); ?&gt; &quot; rel=&quot;trackback&quot;&gt;trackback&lt;/a&gt; from your own site.
-                        
-                        &lt;?php } elseif (('open' == $post-&gt; comment_status) &amp;&amp; !('open' == $post-&gt;ping_status)) {
-                            // Comments are open, Pings are not ?&gt;
-                            You can skip to the end and leave a response. Pinging is currently not allowed.
-                        
-                        &lt;?php } elseif (!('open' == $post-&gt; comment_status) &amp;&amp; !('open' == $post-&gt;ping_status)) {
-                            // Neither Comments, nor Pings are open ?&gt;
-                            Both comments and pings are currently closed.
-                        
-                        &lt;?php } edit_post_link('Edit this entry.','',''); ?&gt;
-                    
-                    &lt;/small&gt;
-                &lt;/p&gt;
-            &lt;/div&gt;
-        &lt;/div&gt;
-    &lt;?php comments_template(); ?&gt;
-    
-    &lt;?php endwhile; else: ?&gt;
-    
-        &lt;p&gt;Sorry, no attachments matched your criteria.&lt;/p&gt;
-    
-    &lt;?php endif; ?&gt;
-    &lt;/div&gt;
+	&lt;div id=&quot;content&quot; class=&quot;widecolumn&quot;&gt;
+	&lt;?php if (have_posts()) : while (have_posts()) : the_post(); ?&gt;
+		
+		&lt;div class=&quot;navigation&quot;&gt;
+			&lt;div class=&quot;alignleft&quot;&gt;&amp;nbsp;&lt;/div&gt;
+			&lt;div class=&quot;alignright&quot;&gt;&amp;nbsp;&lt;/div&gt;
+		&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 &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;&lt;?php printf(__('Permanent Link to %s', 'chaoticsoul'), get_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;
+				&lt;?php the_content('&lt;p class=&quot;serif&quot;&gt;'.__('Read the rest of this entry &amp;raquo;', 'chaoticsoul').'&lt;/p&gt;'); ?&gt;
+				&lt;?php link_pages('&lt;p&gt;&lt;strong&gt;'.__('Pages:', 'chaoticsoul').'&lt;/strong&gt; ', '&lt;/p&gt;', 'number'); ?&gt;
+				&lt;p class=&quot;postmetadata alt&quot;&gt;
+					&lt;small&gt;
+					&lt;?php
+						printf(__('This entry was posted on %s at %s. ', 'chaoticsoul'), get_the_time(get_option('date_format')), get_the_time(get_option('time_format'))); 
+						printf(__('You can follow any responses to this entry through the %s feed. ', 'chaoticsoul'), '&lt;a href=&quot;'.get_post_comments_feed_link().'&quot;&gt;RSS 2.0&lt;/a&gt;');
+						if (('open' == $post-&gt; comment_status) &amp;&amp; ('open' == $post-&gt;ping_status)) {
+							// Both Comments and Pings are open
+							printf(__('You can &lt;a href=&quot;#respond&quot;&gt;leave a response&lt;/a&gt;, or &lt;a href=&quot;%s&quot; rel=&quot;trackback&quot;&gt;trackback&lt;/a&gt; from your own site. ', 'chaoticsoul'), get_trackback_url(true));
+						} elseif (!('open' == $post-&gt; comment_status) &amp;&amp; ('open' == $post-&gt;ping_status)) {
+							// Only Pings are Open
+							printf(__('Responses are currently closed, but you can &lt;a href=&quot;%s&quot; rel=&quot;trackback&quot;&gt;trackback&lt;/a&gt; from your own site. ', 'chaoticsoul'), get_trackback_url(true));
+						
+						} elseif (('open' == $post-&gt; comment_status) &amp;&amp; !('open' == $post-&gt;ping_status)) {
+							// Comments are open, Pings are not
+							_e('You can skip to the end and leave a response. Pinging is currently not allowed. ', 'chaoticsoul');
+						
+						} elseif (!('open' == $post-&gt; comment_status) &amp;&amp; !('open' == $post-&gt;ping_status)) {
+							// Neither Comments, nor Pings are open
+							_e('Both comments and pings are currently closed. ', 'chaoticsoul');
+						
+						}
+						edit_post_link(__('Edit this entry.', 'chaoticsoul'),'','');
+					?&gt;
+					&lt;/small&gt;
+				&lt;/p&gt;
+			&lt;/div&gt;
+		&lt;/div&gt;
+	&lt;?php comments_template(); ?&gt;
+	
+	&lt;?php endwhile; else: ?&gt;
+	
+		&lt;p&gt;&lt;?php _e('Sorry, no attachments matched your criteria.', 'chaoticsoul'); ?&gt;&lt;/p&gt;
+	
+	&lt;?php endif; ?&gt;
+	&lt;/div&gt;
 
 &lt;?php get_footer(); ?&gt;</diff>
      <filename>attachment.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,100 +1,85 @@
 &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';
+	if (!empty($_SERVER['SCRIPT_FILENAME']) &amp;&amp; '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('This post is password protected. Enter the password to view comments.', 'chaoticsoul'); ?&gt;&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;?php if ( have_comments() ) : ?&gt;
 &lt;div class=&quot;comments&quot;&gt;
-    &lt;h3&gt;&lt;?php comments_number('No Responses', 'One Response', '% Responses' );?&gt; to &amp;#8220;&lt;?php the_title(); ?&gt;&amp;#8221;&lt;/h3&gt; 
-    &lt;ol class=&quot;commentlist&quot;&gt;
-    &lt;?php foreach ($comments as $comment) : ?&gt;
-        &lt;li class=&quot;&lt;?php echo $oddcomment; ?&gt;&quot; id=&quot;comment-&lt;?php comment_ID() ?&gt;&quot;&gt;
-            &lt;?php comment_text() ?&gt;
-            &lt;p class=&quot;commentmetadata&quot;&gt;
-                &lt;?php echo get_avatar( $id_or_email, $size = '32'); ?&gt;
-                &lt;small&gt;
-                &lt;cite&gt;&lt;?php comment_author_link() ?&gt;&lt;/cite&gt; said this on
-                &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;a href=&quot;#comment-&lt;?php comment_ID() ?&gt;&quot; title=&quot;&quot;&gt;&lt;?php comment_date('F jS, Y') ?&gt; at &lt;?php comment_time() ?&gt;&lt;/a&gt; &lt;?php edit_comment_link('edit','(',')'); ?&gt;
-                &lt;/small&gt;
-            &lt;/p&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;h3&gt;&lt;?php comments_number(__('No Responses', 'chaoticsoul'), __('One Response', 'chaoticsoul'), __('% Responses', 'chaoticsoul') );?&gt; to &amp;#8220;&lt;?php the_title(); ?&gt;&amp;#8221;&lt;/h3&gt; 
+	&lt;ol class=&quot;commentlist&quot;&gt;
+	&lt;?php wp_list_comments(array('callback' =&gt; 'chaoticsoul_comment')); ?&gt;
+	&lt;/ol&gt;
+	&lt;div class=&quot;navigation&quot;&gt;
+		&lt;div class=&quot;alignleft&quot;&gt;&lt;?php previous_comments_link() ?&gt;&lt;/div&gt;
+		&lt;div class=&quot;alignright&quot;&gt;&lt;?php next_comments_link() ?&gt;&lt;/div&gt;
+	&lt;/div&gt;
 &lt;/div&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;Comments are closed.&lt;/p&gt;
-    
-    &lt;?php endif; ?&gt;
-    
+&lt;?php endif; ?&gt;
+
+&lt;?php if ( $comments &amp;&amp; !comments_open() ) : ?&gt;
+	&lt;p class=&quot;nocomments&quot;&gt;&lt;?php _e('Comments are closed.', 'chaoticsoul'); ?&gt;&lt;/p&gt;
 &lt;?php endif; ?&gt;
 
 &lt;?php if ('open' == $post-&gt;comment_status) : ?&gt;
-&lt;div class=&quot;comments clearfix&quot;&gt;
-    &lt;h3 id=&quot;respond&quot;&gt;Leave a Reply&lt;/h3&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;p&gt;&lt;textarea name=&quot;comment&quot; id=&quot;comment&quot; cols=&quot;65&quot; rows=&quot;10&quot; tabindex=&quot;4&quot;&gt;&lt;/textarea&gt;&lt;/p&gt;
-    
-    &lt;?php else : ?&gt;
-    
-    &lt;p&gt;&lt;textarea name=&quot;comment&quot; id=&quot;comment&quot; cols=&quot;65&quot; rows=&quot;5&quot; tabindex=&quot;4&quot;&gt;&lt;/textarea&gt;&lt;/p&gt;
-    
-    &lt;p&gt;&lt;input type=&quot;text&quot; name=&quot;author&quot; id=&quot;author&quot; value=&quot;&lt;?php echo $comment_author; ?&gt;&quot; size=&quot;20&quot; tabindex=&quot;1&quot; /&gt;&lt;br /&gt;
-    &lt;label for=&quot;author&quot;&gt;&lt;small&gt;&lt;?php if ($req) echo &quot;*&quot;; ?&gt; Name&lt;/small&gt;&lt;/label&gt;&lt;/p&gt;
-    
-    &lt;p&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; size=&quot;20&quot; tabindex=&quot;2&quot; /&gt;&lt;br /&gt;
-    &lt;label for=&quot;email&quot;&gt;&lt;small&gt;&lt;?php if ($req) echo &quot;*&quot;; ?&gt; Mail (private)&lt;/small&gt;&lt;/label&gt;&lt;/p&gt;
-    
-    &lt;p&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; size=&quot;19&quot; tabindex=&quot;3&quot; /&gt;&lt;br /&gt;
-    &lt;label for=&quot;url&quot;&gt;&lt;small&gt;Website&lt;/small&gt;&lt;/label&gt;&lt;/p&gt;
-    
-    &lt;?php endif; ?&gt;
-    
-    &lt;!--&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;--&gt;
-    
-    &lt;p&gt;&lt;input name=&quot;submit&quot; type=&quot;submit&quot; id=&quot;submit&quot; tabindex=&quot;5&quot; value=&quot;Submit Comment&quot; /&gt;
-    &lt;input type=&quot;hidden&quot; name=&quot;comment_post_ID&quot; value=&quot;&lt;?php echo $id; ?&gt;&quot; /&gt;
-    &lt;/p&gt;
-    &lt;?php do_action('comment_form', $post-&gt;ID); ?&gt;
-    
-    &lt;/form&gt;
+&lt;div id=&quot;respond&quot; class=&quot;comments clearfix&quot;&gt;
+	&lt;h3&gt;&lt;?php _e('Leave a Reply', 'chaoticsoul'); ?&gt;&lt;/h3&gt;
+	
+	&lt;div class=&quot;cancel-comment-reply&quot;&gt;
+	&lt;small&gt;&lt;?php cancel_comment_reply_link() ?&gt;&lt;/small&gt;
+	&lt;/div&gt;
+	
+	&lt;?php if ( get_option('comment_registration') &amp;&amp; !$user_ID ) : ?&gt;
+	&lt;p&gt;&lt;?php printf(__('You must be &lt;a href=&quot;%s&quot;&gt;logged in&lt;/a&gt; to post a comment.', 'chaoticsoul'), get_option('siteurl').'/wp-login.php?redirect_to='.get_permalink()); ?&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 comment_id_fields(); ?&gt;
+	&lt;?php if ( $user_ID ) : ?&gt;
+	
+	&lt;p&gt;&lt;?php printf(__('Logged in as %s.', 'chaoticsoul'), '&lt;a href=&quot;'.get_option('siteurl').'/wp-admin/profile.php&quot;&gt;'.$user_identity.'&lt;/a&gt;'); ?&gt;
+	&lt;a href=&quot;&lt;?php echo get_option('siteurl'); ?&gt;/wp-login.php?action=logout&quot; title=&quot;&lt;?php _e('Log out of this account', 'chaoticsoul'); ?&gt;&quot;&gt;&lt;?php _e('Logout &amp;raquo;', 'chaoticsoul'); ?&gt;&lt;/a&gt;&lt;/p&gt;
+	&lt;p&gt;&lt;textarea name=&quot;comment&quot; id=&quot;comment&quot; cols=&quot;65&quot; rows=&quot;10&quot; tabindex=&quot;4&quot;&gt;&lt;/textarea&gt;&lt;/p&gt;
+	
+	&lt;?php else : ?&gt;
+	
+	&lt;p&gt;&lt;textarea name=&quot;comment&quot; id=&quot;comment&quot; cols=&quot;65&quot; rows=&quot;5&quot; tabindex=&quot;4&quot;&gt;&lt;/textarea&gt;&lt;/p&gt;
+	
+	&lt;p&gt;&lt;input type=&quot;text&quot; name=&quot;author&quot; id=&quot;author&quot; value=&quot;&lt;?php echo $comment_author; ?&gt;&quot; size=&quot;20&quot; tabindex=&quot;1&quot; /&gt;&lt;br /&gt;
+	&lt;label for=&quot;author&quot;&gt;&lt;small&gt;&lt;?php if ($req) echo &quot;*&quot;; ?&gt; &lt;?php _e('Name', 'chaoticsoul'); ?&gt;&lt;/small&gt;&lt;/label&gt;&lt;/p&gt;
+	
+	&lt;p&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; size=&quot;20&quot; tabindex=&quot;2&quot; /&gt;&lt;br /&gt;
+	&lt;label for=&quot;email&quot;&gt;&lt;small&gt;&lt;?php if ($req) echo &quot;*&quot;; ?&gt; &lt;?php _e('Mail (private)', 'chaoticsoul'); ?&gt;&lt;/small&gt;&lt;/label&gt;&lt;/p&gt;
+	
+	&lt;p&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; size=&quot;19&quot; tabindex=&quot;3&quot; /&gt;&lt;br /&gt;
+	&lt;label for=&quot;url&quot;&gt;&lt;small&gt;&lt;?php _e('Website', 'chaoticsoul'); ?&gt;&lt;/small&gt;&lt;/label&gt;&lt;/p&gt;
+	
+	&lt;?php endif; ?&gt;
+	
+	&lt;!--&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;--&gt;
+	
+	&lt;p&gt;
+		&lt;input name=&quot;submit&quot; type=&quot;submit&quot; id=&quot;submit&quot; tabindex=&quot;5&quot; value=&quot;&lt;?php _e('Submit Comment', 'chaoticsoul'); ?&gt;&quot; /&gt;
+		&lt;input type=&quot;hidden&quot; name=&quot;comment_post_ID&quot; value=&quot;&lt;?php echo $id; ?&gt;&quot; /&gt;
+	&lt;/p&gt;
+	&lt;?php do_action('comment_form', $post-&gt;ID); ?&gt;
+	
+	&lt;/form&gt;
 &lt;?php endif; // If registration required and not logged in ?&gt;
 &lt;/div&gt;
 &lt;?php endif; // if you delete this the sky will fall on your head ?&gt;</diff>
      <filename>comments.php</filename>
    </modified>
    <modified>
      <diff>@@ -2,7 +2,7 @@
 
 &lt;div class=&quot;hr&quot;&gt;&amp;nbsp;&lt;/div&gt;
 &lt;div id=&quot;footer&quot;&gt;
-    &lt;p&gt;Get a free blog at &lt;a href=&quot;http://wordpress.com/&quot;&gt;WordPress.com&lt;/a&gt; and more themes at &lt;a href=&quot;http://labs.revyver.com&quot;&gt;Revyver Labs&lt;/a&gt;. Theme: AngelicSoul (v1.0) by &lt;a href=&quot;http://avalonstar.com&quot; rel=&quot;designer&quot;&gt;Bryan Veloso&lt;/a&gt;.&lt;/p&gt;
+    &lt;p&gt;Powered by &lt;a href=&quot;http://wordpress.org/&quot;&gt;WordPress&lt;/a&gt;. Theme: ChaoticSoul (v1.4) by &lt;a href=&quot;http://avalonstar.com&quot; rel=&quot;designer&quot;&gt;Bryan Veloso&lt;/a&gt;.&lt;/p&gt;
 &lt;/div&gt;
 &lt;/div&gt;
 </diff>
      <filename>footer.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,30 @@
 &lt;?php
+function chaoticsoul_comment($comment, $args, $depth) { 
+$GLOBALS['comment'] = $comment;	
+	?&gt;
+	&lt;li &lt;?php comment_class(); ?&gt; id=&quot;comment-&lt;?php comment_ID() ?&gt;&quot;&gt;
+		&lt;?php comment_text() ?&gt;
+		&lt;p class=&quot;commentmetadata&quot;&gt;
+			&lt;?php echo get_avatar( $comment, 32 ); ?&gt;
+			&lt;small&gt;
+			&lt;cite&gt;&lt;?php comment_author_link() ?&gt;&lt;/cite&gt; &lt;?php _e('said this on', 'chaoticsoul'); ?&gt;
+			&lt;?php if ($comment-&gt;comment_approved == '0') : ?&gt;
+			&lt;em&gt;&lt;?php _e('Your comment is awaiting moderation.', 'chaoticsoul'); ?&gt;&lt;/em&gt;
+			&lt;?php endif; ?&gt;
+			&lt;a href=&quot;#comment-&lt;?php comment_ID() ?&gt;&quot; title=&quot;&quot;&gt;&lt;?php comment_date(get_option('date_format')) ?&gt; &lt;?php _e('at', 'chaoticsoul');?&gt; &lt;?php comment_time(get_option('time_format')) ?&gt;&lt;/a&gt;&lt;?php echo comment_reply_link(array('depth' =&gt; $depth, 'max_depth' =&gt; $args['max_depth'], 'before' =&gt; ' | ')) ?&gt; &lt;?php edit_comment_link(__('edit', 'chaoticsoul'),'(',')'); ?&gt;
+			&lt;/small&gt;
+		&lt;/p&gt;
+	&lt;/li&gt;
+&lt;?php }
+
+$themecolors = array(
+	'bg' =&gt; '161410',
+	'text' =&gt; '999999',
+	'link' =&gt; 'd8d7d3',
+	'border' =&gt; '161410'
+	);
+
+$content_width = 497;
 
 // Widgets FTW!
 function widget_chaoticsoul_links() {
@@ -10,10 +36,8 @@ function widget_chaoticsoul_links() {
 
 function widget_chaoticsoul_search() {
 ?&gt;
-	&lt;form method=&quot;get&quot; id=&quot;searchform&quot; action=&quot;/&quot;&gt;
-	&lt;div&gt;&lt;input type=&quot;text&quot; value=&quot;&lt;?php echo wp_specialchars($s, 1); ?&gt;&quot; name=&quot;s&quot; id=&quot;s&quot; value=&quot;Journal Search&amp;#8230;&quot; /&gt;
-	&lt;!-- &lt;input type=&quot;submit&quot; id=&quot;searchsubmit&quot; value=&quot;Search&quot; /&gt; --&gt;
-	&lt;/div&gt;
+	&lt;form method=&quot;get&quot; id=&quot;searchform&quot; action=&quot;/index.php&quot;&gt;
+		&lt;div&gt;&lt;input type=&quot;text&quot; value=&quot;&lt;?php _e('Search', 'chaoticsoul'); ?&gt;&quot; onblur=&quot;this.value=(this.value=='') ? '&lt;?php _e('Search', 'chaoticsoul'); ?&gt;' : this.value;&quot; onfocus=&quot;this.value=(this.value=='&lt;?php _e('Search', 'chaoticsoul'); ?&gt;') ? '' : this.value;&quot; name=&quot;s&quot; id=&quot;s&quot; /&gt;&lt;/div&gt;
 	&lt;/form&gt;
 &lt;?php
 }</diff>
      <filename>functions.php</filename>
    </modified>
    <modified>
      <diff>@@ -2,34 +2,36 @@
 &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;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; 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;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;!--[if IE]&gt;
-    &lt;link rel=&quot;stylesheet&quot; href=&quot;&lt;?php bloginfo('stylesheet_directory'); ?&gt;/ie.css&quot; type=&quot;text/css&quot; media=&quot;screen&quot; /&gt;
-    &lt;![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;meta http-equiv=&quot;Content-Type&quot; content=&quot;&lt;?php bloginfo('html_type'); ?&gt;; charset=&lt;?php bloginfo('charset'); ?&gt;&quot; /&gt;
+	&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; 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;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;!--[if IE]&gt;
+	&lt;link rel=&quot;stylesheet&quot; href=&quot;&lt;?php bloginfo('stylesheet_directory'); ?&gt;/ie.css&quot; type=&quot;text/css&quot; media=&quot;screen&quot; /&gt;
+	&lt;![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 
+		if ( is_singular() ) wp_enqueue_script( 'comment-reply' );
+		wp_head();
+	?&gt;
 &lt;/head&gt;
 &lt;body&gt;
 &lt;div id=&quot;page&quot;&gt;
 
 
 &lt;div id=&quot;header&quot;&gt;
-    &lt;h1&gt;&lt;a href=&quot;&lt;?php echo get_settings('home'); ?&gt;/&quot;&gt;&lt;?php bloginfo('title'); ?&gt;&lt;/a&gt;&lt;/h1&gt;
-    &lt;div class=&quot;description&quot;&gt;&lt;?php bloginfo('description'); ?&gt;&lt;/div&gt;
+	&lt;h1&gt;&lt;a href=&quot;&lt;?php echo get_settings('home'); ?&gt;/&quot;&gt;&lt;?php bloginfo('title'); ?&gt;&lt;/a&gt;&lt;/h1&gt;
+	&lt;div class=&quot;description&quot;&gt;&lt;?php bloginfo('description'); ?&gt;&lt;/div&gt;
 &lt;/div&gt;
 
 &lt;div class=&quot;hr&quot;&gt;&amp;nbsp;&lt;/div&gt; &lt;!-- because IE sucks at styling HRs --&gt;
 
 &lt;div id=&quot;headerimg&quot; class=&quot;clearfix&quot;&gt;
-    &lt;div id=&quot;header-overlay&quot;&gt; &lt;/div&gt;
-    &lt;div id=&quot;header-image&quot;&gt;&lt;img alt=&quot;header image&quot; src=&quot;&lt;?php header_image() ?&gt;&quot; /&gt;&lt;/div&gt;
+	&lt;div id=&quot;header-overlay&quot;&gt; &lt;/div&gt;
+	&lt;div id=&quot;header-image&quot;&gt;&lt;img alt=&quot;header image&quot; src=&quot;&lt;?php header_image() ?&gt;&quot; /&gt;&lt;/div&gt;
 &lt;/div&gt;
 
 &lt;div class=&quot;hr&quot;&gt;&amp;nbsp;&lt;/div&gt;</diff>
      <filename>header.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,59 +1,66 @@
 &lt;?php get_header(); ?&gt;
-    
-    &lt;div id=&quot;content&quot; class=&quot;narrowcolumn&quot;&gt;
-    
-    &lt;?php if (have_posts()) : ?&gt;
-    
-        &lt;!-- First Post --&gt;
-        &lt;?php $top_query = new WP_Query('showposts=1'); ?&gt;
-        &lt;?php while($top_query-&gt;have_posts()) : $top_query-&gt;the_post(); $first_post = $post-&gt;ID; ?&gt;
-            &lt;?php 
-            $url    = $_SERVER['REQUEST_URI'];
-            $find = &quot;page&quot;;
-            $pos    = strpos($url, $find); 
-            if ( $pos == false ) : ?&gt;
-            &lt;div class=&quot;post top&quot; id=&quot;post-&lt;?php the_ID(); ?&gt;&quot;&gt;
-                &lt;h2 class=&quot;first&quot;&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;/h2&gt;
-                &lt;span class=&quot;postmetadata&quot;&gt;&amp;nbsp;&lt;?php the_date() ?&gt;  &amp;bull; &lt;?php comments_popup_link('No Comments', '1 Comment', '% Comments'); ?&gt; &lt;?php edit_post_link('Edit', '(', ')'); ?&gt;&lt;/span&gt;
-                
-                &lt;div class=&quot;entry&quot;&gt;
-                    &lt;?php the_content(&quot;&lt;span class=\&quot;continue\&quot;&gt;&quot; . __('Continue reading','') . &quot; '&quot; . the_title('', '', false) . &quot;'&lt;/span&gt;&quot;); ?&gt;
-                &lt;/div&gt;
-            &lt;/div&gt;
-            &lt;?php endif; ?&gt;
-        &lt;?php endwhile; ?&gt;
-        
-        &lt;!-- Next few posts --&gt;
-        &lt;?php while(have_posts()) : the_post(); if(!($first_post == $post-&gt;ID)) : ?&gt;
-        
-            &lt;div class=&quot;post lastfive&quot; id=&quot;post-&lt;?php the_ID(); ?&gt;&quot;&gt;
-                &lt;h2&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;/h2&gt;
-                &lt;span class=&quot;postmetadata&quot;&gt;&amp;nbsp;&lt;?php the_date() ?&gt; &amp;bull; &lt;?php comments_popup_link('No Comments', '1 Comment', '% Comments'); ?&gt; &lt;?php edit_post_link('Edit', '(', ')'); ?&gt;&lt;/span&gt;
-                
-                &lt;div class=&quot;entry&quot;&gt;
-                    &lt;?php the_content(&quot;&lt;span class=\&quot;continue\&quot;&gt;&quot; . __('Continue reading','') . &quot; '&quot; . the_title('', '', false) . &quot;'&lt;/span&gt;&quot;); ?&gt;
-                &lt;/div&gt;
-            &lt;/div&gt;
-            
-        &lt;?php endif; endwhile; ?&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;navigation clearfix&quot;&gt;
-    &lt;?php $_SERVER['REQUEST_URI']  = preg_replace(&quot;/(.*?).php(.*?)&amp;(.*?)&amp;(.*?)&amp;_=/&quot;,&quot;$2$3&quot;,$_SERVER['REQUEST_URI']); ?&gt;
-        &lt;div class=&quot;left&quot;&gt;&lt;?php next_posts_link('&lt;span&gt;&amp;laquo;&lt;/span&gt; '.__('Previous Entries','').''); ?&gt;&lt;/div&gt;
-        &lt;div class=&quot;right&quot;&gt;&lt;?php previous_posts_link(''.__('Next Entries','').' &lt;span&gt;&amp;raquo;&lt;/span&gt;'); ?&gt;&lt;/div&gt;
-        &lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
-    &lt;/div&gt;
-    
-    &lt;/div&gt;
-    
+	
+	&lt;div id=&quot;content&quot; class=&quot;narrowcolumn&quot;&gt;
+	
+	&lt;?php if (have_posts()) : ?&gt;
+	
+		&lt;!-- First Post --&gt;
+		&lt;?php $top_query = new WP_Query('showposts=1'); ?&gt;
+		&lt;?php while($top_query-&gt;have_posts()) : $top_query-&gt;the_post(); $first_post = $post-&gt;ID; ?&gt;
+			&lt;?php 
+			$url	= $_SERVER['REQUEST_URI'];
+			$find = &quot;page&quot;;
+			$pos	= strpos($url, $find); 
+			if ( $pos == false ) : ?&gt;
+			&lt;?php if(!$stickied or is_sticky()) $stickied = true; ?&gt;
+			&lt;div class=&quot;post top&quot; id=&quot;post-&lt;?php the_ID(); ?&gt;&quot;&gt;
+				&lt;h2 class=&quot;first&quot;&gt;&lt;a href=&quot;&lt;?php the_permalink() ?&gt;&quot; rel=&quot;bookmark&quot; title=&quot;&lt;?php printf(__('Permanent Link to %s', 'chaoticsoul'), get_the_title()); ?&gt;&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt;&lt;/h2&gt;
+				&lt;span class=&quot;postmetadata&quot;&gt;&amp;nbsp;&lt;?php the_time(get_option(&quot;date_format&quot;)); ?&gt; &amp;bull; &lt;?php comments_popup_link(__('No Comments', 'chaoticsoul'), __('1 Comment', 'chaoticsoul'), __('% Comments', 'chaoticsoul')); ?&gt; &lt;?php edit_post_link(__('Edit', 'chaoticsoul'), '(', ')'); ?&gt;&lt;/span&gt;
+				&lt;div class=&quot;entry&quot;&gt;
+					&lt;?php the_content(&quot;&lt;span class=\&quot;continue\&quot;&gt;&quot; . __('Continue reading', 'chaoticsoul') . &quot; '&quot; . the_title('', '', false) . &quot;'&lt;/span&gt;&quot;); ?&gt;
+					&lt;p class=&quot;postmetadata&quot;&gt;
+						&lt;?php printf(__('Posted in %s', 'chaoticsoul'), get_the_category_list(', ')); ?&gt;
+						&lt;?php print get_the_term_list( $post-&gt;ID, 'post_tag', '&lt;br /&gt;' . __( 'Tags' ) . ': ', ', ', ''); ?&gt;
+					&lt;/p&gt;
+				&lt;/div&gt;
+			&lt;/div&gt;
+			&lt;?php endif; ?&gt;
+		&lt;?php endwhile; ?&gt;
+		
+		&lt;!-- Next few posts --&gt;
+		&lt;?php while(have_posts()) : the_post(); if(!($first_post == $post-&gt;ID) &amp;&amp; !is_sticky()) : ?&gt;	
+		
+			&lt;div class=&quot;post lastfive&quot; id=&quot;post-&lt;?php the_ID(); ?&gt;&quot;&gt;
+				&lt;h2&gt;&lt;a href=&quot;&lt;?php the_permalink() ?&gt;&quot; rel=&quot;bookmark&quot; title=&quot;&lt;?php printf(__('Permanent Link to %s', 'chaoticsoul'), get_the_title()); ?&gt;&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt;&lt;/h2&gt;
+				&lt;span class=&quot;postmetadata&quot;&gt;&amp;nbsp;&lt;?php the_time(get_option(&quot;date_format&quot;)); ?&gt; &amp;bull; &lt;?php comments_popup_link(__('No Comments', 'chaoticsoul'), __('1 Comment', 'chaoticsoul'), __('% Comments', 'chaoticsoul')); ?&gt; &lt;?php edit_post_link(__('Edit', 'chaoticsoul'), '(', ')'); ?&gt;&lt;/span&gt;				   
+				&lt;div class=&quot;entry&quot;&gt;
+					&lt;?php the_content(&quot;&lt;span class=\&quot;continue\&quot;&gt;&quot; . __('Continue reading','') . &quot; '&quot; . the_title('', '', false) . &quot;'&lt;/span&gt;&quot;); ?&gt;
+					&lt;p class=&quot;postmetadata&quot;&gt;
+						&lt;?php printf(__('Posted in %s', 'chaoticsoul'), get_the_category_list(', ')); ?&gt;
+						&lt;?php the_tags('&lt;br /&gt;' .  __( 'Tags' ) . ': ', ', ', '');	?&gt;
+					&lt;/p&gt;
+				&lt;/div&gt;
+			&lt;/div&gt;
+			
+		&lt;?php endif; endwhile; ?&gt;
+		
+	&lt;?php else : ?&gt;
+		
+		&lt;h2 class=&quot;center&quot;&gt;&lt;?php _e('Not Found', 'chaoticsoul'); ?&gt;&lt;/h2&gt;
+		&lt;p class=&quot;center&quot;&gt;&lt;?php _e('Sorry, but you are looking for something that isn&amp;#8217;t here.', 'chaoticsoul'); ?&gt;&lt;/p&gt;
+		&lt;?php include (TEMPLATEPATH . &quot;/searchform.php&quot;); ?&gt;
+		
+	&lt;?php endif; ?&gt;
+	
+	&lt;div class=&quot;navigation clearfix&quot;&gt;
+	&lt;?php $_SERVER['REQUEST_URI']  = preg_replace(&quot;/(.*?).php(.*?)&amp;(.*?)&amp;(.*?)&amp;_=/&quot;,&quot;$2$3&quot;,$_SERVER['REQUEST_URI']); ?&gt;
+		&lt;div class=&quot;left&quot;&gt;&lt;?php next_posts_link('&lt;span&gt;&amp;laquo;&lt;/span&gt; '.__('Previous Entries', 'chaoticsoul').''); ?&gt;&lt;/div&gt;
+		&lt;div class=&quot;right&quot;&gt;&lt;?php previous_posts_link(''.__('Next Entries', 'chaoticsoul').' &lt;span&gt;&amp;raquo;&lt;/span&gt;'); ?&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>home.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,38 +1,42 @@
 &lt;?php get_header(); ?&gt;
-    
-    &lt;div id=&quot;content&quot; class=&quot;narrowcolumn&quot;&gt;
-    &lt;?php if (have_posts()) : ?&gt;
-    
-        &lt;?php while(have_posts()) : the_post() ?&gt;
-        
-            &lt;div class=&quot;post lastfive&quot; id=&quot;post-&lt;?php the_ID(); ?&gt;&quot;&gt;
-                &lt;h2&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;/h2&gt;
-                &lt;span class=&quot;postmetadata&quot;&gt;&amp;nbsp;&lt;?php the_date() ?&gt; &amp;bull; &lt;?php comments_popup_link('No Comments', '1 Comment', '% Comments'); ?&gt; &lt;?php edit_post_link('Edit', '(', ')'); ?&gt;&lt;/span&gt;
-                
-                &lt;div class=&quot;entry&quot;&gt;
-                    &lt;?php the_content(&quot;&lt;span class=\&quot;continue\&quot;&gt;&quot; . __('Continue reading','') . &quot; '&quot; . the_title('', '', false) . &quot;'&lt;/span&gt;&quot;); ?&gt;
-                &lt;/div&gt;
-            &lt;/div&gt;
-        
-        &lt;?php endwhile; ?&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;navigation&quot;&gt;
-    &lt;?php $_SERVER['REQUEST_URI']  = preg_replace(&quot;/(.*?).php(.*?)&amp;(.*?)&amp;(.*?)&amp;_=/&quot;,&quot;$2$3&quot;,$_SERVER['REQUEST_URI']); ?&gt;
-        &lt;div class=&quot;left&quot;&gt;&lt;?php next_posts_link('&lt;span&gt;&amp;laquo;&lt;/span&gt; '.__('Previous Entries','').''); ?&gt;&lt;/div&gt;
-        &lt;div class=&quot;right&quot;&gt;&lt;?php previous_posts_link(''.__('Next Entries','').' &lt;span&gt;&amp;raquo;&lt;/span&gt;'); ?&gt;&lt;/div&gt;
-        &lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
-    &lt;/div&gt;
-    
-    &lt;/div&gt;
-    
+	
+	&lt;div id=&quot;content&quot; class=&quot;narrowcolumn&quot;&gt;
+	&lt;?php if (have_posts()) : ?&gt;
+	
+		&lt;?php while(have_posts()) : the_post() ?&gt;
+		
+			&lt;div class=&quot;post lastfive&quot; id=&quot;post-&lt;?php the_ID(); ?&gt;&quot;&gt;
+				&lt;h2&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;/h2&gt;
+				&lt;span class=&quot;postmetadata&quot;&gt;&amp;nbsp;&lt;?php the_time(get_option(&quot;date_format&quot;)); ?&gt; &amp;bull; &lt;?php comments_popup_link(__('No Comments', 'chaoticsoul'), __('1 Comment', 'chaoticsoul'), __('% Comments', 'chaoticsoul')); ?&gt; &lt;?php edit_post_link(__('Edit', 'chaoticsoul'), '(', ')'); ?&gt;&lt;/span&gt;
+				
+				&lt;div class=&quot;entry&quot;&gt;
+					&lt;?php the_content(&quot;&lt;span class=\&quot;continue\&quot;&gt;&quot; . __('Continue reading','') . &quot; '&quot; . the_title('', '', false) . &quot;'&lt;/span&gt;&quot;); ?&gt;
+					&lt;p class=&quot;postmetadata&quot;&gt;
+						&lt;?php printf(__('Posted in %s', 'chaoticsoul'), get_the_category_list(', ')); ?&gt;
+						&lt;?php the_tags('&lt;br /&gt;' .  __( 'Tags' ) . ': ', ', ', '');  ?&gt;
+					&lt;/p&gt;
+				&lt;/div&gt;
+			&lt;/div&gt;
+		
+		&lt;?php endwhile; ?&gt;
+		
+	&lt;?php else : ?&gt;
+		
+		&lt;h2 class=&quot;center&quot;&gt;&lt;?php _e('Not Found', 'chaoticsoul'); ?&gt;&lt;/h2&gt;
+		&lt;p class=&quot;center&quot;&gt;&lt;?php _e('Sorry, but you are looking for something that isn&amp;#8217;t here.', 'chaoticsoul'); ?&gt;&lt;/p&gt;
+		&lt;?php include (TEMPLATEPATH . &quot;/searchform.php&quot;); ?&gt;
+		
+	&lt;?php endif; ?&gt;
+	
+	&lt;div class=&quot;navigation&quot;&gt;
+	&lt;?php $_SERVER['REQUEST_URI']  = preg_replace(&quot;/(.*?).php(.*?)&amp;(.*?)&amp;(.*?)&amp;_=/&quot;,&quot;$2$3&quot;,$_SERVER['REQUEST_URI']); ?&gt;
+		&lt;div class=&quot;left&quot;&gt;&lt;?php next_posts_link('&lt;span&gt;&amp;laquo;&lt;/span&gt; '.__('Previous Entries','').''); ?&gt;&lt;/div&gt;
+		&lt;div class=&quot;right&quot;&gt;&lt;?php previous_posts_link(''.__('Next Entries','').' &lt;span&gt;&amp;raquo;&lt;/span&gt;'); ?&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>index.php</filename>
    </modified>
    <modified>
      <diff>@@ -7,10 +7,10 @@ Template Name: Links
 &lt;?php get_header(); ?&gt;
 
 &lt;div id=&quot;content&quot; class=&quot;widecolumn&quot;&gt;
-    &lt;h2&gt;Links:&lt;/h2&gt;
-    &lt;ul&gt;
-    &lt;?php get_links_list(); ?&gt;
-    &lt;/ul&gt;
+	&lt;h2&gt;&lt;?php _e('Links:', 'chaoticsoul'); ?&gt;&lt;/h2&gt;
+	&lt;ul&gt;
+	&lt;?php get_links_list(); ?&gt;
+	&lt;/ul&gt;
 &lt;/div&gt;
 
 &lt;?php get_footer(); ?&gt;</diff>
      <filename>links.php</filename>
    </modified>
    <modified>
      <diff>@@ -2,15 +2,15 @@
     
     &lt;div id=&quot;content&quot; class=&quot;widecolumn&quot;&gt;
     &lt;?php if (have_posts()) : while (have_posts()) : the_post(); ?&gt;
-        &lt;div class=&quot;post&quot; id=&quot;post-&lt;?php the_ID(); ?&gt;&quot;&gt;
-        &lt;h2 class=&quot;title&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/h2&gt;
+		&lt;div &lt;?php post_class('post'); ?&gt; id=&quot;post-&lt;?php the_ID(); ?&gt;&quot;&gt;
+		&lt;h2 class=&quot;title&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/h2&gt;
             &lt;div class=&quot;entrytext&quot;&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 the_content('&lt;p class=&quot;serif&quot;&gt;'.__('Read the rest of this page &amp;raquo;', 'chaoticsoul').'&lt;/p&gt;'); ?&gt;
+				&lt;?php link_pages('&lt;p&gt;&lt;strong&gt;'.__('Pages:', 'chaoticsoul').'&lt;/strong&gt; ', '&lt;/p&gt;', 'number'); ?&gt;
             &lt;/div&gt;
         &lt;/div&gt;
     &lt;?php endwhile; endif; ?&gt;
-    &lt;?php edit_post_link('Edit this entry.', '&lt;p&gt;', '&lt;/p&gt;'); ?&gt;
+	&lt;?php edit_post_link(__('Edit this entry.', 'chaoticsoul'), '&lt;p&gt;', '&lt;/p&gt;'); ?&gt;
     
     &lt;?php if ( comments_open() ) comments_template(); ?&gt;
     &lt;/div&gt;</diff>
      <filename>page.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,35 +1,35 @@
 &lt;?php get_header(); ?&gt;
-    
-    &lt;div id=&quot;content&quot; class=&quot;widecolumn&quot;&gt;
-    
-    &lt;?php if (have_posts()) : ?&gt;
-        
-        &lt;h2 class=&quot;title&quot;&gt;Search Results&lt;/h2&gt;
-        
-        &lt;?php while (have_posts()) : the_post(); ?&gt;
-        
-            &lt;div class=&quot;post&quot;&gt;
-                &lt;h2 id=&quot;post-&lt;?php the_ID(); ?&gt;&quot;&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;
-                &amp;bull; &lt;?php the_time('l, F jS, Y') ?&gt;
-                &lt;p class=&quot;postmetadata&quot;&gt;Posted in &lt;?php the_category(', ') ?&gt; | &lt;?php edit_post_link('Edit', '', ' | '); ?&gt;  &lt;?php comments_popup_link('No Comments &amp;#187;', '1 Comment &amp;#187;', '% Comments &amp;#187;'); ?&gt;&lt;/p&gt;
-            &lt;/div&gt;
-        
-        &lt;?php endwhile; ?&gt;
-        
-        &lt;div class=&quot;navigation&quot;&gt;
-            &lt;div class=&quot;alignleft&quot;&gt;&lt;?php next_posts_link('&amp;laquo; Previous Entries') ?&gt;&lt;/div&gt;
-            &lt;div class=&quot;alignright&quot;&gt;&lt;?php previous_posts_link('Next Entries &amp;raquo;') ?&gt;&lt;/div&gt;
-        &lt;/div&gt;
-        
-    &lt;?php else : ?&gt;
-        
-        &lt;h2 class=&quot;center&quot;&gt;No posts found. Try a different search?&lt;/h2&gt;
-        &lt;?php include (TEMPLATEPATH . '/searchform.php'); ?&gt;
-        
-    &lt;?php endif; ?&gt;
-    
-    &lt;/div&gt;
-    
+	
+	&lt;div id=&quot;content&quot; class=&quot;widecolumn&quot;&gt;
+	
+	&lt;?php if (have_posts()) : ?&gt;
+		
+		&lt;h2 class=&quot;title&quot;&gt;&lt;?php _e('Search Results', 'chaoticsoul'); ?&gt;&lt;/h2&gt;
+		
+		&lt;?php while (have_posts()) : the_post(); ?&gt;
+		
+			&lt;div &lt;?php post_class(); ?&gt;&gt;
+				&lt;h2 id=&quot;post-&lt;?php the_ID(); ?&gt;&quot;&gt;&lt;a href=&quot;&lt;?php the_permalink() ?&gt;&quot; rel=&quot;bookmark&quot; title=&quot;&lt;?php printf(__('Permanent Link to %s', 'chaoticsoul'), get_the_title()); ?&gt;&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt;&lt;/h2&gt;
+				&amp;bull; &lt;?php the_time(get_option('date_format')) ?&gt;
+				&lt;p class=&quot;postmetadata&quot;&gt;Posted in &lt;?php the_category(', ') ?&gt; | &lt;?php edit_post_link('Edit', '', ' | '); ?&gt;	 &lt;?php comments_popup_link('No Comments &amp;#187;', '1 Comment &amp;#187;', '% Comments &amp;#187;'); ?&gt;&lt;/p&gt;
+			&lt;/div&gt;
+		
+		&lt;?php endwhile; ?&gt;
+		
+		&lt;div class=&quot;navigation&quot;&gt;
+			&lt;div class=&quot;alignleft&quot;&gt;&lt;?php next_posts_link(__('&amp;laquo; Previous Entries', 'chaoticsoul')) ?&gt;&lt;/div&gt;
+			&lt;div class=&quot;alignright&quot;&gt;&lt;?php previous_posts_link(__('Next Entries &amp;raquo;', 'chaoticsoul')) ?&gt;&lt;/div&gt;
+		&lt;/div&gt;
+		
+	&lt;?php else : ?&gt;
+		
+		&lt;h2 class=&quot;center&quot;&gt;&lt;?php _e('No posts found. Try a different search?', 'chaoticsoul'); ?&gt;&lt;/h2&gt;
+		&lt;?php include (TEMPLATEPATH . '/searchform.php'); ?&gt;
+		
+	&lt;?php endif; ?&gt;
+	
+	&lt;/div&gt;
+	
 &lt;?php get_sidebar(); ?&gt;
 
 &lt;?php get_footer(); ?&gt;
\ No newline at end of file</diff>
      <filename>search.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,3 @@
-&lt;form method=&quot;get&quot; id=&quot;searchform&quot; action=&quot;/&quot;&gt;
-&lt;div&gt;
-    &lt;input type=&quot;text&quot; name=&quot;s&quot; id=&quot;s&quot; value=&quot;Journal Search&amp;#8230;&quot; /&gt;
-    &lt;!-- &lt;input type=&quot;submit&quot; id=&quot;searchsubmit&quot; value=&quot;Search&quot; /&gt; --&gt;
-&lt;/div&gt;
+&lt;form method=&quot;get&quot; id=&quot;searchform&quot; action=&quot;/index.php&quot;&gt;
+	&lt;div&gt;&lt;input type=&quot;text&quot; value=&quot;&lt;?php _e('Search', 'chaoticsoul'); ?&gt;&quot; onblur=&quot;this.value=(this.value=='') ? '&lt;?php _e('Search', 'chaoticsoul'); ?&gt;' : this.value;&quot; onfocus=&quot;this.value=(this.value=='&lt;?php _e('Search', 'chaoticsoul'); ?&gt;') ? '' : this.value;&quot; name=&quot;s&quot; id=&quot;s&quot; /&gt;&lt;/div&gt;
 &lt;/form&gt;</diff>
      <filename>searchform.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,92 +1,90 @@
-    &lt;div id=&quot;sidebar&quot;&gt;
-    &lt;?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) : ?&gt;
-    
-        &lt;?php include (TEMPLATEPATH . '/searchform.php'); ?&gt;
-        
-        &lt;?php if (is_single()) { ?&gt;
-            
-            &lt;h3&gt;About This Post&lt;/h3&gt;
-            &lt;p class=&quot;postmetadata alt&quot;&gt;
-                &lt;small&gt;
-                    This entry was posted 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;. 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)) {
-                        // Both Comments and Pings are open ?&gt;
-                        You can &lt;a href=&quot;#respond&quot;&gt;leave a response&lt;/a&gt;, or &lt;a href=&quot;&lt;?php trackback_url(true); ?&gt;&quot; rel=&quot;trackback&quot;&gt;trackback&lt;/a&gt; from your own site.
-                    
-                    &lt;?php } elseif (!('open' == $post-&gt; comment_status) &amp;&amp; ('open' == $post-&gt;ping_status)) {
-                        // Only Pings are Open ?&gt;
-                        Responses are currently closed, but you can &lt;a href=&quot;&lt;?php trackback_url(true); ?&gt; &quot; rel=&quot;trackback&quot;&gt;trackback&lt;/a&gt; from your own site.
-                    
-                    &lt;?php } elseif (('open' == $post-&gt; comment_status) &amp;&amp; !('open' == $post-&gt;ping_status)) {
-                        // Comments are open, Pings are not ?&gt;
-                        You can skip to the end and leave a response. Pinging is currently not allowed.
-                    
-                    &lt;?php } elseif (!('open' == $post-&gt; comment_status) &amp;&amp; !('open' == $post-&gt;ping_status)) {
-                        // Neither Comments, nor Pings are open ?&gt;
-                        Both comments and pings are currently closed.
-                    
-                    &lt;?php } edit_post_link('Edit this entry.','',''); ?&gt;
-                    
-                &lt;/small&gt;
-            &lt;/p&gt;
-            
-            &lt;h3&gt;Navigate&lt;/h3&gt;
-            
-            &lt;ul class=&quot;navigation&quot;&gt;
-                &lt;?php previous_post_link('&lt;li&gt;Previous: &lt;strong&gt;%link&lt;/strong&gt;&lt;/li&gt;') ?&gt;
-                &lt;?php next_post_link('&lt;li&gt;Next: &lt;strong&gt;%link&lt;/strong&gt;&lt;/li&gt;') ?&gt;
-            &lt;/ul&gt;   
-            
-        &lt;?php } else { ?&gt;
-            
-            &lt;?php /* If this is a 404 page */ if (is_404()) { ?&gt;
-            &lt;?php /* If this is a category archive */ } elseif (is_category()) { ?&gt;
-            &lt;h3&gt;About This Page&lt;/h3&gt;
-            &lt;p&gt;You are currently browsing the archives for the &lt;?php single_cat_title(''); ?&gt; category.&lt;/p&gt;
-            
-            &lt;?php /* If this is a yearly archive */ } elseif (is_day()) { ?&gt;
-            &lt;h3&gt;About This Page&lt;/h3&gt;
-            &lt;p&gt;You are currently browsing the &lt;a href=&quot;&lt;?php bloginfo('home'); ?&gt;/&quot;&gt;&lt;?php echo bloginfo('name'); ?&gt;&lt;/a&gt; weblog archives
-            for the day &lt;?php the_time('l, F jS, Y'); ?&gt;.&lt;/p&gt;
-            
-            &lt;?php /* If this is a monthly archive */ } elseif (is_month()) { ?&gt;
-            &lt;h3&gt;About This Page&lt;/h3&gt;
-            &lt;p&gt;You are currently browsing the &lt;a href=&quot;&lt;?php bloginfo('home'); ?&gt;/&quot;&gt;&lt;?php echo bloginfo('name'); ?&gt;&lt;/a&gt; weblog archives
-            for &lt;?php the_time('F, Y'); ?&gt;.&lt;/p&gt;
-            
-            &lt;?php /* If this is a yearly archive */ } elseif (is_year()) { ?&gt;
-            &lt;h3&gt;About This Page&lt;/h3&gt;
-            &lt;p&gt;You are currently browsing the &lt;a href=&quot;&lt;?php bloginfo('home'); ?&gt;/&quot;&gt;&lt;?php echo bloginfo('name'); ?&gt;&lt;/a&gt; weblog archives
-            for the year &lt;?php the_time('Y'); ?&gt;.&lt;/p&gt;
-            
-            &lt;?php /* If this is a monthly archive */ } elseif (is_search()) { ?&gt;
-            &lt;h3&gt;About This Page&lt;/h3&gt;
-            &lt;p&gt;You have searched the &lt;a href=&quot;&lt;?php echo bloginfo('home'); ?&gt;/&quot;&gt;&lt;?php echo bloginfo('name'); ?&gt;&lt;/a&gt; weblog archives
-            for &lt;strong&gt;'&lt;?php echo wp_specialchars($s); ?&gt;'&lt;/strong&gt;. If you are unable to find anything in these search results, you can try one of these links.&lt;/p&gt;
-            
-            &lt;?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) &amp;&amp; !empty($_GET['paged'])) { ?&gt;
-            &lt;h3&gt;About This Page&lt;/h3&gt;
-            &lt;p&gt;You are currently browsing the &lt;a href=&quot;&lt;?php echo bloginfo('home'); ?&gt;/&quot;&gt;&lt;?php echo bloginfo('name'); ?&gt;&lt;/a&gt; weblog archives.&lt;/p&gt;
-            
-            &lt;?php } ?&gt;
-            
-            &lt;h3&gt;Pages&lt;/h3&gt;
-            &lt;ul&gt;
-            &lt;?php wp_list_pages('title_li='); ?&gt;
-            &lt;/ul&gt;
-            
-            &lt;h3&gt;Archives&lt;/h3&gt;
-            &lt;ul&gt;
-            &lt;?php wp_get_archives('type=monthly'); ?&gt;
-            &lt;/ul&gt;
-            
-            &lt;h3&gt;Categories&lt;/h3&gt;
-            &lt;ul&gt;
-            &lt;?php wp_list_cats('sort_column=name&amp;optioncount=1&amp;hierarchical=0'); ?&gt;
-            &lt;/ul&gt;
-            
-        &lt;?php } ?&gt;
-    
-    &lt;?php endif; ?&gt;
-    &lt;/div&gt;
\ No newline at end of file
+	&lt;div id=&quot;sidebar&quot;&gt;
+	&lt;?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) : ?&gt;
+	
+		&lt;?php include (TEMPLATEPATH . '/searchform.php'); ?&gt;
+		
+		&lt;?php if (is_single()) { ?&gt;
+			
+			&lt;h3&gt;&lt;?php _e('About This Post','chaoticsoul'); ?&gt;&lt;/h3&gt;
+			&lt;p class=&quot;postmetadata alt&quot;&gt;
+				&lt;small&gt;
+				&lt;?php
+					printf(__('This entry was posted on %s at %s and is filed under %s.', 'chaoticsoul'), get_the_time(get_option('date_format')), get_the_time(get_option('time_format')), get_the_category_list(', ')); 
+					printf(__('You can follow any responses to this entry through the %s feed.', 'chaoticsoul'), '&lt;a href=&quot;'.get_post_comments_feed_link().'&quot;&gt;RSS 2.0&lt;/a&gt;');
+					
+					if (('open' == $post-&gt; comment_status) &amp;&amp; ('open' == $post-&gt;ping_status)) {
+						// Both Comments and Pings are open
+						printf(__('You can &lt;a href=&quot;#respond&quot;&gt;leave a response&lt;/a&gt;, or &lt;a href=&quot;%s&quot; rel=&quot;trackback&quot;&gt;trackback&lt;/a&gt; from your own site.', 'chaoticsoul'), get_trackback_url(true));
+					} elseif (!('open' == $post-&gt; comment_status) &amp;&amp; ('open' == $post-&gt;ping_status)) {
+						// Only Pings are Open
+						printf(__('Responses are currently closed, but you can &lt;a href=&quot;%s&quot; rel=&quot;trackback&quot;&gt;trackback&lt;/a&gt; from your own site.', 'chaoticsoul'), get_trackback_url(true));
+
+					} elseif (('open' == $post-&gt; comment_status) &amp;&amp; !('open' == $post-&gt;ping_status)) {
+						// Comments are open, Pings are not
+						_e('You can skip to the end and leave a response. Pinging is currently not allowed.', 'chaoticsoul');
+
+					} elseif (!('open' == $post-&gt; comment_status) &amp;&amp; !('open' == $post-&gt;ping_status)) {
+						// Neither Comments, nor Pings are open
+						_e('Both comments and pings are currently closed.', 'chaoticsoul');
+
+					}
+					edit_post_link(__('Edit this entry.', 'chaoticsoul'),'','');
+				?&gt;
+				&lt;/small&gt;
+			&lt;/p&gt;
+			
+			&lt;h3&gt;&lt;?php _e('Navigate', 'chaoticsoul'); ?&gt;&lt;/h3&gt;
+			
+			&lt;ul class=&quot;navigation&quot;&gt;
+				&lt;?php previous_post_link('&lt;li&gt;'.__('Previous:', 'chaoticsoul').'&amp;nbsp;&lt;strong&gt;%link&lt;/strong&gt;&lt;/li&gt;') ?&gt;
+				&lt;?php next_post_link('&lt;li&gt;'.__('Next:', 'chaoticsoul').'&amp;nbsp;&lt;strong&gt;%link&lt;/strong&gt;&lt;/li&gt;') ?&gt;
+			&lt;/ul&gt;	
+			
+		&lt;?php } else { ?&gt;
+			
+			&lt;?php /* If this is a 404 page */ if (is_404()) { ?&gt;
+			&lt;?php /* If this is a category archive */ } elseif (is_category()) { ?&gt;
+			&lt;h3&gt;&lt;?php _e('About This Page'); ?&gt;&lt;/h3&gt;
+			&lt;p&gt;&lt;?php printf(__('You are currently browsing the archives for the %s category.', 'chaoticsoul'), single_cat_title('', false)); ?&gt;&lt;/p&gt;
+			
+			&lt;?php /* If this is a yearly archive */ } elseif (is_day()) { ?&gt;
+			&lt;h3&gt;&lt;?php _e('About This Page'); ?&gt;&lt;/h3&gt;
+			&lt;p&gt;&lt;?php printf(__('You are currently browsing the %s weblog archives for the day %s.', 'chaoticsoul'), '&lt;a href=&quot;'.get_bloginfo('home').'/&quot;&gt;'.get_bloginfo('name').'&lt;/a&gt;', get_the_time(get_option('date_format')));?&gt;&lt;/p&gt;
+			
+			&lt;?php /* If this is a monthly archive */ } elseif (is_month()) { ?&gt;
+			&lt;h3&gt;&lt;?php _e('About This Page'); ?&gt;&lt;/h3&gt;
+			&lt;p&gt;&lt;?php printf(__('You are currently browsing the %s weblog archives for %s.', 'chaoticsoul'), '&lt;a href=&quot;'.get_bloginfo('home').'/&quot;&gt;'.get_bloginfo('name').'&lt;/a&gt;', get_the_time('F, Y'));?&gt;&lt;/p&gt;
+			
+			&lt;?php /* If this is a yearly archive */ } elseif (is_year()) { ?&gt;
+			&lt;h3&gt;&lt;?php _e('About This Page'); ?&gt;&lt;/h3&gt;
+			&lt;p&gt;&lt;?php printf(__('You are currently browsing the %s weblog archives for the year %s.', 'chaoticsoul'), '&lt;a href=&quot;'.get_bloginfo('home').'/&quot;&gt;'.get_bloginfo('name').'&lt;/a&gt;', get_the_time('Y'));?&gt;&lt;/p&gt;
+			
+			&lt;?php /* If this is a search */ } elseif (is_search()) { ?&gt;
+			&lt;h3&gt;&lt;?php _e('About This Page'); ?&gt;&lt;/h3&gt;
+			&lt;p&gt;&lt;?php printf(__('You have searched the %s weblog archives for %s. If you are unable to find anything in these search results, you can try one of these links.', 'chaoticsoul'), '&lt;a href=&quot;'.get_bloginfo('home').'/&quot;&gt;'.get_bloginfo('name').'&lt;/a&gt;', '&lt;strong&gt;'.wp_specialchars($s).'&lt;/strong&gt;');?&gt;&lt;/p&gt;
+			
+			&lt;?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) &amp;&amp; !empty($_GET['paged'])) { ?&gt;
+			&lt;h3&gt;&lt;?php _e('About This Page'); ?&gt;&lt;/h3&gt;
+			&lt;p&gt;&lt;?php printf(__('You are currently browsing the %s weblog archives.', 'chaoticsoul'), '&lt;a href=&quot;'.get_bloginfo('home').'/&quot;&gt;'.get_bloginfo('name').'&lt;/a&gt;');?&gt;&lt;/p&gt;
+			
+			&lt;?php } ?&gt;
+			
+			&lt;h3&gt;&lt;?php _e('Pages', 'chaoticsoul'); ?&gt;&lt;/h3&gt;
+			&lt;ul&gt;
+			&lt;?php wp_list_pages('title_li='); ?&gt;
+			&lt;/ul&gt;
+			
+			&lt;h3&gt;&lt;?php _e('Archives', 'chaoticsoul'); ?&gt;&lt;/h3&gt;
+			&lt;ul&gt;
+			&lt;?php wp_get_archives('type=monthly'); ?&gt;
+			&lt;/ul&gt;
+			
+			&lt;h3&gt;&lt;?php _e('Categories', 'chaoticsoul'); ?&gt;&lt;/h3&gt;
+			&lt;ul&gt;
+			&lt;?php wp_list_cats('sort_column=name&amp;optioncount=1&amp;hierarchical=0'); ?&gt;
+			&lt;/ul&gt;
+			
+		&lt;?php } ?&gt;
+	
+	&lt;?php endif; ?&gt;
+	&lt;/div&gt;
\ No newline at end of file</diff>
      <filename>sidebar.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,31 +1,31 @@
 &lt;?php get_header(); ?&gt;
-    
-    &lt;div id=&quot;content&quot; class=&quot;widecolumn&quot;&gt;
-    
-    &lt;?php if (have_posts()) : while (have_posts()) : the_post(); ?&gt;
-        
-        &lt;div class=&quot;post&quot; id=&quot;post-&lt;?php the_ID(); ?&gt;&quot;&gt;
-            &lt;h2 class=&quot;title&quot;&gt;&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;?php the_content('&lt;p class=&quot;serif&quot;&gt;Read the rest of this entry &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;p class=&quot;authormeta&quot;&gt;~ by &lt;?php the_author(); ?&gt; on &lt;? the_date(); ?&gt;.&lt;/p&gt;
-                &lt;?php if (the_category(', ')): ?&gt;&lt;p class=&quot;postmetadata&quot;&gt;Posted in &lt;?php the_category(', '); ?&gt; | &lt;?php edit_post_link('Edit', '', ' | '); ?&gt;&lt;/p&gt;&lt;?php endif; ?&gt;
-                &lt;?php if (get_the_tags()): ?&gt;&lt;p class=&quot;postmetadata&quot;&gt;&lt;?php the_tags(); ?&gt;&lt;/p&gt;&lt;?php endif; ?&gt;
-            &lt;/div&gt;
-        &lt;/div&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 id=&quot;content&quot; class=&quot;widecolumn&quot;&gt;
+	
+	&lt;?php if (have_posts()) : while (have_posts()) : the_post(); ?&gt;
+		
+		&lt;div &lt;?php post_class(); ?&gt; id=&quot;post-&lt;?php the_ID(); ?&gt;&quot;&gt;
+			&lt;h2 class=&quot;title&quot;&gt;&lt;a href=&quot;&lt;?php echo get_permalink(); ?&gt;&quot; rel=&quot;bookmark&quot; title=&quot;&lt;?php printf(__('Permanent Link to %s', 'chaoticsoul'), get_the_title()); ?&gt;&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt;&lt;/h2&gt;
+			
+			&lt;div class=&quot;entrytext&quot;&gt;
+				&lt;?php the_content('&lt;p class=&quot;serif&quot;&gt;'.__('Read the rest of this entry &amp;raquo;', 'chaoticsoul').'&lt;/p&gt;'); ?&gt;
+				&lt;?php link_pages('&lt;p&gt;&lt;strong&gt;'.__('Pages:', 'chaoticsoul').'&lt;/strong&gt; ', '&lt;/p&gt;', 'number'); ?&gt;
+				&lt;p class=&quot;authormeta&quot;&gt;~ by &lt;?php the_author(); ?&gt; on &lt;? the_date(); ?&gt;.&lt;/p&gt;
+				&lt;?php if (the_category(', ')): ?&gt;&lt;p class=&quot;postmetadata&quot;&gt;&lt;?php printf(__('Posted in %s', 'chaoticsoul'), get_the_category_list(', ')); ?&gt; | &lt;?php edit_post_link(__('Edit this entry.', 'chaoticsoul'), '', ' | '); ?&gt;&lt;/p&gt;&lt;?php endif; ?&gt;
+				&lt;?php if (get_the_tags()): ?&gt;&lt;p class=&quot;postmetadata&quot;&gt;&lt;?php the_tags('&lt;br /&gt;' .  __( 'Tags' ) . ': ', ', ', '');  ?&gt;&lt;/p&gt;&lt;?php endif; ?&gt;
+			&lt;/div&gt;
+		&lt;/div&gt;
+		
+	&lt;?php comments_template(); ?&gt;
+	
+	&lt;?php endwhile; else: ?&gt;
+	
+		&lt;p&gt;&lt;?php _e('Sorry, no posts matched your criteria.', 'chaoticsoul'); ?&gt;&lt;/p&gt;
+	
+	&lt;?php endif; ?&gt;
+	
+	&lt;/div&gt;
+	
 &lt;?php get_sidebar(); ?&gt;
 
 &lt;?php get_footer(); ?&gt;</diff>
      <filename>single.php</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>d5778960ba50bfb0cd26af15f03642ba4607b3f2</id>
    </parent>
  </parents>
  <author>
    <name>Bryan Veloso</name>
    <email>bryan@revyver.com</email>
  </author>
  <url>http://github.com/revyver/angelicsoul/commit/55c282ac0f6d5688c42467c09d6c713bce5404a5</url>
  <id>55c282ac0f6d5688c42467c09d6c713bce5404a5</id>
  <committed-date>2009-08-07T23:19:06-07:00</committed-date>
  <authored-date>2009-08-07T23:19:06-07:00</authored-date>
  <message>Copying ChaoticSoul's code to AngelicSoul.</message>
  <tree>e97e6bba57871e40167f33e79fc502faf7b14b1c</tree>
  <committer>
    <name>Bryan Veloso</name>
    <email>bryan@revyver.com</email>
  </committer>
</commit>
