diff -Naur ./archive.php ../scribbishwp/archive.php
--- ./archive.php	2007-05-16 11:59:21.000000000 -0700
+++ ../scribbishwp/archive.php	2008-05-12 13:46:10.000000000 -0700
@@ -15,14 +15,14 @@
           <span class="vcard">
             Posted by <span class="fn"><?php the_author() ?></span>
           </span>
-          <abbr class="published" title="<?php the_time_xml() ?>"><span class="posted_date" title="<?php the_time('D, d M Y H:i:s T') ?>">on <?php the_time('F d, Y') ?></span></abbr>
+          <abbr class="published" title="<?php the_time_xml() ?>"><span class="posted_date" title="<?php the_time('Y-m-d H:i:sP') ?>">on <?php the_time('F d, Y') ?></span></abbr>
         </div>
 			  <br class="clear" />	
 				<div class="entry-content">
 					<?php the_content('Continue reading...'); ?>
 				</div>
 				<ul class="meta">
-          <li class="categories">Posted in <?php the_category(', ') ?></li>
+          <li class="categories"><?php the_tags(); ?></li>
           <li>Meta
             <?php comments_popup_link('no comments', '1 comment', '% comments'); ?>,
             <a href="<?php the_permalink() ?>" rel="bookmark">permalink</a>,
diff -Naur ./comments.php ../scribbishwp/comments.php
--- ./comments.php	2006-06-12 10:19:52.000000000 -0700
+++ ../scribbishwp/comments.php	2008-05-12 15:02:21.000000000 -0700
@@ -38,8 +38,9 @@
 
         <li class="comment" id="comment-<?php comment_ID() ?>">
           <div class="author">
+	 <?php if(function_exists('get_avatar')) { echo get_avatar($comment, '32'); } ?>
             <cite><?php comment_author_link() ?></cite>
-            <abbr title="<?php the_time('Y-m-d\TH:i:s') ?>"><?php comment_time('D, d M Y H:i:s T') ?></abbr>
+            <abbr title="<?php comment_time('Y-m-d H:i:sP') ?>"><?php comment_time('M d, Y H:i T') ?></abbr>
             <?php if ($comment->comment_approved == '0') : ?>
             <em>Your comment is awaiting moderation.</em>
             <?php endif; ?>
diff -Naur ./footer.php ../scribbishwp/footer.php
--- ./footer.php	2006-12-13 07:52:17.000000000 -0800
+++ ../scribbishwp/footer.php	2008-05-11 05:39:48.000000000 -0700
@@ -14,6 +14,7 @@
 
 <!-- Original theme design by Packagethief - http://quotedprintable.com/pages/scribbish -->
 <!-- WordPress theme port by Kenny Pitt - http://pittcrew.net/geekblog/scribbishwp -->
+<!-- WordPress 2.5 patch by Josh Wood - http://labs.utopian.net/who/josh/scribbishwp/ -->
 <?php ?>
 
 		<?php wp_footer(); ?>
