diff --git a/links.php b/links.php
index b84b440..c9fee91 100644
--- a/links.php
+++ b/links.php
@@ -2,24 +2,26 @@
 /*
 Template Name: Links
 */
+
+global $comicpress;
+
+comicpress_init();
+
+ob_start();
+
 ?>
-
-<?php get_header() ?>
-
-<div id="content" class="narrowcolumn">
-
-	<div class="post-page-head">
-		<div class="post-page">
-			<h2 class="pagetitle"><?php the_title() ?></h2>
-			<ul>
-				<?php wp_list_bookmarks() ?>
-			</ul>
-			<br class="clear-margins" />
-		</div>
-		<div class="post-page-foot"></div>
-  </div>
+<div class="post-page-head"></div>
+<div class="post-page">
+	<h2 class="pagetitle"><?php the_title() ?></h2>
+	<ul>
+		<?php wp_list_bookmarks() ?>
+	</ul>
+	<br class="clear-margins" />
 </div>
-	
-<?php ge_sidebar() ?>
+<div class="post-page-foot"></div>
+<?php
 
-<?php get_footer() ?>
\ No newline at end of file
+$content = ob_get_clean();
+
+include(get_template_directory() . '/layouts/' . $comicpress->comicpress_options['layout']);
+?>
\ No newline at end of file
diff --git a/page.php b/page.php
index 91fb57c..d60555a 100644
--- a/page.php
+++ b/page.php
@@ -1,22 +1,19 @@
-<?php get_header() ?>
-
-<div id="content" class="narrowcolumn">
-	<?php if (have_posts()) : while (have_posts()) : the_post() ?>
-		<div class="post-page-head"></div>
-		<div class="post-page" id="post-<?php the_ID() ?>">
-			<h2 class="pagetitle"><?php the_title() ?></h2>
-			<div class="entry">
-				<?php the_content() ?>
-				<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')) ?>
-			</div>
-			<?php edit_post_link('Edit this page.', '<p>', '</p>') ?>
-			<br class="clear-margins" />
-		</div>
-		<div class="post-page-foot"></div>
-	<?php endwhile; endif; ?>
-  <?php comments_template(); ?>
-</div>
-
-<?php get_sidebar() ?>
-
-<?php get_footer() ?>
\ No newline at end of file
+<?php
+  global $comicpress;
+  
+  comicpress_init();
+  
+  ob_start();
+  
+  if (have_posts()) {
+    while (have_posts()) {
+      the_post();
+      include_partial('page-post');
+    }
+  }
+  comments_template();
+  
+  $content = ob_get_clean();
+  
+  include(get_template_directory() . '/layouts/' . $comicpress->comicpress_options['layout']);
+?>
\ No newline at end of file
diff --git a/partials/page-post.inc b/partials/page-post.inc
new file mode 100644
index 0000000..51f8311
--- /dev/null
+++ b/partials/page-post.inc
@@ -0,0 +1,11 @@
+<div class="post-page-head"></div>
+<div class="post-page" id="post-<?php the_ID() ?>">
+	<h2 class="pagetitle"><?php the_title() ?></h2>
+	<div class="entry">
+		<?php the_content() ?>
+		<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')) ?>
+	</div>
+	<?php edit_post_link('Edit this page.', '<p>', '</p>') ?>
+	<br class="clear-margins" />
+</div>
+<div class="post-page-foot"></div>
diff --git a/partials/search-comic-post.inc b/partials/search-comic-post.inc
index 9506a51..2b7d85f 100644
--- a/partials/search-comic-post.inc
+++ b/partials/search-comic-post.inc
@@ -1,7 +1,7 @@
 <div class="post-comic-head"></div>
 <div class="post-comic">
-  <div class="comicarchiveframe" style="width:<?php echo $archive_comic_width ?>px;">
-    <a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="Click for full size." title="Click for full size" width="<?php echo $archive_comic_width ?>" /><br />
+  <div class="comicarchiveframe">
+    <a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="Click for full size." title="Click for full size" /><br />
     <h3><?php the_title() ?></h3>
     <small><?php the_time('F jS, Y') ?></small></a>
   </div>
diff --git a/partials/search-transcript-comic-post.inc b/partials/search-transcript-comic-post.inc
new file mode 100644
index 0000000..84b118b
--- /dev/null
+++ b/partials/search-transcript-comic-post.inc
@@ -0,0 +1,10 @@
+<div class="post-comic-head"></div>
+<div class="post-comic">
+  <div class="comicarchiveframe">
+    <a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="<?php the_transcript() ?>" /><br />
+    <h3><?php the_title() ?></h3>
+    <small><?php the_time('F jS, Y') ?></small></a>
+  </div>
+  <br class="clear-margins" />
+</div>
+<div class="post-comic-foot"></div>
diff --git a/partials/search-transcript-not-found.inc b/partials/search-transcript-not-found.inc
new file mode 100644
index 0000000..0e6dacd
--- /dev/null
+++ b/partials/search-transcript-not-found.inc
@@ -0,0 +1,7 @@
+<?php if(function_exists('wp_page_numbers')) { wp_page_numbers(); } else { ?>
+  <div class="pagenav">
+    <div class="pagenav-right"><?php next_posts_link('Next Page &rsaquo;') ?></div>
+    <div class="pagenav-left"><?php previous_posts_link('&lsaquo; Previous Page') ?></div>
+    <div class="clear"></div>
+  </div>
+<?php } ?>
diff --git a/partials/search-transcript-results-count.inc b/partials/search-transcript-results-count.inc
new file mode 100644
index 0000000..8a469ba
--- /dev/null
+++ b/partials/search-transcript-results-count.inc
@@ -0,0 +1,7 @@
+<div class="post-page-head"></div>
+<div class="post-page">			
+  <?php $count = $wp_query->post_count; ?>
+  <h2 class="pagetitle">Transcript search for &lsquo;<?php the_search_query() ?>&rsquo;</h2>
+  Found <?php echo $count; ?> result<?php if ($count !== 1) { echo "s"; } ?>.
+</div>
+<div class="post-page-foot"></div>
diff --git a/search-transcript.php b/search-transcript.php
index 67b0dc5..84c1c33 100644
--- a/search-transcript.php
+++ b/search-transcript.php
@@ -1,74 +1,32 @@
-<?php get_header() ?>
+<?php
+  global $comicpress, $post, $query_string;
 
