diff --git a/404.php b/404.php
index 04a1332d..3a025190 100644
--- a/404.php
+++ b/404.php
@@ -8,7 +8,7 @@
 
 get_header(); ?>
 
-	<div id="primary">
+	<div id="primary" class="site-content">
 		<div id="content" role="main">
 
 			<article id="post-0" class="post error404 not-found">
@@ -42,6 +42,6 @@ get_header(); ?>
 			</article><!-- #post-0 -->
 
 		</div><!-- #content -->
-	</div><!-- #primary -->
+	</div><!-- #primary .site-content -->
 
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/archive.php b/archive.php
index 13ab4c5e..56cc1ff6 100644
--- a/archive.php
+++ b/archive.php
@@ -10,7 +10,7 @@
 
 get_header(); ?>
 
-		<section id="primary">
+		<section id="primary" class="site-content">
 			<div id="content" role="main">
 
 			<?php if ( have_posts() ) : ?>
@@ -93,7 +93,7 @@ get_header(); ?>
 			<?php endif; ?>
 
 			</div><!-- #content -->
-		</section><!-- #primary -->
+		</section><!-- #primary .site-content -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/author.php b/author.php
index 261b9a71..d9a7cec7 100644
--- a/author.php
+++ b/author.php
@@ -8,7 +8,7 @@
 
 get_header(); ?>
 
-		<section id="primary">
+		<section id="primary" class="site-content">
 			<div id="content" role="main">
 
 			<?php if ( have_posts() ) : ?>
@@ -68,7 +68,7 @@ get_header(); ?>
 			<?php endif; ?>
 
 			</div><!-- #content -->
-		</section><!-- #primary -->
+		</section><!-- #primary .site-content -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/footer.php b/footer.php
index 22fbb773..c8f8f86a 100644
--- a/footer.php
+++ b/footer.php
@@ -11,15 +11,15 @@
 
 	</div><!-- #main -->
 
-	<footer id="colophon" role="contentinfo">
+	<footer id="colophon" class="site-footer" role="contentinfo">
 		<div class="site-info">
 			<?php do_action( '_s_credits' ); ?>
-			<a href="http://wordpress.org/" title="<?php esc_attr_e( 'A Semantic Personal Publishing Platform', '_s' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s', '_s' ), 'WordPress' ); ?></a>
+			<a href="<?php echo esc_url( __( 'http://wordpress.org/', '_s' ) ); ?>" title="<?php esc_attr_e( 'A Semantic Personal Publishing Platform', '_s' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s', '_s' ), 'WordPress' ); ?></a>
 			<span class="sep"> | </span>
 			<?php printf( __( 'Theme: %1$s by %2$s.', '_s' ), '_s', '<a href="http://automattic.com/" rel="designer">Automattic</a>' ); ?>
 		</div><!-- .site-info -->
-	</footer><!-- #colophon -->
-</div><!-- #page -->
+	</footer><!-- .site-footer .site-footer -->
+</div><!-- #page .hfeed .site -->
 
 <?php wp_footer(); ?>
 
diff --git a/header.php b/header.php
index d1368bf7..ac85f1f0 100644
--- a/header.php
+++ b/header.php
@@ -45,7 +45,7 @@
 </head>
 
 <body <?php body_class(); ?>>
-<div id="page" class="hfeed">
+<div id="page" class="hfeed site">
 	<?php do_action( 'before' ); ?>
 	<header id="masthead" class="site-header" role="banner">
 		<hgroup>
diff --git a/image.php b/image.php
index 79d6f651..46b0cf34 100644
--- a/image.php
+++ b/image.php
@@ -8,7 +8,7 @@
 
 get_header(); ?>
 
-		<div id="primary" class="image-attachment">
+		<div id="primary" class="site-content" class="image-attachment">
 			<div id="content" role="main">
 
 			<?php while ( have_posts() ) : the_post(); ?>
@@ -34,8 +34,8 @@ get_header(); ?>
 						</div><!-- .entry-meta -->
 
 						<nav id="image-navigation">
-							<span class="previous-image"><?php previous_image_link( false, __( '&larr; Previous', '_s' ) ); ?></span>
-							<span class="next-image"><?php next_image_link( false, __( 'Next &rarr;', '_s' ) ); ?></span>
+							<span class="previous-image"><?php previous_image_link( false, __( '&larr; Previous' , '_s' ) ); ?></span>
+							<span class="next-image"><?php next_image_link( false, __( 'Next &rarr;' , '_s' ) ); ?></span>
 						</nav><!-- #image-navigation -->
 					</header><!-- .entry-header -->
 
@@ -105,6 +105,6 @@ get_header(); ?>
 			<?php endwhile; // end of the loop. ?>
 
 			</div><!-- #content -->
-		</div><!-- #primary -->
+		</div><!-- #primary .site-content -->
 
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 8ea40b19..0c7d86ad 100644
--- a/index.php
+++ b/index.php
@@ -14,7 +14,7 @@
 
 get_header(); ?>
 
-		<div id="primary">
+		<div id="primary" class="site-content">
 			<div id="content" role="main">
 
 			<?php if ( have_posts() ) : ?>
@@ -52,7 +52,7 @@ get_header(); ?>
 			<?php endif; ?>
 
 			</div><!-- #content -->
