diff --git a/layouts/content-sidebar-sidebar.css b/layouts/content-sidebar-sidebar.css
index 98e3ee2e..4c73a7f3 100644
--- a/layouts/content-sidebar-sidebar.css
+++ b/layouts/content-sidebar-sidebar.css
@@ -3,24 +3,19 @@ Theme Name: _s
 Layout: Content-Sidebar-Sidebar
 */
 
-#primary {
+.content-area {
 	float: left;
 	width: 100%;
 }
-#content {
+.site-content {
 	margin: 0 40% 0 0;
 }
-#main .widget-area {
+.site-main .widget-area {
 	float: left;
+	margin: 0 0 0 -40%;
 	overflow: hidden;
 	width: 20%;
 }
-#secondary { /* Sidebar 1 */
-	margin: 0 0 0 -40%;
-}
-#tertiary { /* Sidebar 2 */
-	margin: 0 0 0 -20%;
-}
 .site-footer {
 	clear: both;
 	width: 100%;
diff --git a/layouts/content-sidebar.css b/layouts/content-sidebar.css
index edf558d8..e0b2f7c6 100644
--- a/layouts/content-sidebar.css
+++ b/layouts/content-sidebar.css
@@ -3,22 +3,19 @@ Theme Name: _s
 Layout: Content-Sidebar
 */
 
-#primary {
+.content-area {
 	float: left;
 	margin: 0 -25% 0 0;
 	width: 100%;
 }
-#content {
+.site-content {
 	margin: 0 25% 0 0;
 }
-#secondary { /* Sidebar 1 */
+.site-main .widget-area {
 	float: right;
 	overflow: hidden;
 	width: 25%;
 }
-#tertiary { /* Sidebar 2 */
-	clear: right;
-}
 .site-footer {
 	clear: both;
 	width: 100%;
diff --git a/layouts/sidebar-content-sidebar.css b/layouts/sidebar-content-sidebar.css
index 9081318a..a2dc79a1 100644
--- a/layouts/sidebar-content-sidebar.css
+++ b/layouts/sidebar-content-sidebar.css
@@ -3,24 +3,19 @@ Theme Name: _s
 Layout: Sidebar-Content-Sidebar
 */
 
-#primary {
+.content-area {
 	float: left;
 	width: 100%;
 }
-#content {
+.site-content {
 	margin: 0 20%;
 }
-#main .widget-area {
+.site-main .widget-area {
 	float: left;
+	margin: 0 0 0 -100%;
 	overflow: hidden;
 	width: 20%;
 }
-#secondary { /* Sidebar 1 */
-	margin: 0 0 0 -100%;
-}
-#tertiary { /* Sidebar 2 */
-	margin: 0 0 0 -20%;
-}
 .site-footer {
 	clear: both;
 	width: 100%;
diff --git a/layouts/sidebar-content.css b/layouts/sidebar-content.css
index 6fe41c2b..5a052e17 100644
--- a/layouts/sidebar-content.css
+++ b/layouts/sidebar-content.css
@@ -3,22 +3,19 @@ Theme Name: _s
 Layout: Sidebar-Content
 */
 
-#primary {
+.content-area {
 	float: right;
 	margin: 0 0 0 -25%;
 	width: 100%;
 }
-#content {
+.site-content {
 	margin: 0 0 0 25%;
 }
-#secondary { /* Sidebar 1 */
+.site-main .widget-area {
 	float: left;
 	overflow: hidden;
 	width: 25%;
 }
-#tertiary { /* Sidebar 2 */
-	clear: left;
-}
 .site-footer {
 	clear: both;
 	width: 100%;
diff --git a/layouts/sidebar-sidebar-content.css b/layouts/sidebar-sidebar-content.css
index 93134584..3daa3fc0 100644
--- a/layouts/sidebar-sidebar-content.css
+++ b/layouts/sidebar-sidebar-content.css
@@ -3,15 +3,15 @@ Theme Name: _s
 Layout: Sidebar-Sidebar-Content
 */
 
-#primary {
+.content-area {
 	float: right;
 	margin: 0 0 0 -40%;
 	width: 100%;
 }
-#content {
+.site-content {
 	margin: 0 0 0 40%;
 }
-#main .widget-area {
+.site-main .widget-area {
 	float: left;
 	overflow: hidden;
 	width: 20%;
diff --git a/style.css b/style.css
index aa2f6914..94013178 100644
--- a/style.css
+++ b/style.css
@@ -554,7 +554,7 @@ object {
 }
 
 /* Search widget */
-#searchsubmit {
+.widget_search .submit {
 	display: none;
 }
 
@@ -562,13 +562,12 @@ object {
 ----------------------------------------------- */
 
 /* Globally hidden elements when Infinite Scroll is supported and in use. */
-.infinite-scroll #nav-above, /* Older / Newer Posts Navigation (always hidden) */
-.infinite-scroll #nav-below,
-.infinite-scroll.neverending #colophon { /* Theme Footer (when set to scrolling) */
+.infinite-scroll .paging-navigation, /* Older / Newer Posts Navigation (always hidden) */
+.infinite-scroll.neverending .site-footer { /* Theme Footer (when set to scrolling) */
 	display: none;
 }
 
 /* When Infinite Scroll has reached its end we need to re-display elements that were hidden (via .neverending) before */
-.infinity-end.neverending #colophon {
+.infinity-end.neverending .site-footer {
 	display: block;
 }