diff --git a/wp-content/themes/twentytwentytwo/assets/videos/birds.mp4 b/wp-content/themes/twentytwentytwo/assets/videos/birds.mp4
index b50ec5b4bb..2872b527bd 100644
Binary files a/wp-content/themes/twentytwentytwo/assets/videos/birds.mp4 and b/wp-content/themes/twentytwentytwo/assets/videos/birds.mp4 differ
diff --git a/wp-content/themes/twentytwentytwo/block-templates/page-home.html b/wp-content/themes/twentytwentytwo/block-templates/page-home.html
deleted file mode 100644
index 150e5e722f..0000000000
--- a/wp-content/themes/twentytwentytwo/block-templates/page-home.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- wp:template-part {"slug":"header-large-dark","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"right":"var(--wp--custom--spacing--small, 1.25rem)","left":"var(--wp--custom--spacing--small, 1.25rem)"}}}} -->
-<main class="wp-block-group" style="padding-right:var(--wp--custom--spacing--small, 1.25rem);padding-left:var(--wp--custom--spacing--small, 1.25rem)">
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","style":{"spacing":{"padding":{"top":"var(--wp--custom--spacing--large, 8rem)","right":"var(--wp--custom--spacing--small, 1.25rem)","left":"var(--wp--custom--spacing--small, 1.25rem)"}}},"layout":{"inherit":true}} /-->
diff --git a/wp-content/themes/twentytwentytwo/functions.php b/wp-content/themes/twentytwentytwo/functions.php
index c3726823e3..e69420d281 100644
--- a/wp-content/themes/twentytwentytwo/functions.php
+++ b/wp-content/themes/twentytwentytwo/functions.php
@@ -126,10 +126,10 @@ if ( ! function_exists( 'twentytwentytwo_preload_webfonts' ) ) :
 	/**
 	 * Preloads the main web font to improve performance.
 	 *
-	 * Only the main web font (font-style: normal) is preloaded here since that font is always relevant (e.g. it used
-	 * on every heading). The other font is only needed if there is any applicable content in italic style, and
-	 * therefore preloading it would in most cases regress performance when that font would otherwise not be loaded at
-	 * all.
+	 * Only the main web font (font-style: normal) is preloaded here since that font is always relevant (it is used
+	 * on every heading, for example). The other font is only needed if there is any applicable content in italic style,
+	 * and therefore preloading it would in most cases regress performance when that font would otherwise not be loaded
+	 * at all.
 	 *
 	 * @since Twenty Twenty-Two 1.0
 	 *
diff --git a/wp-content/themes/twentytwentytwo/block-template-parts/footer.html b/wp-content/themes/twentytwentytwo/parts/footer.html
similarity index 100%
rename from wp-content/themes/twentytwentytwo/block-template-parts/footer.html
rename to wp-content/themes/twentytwentytwo/parts/footer.html
diff --git a/wp-content/themes/twentytwentytwo/block-template-parts/header-large-dark.html b/wp-content/themes/twentytwentytwo/parts/header-large-dark.html
similarity index 100%
rename from wp-content/themes/twentytwentytwo/block-template-parts/header-large-dark.html
rename to wp-content/themes/twentytwentytwo/parts/header-large-dark.html
diff --git a/wp-content/themes/twentytwentytwo/block-template-parts/header-small-dark.html b/wp-content/themes/twentytwentytwo/parts/header-small-dark.html
similarity index 100%
rename from wp-content/themes/twentytwentytwo/block-template-parts/header-small-dark.html
rename to wp-content/themes/twentytwentytwo/parts/header-small-dark.html
diff --git a/wp-content/themes/twentytwentytwo/block-template-parts/header.html b/wp-content/themes/twentytwentytwo/parts/header.html
similarity index 100%
rename from wp-content/themes/twentytwentytwo/block-template-parts/header.html
rename to wp-content/themes/twentytwentytwo/parts/header.html
diff --git a/wp-content/themes/twentytwentytwo/style.css b/wp-content/themes/twentytwentytwo/style.css
index 53982de678..67944fc700 100644
--- a/wp-content/themes/twentytwentytwo/style.css
+++ b/wp-content/themes/twentytwentytwo/style.css
@@ -65,6 +65,14 @@ a:active {
 	padding: calc(.667em + 2px) calc(1.333em + 2px);
 }
 
-.wp-block-file a.wp-block-file__button:hover {
-	opacity: 1;
-}
+/*
+ * Button hover styles.
+ * Necessary until the following issue is resolved in Gutenberg:
+ * https://github.com/WordPress/gutenberg/issues/27075
+ */
+
+.wp-block-search__button:hover,
+.wp-block-file .wp-block-file__button:hover,
+.wp-block-button__link:hover {
+	opacity: 0.90;
+} 
diff --git a/wp-content/themes/twentytwentytwo/block-templates/404.html b/wp-content/themes/twentytwentytwo/templates/404.html
similarity index 100%
rename from wp-content/themes/twentytwentytwo/block-templates/404.html
rename to wp-content/themes/twentytwentytwo/templates/404.html
diff --git a/wp-content/themes/twentytwentytwo/block-templates/archive.html b/wp-content/themes/twentytwentytwo/templates/archive.html
similarity index 100%
rename from wp-content/themes/twentytwentytwo/block-templates/archive.html
rename to wp-content/themes/twentytwentytwo/templates/archive.html
diff --git a/wp-content/themes/twentytwentytwo/block-templates/blank.html b/wp-content/themes/twentytwentytwo/templates/blank.html
similarity index 100%
rename from wp-content/themes/twentytwentytwo/block-templates/blank.html
rename to wp-content/themes/twentytwentytwo/templates/blank.html
diff --git a/wp-content/themes/twentytwentytwo/block-templates/home.html b/wp-content/themes/twentytwentytwo/templates/home.html
similarity index 100%
rename from wp-content/themes/twentytwentytwo/block-templates/home.html
rename to wp-content/themes/twentytwentytwo/templates/home.html
diff --git a/wp-content/themes/twentytwentytwo/block-templates/index.html b/wp-content/themes/twentytwentytwo/templates/index.html
similarity index 100%
rename from wp-content/themes/twentytwentytwo/block-templates/index.html
rename to wp-content/themes/twentytwentytwo/templates/index.html
diff --git a/wp-content/themes/twentytwentytwo/block-templates/page-large-header.html b/wp-content/themes/twentytwentytwo/templates/page-large-header.html
similarity index 100%
rename from wp-content/themes/twentytwentytwo/block-templates/page-large-header.html
rename to wp-content/themes/twentytwentytwo/templates/page-large-header.html
diff --git a/wp-content/themes/twentytwentytwo/block-templates/page-no-separators.html b/wp-content/themes/twentytwentytwo/templates/page-no-separators.html
similarity index 100%
rename from wp-content/themes/twentytwentytwo/block-templates/page-no-separators.html
rename to wp-content/themes/twentytwentytwo/templates/page-no-separators.html
diff --git a/wp-content/themes/twentytwentytwo/block-templates/page.html b/wp-content/themes/twentytwentytwo/templates/page.html
similarity index 100%
rename from wp-content/themes/twentytwentytwo/block-templates/page.html
rename to wp-content/themes/twentytwentytwo/templates/page.html
diff --git a/wp-content/themes/twentytwentytwo/block-templates/single-no-separators.html b/wp-content/themes/twentytwentytwo/templates/single-no-separators.html
similarity index 100%
rename from wp-content/themes/twentytwentytwo/block-templates/single-no-separators.html
rename to wp-content/themes/twentytwentytwo/templates/single-no-separators.html
diff --git a/wp-content/themes/twentytwentytwo/block-templates/single.html b/wp-content/themes/twentytwentytwo/templates/single.html
similarity index 100%
rename from wp-content/themes/twentytwentytwo/block-templates/single.html
rename to wp-content/themes/twentytwentytwo/templates/single.html
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d283d2be6b..0338c2135a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.9-beta1-52334';
+$wp_version = '5.9-beta1-52335';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.