diff --git a/resources/screen-common.less b/resources/screen-common.less
index 4ee6977..2721257 100644
--- a/resources/screen-common.less
+++ b/resources/screen-common.less
@@ -23,6 +23,8 @@ body {
 }
 #mw-content-container {
 	background: @background2;
+}
+.mw-body {
 	word-wrap: break-word;
 }
 #mw-footer-container {
@@ -450,7 +452,7 @@ ul {
 .thumbborder {
 	border: solid 1px @grey-bright;
 }
-#mw-content li.gallerybox div.thumb {
+.mw-body li.gallerybox div.thumb {
 	.box;
 	padding: 0;
 }
@@ -473,7 +475,7 @@ ul#filetoc {
 	margin: 1em 0 0;
 	list-style: none;
 }
-#mw-content .toc h2 {
+.mw-body .toc h2 {
 	font-size: 1em;
 	font-family: @fonts;
 	margin: 0;
@@ -483,7 +485,7 @@ ul#filetoc {
 .toctoggle {
 	color: @background3;
 }
-#toc li:last-child {
+.toc li:last-child {
 	margin-bottom: 0.5em;
 }
 .toclevel-1 {
@@ -493,14 +495,14 @@ ul#filetoc {
 	color: @grey-dark;
 }
 .mw-changeslist-legend,
-#mw-content .mw-search-profile-tabs,
-#mw-content fieldset#mw-searchoptions,
+.mw-body .mw-search-profile-tabs,
+.mw-body fieldset#mw-searchoptions,
 table.wikitable {
 	border: 0;
 	color: @text;
 	.box;
 }
-#mw-content .mw-search-profile-tabs {
+.mw-body .mw-search-profile-tabs {
 	padding: 0.5em;
 }
 
diff --git a/resources/screen-mobile.less b/resources/screen-mobile.less
index 5354f2c..93382fc 100644
--- a/resources/screen-mobile.less
+++ b/resources/screen-mobile.less
@@ -221,24 +221,22 @@ div.thumb {
 	margin: 0 auto 0.5em;
 }
 
-#mw-content {
+.mw-body {
 	overflow: auto;
 	border: 0;
+
+	/* Keep images from overflowing */
+	a > img {
+		height: auto !important;
+		max-width: 100% !important;
+	}
 }
+
 #mw-content-block {
 	background: @background;
 }
 
-/* Keep images from overflowing */
-
-#mw-content a > img {
-	height: auto !important;
-	max-width: 100% !important;
-}
-
 /* Table of contents */
-
-#toc,
 .toc,
 .mw-warning {
 	width: 100%;