diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php
index 552cd31..9f360c7 100644
--- a/archive-comic-calendar.php
+++ b/archive-comic-calendar.php
@@ -74,8 +74,8 @@ $month['12'] = array('month' => __('December','comicpress'), 'days' => '31');
 
 <?php endwhile; ?>
 
-<div class="<?php comicpress_post_class(); ?>">
-	<div class="post-page-head"></div>
+<div <?php post_class(); ?>>
+	<div class="post-head"></div>
 	<div class="post-page">
 		<div class="archive-yearlist">| 
 <?php $years = $wpdb->get_col("SELECT DISTINCT YEAR(post_date) FROM $wpdb->posts WHERE post_status = 'publish' ORDER BY post_date ASC");
@@ -153,7 +153,7 @@ foreach ( $years as $year ) {
 		<?php } ?>
 		</div>
 	</div>
-	<div class="post-page-foot"></div>
+	<div class="post-foot"></div>
 </div>
 
 <?php if ('open' == $post->comment_status) { comments_template('', true); } ?>
diff --git a/archive-comic-month.php b/archive-comic-month.php
index d52ff14..6d88dfa 100644
--- a/archive-comic-month.php
+++ b/archive-comic-month.php
@@ -24,8 +24,8 @@ add_filter('posts_where', 'filter_where');
 $posts = query_posts('&show_posts=-1&posts_per_page=-1&cat='.get_all_comic_categories_as_cat_string());
 
 ?>
-<div class="<?php comicpress_post_class(); ?>">
-	<div class="post-page-head"></div>
+<div <?php post_class(); ?>>
+	<div class="post-head"></div>
 	<div class="post-page">
 <?php if (have_posts()) : while (have_posts()) : the_post() ?>
 
