From 9de6fd98faa3d63b9170281eac33e361c9d091b8 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Fri, 8 Oct 2021 14:09:30 -0400
Subject: [PATCH 01/14] Add header block patterns

---
 block-template-parts/header.html              |  2 +-
 functions.php                                 |  5 ++-
 inc/block-patterns.php                        | 39 +++++++++++++++++++
 inc/patterns/header-default.php               | 21 ++++++++++
 inc/patterns/header-large-dark.php            | 29 ++++++++++++++
 .../header-logo-navigation-offset-tagline.php | 32 +++++++++++++++
 .../header-logo-navigation-social.php         | 22 +++++++++++
 inc/patterns/header-logo-navigation.php       | 16 ++++++++
 inc/patterns/header-stacked.php               | 26 +++++++++++++
 ...header-text-only-all-caps-with-tagline.php | 20 ++++++++++
 .../header-text-only-with-tagline.php         | 20 ++++++++++
 inc/patterns/header-text-only.php             | 16 ++++++++
 .../header-title-navigation-social.php        | 22 +++++++++++
 inc/patterns/header-with-tagline.php          | 24 ++++++++++++
 14 files changed, 292 insertions(+), 2 deletions(-)
 create mode 100644 inc/block-patterns.php
 create mode 100644 inc/patterns/header-default.php
 create mode 100644 inc/patterns/header-large-dark.php
 create mode 100644 inc/patterns/header-logo-navigation-offset-tagline.php
 create mode 100644 inc/patterns/header-logo-navigation-social.php
 create mode 100644 inc/patterns/header-logo-navigation.php
 create mode 100644 inc/patterns/header-stacked.php
 create mode 100644 inc/patterns/header-text-only-all-caps-with-tagline.php
 create mode 100644 inc/patterns/header-text-only-with-tagline.php
 create mode 100644 inc/patterns/header-text-only.php
 create mode 100644 inc/patterns/header-title-navigation-social.php
 create mode 100644 inc/patterns/header-with-tagline.php

diff --git a/block-template-parts/header.html b/block-template-parts/header.html
index 8b56b5e8..f68f1c0a 100644
--- a/block-template-parts/header.html
+++ b/block-template-parts/header.html
@@ -3,7 +3,7 @@
 <div class="wp-block-group">
 <!-- wp:site-logo {"width":64} /-->
 
-<!-- wp:site-title /--></div>
+<!-- wp:site-title {"style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /--></div>
 <!-- /wp:group -->
 
 <!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
diff --git a/functions.php b/functions.php
index 3b938d0a..acf55bfb 100644
--- a/functions.php
+++ b/functions.php
@@ -69,4 +69,7 @@ function twentytwentytwo_get_font_face_styles() {
 		}
 		";
 	}
