diff --git a/resources/skins.citizen.styles/layout.less b/resources/skins.citizen.styles/layout.less
index 14894a60..3d064b0e 100644
--- a/resources/skins.citizen.styles/layout.less
+++ b/resources/skins.citizen.styles/layout.less
@@ -27,6 +27,7 @@
 	.mixin-clearfix();
 }
 
+figure,
 .thumb {
 	margin: @content-margin-top 0;
 
@@ -47,18 +48,27 @@ a.image {
 
 @media ( min-width: @width-breakpoint-tablet ) {
 	div.tleft,
+	figure.mw-halign-left,
 	div.floatleft,
 	table.floatleft {
+		/* @noflip */
 		margin-right: 1.4rem;
+		/* @noflip */
 		clear: left;
+		/* @noflip */
 		float: left;
 	}
 
 	div.tright,
+	figure.mw-halign-right,
+	figure.mw-default-size,
 	div.floatright,
 	table.floatright {
+		/* @noflip */
 		margin-left: 1.4rem;
+		/* @noflip */
 		clear: right;
+		/* @noflip */
 		float: right;
 	}
 }
diff --git a/skin.json b/skin.json
index e13090af..76f22c29 100644
--- a/skin.json
+++ b/skin.json
@@ -486,6 +486,8 @@
 			"+mediawiki.action.history.styles": "skinStyles/mediawiki/action/mediawiki.action.history.styles.less",
 			"+mediawiki.action.view.filepage": "skinStyles/mediawiki/action/mediawiki.action.view.filepage.less",
 
+			"mediawiki.skinning.content.parsoid": "",
+
 			"+mediawiki.special": "skinStyles/mediawiki/special/mediawiki.special.less",
 			"+mediawiki.special.apisandbox": "skinStyles/mediawiki/special/mediawiki.special.apisandbox.less",
 			"+mediawiki.special.changeslist.enhanced": "skinStyles/mediawiki/special/mediawiki.special.changeslist.enhanced.less",