Index: wp-content/themes/classic/sidebar.php
===================================================================
--- wp-content/themes/classic/sidebar.php	(revision 13536)
+++ wp-content/themes/classic/sidebar.php	(working copy)
@@ -1,47 +1,43 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Classic_Theme
- */
-?>
-<!-- begin sidebar -->
-<div id="menu">
+		<div id="primary" class="widget-area">
+			<ul class="xoxo">
+<?php if ( !dynamic_sidebar('primary-widget-area') ) : // begin primary widget area ?>
+			<?php wp_list_pages('title_li=' . __('Pages:')); ?>
+			<?php wp_list_bookmarks('title_after=&title_before='); ?>
+			<?php wp_list_categories('title_li=' . __('Categories:')); ?>
+		 <li id="search">
+		   <label for="s"><?php _e('Search:'); ?></label>
+		   <form id="searchform" method="get" action="<?php bloginfo('url'); ?>">
+			<div>
+				<input type="text" name="s" id="s" size="15" /><br />
+				<input type="submit" value="<?php esc_attr_e('Search'); ?>" />
+			</div>
+			</form>
+		 </li>
+		 <li id="archives"><?php _e('Archives:'); ?>
+			<ul>
+			 <?php wp_get_archives(array('type' => 'monthly')); ?>
+			</ul>
+		 </li>
+		 <li id="meta"><?php _e('Meta:'); ?>
+			<ul>
+				<?php wp_register(); ?>
+				<li><?php wp_loginout(); ?></li>
+				<li><a href="<?php bloginfo('rss2_url'); ?>" title="<?php _e('Syndicate this site using RSS'); ?>"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
+				<li><a href="<?php bloginfo('comments_rss2_url'); ?>" title="<?php _e('The latest comments to all posts in RSS'); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></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">WP</abbr></a></li>
+				<?php wp_meta(); ?>
+			</ul>
+		 </li>
+<?php endif; // end primary widget area ?>
+			</ul>
+		</div><!-- #primary .widget-area -->
 
-<ul>
-<?php 	/* Widgetized sidebar, if you have the plugin installed. */
-		if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) : ?>
-	<?php wp_list_pages('title_li=' . __('Pages:')); ?>
-	<?php wp_list_bookmarks('title_after=&title_before='); ?>
-	<?php wp_list_categories('title_li=' . __('Categories:')); ?>
- <li id="search">
-   <label for="s"><?php _e('Search:'); ?></label>
-   <form id="searchform" method="get" action="<?php bloginfo('url'); ?>">
-	<div>
-		<input type="text" name="s" id="s" size="15" /><br />
-		<input type="submit" value="<?php esc_attr_e('Search'); ?>" />
-	</div>
-	</form>
- </li>
- <li id="archives"><?php _e('Archives:'); ?>
-	<ul>
-	 <?php wp_get_archives(array('type' => 'monthly')); ?>
-	</ul>
- </li>
- <li id="meta"><?php _e('Meta:'); ?>
-	<ul>
-		<?php wp_register(); ?>
-		<li><?php wp_loginout(); ?></li>
-		<li><a href="<?php bloginfo('rss2_url'); ?>" title="<?php _e('Syndicate this site using RSS'); ?>"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
-		<li><a href="<?php bloginfo('comments_rss2_url'); ?>" title="<?php _e('The latest comments to all posts in RSS'); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></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">WP</abbr></a></li>
-		<?php wp_meta(); ?>
-	</ul>
- </li>
-<?php endif; ?>
-
-</ul>
-
-</div>
-<!-- end sidebar -->
+<?php if ( is_active_sidebar('secondary-widget-area') ) : // Nothing here by default and design ?>
+		<div id="secondary" class="widget-area">
+			<ul class="xoxo">
+				<?php dynamic_sidebar( 'secondary-widget-area' ); ?>
+			</ul>
+		</div><!-- #secondary .widget-area -->
+<?php endif; ?>
\ No newline at end of file
Index: wp-content/themes/classic/footer.php
===================================================================
--- wp-content/themes/classic/footer.php	(revision 13536)
+++ wp-content/themes/classic/footer.php	(working copy)
@@ -1,18 +0,0 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Classic_Theme
- */
-?>
-<!-- begin footer -->
-</div>
-
-<?php get_sidebar(); ?>
-
-<p class="credit"><!--<?php echo get_num_queries(); ?> queries. <?php timer_stop(1); ?> seconds. --> <cite><?php echo sprintf(__("Powered by <a href='http://wordpress.org/' title='%s'><strong>WordPress</strong></a>"), __("Powered by WordPress, state-of-the-art semantic personal publishing platform.")); ?></cite></p>
-
-</div>
-
-<?php wp_footer(); ?>
-</body>
-</html>
\ No newline at end of file
Index: wp-content/themes/classic/style.css
===================================================================
--- wp-content/themes/classic/style.css	(revision 13536)
+++ wp-content/themes/classic/style.css	(working copy)
@@ -1,17 +1,20 @@
 /*
 Theme Name: WordPress Classic
 Theme URI: http://wordpress.org/
-Description: The original WordPress theme that graced versions 1.2.x and prior.
-Version: 1.5
-Author: Dave Shea
-Tags: mantle color, variable width, two columns, widgets
+Description: The original WordPress theme that graced versions 1.2.x and prior. Now updated as a twentyten child theme
+Version: 2.0
+Author: Dave Shea, Aaron Brazell
+Tags: mantle color, variable width, two columns, widgets, child theme
+Template: twentyten
 
 Default WordPress by Dave Shea || http://mezzoblue.com
 Modifications by Matthew Mullenweg || http://photomatt.net
+Child Theming by Aaron Brazell || http://technosailor.com
 This is just a basic layout, with only the bare minimum defined.
 Please tweak this and make it your own. :)
 */
 