-endif;
\ No newline at end of file
+endif;
+
+// Block patterns
+require get_template_directory() . '/inc/block-patterns.php';
\ No newline at end of file
diff --git a/inc/block-patterns.php b/inc/block-patterns.php
new file mode 100644
index 00000000..0f679f43
--- /dev/null
+++ b/inc/block-patterns.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Twenty Twenty-Two: Block Patterns
+ *
+ * @since 1.0
+ */
+
+if ( ! function_exists( 'twentytwentytwo_register_block_patterns' ) ) :
+	function twentytwentytwo_register_block_patterns() {
+		if ( function_exists( 'register_block_pattern_category' ) ) {
+			register_block_pattern_category(
+				'twentytwentytwo-headers',
+				array( 'label' => __( 'Twenty Twenty-Two Headers', 'twentytwentytwo' ) )
+			);
+		}
+		if ( function_exists( 'register_block_pattern' ) ) {
+			$block_patterns = array(
+				'header-default',
+				'header-with-tagline',
+				'header-text-only',
+				'header-text-only-with-tagline',
+				'header-text-only-all-caps-with-tagline',
+				'header-logo-navigation',
+				'header-logo-navigation-social',
+				'header-logo-navigation-offset-tagline',
+				'header-stacked',
+				'header-large-dark'
+			);
+
+			foreach ( $block_patterns as $block_pattern ) {
+				register_block_pattern(
+					'twentytwentytwo/' . $block_pattern,
+					require __DIR__ . '/patterns/' . $block_pattern . '.php'
+				);
+			}
+		}
+	}
+endif;
+add_action( 'init', 'twentytwentytwo_register_block_patterns', 9 );
\ No newline at end of file
diff --git a/inc/patterns/header-default.php b/inc/patterns/header-default.php
new file mode 100644
index 00000000..0a69ef01
--- /dev/null
+++ b/inc/patterns/header-default.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Default Header block pattern
+ */
+return array(
+	'title'       => __( 'Default Header', 'twentytwentytwo' ),
+	'categories'  => array( 'twentytwentytwo-headers' ),
+	'blockTypes' => array( 'core/template-part/header' ),
+	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex"}} -->
+					<div class="wp-block-group">
+					<!-- wp:site-logo {"width":64} /-->
+
+					<!-- wp:site-title {"style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /--></div>
+					<!-- /wp:group -->
+
+					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+					<!-- /wp:navigation --></div>
+					<!-- /wp:group -->'
+);
\ No newline at end of file
diff --git a/inc/patterns/header-large-dark.php b/inc/patterns/header-large-dark.php
new file mode 100644
index 00000000..58aca0e3
--- /dev/null
+++ b/inc/patterns/header-large-dark.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Large Header block pattern
+ */
+return array(
+	'title'       => __( 'Large Header', 'twentytwentytwo' ),
+	'categories'  => array( 'twentytwentytwo-headers' ),
+	'blockTypes' => array( 'core/template-part/header' ),
+	'content'     => '<!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"padding":{"top":"0px","right":"max(1.25rem, 5vw)","bottom":"max(1.25rem, 5vw)","left":"max(1.25rem, 5vw)"}}},"backgroundColor":"foreground","textColor":"background","layout":{"inherit":true}} -->
+					<div class="wp-block-group has-background-color has-foreground-background-color has-text-color has-background has-link-color" style="padding-top:0px;padding-right:max(1.25rem, 5vw);padding-bottom:max(1.25rem, 5vw);padding-left:max(1.25rem, 5vw)"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex"}} -->
+					<div class="wp-block-group">
+					<!-- wp:site-logo {"width":64} /-->
+
+					<!-- wp:site-title {"style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /--></div>
+					<!-- /wp:group -->
+
+					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+					<!-- /wp:navigation --></div>
+					<!-- /wp:group -->
+
+					<!-- wp:columns {"align":"wide"} -->
+					<div class="wp-block-columns alignwide"><!-- wp:column -->
+					<div class="wp-block-column"><!-- wp:site-tagline {"style":{"typography":{"fontFamily":"var:preset|font-family|source-serif-pro","fontWeight":"300","fontSize":"clamp(4rem, 8vw, 6.25rem)","lineHeight":"1.15"}}} /--></div>
+					<!-- /wp:column --></div>
+					<!-- /wp:columns --></div>
+					<!-- /wp:group -->'
+);
\ No newline at end of file
diff --git a/inc/patterns/header-logo-navigation-offset-tagline.php b/inc/patterns/header-logo-navigation-offset-tagline.php
new file mode 100644
index 00000000..fdd253eb
--- /dev/null
+++ b/inc/patterns/header-logo-navigation-offset-tagline.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Logo, Navigation, and offset Tagline Header block pattern
+ */
+return array(
+	'title'       => __( 'Logo, Navigation, and offset Tagline Header', 'twentytwentytwo' ),
+	'categories'  => array( 'twentytwentytwo-headers' ),
+	'blockTypes' => array( 'core/template-part/header' ),
+	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem"}}}} -->
+					<div class="wp-block-group alignwide" style="padding-bottom:8rem"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw)"><!-- wp:site-logo {"width":64} /-->
+
+					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+					<!-- /wp:navigation --></div>
+					<!-- /wp:group -->
+
+					<!-- wp:columns {"isStackedOnMobile":false,"align":"wide"} -->
+					<div class="wp-block-columns alignwide is-not-stacked-on-mobile"><!-- wp:column {"width":"64px"} -->
+					<div class="wp-block-column" style="flex-basis:64px"></div>
+					<!-- /wp:column -->
+
+					<!-- wp:column {"width":"380px"} -->
+					<div class="wp-block-column" style="flex-basis:380px"><!-- wp:site-tagline {"fontSize":"small"} /--></div>
+					<!-- /wp:column --></div>
+					<!-- /wp:columns -->
+
+					<!-- wp:paragraph -->
+					<p></p>
+					<!-- /wp:paragraph --></div>
+					<!-- /wp:group -->'
+);
\ No newline at end of file
diff --git a/inc/patterns/header-logo-navigation-social.php b/inc/patterns/header-logo-navigation-social.php
new file mode 100644
index 00000000..38d0b437
--- /dev/null
+++ b/inc/patterns/header-logo-navigation-social.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Logo, Navigation, and Social Links Header block pattern
+ */
+return array(
+	'title'       => __( 'Logo, Navigation, and Social Links Header', 'twentytwentytwo' ),
+	'categories'  => array( 'twentytwentytwo-headers' ),
+	'blockTypes' => array( 'core/template-part/header' ),
+	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"width":64} /-->
+
+					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+
+					<!-- wp:social-links {"iconColor":"foreground","iconColorValue":"#000000","className":"is-style-logos-only"} -->
+					<ul class="wp-block-social-links has-icon-color is-style-logos-only"><!-- wp:social-link {"url":"#","service":"instagram"} /-->
+
+					<!-- wp:social-link {"url":"#","service":"twitter"} /--></ul>
+					<!-- /wp:social-links -->
+					<!-- /wp:navigation --></div>
+					<!-- /wp:group -->'
+);
\ No newline at end of file
diff --git a/inc/patterns/header-logo-navigation.php b/inc/patterns/header-logo-navigation.php
new file mode 100644
index 00000000..f384773f
--- /dev/null
+++ b/inc/patterns/header-logo-navigation.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Logo and Navigation Header
+ */
+return array(
+	'title'       => __( 'Logo and Navigation Header', 'twentytwentytwo' ),
+	'categories'  => array( 'twentytwentytwo-headers' ),
+	'blockTypes' => array( 'core/template-part/header' ),
+	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"width":64} /-->
+
+					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+					<!-- /wp:navigation --></div>
+					<!-- /wp:group -->'
+);
\ No newline at end of file
diff --git a/inc/patterns/header-stacked.php b/inc/patterns/header-stacked.php
new file mode 100644
index 00000000..28709899
--- /dev/null
+++ b/inc/patterns/header-stacked.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Logo and Navigation Header block pattern
+ */
+return array(
+	'title'       => __( 'Logo and Navigation Header', 'twentytwentytwo' ),
+	'categories'  => array( 'twentytwentytwo-headers' ),
+	'blockTypes' => array( 'core/template-part/header' ),
+	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"align":"center","width":128} /-->
+
+					<!-- wp:spacer {"height":10} -->
+					<div style="height:10px" aria-hidden="true" class="wp-block-spacer"></div>
+					<!-- /wp:spacer -->
+
+					<!-- wp:site-title {"textAlign":"center","style":{"typography":{"fontStyle":"normal","fontWeight":"400","textTransform":"uppercase"}}} /-->
+
+					<!-- wp:spacer {"height":10} -->
+					<div style="height:10px" aria-hidden="true" class="wp-block-spacer"></div>
+					<!-- /wp:spacer -->
+
+					<!-- wp:navigation {"itemsJustification":"center","isResponsive":true} -->
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+					<!-- /wp:navigation --></div>
+					<!-- /wp:group -->'
+);
\ No newline at end of file
diff --git a/inc/patterns/header-text-only-all-caps-with-tagline.php b/inc/patterns/header-text-only-all-caps-with-tagline.php
new file mode 100644
index 00000000..521a4263
--- /dev/null
+++ b/inc/patterns/header-text-only-all-caps-with-tagline.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Text-only Header with Tagline and all-caps Title block pattern
+ */
+return array(
+	'title'       => __( 'Text-only Header with Tagline and all-caps Title', 'twentytwentytwo' ),
+	'categories'  => array( 'twentytwentytwo-headers' ),
+	'blockTypes' => array( 'core/template-part/header' ),
+	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex","justifyContent":"left"}} -->
+					<div class="wp-block-group"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}}} /-->
+
+					<!-- wp:site-tagline {"fontSize":"small","style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /--></div>
+					<!-- /wp:group -->
+
+					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+					<!-- /wp:navigation --></div>
+					<!-- /wp:group -->'
+);
\ No newline at end of file
diff --git a/inc/patterns/header-text-only-with-tagline.php b/inc/patterns/header-text-only-with-tagline.php
new file mode 100644
index 00000000..b2b4b0c3
--- /dev/null
+++ b/inc/patterns/header-text-only-with-tagline.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Text-only Header with Tagline block pattern
+ */
+return array(
+	'title'       => __( 'Text-only Header with Tagline', 'twentytwentytwo' ),
+	'categories'  => array( 'twentytwentytwo-headers' ),
+	'blockTypes' => array( 'core/template-part/header' ),
+	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex","justifyContent":"left"}} -->
+					<div class="wp-block-group"><!-- wp:site-title {"style":{"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
+
+					<!-- wp:site-tagline {"fontSize":"small","style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /--></div>
+					<!-- /wp:group -->
+
+					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+					<!-- /wp:navigation --></div>
+					<!-- /wp:group -->'
+);
\ No newline at end of file
diff --git a/inc/patterns/header-text-only.php b/inc/patterns/header-text-only.php
new file mode 100644
index 00000000..6cafb3eb
--- /dev/null
+++ b/inc/patterns/header-text-only.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Text-only Header block pattern
+ */
+return array(
+	'title'       => __( 'Text-only Header', 'twentytwentytwo' ),
+	'categories'  => array( 'twentytwentytwo-headers' ),
+	'blockTypes' => array( 'core/template-part/header' ),
+	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /-->
+
+					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+					<!-- /wp:navigation --></div>
+					<!-- /wp:group -->'
+);
\ No newline at end of file
diff --git a/inc/patterns/header-title-navigation-social.php b/inc/patterns/header-title-navigation-social.php
new file mode 100644
index 00000000..224751b2
--- /dev/null
+++ b/inc/patterns/header-title-navigation-social.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Title, Navigation, and Social Links Header block pattern
+ */
+return array(
+	'title'       => __( 'Title, Navigation, and Social Links Header', 'twentytwentytwo' ),
+	'categories'  => array( 'twentytwentytwo-headers' ),
+	'blockTypes' => array( 'core/template-part/header' ),
+	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /-->
+
+					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+
+					<!-- wp:social-links {"iconColor":"foreground","iconColorValue":"#000000","className":"is-style-logos-only"} -->
+					<ul class="wp-block-social-links has-icon-color is-style-logos-only"><!-- wp:social-link {"url":"#","service":"instagram"} /-->
+
+					<!-- wp:social-link {"url":"#","service":"twitter"} /--></ul>
+					<!-- /wp:social-links -->
+					<!-- /wp:navigation --></div>
+					<!-- /wp:group -->'
+);
\ No newline at end of file
diff --git a/inc/patterns/header-with-tagline.php b/inc/patterns/header-with-tagline.php
new file mode 100644
index 00000000..59f91925
--- /dev/null
+++ b/inc/patterns/header-with-tagline.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Header with Tagline block pattern
+ */
+return array(
+	'title'       => __( 'Header with Tagline', 'twentytwentytwo' ),
+	'categories'  => array( 'twentytwentytwo-headers' ),
+	'blockTypes' => array( 'core/template-part/header' ),
+	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex"}} -->
+					<div class="wp-block-group"><!-- wp:site-logo {"width":64} /-->
+
+					<!-- wp:group -->
+					<div class="wp-block-group"><!-- wp:site-title {"style":{"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
+
+					<!-- wp:site-tagline {"fontSize":"small","style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /--></div>
+					<!-- /wp:group --></div>
+					<!-- /wp:group -->
+
+					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+					<!-- /wp:navigation --></div>
+					<!-- /wp:group -->'
+);
\ No newline at end of file

From f69b1fc3efac1097fd23911b97af0a3ae99caa91 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Fri, 8 Oct 2021 14:33:25 -0400
Subject: [PATCH 02/14] Remove empty paragraph block.

---
 inc/patterns/header-logo-navigation-offset-tagline.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/inc/patterns/header-logo-navigation-offset-tagline.php b/inc/patterns/header-logo-navigation-offset-tagline.php
index fdd253eb..2823dd38 100644
--- a/inc/patterns/header-logo-navigation-offset-tagline.php
+++ b/inc/patterns/header-logo-navigation-offset-tagline.php
@@ -23,10 +23,6 @@
 					<!-- wp:column {"width":"380px"} -->
 					<div class="wp-block-column" style="flex-basis:380px"><!-- wp:site-tagline {"fontSize":"small"} /--></div>
 					<!-- /wp:column --></div>
-					<!-- /wp:columns -->
-
-					<!-- wp:paragraph -->
-					<p></p>
-					<!-- /wp:paragraph --></div>
+					<!-- /wp:columns --></div>
 					<!-- /wp:group -->'
 );
\ No newline at end of file

From 7ccc96d19c6769ce3c35b36c6ab3e5ebeebb5892 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Fri, 8 Oct 2021 14:34:17 -0400
Subject: [PATCH 03/14] Register title nav social pattern.

---
 inc/block-patterns.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/block-patterns.php b/inc/block-patterns.php
index 0f679f43..06f49a2e 100644
--- a/inc/block-patterns.php
+++ b/inc/block-patterns.php
@@ -22,6 +22,7 @@ function twentytwentytwo_register_block_patterns() {
 				'header-text-only-all-caps-with-tagline',
 				'header-logo-navigation',
 				'header-logo-navigation-social',
+				'header-title-navigation-social',
 				'header-logo-navigation-offset-tagline',
 				'header-stacked',
 				'header-large-dark'

From dee270bc105b9c674fc695effa6e3478929f4927 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Fri, 8 Oct 2021 14:47:20 -0400
Subject: [PATCH 04/14] Add text-only header with stacked tagline.

---
 inc/block-patterns.php                        |  1 +
 .../header-text-only-with-stacked-tagline.php | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 inc/patterns/header-text-only-with-stacked-tagline.php

diff --git a/inc/block-patterns.php b/inc/block-patterns.php
index 06f49a2e..c34a18a3 100644
--- a/inc/block-patterns.php
+++ b/inc/block-patterns.php
@@ -19,6 +19,7 @@ function twentytwentytwo_register_block_patterns() {
 				'header-with-tagline',
 				'header-text-only',
 				'header-text-only-with-tagline',
+				'header-text-only-stacked-tagline'
 				'header-text-only-all-caps-with-tagline',
 				'header-logo-navigation',
 				'header-logo-navigation-social',
diff --git a/inc/patterns/header-text-only-with-stacked-tagline.php b/inc/patterns/header-text-only-with-stacked-tagline.php
new file mode 100644
index 00000000..5e8007a5
--- /dev/null
+++ b/inc/patterns/header-text-only-with-stacked-tagline.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Text-only Header with stacked Tagline block pattern
+ */
+return array(
+	'title'       => __( 'Text-only Header with stacked Tagline', 'twentytwentytwo' ),
+	'categories'  => array( 'twentytwentytwo-headers' ),
+	'blockTypes' => array( 'core/template-part/header' ),
+	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group -->
+					<div class="wp-block-group"><!-- wp:site-title {"style":{"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
+
+					<!-- wp:site-tagline {"fontSize":"small","style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /--></div>
+					<!-- /wp:group -->
+
+					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+					<!-- /wp:navigation --></div>
+					<!-- /wp:group -->'
+);
\ No newline at end of file

From e9589568cbc7058bdc95f94274cffc5c7a79ad51 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Fri, 8 Oct 2021 14:47:45 -0400
Subject: [PATCH 05/14] Fix pattern slug.

---
 inc/block-patterns.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/block-patterns.php b/inc/block-patterns.php
index c34a18a3..dbb5a471 100644
--- a/inc/block-patterns.php
+++ b/inc/block-patterns.php
@@ -19,7 +19,7 @@ function twentytwentytwo_register_block_patterns() {
 				'header-with-tagline',
 				'header-text-only',
 				'header-text-only-with-tagline',
-				'header-text-only-stacked-tagline'
+				'header-text-only-with-stacked-tagline'
 				'header-text-only-all-caps-with-tagline',
 				'header-logo-navigation',
 				'header-logo-navigation-social',

From 6963f759d99dda17a999f57399b3807465261385 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Fri, 8 Oct 2021 14:50:21 -0400
Subject: [PATCH 06/14] Reorder patterns, add missing comma.

---
 inc/block-patterns.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/block-patterns.php b/inc/block-patterns.php
index dbb5a471..747e0457 100644
--- a/inc/block-patterns.php
+++ b/inc/block-patterns.php
@@ -17,9 +17,9 @@ function twentytwentytwo_register_block_patterns() {
 			$block_patterns = array(
 				'header-default',
 				'header-with-tagline',
+				'header-text-only-with-stacked-tagline',
 				'header-text-only',
 				'header-text-only-with-tagline',
-				'header-text-only-with-stacked-tagline'
 				'header-text-only-all-caps-with-tagline',
 				'header-logo-navigation',
 				'header-logo-navigation-social',

From 65da3c170eb8465c76a4949f91b43fb3379c4dbc Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Fri, 8 Oct 2021 15:27:46 -0400
Subject: [PATCH 07/14] Use preset color variables for the social links block.

---
 inc/patterns/header-logo-navigation-social.php  | 2 +-
 inc/patterns/header-title-navigation-social.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/patterns/header-logo-navigation-social.php b/inc/patterns/header-logo-navigation-social.php
index 38d0b437..ae573f48 100644
--- a/inc/patterns/header-logo-navigation-social.php
+++ b/inc/patterns/header-logo-navigation-social.php
@@ -12,7 +12,7 @@
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 
-					<!-- wp:social-links {"iconColor":"foreground","iconColorValue":"#000000","className":"is-style-logos-only"} -->
+					<!-- wp:social-links {"iconColor":"foreground","iconColorValue":"var(--wp--preset--color--foreground)","className":"is-style-logos-only"} -->
 					<ul class="wp-block-social-links has-icon-color is-style-logos-only"><!-- wp:social-link {"url":"#","service":"instagram"} /-->
 
 					<!-- wp:social-link {"url":"#","service":"twitter"} /--></ul>
diff --git a/inc/patterns/header-title-navigation-social.php b/inc/patterns/header-title-navigation-social.php
index 224751b2..9c300c06 100644
--- a/inc/patterns/header-title-navigation-social.php
+++ b/inc/patterns/header-title-navigation-social.php
@@ -12,7 +12,7 @@
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 
-					<!-- wp:social-links {"iconColor":"foreground","iconColorValue":"#000000","className":"is-style-logos-only"} -->
+					<!-- wp:social-links {"iconColor":"foreground","iconColorValue":"var(--wp--preset--color--foreground)","className":"is-style-logos-only"} -->
 					<ul class="wp-block-social-links has-icon-color is-style-logos-only"><!-- wp:social-link {"url":"#","service":"instagram"} /-->
 
 					<!-- wp:social-link {"url":"#","service":"twitter"} /--></ul>

From b047708ed24e70393550422aff69433f9980f85a Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 11 Oct 2021 08:14:49 -0400
Subject: [PATCH 08/14] Tidy up margin for stacked title/tagline patterns.

---
 inc/patterns/header-text-only-with-stacked-tagline.php | 4 ++--
 inc/patterns/header-with-tagline.php                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/inc/patterns/header-text-only-with-stacked-tagline.php b/inc/patterns/header-text-only-with-stacked-tagline.php
index 5e8007a5..bcc64092 100644
--- a/inc/patterns/header-text-only-with-stacked-tagline.php
+++ b/inc/patterns/header-text-only-with-stacked-tagline.php
@@ -8,9 +8,9 @@
 	'blockTypes' => array( 'core/template-part/header' ),
 	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group -->
-					<div class="wp-block-group"><!-- wp:site-title {"style":{"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
+					<div class="wp-block-group"><!-- wp:site-title {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}},"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
 
-					<!-- wp:site-tagline {"fontSize":"small","style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /--></div>
+					<!-- wp:site-tagline {"style":{"spacing":{"margin":{"top":"0.25em","bottom":"0px"}},"typography":{"fontStyle":"italic","fontWeight":"400"}},"fontSize":"small"} /--></div>
 					<!-- /wp:group -->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
diff --git a/inc/patterns/header-with-tagline.php b/inc/patterns/header-with-tagline.php
index 59f91925..83a9e34d 100644
--- a/inc/patterns/header-with-tagline.php
+++ b/inc/patterns/header-with-tagline.php
@@ -11,9 +11,9 @@
 					<div class="wp-block-group"><!-- wp:site-logo {"width":64} /-->
 
 					<!-- wp:group -->
-					<div class="wp-block-group"><!-- wp:site-title {"style":{"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
+					<div class="wp-block-group"><!-- wp:site-title {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}},"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
 
-					<!-- wp:site-tagline {"fontSize":"small","style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /--></div>
+					<!-- wp:site-tagline {"style":{"spacing":{"margin":{"top":"0.25em","bottom":"0px"}},"typography":{"fontStyle":"italic","fontWeight":"400"}},"fontSize":"small"} /--></div>
 					<!-- /wp:group --></div>
 					<!-- /wp:group -->
 

From bcbdc329107a8d2bc8bc08e9ef4bfeceb78f045e Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 11 Oct 2021 10:06:38 -0400
Subject: [PATCH 09/14] Add additional patterns.

---
 inc/block-patterns.php                        |  6 +++-
 .../header-centered-logo-in-navigation.php    | 18 +++++++++++
 inc/patterns/header-centered-logo.php         | 26 ++++++++++++++++
 ...eader-centered-title-navigation-social.php | 30 +++++++++++++++++++
 inc/patterns/header-title-and-button.php      | 16 ++++++++++
 5 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 inc/patterns/header-centered-logo-in-navigation.php
 create mode 100644 inc/patterns/header-centered-logo.php
 create mode 100644 inc/patterns/header-centered-title-navigation-social.php
 create mode 100644 inc/patterns/header-title-and-button.php

diff --git a/inc/block-patterns.php b/inc/block-patterns.php
index 747e0457..c25e0404 100644
--- a/inc/block-patterns.php
+++ b/inc/block-patterns.php
@@ -26,7 +26,11 @@ function twentytwentytwo_register_block_patterns() {
 				'header-title-navigation-social',
 				'header-logo-navigation-offset-tagline',
 				'header-stacked',
-				'header-large-dark'
+				'header-large-dark',
+				'header-centered-logo',
+				'header-centered-logo-in-navigation',
+				'header-centered-title-navigation-social',
+				'header-title-and-button'
 			);
 
 			foreach ( $block_patterns as $block_pattern ) {
diff --git a/inc/patterns/header-centered-logo-in-navigation.php b/inc/patterns/header-centered-logo-in-navigation.php
new file mode 100644
index 00000000..1601e2ed
--- /dev/null
+++ b/inc/patterns/header-centered-logo-in-navigation.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Header with centered Logo in Navigation block pattern
+ */
+return array(
+	'title'       => __( 'Header with centered Logo in Navigation', 'twentytwentytwo' ),
+	'categories'  => array( 'twentytwentytwo-headers' ),
+	'blockTypes' => array( 'core/template-part/header' ),
+	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"center"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+
+					<!-- wp:site-logo {"width":90} /-->
+
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+					<!-- /wp:navigation --></div>
+					<!-- /wp:group -->'
+);
\ No newline at end of file
diff --git a/inc/patterns/header-centered-logo.php b/inc/patterns/header-centered-logo.php
new file mode 100644
index 00000000..43d6b8af
--- /dev/null
+++ b/inc/patterns/header-centered-logo.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Header with centered Logo block pattern
+ */
+return array(
+	'title'       => __( 'Header with centered Logo', 'twentytwentytwo' ),
+	'categories'  => array( 'twentytwentytwo-headers' ),
+	'blockTypes' => array( 'core/template-part/header' ),
+	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:columns {"verticalAlignment":"center"} -->
+					<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center"} -->
+					<div class="wp-block-column is-vertically-aligned-center"><!-- wp:site-title {"style":{"typography":{"fontStyle":"normal","fontWeight":"400","textTransform":"uppercase"}}} /--></div>
+					<!-- /wp:column -->
+
+					<!-- wp:column {"width":"64px"} -->
+					<div class="wp-block-column" style="flex-basis:64px"><!-- wp:site-logo {"width":64} /--></div>
+					<!-- /wp:column -->
+
+					<!-- wp:column {"verticalAlignment":"center"} -->
+					<div class="wp-block-column is-vertically-aligned-center"><!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+					<!-- /wp:navigation --></div>
+					<!-- /wp:column --></div>
+					<!-- /wp:columns --></div>
+					<!-- /wp:group -->'
+);
\ No newline at end of file
diff --git a/inc/patterns/header-centered-title-navigation-social.php b/inc/patterns/header-centered-title-navigation-social.php
new file mode 100644
index 00000000..a067a8ed
--- /dev/null
+++ b/inc/patterns/header-centered-title-navigation-social.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Centered title with Navigation and Social Links Header block pattern
+ */
+return array(
+	'title'       => __( 'Centered title with Navigation and Social Links Header', 'twentytwentytwo' ),
+	'categories'  => array( 'twentytwentytwo-headers' ),
+	'blockTypes' => array( 'core/template-part/header' ),
+	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:columns {"verticalAlignment":"center"} -->
+					<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center"} -->
+					<div class="wp-block-column is-vertically-aligned-center"><!-- wp:navigation {"itemsJustification":"left","isResponsive":true} -->
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+					<!-- /wp:navigation --></div>
+					<!-- /wp:column -->
+
+					<!-- wp:column {"width":""} -->
+					<div class="wp-block-column"><!-- wp:site-title {"textAlign":"center","style":{"typography":{"textTransform":"uppercase","fontStyle":"normal","fontWeight":"700"}}} /--></div>
+					<!-- /wp:column -->
+
+					<!-- wp:column {"verticalAlignment":"center"} -->
+					<div class="wp-block-column is-vertically-aligned-center"><!-- wp:social-links {"iconColor":"foreground","iconColorValue":"var(--wp--preset--color--foreground)","className":"is-style-logos-only","layout":{"type":"flex","justifyContent":"right"}} -->
+					<ul class="wp-block-social-links has-icon-color is-style-logos-only"><!-- wp:social-link {"url":"#","service":"twitter"} /-->
+
+					<!-- wp:social-link {"url":"#","service":"instagram"} /--></ul>
+					<!-- /wp:social-links --></div>
+					<!-- /wp:column --></div>
+					<!-- /wp:columns --></div>
+					<!-- /wp:group -->'
+);
\ No newline at end of file
diff --git a/inc/patterns/header-title-and-button.php b/inc/patterns/header-title-and-button.php
new file mode 100644
index 00000000..c9e4b58b
--- /dev/null
+++ b/inc/patterns/header-title-and-button.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Title and Button Header block pattern
+ */
+return array(
+	'title'       => __( 'Title and Button Header', 'twentytwentytwo' ),
+	'categories'  => array( 'twentytwentytwo-headers' ),
+	'blockTypes' => array( 'core/template-part/header' ),
+	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}},"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
+
+					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
+					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+					<!-- /wp:navigation --></div>
+					<!-- /wp:group -->'
+);
\ No newline at end of file

From b63766f1ae7cf374de18bbbc0f0aee66737015b6 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 11 Oct 2021 10:25:05 -0400
Subject: [PATCH 10/14] Fix PHPCS errors.

---
 inc/block-patterns.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/block-patterns.php b/inc/block-patterns.php
index c25e0404..657ac885 100644
--- a/inc/block-patterns.php
+++ b/inc/block-patterns.php
@@ -30,7 +30,7 @@ function twentytwentytwo_register_block_patterns() {
 				'header-centered-logo',
 				'header-centered-logo-in-navigation',
 				'header-centered-title-navigation-social',
-				'header-title-and-button'
+				'header-title-and-button',
 			);
 
 			foreach ( $block_patterns as $block_pattern ) {
@@ -42,4 +42,4 @@ function twentytwentytwo_register_block_patterns() {
 		}
 	}
 endif;
-add_action( 'init', 'twentytwentytwo_register_block_patterns', 9 );
\ No newline at end of file
+add_action( 'init', 'twentytwentytwo_register_block_patterns', 9 );

From 060b0fae1be720a0aa90c6856ad6bb218ab7eeb7 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 11 Oct 2021 10:31:39 -0400
Subject: [PATCH 11/14] Fix PHPCS errors.

---
 inc/patterns/header-centered-logo-in-navigation.php    | 10 +++++-----
 inc/patterns/header-centered-logo.php                  | 10 +++++-----
 .../header-centered-title-navigation-social.php        | 10 +++++-----
 inc/patterns/header-default.php                        | 10 +++++-----
 inc/patterns/header-large-dark.php                     | 10 +++++-----
 inc/patterns/header-logo-navigation-offset-tagline.php | 10 +++++-----
 inc/patterns/header-logo-navigation-social.php         | 10 +++++-----
 inc/patterns/header-logo-navigation.php                | 10 +++++-----
 inc/patterns/header-stacked.php                        | 10 +++++-----
 .../header-text-only-all-caps-with-tagline.php         | 10 +++++-----
 inc/patterns/header-text-only-with-stacked-tagline.php | 10 +++++-----
 inc/patterns/header-text-only-with-tagline.php         | 10 +++++-----
 inc/patterns/header-text-only.php                      | 10 +++++-----
 inc/patterns/header-title-and-button.php               | 10 +++++-----
 inc/patterns/header-title-navigation-social.php        | 10 +++++-----
 inc/patterns/header-with-tagline.php                   | 10 +++++-----
 16 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/inc/patterns/header-centered-logo-in-navigation.php b/inc/patterns/header-centered-logo-in-navigation.php
index 1601e2ed..568cfb9c 100644
--- a/inc/patterns/header-centered-logo-in-navigation.php
+++ b/inc/patterns/header-centered-logo-in-navigation.php
@@ -3,10 +3,10 @@
  * Header with centered Logo in Navigation block pattern
  */
 return array(
-	'title'       => __( 'Header with centered Logo in Navigation', 'twentytwentytwo' ),
-	'categories'  => array( 'twentytwentytwo-headers' ),
+	'title'      => __( 'Header with centered Logo in Navigation', 'twentytwentytwo' ),
+	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"center"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"center"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 
@@ -14,5 +14,5 @@
 
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 					<!-- /wp:navigation --></div>
-					<!-- /wp:group -->'
-);
\ No newline at end of file
+					<!-- /wp:group -->',
+);
diff --git a/inc/patterns/header-centered-logo.php b/inc/patterns/header-centered-logo.php
index 43d6b8af..64778c11 100644
--- a/inc/patterns/header-centered-logo.php
+++ b/inc/patterns/header-centered-logo.php
@@ -3,10 +3,10 @@
  * Header with centered Logo block pattern
  */
 return array(
-	'title'       => __( 'Header with centered Logo', 'twentytwentytwo' ),
-	'categories'  => array( 'twentytwentytwo-headers' ),
+	'title'      => __( 'Header with centered Logo', 'twentytwentytwo' ),
+	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:columns {"verticalAlignment":"center"} -->
 					<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center"} -->
 					<div class="wp-block-column is-vertically-aligned-center"><!-- wp:site-title {"style":{"typography":{"fontStyle":"normal","fontWeight":"400","textTransform":"uppercase"}}} /--></div>
@@ -22,5 +22,5 @@
 					<!-- /wp:navigation --></div>
 					<!-- /wp:column --></div>
 					<!-- /wp:columns --></div>
-					<!-- /wp:group -->'
-);
\ No newline at end of file
+					<!-- /wp:group -->',
+);
diff --git a/inc/patterns/header-centered-title-navigation-social.php b/inc/patterns/header-centered-title-navigation-social.php
index a067a8ed..c8cda51d 100644
--- a/inc/patterns/header-centered-title-navigation-social.php
+++ b/inc/patterns/header-centered-title-navigation-social.php
@@ -3,10 +3,10 @@
  * Centered title with Navigation and Social Links Header block pattern
  */
 return array(
-	'title'       => __( 'Centered title with Navigation and Social Links Header', 'twentytwentytwo' ),
-	'categories'  => array( 'twentytwentytwo-headers' ),
+	'title'      => __( 'Centered title with Navigation and Social Links Header', 'twentytwentytwo' ),
+	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:columns {"verticalAlignment":"center"} -->
 					<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center"} -->
 					<div class="wp-block-column is-vertically-aligned-center"><!-- wp:navigation {"itemsJustification":"left","isResponsive":true} -->
@@ -26,5 +26,5 @@
 					<!-- /wp:social-links --></div>
 					<!-- /wp:column --></div>
 					<!-- /wp:columns --></div>
-					<!-- /wp:group -->'
-);
\ No newline at end of file
+					<!-- /wp:group -->',
+);
diff --git a/inc/patterns/header-default.php b/inc/patterns/header-default.php
index 0a69ef01..be03f54d 100644
--- a/inc/patterns/header-default.php
+++ b/inc/patterns/header-default.php
@@ -3,10 +3,10 @@
  * Default Header block pattern
  */
 return array(
-	'title'       => __( 'Default Header', 'twentytwentytwo' ),
-	'categories'  => array( 'twentytwentytwo-headers' ),
+	'title'      => __( 'Default Header', 'twentytwentytwo' ),
+	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex"}} -->
 					<div class="wp-block-group">
 					<!-- wp:site-logo {"width":64} /-->
@@ -17,5 +17,5 @@
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 					<!-- /wp:navigation --></div>
-					<!-- /wp:group -->'
-);
\ No newline at end of file
+					<!-- /wp:group -->',
+);
diff --git a/inc/patterns/header-large-dark.php b/inc/patterns/header-large-dark.php
index 58aca0e3..4315a73c 100644
--- a/inc/patterns/header-large-dark.php
+++ b/inc/patterns/header-large-dark.php
@@ -3,10 +3,10 @@
  * Large Header block pattern
  */
 return array(
-	'title'       => __( 'Large Header', 'twentytwentytwo' ),
-	'categories'  => array( 'twentytwentytwo-headers' ),
+	'title'      => __( 'Large Header', 'twentytwentytwo' ),
+	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'     => '<!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"padding":{"top":"0px","right":"max(1.25rem, 5vw)","bottom":"max(1.25rem, 5vw)","left":"max(1.25rem, 5vw)"}}},"backgroundColor":"foreground","textColor":"background","layout":{"inherit":true}} -->
+	'content'    => '<!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"padding":{"top":"0px","right":"max(1.25rem, 5vw)","bottom":"max(1.25rem, 5vw)","left":"max(1.25rem, 5vw)"}}},"backgroundColor":"foreground","textColor":"background","layout":{"inherit":true}} -->
 					<div class="wp-block-group has-background-color has-foreground-background-color has-text-color has-background has-link-color" style="padding-top:0px;padding-right:max(1.25rem, 5vw);padding-bottom:max(1.25rem, 5vw);padding-left:max(1.25rem, 5vw)"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex"}} -->
 					<div class="wp-block-group">
@@ -25,5 +25,5 @@
 					<div class="wp-block-column"><!-- wp:site-tagline {"style":{"typography":{"fontFamily":"var:preset|font-family|source-serif-pro","fontWeight":"300","fontSize":"clamp(4rem, 8vw, 6.25rem)","lineHeight":"1.15"}}} /--></div>
 					<!-- /wp:column --></div>
 					<!-- /wp:columns --></div>
-					<!-- /wp:group -->'
-);
\ No newline at end of file
+					<!-- /wp:group -->',
+);
diff --git a/inc/patterns/header-logo-navigation-offset-tagline.php b/inc/patterns/header-logo-navigation-offset-tagline.php
index 2823dd38..e2790ca4 100644
--- a/inc/patterns/header-logo-navigation-offset-tagline.php
+++ b/inc/patterns/header-logo-navigation-offset-tagline.php
@@ -3,10 +3,10 @@
  * Logo, Navigation, and offset Tagline Header block pattern
  */
 return array(
-	'title'       => __( 'Logo, Navigation, and offset Tagline Header', 'twentytwentytwo' ),
-	'categories'  => array( 'twentytwentytwo-headers' ),
+	'title'      => __( 'Logo, Navigation, and offset Tagline Header', 'twentytwentytwo' ),
+	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem"}}}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem"}}}} -->
 					<div class="wp-block-group alignwide" style="padding-bottom:8rem"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw)"><!-- wp:site-logo {"width":64} /-->
 
@@ -24,5 +24,5 @@
 					<div class="wp-block-column" style="flex-basis:380px"><!-- wp:site-tagline {"fontSize":"small"} /--></div>
 					<!-- /wp:column --></div>
 					<!-- /wp:columns --></div>
-					<!-- /wp:group -->'
-);
\ No newline at end of file
+					<!-- /wp:group -->',
+);
diff --git a/inc/patterns/header-logo-navigation-social.php b/inc/patterns/header-logo-navigation-social.php
index ae573f48..75e85fe4 100644
--- a/inc/patterns/header-logo-navigation-social.php
+++ b/inc/patterns/header-logo-navigation-social.php
@@ -3,10 +3,10 @@
  * Logo, Navigation, and Social Links Header block pattern
  */
 return array(
-	'title'       => __( 'Logo, Navigation, and Social Links Header', 'twentytwentytwo' ),
-	'categories'  => array( 'twentytwentytwo-headers' ),
+	'title'      => __( 'Logo, Navigation, and Social Links Header', 'twentytwentytwo' ),
+	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"width":64} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
@@ -18,5 +18,5 @@
 					<!-- wp:social-link {"url":"#","service":"twitter"} /--></ul>
 					<!-- /wp:social-links -->
 					<!-- /wp:navigation --></div>
-					<!-- /wp:group -->'
-);
\ No newline at end of file
+					<!-- /wp:group -->',
+);
diff --git a/inc/patterns/header-logo-navigation.php b/inc/patterns/header-logo-navigation.php
index f384773f..e3a448b3 100644
--- a/inc/patterns/header-logo-navigation.php
+++ b/inc/patterns/header-logo-navigation.php
@@ -3,14 +3,14 @@
  * Logo and Navigation Header
  */
 return array(
-	'title'       => __( 'Logo and Navigation Header', 'twentytwentytwo' ),
-	'categories'  => array( 'twentytwentytwo-headers' ),
+	'title'      => __( 'Logo and Navigation Header', 'twentytwentytwo' ),
+	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"width":64} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 					<!-- /wp:navigation --></div>
-					<!-- /wp:group -->'
-);
\ No newline at end of file
+					<!-- /wp:group -->',
+);
diff --git a/inc/patterns/header-stacked.php b/inc/patterns/header-stacked.php
index 28709899..55619ac8 100644
--- a/inc/patterns/header-stacked.php
+++ b/inc/patterns/header-stacked.php
@@ -3,10 +3,10 @@
  * Logo and Navigation Header block pattern
  */
 return array(
-	'title'       => __( 'Logo and Navigation Header', 'twentytwentytwo' ),
-	'categories'  => array( 'twentytwentytwo-headers' ),
+	'title'      => __( 'Logo and Navigation Header', 'twentytwentytwo' ),
+	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"align":"center","width":128} /-->
 
 					<!-- wp:spacer {"height":10} -->