-<div id="content" class="archive">
+  comicpress_init();
 
-  <div class="post-page-head"></div>
-  <div class="post-page">			
-    <?php
-      $tmp_search = new WP_Query('s=' . wp_specialchars($_GET['s']) . '&show_posts=-1&posts_per_page=-1');
-      $count = $tmp_search->post_count;
-    ?>
-    <h2 class="pagetitle">Transcript search for &lsquo;<?php the_search_query() ?>&rsquo;</h2>
-    Found <?php echo $count; ?> result<?php if ($count !== 1) { echo "s"; } ?>.
-  </div>
-  <div class="post-page-foot"></div>
+  ob_start();
+  
+  include_partial('search-transcript-results-count');
+  
+  if (have_posts()) {
+    query_posts($query_string.'&order=asc');
+   
+    while (have_posts()) {
+      the_post();
 
-  <?php if (have_posts()) : ?>
+      if (in_comic_category()) {
+        include_partial('search-transcript-comic-post', 'search-comic-post', 'archive-comic-post');        
+      } else {
+        include_partial('search-transcript-blog-post', 'search-blog-post', 'archive-blog-post');                
+      }
+    }
+    
+    include_partial('search-transcript-page-nav', 'search-page-nav', 'archive-page-nav');
 
-    <?php $posts = query_posts($query_string.'&order=asc');
-    while (have_posts()) : the_post() ?>
+  } else {
+    include_partial('search-transcript-not-found');    
+  }
 
-        <?php if (in_comic_category()) { ?>
-
-          <div class="post-comic-head"></div>
-          <div class="post-comic">
-            <div class="comicarchiveframe" style="width:<?php echo $archive_comic_width ?>px;">
-              <a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="<?php the_transcript() ?>" width="<?php echo $archive_comic_width ?>" /><br />
-              <h3><?php the_title() ?></h3>
-              <small><?php the_time('F jS, Y') ?></small></a>
-            </div>
-            <br class="clear-margins" />
-          </div>
-          <div class="post-comic-foot"></div>
-
-        <?php } else { ?>
-
-          <div class="post-head"></div>
-          <div class="post">
-            <h3><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title() ?>"><?php the_title() ?></a></h3>
-            <div class="postdate"><?php the_time('F jS, Y') ?></div>
-            <?php the_excerpt() ?>
-            <br class="clear-margins" />
-          </div>
-          <div class="post-foot"></div>
-          
-        <?php } ?>
-
-    <?php endwhile; ?>
-
-    <?php if(function_exists('wp_page_numbers')) { wp_page_numbers(); } else { ?>
-      <div class="pagenav">
-        <div class="pagenav-right"><?php next_posts_link('Next Page &rsaquo;') ?></div>
-        <div class="pagenav-left"><?php previous_posts_link('&lsaquo; Previous Page') ?></div>
-        <div class="clear"></div>
-      </div>
-    <?php } ?>
-
-  <?php else : ?>
-
-    <div class="post-page-head"></div>
-    <div class="post-page">
-      <h3>No transcripts found.</h3>
-      <p>Try another search?</p>
-      <p><?php include (get_template_directory() . '/searchform-transcript.php') ?></p>
-      <br class="clear-margins" />
-    </div>
-    <div class="post-page-foot"></div>
-
-  <?php endif; ?>
-
-</div>
-
-<?php get_sidebar() ?>
-
-<?php get_footer() ?>
\ No newline at end of file
+  $content = ob_get_clean();
+  
+  include(get_template_directory() . '/layouts/' . $comicpress->comicpress_options['layout']);
+?>
diff --git a/search.php b/search.php
index f4511a7..d876abb 100644
--- a/search.php
+++ b/search.php
@@ -1,29 +1,29 @@
-<?php get_header() ?>
+<?php
+  global $comicpress, $query_string;
 
-<div id="content" class="archive">
-  <?php 
-    include_partial('search-results-count');
+  comicpress_init();
 
-    if (have_posts()) {
-      query_posts($query_string . '&order=asc');
-      
-      while (have_posts()) {
-        the_post();
+  include_partial('search-results-count');
+
+  if (have_posts()) {
+    query_posts($query_string . '&order=asc');
     
-        if (in_comic_category()) {
-          include_partial('search-comic-post', 'archive-comic-post');
-        } else {
-          include_partial('search-blog-post', 'archive-blog-post');
-        }
+    while (have_posts()) {
+      the_post();
+  
+      if (in_comic_category()) {
+        include_partial('search-comic-post', 'archive-comic-post');
+      } else {
+        include_partial('search-blog-post', 'archive-blog-post');
       }
-      
-      include_partial('search-page-nav', 'archive-page-nav');
-    } else {
-      include_partial('search-not-found');
     }
-  ?>
-</div>
+    
+    include_partial('search-page-nav', 'archive-page-nav');
+  } else {
+    include_partial('search-not-found');
+  }
 
-<?php get_sidebar() ?>
-
-<?php get_footer() ?>
\ No newline at end of file
+  $content = ob_get_clean();
+  
+  include(get_template_directory() . '/layouts/' . $comicpress->comicpress_options['layout']);
+?>
\ No newline at end of file