diff --git a/functions/displaycomic.php b/functions/displaycomic.php
index 50e5d73..68e0ddf 100644
--- a/functions/displaycomic.php
+++ b/functions/displaycomic.php
@@ -1,13 +1,36 @@
 <?php
 
-function display_comic_area() {
+function comicpress_display_comic_image($searchorder = "comic",$use_post_image = false) {
+	global $post;
+	if ($use_post_image) {
+		if (function_exists('has_post_thumbnail')) {
+			if ( has_post_thumbnail($post->ID) ) {
+				$comic_image = get_the_post_thumbnail($post->ID,'full');
+			} 
+		}
+	}
+	if (!isset($comic_image)) {
+		$searchorder = explode(',',$searchorder);
+		$requested_archive_image = '';
+		foreach ($searchorder as $type) {
+			if (($requested_archive_image = get_comic_url($type, $post)) !== false) {
+				$comic_image = "<img src=\"$requested_archive_image\" alt=\"".get_the_title()."\" title=\"".get_the_title()."\" />";
+				break;
+			}
+		}
+	}
+	return apply_filters('comicpress_display_comic_image',$comic_image);
+}
+
+
+function comicpress_display_comic_area() {
 	global $post, $wp_query, $comicpress_options;
 	if (comicpress_check_child_file('partials/displaycomic') == false) { ?>
 		<div id="comic-wrap">
 			<div id="comic-head"><?php get_sidebar('over'); ?></div>
 			<div class="clear"></div>
 			<?php get_sidebar('comicleft'); ?>
-			<div id="comic"><?php display_comic(); ?></div>
+			<div id="comic"><?php comicpress_display_comic(); ?></div>
 			<?php get_sidebar('comicright'); ?>
 			<div class="clear"></div>
 			<div id="comic-foot"><?php get_sidebar('under'); ?></div>
@@ -15,7 +38,7 @@ function display_comic_area() {
 <?php }	
 }
 
-function display_comic() { 
+function comicpress_display_comic() { 
 	global $post, $wp_query, $rascal_says, $comicpress_options, $comic_filename_filters;
 	$next_comic = get_next_comic_permalink();
 	$comic = explode(".", the_comic_filename()); 
diff --git a/layout-head.php b/layout-head.php
index f5d6685..88dfeba 100644
--- a/layout-head.php
+++ b/layout-head.php
@@ -27,7 +27,7 @@
 		if (have_posts()) {
 			while (have_posts()) : the_post();
 				$wp_query->is_single = true;
-				display_comic_area();
+				comicpress_display_comic_area();
 			endwhile;
 		}
 		Restore();
@@ -35,7 +35,7 @@
 		wp_reset_query();
 	}
 	if (is_single() & in_comic_category()) {
-		display_comic_area();
+		comicpress_display_comic_area();
 	}
 ?>
 
diff --git a/widgets/LatestThumbnailWidget.inc b/widgets/LatestThumbnailWidget.inc
index 77aee92..4b5ead3 100644
--- a/widgets/LatestThumbnailWidget.inc
+++ b/widgets/LatestThumbnailWidget.inc
@@ -32,26 +32,10 @@ class ComicPressLatestThumbnailWidget extends WP_Widget {
 		$archive_image = null;
 		if (have_posts()) {
 			while (have_posts()) : the_post();
-				if (!empty($post->post_content)) {
-					echo $before_widget;
-					$temp_query = $wp_query->is_single;
-					$wp_query->is_single = true;
-					foreach (array("archive", "rss", "mini", "comic") as $type) {
-						if (($requested_archive_image = get_comic_url($type, $post)) !== false) {
-							$archive_image = "<img src=\"$requested_archive_image\" alt=\"".get_the_title()."\" title=\"".get_the_title()."\" />";
-							break;
-						}
-					}
-					if (function_exists('has_post_thumbnail')) {
-						if ( has_post_thumbnail($post->ID) ) {
-							$archive_image = get_the_post_thumbnail($post->ID,'full');
-						}
-					}  ?>
-					<a href="<?php the_permalink(); ?>"><?php echo $archive_image; ?></a> 
-				<?php
-					$wp_query->is_single = $temp_query;
-					echo $after_widget;
-				}
+				$temp_query = $wp_query->is_single;
+				$wp_query->is_single = true;
+				echo "<a href=\"".get_permalink()."\">".comicpress_display_comic_image('rss,archive,mini,comic',true)."</a>\r\n";
+				$wp_query->is_single = $temp_query;
 			endwhile;
 		}
 		Restore();