@@ -22,5 +22,5 @@
 					<!-- wp:navigation {"itemsJustification":"center","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 					<!-- /wp:navigation --></div>
-					<!-- /wp:group -->'
-);
\ No newline at end of file
+					<!-- /wp:group -->',
+);
diff --git a/inc/patterns/header-text-only-all-caps-with-tagline.php b/inc/patterns/header-text-only-all-caps-with-tagline.php
index 521a4263..08435a59 100644
--- a/inc/patterns/header-text-only-all-caps-with-tagline.php
+++ b/inc/patterns/header-text-only-all-caps-with-tagline.php
@@ -3,10 +3,10 @@
  * Text-only Header with Tagline and all-caps Title block pattern
  */
 return array(
-	'title'       => __( 'Text-only Header with Tagline and all-caps Title', 'twentytwentytwo' ),
-	'categories'  => array( 'twentytwentytwo-headers' ),
+	'title'      => __( 'Text-only Header with Tagline and all-caps Title', 'twentytwentytwo' ),
+	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex","justifyContent":"left"}} -->
 					<div class="wp-block-group"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}}} /-->
 
@@ -16,5 +16,5 @@
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 					<!-- /wp:navigation --></div>
-					<!-- /wp:group -->'
-);
\ No newline at end of file
+					<!-- /wp:group -->',
+);
diff --git a/inc/patterns/header-text-only-with-stacked-tagline.php b/inc/patterns/header-text-only-with-stacked-tagline.php
index bcc64092..2ddd9fec 100644
--- a/inc/patterns/header-text-only-with-stacked-tagline.php
+++ b/inc/patterns/header-text-only-with-stacked-tagline.php
@@ -3,10 +3,10 @@
  * Text-only Header with stacked Tagline block pattern
  */
 return array(
-	'title'       => __( 'Text-only Header with stacked Tagline', 'twentytwentytwo' ),
-	'categories'  => array( 'twentytwentytwo-headers' ),
+	'title'      => __( 'Text-only Header with stacked Tagline', 'twentytwentytwo' ),
+	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group -->
 					<div class="wp-block-group"><!-- wp:site-title {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}},"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
 
