diff --git a/wp-content/themes/kubrick/archive.php b/wp-content/themes/kubrick/archive.php
index cc3fc43244..d27111b085 100644
--- a/wp-content/themes/kubrick/archive.php
+++ b/wp-content/themes/kubrick/archive.php
@@ -60,7 +60,7 @@
 	<?php else : ?>
 
 		<h2 class="center">Not Found</h2>
-		<?php include (TEMPLATEPATH . "/searchform.php"; ?>
+		<?php include (TEMPLATEPATH . '/searchform.php'); ?>
 
 	<?php endif; ?>
 		
diff --git a/wp-content/themes/kubrick/footer.php b/wp-content/themes/kubrick/footer.php
index 3bea32f822..2bf8b772ff 100644
--- a/wp-content/themes/kubrick/footer.php
+++ b/wp-content/themes/kubrick/footer.php
@@ -3,22 +3,17 @@
 <div id="footer">
 	<p>
 		<?php bloginfo('name'); ?> is proudly powered by 
-		<a href="http://wordpress.org">WordPress <?php echo $wp_version; ?></a>
-		<!--
-		and valid <a href="http://validator.w3.org/check/referer" title="This page validates as XHTML 1.0 Transitional (most of the time)">XHTML</a> and
-		<a href="http://jigsaw.w3.org/css-validator/check/referer" title="Valid CSS; hopefully...">CSS</a>.
-		-->
+		<a href="http://wordpress.org">WordPress</a>
 		<br /><a href="<?php bloginfo('rss2_url'); ?>">Entries (RSS)</a>
 		and <a href="<?php bloginfo('comments_rss2_url'); ?>">Comments (RSS)</a>.
-		<!-- Spawned in <?php timer_stop(1); ?> seconds. -->
-		<a href="http://binarybonsai.com/kubrick/">Design by Michael Heilemann.</a>
+		<!-- <?php echo $wpdb->num_queries; ?> queries. <?php timer_stop(1); ?> seconds. -->
 	</p>
 </div>
 </div>
 
-
+<!-- Gorgeous design by Michael Heilemann - http://binarybonsai.com/kubrick/ -->
 <?php /* "Just what do you think you're doing Dave?" */ ?>
 
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/wp-content/themes/kubrick/index.php b/wp-content/themes/kubrick/index.php
index 3086096b8c..3db26312b8 100644
--- a/wp-content/themes/kubrick/index.php
+++ b/wp-content/themes/kubrick/index.php
@@ -32,7 +32,7 @@
 
 		<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 (TEMPLATEPATH . "/searchform.php"; ?>
+		<?php include (TEMPLATEPATH . "/searchform.php"); ?>
 
 	<?php endif; ?>
 
diff --git a/wp-content/themes/kubrick/search.php b/wp-content/themes/kubrick/search.php
index 5359cad867..a155e56020 100644
--- a/wp-content/themes/kubrick/search.php
+++ b/wp-content/themes/kubrick/search.php
@@ -39,7 +39,7 @@
 	<?php else : ?>
 
 		<h2 class="center">Not Found</h2>
-		<?php include (TEMPLATEPATH . "/searchform.php"; ?>
+		<?php include (TEMPLATEPATH . '/searchform.php'); ?>
 
 	<?php endif; ?>
 		
diff --git a/wp-content/themes/kubrick/searchform.php b/wp-content/themes/kubrick/searchform.php
index 78ad197367..2e7abbf9e7 100644
--- a/wp-content/themes/kubrick/searchform.php
+++ b/wp-content/themes/kubrick/searchform.php
@@ -1,5 +1,5 @@
 <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" />
+<div><input type="text" value="<?php echo wp_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 584acd8d9f..cdfd411f09 100644
--- a/wp-content/themes/kubrick/sidebar.php
+++ b/wp-content/themes/kubrick/sidebar.php
@@ -2,7 +2,7 @@
 		<ul>
 			
 			<li>
-				<?php include (TEMPLATEPATH . "/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.
@@ -66,13 +66,15 @@
 					</ul>
 				</li>
 				
-				<li><h2><?php _e('Admin'); ?></h2>
-					<ul>
-						<li><a href="<?php echo get_settings('siteurl'); ?>/wp-login.php"><?php _e('Login'); ?></a></li>
-						<!--
-						<li><a href="<?php echo get_settings('siteurl'); ?>/wp-register.php"><?php _e('Register'); ?></a></li>
-						-->
-					</ul>
+				<li><h2><?php _e('Meta'); ?></h2>
+				<ul>
+					<li><?php wp_register(); ?></li>
+					<li><?php wp_loginout(); ?></li>
+					<li><a href="http://validator.w3.org/check/referer" title="<?php _e('This page validates as XHTML 1.0 Transitional'); ?>"><?php _e('Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr>'); ?></a></li>
+					<li><a href="http://gmpg.org/xfn/"><abbr title="XHTML Friends Network">XFN</abbr></a></li>
+					<li><a href="http://wordpress.org/" title="<?php _e('Powered by WordPress, state-of-the-art semantic personal publishing platform.'); ?>"><abbr title="WordPress">WordPress</abbr></a></li>
+					<?php wp_meta(); ?>
+				</ul>
 				</li>
 			<?php } ?>