+
 .screen-reader-text {
      position: absolute;
      left: -1000em;
@@ -100,7 +103,7 @@
 	font-weight: bold;
 }
 
-.credit {
+#footer {
 	background: #90a090;
 	border-top: 3px double #aba;
 	color: #fff;
@@ -110,7 +113,7 @@
 	text-align: center;
 }
 
-.credit a:link, .credit a:hover {
+#footer a:link, #footer a:hover {
 	color: #fff;
 }
 
@@ -198,7 +201,7 @@
 	text-decoration: underline;
 }
 
-#menu {
+#primary {
 	background: #fff;
 	border-left: 1px dotted #ccc;
 	border-top: 3px solid #e0e6e0;
@@ -209,18 +212,18 @@
 	width: 11em;
 }
 
-#menu form {
+#primary form {
 	margin: 0 0 0 13px;
 }
 
-#menu input#s {
+#primary input#s {
 	width: 80%;
 	background: #eee;
 	border: 1px solid #999;
 	color: #000;
 }
 
-#menu ul {
+#primary ul {
 	color: #ccc;
 	font-weight: bold;
 	list-style-type: none;
@@ -229,14 +232,14 @@
 	text-transform: lowercase;
 }
 
-#menu ul li {
+#primary ul li {
 	font: italic normal 110% 'Times New Roman', Times, serif;
 	letter-spacing: 0.1em;
 	margin-top: 10px;
 	padding-bottom: 2px; /*border-bottom: dotted 1px #ccc;*/
 }
 
-#menu ul ul {
+#primary ul ul {
 	font-variant: normal;
 	font-weight: normal;
 	line-height: 100%;
@@ -246,7 +249,7 @@
 	text-align: left;
 }
 
-#menu ul ul li {
+#primary ul ul li {
 	border: 0;
 	font: normal normal 12px/115% 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
 	letter-spacing: 0;
@@ -255,16 +258,16 @@
 	padding-left: 12px;
 }
 
-#menu ul ul li a {
+#primary ul ul li a {
 	color: #000;
 	text-decoration: none;
 }
 