@@ -16,5 +16,5 @@
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 					<!-- /wp:navigation --></div>
-					<!-- /wp:group -->'
-);
\ No newline at end of file
+					<!-- /wp:group -->',
+);
diff --git a/inc/patterns/header-text-only-with-tagline.php b/inc/patterns/header-text-only-with-tagline.php
index b2b4b0c3..0416885c 100644
--- a/inc/patterns/header-text-only-with-tagline.php
+++ b/inc/patterns/header-text-only-with-tagline.php
@@ -3,10 +3,10 @@
  * Text-only Header with Tagline block pattern
  */
 return array(
-	'title'       => __( 'Text-only Header with Tagline', 'twentytwentytwo' ),
-	'categories'  => array( 'twentytwentytwo-headers' ),
+	'title'      => __( 'Text-only Header with Tagline', 'twentytwentytwo' ),
+	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex","justifyContent":"left"}} -->
 					<div class="wp-block-group"><!-- wp:site-title {"style":{"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
 
@@ -16,5 +16,5 @@
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 					<!-- /wp:navigation --></div>
-					<!-- /wp:group -->'
-);
\ No newline at end of file
+					<!-- /wp:group -->',
+);
diff --git a/inc/patterns/header-text-only.php b/inc/patterns/header-text-only.php
index 6cafb3eb..0e064f1a 100644
--- a/inc/patterns/header-text-only.php
+++ b/inc/patterns/header-text-only.php
@@ -3,14 +3,14 @@
  * Text-only Header block pattern
  */
 return array(
-	'title'       => __( 'Text-only Header', 'twentytwentytwo' ),
-	'categories'  => array( 'twentytwentytwo-headers' ),
+	'title'      => __( 'Text-only Header', 'twentytwentytwo' ),
+	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 					<!-- /wp:navigation --></div>
-					<!-- /wp:group -->'
-);
\ No newline at end of file
+					<!-- /wp:group -->',
+);
diff --git a/inc/patterns/header-title-and-button.php b/inc/patterns/header-title-and-button.php
index c9e4b58b..0a679b4d 100644
--- a/inc/patterns/header-title-and-button.php
+++ b/inc/patterns/header-title-and-button.php
@@ -3,14 +3,14 @@
  * Title and Button Header block pattern
  */
 return array(
-	'title'       => __( 'Title and Button Header', 'twentytwentytwo' ),
-	'categories'  => array( 'twentytwentytwo-headers' ),
+	'title'      => __( 'Title and Button Header', 'twentytwentytwo' ),
+	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}},"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 					<!-- /wp:navigation --></div>
-					<!-- /wp:group -->'
-);
\ No newline at end of file
+					<!-- /wp:group -->',
+);
diff --git a/inc/patterns/header-title-navigation-social.php b/inc/patterns/header-title-navigation-social.php
index 9c300c06..4795f36c 100644
--- a/inc/patterns/header-title-navigation-social.php
+++ b/inc/patterns/header-title-navigation-social.php
@@ -3,10 +3,10 @@
  * Title, Navigation, and Social Links Header block pattern
  */
 return array(
-	'title'       => __( 'Title, Navigation, and Social Links Header', 'twentytwentytwo' ),
-	'categories'  => array( 'twentytwentytwo-headers' ),
+	'title'      => __( 'Title, Navigation, and Social Links Header', 'twentytwentytwo' ),
+	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
@@ -18,5 +18,5 @@
 					<!-- wp:social-link {"url":"#","service":"twitter"} /--></ul>
 					<!-- /wp:social-links -->
 					<!-- /wp:navigation --></div>
-					<!-- /wp:group -->'
-);
\ No newline at end of file
+					<!-- /wp:group -->',
+);
diff --git a/inc/patterns/header-with-tagline.php b/inc/patterns/header-with-tagline.php
index 83a9e34d..fc8f3a51 100644
--- a/inc/patterns/header-with-tagline.php
+++ b/inc/patterns/header-with-tagline.php
@@ -3,10 +3,10 @@
  * Header with Tagline block pattern
  */
 return array(
-	'title'       => __( 'Header with Tagline', 'twentytwentytwo' ),
-	'categories'  => array( 'twentytwentytwo-headers' ),
+	'title'      => __( 'Header with Tagline', 'twentytwentytwo' ),
+	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'     => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex"}} -->
 					<div class="wp-block-group"><!-- wp:site-logo {"width":64} /-->
 
@@ -20,5 +20,5 @@
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 					<!-- /wp:navigation --></div>
-					<!-- /wp:group -->'
-);
\ No newline at end of file
+					<!-- /wp:group -->',
+);

