diff --git a/archive-comic.php b/archive-comic.php
index 337149c..3ac5da3 100644
--- a/archive-comic.php
+++ b/archive-comic.php
@@ -10,8 +10,19 @@ Template Name: Comic Archive
 	<div class="post-page-head"></div>
 	<div class="post-page">
 	<?php while (have_posts()) : the_post() ?>
+			<?php if (function_exists('the_post_image')) {
+				if ( has_post_image() ) { ?>
+					<div class="post-page-image">
+					<?php the_post_image('full'); ?>
+					</div>
+				<?php } else { ?>
+					<h2 class="pagetitle"><?php the_title() ?></h2>
+				<?php } ?>
+			<?php } else { ?>
+				<h2 class="pagetitle"><?php the_title() ?></h2>
+			<?php } ?>
+			<br class="clear-margins" />
 		<div class="entry">
-			<h2 class="pagetitle"><?php the_title() ?></h2>
 			<?php the_content(); ?>
 		</div>
 	<?php endwhile; ?>
diff --git a/archives.php b/archives.php
index a710c48..5264d95 100644
--- a/archives.php
+++ b/archives.php
@@ -10,7 +10,18 @@ Template Name: Archives
 			<div class="post-page-head"></div>
 			<div class="post-page">
 				<div id="archivepage">
-					<h2><?php _e('Archives by Month:','comicpress'); ?></h2>
+			<?php if (function_exists('the_post_image')) {
+				if ( has_post_image() ) { ?>
+					<div class="post-page-image">
+					<?php the_post_image('full'); ?>
+					</div>
+				<?php } else { ?>
+					<h2 class="pagetitle"><?php the_title() ?></h2>
+				<?php } ?>
+			<?php } else { ?>
+				<h2 class="pagetitle"><?php the_title() ?></h2>
+			<?php } ?>
+			<br class="clear-margins" />
 					<ul><?php wp_get_archives('type=monthly') ?></ul>
 					<h2><?php _e('Archives by Subject:','comicpress'); ?></h2>
 					<ul><?php wp_list_categories() ?></ul>
diff --git a/buystrip.php b/buystrip.php
index 8769346..b440cb5 100644
--- a/buystrip.php
+++ b/buystrip.php
@@ -21,10 +21,18 @@ Template Version: 2.14
 				<br />
 				<img src="<?php echo get_template_directory_uri(); ?>/images/paypal.png" alt="<?php _e('Powered by Paypal','comicpress'); ?>" /><br />
 			</div>
-			<div style="float:left;">
-				<h2 class="pagetitle"><?php _e('Buy Print!','comicpress'); ?></h2>
-			</div>
-			<div class="clear"></div>
+			<?php if (function_exists('the_post_image')) {
+				if ( has_post_image() ) { ?>
+					<div class="post-page-image">
+					<?php the_post_image('full'); ?>
+					</div>
+				<?php } else { ?>
+					<h2 class="pagetitle"><?php the_title() ?></h2>
+				<?php } ?>
+			<?php } else { ?>
+				<h2 class="pagetitle"><?php the_title() ?></h2>
+			<?php } ?>
+			<br class="clear-margins" />
 			<?php _e('Comic ID','comicpress'); ?> - #<?php echo $comicnum; ?><br />
 			<?php _e('Title:','comicpress'); ?>	<?php echo the_title(); ?><br />
 			<br />
diff --git a/image.php b/image.php
index 5cd9838..1ba3826 100644
--- a/image.php
+++ b/image.php
@@ -5,9 +5,18 @@
 	<div class="<?php comicpress_post_class(); ?>">
 		<div class="post-page-head"></div>
 		<div class="post-page" id="post-<?php the_ID() ?>">
-			<h2 class="pagetitle">
-				<a href="<?php echo get_permalink($post->post_parent) ?>" rev="attachment"><?php echo get_the_title($post->post_parent) ?></a>
-			</h2>
+			<?php if (function_exists('the_post_image')) {
+				if ( has_post_image() ) { ?>
+					<div class="post-page-image">
+					<?php the_post_image('full'); ?>
+					</div>
+				<?php } else { ?>
+					<h2 class="pagetitle"><?php the_title() ?></h2>
+				<?php } ?>
+			<?php } else { ?>
+				<h2 class="pagetitle"><?php the_title() ?></h2>
+			<?php } ?>
+			<br class="clear-margins" />
 			<div class="gallery-image">
 				<a href="<?php echo wp_get_attachment_url($post->ID) ?>" target="_blank" title="<?php _e('Click for full size.','comicpress'); ?>" ><img src="<?php echo wp_get_attachment_url($post->ID) ?>" alt="<?php the_title() ?>" /></a>
 			</div>
diff --git a/links.php b/links.php
index 5bbcd85..dd9ea50 100644
--- a/links.php
+++ b/links.php
@@ -16,7 +16,18 @@ Template Name: Links
 	<div class="<?php comicpress_post_class(); ?>">
 		<div class="post-page-head"></div>
 		<div class="post-page">
-			<h2 class="pagetitle"><?php the_title() ?></h2>
+			<?php if (function_exists('the_post_image')) {
+				if ( has_post_image() ) { ?>
+					<div class="post-page-image">
+					<?php the_post_image('full'); ?>
+					</div>
+				<?php } else { ?>
+					<h2 class="pagetitle"><?php the_title() ?></h2>
+				<?php } ?>
+			<?php } else { ?>
+				<h2 class="pagetitle"><?php the_title() ?></h2>
+			<?php } ?>
+			<br class="clear-margins" />
 			<div id="linkspage">
 			<ul>
 				<?php echo $bookmarks; ?>