-#menu ul ul li a:hover {
+#primary ul ul li a:hover {
 	border-bottom: 1px solid #809080;
 }
 
-#menu ul ul ul.children {
+#primary ul ul ul.children {
 	font-size: 142%;
 	padding-left: 4px;
 }
@@ -366,3 +369,358 @@
 	margin: 0;
 }
 /* End captions & aligment */
+
+.screen-reader-text {
+     position: absolute;
+     left: -1000em;
+}
+
+a {
+	color: #675;
+}
+
+a img {
+	border: none;
+}
+
+a:visited {
+	color: #342;
+}
+
+a:hover {
+	color: #9a8;
+}
+
+acronym, abbr {
+	border-bottom: 1px dashed #333;
+}
+
+acronym, abbr, span.caps {
+	font-size: 90%;
+	letter-spacing: .07em;
+}
+
+acronym, abbr {
+	cursor: help;
+}
+
+blockquote {
+	border-left: 5px solid #ccc;
+	margin-left: 1.5em;
+	padding-left: 5px;
+}
+
+body {
+	background: #fff;
+	border: 2px solid #565;
+	border-bottom: 1px solid #565;
+	border-top: 3px solid #565;
+	color: #000;
+	font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
+	margin: 0;
+	padding: 0;
+}
+
+cite {
+	font-size: 90%;
+	font-style: normal;
+}
+
+h2 {
+	border-bottom: 1px dotted #ccc;
+	font: 95% "Times New Roman", Times, serif;
+	letter-spacing: 0.2em;
+	margin: 15px 0 2px 0;
+	padding-bottom: 2px;
+}
+
+h3 {
+	border-bottom: 1px dotted #eee;
+	font-family: "Times New Roman", Times, serif;
+	margin-top: 0;
+}
+
+ol#comments li p {
+	font-size: 100%;
+}
+
+p, li, .feedback {
+	font: 90%/175% 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
+	letter-spacing: -1px;
+}
+
+/* classes used by the_meta() */
+ul.post-meta {
+	list-style: none;
+}
+
+ul.post-meta span.post-meta-key {
+	font-weight: bold;
+}
+
+#footer {
+	background: #90a090;
+	border-top: 3px double #aba;
+	color: #fff;
+	font-size: 11px;
+	margin: 10px 0 0 0;
+	padding: 3px;
+	text-align: center;
+}
+
+#footer a:link, #footer a:hover {
+	color: #fff;
+}
+
+.feedback {
+	color: #ccc;
+	text-align: right;
+	clear: both;
+}
+
+.meta {
+	font-size: .75em;
+}
+
+.meta li, ul.post-meta li {
+	display: inline;
+}
+
+.meta ul {
+	display: inline;
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+
+.meta, .meta a {
+	color: #808080;
+	font-weight: normal;
+	letter-spacing: 0;
+}
+
+.storytitle {
+	margin: 0;
+}
+
+.storytitle a {
+	text-decoration: none;
+}
+
+#commentform #author, #commentform #email, #commentform #url, #commentform textarea {
+	background: #fff;
+	border: 1px solid #333;
+	padding: .2em;
+}
+
+#commentform textarea {
+	width: 100%;
+}
+
+#commentlist li ul {
+	border-left: 1px solid #ddd;
+	font-size: 110%;
+	list-style-type: none;
+}
+
+#commentlist li .avatar {
+	float: right;
+	margin-right: 25px;
+	border: 1px dotted #ccc;
+	padding: 2px;
+}
+
+#content {
+	margin: 30px 13em 0 3em;
+	padding-right: 60px;
+}
+
+#header {
+	background: #90a090;
+	border-bottom: 3px double #aba;
+	border-left: 1px solid #9a9;
+	border-right: 1px solid #565;
+	border-top: 1px solid #9a9;
+	font: italic normal 230% 'Times New Roman', Times, serif;
+	letter-spacing: 0.2em;
+	margin: 0;
+	padding: 15px 10px 15px 60px;
+}
+
+#header a {
+	color: #fff;
+	text-decoration: none;
+}
+
+#header a:hover {
+	text-decoration: underline;
+}
+
+#primary {
+	background: #fff;
+	border-left: 1px dotted #ccc;
+	border-top: 3px solid #e0e6e0;
+	padding: 20px 0 10px 30px;
+	position: absolute;
+	right: 2px;
+	top: 0;
+	width: 11em;
+}
+
+#primary form {
+	margin: 0 0 0 13px;
+}
+
+#primary input#s {
+	width: 80%;
+	background: #eee;
+	border: 1px solid #999;
+	color: #000;
+}
+
+#primary ul {
+	color: #ccc;
+	font-weight: bold;
+	list-style-type: none;
+	margin: 0;
+	padding-left: 3px;
+	text-transform: lowercase;
+}
+
+#primary ul li {
+	font: italic normal 110% 'Times New Roman', Times, serif;
+	letter-spacing: 0.1em;
+	margin-top: 10px;
+	padding-bottom: 2px; /*border-bottom: dotted 1px #ccc;*/
+}
+
+#primary ul ul {
+	font-variant: normal;
+	font-weight: normal;
+	line-height: 100%;
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+	text-align: left;
+}
+
+#primary ul ul li {
+	border: 0;
+	font: normal normal 12px/115% 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
+	letter-spacing: 0;
+	margin-top: 0;
+	padding: 0;
+	padding-left: 12px;
+}
+
+#primary ul ul li a {
+	color: #000;
+	text-decoration: none;
+}
+
+#primary ul ul li a:hover {
+	border-bottom: 1px solid #809080;
+}
+
+#primary ul ul ul.children {
+	font-size: 142%;
+	padding-left: 4px;
+}
+
+#wp-calendar {
+	border: 1px solid #ddd;
+	empty-cells: show;
+	font-size: 14px;
+	margin: 0;
+	width: 90%;
+}
+
+#wp-calendar #next a {
+	padding-right: 10px;
+	text-align: right;
+}
+
+#wp-calendar #prev a {
+	padding-left: 10px;
+	text-align: left;
+}
+
+#wp-calendar a {
+	display: block;
+	text-decoration: none;
+}
+
+#wp-calendar a:hover {
+	background: #e0e6e0;
+	color: #333;
+}
+
+#wp-calendar caption {
+	color: #999;
+	font-size: 16px;
+	text-align: left;
+}
+
+#wp-calendar td {
+	color: #ccc;
+	font: normal 12px 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
+	letter-spacing: normal;
+	padding: 2px 0;
+	text-align: center;
+}
+
+#wp-calendar td.pad:hover {
+	background: #fff;
+}
+
+#wp-calendar td:hover, #wp-calendar #today {
+	background: #eee;
+	color: #bbb;
+}
+
+#wp-calendar th {
+	font-style: normal;
+	text-transform: capitalize;
+}
+
+/* Captions & aligment */
+.aligncenter,
+div.aligncenter {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+.alignleft {
+	float: left;
+}
+
+.alignright {
+	float: right;
+}
+
+.wp-caption {
+	border: 1px solid #ddd;
+	text-align: center;
+	background-color: #f3f3f3;
+	padding-top: 4px;
+	margin: 10px;
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+.wp-caption img {
+	margin: 0;
+	padding: 0;
+	border: 0 none;
+}
+
+.wp-caption p.wp-caption-text {
+	font-size: 11px;
+	line-height: 17px;
+	padding: 0 4px 5px;
+	margin: 0;
+}
+/* End captions & aligment */
\ No newline at end of file
Index: wp-content/themes/classic/rtl.css
===================================================================
--- wp-content/themes/classic/rtl.css	(revision 13536)
+++ wp-content/themes/classic/rtl.css	(working copy)
@@ -1,92 +0,0 @@
-/* Based on Arabic (RTL) version of WordPress Classic theme, converted by Serdal (Serdal.com) */
-
-#menu ul ul, #wp-calendar caption, #wp-calendar #prev a { text-align: right; }
-#wp-calendar #next a, .feedback { text-align: left; }
-
-blockquote {
-	border-left: 0;
-	border-right: 5px solid #ccc;
-	margin-left: auto;
-	margin-right: 1.5em;
-	padding-left: 0;
-	padding-right: 5px;
-}
-
-body { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif; }
-
-h2 { font: 95% 'Al Bayan', 'Traditional Arabic', "Times New Roman", Times, serif; }
-
-p, li, .feedback {
-	font: 90%/175% 'Geeza Pro', Tahoma, 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
-	text-align: justify;
-}
-
-acronym, abbr, span.caps, h2, p, li, #header, #menu ul li, #menu ul ul li, #wp-calendar td, .feedback, .meta, .meta a { letter-spacing: normal; }
-
-#commentlist li ul {
-	border-left: 0;
-	border-right: 1px solid #ddd;
-}
-
-#commentlist li .avatar {
-	margin-right: 0;
-	margin-left: 12px;
-}
-
-#commentlist li .avatar {
-	margin-right: 0;
-	margin-left: 12px;
-}
-
-#content {
-	margin: 30px 3em 0 13em;
-	padding-right: 0;
-	padding-left: 60px;
-}
-
-#header {
-	border-left: solid 1px #9a9;
-	border-right: solid 1px #565;
-	font: normal normal 230% 'Al Bayan', 'Traditional Arabic', 'Times New Roman', Times, serif;
-	padding: 15px 60px 15px 10px;
-}
-
-#menu {
-	border-left: 0;
-	border-right: 1px dotted #ccc;
-	padding: 20px 30px 10px 0;
-	right: auto;
-	left: 2px;
-}
-
-#menu form { margin: 0 13px 0 0; }
-
-#menu ul {
-	padding-left: 0;
-	padding-right: 3px;
-}
-
-#menu ul li { font: normal normal 110% 'Geeza Pro', Tahoma, 'Times New Roman', Times, serif; }
-
-#menu ul ul li {
-	font: normal normal 12px/115% 'Geeza Pro', Tahoma, 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
-	padding-left: 0;
-	padding-right: 12px;
-}
-
-#menu ul ul ul.children {
-	padding-left: 0;
-	padding-right: 4px;
-}
-
-#wp-calendar #next a {
-	padding-right: 0;
-	padding-left: 10px;
-}
-
-#wp-calendar #prev a {
-	padding-left: 0;
-	padding-right: 10px;
-}
-
-#wp-calendar td { font: normal normal 12px 'Geeza Pro', Tahoma, 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif; }
Index: wp-content/themes/classic/comments.php
===================================================================
--- wp-content/themes/classic/comments.php	(revision 13536)
+++ wp-content/themes/classic/comments.php	(working copy)
@@ -1,82 +0,0 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Classic_Theme
- */
-
-if ( post_password_required() ) : ?>
-<p><?php _e('Enter your password to view comments.'); ?></p>
-<?php return; endif; ?>
-
-<h2 id="comments"><?php comments_number(__('No Comments'), __('1 Comment'), __('% Comments')); ?>
-<?php if ( comments_open() ) : ?>
-	<a href="#postcomment" title="<?php _e("Leave a comment"); ?>">&raquo;</a>
-<?php endif; ?>
-</h2>
-
-<?php if ( have_comments() ) : ?>
-<ol id="commentlist">
-
-<?php foreach ($comments as $comment) : ?>
-	<li <?php comment_class(); ?> id="comment-<?php comment_ID() ?>">
-	<?php echo get_avatar( $comment, 32 ); ?>
-	<?php comment_text() ?>
-	<p><cite><?php comment_type(_x('Comment', 'noun'), __('Trackback'), __('Pingback')); ?> <?php _e('by'); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite> <?php edit_comment_link(__("Edit This"), ' |'); ?></p>
-	</li>
-
-<?php endforeach; ?>
-
-</ol>
-
-<?php else : // If there are no comments yet ?>
-	<p><?php _e('No comments yet.'); ?></p>
-<?php endif; ?>
-
-<p><?php post_comments_feed_link(__('<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.')); ?>
-<?php if ( pings_open() ) : ?>
-	<a href="<?php trackback_url() ?>" rel="trackback"><?php _e('TrackBack <abbr title="Universal Resource Locator">URL</abbr>'); ?></a>
-<?php endif; ?>
-</p>
-
-<?php if ( comments_open() ) : ?>
-<h2 id="postcomment"><?php _e('Leave a comment'); ?></h2>
-
-<?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
-<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.'), wp_login_url( get_permalink() ) );?></p>
-<?php else : ?>
-
-<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
-
-<?php if ( is_user_logged_in() ) : ?>
-
-<p><?php printf(__('Logged in as %s.'), '<a href="'.get_option('siteurl').'/wp-admin/profile.php">'.$user_identity.'</a>'); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account') ?>"><?php _e('Log out &raquo;'); ?></a></p>
-
-<?php else : ?>
-
-<p><input type="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" size="22" tabindex="1" />
-<label for="author"><small><?php _e('Name'); ?> <?php if ($req) _e('(required)'); ?></small></label></p>
-
-<p><input type="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="22" tabindex="2" />
-<label for="email"><small><?php _e('Mail (will not be published)');?> <?php if ($req) _e('(required)'); ?></small></label></p>
-
-<p><input type="text" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="22" tabindex="3" />
-<label for="url"><small><?php _e('Website'); ?></small></label></p>
-
-<?php endif; ?>
-
-<!--<p><small><strong>XHTML:</strong> <?php printf(__('You can use these tags: %s'), allowed_tags()); ?></small></p>-->
-
-<p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>
-
-<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php esc_attr_e('Submit Comment'); ?>" />
-<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
-</p>
-<?php do_action('comment_form', $post->ID); ?>
-
-</form>
-
-<?php endif; // If registration required and not logged in ?>
-
-<?php else : // Comments are closed ?>
-<p><?php _e('Sorry, the comment form is closed at this time.'); ?></p>
-<?php endif; ?>
Index: wp-content/themes/classic/comments-popup.php
===================================================================
--- wp-content/themes/classic/comments-popup.php	(revision 13536)
+++ wp-content/themes/classic/comments-popup.php	(working copy)
@@ -1,126 +0,0 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Classic_Theme
- */
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-     <title><?php echo get_option('blogname'); ?> - <?php echo sprintf(__("Comments on %s"), the_title('','',false)); ?></title>
-
-	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-	<style type="text/css" media="screen">
-		@import url( <?php bloginfo('stylesheet_url'); ?> );
-		body { margin: 3px; }
-	</style>
-
-</head>
-<body id="commentspopup">
-
-<h1 id="header"><a href="" title="<?php echo get_option('blogname'); ?>"><?php echo get_option('blogname'); ?></a></h1>
-
-<?php
-/* Don't remove these lines. */
-add_filter('comment_text', 'popuplinks');
-if ( have_posts() ) :
-while( have_posts()) : the_post();
-?>
-
-<h2 id="comments"><?php _e("Comments"); ?></h2>
-
-<p><a href="<?php echo get_post_comments_feed_link($post->ID); ?>"><?php _e("<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on this post."); ?></a></p>
-
-<?php if ( pings_open() ) { ?>
-<p><?php _e("The <abbr title=\"Universal Resource Locator\">URL</abbr> to TrackBack this entry is:"); ?> <em><?php trackback_url() ?></em></p>
-<?php } ?>
-
-<?php
-// this line is WordPress' motor, do not delete it.
-$commenter = wp_get_current_commenter();
-extract($commenter);
-$comments = get_approved_comments($id);
-$commentstatus = get_post($id);
-if ( post_password_required($commentstatus) ) {  // and it doesn't match the cookie
-	echo(get_the_password_form());
-} else { ?>
-
-<?php if ($comments) { ?>
-<ol id="commentlist">
-<?php foreach ($comments as $comment) { ?>
-	<li id="comment-<?php comment_ID() ?>">
-	<?php comment_text() ?>
-	<p><cite><?php comment_type(_x('Comment', 'noun'), __('Trackback'), __('Pingback')); ?> <?php _e("by"); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
-	</li>
-
-<?php } // end for each comment ?>
-</ol>
-<?php } else { // this is displayed if there are no comments so far ?>
-	<p><?php _e("No comments yet."); ?></p>
-<?php } ?>
-
-<?php if ( comments_open($commentstatus) ) { ?>
-<h2><?php _e("Leave a comment"); ?></h2>
-<p><?php _e("Line and paragraph breaks automatic, e-mail address never displayed, <acronym title=\"Hypertext Markup Language\">HTML</acronym> allowed:"); ?> <code><?php echo allowed_tags(); ?></code></p>
-
-<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
-<?php if ( is_user_logged_in() ) : ?>
-<p><?php printf(__('Logged in as %s.'), '<a href="'.get_option('siteurl').'/wp-admin/profile.php">'.$user_identity.'</a>'); ?> <a href="<?php echo wp_logout_url(); ?>" title="<?php echo esc_attr(__('Log out of this account')); ?>"><?php _e('Log out &raquo;'); ?></a></p>
-<?php else : ?>
-	<p>
-	  <input type="text" name="author" id="author" class="textarea" value="<?php echo esc_attr($comment_author); ?>" size="28" tabindex="1" />
-	   <label for="author"><?php _e("Name"); ?></label>
-	</p>
-
-	<p>
-	  <input type="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="28" tabindex="2" />
-	   <label for="email"><?php _e("E-mail"); ?></label>
-	</p>
-
-	<p>
-	  <input type="text" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="28" tabindex="3" />
-	   <label for="url"><?php _e("<abbr title=\"Universal Resource Locator\">URL</abbr>"); ?></label>
-	</p>
-<?php endif; ?>
-
-	<p>
-	  <label for="comment"><?php _e("Your Comment"); ?></label>
-	<br />
-	  <textarea name="comment" id="comment" cols="70" rows="4" tabindex="4"></textarea>
-	</p>
-
-	<p>
-	  <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
-	  <input type="hidden" name="redirect_to" value="<?php echo esc_attr($_SERVER["REQUEST_URI"]); ?>" />
-	  <input name="submit" type="submit" tabindex="5" value="<?php esc_attr_e("Say It!"); ?>" />
-	</p>
-	<?php do_action('comment_form', $post->ID); ?>
-</form>
-<?php } else { // comments are closed ?>
-<p><?php _e("Sorry, the comment form is closed at this time."); ?></p>
-<?php }
-} // end password check
-?>
-
-<div><strong><a href="javascript:window.close()"><?php _e("Close this window."); ?></a></strong></div>
-
-<?php // if you delete this the sky will fall on your head
-endwhile; //endwhile have_posts()
-else: //have_posts()
-?>
-<p>Sorry, no posts matched your criteria.</p>
-<?php endif; ?>
-
-<!-- // this is just the end of the motor - don't touch that line either :) -->
-<?php //} ?>
-<p class="credit"><?php timer_stop(1); ?> <?php echo sprintf(__("<cite>Powered by <a href=\"http://wordpress.org\" title=\"%s\"><strong>WordPress</strong></a></cite>"),__("Powered by WordPress, state-of-the-art semantic personal publishing platform.")); ?></p>
-<?php // Seen at http://www.mijnkopthee.nl/log2/archive/2003/05/28/esc(18) ?>
-<script type="text/javascript">
-<!--
-document.onkeypress = function esc(e) {
-	if(typeof(e) == "undefined") { e=event; }
-	if (e.keyCode == 27) { self.close(); }
-}
-// -->
-</script>
-</body>
-</html>
Index: wp-content/themes/classic/index.php
===================================================================
--- wp-content/themes/classic/index.php	(revision 13536)
+++ wp-content/themes/classic/index.php	(working copy)
@@ -1,36 +0,0 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Classic_Theme
- */
-get_header();
-?>
-
-<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
-
-<?php the_date('','<h2>','</h2>'); ?>
-
-<div <?php post_class() ?> id="post-<?php the_ID(); ?>">
-	 <h3 class="storytitle"><a href="<?php the_permalink() ?>" rel="bookmark"><?php the_title(); ?></a></h3>
-	<div class="meta"><?php _e("Filed under:"); ?> <?php the_category(',') ?> &#8212; <?php the_tags(__('Tags: '), ', ', ' &#8212; '); ?> <?php the_author() ?> @ <?php the_time() ?> <?php edit_post_link(__('Edit This')); ?></div>
-
-	<div class="storycontent">
-		<?php the_content(__('(more...)')); ?>
-	</div>
-
-	<div class="feedback">
-		<?php wp_link_pages(); ?>
-		<?php comments_popup_link(__('Comments (0)'), __('Comments (1)'), __('Comments (%)')); ?>
-	</div>
-
-</div>
-
-<?php comments_template(); // Get wp-comments.php template ?>
-
-<?php endwhile; else: ?>
-<p><?php _e('Sorry, no posts matched your criteria.'); ?></p>
-<?php endif; ?>
-
-<?php posts_nav_link(' &#8212; ', __('&laquo; Newer Posts'), __('Older Posts &raquo;')); ?>
-
-<?php get_footer(); ?>
Index: wp-content/themes/classic/header.php
===================================================================
--- wp-content/themes/classic/header.php	(revision 13536)
+++ wp-content/themes/classic/header.php	(working copy)
@@ -1,30 +1,47 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Classic_Theme
- */
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
+<!DOCTYPE html>
+<html <?php language_attributes(); ?>>
+<head>
+    <title><?php
+        if ( is_single() ) {
+			single_post_title(); echo ' | '; bloginfo('name');
+		} elseif ( is_home() || is_front_page() ) {
+			bloginfo('name'); echo ' | '; bloginfo('description'); twentyten_the_page_number();
+		} elseif ( is_page() ) {
+			single_post_title(''); echo ' | '; bloginfo('name');
+		} elseif ( is_search() ) {
+			printf(__('Search results for "%s"', 'twentyten'), esc_html($s)); twentyten_the_page_number(); echo ' | '; bloginfo('name'); 
+		} elseif ( is_404() ) {
+			_e('Not Found', 'twentyten'); echo ' | '; bloginfo('name');
+		} else {
+			wp_title(''); echo ' | '; bloginfo('name'); twentyten_the_page_number();
+		}
+    ?></title>
 
