diff --git a/404.php b/404.php
index 9dea826..8634639 100644
--- a/404.php
+++ b/404.php
@@ -1,7 +1,7 @@
 <?php get_header(); ?>
 <?php include(get_template_directory() . '/layout-head.php'); ?>
 	
-<div class="post post-404">
+<div class="post page post-404">
 	<div class="post-head"></div>
 	<div class="post-content">
 		<h2 class="pagetitle"><?php _e('Page Not Found','comicpress'); ?></h2>
diff --git a/archive.php b/archive.php
index c8e8069..dcc6852 100644
--- a/archive.php
+++ b/archive.php
@@ -17,10 +17,9 @@
 			} else {
 				$posts = query_posts($query_string.'&order='.$archive_display_order);
 			} ?>
-	<div class="<?php comicpress_post_class(); ?>">
-		<div class="post-page-head"></div>
-		<div class="post-page">	
-			<div class="content">
+	<div <?php post_class(); ?>>
+		<div class="post-head"></div>
+		<div class="post-content">	
 			<?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
 			<?php /* Category Archive */ if (is_category()) { ?>
 				<h2 class="pagetitle"><?php _e('Archive for &#8216;','comicpress'); ?><?php single_cat_title() ?>&#8217;</h2>
@@ -37,18 +36,17 @@
 			<?php /* Paged Archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
 				<h2 class="pagetitle"><?php _e('Archives','comicpress'); ?></h2>
 			<?php } ?>
-				<div class="searchresults"><?php printf(__ngettext("%d item.", "%d items.", $count,'comicpress'),$count); ?></div>
-			</div>
+			<div class="searchresults"><?php printf(__ngettext("%d item.", "%d items.", $count,'comicpress'),$count); ?></div>
 			<br class="clear-margins" />
 		</div>
-		<div class="post-page-foot"></div>
+		<div class="post-foot"></div>
 	</div>
 	
 		<?php if (is_category() && in_comic_category()) { ?>
 
-		<div class="<?php comicpress_post_class(); ?>">
-			<div class="post-page-head"></div>
-			<div class="post-page">	
+		<div <?php post_class(); ?>>
+			<div class="post-head"></div>
+			<div class="post-content">	
 			
 		<?php } ?>
 		<?php while (have_posts()) : the_post();
@@ -63,9 +61,9 @@
 				
 			<?php } else { ?>
 				<?php if (in_comic_category()) {
-					display_comic_post();
+					comicpress_display_post();
 				} else {
-					display_blog_post();
+					comicpress_display_post();
 				}
 			}
 			
@@ -75,21 +73,21 @@
 	
 			<br class="clear-margins" />
 		</div>
-		<div class="post-page-foot"></div>
+		<div class="post-foot"></div>
 	</div>	
 	
 	<?php } ?>
 		
 		<div class="clear"></div>
 	<?php else : ?>
-		<div class="<?php comicpress_post_class(); ?>">
-			<div class="post-page-head"></div>
-			<div class="post-page">
+		<div <?php post_class(); ?>>
+			<div class="post-head"></div>
+			<div class="post">
 				<h3><?php _e('No entries found.','comicpress'); ?></h3>
 				<p><?php _e('Try another search?','comicpress'); ?></p>
 				<p><?php the_widget('WP_Widget_Search'); ?></p>
 			</div>
-			<div class="post-page-foot"></div>
+			<div class="post-foot"></div>
 		</div>
 	<?php endif; ?>
 		
diff --git a/blog.php b/blog.php
index 01e5d57..174a445 100644
--- a/blog.php
+++ b/blog.php
@@ -15,7 +15,7 @@ Template Name: Blog
 			
 			while (have_posts()) : the_post();
 				
-				display_blog_post();	
+				comicpress_display_post();	
 			
 			endwhile;
 			
diff --git a/functions/dual-columns.php b/functions/dual-columns.php
index 43fb687..5fb20dc 100644
--- a/functions/dual-columns.php
+++ b/functions/dual-columns.php
@@ -9,7 +9,7 @@ function comicpress_dual_columns() {
     $posts = query_posts($blog_query);
     if (have_posts()) {
       while (have_posts()) : the_post();
-        display_blog_post();
+        comicpress_display_post();
       endwhile;
     } ?>
     <span class="viewpostsbyone">View all posts by: <?php the_author_posts_link(); ?><span><br />
@@ -20,7 +20,7 @@ function comicpress_dual_columns() {
     $posts = query_posts($blog_query);
     if (have_posts()) {
       while (have_posts()) : the_post();
-        display_blog_post();
+        comicpress_display_post();
       endwhile;
     } ?>
     <span class="viewpostsbytwo">View all posts by: <?php the_author_posts_link(); ?></span><br />
diff --git a/members-blog.php b/members-blog.php
index 4a8cb3d..62f6ab8 100644
--- a/members-blog.php
+++ b/members-blog.php
@@ -15,7 +15,7 @@ Template Name: Members Only Blog
 		$posts = query_posts($blog_query);
 		while (have_posts()) : the_post();
 			
-			display_blog_post();			
+			comicpress_display_post();			
 		
 		endwhile; 
 		
diff --git a/search-transcript.php b/search-transcript.php
index e74ea33..9e8838d 100644
--- a/search-transcript.php
+++ b/search-transcript.php
@@ -31,9 +31,9 @@ $count = $tmp_search->post_count;
 				
 			<?php } else { ?>
 				<?php if (in_comic_category()) {
-					display_comic_post();
+					comicpress_display_post();
 				} else {
-					display_blog_post();
+					comicpress_display_post();
 				}
 			}
 	endwhile;
diff --git a/search.php b/search.php
index 74f9064..8e20470 100644
--- a/search.php
+++ b/search.php
@@ -30,9 +30,9 @@
 				
 			<?php } else { ?>
 				<?php if (in_comic_category()) {
-					display_comic_post();
+					comicpress_display_post();
 				} else {
-					display_blog_post();
+					comicpress_display_post();
 				}
 			}
 	endwhile;