From d32c73ac667784a25c611ab01ff7f2e950a691d5 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 11 Oct 2021 12:49:24 -0400
Subject: [PATCH 12/14] Update all patterns to use a header tagName.

---
 inc/patterns/header-centered-logo-in-navigation.php      | 6 +++---
 inc/patterns/header-centered-logo.php                    | 6 +++---
 inc/patterns/header-centered-title-navigation-social.php | 6 +++---
 inc/patterns/header-default.php                          | 6 +++---
 inc/patterns/header-large-dark.php                       | 6 +++---
 inc/patterns/header-logo-navigation-offset-tagline.php   | 6 +++---
 inc/patterns/header-logo-navigation-social.php           | 6 +++---
 inc/patterns/header-logo-navigation.php                  | 6 +++---
 inc/patterns/header-stacked.php                          | 6 +++---
 inc/patterns/header-text-only-all-caps-with-tagline.php  | 6 +++---
 inc/patterns/header-text-only-with-stacked-tagline.php   | 6 +++---
 inc/patterns/header-text-only-with-tagline.php           | 6 +++---
 inc/patterns/header-text-only.php                        | 6 +++---
 inc/patterns/header-title-and-button.php                 | 6 +++---
 inc/patterns/header-title-navigation-social.php          | 6 +++---
 inc/patterns/header-with-tagline.php                     | 6 +++---
 16 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/inc/patterns/header-centered-logo-in-navigation.php b/inc/patterns/header-centered-logo-in-navigation.php
