diff --git a/wp-content/themes/kubrick/404.php b/wp-content/themes/kubrick/404.php
index 615d8d9b5..01a8e8a61 100644
--- a/wp-content/themes/kubrick/404.php
+++ b/wp-content/themes/kubrick/404.php
@@ -1,4 +1,4 @@
-<?php include "header.php"; ?>
+<?php get_header(); ?>
 
 	<div id="content" class="narrowcolumn">
 
@@ -6,5 +6,6 @@
 
 	</div>
 
-<?php include "sidebar.php"; ?>
-<?php include "footer.php"; ?>
+<?php get_sidebar(); ?>
+
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/wp-content/themes/kubrick/archive.php b/wp-content/themes/kubrick/archive.php
index 71b0e35cf..cc3fc4324 100644
--- a/wp-content/themes/kubrick/archive.php
+++ b/wp-content/themes/kubrick/archive.php
@@ -1,4 +1,4 @@
-<?php include "header.php"; ?>
+<?php get_header(); ?>
 
 	<div id="content" class="narrowcolumn">
 
@@ -60,11 +60,12 @@
 	<?php else : ?>
 
 		<h2 class="center">Not Found</h2>
-		<?php include "searchform.php"; ?>
+		<?php include (TEMPLATEPATH . "/searchform.php"; ?>
 
 	<?php endif; ?>
 		
 	</div>
 
-<?php include "sidebar.php"; ?>
-<?php include "footer.php"; ?>
+<?php get_sidebar(); ?>
+
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/wp-content/themes/kubrick/archives.php b/wp-content/themes/kubrick/archives.php
index 555a433a3..eb3142426 100644
--- a/wp-content/themes/kubrick/archives.php
+++ b/wp-content/themes/kubrick/archives.php
@@ -1,12 +1,8 @@
-<?php /*
-			 Template Name: Archives
-			*/
-?>
-<?php include "header.php"; ?>
+<?php get_header(); ?>
 
 <div id="content" class="widecolumn">
 
-<?php include "searchform.php"; ?>
+<?php include (TEMPLATEPATH . '/searchform.php'; ?>
 
 <h2>Archives by Month:</h2>
   <ul>
@@ -20,4 +16,4 @@
 
 </div>	
 
-<?php include "footer.php"; ?>
\ No newline at end of file
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/wp-content/themes/kubrick/comments.php b/wp-content/themes/kubrick/comments.php
index cee2ca3b7..ecb7ecce8 100644
--- a/wp-content/themes/kubrick/comments.php
+++ b/wp-content/themes/kubrick/comments.php
@@ -14,7 +14,7 @@
         }
 
 		/* This variable is for alternating comment background */
-		$oddcomment = "graybox";
+		$oddcomment = 'graybox';
 ?>
 
 <!-- You can start editing here. -->
@@ -26,7 +26,7 @@
 
 	<?php foreach ($comments as $comment) : ?>
 
-		<li class="<?=$oddcomment;?>">
+		<li class="<?php echo $oddcomment; ?>">
 			<a name="comment-<?php comment_ID() ?>"></a><cite><?php comment_author_link() ?></cite> Says:<br />
 			<!--<small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title="<?php comment_date('l, F jS, Y') ?> at <?php comment_time() ?>"><?php /* $entry_datetime = abs(strtotime($post->post_date)); $comment_datetime = abs(strtotime($comment->comment_date)); echo time_since($entry_datetime, $comment_datetime) */ ?></a> after publication. <?php edit_comment_link('e','',''); ?></small>-->
 			<small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date('F jS, Y') ?> at <?php comment_time() ?></a> <?php edit_comment_link('e','',''); ?></small>
@@ -36,8 +36,8 @@
 		</li>
 		
 		<?php /* Changes every other comment to a different class */	
-			if("graybox" == $oddcomment) {$oddcomment="";}
-			else { $oddcomment="graybox"; }
+			if('graybox' == $oddcomment) {$oddcomment="";}
+			else { $oddcomment = "graybox"; }
 		?>
 
 	<?php endforeach; /* end for each comment */ ?>
@@ -64,7 +64,6 @@
 
 <p><input type="text" name="author" id="author" class="styled" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
 <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
-<input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars($_SERVER["REQUEST_URI"]); ?>" />
 <label for="author"><small>Name</small></label></p>
 
 <p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
@@ -77,14 +76,9 @@
 
 <p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
 
-<?php if ('none' != get_settings("comment_moderation")) { ?>
-	<p><small><strong>Please note:</strong> Comment moderation is enabled and may delay your comment. There is no need to resubmit your comment.</small></p>
-<?php } ?>
-
 <p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" /></p>
 
 
 </form>
 
-<?php // if you delete this the sky will fall on your head
-endif; ?>
+<?php endif; // if you delete this the sky will fall on your head ?>
\ No newline at end of file
diff --git a/wp-content/themes/kubrick/footer.php b/wp-content/themes/kubrick/footer.php
index 497b27ab5..3bea32f82 100644
--- a/wp-content/themes/kubrick/footer.php
+++ b/wp-content/themes/kubrick/footer.php
@@ -1,4 +1,4 @@
-<? // Begin Footer ?>
+
 <hr />
 <div id="footer">
 	<p>
@@ -15,7 +15,6 @@
 	</p>
 </div>
 </div>
-<? // End Footer ?>
 
 
 <?php /* "Just what do you think you're doing Dave?" */ ?>
diff --git a/wp-content/themes/kubrick/header.php b/wp-content/themes/kubrick/header.php
index 8734c6a3b..71462a1f7 100644
--- a/wp-content/themes/kubrick/header.php
+++ b/wp-content/themes/kubrick/header.php
@@ -55,7 +55,7 @@
 <body>
 <div id="page">
 
-<? // Begin Header ?>
+
 <div id="header">
 	<div id="headerimg">
 		<h1><a href="<?php bloginfo('url'); ?>" title="<?php bloginfo('name'); ?>"><?php bloginfo('name'); ?></a></h1>
@@ -63,4 +63,3 @@
 	</div>
 </div>
 <hr />
-<? // End Header ?>
diff --git a/wp-content/themes/kubrick/index.php b/wp-content/themes/kubrick/index.php
index ce2c49eb6..3086096b8 100644
--- a/wp-content/themes/kubrick/index.php
+++ b/wp-content/themes/kubrick/index.php
@@ -1,4 +1,4 @@
-<?php include "header.php"; ?>
+<?php get_header(); ?>
 
 	<div id="content" class="narrowcolumn">
 
@@ -32,11 +32,12 @@
 
 		<h2 class="center">Not Found</h2>
 		<p class="center"><?php _e("Sorry, but you are looking for something that isn't here."); ?></p>
-		<?php include "searchform.php"; ?>
+		<?php include (TEMPLATEPATH . "/searchform.php"; ?>
 
 	<?php endif; ?>
 
 	</div>
 
-<?php include "sidebar.php"; ?>
-<?php include "footer.php"; ?>
+<?php get_sidebar(); ?>
+
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/wp-content/themes/kubrick/links.php b/wp-content/themes/kubrick/links.php
index 74b339dca..0740308d2 100644
--- a/wp-content/themes/kubrick/links.php
+++ b/wp-content/themes/kubrick/links.php
@@ -1,8 +1,4 @@
-<?php /*
-			 Template Name: Links
-			*/
-?>
-<?php include "header.php"; ?>
+<?php get_header(); ?>
 
 <div id="content" class="widecolumn">
 
@@ -13,4 +9,4 @@
 
 </div>	
 
-<?php include "footer.php"; ?>
\ No newline at end of file
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/wp-content/themes/kubrick/page.php b/wp-content/themes/kubrick/page.php
index 08787a106..fbff7df24 100644
--- a/wp-content/themes/kubrick/page.php
+++ b/wp-content/themes/kubrick/page.php
@@ -1,4 +1,4 @@
-<?php include "header.php"; ?>
+<?php get_header(); ?>
 
 	<div id="content" class="widecolumn">
 
@@ -14,4 +14,4 @@
 	  <?php endwhile; endif; ?>
 	</div>
 
-<?php include "footer.php"; ?>
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/wp-content/themes/kubrick/search.php b/wp-content/themes/kubrick/search.php
index 01cba1ba0..5359cad86 100644
--- a/wp-content/themes/kubrick/search.php
+++ b/wp-content/themes/kubrick/search.php
@@ -1,4 +1,4 @@
-<?php include "header.php"; ?>
+<?php get_header(); ?>
 
 	<div id="content" class="narrowcolumn">
 
@@ -39,11 +39,12 @@
 	<?php else : ?>
 
 		<h2 class="center">Not Found</h2>
-		<?php include "searchform.php"; ?>
+		<?php include (TEMPLATEPATH . "/searchform.php"; ?>
 
 	<?php endif; ?>
 		
 	</div>
 
-<?php include "sidebar.php"; ?>
-<?php include "footer.php"; ?>
+<?php get_sidebar(); ?>
+
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/wp-content/themes/kubrick/searchform.php b/wp-content/themes/kubrick/searchform.php
index 65a22aebf..78ad19736 100644
--- a/wp-content/themes/kubrick/searchform.php
+++ b/wp-content/themes/kubrick/searchform.php
@@ -1,4 +1,5 @@
-		<form method="get" id="searchform" action="<?php echo $PHP_SELF; ?>">
-			<input type="text" value="<?=$s; ?>" name="s" id="s" />
-			<input type="submit" id="searchsubmit" name="Submit" value="<?php _e('Go!'); ?>" />
-		</form>
\ No newline at end of file
+<form method="get" id="searchform" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<div><input type="text" value="<?php echo bb_specialchars($s, 1); ?>" name="s" id="s" />
+<input type="submit" id="searchsubmit" name="Submit" value="Go!" />
+</div>
+</form>
\ No newline at end of file
diff --git a/wp-content/themes/kubrick/sidebar.php b/wp-content/themes/kubrick/sidebar.php
index f42b40fc0..584acd8d9 100644
--- a/wp-content/themes/kubrick/sidebar.php
+++ b/wp-content/themes/kubrick/sidebar.php
@@ -2,7 +2,7 @@
 		<ul>
 			
 			<li>
-				<?php include "searchform.php"; ?>
+				<?php include (TEMPLATEPATH . "/searchform.php"; ?>
 			</li>
 
 			<!-- Author information is disabled per default. Uncomment and fill in your details if you want to use it.
diff --git a/wp-content/themes/kubrick/single.php b/wp-content/themes/kubrick/single.php
index 729dc2bcc..e1f78d692 100644
--- a/wp-content/themes/kubrick/single.php
+++ b/wp-content/themes/kubrick/single.php
@@ -1,4 +1,4 @@
-<?php include "header.php"; ?>
+<?php get_header(); ?>
 
 	<div id="content" class="widecolumn">
 				
@@ -63,4 +63,4 @@
 	
 	</div>
 
-<?php include "footer.php"; ?>
\ No newline at end of file
+<?php get_footer(); ?>
\ No newline at end of file