-<head profile="http://gmpg.org/xfn/11">
-	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
+	<meta http-equiv="content-type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
 
-	<title><?php wp_title('&laquo;', true, 'right'); ?> <?php bloginfo('name'); ?></title>
+	<link rel="profile" href="http://gmpg.org/xfn/11" />
+	<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo('stylesheet_url'); ?>" />
+	<link rel="stylesheet" type="text/css" media="print" href="<?php bloginfo('stylesheet_directory'); ?>/print.css" />
 
-	<style type="text/css" media="screen">
-		@import url( <?php bloginfo('stylesheet_url'); ?> );
-	</style>
+	<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
 
-	<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
-	<?php wp_get_archives(array('type' => 'monthly', 'format' => 'link')); ?>
-	<?php //comments_popup_script(); // off by default ?>
+	<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
+
 	<?php wp_head(); ?>
 </head>
 
 <body <?php body_class(); ?>>
-<div id="rap">
-<h1 id="header"><a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a></h1>
+<div id="wrapper" class="hfeed">
 
-<div id="content">
-<!-- end header -->
+	<div id="header">
+		<div id="masthead">
+
+			<div id="branding">
+				<div id="site-title"><span><a href="<?php echo home_url('/'); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></div>
+
+			</div><!-- #branding -->
+
+		</div><!-- #masthead -->
+	</div><!-- #header -->
+
+	<div id="main">