diff --git a/tt1-blocks/assets/css/blocks.css b/tt1-blocks/assets/css/blocks.css
index acd1a506..7796af84 100644
--- a/tt1-blocks/assets/css/blocks.css
+++ b/tt1-blocks/assets/css/blocks.css
@@ -1,8 +1,8 @@
 /*--------------------------------------------------------------
-# Cover
+# Border, for backwards compatibility
 --------------------------------------------------------------*/
 
-.wp-block-cover.is-style-twentytwentyone-border {
+.is-style-twentytwentyone-border {
 	border: 3px solid var(--wp--preset--color--dark-gray);
 }
 
@@ -50,15 +50,6 @@
 # Image
 --------------------------------------------------------------*/
 
-.wp-block-image img {
-	height: auto;
-}
-
-.wp-block-image.is-style-twentytwentyone-border img,
-.wp-block-image.is-style-twentytwentyone-image-frame img {
-	border: 3px solid var(--wp--preset--color--dark-gray);
-}
-
 .wp-block-image.is-style-twentytwentyone-image-frame img {
 	padding: var(--wp--custom--spacing--unit);
 }
@@ -137,14 +128,6 @@
 	margin-bottom: var(--wp--custom--spacing--horizontal);
 }
 
-/*--------------------------------------------------------------
-# Media & Text
---------------------------------------------------------------*/
-
-.wp-block-media-text.is-style-twentytwentyone-border {
-	border: 3px solid var(--wp--preset--color--dark-gray);
-}
-
 /*--------------------------------------------------------------
 # Navigation
 --------------------------------------------------------------*/
@@ -179,23 +162,7 @@ hr.is-style-twentytwentyone-separator-thick,
 	border-bottom-width: 3px;
 }
 
-.wp-block-separator.is-style-dots {
-	border-bottom: none;
-}
-
-.wp-block-separator.is-style-dots > hr {
-	display: none;
-}
-
 /* In Twenty Twenty-One, separators are 100% wide. This replicates that approach */
 .wp-block-separator:not(.is-style-wide):not(.is-style-dots) {
 	width: 100%;
 }
-
-/*--------------------------------------------------------------
-# Site Title
---------------------------------------------------------------*/
-
-h1.wp-block-site-title a:not(:hover):not(:focus):not(:active) {
-	text-decoration: none;
-}
diff --git a/tt1-blocks/assets/css/style-shared.css b/tt1-blocks/assets/css/style-shared.css
index 1649321b..889e3bd5 100644
--- a/tt1-blocks/assets/css/style-shared.css
+++ b/tt1-blocks/assets/css/style-shared.css
@@ -23,49 +23,3 @@ a:hover {
 	text-decoration-style: dotted;
 	text-decoration-skip-ink: none;
 }
-
-/*
- * Gutenberg remotes this underline, but Twenty Twenty-One uses it. 
- */
-.site-header h1.wp-block-site-title a:not(:hover):not(:focus):not(:active) {
-	text-decoration: underline;
-}
-
-/*
- * Alignment styles.
- * These rules are temporary, and should not be relied on or 
- * modified too heavily by themes or plugins that build on 
- * Twenty Twenty-Two. These are meant to be a precursor to 
- * a global solution provided by the Block Editor. 
- * 
- * Relevant issues:
- * https://github.com/WordPress/gutenberg/issues/35607
- * https://github.com/WordPress/gutenberg/issues/35884
- */
-
-.wp-site-blocks,
-body > .is-root-container,
-.edit-post-visual-editor__post-title-wrapper,
-.wp-block-group.alignfull,
-.is-root-container .wp-block[data-align="full"] > .wp-block-group {
-	padding-left: var(--wp--custom--spacing--outer);
-	padding-right: var(--wp--custom--spacing--outer);
-}
-
-.wp-site-blocks .alignfull,
-.is-root-container .wp-block[data-align="full"] {
-	margin-left: calc(-1 * var(--wp--custom--spacing--outer)) !important;
-	margin-right: calc(-1 * var(--wp--custom--spacing--outer)) !important;
-	width: unset;
-}
-
-/* Blocks inside columns don't have negative margins. */
-.wp-site-blocks .wp-block-columns .wp-block-column .alignfull,
-.is-root-container .wp-block-columns .wp-block-column .wp-block[data-align="full"],
-/* We also want to avoid stacking negative margins. */
-.wp-site-blocks .alignfull:not(.wp-block-group) .alignfull,
-.is-root-container .wp-block[data-align="full"] > *:not(.wp-block-group) .wp-block[data-align="full"] {
-	margin-left: auto !important;
-	margin-right: auto !important;
-	width: inherit;
-}
diff --git a/tt1-blocks/patterns/links-area.php b/tt1-blocks/patterns/links-area.php
index a6a6fb80..856cc7bd 100644
--- a/tt1-blocks/patterns/links-area.php
+++ b/tt1-blocks/patterns/links-area.php
@@ -13,26 +13,24 @@
  */
 
 ?>
