diff -urN sandbox-0.9.6/404.php sandbox-0.9.7/404.php
--- sandbox-0.9.6/404.php	2007-08-08 20:39:44.000000000 +0200
+++ sandbox-0.9.7/404.php	2007-08-10 18:02:48.000000000 +0200
@@ -8,10 +8,10 @@
 				<div class="entry-content">
 					<p><?php _e('Apologies, but we were unable to find what you were looking for. Perhaps  searching will help.', 'sandbox') ?></p>
 				</div>
-				<form id="searchform" method="get" action="<?php bloginfo('home') ?>">
+				<form id="error404_searchform" method="get" action="<?php bloginfo('home') ?>">
 					<div>
-						<input id="s" name="s" type="text" value="<?php echo wp_specialchars(stripslashes($_GET['s']), true) ?>" size="40" />
-						<input id="searchsubmit" name="searchsubmit" type="submit" value="<?php _e('Find', 'sandbox') ?>" />
+						<input id="error404-s" name="s" type="text" value="<?php echo wp_specialchars(stripslashes($_GET['s']), true) ?>" size="40" />
+						<input id="error404-searchsubmit" name="searchsubmit" type="submit" value="<?php _e('Find', 'sandbox') ?>" />
 					</div>
 				</form>
 			</div><!-- .post -->
diff -urN sandbox-0.9.6/readme.html sandbox-0.9.7/readme.html
--- sandbox-0.9.6/readme.html	2007-08-08 22:17:00.000000000 +0200
+++ sandbox-0.9.7/readme.html	2007-08-10 18:25:58.000000000 +0200
@@ -45,7 +45,7 @@
 
 		<div id="header">
 			<h1 id="title">The Sandbox</h1>
-			<div class="readme-version">Version 0.9.6</div>
+			<div class="readme-version">Version 0.9.7</div>
 			<div class="readme-subtitle">A theme rich with powerful and dynamic semantic class selectors</div>
 		</div><!-- #header -->
 
@@ -584,7 +584,7 @@
 		</ol><!-- #readme .xoxo -->
 
 		<div id="footer">
-			<p>Last updated 08 August 2007</p>
+			<p>Last updated 10 August 2007</p>
 		</div><!-- #footer -->
 		
 
diff -urN sandbox-0.9.6/search.php sandbox-0.9.7/search.php
--- sandbox-0.9.6/search.php	2007-08-08 20:39:44.000000000 +0200
+++ sandbox-0.9.7/search.php	2007-08-10 18:03:00.000000000 +0200
@@ -45,10 +45,10 @@
 				<div class="entry-content">
 					<p><?php _e('Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'sandbox') ?></p>
 				</div>
-				<form id="searchform" method="get" action="<?php bloginfo('home') ?>">
+				<form id="noresults-searchform" method="get" action="<?php bloginfo('home') ?>">
 					<div>
-						<input id="s" name="s" type="text" value="<?php echo wp_specialchars(stripslashes($_GET['s']), true) ?>" size="40" />
-						<input id="searchsubmit" name="searchsubmit" type="submit" value="<?php _e('Find', 'sandbox') ?>" />
+						<input id="noresults-s" name="s" type="text" value="<?php echo wp_specialchars(stripslashes($_GET['s']), true) ?>" size="40" />
+						<input id="noresults-searchsubmit" name="searchsubmit" type="submit" value="<?php _e('Find', 'sandbox') ?>" />
 					</div>
 				</form>
 			</div><!-- .post -->
diff -urN sandbox-0.9.6/single.php sandbox-0.9.7/single.php
--- sandbox-0.9.6/single.php	2007-08-08 20:39:44.000000000 +0200
+++ sandbox-0.9.7/single.php	2007-08-10 18:21:02.000000000 +0200
@@ -5,8 +5,8 @@
 
 <?php the_post(); ?>
 			<div id="nav-above" class="navigation">
-				<div class="nav-previous"><?php previous_post_link('<span class="meta-nav">&laquo;</span> %link') ?></div>
-				<div class="nav-next"><?php next_post_link('%link <span class="meta-nav">&raquo;</span>') ?></div>
+				<div class="nav-previous"><?php previous_post_link('%link', '<span class="meta-nav">&laquo;</span> %title') ?></div>
+				<div class="nav-next"><?php next_post_link('%link', '%title <span class="meta-nav">&raquo;</span>') ?></div>
 			</div>
 
 			<div id="post-<?php the_ID(); ?>" class="<?php sandbox_post_class(); ?>">
@@ -43,8 +43,8 @@
 			</div><!-- .post -->
 
 			<div id="nav-below" class="navigation">
-				<div class="nav-previous"><?php previous_post_link('<span class="meta-nav">&laquo;</span> %link') ?></div>
-				<div class="nav-next"><?php next_post_link('%link <span class="meta-nav">&raquo;</span>') ?></div>
+				<div class="nav-previous"><?php previous_post_link('%link', '<span class="meta-nav">&laquo;</span> %title') ?></div>
+				<div class="nav-next"><?php next_post_link('%link', '%title <span class="meta-nav">&raquo;</span>') ?></div>
 			</div>
 
 <?php comments_template(); ?>
diff -urN sandbox-0.9.6/style.css sandbox-0.9.7/style.css
--- sandbox-0.9.6/style.css	2007-08-08 22:30:38.000000000 +0200
+++ sandbox-0.9.7/style.css	2007-08-10 18:26:12.000000000 +0200
@@ -2,7 +2,7 @@
 THEME NAME: Sandbox
 THEME URI: http://www.plaintxt.org/themes/sandbox/
 DESCRIPTION: A theme rich with powerful and dynamic semantic class selectors; a canvas for CSS artists
-VERSION: 0.9.6
+VERSION: 0.9.7
 AUTHOR: <a href="http://andy.wordpress.com/">Andy Skelton</a> &amp; <a href="http://www.plaintxt.org/">Scott Allan Wallick</a>
 AUTHOR URI:
 */