diff --git a/404.php b/404.php
index b13e7f4..cfbaff0 100644
--- a/404.php
+++ b/404.php
@@ -11,6 +11,6 @@
 	<div class="post-page-foot"></div>
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php include(get_template_directory() . '/sidebar.php') ?>
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php
index 8b9e5fa..232fb18 100644
--- a/archive-comic-calendar.php
+++ b/archive-comic-calendar.php
@@ -93,6 +93,6 @@ for ($i = 0; $i < 7; ++$i) {
 
 </div>
 
-<?php include(dirname(__FILE__) . '/sidebar.php') ?>
+<?php include(get_template_directory() . '/sidebar.php') ?>
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/archive-comic-storyline-thumbs.php b/archive-comic-storyline-thumbs.php
index c5c0757..5df1c1a 100644
--- a/archive-comic-storyline-thumbs.php
+++ b/archive-comic-storyline-thumbs.php
@@ -128,6 +128,6 @@ Template Name: Comic Storyline with Thumbs
 	
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php include(get_template_directory() . '/sidebar.php') ?>
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/archive-comic-storyline.php b/archive-comic-storyline.php
index 3cef1c3..f10780f 100644
--- a/archive-comic-storyline.php
+++ b/archive-comic-storyline.php
@@ -128,6 +128,6 @@ Template Name: Comic Storyline Archive
 	
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php include(get_template_directory() . '/sidebar.php') ?>
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/archive-comic-year.php b/archive-comic-year.php
index 85c68e6..ac0f4cb 100644
--- a/archive-comic-year.php
+++ b/archive-comic-year.php
@@ -66,6 +66,6 @@ Template Name: Comic Year Archive
 	
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php include(get_template_directory() . '/sidebar.php') ?>
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/archive.php b/archive.php
index 1b88899..07f26f7 100644
--- a/archive.php
+++ b/archive.php
@@ -2,7 +2,7 @@
 
 <div id="content" class="archive">
 	<?php if (have_posts()) {
-    include(dirname(__FILE__) . '/partials/archive-header.inc');
+    include(get_template_directory() . '/partials/archive-header.inc');
     
     // why can't wordpress allow for post date asc sorting out of the box...
     
@@ -11,13 +11,13 @@
       the_post();
       
       if (in_comic_category()) {
-        include(dirname(__FILE__) . '/partials/archive-comic-post.inc');
+        include(get_template_directory() . '/partials/archive-comic-post.inc');
       } else {
-        include(dirname(__FILE__) . '/partials/archive-blog-post.inc');
+        include(get_template_directory() . '/partials/archive-blog-post.inc');
       }
     }
 
-    include(dirname(__FILE__) . '/partials/archive-page-nav.inc');
+    include(get_template_directory() . '/partials/archive-page-nav.inc');
 
 	<?php } else { ?>
 
@@ -25,7 +25,7 @@
 		<div class="post">
 			<h3>No entries found.</h3>
 			<p>Try another search?</p>
-			<p><?php include (TEMPLATEPATH . '/searchform.php') ?></p>
+			<p><?php include (get_template_directory() . '/searchform.php') ?></p>
 			<br class="clear-margins" />
 		</div>
 		<div class="post-foot"></div>
@@ -34,6 +34,6 @@
 
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php include(get_template_directory() . '/sidebar.php') ?>
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/archives.php b/archives.php
index ebc09b1..541ae8e 100644
--- a/archives.php
+++ b/archives.php
@@ -18,6 +18,6 @@ Template Name: Archives
 	<div class="post-page-foot"></div>
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php include(get_template_directory() . '/sidebar.php') ?>
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/image.php b/image.php
index a809e85..2e98093 100644
--- a/image.php
+++ b/image.php
@@ -64,6 +64,6 @@
 
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php include(get_template_directory() . '/sidebar.php') ?>
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 7a54108..c1f1860 100644
--- a/index.php
+++ b/index.php
@@ -14,7 +14,7 @@
 <?php } ?>
 	
 <div id="content" class="narrowcolumn">