-<!-- wp:cover {"overlayColor":"green","contentPosition":"center center","align":"wide","className":"is-style-twentytwentyone-border"} -->
-<div class="wp-block-cover alignwide has-green-background-color has-background-dim is-style-twentytwentyone-border">
-	<div class="wp-block-cover__inner-container">
-		<!-- wp:spacer {"height":20} --><div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer -->
-		<!-- wp:paragraph {"fontSize":"huge"} --><p class="has-huge-font-size"><?php echo wp_kses_post( __( 'Let&#8217;s Connect.', 'tt1-blocks' ) ); ?></p><!-- /wp:paragraph -->
-		<!-- wp:spacer {"height":75} --><div style="height:75px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer -->
-		<!-- wp:columns -->
-		<div class="wp-block-columns">
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:paragraph --><p><a href="#" data-type="URL"><?php esc_html_e( 'Twitter', 'tt1-blocks' ); ?></a> / <a href="#" data-type="URL"><?php esc_html_e( 'Instagram', 'tt1-blocks' )?> </a> / <a href="#" data-type="URL"> <?php esc_html_e( 'Dribbble', 'tt1-blocks' ); ?></a></p><!-- /wp:paragraph -->
-			</div><!-- /wp:column -->
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:paragraph --><p><a href="#"><?php esc_html_e( 'example@example.com', 'tt1-blocks' ); ?></a></p><!-- /wp:paragraph -->
-			</div>
-			<!-- /wp:column -->
+<!-- wp:group {"align":"wide","style":{"border":{"top":{"color":"var:preset|color|gray","style":"solid"},"right":{"color":"var:preset|color|gray","style":"solid"},"bottom":{"color":"var:preset|color|gray","style":"solid"},"left":{"color":"var:preset|color|gray","style":"solid"}},"spacing":{"padding":{"top":"20px","right":"20px","bottom":"20px","left":"20px"}}},"backgroundColor":"green"} -->
+<div class="wp-block-group alignwide has-green-background-color has-background" style="border-top-color:var(--wp--preset--color--gray);border-top-style:solid;border-right-color:var(--wp--preset--color--gray);border-right-style:solid;border-bottom-color:var(--wp--preset--color--gray);border-bottom-style:solid;border-left-color:var(--wp--preset--color--gray);border-left-style:solid;padding-top:20px;padding-right:20px;padding-bottom:20px;padding-left:20px">
+	<!-- wp:spacer {"height":20} --><div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer -->
+	<!-- wp:paragraph {"fontSize":"huge"} --><p class="has-huge-font-size"><?php echo wp_kses_post( __( 'Let&#8217;s Connect.', 'tt1-blocks' ) ); ?></p><!-- /wp:paragraph -->
+	<!-- wp:spacer {"height":75} --><div style="height:75px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer -->
+	<!-- wp:columns -->
+	<div class="wp-block-columns">
+		<!-- wp:column -->
+		<div class="wp-block-column">
+			<!-- wp:paragraph --><p><a href="#" data-type="URL"><?php esc_html_e( 'Twitter', 'tt1-blocks' ); ?></a> / <a href="#" data-type="URL"><?php esc_html_e( 'Instagram', 'tt1-blocks' )?> </a> / <a href="#" data-type="URL"> <?php esc_html_e( 'Dribbble', 'tt1-blocks' ); ?></a></p><!-- /wp:paragraph -->
+		</div><!-- /wp:column -->
+		<!-- wp:column -->
+		<div class="wp-block-column">
+			<!-- wp:paragraph --><p><a href="#"><?php esc_html_e( 'example@example.com', 'tt1-blocks' ); ?></a></p><!-- /wp:paragraph -->
 		</div>
-		<!-- /wp:columns -->
-		<!-- wp:spacer {"height":20} --><div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer -->
+		<!-- /wp:column -->
 	</div>
+	<!-- /wp:columns -->
+	<!-- wp:spacer {"height":20} --><div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer -->
 </div>
-<!-- /wp:cover -->
\ No newline at end of file
+<!-- /wp:group -->
\ No newline at end of file
diff --git a/tt1-blocks/patterns/media-text-article.php b/tt1-blocks/patterns/media-text-article.php
index 0d649b36..5feac623 100644
--- a/tt1-blocks/patterns/media-text-article.php
+++ b/tt1-blocks/patterns/media-text-article.php
@@ -11,14 +11,17 @@
  * @since 0.4.9
  */
 ?>
