diff --git a/wp-content/themes/default/comments.php b/wp-content/themes/default/comments.php
index 06f31ae6e..e48ea9b9d 100644
--- a/wp-content/themes/default/comments.php
+++ b/wp-content/themes/default/comments.php
@@ -14,13 +14,13 @@
         }
 
 		/* This variable is for alternating comment background */
-		$oddcomment = 'graybox';
+		$oddcomment = 'alt';
 ?>
 
 <!-- You can start editing here. -->
 
 <?php if ($comments) : ?>
-	<h3 id="comments"><?php comments_number('No Responses','One Response','% Responses' );?> to '<?php the_title(); ?>'</h3> 
+	<h3 id="comments"><?php comments_number('No Responses', 'One Response', '% Responses' );?> to &#8220;<?php the_title(); ?>&#8221;</h3> 
 
 	<ol class="commentlist">
 
@@ -36,8 +36,8 @@
 		</li>
 		
 		<?php /* Changes every other comment to a different class */	
-			if('graybox' == $oddcomment) {$oddcomment="";}
-			else { $oddcomment = "graybox"; }
+			if ('alt' == $oddcomment) $oddcomment = '';
+			else $oddcomment = 'alt';
 		?>
 
 	<?php endforeach; /* end for each comment */ ?>
@@ -62,12 +62,12 @@
 <h3 id="respond">Leave a Reply</h3>
 <form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
 
-<p><input type="text" name="author" id="author" class="styled" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
+<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
 <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
-<label for="author"><small>Name</small></label></p>
+<label for="author"><small>Name <?php if ($req) _e('(required)'); ?></small></label></p>
 
 <p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
-<label for="email"><small>Mail (will not be published)</small></label></p>
+<label for="email"><small>Mail (will not be published) <?php if ($req) _e('(required)'); ?></small></label></p>
 
 <p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
 <label for="url"><small>Website</small></label></p>
diff --git a/wp-content/themes/default/page.php b/wp-content/themes/default/page.php
index b082a5c5a..0ee0a0dc2 100644
--- a/wp-content/themes/default/page.php
+++ b/wp-content/themes/default/page.php
@@ -13,6 +13,7 @@
 			</div>
 		</div>
 	  <?php endwhile; endif; ?>
+	<?php edit_post_link('Edit this entry.', '<p>', '</p>'); ?>
 	</div>
 
 <?php get_sidebar(); ?>
diff --git a/wp-content/themes/default/searchform.php b/wp-content/themes/default/searchform.php
index 2e7abbf9e..4b6d2c4a3 100644
--- a/wp-content/themes/default/searchform.php
+++ b/wp-content/themes/default/searchform.php
@@ -1,5 +1,5 @@
 <form method="get" id="searchform" action="<?php echo $_SERVER['PHP_SELF']; ?>">
 <div><input type="text" value="<?php echo wp_specialchars($s, 1); ?>" name="s" id="s" />
-<input type="submit" id="searchsubmit" name="Submit" value="Go!" />
+<input type="submit" id="searchsubmit" name="Submit" value="Search" />
 </div>
 </form>
\ No newline at end of file
diff --git a/wp-content/themes/default/sidebar.php b/wp-content/themes/default/sidebar.php
index 14e886308..316bdd4e9 100644
--- a/wp-content/themes/default/sidebar.php
+++ b/wp-content/themes/default/sidebar.php
@@ -36,15 +36,6 @@
 
 			<?php } ?>
 			</li>
-			
-		
-		
-			
-			<!-- The Calendar is disabled per default. Uncomment if you want to use it.
-			<li><h2><?php _e('Calendar'); ?></h2>
-				<?php get_calendar(); ?>
-			</li>
-			-->
 
 			<?php wp_list_pages('title_li=<h2>' . __('Pages') . '</h2>' ); ?>
 
@@ -60,12 +51,8 @@
 				</ul>
 			</li>
 
-			<?php /* If this is the frontpage */ if (is_home()) { ?>				
-				<li><h2><?php _e('Links'); ?></h2>
-					<ul>
-						<?php get_links('-1', '<li>', '</li>', '<br />'); ?>
-					</ul>
-				</li>
+			<?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?>				
+				<?php get_links_list(); ?>
 				
 				<li><h2><?php _e('Meta'); ?></h2>
 				<ul>
diff --git a/wp-content/themes/default/single.php b/wp-content/themes/default/single.php
index e1f78d692..ec0e23781 100644
--- a/wp-content/themes/default/single.php
+++ b/wp-content/themes/default/single.php
@@ -17,10 +17,10 @@
 	
 				<?php link_pages('<p><strong>Pages:</strong> ', '</p>', 'number'); ?>
 	
-				<p class="postmetadata graybox">
+				<p class="postmetadata alt">
 					<small>
 						This entry was posted
-						<?php /* This is uncommented, because it requires a little adjusting sometimes.
+						<?php /* This is commented, because it requires a little adjusting sometimes.
 							You'll need to download this plugin, and follow the instructions:
 							http://binarybonsai.com/archives/2004/08/17/time-since-plugin/ */
 							/* $entry_datetime = abs(strtotime($post->post_date) - (60*120)); echo time_since($entry_datetime); echo ' ago'; */ ?> 
diff --git a/wp-content/themes/default/style.css b/wp-content/themes/default/style.css
index 184b55384..7528ffe4e 100644
--- a/wp-content/themes/default/style.css
+++ b/wp-content/themes/default/style.css
@@ -64,7 +64,7 @@ body {
 	text-align: center;
 	}
 
-.graybox {
+.alt {
 	background-color: #f8f8f8;
 	border-top: 1px solid #ddd;
 	border-bottom: 1px solid #ddd;
@@ -437,7 +437,7 @@ ol li, #sidebar ul ol li {
 	}
 
 #sidebar #searchform #s {
-	width: 130px;
+	width: 115px;
 	padding: 2px;
 	}
 
@@ -473,7 +473,7 @@ select {
 
 
 /* Begin Comments*/
-.graybox {
+.alt {
 	margin: 0;
 	padding: 10px;
 	}