-		</div><!-- #primary -->
+		</div><!-- #primary .site-content -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/layouts/content-sidebar-sidebar.css b/layouts/content-sidebar-sidebar.css
index 9c8a4d53..3bb0a21f 100644
--- a/layouts/content-sidebar-sidebar.css
+++ b/layouts/content-sidebar-sidebar.css
@@ -3,7 +3,7 @@ Theme Name: _s
 Layout: Content-Sidebar-Sidebar
 */
 
-#primary {
+.site-content {
 	float: left;
 	width: 100%;
 }
@@ -21,7 +21,7 @@ Layout: Content-Sidebar-Sidebar
 #tertiary { /* Sidebar 2 */
 	margin: 0 0 0 -20%;
 }
-#colophon {
+.site-footer {
 	clear: both;
 	width: 100%;
 }
diff --git a/layouts/content-sidebar.css b/layouts/content-sidebar.css
index 78f40a71..fba0c662 100644
--- a/layouts/content-sidebar.css
+++ b/layouts/content-sidebar.css
@@ -3,7 +3,7 @@ Theme Name: _s
 Layout: Content-Sidebar
 */
 
-#primary {
+.site-content {
 	float: left;
 	margin: 0 -25% 0 0;
 	width: 100%;
@@ -19,7 +19,7 @@ Layout: Content-Sidebar
 #tertiary { /* Sidebar 2 */
 	clear: right;
 }
-#colophon {
+.site-footer {
 	clear: both;
 	width: 100%;
 }
\ No newline at end of file
diff --git a/layouts/sidebar-content-sidebar.css b/layouts/sidebar-content-sidebar.css
index 50771e03..706ee13b 100644
--- a/layouts/sidebar-content-sidebar.css
+++ b/layouts/sidebar-content-sidebar.css
@@ -3,7 +3,7 @@ Theme Name: _s
 Layout: Sidebar-Content-Sidebar
 */
 
-#primary {
+.site-content {
 	float: left;
 	width: 100%;
 }
@@ -21,7 +21,7 @@ Layout: Sidebar-Content-Sidebar
 #tertiary { /* Sidebar 2 */
 	margin: 0 0 0 -20%;
 }
-#colophon {
+.site-footer {
 	clear: both;
 	width: 100%;
 }
diff --git a/layouts/sidebar-content.css b/layouts/sidebar-content.css
index 07af8563..4be0ec4d 100644
--- a/layouts/sidebar-content.css
+++ b/layouts/sidebar-content.css
@@ -3,7 +3,7 @@ Theme Name: _s
 Layout: Sidebar-Content
 */
 
-#primary {
+.site-content {
 	float: right;
 	margin: 0 0 0 -25%;
 	width: 100%;
@@ -19,7 +19,7 @@ Layout: Sidebar-Content
 #tertiary { /* Sidebar 2 */
 	clear: left;
 }
-#colophon {
+.site-footer {
 	clear: both;
 	width: 100%;
 }
\ No newline at end of file
diff --git a/layouts/sidebar-sidebar-content.css b/layouts/sidebar-sidebar-content.css
index eef7d7df..76f59881 100644
--- a/layouts/sidebar-sidebar-content.css
+++ b/layouts/sidebar-sidebar-content.css
@@ -3,7 +3,7 @@ Theme Name: _s
 Layout: Sidebar-Sidebar-Content
 */
 
-#primary {
+.site-content {
 	float: right;
 	margin: 0 0 0 -40%;
 	width: 100%;
@@ -16,7 +16,7 @@ Layout: Sidebar-Sidebar-Content
 	overflow: hidden;
 	width: 20%;
 }
-#colophon {
+.site-footer {
 	clear: both;
 	width: 100%;
 }
\ No newline at end of file
diff --git a/page.php b/page.php
index b32b1cb4..77d63df1 100644
--- a/page.php
+++ b/page.php
@@ -13,7 +13,7 @@
 
 get_header(); ?>
 
-		<div id="primary">
+		<div id="primary" class="site-content">
 			<div id="content" role="main">
 
 				<?php while ( have_posts() ) : the_post(); ?>
@@ -25,7 +25,7 @@ get_header(); ?>
 				<?php endwhile; // end of the loop. ?>
 
 			</div><!-- #content -->
-		</div><!-- #primary -->
+		</div><!-- #primary .site-content -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/search.php b/search.php
index a0b10b08..4f3f0f0e 100644
--- a/search.php
+++ b/search.php
@@ -8,7 +8,7 @@
 
 get_header(); ?>
 
-		<section id="primary">
+		<section id="primary" class="site-content">
 			<div id="content" role="main">
 
 			<?php if ( have_posts() ) : ?>
@@ -44,7 +44,7 @@ get_header(); ?>
 			<?php endif; ?>
 
 			</div><!-- #content -->
-		</section><!-- #primary -->
+		</section><!-- #primary .site-content -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/single.php b/single.php
index ea5cdd8f..b4713010 100644
--- a/single.php
+++ b/single.php
@@ -8,7 +8,7 @@
 
 get_header(); ?>
 
-		<div id="primary">
+		<div id="primary" class="site-content">
 			<div id="content" role="main">
 
 			<?php while ( have_posts() ) : the_post(); ?>
@@ -28,7 +28,7 @@ get_header(); ?>
 			<?php endwhile; // end of the loop. ?>
 
 			</div><!-- #content -->
-		</div><!-- #primary -->
+		</div><!-- #primary .site-content -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