diff -Naur ./image.php ../scribbishwp/image.php
--- ./image.php	1969-12-31 16:00:00.000000000 -0800
+++ ../scribbishwp/image.php	2008-05-12 14:10:06.000000000 -0700
@@ -0,0 +1,72 @@
+<?php get_header(); ?>
+
+	<div id="content" class="widecolumn">
+
+  <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
+
+		<div class="hentry" id="post-<?php the_ID(); ?>">
+			<h2 class="entry-title"><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> &raquo; <?php the_title(); ?></h2>
+			
+			<div class="posted">
+				<span class="vcard">
+					Posted by <span class="fn"><?php the_author() ?></span>
+				</span>
+				<abbr class="published" title="<?php the_time_xml() ?>"><span class="posted_date" title="<?php the_time('Y-m-d H:i:sP') ?>">on <?php the_time('F d, Y') ?></span></abbr>
+			</div>
+			<br class="clear" />	
+			
+			<div class="entry">
+				<p class="attachment"><a href="<?php echo wp_get_attachment_url($post->ID); ?>"><?php echo wp_get_attachment_image( $post->ID, 'medium' ); ?></a></p>
+                <div class="caption"><?php if ( !empty($post->post_excerpt) ) the_excerpt(); // this is the "caption" ?></div>
+
+				<?php the_content('<p class="serif">Read the rest of this entry &raquo;</p>'); ?>
+
+				<div class="navigation">
+					<div class="alignleft"><?php previous_image_link() ?></div>
+					<div class="alignright"><?php next_image_link() ?></div>
+				</div>
+				<br class="clear" />
+<!--
+				<p class="postmetadata alt">
+					<small>
+						This entry was posted on <?php the_time('l, F jS, Y') ?> at <?php the_time() ?>
+						and is filed under <?php the_category(', ') ?>.
+						<?php the_taxonomies(); ?>
+						You can follow any responses to this entry through the <?php post_comments_feed_link('RSS 2.0'); ?> feed.
+
+						<?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
+							// Both Comments and Pings are open ?>
+							You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(); ?>" rel="trackback">trackback</a> from your own site.
+
+						<?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
+							// Only Pings are Open ?>
+							Responses are currently closed, but you can <a href="<?php trackback_url(); ?> " rel="trackback">trackback</a> from your own site.
+
+						<?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
+							// Comments are open, Pings are not ?>
+							You can skip to the end and leave a response. Pinging is currently not allowed.
+
+						<?php } elseif (!('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
+							// Neither Comments, nor Pings are open ?>
+							Both comments and pings are currently closed.
+
+						<?php } edit_post_link('Edit this entry.','',''); ?>
+
+					</small>
+				</p>
+-->
+			</div>
+
+		</div>
+
+	<?php comments_template(); ?>
+
+	<?php endwhile; else: ?>
+
+		<p>Sorry, no attachments matched your criteria.</p>
+
+<?php endif; ?>
+
+	</div>
+
+<?php get_footer(); ?>
diff -Naur ./index.php ../scribbishwp/index.php
--- ./index.php	2007-05-16 11:56:00.000000000 -0700
+++ ../scribbishwp/index.php	2008-05-12 13:48:23.000000000 -0700
@@ -16,14 +16,14 @@
           <span class="vcard">
             Posted by <span class="fn"><?php the_author() ?></span>
           </span>
-          <abbr class="published" title="<?php the_time_xml() ?>"><span class="posted_date" title="<?php the_time('D, d M Y H:i:s T') ?>">on <?php the_time('F d, Y') ?></span></abbr>
+          <abbr class="published" title="<?php the_time_xml() ?>"><span class="posted_date" title="<?php the_time('Y-m-d H:i:sP') ?>">on <?php the_time('F d, Y') ?></span></abbr>
         </div>
         <br class="clear" />
 				<div class="entry-content">
 					<?php the_content('Continue reading...'); ?>
 				</div>
 				<ul class="meta">
-          <li class="categories">Posted in <?php the_category(', ') ?></li>
+          <li class="categories"><?php the_tags(); ?></li>
           <li>Meta
             <?php comments_popup_link('no comments', '1 comment', '% comments'); ?>,
             <a href="<?php the_permalink() ?>" rel="bookmark">permalink</a>,
diff -Naur ./search.php ../scribbishwp/search.php
--- ./search.php	2006-06-15 09:48:42.000000000 -0700
+++ ../scribbishwp/search.php	2008-05-12 13:48:36.000000000 -0700
@@ -15,7 +15,7 @@
 
         <p class="author">
 				  Posted by <cite><?php the_author() ?></cite> on
-          <abbr class="published" title="<?php the_time('Y-m-d\TH:i:s') ?>"><span class="posted_date" title="<?php the_time('D, d M Y H:i:s T') ?>"><?php the_time('F d, Y') ?></span></abbr>
+          <abbr class="published" title="<?php the_time('Y-m-d\TH:i:s') ?>"><span class="posted_date" title="<?php the_time('Y-m-d H:i:sP') ?>"><?php the_time('F d, Y') ?></span></abbr>
         </p>
 				
 				<div class="content">
@@ -23,7 +23,7 @@
 				</div>
 		
 				<ul class="meta">
-          <li class="categories">Posted in <?php the_category(', ') ?></li>
+          <li class="categories"><?php the_tags(); ?></li>
           <li>Meta
             <?php comments_popup_link('no comments', '1 comment', '% comments'); ?>,
             <a href="<?php the_permalink() ?>" rel="bookmark">permalink</a>,
diff -Naur ./single.php ../scribbishwp/single.php
--- ./single.php	2007-05-16 11:57:24.000000000 -0700
+++ ../scribbishwp/single.php	2008-05-12 13:48:49.000000000 -0700
@@ -17,7 +17,7 @@
         <span class="vcard">
           Posted by <span class="fn"><?php the_author() ?></span>
         </span>
-        <abbr class="published" title="<?php the_time_xml() ?>"><span class="posted_date" title="<?php the_time('D, d M Y H:i:s T') ?>">on <?php the_time('F d, Y') ?></span></abbr>
+        <abbr class="published" title="<?php the_time_xml() ?>"><span class="posted_date" title="<?php the_time('Y-m-d H:i:sP') ?>">on <?php the_time('F d, Y') ?></span></abbr>
       </div>
       <br class="clear" />	
 			<div class="entry-content">
@@ -26,7 +26,7 @@
 				<?php link_pages('<p><strong>Pages:</strong> ', '</p>', 'number'); ?>
 			</div>
       <ul class="meta">
-        <li class="categories">Posted in <?php the_category(', ') ?></li>
+        <li class="categories"><?php the_tags(); ?></li>
         <li>Meta
           <a href="#comments"><?php comments_number('no comments', '1 comment', '% comments'); ?></a>,
           <a href="<?php the_permalink() ?>" rel="bookmark">permalink</a>,
diff -Naur ./style.css ../scribbishwp/style.css
--- ./style.css	2007-09-24 18:49:21.000000000 -0700
+++ ../scribbishwp/style.css	2008-05-12 15:24:36.000000000 -0700
@@ -2,10 +2,15 @@
 Theme Name: ScribbishWP
 Theme URI: http://pittcrew.net/geekblog/scribbishwp
 Description: WordPress port of the Scribbish theme for Typo.
-Version: 1.0-3.0
+TAGS: widgets, scribbish, microformats, hatom
+Version: 1.1-3.0
 Author: Kenny Pitt and Jeffrey Hardy
 Author URI: http://pittcrew.net/geekblog/
 
+  [Interim] ScribbishWP v1.1-3.0
+	Updated for wp2.5+, tag in post meta + gallery support (image.php)
+	http://labs.utopian.net/who/josh/scribbishwp/
+	
   ScribbishWP v1.0-3.0
     http://pittcrew.net/geekblog/scribbishwp
 
@@ -68,10 +73,10 @@
 }
 
 /*--------------------------------------------------------------
- Content Width: you can have standard or wide
+ Content Width: you can have narrow or wide
  --------------------------------------------------------------*/
 
