diff --git a/lib/edit-site-page.php b/lib/edit-site-page.php
index 837148666319d..7658fe05a5951 100644
--- a/lib/edit-site-page.php
+++ b/lib/edit-site-page.php
@@ -127,6 +127,7 @@ function gutenberg_edit_site_init( $hook ) {
 	}
 
 	$settings = array(
+		'alignWide'              => get_theme_support( 'align-wide' ),
 		'disableCustomColors'    => get_theme_support( 'disable-custom-colors' ),
 		'disableCustomFontSizes' => get_theme_support( 'disable-custom-font-sizes' ),
 		'imageSizes'             => $available_image_sizes,
diff --git a/packages/block-library/src/post-content/block.json b/packages/block-library/src/post-content/block.json
index 215989a2a8feb..dc8ad29ba4d0a 100644
--- a/packages/block-library/src/post-content/block.json
+++ b/packages/block-library/src/post-content/block.json
@@ -6,6 +6,7 @@
 		"postType"
 	],
 	"supports": {
+		"align": true,
 		"html": false
 	}
 }
diff --git a/packages/block-library/src/template-part/block.json b/packages/block-library/src/template-part/block.json
index bd381e4dd073d..bb5146843f7b7 100644
--- a/packages/block-library/src/template-part/block.json
+++ b/packages/block-library/src/template-part/block.json
@@ -13,6 +13,7 @@
 		}
 	},
 	"supports": {
+		"align": true,
 		"html": false
 	}
 }
diff --git a/packages/edit-site/src/components/block-editor/style.scss b/packages/edit-site/src/components/block-editor/style.scss
index 1b273ae401f32..bd84864f61aa1 100644
--- a/packages/edit-site/src/components/block-editor/style.scss
+++ b/packages/edit-site/src/components/block-editor/style.scss
@@ -1,17 +1,3 @@
-.edit-site-block-editor__block-list {
-	padding-bottom: $grid-unit-30;
-	padding-top: $grid-unit-30 + 5;
-
-	padding-left: $block-padding;
-	padding-right: $block-padding;
-
-	// Full-wide. (to account for the padddings added above)
-	.wp-block[data-align="full"] {
-		margin-left: -$block-padding;
-		margin-right: -$block-padding;
-	}
-}
-
 // The button element easily inherits styles that are meant for the editor style.
 // These rules enhance the specificity to reduce that inheritance.
 // This is duplicated in visual-editor.