diff --git a/public_html/wp-content/themes/pattern-directory/functions.php b/public_html/wp-content/themes/pattern-directory/functions.php
index 9e4833b6c..e40356134 100644
--- a/public_html/wp-content/themes/pattern-directory/functions.php
+++ b/public_html/wp-content/themes/pattern-directory/functions.php
@@ -150,13 +150,6 @@ function generate_block_editor_styles_html() {
 	wp_styles()->do_items( $handles );
 	wp_styles()->done = $done;
 
-	// Build up the alignment styles to match the layout set in theme.json.
-	// See https://github.com/WordPress/gutenberg/blob/9d4b83cbbafcd6c6cbd20c86b572f458fc65ff16/lib/block-supports/layout.php#L38
-	$block_gap = wp_get_global_styles( array( 'spacing', 'blockGap' ) );
-	$layout = wp_get_global_settings( array( 'layout' ) );
-	$style = gutenberg_get_layout_style( 'body > div', $layout, true, $block_gap );
-	echo '<style>' . $style . '</style>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-
 	wp_add_inline_script(
 		'wporg-pattern-script',
 		sprintf(
diff --git a/public_html/wp-content/themes/pattern-directory/src/components/iframe/index.js b/public_html/wp-content/themes/pattern-directory/src/components/iframe/index.js
index e9062cc10..a89b20ac1 100644
--- a/public_html/wp-content/themes/pattern-directory/src/components/iframe/index.js
+++ b/public_html/wp-content/themes/pattern-directory/src/components/iframe/index.js
@@ -104,6 +104,9 @@ function Iframe(
         align-items: center;
         justify-content: center;
         background-color: white;
+        /* Override the Twenty Twenty-One sizes with our custom sizes. */
+        --responsive--aligndefault-width: 800px;
+        --responsive--alignwide-width: 1000px;
     }
     .${ BODY_CLASS_NAME } {
         padding: 0;
@@ -136,7 +139,6 @@ function Iframe(
 			}
 
 			setHead( contentDocument, headHTML );
-			setBodyClassName( contentDocument );
 			bubbleEvents( contentDocument );
 			setBodyClassName( contentDocument );
 			setIframeDocument( contentDocument );
diff --git a/public_html/wp-content/themes/pattern-directory/src/components/pattern-preview/canvas.js b/public_html/wp-content/themes/pattern-directory/src/components/pattern-preview/canvas.js
index f8867dfbd..9b1e98fa1 100644
--- a/public_html/wp-content/themes/pattern-directory/src/components/pattern-preview/canvas.js
+++ b/public_html/wp-content/themes/pattern-directory/src/components/pattern-preview/canvas.js
@@ -19,6 +19,7 @@ function Canvas( { html } ) {
 				headHTML={ window.__editorStyles.html }
 			>
 				<div
+					className="entry-content"
 					dangerouslySetInnerHTML={ {
 						__html: html,
 					} }
diff --git a/public_html/wp-content/themes/pattern-directory/src/components/pattern-thumbnail/canvas.js b/public_html/wp-content/themes/pattern-directory/src/components/pattern-thumbnail/canvas.js
index e8d929905..95fe32987 100644
--- a/public_html/wp-content/themes/pattern-directory/src/components/pattern-thumbnail/canvas.js
+++ b/public_html/wp-content/themes/pattern-directory/src/components/pattern-thumbnail/canvas.js
@@ -69,6 +69,7 @@ function PatternThumbnail( { className, html } ) {
 				headHTML={ window.__editorStyles.html }
 			>
 				<div
+					className="entry-content"
 					dangerouslySetInnerHTML={ {
 						__html: shouldLoad ? html : '',
 					} }