-  <?php if (!is_paged()) { include(dirname(__FILE__) . '/partials/index-comic-post.inc'); } ?>
+  <?php if (!is_paged()) { include(get_template_directory() . '/partials/index-comic-post.inc'); } ?>
 
   <div id="blogheader"><!-- This area can be used for a heading above your main page blog posts --></div>
 
@@ -31,13 +31,13 @@
 
     while ($wp_query->have_posts()) {
       $wp_query->the_post();
-      include(dirname(__FILE__) . '/partials/index-blog-post.inc');
+      include(get_template_directory() . '/partials/index-blog-post.inc');
     }
 
-    include(dirname(__FILE__) . '/partials/index-blog-post.inc');
+    include(get_template_directory() . '/partials/index-blog-post.inc');
   ?>
 </div>
 
-<?php include(dirname(__FILE__) . '/sidebar.php') ?>
+<?php include(get_template_directory() . '/sidebar.php') ?>
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/links.php b/links.php
index 55f9c9e..8413c3c 100644
--- a/links.php
+++ b/links.php
@@ -20,6 +20,6 @@ Template Name: Links
   </div>
 </div>
 	
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php include(get_template_directory() . '/sidebar.php') ?>
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/page.php b/page.php
index 5f39f4b..000c5b7 100644
--- a/page.php
+++ b/page.php
@@ -17,6 +17,6 @@
   <?php comments_template(); ?>
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php include(get_template_directory() . '/sidebar.php') ?>
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/search-transcript.php b/search-transcript.php
index 540a925..cc4ffd7 100644
--- a/search-transcript.php
+++ b/search-transcript.php
@@ -60,7 +60,7 @@
     <div class="post-page">
       <h3>No transcripts found.</h3>
       <p>Try another search?</p>
-      <p><?php include (TEMPLATEPATH . '/searchform-transcript.php') ?></p>
+      <p><?php include (get_template_directory() . '/searchform-transcript.php') ?></p>
       <br class="clear-margins" />
     </div>
     <div class="post-page-foot"></div>
@@ -69,6 +69,6 @@
 
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php include(get_template_directory() . '/sidebar.php') ?>
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/search.php b/search.php
index 627663b..2a0e46a 100644
--- a/search.php
+++ b/search.php
@@ -60,7 +60,7 @@
     <div class="post-page">
       <h3>No entries found.</h3>
       <p>Try another search?</p>
-      <p><?php include (TEMPLATEPATH . '/searchform.php') ?></p>
+      <p><?php include (get_template_directory() . '/searchform.php') ?></p>
       <br class="clear-margins" />
     </div>
     <div class="post-page-foot"></div>
@@ -69,6 +69,6 @@
 
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php include(get_template_directory() . '/sidebar.php') ?>
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/sidebar.php b/sidebar.php
index 2781df8..3d76947 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -31,7 +31,7 @@
 			<?php wp_list_bookmarks(); ?>
 
 			<li>
-				<?php include (TEMPLATEPATH . '/searchform.php'); ?>
+				<?php include (get_template_directory() . '/searchform.php'); ?>
 			</li>
 
 		<?php endif; ?>
diff --git a/single.php b/single.php
index d92a549..d4b9f34 100644
--- a/single.php
+++ b/single.php
@@ -21,19 +21,19 @@
     if (have_posts()) {
       while (have_posts()) { the_post();
         if (in_comic_category()) {
-          include(dirname(__FILE__) . '/partials/single-comic-post.inc');
+          include(get_template_directory() . '/partials/single-comic-post.inc');
         } else {
-          include(dirname(__FILE_) . '/partials/single-blog-post.inc');
+          include(get_template_directory() . '/partials/single-blog-post.inc');
         }
         
         comments_template();
       }
     } else {
-      include(dirname(__FILE_) . '/partials/single-no-matches.inc');
+      include(get_template_directory() . '/partials/single-no-matches.inc');
     }
   ?>
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php include(get_template_directory() . '/sidebar.php') ?>
 
 <?php get_footer() ?>
\ No newline at end of file