index 568cfb9c..756f64e4 100644
--- a/inc/patterns/header-centered-logo-in-navigation.php
+++ b/inc/patterns/header-centered-logo-in-navigation.php
@@ -6,13 +6,13 @@
 	'title'      => __( 'Header with centered Logo in Navigation', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"center"}} -->
-					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
+	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"center"}} -->
+					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 
 					<!-- wp:site-logo {"width":90} /-->
 
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></div>
+					<!-- /wp:navigation --></header>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-centered-logo.php b/inc/patterns/header-centered-logo.php
index 64778c11..8c44a0b9 100644
--- a/inc/patterns/header-centered-logo.php
+++ b/inc/patterns/header-centered-logo.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Header with centered Logo', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
-					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:columns {"verticalAlignment":"center"} -->
+	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
+					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:columns {"verticalAlignment":"center"} -->
 					<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center"} -->
 					<div class="wp-block-column is-vertically-aligned-center"><!-- wp:site-title {"style":{"typography":{"fontStyle":"normal","fontWeight":"400","textTransform":"uppercase"}}} /--></div>
 					<!-- /wp:column -->
@@ -21,6 +21,6 @@
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 					<!-- /wp:navigation --></div>
 					<!-- /wp:column --></div>
-					<!-- /wp:columns --></div>
+					<!-- /wp:columns --></header>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-centered-title-navigation-social.php b/inc/patterns/header-centered-title-navigation-social.php
index c8cda51d..c00341bf 100644
--- a/inc/patterns/header-centered-title-navigation-social.php
+++ b/inc/patterns/header-centered-title-navigation-social.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Centered title with Navigation and Social Links Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
-					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:columns {"verticalAlignment":"center"} -->
+	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
+					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:columns {"verticalAlignment":"center"} -->
 					<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center"} -->
 					<div class="wp-block-column is-vertically-aligned-center"><!-- wp:navigation {"itemsJustification":"left","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
@@ -25,6 +25,6 @@
 					<!-- wp:social-link {"url":"#","service":"instagram"} /--></ul>
 					<!-- /wp:social-links --></div>
 					<!-- /wp:column --></div>
-					<!-- /wp:columns --></div>
+					<!-- /wp:columns --></header>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-default.php b/inc/patterns/header-default.php
index be03f54d..fe75a76c 100644
--- a/inc/patterns/header-default.php
+++ b/inc/patterns/header-default.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Default Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex"}} -->
 					<div class="wp-block-group">
 					<!-- wp:site-logo {"width":64} /-->
 
@@ -16,6 +16,6 @@
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></div>
+					<!-- /wp:navigation --></header>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-large-dark.php b/inc/patterns/header-large-dark.php
index 4315a73c..b255fca2 100644
--- a/inc/patterns/header-large-dark.php
+++ b/inc/patterns/header-large-dark.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Large Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"padding":{"top":"0px","right":"max(1.25rem, 5vw)","bottom":"max(1.25rem, 5vw)","left":"max(1.25rem, 5vw)"}}},"backgroundColor":"foreground","textColor":"background","layout":{"inherit":true}} -->
-					<div class="wp-block-group has-background-color has-foreground-background-color has-text-color has-background has-link-color" style="padding-top:0px;padding-right:max(1.25rem, 5vw);padding-bottom:max(1.25rem, 5vw);padding-left:max(1.25rem, 5vw)"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	'content'    => '<!-- wp:group {"tagName":"header","style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"padding":{"top":"0px","right":"max(1.25rem, 5vw)","bottom":"max(1.25rem, 5vw)","left":"max(1.25rem, 5vw)"}}},"backgroundColor":"foreground","textColor":"background","layout":{"inherit":true}} -->
+					<header class="wp-block-group has-background-color has-foreground-background-color has-text-color has-background has-link-color" style="padding-top:0px;padding-right:max(1.25rem, 5vw);padding-bottom:max(1.25rem, 5vw);padding-left:max(1.25rem, 5vw)"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex"}} -->
 					<div class="wp-block-group">
 					<!-- wp:site-logo {"width":64} /-->
@@ -24,6 +24,6 @@
 					<div class="wp-block-columns alignwide"><!-- wp:column -->
 					<div class="wp-block-column"><!-- wp:site-tagline {"style":{"typography":{"fontFamily":"var:preset|font-family|source-serif-pro","fontWeight":"300","fontSize":"clamp(4rem, 8vw, 6.25rem)","lineHeight":"1.15"}}} /--></div>
 					<!-- /wp:column --></div>
-					<!-- /wp:columns --></div>
+					<!-- /wp:columns --></header>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-logo-navigation-offset-tagline.php b/inc/patterns/header-logo-navigation-offset-tagline.php
index e2790ca4..6274ddfc 100644
--- a/inc/patterns/header-logo-navigation-offset-tagline.php
+++ b/inc/patterns/header-logo-navigation-offset-tagline.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Logo, Navigation, and offset Tagline Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem"}}}} -->
-					<div class="wp-block-group alignwide" style="padding-bottom:8rem"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem"}}}} -->
+					<header class="wp-block-group alignwide" style="padding-bottom:8rem"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw)"><!-- wp:site-logo {"width":64} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
@@ -23,6 +23,6 @@
 					<!-- wp:column {"width":"380px"} -->
 					<div class="wp-block-column" style="flex-basis:380px"><!-- wp:site-tagline {"fontSize":"small"} /--></div>
 					<!-- /wp:column --></div>
-					<!-- /wp:columns --></div>
+					<!-- /wp:columns --></header>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-logo-navigation-social.php b/inc/patterns/header-logo-navigation-social.php
index 75e85fe4..aeca09fe 100644
--- a/inc/patterns/header-logo-navigation-social.php
+++ b/inc/patterns/header-logo-navigation-social.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Logo, Navigation, and Social Links Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"width":64} /-->
+	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"width":64} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
@@ -17,6 +17,6 @@
 
 					<!-- wp:social-link {"url":"#","service":"twitter"} /--></ul>
 					<!-- /wp:social-links -->
