Index: src/wp-content/themes/twentyeleven/blocks.css
===================================================================
--- src/wp-content/themes/twentyeleven/blocks.css	(revision 43866)
+++ src/wp-content/themes/twentyeleven/blocks.css	(working copy)
@@ -130,18 +130,21 @@
 	width: 100%;
 }
 
-/* Cover Image */
+/* Cover */
 
-.wp-block-cover-image.aligncenter {
+.wp-block-cover-image.aligncenter,
+.wp-block-cover.aligncenter {
 	clear: both;
 	display: flex;
 }
 
-.wp-block-cover-image.alignleft {
+.wp-block-cover-image.alignleft,
+.wp-block-cover.alignleft {
 	margin-right: 1.625em;
 }
 
-.wp-block-cover-image.alignright {
+.wp-block-cover-image.alignright,
+.wp-block-cover.alignright {
 	margin-left: 1.625em;
 }
 
@@ -260,10 +263,37 @@
 	max-width: 100%;
 }
 
+/* Media & Text */
+
+.wp-block-media-text {
+	margin-bottom: 1.625em;
+}
+
+.wp-block-media-text *:last-child {
+	margin-bottom: 0;
+}
+
 /*--------------------------------------------------------------
 5.0 Blocks - Widgets
 --------------------------------------------------------------*/
 
+/* Archives, Categories & Latest Posts */
+
+.wp-block-archives.aligncenter,
+.wp-block-categories.aligncenter,
+.wp-block-latest-posts.aligncenter {
+	list-style-position: inside;
+	margin-left: 2.5em;
+	text-align: center;
+}
+
+.rtl .wp-block-archives.aligncenter,
+.rtl .wp-block-categories.aligncenter,
+.rtl .wp-block-latest-posts.aligncenter {
+	margin-left: 0;
+	margin-right: 2.5em;
+}
+
 /* Latest Comments */
 
 .wp-block-latest-comments {
Index: src/wp-content/themes/twentyeleven/editor-blocks.css
===================================================================
--- src/wp-content/themes/twentyeleven/editor-blocks.css	(revision 43866)
+++ src/wp-content/themes/twentyeleven/editor-blocks.css	(working copy)
@@ -72,12 +72,14 @@
 
 /* Main column width */
 
-body.gutenberg-editor-page .edit-post-visual-editor .editor-post-title__block,
-body.gutenberg-editor-page .edit-post-visual-editor .editor-default-block-appender,
-body.gutenberg-editor-page .edit-post-visual-editor .editor-block-list__block {
-	max-width: 614px;
+.editor-styles-wrapper {
+	max-width: 100% !important; /* Override where editor-style.css is affecting this. */
 }
 
+.wp-block {
+	max-width: 614px; /* 584px + 30px to account for padding */
+}
+
 /* Link styles */
 
 .edit-post-visual-editor a,
@@ -288,10 +290,10 @@
 	font-size: 16px;
 }
 
+/* Cover */
 
-/* Cover Image */
-
-.edit-post-visual-editor .editor-block-list__block .wp-block-cover-image p.wp-block-cover-image-text {
+.edit-post-visual-editor .editor-block-list__block .wp-block-cover-image p.wp-block-cover-image-text,
+.edit-post-visual-editor .editor-block-list__block .wp-block-cover p.wp-block-cover-text {
 	font-size: 30px;
 	line-height: 37.5px;
 }
@@ -385,10 +387,26 @@
 	text-shadow: 0 -1px 0 rgba(0,0,0,0.3);
 }
 
+/* Media & Text */
+
+.wp-block-media-text *:last-child {
+	margin-bottom: 0;
+}
+
 /*--------------------------------------------------------------
 6.0 Blocks - Widgets
 --------------------------------------------------------------*/
 
+/* Archives, Categories & Latest Posts */
+
+[data-align="center"] .wp-block-archives ul,
+[data-align="center"] .wp-block-categories ul,
+[data-align="center"] .wp-block-latest-posts ul {
+	list-style-position: inside;
+	margin-left: 2.5em;
+	text-align: center;
+}
+
 /* Latest Comments */
 
 .wp-block-latest-comments {