Merging upstream version 6.5+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

29 files changed, 30 insertions, 24 deletions

diff --git a/wp-content/themes/twentytwentytwo/assets/images/bird-on-black.jpg b/wp-content/themes/twentytwentytwo/assets/images/bird-on-black.jpg
index 684affb..15194fe 100644
--- a/wp-content/themes/twentytwentytwo/assets/images/bird-on-black.jpg
+++ b/wp-content/themes/twentytwentytwo/assets/images/bird-on-black.jpg
diff --git a/wp-content/themes/twentytwentytwo/assets/images/bird-on-gray.jpg b/wp-content/themes/twentytwentytwo/assets/images/bird-on-gray.jpg
index 4fde765..7f90926 100644
--- a/wp-content/themes/twentytwentytwo/assets/images/bird-on-gray.jpg
+++ b/wp-content/themes/twentytwentytwo/assets/images/bird-on-gray.jpg
diff --git a/wp-content/themes/twentytwentytwo/assets/images/bird-on-green.jpg b/wp-content/themes/twentytwentytwo/assets/images/bird-on-green.jpg
index f1b5505..86f6265 100644
--- a/wp-content/themes/twentytwentytwo/assets/images/bird-on-green.jpg
+++ b/wp-content/themes/twentytwentytwo/assets/images/bird-on-green.jpg
diff --git a/wp-content/themes/twentytwentytwo/assets/images/bird-on-salmon.jpg b/wp-content/themes/twentytwentytwo/assets/images/bird-on-salmon.jpg
index 727c70e..d854f6d 100644
--- a/wp-content/themes/twentytwentytwo/assets/images/bird-on-salmon.jpg
+++ b/wp-content/themes/twentytwentytwo/assets/images/bird-on-salmon.jpg
diff --git a/wp-content/themes/twentytwentytwo/assets/images/ducks.jpg b/wp-content/themes/twentytwentytwo/assets/images/ducks.jpg
index 6c65eb4..ff8c3a2 100644
--- a/wp-content/themes/twentytwentytwo/assets/images/ducks.jpg
+++ b/wp-content/themes/twentytwentytwo/assets/images/ducks.jpg
diff --git a/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-a.jpg b/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-a.jpg
index b533d0f..f2b0c1d 100644
--- a/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-a.jpg
+++ b/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-a.jpg
diff --git a/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-b.jpg b/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-b.jpg
index 9314e9f..78df7e7 100644
--- a/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-b.jpg
+++ b/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-b.jpg
diff --git a/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-c.jpg b/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-c.jpg
index 3797692..ffca803 100644
--- a/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-c.jpg
+++ b/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-c.jpg
diff --git a/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-salmon.jpg b/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-salmon.jpg
index 86731b9..2811480 100644
--- a/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-salmon.jpg
+++ b/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-salmon.jpg
diff --git a/wp-content/themes/twentytwentytwo/assets/images/icon-bird.jpg b/wp-content/themes/twentytwentytwo/assets/images/icon-bird.jpg
index dbfa90e..308cadc 100644
--- a/wp-content/themes/twentytwentytwo/assets/images/icon-bird.jpg
+++ b/wp-content/themes/twentytwentytwo/assets/images/icon-bird.jpg
diff --git a/wp-content/themes/twentytwentytwo/inc/block-patterns.php b/wp-content/themes/twentytwentytwo/inc/block-patterns.php
index ce5e331..f47e26e 100644
--- a/wp-content/themes/twentytwentytwo/inc/block-patterns.php
+++ b/wp-content/themes/twentytwentytwo/inc/block-patterns.php
@@ -14,11 +14,11 @@
  */
 function twentytwentytwo_register_block_patterns() {
 	$block_pattern_categories = array(
-		'featured' => array( 'label' => __( 'Featured', 'twentytwentytwo' ) ),
-		'footer'   => array( 'label' => __( 'Footers', 'twentytwentytwo' ) ),
-		'header'   => array( 'label' => __( 'Headers', 'twentytwentytwo' ) ),
-		'query'    => array( 'label' => __( 'Query', 'twentytwentytwo' ) ),
-		'pages'    => array( 'label' => __( 'Pages', 'twentytwentytwo' ) ),
+		'featured'              => array( 'label' => __( 'Featured', 'twentytwentytwo' ) ),
+		'footer'                => array( 'label' => __( 'Footers', 'twentytwentytwo' ) ),
+		'header'                => array( 'label' => __( 'Headers', 'twentytwentytwo' ) ),
+		'query'                 => array( 'label' => __( 'Query', 'twentytwentytwo' ) ),
+		'twentytwentytwo_pages' => array( 'label' => __( 'Pages', 'twentytwentytwo' ) ),
 	);
 
 	/**
diff --git a/wp-content/themes/twentytwentytwo/inc/patterns/page-about-large-image-and-buttons.php b/wp-content/themes/twentytwentytwo/inc/patterns/page-about-large-image-and-buttons.php
index 12d44e7..52dbd0e 100644
--- a/wp-content/themes/twentytwentytwo/inc/patterns/page-about-large-image-and-buttons.php
+++ b/wp-content/themes/twentytwentytwo/inc/patterns/page-about-large-image-and-buttons.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'About page with large image and buttons', 'twentytwentytwo' ),
-	'categories' => array( 'pages', 'buttons' ),
+	'categories' => array( 'twentytwentytwo_pages', 'buttons' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var(--wp--custom--spacing--small, 1.25rem)","bottom":"var(--wp--custom--spacing--small, 1.25rem)"}}},"layout":{"inherit":true}} -->
 					<div class="wp-block-group alignfull" style="padding-top:var(--wp--custom--spacing--small, 1.25rem);padding-bottom:var(--wp--custom--spacing--small, 1.25rem)"><!-- wp:image {"align":"wide","width":2100,"height":1260,"sizeSlug":"full","linkDestination":"none"} -->
 					<figure class="wp-block-image alignwide size-full is-resized"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/flight-path-on-gray-b.jpg" alt="" width="2100" height="1260"/></figure>
diff --git a/wp-content/themes/twentytwentytwo/inc/patterns/page-about-links-dark.php b/wp-content/themes/twentytwentytwo/inc/patterns/page-about-links-dark.php
index ccb0ec2..943524f 100644
--- a/wp-content/themes/twentytwentytwo/inc/patterns/page-about-links-dark.php
+++ b/wp-content/themes/twentytwentytwo/inc/patterns/page-about-links-dark.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'About page links (dark)', 'twentytwentytwo' ),
-	'categories' => array( 'pages', 'buttons' ),
+	'categories' => array( 'twentytwentytwo_pages', 'buttons' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"padding":{"top":"10rem","bottom":"10rem"}}},"backgroundColor":"primary","textColor":"background","layout":{"inherit":false,"contentSize":"400px"}} -->
 					<div class="wp-block-group alignfull has-background-color has-primary-background-color has-text-color has-background has-link-color" style="padding-top:10rem;padding-bottom:10rem;"><!-- wp:group -->
 					<div class="wp-block-group">
diff --git a/wp-content/themes/twentytwentytwo/inc/patterns/page-about-links.php b/wp-content/themes/twentytwentytwo/inc/patterns/page-about-links.php
index 997cf03..3cf2717 100644
--- a/wp-content/themes/twentytwentytwo/inc/patterns/page-about-links.php
+++ b/wp-content/themes/twentytwentytwo/inc/patterns/page-about-links.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'About page links', 'twentytwentytwo' ),
-	'categories' => array( 'pages', 'buttons' ),
+	'categories' => array( 'twentytwentytwo_pages', 'buttons' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"10rem","bottom":"10rem"}}},"layout":{"inherit":false,"contentSize":"400px"}} -->
 					<div class="wp-block-group alignfull" style="padding-top:10rem;padding-bottom:10rem;"><!-- wp:image {"align":"center","width":100,"height":100,"sizeSlug":"full","linkDestination":"none","className":"is-style-rounded"} -->
 					<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-full is-resized"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/icon-bird.jpg" alt="' . esc_attr__( 'Logo featuring a flying bird', 'twentytwentytwo' ) . '" width="100" height="100"/></figure></div>
diff --git a/wp-content/themes/twentytwentytwo/inc/patterns/page-about-media-left.php b/wp-content/themes/twentytwentytwo/inc/patterns/page-about-media-left.php
index ea80594..f5c769a 100644
--- a/wp-content/themes/twentytwentytwo/inc/patterns/page-about-media-left.php
+++ b/wp-content/themes/twentytwentytwo/inc/patterns/page-about-media-left.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'About page with media on the left', 'twentytwentytwo' ),
-	'categories' => array( 'pages' ),
+	'categories' => array( 'twentytwentytwo_pages' ),
 	'content'    => '<!-- wp:media-text {"align":"full","mediaType":"image","imageFill":true,"focalPoint":{"x":"0.63","y":"0.16"},"backgroundColor":"foreground","className":"alignfull is-image-fill has-background-color has-text-color has-background has-link-color"} -->
 					<div class="wp-block-media-text alignfull is-stacked-on-mobile is-image-fill has-background-color has-text-color has-background has-link-color has-foreground-background-color has-background"><figure class="wp-block-media-text__media" style="background-image:url(' . esc_url( get_template_directory_uri() ) . '/assets/images/bird-on-salmon.jpg);background-position:63% 16%"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/bird-on-salmon.jpg" alt="' . esc_attr__( 'Image of a bird on a branch', 'twentytwentytwo' ) . '"/></figure><div class="wp-block-media-text__content"><!-- wp:spacer {"height":32} -->
 					<div style="height:32px" aria-hidden="true" class="wp-block-spacer"></div>
diff --git a/wp-content/themes/twentytwentytwo/inc/patterns/page-about-media-right.php b/wp-content/themes/twentytwentytwo/inc/patterns/page-about-media-right.php
index 2493d5d..8f29115 100644
--- a/wp-content/themes/twentytwentytwo/inc/patterns/page-about-media-right.php
+++ b/wp-content/themes/twentytwentytwo/inc/patterns/page-about-media-right.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'About page with media on the right', 'twentytwentytwo' ),
-	'categories' => array( 'pages' ),
+	'categories' => array( 'twentytwentytwo_pages' ),
 	'content'    => '<!-- wp:media-text {"align":"full","mediaPosition":"right","mediaLink":"' . esc_url( get_template_directory_uri() ) . '/assets/images/bird-on-black.jpg","mediaType":"image","style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"foreground","textColor":"background"} -->
 				<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile has-background-color has-foreground-background-color has-text-color has-background has-link-color"><figure class="wp-block-media-text__media"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/bird-on-black.jpg" alt="' . esc_attr__( 'An image of a bird flying', 'twentytwentytwo' ) . '"/></figure><div class="wp-block-media-text__content"><!-- wp:spacer {"height":32} -->
 					<div style="height:32px" aria-hidden="true" class="wp-block-spacer"></div>
diff --git a/wp-content/themes/twentytwentytwo/inc/patterns/page-about-simple-dark.php b/wp-content/themes/twentytwentytwo/inc/patterns/page-about-simple-dark.php
index 131a48b..fe07159 100644
--- a/wp-content/themes/twentytwentytwo/inc/patterns/page-about-simple-dark.php
+++ b/wp-content/themes/twentytwentytwo/inc/patterns/page-about-simple-dark.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'Simple dark about page', 'twentytwentytwo' ),
-	'categories' => array( 'pages' ),
+	'categories' => array( 'twentytwentytwo_pages' ),
 	'content'    => '<!-- wp:cover {"overlayColor":"foreground","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full","style":{"spacing":{"padding":{"top":"max(1.25rem, 8vw)","right":"max(1.25rem, 8vw)","bottom":"max(1.25rem, 8vw)","left":"max(1.25rem, 8vw)"}}}} -->
 					<div class="wp-block-cover alignfull has-foreground-background-color has-background-dim" style="padding-top:max(1.25rem, 8vw);padding-right:max(1.25rem, 8vw);padding-bottom:max(1.25rem, 8vw);padding-left:max(1.25rem, 8vw);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right"},"overlayMenu":"always"} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
diff --git a/wp-content/themes/twentytwentytwo/inc/patterns/page-about-solid-color.php b/wp-content/themes/twentytwentytwo/inc/patterns/page-about-solid-color.php
index df8903d..6c07725 100644
--- a/wp-content/themes/twentytwentytwo/inc/patterns/page-about-solid-color.php
+++ b/wp-content/themes/twentytwentytwo/inc/patterns/page-about-solid-color.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'About page on solid color background', 'twentytwentytwo' ),
-	'categories' => array( 'pages' ),
+	'categories' => array( 'twentytwentytwo_pages' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"1.25rem","right":"1.25rem","bottom":"1.25rem","left":"1.25rem"}}}} -->
 					<div class="wp-block-group alignfull" style="padding-top:1.25rem;padding-right:1.25rem;padding-bottom:1.25rem;padding-left:1.25rem"><!-- wp:cover {"overlayColor":"secondary","minHeight":80,"minHeightUnit":"vh","isDark":false,"align":"full"} -->
 					<div class="wp-block-cover alignfull is-light" style="min-height:80vh"><span aria-hidden="true" class="has-secondary-background-color has-background-dim-100 wp-block-cover__gradient-background has-background-dim"></span><div class="wp-block-cover__inner-container"><!-- wp:group {"layout":{"inherit":false,"contentSize":"400px"}} -->
diff --git a/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-image-and-text.php b/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-image-and-text.php
index eec6e0d..20e08e0 100644
--- a/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-image-and-text.php
+++ b/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-image-and-text.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'Page layout with image and text', 'twentytwentytwo' ),
-	'categories' => array( 'pages' ),
+	'categories' => array( 'twentytwentytwo_pages' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var(--wp--custom--spacing--large, 8rem)","bottom":"2rem"}}},"layout":{"inherit":true}} -->
 				<div class="wp-block-group alignfull" style="padding-top:var(--wp--custom--spacing--large, 8rem);padding-bottom:2rem"><!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"clamp(4rem, 8vw, 7.5rem)","lineHeight":"1.15","fontWeight":"300"}}} -->
 					<h2 class="alignwide" style="font-size:clamp(4rem, 8vw, 7.5rem);font-weight:300;line-height:1.15">' . wp_kses_post( __( '<em>Watching Birds </em><br><em>in the Garden</em>', 'twentytwentytwo' ) ) . '</h2>
diff --git a/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-image-text-and-video.php b/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-image-text-and-video.php
index bfb4e6e..0ee87f1 100644
--- a/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-image-text-and-video.php
+++ b/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-image-text-and-video.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'Page layout with image, text and video', 'twentytwentytwo' ),
-	'categories' => array( 'pages' ),
+	'categories' => array( 'twentytwentytwo_pages' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var(--wp--custom--spacing--large, 8rem)","bottom":"var(--wp--custom--spacing--large, 8rem)"}}},"backgroundColor":"primary","textColor":"background"} -->
 					<div class="wp-block-group alignfull has-background-color has-primary-background-color has-text-color has-background" style="padding-top:var(--wp--custom--spacing--large, 8rem);padding-bottom:var(--wp--custom--spacing--large, 8rem)"><!-- wp:group {"layout":{"inherit":true}} -->
 					<div class="wp-block-group"><!-- wp:heading {"level":1,"align":"wide","style":{"typography":{"fontSize":"clamp(3rem, 6vw, 4.5rem)"}}} -->
diff --git a/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-two-columns.php b/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-two-columns.php
index 2a27dfe..b24c9c5 100644
--- a/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-two-columns.php
+++ b/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-two-columns.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'Page layout with two columns', 'twentytwentytwo' ),
-	'categories' => array( 'pages' ),
+	'categories' => array( 'twentytwentytwo_pages' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var(--wp--custom--spacing--large, 8rem)","bottom":"var(--wp--custom--spacing--large, 8rem)"}}},"layout":{"inherit":true}} -->
 					<div class="wp-block-group alignfull" style="padding-top:var(--wp--custom--spacing--large, 8rem);padding-bottom:var(--wp--custom--spacing--large, 8rem);"><!-- wp:heading {"level":1,"align":"wide","style":{"typography":{"fontSize":"clamp(4rem, 15vw, 12.5rem)","lineHeight":"1","fontWeight":"200"}}} -->
 					<h1 class="alignwide" style="font-size:clamp(4rem, 15vw, 12.5rem);font-weight:200;line-height:1">' . wp_kses_post( __( '<em>Goldfinch </em><br><em>&amp; Sparrow</em>', 'twentytwentytwo' ) ) . '</h1>
diff --git a/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-blog-posts-right.php b/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-blog-posts-right.php
index 1601925..070aef0 100644
--- a/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-blog-posts-right.php
+++ b/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-blog-posts-right.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'Blog posts with right sidebar', 'twentytwentytwo' ),
-	'categories' => array( 'pages' ),
+	'categories' => array( 'twentytwentytwo_pages' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var(--wp--custom--spacing--small, 1.25rem)","bottom":"var(--wp--custom--spacing--small, 1.25rem)"}}},"layout":{"inherit":true}} -->
 					<div class="wp-block-group alignfull" style="padding-top:var(--wp--custom--spacing--small, 1.25rem);padding-bottom:var(--wp--custom--spacing--small, 1.25rem)"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"2rem","top":"0px","right":"0px","left":"0px"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:0px;padding-right:0px;padding-bottom:2rem;padding-left:0px"><!-- wp:group {"layout":{"type":"flex"}} -->
diff --git a/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-blog-posts.php b/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-blog-posts.php
index c40b207..e535a81 100644
--- a/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-blog-posts.php
+++ b/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-blog-posts.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'Blog posts with left sidebar', 'twentytwentytwo' ),
-	'categories' => array( 'pages' ),
+	'categories' => array( 'twentytwentytwo_pages' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var(--wp--custom--spacing--small, 1.25rem)","bottom":"var(--wp--custom--spacing--small, 1.25rem)"}}},"layout":{"inherit":true}} -->
 					<div class="wp-block-group alignfull" style="padding-top:var(--wp--custom--spacing--small, 1.25rem);padding-bottom:var(--wp--custom--spacing--small, 1.25rem)"><!-- wp:columns {"align":"wide","style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"5%"},"elements":{"link":{"color":{"text":"var:preset|color|primary"}}}},"textColor":"primary"} -->
 					<div class="wp-block-columns alignwide has-primary-color has-text-color has-link-color" style="margin-top:0px;margin-bottom:0px"><!-- wp:column {"width":"33.33%"} -->
diff --git a/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-grid-posts.php b/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-grid-posts.php
index 3a4f037..b4aa6a5 100644
--- a/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-grid-posts.php
+++ b/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-grid-posts.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'Grid of posts with left sidebar', 'twentytwentytwo' ),
-	'categories' => array( 'pages' ),
+	'categories' => array( 'twentytwentytwo_pages' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var(--wp--custom--spacing--small, 1.25rem)","bottom":"var(--wp--custom--spacing--small, 1.25rem)"}}},"layout":{"inherit":true}} -->
 					<div class="wp-block-group alignfull" style="padding-top:var(--wp--custom--spacing--small, 1.25rem);padding-bottom:var(--wp--custom--spacing--small, 1.25rem)"><!-- wp:columns {"align":"wide","style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}}}} -->
 					<div class="wp-block-columns alignwide" style="margin-top:0px;margin-bottom:0px"><!-- wp:column {"width":"30%"} -->
diff --git a/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-poster.php b/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-poster.php
index bc744b1..9cbcef2 100644
--- a/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-poster.php
+++ b/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-poster.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'Poster with right sidebar', 'twentytwentytwo' ),
-	'categories' => array( 'pages' ),
+	'categories' => array( 'twentytwentytwo_pages' ),
 	'content'    => '<!-- wp:group {"align":"full","layout":{"inherit":true}} -->
 					<div class="wp-block-group alignfull"><!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":"5%"}}} -->
 					<div class="wp-block-columns alignwide"><!-- wp:column {"width":"70%"} -->
diff --git a/wp-content/themes/twentytwentytwo/readme.txt b/wp-content/themes/twentytwentytwo/readme.txt
index 9a3c25b..61bbb8f 100644
--- a/wp-content/themes/twentytwentytwo/readme.txt
+++ b/wp-content/themes/twentytwentytwo/readme.txt
@@ -1,9 +1,9 @@
 === Twenty Twenty-Two ===
 Contributors: wordpressdotorg
 Requires at least: 5.9
-Tested up to: 6.4
+Tested up to: 6.5
 Requires PHP: 5.6
-Stable tag: 1.6
+Stable tag: 1.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -17,6 +17,11 @@ Whether you’re building a single-page website, a blog, a business website, or
 
 == Changelog ==
 
+= 1.7 =
+* Released: April 2, 2024
+
+https://wordpress.org/documentation/article/twenty-twenty-two-changelog/#Version_1.7
+
 = 1.6 =
 * Released: November 7, 2023
 
@@ -54,7 +59,7 @@ https://wordpress.org/documentation/article/twenty-twenty-two-changelog/#Version
 
 == Copyright ==
 
-Twenty Twenty-Two WordPress Theme, 2021-2023 WordPress.org
+Twenty Twenty-Two WordPress Theme, 2021-2024 WordPress.org
 Twenty Twenty-Two is distributed under the terms of the GNU GPL.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/wp-content/themes/twentytwentytwo/screenshot.png b/wp-content/themes/twentytwentytwo/screenshot.png
index 9e8710c..0bba95b 100644
--- a/wp-content/themes/twentytwentytwo/screenshot.png
+++ b/wp-content/themes/twentytwentytwo/screenshot.png
diff --git a/wp-content/themes/twentytwentytwo/style.css b/wp-content/themes/twentytwentytwo/style.css
index 5190836..e1e26e9 100644
--- a/wp-content/themes/twentytwentytwo/style.css
+++ b/wp-content/themes/twentytwentytwo/style.css
@@ -5,9 +5,9 @@ Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: Built on a solidly designed foundation, Twenty Twenty-Two embraces the idea that everyone deserves a truly unique website. The theme’s subtle styles are inspired by the diversity and versatility of birds: its typography is lightweight yet strong, its color palette is drawn from nature, and its layout elements sit gently on the page. The true richness of Twenty Twenty-Two lies in its opportunity for customization. The theme is built to take advantage of the Site Editor features introduced in WordPress 5.9, which means that colors, typography, and the layout of every single page on your site can be customized to suit your vision. It also includes dozens of block patterns, opening the door to a wide range of professionally designed layouts in just a few clicks. Whether you’re building a single-page website, a blog, a business website, or a portfolio, Twenty Twenty-Two will help you create a site that is uniquely yours.
 Requires at least: 5.9
-Tested up to: 6.4
+Tested up to: 6.5
 Requires PHP: 5.6
-Version: 1.6
+Version: 1.7
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: twentytwentytwo
diff --git a/wp-content/themes/twentytwentytwo/theme.json b/wp-content/themes/twentytwentytwo/theme.json
index 41ffb72..ec9ff86 100644
--- a/wp-content/themes/twentytwentytwo/theme.json
+++ b/wp-content/themes/twentytwentytwo/theme.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/theme.json",
 	"version": 2,
 	"customTemplates": [
 		{