@@ -38,7 +38,7 @@ $posts = query_posts('&show_posts=-1&posts_per_page=-1&cat='.get_all_comic_categ
 <?php endwhile; endif; ?>
 		<br class="clear-margins" />
 	</div>
-	<div class="post-page-foot"></div>
+	<div class="post-foot"></div>
 </div>	
 	
 
diff --git a/archive-comic-storyline-thumbs.php b/archive-comic-storyline-thumbs.php
index a667adf..0a3b0de 100644
--- a/archive-comic-storyline-thumbs.php
+++ b/archive-comic-storyline-thumbs.php
@@ -14,8 +14,8 @@ if (have_posts()) {
 }
 ?>
 
-<div class="<?php comicpress_post_class(); ?>">
-	<div class="post-page-head"></div>
+<div <?php post_class(); ?>>
+	<div class="post-head"></div>
 	<div class="post-page">
 		<ul id="storyline" class="level-0">
 <?php if (get_option('comicpress-enable-storyline-support') == 1) {
@@ -70,7 +70,7 @@ if (have_posts()) {
 		</ul>
 		<br class="clear-margins" />
 	</div>
-	<div class="post-page-foot"></div>
+	<div class="post-foot"></div>
 </div>
 
 <?php if ('open' == $post->comment_status) { comments_template('', true); } ?>
diff --git a/archive-comic-storyline.php b/archive-comic-storyline.php
index fc5d4e5..25d5cf0 100644
--- a/archive-comic-storyline.php
+++ b/archive-comic-storyline.php
@@ -14,8 +14,8 @@ if (have_posts()) {
 }
 ?>
 
-<div class="<?php comicpress_post_class(); ?>">
-	<div class="post-page-head"></div>
+<div <?php post_class(); ?>>
+	<div class="post-head"></div>
 	<div class="post-page">
 		<ul id="storyline" class="level-0">
 			<?php if (get_option('comicpress-enable-storyline-support') == 1) {
@@ -72,7 +72,7 @@ if (have_posts()) {
 		</ul>
 		<br class="clear-margins" />
 	</div>
-	<div class="post-page-foot"></div>
+	<div class="post-foot"></div>
 </div>
 
 <?php if ('open' == $post->comment_status) { comments_template('', true); } ?>
diff --git a/archive-comic-year.php b/archive-comic-year.php
index 48041b9..f891885 100644
--- a/archive-comic-year.php
+++ b/archive-comic-year.php
@@ -25,8 +25,8 @@ if (have_posts()) {
 }
 ?>
 
-<div class="<?php comicpress_post_class(); ?>">
-	<div class="post-page-head"></div>
+<div <?php post_class(); ?>>
+	<div class="post-head"></div>
 	<div class="post-page">
 		<div class="archive-yearlist">| 
 			<?php $years = $wpdb->get_col("SELECT DISTINCT YEAR(post_date) FROM $wpdb->posts WHERE post_status = 'publish' ORDER BY post_date ASC");
@@ -44,7 +44,7 @@ if (have_posts()) {
 		</table>
 		<br class="clear-margins" />
 	</div>
-	<div class="post-page-foot"></div>
+	<div class="post-foot"></div>
 </div>
 
 <?php if ('open' == $post->comment_status) { comments_template('', true); } ?>
diff --git a/archive-comic.php b/archive-comic.php
index 077d13e..74af64b 100644
--- a/archive-comic.php
+++ b/archive-comic.php
@@ -19,8 +19,8 @@ $years = $wpdb->get_col("SELECT DISTINCT YEAR(post_date) FROM $wpdb->posts WHERE
 foreach ( $years as $year ) { 
 	if ($year != (0) ) {
 ?>
-<div class="<?php comicpress_post_class(); ?>">
-	<div class="post-page-head"></div>
+<div <?php post_class(); ?>>
+	<div class="post-head"></div>
 	<div class="post-page">
 			<h3><?php echo $year ?></h3>
 			<table class="month-table">
@@ -31,7 +31,7 @@ foreach ( $years as $year ) {
 			</table>
 		<br class="clear-margins" />
 	</div>
-	<div class="post-page-foot"></div>
+	<div class="post-foot"></div>
 </div>
 	<?php } 
 } ?>
diff --git a/archives.php b/archives.php
index 2c28c63..89852f8 100644
--- a/archives.php
+++ b/archives.php
@@ -14,8 +14,8 @@ if (have_posts()) {
 }
 ?>
 
-<div class="<?php comicpress_post_class(); ?>">
-	<div class="post-page-head"></div>
+<div <?php post_class(); ?>>
+	<div class="post-head"></div>
 	<div class="post-page">
 		<div id="archivepage">
 			<h2><?php _e('Archives by Month:','comicpress'); ?></h2>
@@ -23,11 +23,11 @@ if (have_posts()) {
 		</div>
 		<br class="clear-margins" />
 	</div>
-	<div class="post-page-foot"></div>
+	<div class="post-foot"></div>
 </div>
 
-<div class="<?php comicpress_post_class(); ?>">
-	<div class="post-page-head"></div>
+<div <?php post_class(); ?>>
+	<div class="post-head"></div>
 	<div class="post-page">
 		<div id="archivepage">
 			<h2><?php _e('Archives by Subject:','comicpress'); ?></h2>
@@ -35,7 +35,7 @@ if (have_posts()) {
 		</div>
 		<br class="clear-margins" />
 	</div>
-	<div class="post-page-foot"></div>
+	<div class="post-foot"></div>
 </div>
 
 <?php if ('open' == $post->comment_status) { comments_template('', true); } ?>
diff --git a/author.php b/author.php
index e7ad8ed..b583ee4 100644
--- a/author.php
+++ b/author.php
@@ -11,9 +11,9 @@
 		if (empty($curauth)) { ?>
 			<h2><?php _e('No such author.','comicpress'); ?></h2>
 		<?php } else { ?>
-		<div class="<?php comicpress_post_class(); ?>">
+		<div <?php post_class(); ?>>
 			<?php comicpress_display_post_thumbnail(); ?>
-			<div class="post-page-head"></div>
+			<div class="post-head"></div>
 			<div class="post-page">
 					<div class="userpage-avatar">
 						<?php echo str_replace("alt='", "alt='".wp_specialchars($curauth->display_name, 1)."' title='".wp_specialchars($curauth->display_name, 1), comicpress_get_avatar($curauth->user_email, 64)); ?>
@@ -63,7 +63,7 @@
 						<?php } ?>
 					</div>
 				</div>
-				<div class="post-page-foot"></div>
+				<div class="post-foot"></div>
 			</div>
 		<?php } ?>
 
diff --git a/buystrip.php b/buystrip.php
index 498a63d..2fe8282 100644
--- a/buystrip.php
+++ b/buystrip.php
@@ -16,9 +16,9 @@ Template Version: 2.14
 	$temppost = $post;
 	$post = & get_post( $comicnum ); 
 ?>
-	<div class="<?php comicpress_post_class(); ?>">
+	<div <?php post_class(); ?>>
 		<?php comicpress_display_post_thumbnail(); ?>
-		<div class="post-page-head"></div>
+		<div class="post-head"></div>
 		<div class="post-page">
 			<?php if (!$comicpress_options['disable_page_titles']) { ?>
 				<h2 class="pagetitle"><?php the_title() ?></h2>
@@ -90,16 +90,16 @@ Template Version: 2.14
 			<?php $post = $temppost; ?>
 			<br class="clear-margins" />
 		</div>
-		<div class="post-page-foot"></div>
+		<div class="post-foot"></div>
 	</div>
 	
 <?php else: ?>
 	
 		<?php while (have_posts()) : the_post() ?>
 
-		<div class="<?php comicpress_post_class(); ?>">
+		<div <?php post_class(); ?>>
 			<?php comicpress_display_post_thumbnail(); ?>
-			<div class="post-page-head"></div>
+			<div class="post-head"></div>
 			<div class="post-page">
 				<?php if (!$comicpress_options['disable_page_titles']) { ?>
 					<h2 class="pagetitle"><?php the_title() ?></h2>
@@ -110,7 +110,7 @@ Template Version: 2.14
 				<br class="clear-margins" />
 				<?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
 			</div>
-			<div class="post-page-foot"></div>
+			<div class="post-foot"></div>
 		</div>
 
 		<?php endwhile; ?>
diff --git a/image.php b/image.php
index 531c26f..c7b8d84 100644
--- a/image.php
+++ b/image.php
@@ -2,9 +2,9 @@
 <?php include(get_template_directory() . '/layout-head.php'); ?>
 
 	<?php if (have_posts()) : while (have_posts()) : the_post() ?>
-	<div class="<?php comicpress_post_class(); ?>">
+	<div <?php post_class(); ?>>
 		<?php comicpress_display_post_thumbnail(); ?>
-		<div class="post-page-head"></div>
+		<div class="post-head"></div>
 		<div class="post-page" id="post-<?php the_ID() ?>">
 			<?php if (!$comicpress_options['disable_page_titles']) { ?>
 				<h2 class="pagetitle"><?php the_title() ?></h2>
@@ -49,16 +49,16 @@
 			<?php if ('open' == $post->comment_status) { comments_template('', true); } ?>
 			<br class="clear-margins" />
 		</div>
-		<div class="post-page-foot"></div>
+		<div class="post-foot"></div>
 	</div>
 	<?php endwhile; else: ?>
-	<div class="<?php comicpress_post_class(); ?>">
-		<div class="post-page-head"></div>
+	<div <?php post_class(); ?>>
+		<div class="post-head"></div>
 		<div class="post-page">
 			<p><?php _e('Sorry, no image matched your criteria.','comicpress'); ?></p>
 			<br class="clear-margins" />
 		</div>
-		<div class="post-page-foot"></div>
+		<div class="post-foot"></div>
 	</div>
 	<?php endif; ?>
 	
diff --git a/links.php b/links.php
index 17b5097..1ad32c2 100644
--- a/links.php
+++ b/links.php
@@ -22,8 +22,8 @@ $bookmarks = preg_replace('#<li ([^>]*)>#', '<li>', $bookmarks);
 $bookmarks = preg_replace('#<ul ([^>]*)>#', '<ul>', $bookmarks);
 ?>
 
-<div class="<?php comicpress_post_class(); ?>">
-	<div class="post-page-head"></div>
+<div <?php post_class(); ?>>
+	<div class="post-head"></div>
 	<div class="post-page">
 		<div id="linkspage">
 		<ul>
@@ -32,7 +32,7 @@ $bookmarks = preg_replace('#<ul ([^>]*)>#', '<ul>', $bookmarks);
 		</div>
 		<div class="clear"></div>
 	</div>
-	<div class="post-page-foot"></div>
+	<div class="post-foot"></div>
 </div>
 	
 <?php include(get_template_directory() . '/layout-foot.php'); ?>
diff --git a/search-transcript.php b/search-transcript.php
index 9e8838d..f08d812 100644
--- a/search-transcript.php
+++ b/search-transcript.php
@@ -8,8 +8,8 @@ $count = $tmp_search->post_count;
 			?>
 		<?php if (!$count) $count = "no"; ?>
 		
-<div class="<?php comicpress_post_class(); ?>">
-	<div class="post-page-head"></div>
+<div <?php post_class(); ?>>
+	<div class="post-head"></div>
 	<div class="post-page">		
 		<h2 class="pagetitle"><?php _e('Search for &lsquo;','comicpress'); the_search_query(); _e('&rsquo;','comicpress'); ?></h2>
 		<div class="searchresults"><?php printf(__ngettext("%d item.", "%d items.", $count,'comicpress'),$count); ?></div>
@@ -39,14 +39,14 @@ $count = $tmp_search->post_count;
 	endwhile;
 
 	else : ?>
-<div class="<?php comicpress_post_class(); ?>">
-    <div class="post-page-head"></div>
+<div <?php post_class(); ?>>
+    <div class="post-head"></div>
     <div class="post-page">
       <h3><?php _e('No transcripts found.','comicpress'); ?></h3>
       <p><?php _e('Try another search?','comicpress'); ?></p>
       <p><?php include(get_template_directory() . '/searchform-transcript.php') ?></p>
     </div>
-    <div class="post-page-foot"></div>
+    <div class="post-foot"></div>
 </div>
   <?php endif; ?>
 
diff --git a/search.php b/search.php
index 8e20470..9c3fc15 100644
--- a/search.php
+++ b/search.php
@@ -8,8 +8,8 @@
 			?>
 		<?php if (!$count) $count = "no"; ?>
 		
-<div class="<?php comicpress_post_class(); ?>">
-	<div class="post-page-head"></div>
+<div <?php post_class(); ?>>
+	<div class="post-head"></div>
 	<div class="post-page">		
 		<h2 class="pagetitle"><?php _e('Search for &lsquo;','comicpress'); the_search_query(); _e('&rsquo;','comicpress'); ?></h2>
 		<div class="searchresults"><?php printf(__ngettext("%d item.", "%d items.", $count,'comicpress'),$count); ?></div>
@@ -28,24 +28,20 @@
 					</div>
 				</div>
 				
-			<?php } else { ?>
-				<?php if (in_comic_category()) {
+			<?php } else {
 					comicpress_display_post();
-				} else {
-					comicpress_display_post();
-				}
 			}
 	endwhile;
     
 	else : ?>
-		<div class="<?php comicpress_post_class(); ?>">
-			<div class="post-page-head"></div>
+		<div <?php post_class(); ?>>
+			<div class="post-head"></div>
 			<div class="post-page">
 				<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/single.php b/single.php
index 4634906..a480cd0 100644
--- a/single.php
+++ b/single.php
@@ -79,7 +79,7 @@ if (have_posts()) : while (have_posts()) : the_post();
 		
 	<?php else: ?>
 	<?php get_sidebar('underblog'); ?>	
-	<div class="<?php comicpress_post_class(); ?>">
+	<div <?php post_class(); ?>>
 		<div class="post-head"></div>
 		<div class="post">
 			<p><?php _e('Sorry, no posts matched your criteria.','comicpress'); ?></p>