diff --git a/404.php b/404.php
index 9ad1b32f..caebc794 100644
--- a/404.php
+++ b/404.php
@@ -8,8 +8,8 @@
 
 get_header(); ?>
 
-	<div id="primary" class="site-content">
-		<div id="content" role="main">
+	<div id="primary" class="content-area">
+		<div id="content" class="site-content" role="main">
 
 			<article id="post-0" class="post error404 not-found">
 				<header class="entry-header">
@@ -41,7 +41,7 @@ get_header(); ?>
 				</div><!-- .entry-content -->
 			</article><!-- #post-0 .post .error404 .not-found -->
 
-		</div><!-- #content -->
-	</div><!-- #primary .site-content -->
+		</div><!-- #content .site-content -->
+	</div><!-- #primary .content-area -->
 
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/archive.php b/archive.php
index 49d4170d..9542a31e 100644
--- a/archive.php
+++ b/archive.php
@@ -10,8 +10,8 @@
 
 get_header(); ?>
 
-		<section id="primary" class="site-content">
-			<div id="content" role="main">
+		<section id="primary" class="content-area">
+			<div id="content" class="site-content" role="main">
 
 			<?php if ( have_posts() ) : ?>
 
@@ -90,8 +90,8 @@ get_header(); ?>
 
 			<?php endif; ?>
 
-			</div><!-- #content -->
-		</section><!-- #primary .site-content -->
+			</div><!-- #content .site-content -->
+		</section><!-- #primary .content-area -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/footer.php b/footer.php
index dfad2c50..ebf6767c 100644
--- a/footer.php
+++ b/footer.php
@@ -9,7 +9,7 @@
  */
 ?>
 
-	</div><!-- #main -->
+	</div><!-- #main .site-main -->
 
 	<footer id="colophon" class="site-footer" role="contentinfo">
 		<div class="site-info">
diff --git a/header.php b/header.php
index 76b62c1b..55bd1631 100644
--- a/header.php
+++ b/header.php
@@ -59,4 +59,4 @@
 		</nav><!-- .site-navigation .main-navigation -->
 	</header><!-- #masthead .site-header -->
 
-	<div id="main">
\ No newline at end of file
+	<div id="main" class="site-main">
\ No newline at end of file
diff --git a/image.php b/image.php
index 48f72fff..c736c297 100644
--- a/image.php
+++ b/image.php
@@ -9,8 +9,8 @@
 get_header();
 ?>
 
-		<div id="primary" class="site-content image-attachment">
-			<div id="content" role="main">
+		<div id="primary" class="content-area image-attachment">
+			<div id="content" class="site-content" role="main">
 
 			<?php while ( have_posts() ) : the_post(); ?>
 
@@ -105,7 +105,7 @@ get_header();
 
 			<?php endwhile; // end of the loop. ?>
 
-			</div><!-- #content -->
-		</div><!-- #primary .site-content .image-attachment -->
+			</div><!-- #content .site-content -->
+		</div><!-- #primary .content-area .image-attachment -->
 
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 27d8cbf5..f592996a 100644
--- a/index.php
+++ b/index.php
@@ -14,8 +14,8 @@
 
 get_header(); ?>
 
-		<div id="primary" class="site-content">
-			<div id="content" role="main">
+		<div id="primary" class="content-area">
+			<div id="content" class="site-content" role="main">
 
 			<?php if ( have_posts() ) : ?>
 
@@ -42,8 +42,8 @@ get_header(); ?>
 
 			<?php endif; ?>
 
-			</div><!-- #content -->
-		</div><!-- #primary .site-content -->
+			</div><!-- #content .site-content -->
+		</div><!-- #primary .content-area -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/page.php b/page.php
index 77d63df1..c5c1ef30 100644
--- a/page.php
+++ b/page.php
@@ -13,8 +13,8 @@
 
 get_header(); ?>
 
-		<div id="primary" class="site-content">
-			<div id="content" role="main">
+		<div id="primary" class="content-area">
+			<div id="content" class="site-content" role="main">
 
 				<?php while ( have_posts() ) : the_post(); ?>
 
@@ -24,8 +24,8 @@ get_header(); ?>
 
 				<?php endwhile; // end of the loop. ?>
 
-			</div><!-- #content -->
-		</div><!-- #primary .site-content -->
+			</div><!-- #content .site-content -->
+		</div><!-- #primary .content-area -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/search.php b/search.php
index f4bedcd5..5ed44f9d 100644
--- a/search.php
+++ b/search.php
@@ -8,8 +8,8 @@
 
 get_header(); ?>
 
-		<section id="primary" class="site-content">
-			<div id="content" role="main">
+		<section id="primary" class="content-area">
+			<div id="content" class="site-content" role="main">
 
 			<?php if ( have_posts() ) : ?>
 
@@ -34,8 +34,8 @@ get_header(); ?>
 
 			<?php endif; ?>
 
-			</div><!-- #content -->
-		</section><!-- #primary .site-content -->
+			</div><!-- #content .site-content -->
+		</section><!-- #primary .content-area -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/single.php b/single.php
index b4713010..9b9d762b 100644
--- a/single.php
+++ b/single.php
@@ -8,8 +8,8 @@
 
 get_header(); ?>
 
-		<div id="primary" class="site-content">
-			<div id="content" role="main">
+		<div id="primary" class="content-area">
+			<div id="content" class="site-content" role="main">
 
 			<?php while ( have_posts() ) : the_post(); ?>
 
@@ -27,8 +27,8 @@ get_header(); ?>
 
 			<?php endwhile; // end of the loop. ?>
 
-			</div><!-- #content -->
-		</div><!-- #primary .site-content -->
+			</div><!-- #content .site-content -->
+		</div><!-- #primary .content-area -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file