-
-<!-- wp:media-text {"mediaId":1752,"mediaLink":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/playing-in-the-sand.jpg","mediaType":"image","className":"is-style-twentytwentyone-border"} -->
-<div class="wp-block-media-text alignwide is-stacked-on-mobile is-style-twentytwentyone-border">
-	<figure class="wp-block-media-text__media"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/playing-in-the-sand.jpg" alt="<?php esc_attr_e( '&#8220;Playing in the Sand&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>" class="wp-image-1752"/></figure><div class="wp-block-media-text__content">
-		<!-- wp:heading {"align":"center"} --><h2 class="has-text-align-center"><?php esc_html_e( 'Playing in the Sand', 'tt1-blocks' ); ?></h2><!-- /wp:heading -->
-		<!-- wp:separator {"className":"is-style-dots"} --><hr class="wp-block-separator is-style-dots"/>
-		<!-- /wp:separator -->
-		<!-- wp:paragraph {"align":"center","fontSize":"small"} -->
-		<p class="has-text-align-center has-small-font-size"><?php echo wp_kses_post( __( 'Berthe Morisot<br>(French, 1841-1895)', 'tt1-blocks' ) ); ?></p><!-- /wp:paragraph -->
-	</div>
-</div><!-- /wp:media-text -->
\ No newline at end of file
+<!-- wp:group {"align":"wide","style":{"border":{"top":{"color":"var:preset|color|gray","style":"solid","width":"3px"},"right":{"color":"var:preset|color|gray","style":"solid","width":"3px"},"bottom":{"color":"var:preset|color|gray","style":"solid","width":"3px"},"left":{"color":"var:preset|color|gray","style":"solid","width":"3px"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignwide" style="border-top-color:var(--wp--preset--color--gray);border-top-style:solid;border-top-width:3px;border-right-color:var(--wp--preset--color--gray);border-right-style:solid;border-right-width:3px;border-bottom-color:var(--wp--preset--color--gray);border-bottom-style:solid;border-bottom-width:3px;border-left-color:var(--wp--preset--color--gray);border-left-style:solid;border-left-width:3px">
+<!-- wp:media-text {"mediaId":1752,"mediaLink":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/playing-in-the-sand.jpg","mediaType":"image"} -->
+	<div class="wp-block-media-text alignwide is-stacked-on-mobile">
+		<figure class="wp-block-media-text__media"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/playing-in-the-sand.jpg" alt="<?php esc_attr_e( '&#8220;Playing in the Sand&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>" class="wp-image-1752"/></figure><div class="wp-block-media-text__content">
+			<!-- wp:heading {"align":"center"} --><h2 class="has-text-align-center"><?php esc_html_e( 'Playing in the Sand', 'tt1-blocks' ); ?></h2><!-- /wp:heading -->
+			<!-- wp:separator {"className":"is-style-dots"} --><hr class="wp-block-separator is-style-dots"/>
+			<!-- /wp:separator -->
+			<!-- wp:paragraph {"align":"center","fontSize":"small"} -->
+			<p class="has-text-align-center has-small-font-size"><?php echo wp_kses_post( __( 'Berthe Morisot<br>(French, 1841-1895)', 'tt1-blocks' ) ); ?></p><!-- /wp:paragraph -->
+		</div>
+	</div><!-- /wp:media-text -->
+</div>
+<!-- /wp:group -->
\ No newline at end of file
diff --git a/tt1-blocks/readme.txt b/tt1-blocks/readme.txt
index f030bdf1..07f3f726 100644
--- a/tt1-blocks/readme.txt
+++ b/tt1-blocks/readme.txt
@@ -1,7 +1,7 @@
 === TT1 Blocks ===
 Contributors: wordpressdotorg
 Requires at least: 5.6
-Tested up to: 5.8
+Tested up to: 6.2
 Requires PHP: 5.6
 Stable tag: 0.4.8
 License: GPLv2 or later
@@ -24,6 +24,10 @@ This theme is beta software, and is not meant for use on a production site. Bug
 5. From your admin panel, visit the Site Editor to customize your site.
 
 == Changelog ==
+
+= 1.0.0 =
+* Update to work with changes from WordPress 6.2 onwards
+
 = 0.4.8 =
 * Update for compatibility with Gutenberg v12.1
 
diff --git a/tt1-blocks/style.css b/tt1-blocks/style.css
index a13dd86a..0b7a84b3 100644
--- a/tt1-blocks/style.css
+++ b/tt1-blocks/style.css
@@ -4,10 +4,10 @@ Theme URI: https://github.com/WordPress/theme-experiments/tree/master/tt1-blocks
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: TT1 Blocks is an experimental block-based version of the Twenty Twenty-One theme. It is built to leverage the full-site editing functionality that is being built in the Gutenberg plugin. This theme is not meant for use on a production site.
-Requires at least: 5.6
+Requires at least: 6.2
 Tested up to: 5.8
 Requires PHP: 5.6
-Version: 0.4.8
+Version: 1.0.0
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: tt1-blocks