-					<!-- /wp:navigation --></div>
+					<!-- /wp:navigation --></header>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-logo-navigation.php b/inc/patterns/header-logo-navigation.php
index e3a448b3..f35e298d 100644
--- a/inc/patterns/header-logo-navigation.php
+++ b/inc/patterns/header-logo-navigation.php
@@ -6,11 +6,11 @@
 	'title'      => __( 'Logo and Navigation Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"width":64} /-->
+	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"width":64} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></div>
+					<!-- /wp:navigation --></header>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-stacked.php b/inc/patterns/header-stacked.php
index 55619ac8..f2ce605e 100644
--- a/inc/patterns/header-stacked.php
+++ b/inc/patterns/header-stacked.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Logo and Navigation Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
-					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"align":"center","width":128} /-->
+	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
+					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"align":"center","width":128} /-->
 
 					<!-- wp:spacer {"height":10} -->
 					<div style="height:10px" aria-hidden="true" class="wp-block-spacer"></div>
@@ -21,6 +21,6 @@
 
 					<!-- wp:navigation {"itemsJustification":"center","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></div>
+					<!-- /wp:navigation --></header>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-text-only-all-caps-with-tagline.php b/inc/patterns/header-text-only-all-caps-with-tagline.php
index 08435a59..214f9c9d 100644
--- a/inc/patterns/header-text-only-all-caps-with-tagline.php
+++ b/inc/patterns/header-text-only-all-caps-with-tagline.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Text-only Header with Tagline and all-caps Title', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex","justifyContent":"left"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex","justifyContent":"left"}} -->
 					<div class="wp-block-group"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}}} /-->
 
 					<!-- wp:site-tagline {"fontSize":"small","style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /--></div>
@@ -15,6 +15,6 @@
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></div>
+					<!-- /wp:navigation --></header>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-text-only-with-stacked-tagline.php b/inc/patterns/header-text-only-with-stacked-tagline.php
index 2ddd9fec..05d70d18 100644
--- a/inc/patterns/header-text-only-with-stacked-tagline.php
+++ b/inc/patterns/header-text-only-with-stacked-tagline.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Text-only Header with stacked Tagline', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group -->
+	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group -->
 					<div class="wp-block-group"><!-- wp:site-title {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}},"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
 
 					<!-- wp:site-tagline {"style":{"spacing":{"margin":{"top":"0.25em","bottom":"0px"}},"typography":{"fontStyle":"italic","fontWeight":"400"}},"fontSize":"small"} /--></div>
@@ -15,6 +15,6 @@
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></div>
+					<!-- /wp:navigation --></header>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-text-only-with-tagline.php b/inc/patterns/header-text-only-with-tagline.php
index 0416885c..f56abb44 100644
--- a/inc/patterns/header-text-only-with-tagline.php
+++ b/inc/patterns/header-text-only-with-tagline.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Text-only Header with Tagline', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex","justifyContent":"left"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex","justifyContent":"left"}} -->
 					<div class="wp-block-group"><!-- wp:site-title {"style":{"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
 
 					<!-- wp:site-tagline {"fontSize":"small","style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /--></div>
@@ -15,6 +15,6 @@
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></div>
+					<!-- /wp:navigation --></header>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-text-only.php b/inc/patterns/header-text-only.php
index 0e064f1a..43d2cab9 100644
--- a/inc/patterns/header-text-only.php
+++ b/inc/patterns/header-text-only.php
@@ -6,11 +6,11 @@
 	'title'      => __( 'Text-only Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /-->
+	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></div>
+					<!-- /wp:navigation --></header>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-title-and-button.php b/inc/patterns/header-title-and-button.php
index 0a679b4d..7c7456e6 100644
--- a/inc/patterns/header-title-and-button.php
+++ b/inc/patterns/header-title-and-button.php
@@ -6,11 +6,11 @@
 	'title'      => __( 'Title and Button Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}},"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
+	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}},"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></div>
+					<!-- /wp:navigation --></header>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-title-navigation-social.php b/inc/patterns/header-title-navigation-social.php
index 4795f36c..4fd551a7 100644
--- a/inc/patterns/header-title-navigation-social.php
+++ b/inc/patterns/header-title-navigation-social.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Title, Navigation, and Social Links Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /-->
+	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
@@ -17,6 +17,6 @@
 
 					<!-- wp:social-link {"url":"#","service":"twitter"} /--></ul>
 					<!-- /wp:social-links -->
-					<!-- /wp:navigation --></div>
+					<!-- /wp:navigation --></header>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-with-tagline.php b/inc/patterns/header-with-tagline.php
index fc8f3a51..0807d605 100644
--- a/inc/patterns/header-with-tagline.php
+++ b/inc/patterns/header-with-tagline.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Header with Tagline', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex"}} -->
 					<div class="wp-block-group"><!-- wp:site-logo {"width":64} /-->
 
 					<!-- wp:group -->
@@ -19,6 +19,6 @@
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></div>
+					<!-- /wp:navigation --></header>
 					<!-- /wp:group -->',
 );

From ec40e46bb26173e15d3af577f2d19b51a6f9b422 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 11 Oct 2021 13:07:59 -0400
Subject: [PATCH 13/14] Use links instead of two page lists.

---
 inc/patterns/header-centered-logo-in-navigation.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/inc/patterns/header-centered-logo-in-navigation.php b/inc/patterns/header-centered-logo-in-navigation.php
index 756f64e4..8a294a18 100644
--- a/inc/patterns/header-centered-logo-in-navigation.php
+++ b/inc/patterns/header-centered-logo-in-navigation.php
@@ -6,13 +6,17 @@
 	'title'      => __( 'Header with centered Logo in Navigation', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"center"}} -->
+	'content'    => '<!-- wp:group {"tagName":"header","align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"center"}} -->
 					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
-					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+					<!-- wp:navigation-link {"isTopLevelLink":true} /-->
+
+					<!-- wp:navigation-link {"isTopLevelLink":true} /-->
 
 					<!-- wp:site-logo {"width":90} /-->
 
-					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
+					<!-- wp:navigation-link {"isTopLevelLink":true} /-->
+
+					<!-- wp:navigation-link {"isTopLevelLink":true} /-->
 					<!-- /wp:navigation --></header>
 					<!-- /wp:group -->',
 );

From 473937b3c93842f5b8a14cdb3891e3f7e889d666 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 11 Oct 2021 19:18:17 -0400
Subject: [PATCH 14/14] Remove tagNames to avoid duplication.

---
 inc/patterns/header-centered-logo-in-navigation.php      | 6 +++---
 inc/patterns/header-centered-logo.php                    | 6 +++---
 inc/patterns/header-centered-title-navigation-social.php | 6 +++---
 inc/patterns/header-default.php                          | 6 +++---
 inc/patterns/header-large-dark.php                       | 6 +++---
 inc/patterns/header-logo-navigation-offset-tagline.php   | 6 +++---
 inc/patterns/header-logo-navigation-social.php           | 6 +++---
 inc/patterns/header-logo-navigation.php                  | 6 +++---
 inc/patterns/header-stacked.php                          | 6 +++---
 inc/patterns/header-text-only-all-caps-with-tagline.php  | 6 +++---
 inc/patterns/header-text-only-with-stacked-tagline.php   | 6 +++---
 inc/patterns/header-text-only-with-tagline.php           | 6 +++---
 inc/patterns/header-text-only.php                        | 6 +++---
 inc/patterns/header-title-and-button.php                 | 6 +++---
 inc/patterns/header-title-navigation-social.php          | 6 +++---
 inc/patterns/header-with-tagline.php                     | 6 +++---
 16 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/inc/patterns/header-centered-logo-in-navigation.php b/inc/patterns/header-centered-logo-in-navigation.php
index 8a294a18..6b3e0fe0 100644
--- a/inc/patterns/header-centered-logo-in-navigation.php
+++ b/inc/patterns/header-centered-logo-in-navigation.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Header with centered Logo in Navigation', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"tagName":"header","align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"center"}} -->
-					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"center"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:navigation-link {"isTopLevelLink":true} /-->
 
 					<!-- wp:navigation-link {"isTopLevelLink":true} /-->
@@ -17,6 +17,6 @@
 					<!-- wp:navigation-link {"isTopLevelLink":true} /-->
 
 					<!-- wp:navigation-link {"isTopLevelLink":true} /-->
-					<!-- /wp:navigation --></header>
+					<!-- /wp:navigation --></div>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-centered-logo.php b/inc/patterns/header-centered-logo.php
index 8c44a0b9..64778c11 100644
--- a/inc/patterns/header-centered-logo.php
+++ b/inc/patterns/header-centered-logo.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Header with centered Logo', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
-					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:columns {"verticalAlignment":"center"} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:columns {"verticalAlignment":"center"} -->
 					<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center"} -->
 					<div class="wp-block-column is-vertically-aligned-center"><!-- wp:site-title {"style":{"typography":{"fontStyle":"normal","fontWeight":"400","textTransform":"uppercase"}}} /--></div>
 					<!-- /wp:column -->
@@ -21,6 +21,6 @@
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 					<!-- /wp:navigation --></div>
 					<!-- /wp:column --></div>
