diff --git a/404.php b/404.php
index d2c2de6f..950cf977 100644
--- a/404.php
+++ b/404.php
@@ -7,8 +7,9 @@
 
 get_header(); ?>
 
+
 	<div id="primary" class="content-area">
-		<div id="content" class="site-content" role="main">
+		<main id="main" class="site-main" role="main">
 
 			<section class="error-404 not-found">
 				<header class="page-header">
@@ -50,7 +51,7 @@ get_header(); ?>
 				</div><!-- .page-content -->
 			</section><!-- .error-404 -->
 
-		</div><!-- #content -->
+		</main><!-- #main -->
 	</div><!-- #primary -->
 
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/archive.php b/archive.php
index b55cb95f..f808fd6a 100644
--- a/archive.php
+++ b/archive.php
@@ -10,7 +10,7 @@
 get_header(); ?>
 
 	<section id="primary" class="content-area">
-		<div id="content" class="site-content" role="main">
+		<main id="main" class="site-main" role="main">
 
 		<?php if ( have_posts() ) : ?>
 
@@ -95,7 +95,7 @@ get_header(); ?>
 
 		<?php endif; ?>
 
-		</div><!-- #content -->
+		</main><!-- #main -->
 	</section><!-- #primary -->
 
 <?php get_sidebar(); ?>
diff --git a/footer.php b/footer.php
index 7dd82a8b..95646bab 100644
--- a/footer.php
+++ b/footer.php
@@ -8,7 +8,7 @@
  */
 ?>
 
-	</div><!-- #main -->
+	</div><!-- #content -->
 
 	<footer id="colophon" class="site-footer" role="contentinfo">
 		<div class="site-info">
diff --git a/header.php b/header.php
index e45a1eb6..562255c7 100644
--- a/header.php
+++ b/header.php
@@ -35,4 +35,4 @@
 		</nav><!-- #site-navigation -->
 	</header><!-- #masthead -->
 
-	<div id="main" class="site-main">
+	<div id="content" class="site-content">
diff --git a/image.php b/image.php
index 23c61eb8..e9c7d502 100644
--- a/image.php
+++ b/image.php
@@ -9,7 +9,7 @@ get_header();
 ?>
 
 	<div id="primary" class="content-area image-attachment">
-		<div id="content" class="site-content" role="main">
+		<main id="main" class="site-main" role="main">
 
 		<?php while ( have_posts() ) : the_post(); ?>
 
@@ -88,7 +88,7 @@ get_header();
 
 		<?php endwhile; // end of the loop. ?>
 
-		</div><!-- #content -->
+		</main><!-- #main -->
 	</div><!-- #primary -->
 
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/inc/jetpack.php b/inc/jetpack.php
index d26a9ee9..068f0f0f 100644
--- a/inc/jetpack.php
+++ b/inc/jetpack.php
@@ -12,7 +12,7 @@
  */
 function _s_jetpack_setup() {
 	add_theme_support( 'infinite-scroll', array(
-		'container' => 'content',
+		'container' => 'main',
 		'footer'    => 'page',
 	) );
 }
diff --git a/index.php b/index.php
index b3415dd4..ca4591fb 100644
--- a/index.php
+++ b/index.php
@@ -14,7 +14,7 @@
 get_header(); ?>
 
 	<div id="primary" class="content-area">
-		<div id="content" class="site-content" role="main">
+		<main id="main" class="site-main" role="main">
 
 		<?php if ( have_posts() ) : ?>
 
@@ -39,7 +39,7 @@ get_header(); ?>
 
 		<?php endif; ?>
 
-		</div><!-- #content -->
+		</main><!-- #main -->
 	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
diff --git a/layouts/content-sidebar.css b/layouts/content-sidebar.css
index e0b2f7c6..5e0951cd 100644
--- a/layouts/content-sidebar.css
+++ b/layouts/content-sidebar.css
@@ -8,10 +8,10 @@ Layout: Content-Sidebar
 	margin: 0 -25% 0 0;
 	width: 100%;
 }
-.site-content {
+.site-main {
 	margin: 0 25% 0 0;
 }
-.site-main .widget-area {
+.site-content .widget-area {
 	float: right;
 	overflow: hidden;
 	width: 25%;
diff --git a/layouts/sidebar-content.css b/layouts/sidebar-content.css
index 5a052e17..6f0a119c 100644
--- a/layouts/sidebar-content.css
+++ b/layouts/sidebar-content.css
@@ -8,10 +8,10 @@ Layout: Sidebar-Content
 	margin: 0 0 0 -25%;
 	width: 100%;
 }
-.site-content {
+.site-main {
 	margin: 0 0 0 25%;
 }
-.site-main .widget-area {
+.site-content .widget-area {
 	float: left;
 	overflow: hidden;
 	width: 25%;
diff --git a/page.php b/page.php
index ee3f17d3..575d8fa1 100644
--- a/page.php
+++ b/page.php
@@ -13,7 +13,7 @@
 get_header(); ?>
 
 	<div id="primary" class="content-area">
-		<div id="content" class="site-content" role="main">
+		<main id="main" class="site-main" role="main">
 
 			<?php while ( have_posts() ) : the_post(); ?>
 
@@ -27,7 +27,7 @@ get_header(); ?>
 
 			<?php endwhile; // end of the loop. ?>
 
-		</div><!-- #content -->
+		</main><!-- #main -->
 	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
diff --git a/search.php b/search.php
index 5bce792f..e28eece9 100644
--- a/search.php
+++ b/search.php
@@ -8,7 +8,7 @@
 get_header(); ?>
 
 	<section id="primary" class="content-area">
-		<div id="content" class="site-content" role="main">
+		<main id="main" class="site-main" role="main">
 
 		<?php if ( have_posts() ) : ?>
 
@@ -31,7 +31,7 @@ get_header(); ?>
 
 		<?php endif; ?>
 
-		</div><!-- #content -->
+		</main><!-- #main -->
 	</section><!-- #primary -->
 
 <?php get_sidebar(); ?>
diff --git a/single.php b/single.php
index 032e9fb5..f088fb76 100644
--- a/single.php
+++ b/single.php
@@ -8,7 +8,7 @@
 get_header(); ?>
 
 	<div id="primary" class="content-area">
-		<div id="content" class="site-content" role="main">
+		<main id="main" class="site-main" role="main">
 
 		<?php while ( have_posts() ) : the_post(); ?>
 
@@ -24,7 +24,7 @@ get_header(); ?>
 
 		<?php endwhile; // end of the loop. ?>
 
-		</div><!-- #content -->
+		</main><!-- #main -->
 	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>