-/* BEGIN: Standard Layout */
+/* BEGIN: Narrow Layout
 #container {
   width: 740px;
 }
@@ -79,9 +84,9 @@
 #content {
   width: 500px;
 }
-/* END: Standard Layout */
+/* END: Narrow Layout */
 
-/* BEGIN: Wide Layout
+/* BEGIN: Wide Layout */
 #container {
   width: 900px;
 }
@@ -166,13 +171,8 @@
 #content h3,
 #content h4,
 #content h5 { 
-  /* BEGIN: Scribbish 2.0 Styles */
-	font-family: "lucidamac bold", "lucida grande", arial, sans-serif;
-  /* END: Scribbish 2.0 Styles */
-  /* BEGIN: Scribbish 3.0 Styles 
   font-family: georgia, times, serif; 
   font-weight: normal;
-  /* END: Scribbish 3.0 Styles */
   letter-spacing: -1px;
 }
 
@@ -235,9 +235,15 @@
 }
 
 #content pre {
-  color: #63FF00; /* green on black like an old-school monochrome monitor */
-  /*color: #eee;*/ /* uncomment if you prefer basic grey text */
-  background: #000; 
+/* BEGIN: Std Scribbish green on black like monochrome monitor
+  color: #63FF00;
+  background: #000000; 
+/* END: std scribbish pre style */
+/* BEGIN: Gray border box, mono black font on white bg */
+  color: #000000;
+  background: #FFFFFF; 
+  border: 1px solid #EEEEEE;
+/* END: clean pre style */
   overflow: auto;
   font: normal 12px "bitstream vera sans mono", monaco, "lucida console", "courier new", courier, serif;
   margin: 0.9em 0; padding: 8px;
@@ -257,24 +263,15 @@
 
 #content .hentry .entry-title a:link,
 #content .hentry .entry-title a:visited { 
-  /* BEGIN: Scribbish 2.0 Styles */
-	color: #930;
-  /* END: Scribbish 2.0 Styles */
-  /* BEGIN: Scribbish 3.0 Styles 
   color: #111;
-  /* END: Scribbish 3.0 Styles */
   text-decoration: none;
 }
 
 #content .hentry .entry-title a:hover,
 #content .hentry .entry-title a:active { 
   background: transparent;
-  /* BEGIN: Scribbish 2.0 Styles */
-	color: #000;
-  /* END: Scribbish 2.0 Styles */
-  /* BEGIN: Scribbish 3.0 Styles 
+  color: #000;
   text-decoration: underline;
-  /* END: Scribbish 3.0 Styles */
 }
 
 /* Set display to "inline" to show comment count after article title */
@@ -298,7 +295,7 @@
   text-decoration: none;
 }
 
-#content .hentry .clear { clear: both; }
+.clear { clear: both; }
 
 #content .hentry .entry-content {}
 
@@ -362,11 +359,10 @@
 #content li.comment   .author abbr, 
 #content li.trackback .author abbr { color: #999; }
 
-/* For future Gravatar support.  Not currently used. */
-/*
-#content li.comment .author .gravatar { 
-  margin: 0 0 0.5em 0.5em;
-  float: right; 
+/* Gravatars are returned with class='avatar' */
+#content li.comment .author .avatar { 
+  float: right;
+  background: #fff;
 }
 
 #content li.comment .author div {
@@ -375,7 +371,6 @@
   background: url(images/gravatar.gif) no-repeat left top;
   float: right; 
 }
-*/
 
 #content form.comments {
   background: #f2f2f2;
@@ -552,7 +547,7 @@
   padding: 4px;
   margin: 0 0 2px 7px;
   display: inline;
-  }
+}
 
 img.alignleft {
   padding: 4px;