-					<!-- /wp:columns --></header>
+					<!-- /wp:columns --></div>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-centered-title-navigation-social.php b/inc/patterns/header-centered-title-navigation-social.php
index c00341bf..c8cda51d 100644
--- a/inc/patterns/header-centered-title-navigation-social.php
+++ b/inc/patterns/header-centered-title-navigation-social.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Centered title with Navigation and Social Links Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
-					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:columns {"verticalAlignment":"center"} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:columns {"verticalAlignment":"center"} -->
 					<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center"} -->
 					<div class="wp-block-column is-vertically-aligned-center"><!-- wp:navigation {"itemsJustification":"left","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
@@ -25,6 +25,6 @@
 					<!-- wp:social-link {"url":"#","service":"instagram"} /--></ul>
 					<!-- /wp:social-links --></div>
 					<!-- /wp:column --></div>
-					<!-- /wp:columns --></header>
+					<!-- /wp:columns --></div>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-default.php b/inc/patterns/header-default.php
index fe75a76c..be03f54d 100644
--- a/inc/patterns/header-default.php
+++ b/inc/patterns/header-default.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Default Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex"}} -->
 					<div class="wp-block-group">
 					<!-- wp:site-logo {"width":64} /-->
 
@@ -16,6 +16,6 @@
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></header>
+					<!-- /wp:navigation --></div>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-large-dark.php b/inc/patterns/header-large-dark.php
index b255fca2..4315a73c 100644
--- a/inc/patterns/header-large-dark.php
+++ b/inc/patterns/header-large-dark.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Large Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"tagName":"header","style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"padding":{"top":"0px","right":"max(1.25rem, 5vw)","bottom":"max(1.25rem, 5vw)","left":"max(1.25rem, 5vw)"}}},"backgroundColor":"foreground","textColor":"background","layout":{"inherit":true}} -->
-					<header class="wp-block-group has-background-color has-foreground-background-color has-text-color has-background has-link-color" style="padding-top:0px;padding-right:max(1.25rem, 5vw);padding-bottom:max(1.25rem, 5vw);padding-left:max(1.25rem, 5vw)"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	'content'    => '<!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"padding":{"top":"0px","right":"max(1.25rem, 5vw)","bottom":"max(1.25rem, 5vw)","left":"max(1.25rem, 5vw)"}}},"backgroundColor":"foreground","textColor":"background","layout":{"inherit":true}} -->
+					<div class="wp-block-group has-background-color has-foreground-background-color has-text-color has-background has-link-color" style="padding-top:0px;padding-right:max(1.25rem, 5vw);padding-bottom:max(1.25rem, 5vw);padding-left:max(1.25rem, 5vw)"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex"}} -->
 					<div class="wp-block-group">
 					<!-- wp:site-logo {"width":64} /-->
@@ -24,6 +24,6 @@
 					<div class="wp-block-columns alignwide"><!-- wp:column -->
 					<div class="wp-block-column"><!-- wp:site-tagline {"style":{"typography":{"fontFamily":"var:preset|font-family|source-serif-pro","fontWeight":"300","fontSize":"clamp(4rem, 8vw, 6.25rem)","lineHeight":"1.15"}}} /--></div>
 					<!-- /wp:column --></div>
-					<!-- /wp:columns --></header>
+					<!-- /wp:columns --></div>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-logo-navigation-offset-tagline.php b/inc/patterns/header-logo-navigation-offset-tagline.php
index 6274ddfc..e2790ca4 100644
--- a/inc/patterns/header-logo-navigation-offset-tagline.php
+++ b/inc/patterns/header-logo-navigation-offset-tagline.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Logo, Navigation, and offset Tagline Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem"}}}} -->
-					<header class="wp-block-group alignwide" style="padding-bottom:8rem"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem"}}}} -->
+					<div class="wp-block-group alignwide" style="padding-bottom:8rem"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw)"><!-- wp:site-logo {"width":64} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
@@ -23,6 +23,6 @@
 					<!-- wp:column {"width":"380px"} -->
 					<div class="wp-block-column" style="flex-basis:380px"><!-- wp:site-tagline {"fontSize":"small"} /--></div>
 					<!-- /wp:column --></div>
-					<!-- /wp:columns --></header>
+					<!-- /wp:columns --></div>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-logo-navigation-social.php b/inc/patterns/header-logo-navigation-social.php
index aeca09fe..75e85fe4 100644
--- a/inc/patterns/header-logo-navigation-social.php
+++ b/inc/patterns/header-logo-navigation-social.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Logo, Navigation, and Social Links Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"width":64} /-->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"width":64} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
@@ -17,6 +17,6 @@
 
 					<!-- wp:social-link {"url":"#","service":"twitter"} /--></ul>
 					<!-- /wp:social-links -->
-					<!-- /wp:navigation --></header>
+					<!-- /wp:navigation --></div>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-logo-navigation.php b/inc/patterns/header-logo-navigation.php
index f35e298d..e3a448b3 100644
--- a/inc/patterns/header-logo-navigation.php
+++ b/inc/patterns/header-logo-navigation.php
@@ -6,11 +6,11 @@
 	'title'      => __( 'Logo and Navigation Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"width":64} /-->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"width":64} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></header>
+					<!-- /wp:navigation --></div>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-stacked.php b/inc/patterns/header-stacked.php
index f2ce605e..55619ac8 100644
--- a/inc/patterns/header-stacked.php
+++ b/inc/patterns/header-stacked.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Logo and Navigation Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
-					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"align":"center","width":128} /-->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-logo {"align":"center","width":128} /-->
 
 					<!-- wp:spacer {"height":10} -->
 					<div style="height:10px" aria-hidden="true" class="wp-block-spacer"></div>
@@ -21,6 +21,6 @@
 
 					<!-- wp:navigation {"itemsJustification":"center","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></header>
+					<!-- /wp:navigation --></div>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-text-only-all-caps-with-tagline.php b/inc/patterns/header-text-only-all-caps-with-tagline.php
index 214f9c9d..08435a59 100644
--- a/inc/patterns/header-text-only-all-caps-with-tagline.php
+++ b/inc/patterns/header-text-only-all-caps-with-tagline.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Text-only Header with Tagline and all-caps Title', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex","justifyContent":"left"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex","justifyContent":"left"}} -->
 					<div class="wp-block-group"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}}} /-->
 
 					<!-- wp:site-tagline {"fontSize":"small","style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /--></div>
@@ -15,6 +15,6 @@
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></header>
+					<!-- /wp:navigation --></div>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-text-only-with-stacked-tagline.php b/inc/patterns/header-text-only-with-stacked-tagline.php
index 05d70d18..2ddd9fec 100644
--- a/inc/patterns/header-text-only-with-stacked-tagline.php
+++ b/inc/patterns/header-text-only-with-stacked-tagline.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Text-only Header with stacked Tagline', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group -->
 					<div class="wp-block-group"><!-- wp:site-title {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}},"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
 
 					<!-- wp:site-tagline {"style":{"spacing":{"margin":{"top":"0.25em","bottom":"0px"}},"typography":{"fontStyle":"italic","fontWeight":"400"}},"fontSize":"small"} /--></div>
@@ -15,6 +15,6 @@
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></header>
+					<!-- /wp:navigation --></div>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-text-only-with-tagline.php b/inc/patterns/header-text-only-with-tagline.php
index f56abb44..0416885c 100644
--- a/inc/patterns/header-text-only-with-tagline.php
+++ b/inc/patterns/header-text-only-with-tagline.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Text-only Header with Tagline', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex","justifyContent":"left"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex","justifyContent":"left"}} -->
 					<div class="wp-block-group"><!-- wp:site-title {"style":{"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
 
 					<!-- wp:site-tagline {"fontSize":"small","style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /--></div>
@@ -15,6 +15,6 @@
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></header>
+					<!-- /wp:navigation --></div>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-text-only.php b/inc/patterns/header-text-only.php
index 43d2cab9..0e064f1a 100644
--- a/inc/patterns/header-text-only.php
+++ b/inc/patterns/header-text-only.php
@@ -6,11 +6,11 @@
 	'title'      => __( 'Text-only Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /-->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></header>
+					<!-- /wp:navigation --></div>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-title-and-button.php b/inc/patterns/header-title-and-button.php
index 7c7456e6..0a679b4d 100644
--- a/inc/patterns/header-title-and-button.php
+++ b/inc/patterns/header-title-and-button.php
@@ -6,11 +6,11 @@
 	'title'      => __( 'Title and Button Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}},"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}},"typography":{"fontStyle":"normal","fontWeight":"700"}}} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></header>
+					<!-- /wp:navigation --></div>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-title-navigation-social.php b/inc/patterns/header-title-navigation-social.php
index 4fd551a7..4795f36c 100644
--- a/inc/patterns/header-title-navigation-social.php
+++ b/inc/patterns/header-title-navigation-social.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Title, Navigation, and Social Links Header', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /-->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:site-title {"style":{"typography":{"fontStyle":"italic","fontWeight":"400"}}} /-->
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
@@ -17,6 +17,6 @@
 
 					<!-- wp:social-link {"url":"#","service":"twitter"} /--></ul>
 					<!-- /wp:social-links -->
-					<!-- /wp:navigation --></header>
+					<!-- /wp:navigation --></div>
 					<!-- /wp:group -->',
 );
diff --git a/inc/patterns/header-with-tagline.php b/inc/patterns/header-with-tagline.php
index 0807d605..fc8f3a51 100644
--- a/inc/patterns/header-with-tagline.php
+++ b/inc/patterns/header-with-tagline.php
@@ -6,8 +6,8 @@
 	'title'      => __( 'Header with Tagline', 'twentytwentytwo' ),
 	'categories' => array( 'twentytwentytwo-headers' ),
 	'blockTypes' => array( 'core/template-part/header' ),
-	'content'    => '<!-- wp:group {"align":"wide","tagName":"header","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-					<header class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex"}} -->
+	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"8rem","top":"max(1.25rem, 5vw)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<div class="wp-block-group alignwide" style="padding-top:max(1.25rem, 5vw);padding-bottom:8rem"><!-- wp:group {"layout":{"type":"flex"}} -->
 					<div class="wp-block-group"><!-- wp:site-logo {"width":64} /-->
 
 					<!-- wp:group -->
@@ -19,6 +19,6 @@
 
 					<!-- wp:navigation {"itemsJustification":"right","isResponsive":true} -->
 					<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-					<!-- /wp:navigation --></header>
+					<!-- /wp:navigation --></div>
 					<!-- /wp:group -->',
 );