From 967e6393ea4ccda75b98cb865306a9b4141b3796 Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Thu, 18 Mar 2021 11:56:43 +0100
Subject: [PATCH 01/44] added new block patterns

---
 lib/block-patterns.php                        | 29 +++++++
 lib/block-patterns/cover-columns.php          | 35 ++++++++
 lib/block-patterns/cover-quote.php            | 33 ++++++++
 lib/block-patterns/heading.php                | 15 ++++
 lib/block-patterns/hero-section.php           | 35 ++++++++
 lib/block-patterns/large-header-button.php    | 14 ++++
 .../media-text-arquitecture.php               | 29 +++++++
 lib/block-patterns/media-text-art.php         | 23 ++++++
 lib/block-patterns/media-text-nature.php      | 29 +++++++
 lib/block-patterns/quote-portrait.php         | 29 +++++++
 .../text-two-columns-title-2.php              | 31 ++++++++
 lib/block-patterns/text-two-columns-title.php | 53 +++++++++++++
 lib/block-patterns/three-columns-list.php     | 43 ++++++++++
 .../three-columns-media-text.php              | 79 +++++++++++++++++++
 lib/block-patterns/three-images-gallery.php   | 43 ++++++++++
 lib/block-patterns/two-columns-list.php       | 45 +++++++++++
 lib/block-patterns/two-images-gallery.php     | 15 ++++
 17 files changed, 580 insertions(+)
 create mode 100644 lib/block-patterns/cover-columns.php
 create mode 100644 lib/block-patterns/cover-quote.php
 create mode 100644 lib/block-patterns/heading.php
 create mode 100644 lib/block-patterns/hero-section.php
 create mode 100644 lib/block-patterns/large-header-button.php
 create mode 100644 lib/block-patterns/media-text-arquitecture.php
 create mode 100644 lib/block-patterns/media-text-art.php
 create mode 100644 lib/block-patterns/media-text-nature.php
 create mode 100644 lib/block-patterns/quote-portrait.php
 create mode 100644 lib/block-patterns/text-two-columns-title-2.php
 create mode 100644 lib/block-patterns/text-two-columns-title.php
 create mode 100644 lib/block-patterns/three-columns-list.php
 create mode 100644 lib/block-patterns/three-columns-media-text.php
 create mode 100644 lib/block-patterns/three-images-gallery.php
 create mode 100644 lib/block-patterns/two-columns-list.php
 create mode 100644 lib/block-patterns/two-images-gallery.php

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index 789f483aea6c3..b4fdf720cfae5 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -179,3 +179,32 @@
 							<!-- /wp:social-links -->',
 	)
 );
+
+$core_block_patterns = array(
+	'media-text-nature',
+	'two-images-gallery',
+	'cover-quote',
+	'cover-columns',
+	'three-columns-media-text',
+	'quote-portrait',
+	'hero-section',
+	'media-text-art',
+	'text-two-columns-title',
+	'three-columns-list',
+	'text-two-columns-title-2',
+	'heading',
+	'three-images-gallery',
+	'two-columns-list',
+	'media-text-arquitecture'
+);
+
+foreach ( $core_block_patterns as $core_block_pattern ) {
+	register_block_pattern(
+		'core/' . $core_block_pattern,
+		require __DIR__ . '/block-patterns/' . $core_block_pattern . '.php'
+	);
+}
+
+register_block_pattern_category( 'nature', array( 'label' => _x( 'Nature', 'Block pattern category' ) ) );
+register_block_pattern_category( 'art', array( 'label' => _x( 'Art', 'Block pattern category' ) ) );
+register_block_pattern_category( 'arquitecture', array( 'label' => _x( 'Arquitecture', 'Block pattern category' ) ) );
\ No newline at end of file
diff --git a/lib/block-patterns/cover-columns.php b/lib/block-patterns/cover-columns.php
new file mode 100644
index 0000000000000..7670694789d89
--- /dev/null
+++ b/lib/block-patterns/cover-columns.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Cover with two columns
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Cover with two columns' ),
+	'categories'  => array( 'nature' ),
+	'content'     => '<!-- wp:cover {"customOverlayColor":"#51503b","minHeight":800,"align":"full"} -->
+	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#51503b;min-height:800px"><div class="wp-block-cover__inner-container"><!-- wp:columns {"align":"wide"} -->
+	<div class="wp-block-columns alignwide"><!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:separator {"customColor":"#ffe074","className":"is-style-wide"} -->
+	<hr class="wp-block-separator has-text-color has-background is-style-wide" style="background-color:#ffe074;color:#ffe074"/>
+	<!-- /wp:separator -->
+	
+	<!-- wp:heading {"style":{"color":{"text":"#ffe074"},"typography":{"fontSize":"200px"}}} -->
+	<h2 class="has-text-color" style="color:#ffe074;font-size:200px">'. __("80%*") . '</h2>
+	<!-- /wp:heading -->
+	
+	<!-- wp:paragraph {"style":{"typography":{"fontSize":"12px","lineHeight":"1.3"},"color":{"text":"#ffe074","link":"#ffe074"}}} -->
+	<p class="has-text-color has-link-color" style="--wp--style--color--link:#ffe074;color:#ffe074;font-size:12px;line-height:1.3"><em>'. __("*Is how much industrial agriculture contributes to deforestation across the globe. Nature always wears the colors of the spirit. To a man laboring under calamity, the heat of his own fire hath sadness in it.") . '</em></p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:image {"id":265,"sizeSlug":"large","linkDestination":"none"} -->
+	<figure class="wp-block-image size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-nature-forest-light-plant-sunshine-1100731-pxhere.com_-1024x681.jpg" alt="" class="wp-image-265"/></figure>
+	<!-- /wp:image --></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns --></div></div>
+	<!-- /wp:cover -->',
+	'description' => _x( 'Cover with two columns with text on the left one and an image on the right one', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/cover-quote.php b/lib/block-patterns/cover-quote.php
new file mode 100644
index 0000000000000..648b3134acb13
--- /dev/null
+++ b/lib/block-patterns/cover-quote.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Cover image with quote on top
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Quote' ),
+	'categories'  => array( 'nature' ),
+	'content'     => '<!-- wp:cover {"url":"https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg","id":261,"dimRatio":60,"minHeight":800,"align":"full"} -->
+	<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background wp-image-261" alt="" src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:columns {"align":"wide"} -->
+	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"55%"} -->
+	<div class="wp-block-column" style="flex-basis:55%"><!-- wp:heading {"style":{"typography":{"fontSize":"200px"},"color":{"text":"#ffe074"}}} -->
+	<h2 class="has-text-color" style="color:#ffe074;font-size:200px">'. __("Forest.") . '</h2>
+	<!-- /wp:heading -->
+	
+	<!-- wp:spacer {"height":330} -->
+	<div style="height:330px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+	
+	<!-- wp:paragraph {"style":{"color":{"text":"#ffe074"},"typography":{"lineHeight":"1.3","fontSize":"12px"}}} -->
+	<p class="has-text-color" style="color:#ffe074;font-size:12px;line-height:1.3"><em>'. __("Even a child knows how valuable the forest is. The fresh, breathtaking smell of trees. Echoing birds flying above that dense magnitude. A stable climate, a sustainable diverse life and a source of culture. Yet, forests and other ecosystems hang in the balance, threatened to become croplands, pasture, and plantations.") . '</em></p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column -->
+	<div class="wp-block-column"></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns --></div></div>
+	<!-- /wp:cover -->',
+	'description' => _x( 'Cover image with quote on top', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/heading.php b/lib/block-patterns/heading.php
new file mode 100644
index 0000000000000..afc229fab0bcf
--- /dev/null
+++ b/lib/block-patterns/heading.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Heading
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Heading' ),
+	'categories'  => array( 'arquitecture' ),
+	'content'     => '<!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"55px","lineHeight":"1.1"},"color":{"text":"#0026ff"}}} -->
+	<h2 class="alignwide has-text-color" style="color:#0026ff;font-size:55px;line-height:1.1">'. __("We're a studio in Berlin with an international practice in architecture, urban planning and interior design. We believe in sharing knowledge and promoting dialogue to increase the creative potential of collaboration.") .'</h2>
+	<!-- /wp:heading -->',
+	'description' => _x( 'Heading text', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/hero-section.php b/lib/block-patterns/hero-section.php
new file mode 100644
index 0000000000000..e27f236a4e984
--- /dev/null
+++ b/lib/block-patterns/hero-section.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Hero section
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Hero section' ),
+	'categories'  => array( 'art' ),
+	'content'     => '<!-- wp:cover {"url":"https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg","id":613,"hasParallax":true,"dimRatio":40,"overlayColor":"black","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
+	<div class="wp-block-cover alignfull has-background-dim-40 has-black-background-color has-background-dim has-parallax" style="background-image:url(https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"level":1,"align":"wide","textColor":"white"} -->
+	<h1 class="alignwide has-white-color has-text-color"><strong><em>'. __("Overseas: 1500 — 1960") .'</em></strong></h1>
+	<!-- /wp:heading -->
+	
+	<!-- wp:columns {"align":"wide"} -->
+	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"60%"} -->
+	<div class="wp-block-column" style="flex-basis:60%"><!-- wp:paragraph -->
+	<p>'. __("An exhibition about the different representations of the ocean throughout time, between the sixteenth and the twentieth century. Taking place in our Open Room in <em>Floor 2</em>.") .'</p>
+	<!-- /wp:paragraph -->
+	
+	<!-- wp:buttons -->
+	<div class="wp-block-buttons"><!-- wp:button {"borderRadius":0,"backgroundColor":"black","textColor":"white","className":"is-style-outline"} -->
+	<div class="wp-block-button is-style-outline"><a class="wp-block-button__link has-white-color has-black-background-color has-text-color has-background no-border-radius">'. __("Visit") .'</a></div>
+	<!-- /wp:button --></div>
+	<!-- /wp:buttons --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column -->
+	<div class="wp-block-column"></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns --></div></div>
+	<!-- /wp:cover -->',
+	'description' => _x( 'Hero section with background image and text and button on top', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/large-header-button.php b/lib/block-patterns/large-header-button.php
new file mode 100644
index 0000000000000..313dc26b47bca
--- /dev/null
+++ b/lib/block-patterns/large-header-button.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Large header and a button block pattern.
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'         => __( 'Large header with a heading and a button ' ),
+	'content'       => "<!-- wp:cover {\"minHeight\":575,\"minHeightUnit\":\"px\",\"customGradient\":\"linear-gradient(135deg,rgb(249,72,72) 1%,rgb(179,22,22) 100%)\",\"contentPosition\":\"center center\",\"align\":\"wide\"} -->\n<div class=\"wp-block-cover alignwide has-background-dim has-background-gradient is-position-center-center\" style=\"background:linear-gradient(135deg,rgb(249,72,72) 1%,rgb(179,22,22) 100%);min-height:575px\"><div class=\"wp-block-cover__inner-container\"><!-- wp:columns {\"align\":\"wide\"} -->\n<div class=\"wp-block-columns alignwide\"><!-- wp:column {\"width\":12} -->\n<div class=\"wp-block-column\" style=\"flex-basis:12%\"><!-- wp:spacer -->\n<div style=\"height:100px\" aria-hidden=\"true\" class=\"wp-block-spacer\"></div>\n<!-- /wp:spacer --></div>\n<!-- /wp:column -->\n\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:spacer -->\n<div style=\"height:100px\" aria-hidden=\"true\" class=\"wp-block-spacer\"></div>\n<!-- /wp:spacer -->\n\n<!-- wp:paragraph {\"align\":\"left\",\"placeholder\":\"" . __( 'Write title…' ) . "\",\"style\":{\"typography\":{\"fontSize\":68,\"lineHeight\":\"1.2\"},\"color\":{\"text\":\"#fffffa\"}}} -->\n<p class=\"has-text-align-left has-text-color\" style=\"line-height:1.2;font-size:68px;color:#fffffa\"><strong>" . __( 'Thou hast seen<br>nothing yet' ) . "</strong></p>\n<!-- /wp:paragraph -->\n\n<!-- wp:buttons -->\n<div class=\"wp-block-buttons\"><!-- wp:button {\"borderRadius\":3,\"style\":{\"color\":{\"background\":\"#fffffa\",\"text\":\"#00000a\"}}} -->\n<div class=\"wp-block-button\"><a class=\"wp-block-button__link has-text-color has-background\" style=\"border-radius:3px;background-color:#fffffa;color:#00000a\">" . __( 'Read now' ) . "</a></div>\n<!-- /wp:button --></div>\n<!-- /wp:buttons -->\n\n<!-- wp:spacer -->\n<div style=\"height:100px\" aria-hidden=\"true\" class=\"wp-block-spacer\"></div>\n<!-- /wp:spacer --></div>\n<!-- /wp:column -->\n\n<!-- wp:column {\"width\":12} -->\n<div class=\"wp-block-column\" style=\"flex-basis:12%\"><!-- wp:spacer -->\n<div style=\"height:100px\" aria-hidden=\"true\" class=\"wp-block-spacer\"></div>\n<!-- /wp:spacer --></div>\n<!-- /wp:column --></div>\n<!-- /wp:columns --></div></div>\n<!-- /wp:cover -->",
+	'viewportWidth' => 1000,
+	'categories'    => array( 'header' ),
+	'description'   => _x( 'A large hero section with a bright gradient background, a big heading and a filled button.', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/media-text-arquitecture.php b/lib/block-patterns/media-text-arquitecture.php
new file mode 100644
index 0000000000000..474739a46895f
--- /dev/null
+++ b/lib/block-patterns/media-text-arquitecture.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Media + Text
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Media + text' ),
+	'categories'  => array( 'arquitecture' ),
+	'content'     => '<!-- wp:columns {"align":"full","backgroundColor":"white"} -->
+	<div class="wp-block-columns alignfull has-white-background-color has-background"><!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:image {"align":"full","id":330,"sizeSlug":"large","linkDestination":"none"} -->
+	<figure class="wp-block-image alignfull size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_C7E4WYWEHZ-edited-768x1024.jpg" alt="" class="wp-image-330"/></figure>
+	<!-- /wp:image --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column {"verticalAlignment":"center"} -->
+	<div class="wp-block-column is-vertically-aligned-center"><!-- wp:heading {"textAlign":"center","level":3,"textColor":"black"} -->
+	<h3 class="has-text-align-center has-black-color has-text-color"><strong>'. __("Open Spaces") .'</strong></h3>
+	<!-- /wp:heading -->
+	
+	<!-- wp:paragraph {"align":"center","style":{"color":{"text":"#0026ff"}},"fontSize":"extra-small"} -->
+	<p class="has-text-align-center has-text-color has-extra-small-font-size" style="color:#0026ff"><a href="https://blockpatterndesigns.mystagingwebsite.com">'. __("See case study ↗") .'</a></p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns -->',
+	'description' => _x( 'Media and text block with image to the left and text to the right', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/media-text-art.php b/lib/block-patterns/media-text-art.php
new file mode 100644
index 0000000000000..4338ad4550aed
--- /dev/null
+++ b/lib/block-patterns/media-text-art.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Media + Text
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Media + text' ),
+	'categories'  => array( 'art' ),
+	'content'     => '<!-- wp:cover {"customOverlayColor":"#ffffff","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
+	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"align":"full","mediaPosition":"right","mediaId":615,"mediaLink":"https://blockpatterndesigns.mystagingwebsite.com/block-patterns-art/508741ldsdl/","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","className":"is-style-default"} -->
+	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/508741ldsdl-1024x870.jpg" alt="" class="wp-image-615 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"35px"}},"textColor":"black"} -->
+	<h2 class="has-black-color has-text-color" style="font-size:35px"><strong>'. __("Shore with Blue Sea") .'</strong></h2>
+	<!-- /wp:heading -->
+	
+	<!-- wp:paragraph {"style":{"typography":{"fontSize":"17px"},"color":{"text":"#636363"}}} -->
+	<p class="has-text-color" style="color:#636363;font-size:17px">'. __("Eleanor Harris&nbsp;(American, 1901-1942)") .'</p>
+	<!-- /wp:paragraph --></div></div>
+	<!-- /wp:media-text --></div></div>
+	<!-- /wp:cover -->',
+	'description' => _x( 'Media and text block with image to the right and text to the left', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/media-text-nature.php b/lib/block-patterns/media-text-nature.php
new file mode 100644
index 0000000000000..6dc4905b6fec0
--- /dev/null
+++ b/lib/block-patterns/media-text-nature.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Media + text 
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Media + text' ),
+	'categories'  => array( 'nature' ),
+	'content'     => '<!-- wp:cover {"customOverlayColor":"#ffffff","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
+	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"mediaId":2501,"mediaLink":"https://mywptesting.site/2021/02/button-bug/sand-rock-texture-dry-brown-soil-726223-pxhere-com_/","mediaType":"image","mediaWidth":56,"verticalAlignment":"center"} -->
+	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media"><img src="https://mywptesting.site/wp-content/uploads/2021/02/sand-rock-texture-dry-brown-soil-726223-pxhere.com_-1024x681.jpg" alt="" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"}},"textColor":"black"} -->
+	<h2 class="has-black-color has-text-color" style="font-size:32px"><strong>'. __("What's the problem?") . '</strong></h2>
+	<!-- /wp:heading -->
+	
+	<!-- wp:paragraph {"style":{"typography":{"fontSize":"17px"}},"textColor":"black"} -->
+	<p class="has-black-color has-text-color" style="font-size:17px">'. __("Trees are more important today than ever before. More than 10,000 products are reportedly made from trees. Through chemistry, the humble woodpile is yielding chemicals, plastics and fabrics that were beyond comprehension when an axe first felled a Texas tree.") . '</p>
+	<!-- /wp:paragraph -->
+	
+	<!-- wp:buttons -->
+	<div class="wp-block-buttons"><!-- wp:button {"backgroundColor":"black","className":"is-style-fill"} -->
+	<div class="wp-block-button is-style-fill"><a class="wp-block-button__link has-black-background-color has-background">'. __("Learn more") . '</a></div>
+	<!-- /wp:button --></div>
+	<!-- /wp:buttons --></div></div>
+	<!-- /wp:media-text --></div></div>
+	<!-- /wp:cover -->',
+	'description' => _x( 'Media and text block with image to the left and text and button to the right', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/quote-portrait.php b/lib/block-patterns/quote-portrait.php
new file mode 100644
index 0000000000000..6a5ffe8eb0555
--- /dev/null
+++ b/lib/block-patterns/quote-portrait.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Quote with portrait
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Quote with portrait' ),
+	'categories'  => array( 'nature' ),
+	'content'     => '<!-- wp:group -->
+	<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:separator {"className":"is-style-default"} -->
+	<hr class="wp-block-separator is-style-default"/>
+	<!-- /wp:separator -->
+	
+	<!-- wp:image {"align":"center","id":553,"width":150,"height":150,"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
+	<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_HQR8BJFZID-1.jpg" alt="" class="wp-image-553" width="150" height="150"/></figure></div>
+	<!-- /wp:image -->
+	
+	<!-- wp:quote {"align":"center","className":"is-style-large"} -->
+	<blockquote class="wp-block-quote has-text-align-center is-style-large"><p>'. __("\"Contributing makes me feel like I'm being useful to the planet.\"") .'</p><cite>'. __("— Anna Wong, <em>Volunteer</em>") .'</cite></blockquote>
+	<!-- /wp:quote -->
+	
+	<!-- wp:separator {"className":"is-style-default"} -->
+	<hr class="wp-block-separator is-style-default"/>
+	<!-- /wp:separator --></div></div>
+	<!-- /wp:group -->',
+	'description' => _x( 'Testimonial quote with portrait', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/text-two-columns-title-2.php b/lib/block-patterns/text-two-columns-title-2.php
new file mode 100644
index 0000000000000..95eb0fe55a48f
--- /dev/null
+++ b/lib/block-patterns/text-two-columns-title-2.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Two columns text and title
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Two columns text and title' ),
+	'categories'  => array( 'art' ),
+	'content'     => '<!-- wp:group -->
+	<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":38}}} -->
+	<h2 style="font-size:38px"><strong>'. __("The voyage had begun, and had begun happily with a soft blue sky, and a calm sea.") .'</strong></h2>
+	<!-- /wp:heading -->
+	
+	<!-- wp:columns -->
+	<div class="wp-block-columns"><!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:paragraph {"fontSize":"small"} -->
+	<p style="font-size:18px">'. __("They followed her on to the deck. All the smoke and the houses had disappeared, and the ship was out in a wide space of sea very fresh and clear though pale in the early light. They had left London sitting on its mud. A very thin line of shadow tapered on the horizon, scarcely thick enough to stand the burden of Paris, which nevertheless rested upon it. They were free of roads, free of mankind, and the same exhilaration at their freedom ran through them all.") .'</p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:paragraph {"style":{"typography":{"fontSize":18}}} -->
+	<p style="font-size:18px"> '. __("The ship was making her way steadily through small waves which slapped her and then fizzled like effervescing water, leaving a little border of bubbles and foam on either side. The colourless October sky above was thinly clouded as if by the trail of wood-fire smoke, and the air was wonderfully salt and brisk. Indeed it was too cold to stand still. Mrs. Ambrose drew her arm within her husband's, and as they moved off it could be seen from the way in which her sloping cheek turned up to his that she had something private to communicate.") .'</p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns --></div></div>
+	<!-- /wp:group -->',
+	'description' => _x( 'Two columns text and title', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/text-two-columns-title.php b/lib/block-patterns/text-two-columns-title.php
new file mode 100644
index 0000000000000..ad9be173e2049
--- /dev/null
+++ b/lib/block-patterns/text-two-columns-title.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Two columns text and title
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Two columns text and title' ),
+	'categories'  => array( 'art' ),
+	'content'     => '<!-- wp:group {"align":"full","style":{"color":{"background":"#f2f0e9"}}} -->
+	<div class="wp-block-group alignfull"><div class="wp-block-group__inner-container"><!-- wp:columns {"align":"full","style":{"color":{"background":"#f2f0e9"}}} -->
+	<div class="wp-block-columns alignfull has-background" style="background-color:#f2f0e9"><!-- wp:column {"width":"60%"} -->
+	<div class="wp-block-column" style="flex-basis:60%"><!-- wp:spacer {"height":70} -->
+	<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+	
+	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"87px"}},"textColor":"black"} -->
+	<p class="has-black-color has-text-color" style="font-size:87px;line-height:1.1"><strong>'. __("Ancient Sea Representations") .'</strong></p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:spacer {"height":95} -->
+	<div style="height:95px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+	
+	<!-- wp:separator {"color":"black","className":"is-style-wide"} -->
+	<hr class="wp-block-separator has-text-color has-background has-black-background-color has-black-color is-style-wide"/>
+	<!-- /wp:separator --></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns --></div></div><!-- wp:columns {"align":"full","style":{"color":{"background":"#f2f0e9"}}} -->
+	<div class="wp-block-columns alignfull has-background" style="background-color:#f2f0e9"><!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:spacer {"height":350} -->
+	<div style="height:350px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:paragraph {"textColor":"black","fontSize":"extra-small"} -->
+	<p class="has-black-color has-text-color has-extra-small-font-size">'. __("Winding veils round their heads, the women walked on deck. They were now moving steadily down the river, passing the dark shapes of ships at anchor, and London was a swarm of lights with a pale yellow canopy drooping above it. There were the lights of the great theatres, the lights of the long streets, lights that indicated huge squares of domestic comfort, lights that hung high in air.") .'</p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:paragraph {"textColor":"black","fontSize":"extra-small"} -->
+	<p class="has-black-color has-text-color has-extra-small-font-size">'. __("No darkness would ever settle upon those lamps, as no darkness had settled upon them for hundreds of years. It seemed dreadful that the town should blaze for ever in the same spot; dreadful at least to people going away to adventure upon the sea, and beholding it as a circumscribed mound, eternally burnt, eternally scarred. From the deck of the ship the great city appeared a crouched and cowardly figure, a sedentary miser.") .'</p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns -->
+	<!-- /wp:group -->',
+	'description' => _x( 'Two columns text and title', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/three-columns-list.php b/lib/block-patterns/three-columns-list.php
new file mode 100644
index 0000000000000..cb6a0ff54595b
--- /dev/null
+++ b/lib/block-patterns/three-columns-list.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Three columns list
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Three columns list' ),
+	'categories'  => array( 'art' ),
+	'content'     => '<!-- wp:columns {"align":"full","backgroundColor":"white","textColor":"black"} -->
+	<div class="wp-block-columns alignfull has-black-color has-white-background-color has-text-color has-background"><!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:heading {"level":3} -->
+	<h3><strong><a href="http://wordpress.org" data-type="URL" data-id="wordpress.org">'. __("Virtual Tour ↗") .'</a></strong></h3>
+	<!-- /wp:heading -->
+	
+	<!-- wp:paragraph -->
+	<p>'. __("Get a virtual tour of the museum. Ideal for schools and events.") .'</p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:heading {"level":3} -->
+	<h3><strong><a href="https://wordpress.org">'. __("Open Exhibitions ↗") .'</a></strong></h3>
+	<!-- /wp:heading -->
+	
+	<!-- wp:paragraph -->
+	<p>'. __("Stay updated and see our current exhibitions here.") .'</p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:heading {"level":3} -->
+	<h3><strong><a href="https://wordpress.org">'. __("Useful Info ↗") .'</a></strong></h3>
+	<!-- /wp:heading -->
+	
+	<!-- wp:paragraph -->
+	<p>'. __("Get to know our opening times, ticket prices and discounts.") .'</p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns -->',
+	'description' => _x( 'Three columns list', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/three-columns-media-text.php b/lib/block-patterns/three-columns-media-text.php
new file mode 100644
index 0000000000000..0576ea2d8c7a8
--- /dev/null
+++ b/lib/block-patterns/three-columns-media-text.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Three columns with images and text
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Three columns with images and text' ),
+	'categories'  => array( 'nature' ),
+	'content'     => '<!-- wp:group {"align":"full","style":{"color":{"background":"#f8f4e4"}}} -->
+	<div class="wp-block-group alignfull has-background" style="background-color:#f8f4e4"><div class="wp-block-group__inner-container"><!-- wp:columns {"align":"wide"} -->
+	<div class="wp-block-columns alignwide"><!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:spacer -->
+	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+	
+	<!-- wp:heading {"level":6,"textColor":"black"} -->
+	<h6 class="has-black-color has-text-color">ECOSYSTEM</h6>
+	<!-- /wp:heading -->
+	
+	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1"}},"textColor":"black","fontSize":"huge"} -->
+	<p class="has-black-color has-text-color has-huge-font-size" style="line-height:1.1"><strong>'. __("Positive growth.") . '</strong></p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:spacer -->
+	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:spacer -->
+	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer --></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns -->
+	
+	<!-- wp:columns {"align":"wide"} -->
+	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"33.38%"} -->
+	<div class="wp-block-column" style="flex-basis:33.38%"><!-- wp:paragraph {"textColor":"black","fontSize":"extra-small"} -->
+	<p class="has-black-color has-text-color has-extra-small-font-size">'. __("<em>Nature</em>, in the common sense, refers to essences unchanged by man; space, the air, the river, the leaf.&nbsp;<em>Art</em>&nbsp;is applied to the mixture of his will with the same things, as in a house, a canal, a statue, a picture. But his operations taken together are so insignificant, a little chipping, baking, patching, and washing, that in an impression so grand as that of the world on the human mind, they do not vary the result.") . '</p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column {"width":"33%"} -->
+	<div class="wp-block-column" style="flex-basis:33%"><!-- wp:spacer -->
+	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+	
+	<!-- wp:image {"id":345,"sizeSlug":"large","linkDestination":"none"} -->
+	<figure class="wp-block-image size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_ZD6WAL4LGT-edited.jpg" alt="" class="wp-image-345"/></figure>
+	<!-- /wp:image --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column {"width":"33.62%"} -->
+	<div class="wp-block-column" style="flex-basis:33.62%"><!-- wp:image {"id":347,"sizeSlug":"large","linkDestination":"none"} -->
+	<figure class="wp-block-image size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_56RKHNDUQ2-edited-scaled.jpg" alt="" class="wp-image-347"/></figure>
+	<!-- /wp:image --></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns -->
+	
+	<!-- wp:columns {"align":"wide"} -->
+	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"67%"} -->
+	<div class="wp-block-column" style="flex-basis:67%"><!-- wp:image {"align":"right","id":348,"sizeSlug":"large","linkDestination":"none"} -->
+	<div class="wp-block-image"><figure class="alignright size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_H17J2YTARL-1024x683.jpg" alt="" class="wp-image-348"/></figure></div>
+	<!-- /wp:image --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column {"verticalAlignment":"center","width":"33%"} -->
+	<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:33%"><!-- wp:paragraph {"textColor":"black","fontSize":"extra-small"} -->
+	<p class="has-black-color has-text-color has-extra-small-font-size">'. __("Undoubtedly we have no questions to ask which are unanswerable. We must trust the perfection of the creation so far, as to believe that whatever curiosity the order of things has awakened in our minds, the order of things can satisfy. Every man's condition is a solution in hieroglyphic to those inquiries he would put.") . '</p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns --></div></div>
+	<!-- /wp:group -->',
+	'description' => _x( 'Three columns with images and text', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/three-images-gallery.php b/lib/block-patterns/three-images-gallery.php
new file mode 100644
index 0000000000000..e52a900b4198a
--- /dev/null
+++ b/lib/block-patterns/three-images-gallery.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Three Images gallery
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Three Images gallery' ),
+	'categories'  => array( 'arquitecture' ),
+	'content'     => '<!-- wp:columns {"align":"wide","backgroundColor":"white"} -->
+	<div class="wp-block-columns alignwide has-white-background-color has-background"><!-- wp:column {"width":"25%"} -->
+	<div class="wp-block-column" style="flex-basis:25%"><!-- wp:image {"id":240,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
+	<figure class="wp-block-image size-large is-style-default"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/wing-light-architecture-structure-wood-white-714046-pxhere.com_-576x1024.jpg" alt="" class="wp-image-240"/></figure>
+	<!-- /wp:image --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column {"width":"25%"} -->
+	<div class="wp-block-column" style="flex-basis:25%"><!-- wp:spacer {"height":500} -->
+	<div style="height:500px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+	
+	<!-- wp:spacer {"height":150} -->
+	<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+	
+	<!-- wp:image {"id":237,"sizeSlug":"large","linkDestination":"none"} -->
+	<figure class="wp-block-image size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/wing-architecture-structure-wood-white-house-997338-pxhere.com_-683x1024.jpg" alt="" class="wp-image-237"/></figure>
+	<!-- /wp:image --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column {"width":"45%"} -->
+	<div class="wp-block-column" style="flex-basis:45%"><!-- wp:image {"id":236,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
+	<figure class="wp-block-image size-large is-style-default"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/wing-architecture-structure-building-ceiling-geometric-99094-pxhere.com_-1024x683.jpg" alt="" class="wp-image-236"/></figure>
+	<!-- /wp:image -->
+	
+	<!-- wp:spacer {"height":285} -->
+	<div style="height:285px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer --></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns -->',
+	'description' => _x( 'Three Images gallery', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/two-columns-list.php b/lib/block-patterns/two-columns-list.php
new file mode 100644
index 0000000000000..8f96708f841e7
--- /dev/null
+++ b/lib/block-patterns/two-columns-list.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Two columns list
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Two columns list' ),
+	'categories'  => array( 'arquitecture' ),
+	'content'     => '<!-- wp:columns {"align":"full","backgroundColor":"white"} -->
+	<div class="wp-block-columns alignfull has-white-background-color has-background"><!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:spacer -->
+	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+	
+	<!-- wp:paragraph {"style":{"typography":{"fontSize":"21px"}},"textColor":"black"} -->
+	<p class="has-black-color has-text-color" style="font-size:21px"><strong>'. __("We have worked with:") .'</strong></p>
+	<!-- /wp:paragraph -->
+	
+	<!-- wp:paragraph {"style":{"typography":{"fontSize":"49px","lineHeight":"1.2"},"color":{"link":"#0026ff","text":"#0026ff"}}} -->
+	<p class="has-text-color has-link-color" style="--wp--style--color--link:#0026ff;color:#0026ff;font-size:49px;line-height:1.2"><a href="https://wordpress.org">'. __("EARTHFUND™<br>ARCHWEEKLY<br>FUTURE ROADS<br>BUILDING NY") .'</a></p>
+	<!-- /wp:paragraph -->
+	
+	<!-- wp:spacer -->
+	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:spacer {"height":160} -->
+	<div style="height:160px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+	
+	<!-- wp:paragraph {"style":{"typography":{"fontSize":"49px","lineHeight":"1.2"},"color":{"text":"#0026ff","link":"#0026ff"}}} -->
+	<p class="has-text-color has-link-color" style="--wp--style--color--link:#0026ff;color:#0026ff;font-size:49px;line-height:1.2"><a href="https://wordpress.org">'. __("DUBAI ROOFS<br>MAY WATSON STUDIO<br>Y.O.L<br>RUDIMENTAR") .'</a></p>
+	<!-- /wp:paragraph -->
+	
+	<!-- wp:spacer -->
+	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer --></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns -->',
+	'description' => _x( 'Two columns list', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/two-images-gallery.php b/lib/block-patterns/two-images-gallery.php
new file mode 100644
index 0000000000000..a0cbef60591f7
--- /dev/null
+++ b/lib/block-patterns/two-images-gallery.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Two Images side by side
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Two Images side by side' ),
+	'categories'  => array( 'nature' ),
+	'content'     => '<!-- wp:gallery {"ids":[259,258],"linkTo":"none","align":"wide"} -->
+	<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_IM8T5HVXU0-edited-1024x1024.jpg" alt="" data-id="259" data-full-url="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_IM8T5HVXU0-edited-scaled.jpg" data-link="https://blockpatterndesigns.mystagingwebsite.com/stocksnap_im8t5hvxu0-2/" class="wp-image-259"/></figure></li><li class="blocks-gallery-item"><figure><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_66J4T150FP-edited-1024x1024.jpg" alt="" data-id="258" data-full-url="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_66J4T150FP-edited-scaled.jpg" data-link="https://blockpatterndesigns.mystagingwebsite.com/stocksnap_66j4t150fp-2/" class="wp-image-258"/></figure></li></ul></figure>
+	<!-- /wp:gallery -->',
+	'description' => _x( 'Two Images side by side', 'Block pattern description' ),
+);

From 21bc47722275f6ec5a82b4507780feddfd61add6 Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Thu, 18 Mar 2021 12:11:06 +0100
Subject: [PATCH 02/44] changed background colors to group block

---
 lib/block-patterns/text-two-columns-title.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/block-patterns/text-two-columns-title.php b/lib/block-patterns/text-two-columns-title.php
index ad9be173e2049..3f6404f2fccdb 100644
--- a/lib/block-patterns/text-two-columns-title.php
+++ b/lib/block-patterns/text-two-columns-title.php
@@ -9,8 +9,8 @@
 	'title'       => __( 'Two columns text and title' ),
 	'categories'  => array( 'art' ),
 	'content'     => '<!-- wp:group {"align":"full","style":{"color":{"background":"#f2f0e9"}}} -->
-	<div class="wp-block-group alignfull"><div class="wp-block-group__inner-container"><!-- wp:columns {"align":"full","style":{"color":{"background":"#f2f0e9"}}} -->
-	<div class="wp-block-columns alignfull has-background" style="background-color:#f2f0e9"><!-- wp:column {"width":"60%"} -->
+	<div class="wp-block-group alignfull has-background" style="background-color:#f2f0e9"><!-- wp:columns {"align":"full"} -->
+	<div class="wp-block-columns alignfull"><!-- wp:column {"width":"60%"} -->
 	<div class="wp-block-column" style="flex-basis:60%"><!-- wp:spacer {"height":70} -->
 	<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
@@ -29,8 +29,10 @@
 	<hr class="wp-block-separator has-text-color has-background has-black-background-color has-black-color is-style-wide"/>
 	<!-- /wp:separator --></div>
 	<!-- /wp:column --></div>
-	<!-- /wp:columns --></div></div><!-- wp:columns {"align":"full","style":{"color":{"background":"#f2f0e9"}}} -->
-	<div class="wp-block-columns alignfull has-background" style="background-color:#f2f0e9"><!-- wp:column -->
+	<!-- /wp:columns -->
+	
+	<!-- wp:columns {"align":"full"} -->
+	<div class="wp-block-columns alignfull"><!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:spacer {"height":350} -->
 	<div style="height:350px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer --></div>
@@ -47,7 +49,7 @@
 	<p class="has-black-color has-text-color has-extra-small-font-size">'. __("No darkness would ever settle upon those lamps, as no darkness had settled upon them for hundreds of years. It seemed dreadful that the town should blaze for ever in the same spot; dreadful at least to people going away to adventure upon the sea, and beholding it as a circumscribed mound, eternally burnt, eternally scarred. From the deck of the ship the great city appeared a crouched and cowardly figure, a sedentary miser.") .'</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column --></div>
-	<!-- /wp:columns -->
+	<!-- /wp:columns --></div>
 	<!-- /wp:group -->',
 	'description' => _x( 'Two columns text and title', 'Block pattern description' ),
 );

From 0a423db9670c1ca7141625dcc4e2108dfe99f6e9 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 22 Mar 2021 15:46:09 -0400
Subject: [PATCH 03/44] Switch large text to use viewport width font sizes.

---
 lib/block-patterns/cover-columns.php            |  4 ++--
 lib/block-patterns/cover-quote.php              | 11 ++++++-----
 lib/block-patterns/hero-section.php             |  4 ++--
 lib/block-patterns/text-two-columns-title.php   |  4 ++--
 lib/block-patterns/three-columns-media-text.php |  4 ++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/lib/block-patterns/cover-columns.php b/lib/block-patterns/cover-columns.php
index 7670694789d89..21c48ae7245da 100644
--- a/lib/block-patterns/cover-columns.php
+++ b/lib/block-patterns/cover-columns.php
@@ -15,8 +15,8 @@
 	<hr class="wp-block-separator has-text-color has-background is-style-wide" style="background-color:#ffe074;color:#ffe074"/>
 	<!-- /wp:separator -->
 	
-	<!-- wp:heading {"style":{"color":{"text":"#ffe074"},"typography":{"fontSize":"200px"}}} -->
-	<h2 class="has-text-color" style="color:#ffe074;font-size:200px">'. __("80%*") . '</h2>
+	<!-- wp:heading {"style":{"color":{"text":"#ffe074"},"typography":{"fontSize":"16vw"}}} -->
+	<h2 class="has-text-color" style="color:#ffe074;font-size:16vw">'. __("80%*") . '</h2>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"12px","lineHeight":"1.3"},"color":{"text":"#ffe074","link":"#ffe074"}}} -->
diff --git a/lib/block-patterns/cover-quote.php b/lib/block-patterns/cover-quote.php
index 648b3134acb13..a36af578348ff 100644
--- a/lib/block-patterns/cover-quote.php
+++ b/lib/block-patterns/cover-quote.php
@@ -9,12 +9,13 @@
 	'title'       => __( 'Quote' ),
 	'categories'  => array( 'nature' ),
 	'content'     => '<!-- wp:cover {"url":"https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg","id":261,"dimRatio":60,"minHeight":800,"align":"full"} -->
-	<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background wp-image-261" alt="" src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:columns {"align":"wide"} -->
-	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"55%"} -->
-	<div class="wp-block-column" style="flex-basis:55%"><!-- wp:heading {"style":{"typography":{"fontSize":"200px"},"color":{"text":"#ffe074"}}} -->
-	<h2 class="has-text-color" style="color:#ffe074;font-size:200px">'. __("Forest.") . '</h2>
+	<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background wp-image-261" alt="" src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container">
+	<!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"14vw"},"color":{"text":"#ffe074"}}} -->
+	<h2 class="alignwide has-text-color" style="color:#ffe074;font-size:14vw">'. __("Forest.") . '</h2>
 	<!-- /wp:heading -->
-	
+	<!-- wp:columns {"align":"wide"} -->
+	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"55%"} -->
+	<div class="wp-block-column" style="flex-basis:55%">
 	<!-- wp:spacer {"height":330} -->
 	<div style="height:330px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
diff --git a/lib/block-patterns/hero-section.php b/lib/block-patterns/hero-section.php
index e27f236a4e984..47b4413351ee7 100644
--- a/lib/block-patterns/hero-section.php
+++ b/lib/block-patterns/hero-section.php
@@ -9,8 +9,8 @@
 	'title'       => __( 'Hero section' ),
 	'categories'  => array( 'art' ),
 	'content'     => '<!-- wp:cover {"url":"https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg","id":613,"hasParallax":true,"dimRatio":40,"overlayColor":"black","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
-	<div class="wp-block-cover alignfull has-background-dim-40 has-black-background-color has-background-dim has-parallax" style="background-image:url(https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"level":1,"align":"wide","textColor":"white"} -->
-	<h1 class="alignwide has-white-color has-text-color"><strong><em>'. __("Overseas: 1500 — 1960") .'</em></strong></h1>
+	<div class="wp-block-cover alignfull has-background-dim-40 has-black-background-color has-background-dim has-parallax" style="background-image:url(https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":"8vw"}},"className":"alignwide has-white-color has-text-color"} -->
+<h2 class="alignwide has-white-color has-text-color" style="font-size:8vw"><strong><em>'. __("Overseas: 1500 — 1960") .'</em></strong></h1>
 	<!-- /wp:heading -->
 	
 	<!-- wp:columns {"align":"wide"} -->
diff --git a/lib/block-patterns/text-two-columns-title.php b/lib/block-patterns/text-two-columns-title.php
index 3f6404f2fccdb..f68be569266d5 100644
--- a/lib/block-patterns/text-two-columns-title.php
+++ b/lib/block-patterns/text-two-columns-title.php
@@ -15,8 +15,8 @@
 	<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
 	
-	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"87px"}},"textColor":"black"} -->
-	<p class="has-black-color has-text-color" style="font-size:87px;line-height:1.1"><strong>'. __("Ancient Sea Representations") .'</strong></p>
+	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"5vw"}},"textColor":"black"} -->
+	<p class="has-black-color has-text-color" style="font-size:5vw;line-height:1.1"><strong>'. __("Ancient Sea Representations") .'</strong></p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
diff --git a/lib/block-patterns/three-columns-media-text.php b/lib/block-patterns/three-columns-media-text.php
index 0576ea2d8c7a8..efedf2ac9052c 100644
--- a/lib/block-patterns/three-columns-media-text.php
+++ b/lib/block-patterns/three-columns-media-text.php
@@ -19,8 +19,8 @@
 	<h6 class="has-black-color has-text-color">ECOSYSTEM</h6>
 	<!-- /wp:heading -->
 	
-	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1"}},"textColor":"black","fontSize":"huge"} -->
-	<p class="has-black-color has-text-color has-huge-font-size" style="line-height:1.1"><strong>'. __("Positive growth.") . '</strong></p>
+	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"5vw"}},"textColor":"black"} -->
+	<p class="has-black-color has-text-color" style="font-size:5vw;line-height:1.1"><strong>'. __("Positive growth.") . '</strong></p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	

From 36deadb6628048162c8b664586939df43d024f70 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 22 Mar 2021 15:53:10 -0400
Subject: [PATCH 04/44] Make "Overseas" font size slightly smaller so it sits
 on one line.

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

diff --git a/lib/block-patterns/hero-section.php b/lib/block-patterns/hero-section.php
index 47b4413351ee7..2a47fb1c259c3 100644
--- a/lib/block-patterns/hero-section.php
+++ b/lib/block-patterns/hero-section.php
@@ -9,8 +9,8 @@
 	'title'       => __( 'Hero section' ),
 	'categories'  => array( 'art' ),
 	'content'     => '<!-- wp:cover {"url":"https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg","id":613,"hasParallax":true,"dimRatio":40,"overlayColor":"black","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
-	<div class="wp-block-cover alignfull has-background-dim-40 has-black-background-color has-background-dim has-parallax" style="background-image:url(https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":"8vw"}},"className":"alignwide has-white-color has-text-color"} -->
-<h2 class="alignwide has-white-color has-text-color" style="font-size:8vw"><strong><em>'. __("Overseas: 1500 — 1960") .'</em></strong></h1>
+	<div class="wp-block-cover alignfull has-background-dim-40 has-black-background-color has-background-dim has-parallax" style="background-image:url(https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":"6vw"}},"className":"alignwide has-white-color has-text-color"} -->
+<h2 class="alignwide has-white-color has-text-color" style="font-size:6vw"><strong><em>'. __("Overseas: 1500 — 1960") .'</em></strong></h1>
 	<!-- /wp:heading -->
 	
 	<!-- wp:columns {"align":"wide"} -->

From 9349744110125e2ba22b1474ee825922eb43a2c6 Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Tue, 23 Mar 2021 11:46:01 +0100
Subject: [PATCH 05/44] renaming and pattern adjustments

---
 lib/block-patterns.php                        | 18 +++---
 lib/block-patterns/cover-quote.php            |  4 +-
 lib/block-patterns/heading.php                |  6 +-
 lib/block-patterns/large-header-button.php    | 14 -----
 ...ction.php => large-header-text-button.php} | 14 ++---
 .../media-text-arquitecture.php               | 26 +++------
 lib/block-patterns/media-text-art.php         | 16 +++---
 lib/block-patterns/media-text-nature.php      | 20 +++----
 .../{quote-portrait.php => quote-2.php}       |  6 +-
 ...olumns-list.php => text-two-columns-2.php} | 20 +++----
 .../text-two-columns-title-2.php              | 31 -----------
 .../text-two-columns-title-offset.php         | 55 +++++++++++++++++++
 lib/block-patterns/text-two-columns-title.php | 48 ++++------------
 .../three-columns-media-text.php              |  2 +-
 ...olumns-list.php => three-columns-text.php} |  8 +--
 lib/block-patterns/three-images-gallery.php   | 12 ++--
 ...ver-columns.php => two-columns-header.php} |  6 +-
 lib/block-patterns/two-images-gallery.php     |  8 +--
 18 files changed, 145 insertions(+), 169 deletions(-)
 delete mode 100644 lib/block-patterns/large-header-button.php
 rename lib/block-patterns/{hero-section.php => large-header-text-button.php} (78%)
 rename lib/block-patterns/{quote-portrait.php => quote-2.php} (92%)
 rename lib/block-patterns/{two-columns-list.php => text-two-columns-2.php} (53%)
 delete mode 100644 lib/block-patterns/text-two-columns-title-2.php
 create mode 100644 lib/block-patterns/text-two-columns-title-offset.php
 rename lib/block-patterns/{three-columns-list.php => three-columns-text.php} (88%)
 rename lib/block-patterns/{cover-columns.php => two-columns-header.php} (94%)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index b4fdf720cfae5..39bce380c87c6 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -184,17 +184,17 @@
 	'media-text-nature',
 	'two-images-gallery',
 	'cover-quote',
-	'cover-columns',
+	'two-columns-header',
 	'three-columns-media-text',
-	'quote-portrait',
-	'hero-section',
+	'quote-2',
+	'large-header-text-button',
 	'media-text-art',
 	'text-two-columns-title',
-	'three-columns-list',
-	'text-two-columns-title-2',
+	'three-columns-text',
+	'text-two-columns-title-offset',
 	'heading',
 	'three-images-gallery',
-	'two-columns-list',
+	'text-two-columns-2',
 	'media-text-arquitecture'
 );
 
@@ -205,6 +205,6 @@
 	);
 }
 
-register_block_pattern_category( 'nature', array( 'label' => _x( 'Nature', 'Block pattern category' ) ) );
-register_block_pattern_category( 'art', array( 'label' => _x( 'Art', 'Block pattern category' ) ) );
-register_block_pattern_category( 'arquitecture', array( 'label' => _x( 'Arquitecture', 'Block pattern category' ) ) );
\ No newline at end of file
+register_block_pattern_category( 'header', array( 'label' => _x( 'Headers', 'Block pattern category' ) ) );
+register_block_pattern_category( 'gallery', array( 'label' => _x( 'Gallery', 'Block pattern category' ) ) );
+register_block_pattern_category( 'text', array( 'label' => _x( 'Text', 'Block pattern category' ) ) );
\ No newline at end of file
diff --git a/lib/block-patterns/cover-quote.php b/lib/block-patterns/cover-quote.php
index a36af578348ff..ad8139b713743 100644
--- a/lib/block-patterns/cover-quote.php
+++ b/lib/block-patterns/cover-quote.php
@@ -6,8 +6,8 @@
  */
 
 return array(
-	'title'       => __( 'Quote' ),
-	'categories'  => array( 'nature' ),
+	'title'       => __( 'Large header with left-aligned text' ),
+	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"url":"https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg","id":261,"dimRatio":60,"minHeight":800,"align":"full"} -->
 	<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background wp-image-261" alt="" src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container">
 	<!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"14vw"},"color":{"text":"#ffe074"}}} -->
diff --git a/lib/block-patterns/heading.php b/lib/block-patterns/heading.php
index afc229fab0bcf..4eae5130e709e 100644
--- a/lib/block-patterns/heading.php
+++ b/lib/block-patterns/heading.php
@@ -7,9 +7,9 @@
 
 return array(
 	'title'       => __( 'Heading' ),
-	'categories'  => array( 'arquitecture' ),
-	'content'     => '<!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"55px","lineHeight":"1.1"},"color":{"text":"#0026ff"}}} -->
-	<h2 class="alignwide has-text-color" style="color:#0026ff;font-size:55px;line-height:1.1">'. __("We're a studio in Berlin with an international practice in architecture, urban planning and interior design. We believe in sharing knowledge and promoting dialogue to increase the creative potential of collaboration.") .'</h2>
+	'categories'  => array( 'text' ),
+	'content'     => '<!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"55px","lineHeight":"1.1"}}} -->
+	<h2 class="alignwide" style="font-size:55px;line-height:1.1">'. __("We're a studio in Berlin with an international practice in architecture, urban planning and interior design. We believe in sharing knowledge and promoting dialogue to increase the creative potential of collaboration.") .'</h2>
 	<!-- /wp:heading -->',
 	'description' => _x( 'Heading text', 'Block pattern description' ),
 );
diff --git a/lib/block-patterns/large-header-button.php b/lib/block-patterns/large-header-button.php
deleted file mode 100644
index 313dc26b47bca..0000000000000
--- a/lib/block-patterns/large-header-button.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Large header and a button block pattern.
- *
- * @package WordPress
- */
-
-return array(
-	'title'         => __( 'Large header with a heading and a button ' ),
-	'content'       => "<!-- wp:cover {\"minHeight\":575,\"minHeightUnit\":\"px\",\"customGradient\":\"linear-gradient(135deg,rgb(249,72,72) 1%,rgb(179,22,22) 100%)\",\"contentPosition\":\"center center\",\"align\":\"wide\"} -->\n<div class=\"wp-block-cover alignwide has-background-dim has-background-gradient is-position-center-center\" style=\"background:linear-gradient(135deg,rgb(249,72,72) 1%,rgb(179,22,22) 100%);min-height:575px\"><div class=\"wp-block-cover__inner-container\"><!-- wp:columns {\"align\":\"wide\"} -->\n<div class=\"wp-block-columns alignwide\"><!-- wp:column {\"width\":12} -->\n<div class=\"wp-block-column\" style=\"flex-basis:12%\"><!-- wp:spacer -->\n<div style=\"height:100px\" aria-hidden=\"true\" class=\"wp-block-spacer\"></div>\n<!-- /wp:spacer --></div>\n<!-- /wp:column -->\n\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:spacer -->\n<div style=\"height:100px\" aria-hidden=\"true\" class=\"wp-block-spacer\"></div>\n<!-- /wp:spacer -->\n\n<!-- wp:paragraph {\"align\":\"left\",\"placeholder\":\"" . __( 'Write title…' ) . "\",\"style\":{\"typography\":{\"fontSize\":68,\"lineHeight\":\"1.2\"},\"color\":{\"text\":\"#fffffa\"}}} -->\n<p class=\"has-text-align-left has-text-color\" style=\"line-height:1.2;font-size:68px;color:#fffffa\"><strong>" . __( 'Thou hast seen<br>nothing yet' ) . "</strong></p>\n<!-- /wp:paragraph -->\n\n<!-- wp:buttons -->\n<div class=\"wp-block-buttons\"><!-- wp:button {\"borderRadius\":3,\"style\":{\"color\":{\"background\":\"#fffffa\",\"text\":\"#00000a\"}}} -->\n<div class=\"wp-block-button\"><a class=\"wp-block-button__link has-text-color has-background\" style=\"border-radius:3px;background-color:#fffffa;color:#00000a\">" . __( 'Read now' ) . "</a></div>\n<!-- /wp:button --></div>\n<!-- /wp:buttons -->\n\n<!-- wp:spacer -->\n<div style=\"height:100px\" aria-hidden=\"true\" class=\"wp-block-spacer\"></div>\n<!-- /wp:spacer --></div>\n<!-- /wp:column -->\n\n<!-- wp:column {\"width\":12} -->\n<div class=\"wp-block-column\" style=\"flex-basis:12%\"><!-- wp:spacer -->\n<div style=\"height:100px\" aria-hidden=\"true\" class=\"wp-block-spacer\"></div>\n<!-- /wp:spacer --></div>\n<!-- /wp:column --></div>\n<!-- /wp:columns --></div></div>\n<!-- /wp:cover -->",
-	'viewportWidth' => 1000,
-	'categories'    => array( 'header' ),
-	'description'   => _x( 'A large hero section with a bright gradient background, a big heading and a filled button.', 'Block pattern description' ),
-);
diff --git a/lib/block-patterns/hero-section.php b/lib/block-patterns/large-header-text-button.php
similarity index 78%
rename from lib/block-patterns/hero-section.php
rename to lib/block-patterns/large-header-text-button.php
index 2a47fb1c259c3..622b3abc33e49 100644
--- a/lib/block-patterns/hero-section.php
+++ b/lib/block-patterns/large-header-text-button.php
@@ -1,22 +1,22 @@
 <?php
 /**
- * Hero section
+ * Large header with text and a button.
  *
  * @package WordPress
  */
 
 return array(
-	'title'       => __( 'Hero section' ),
-	'categories'  => array( 'art' ),
+	'title'       => __( 'Large header with text and a button.' ),
+	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"url":"https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg","id":613,"hasParallax":true,"dimRatio":40,"overlayColor":"black","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
 	<div class="wp-block-cover alignfull has-background-dim-40 has-black-background-color has-background-dim has-parallax" style="background-image:url(https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":"6vw"}},"className":"alignwide has-white-color has-text-color"} -->
 <h2 class="alignwide has-white-color has-text-color" style="font-size:6vw"><strong><em>'. __("Overseas: 1500 — 1960") .'</em></strong></h1>
 	<!-- /wp:heading -->
-	
+
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"60%"} -->
-	<div class="wp-block-column" style="flex-basis:60%"><!-- wp:paragraph -->
-	<p>'. __("An exhibition about the different representations of the ocean throughout time, between the sixteenth and the twentieth century. Taking place in our Open Room in <em>Floor 2</em>.") .'</p>
+	<div class="wp-block-column" style="flex-basis:60%"><!-- wp:paragraph {"style":{"color":{"text":"#ffffff"}}} -->
+	<p class="has-text-color" style="color:#ffffff">'. __("An exhibition about the different representations of the ocean throughout time, between the sixteenth and the twentieth century. Taking place in our Open Room in <em>Floor 2</em>.") .'</p>
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:buttons -->
@@ -31,5 +31,5 @@
 	<!-- /wp:column --></div>
 	<!-- /wp:columns --></div></div>
 	<!-- /wp:cover -->',
-	'description' => _x( 'Hero section with background image and text and button on top', 'Block pattern description' ),
+	'description' => _x( 'Large header with background image and text and button on top', 'Block pattern description' ),
 );
diff --git a/lib/block-patterns/media-text-arquitecture.php b/lib/block-patterns/media-text-arquitecture.php
index 474739a46895f..613c52148e00d 100644
--- a/lib/block-patterns/media-text-arquitecture.php
+++ b/lib/block-patterns/media-text-arquitecture.php
@@ -1,29 +1,21 @@
 <?php
 /**
- * Media + Text
+ * Media and text with image on the right
  *
  * @package WordPress
  */
 
 return array(
-	'title'       => __( 'Media + text' ),
-	'categories'  => array( 'arquitecture' ),
-	'content'     => '<!-- wp:columns {"align":"full","backgroundColor":"white"} -->
-	<div class="wp-block-columns alignfull has-white-background-color has-background"><!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:image {"align":"full","id":330,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image alignfull size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_C7E4WYWEHZ-edited-768x1024.jpg" alt="" class="wp-image-330"/></figure>
-	<!-- /wp:image --></div>
-	<!-- /wp:column -->
-	
-	<!-- wp:column {"verticalAlignment":"center"} -->
-	<div class="wp-block-column is-vertically-aligned-center"><!-- wp:heading {"textAlign":"center","level":3,"textColor":"black"} -->
+	'title'       => __( 'Media and text with image on the right' ),
+	'categories'  => array( 'text' ),
+	'content'     => '<!-- wp:media-text {"align":"full","mediaId":1352,"mediaType":"image","verticalAlignment":"center"} -->
+	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_C7E4WYWEHZ-edited-768x1024.jpg" alt="" class="wp-image-1352 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"textColor":"black"} -->
 	<h3 class="has-text-align-center has-black-color has-text-color"><strong>'. __("Open Spaces") .'</strong></h3>
 	<!-- /wp:heading -->
 	
-	<!-- wp:paragraph {"align":"center","style":{"color":{"text":"#0026ff"}},"fontSize":"extra-small"} -->
-	<p class="has-text-align-center has-text-color has-extra-small-font-size" style="color:#0026ff"><a href="https://blockpatterndesigns.mystagingwebsite.com">'. __("See case study ↗") .'</a></p>
-	<!-- /wp:paragraph --></div>
-	<!-- /wp:column --></div>
-	<!-- /wp:columns -->',
+	<!-- wp:paragraph {"align":"center","fontSize":"extra-small"} -->
+	<p class="has-text-align-center has-extra-small-font-size"><a href="https://blockpatterndesigns.mystagingwebsite.com">'. __("See case study ↗") .'</a></p>
+	<!-- /wp:paragraph --></div></div>
+	<!-- /wp:media-text -->',
 	'description' => _x( 'Media and text block with image to the left and text to the right', 'Block pattern description' ),
 );
diff --git a/lib/block-patterns/media-text-art.php b/lib/block-patterns/media-text-art.php
index 4338ad4550aed..f036d989f1b77 100644
--- a/lib/block-patterns/media-text-art.php
+++ b/lib/block-patterns/media-text-art.php
@@ -1,23 +1,21 @@
 <?php
 /**
- * Media + Text
+ * Media & text with image on the right
  *
  * @package WordPress
  */
 
 return array(
-	'title'       => __( 'Media + text' ),
-	'categories'  => array( 'art' ),
-	'content'     => '<!-- wp:cover {"customOverlayColor":"#ffffff","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
-	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"align":"full","mediaPosition":"right","mediaId":615,"mediaLink":"https://blockpatterndesigns.mystagingwebsite.com/block-patterns-art/508741ldsdl/","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","className":"is-style-default"} -->
-	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/508741ldsdl-1024x870.jpg" alt="" class="wp-image-615 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"35px"}},"textColor":"black"} -->
-	<h2 class="has-black-color has-text-color" style="font-size:35px"><strong>'. __("Shore with Blue Sea") .'</strong></h2>
+	'title'       => __( 'Media & text with image on the right' ),
+	'categories'  => array( 'header' ),
+	'content'     => '<!-- wp:media-text {"align":"full","mediaPosition":"right","mediaId":615,"mediaLink":"https://blockpatterndesigns.mystagingwebsite.com/block-patterns-art/508741ldsdl/","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","className":"is-style-default"} -->
+	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/508741ldsdl-1024x870.jpg" alt="" class="wp-image-615 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"color":{"text":"#000000"}},"className":"has-text-color"} -->
+	<h2 class="has-text-color" style="color:#000000"><strong>'. __("Shore with Blue Sea") .'</strong></h2>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"17px"},"color":{"text":"#636363"}}} -->
 	<p class="has-text-color" style="color:#636363;font-size:17px">'. __("Eleanor Harris&nbsp;(American, 1901-1942)") .'</p>
 	<!-- /wp:paragraph --></div></div>
-	<!-- /wp:media-text --></div></div>
-	<!-- /wp:cover -->',
+	<!-- /wp:media-text -->',
 	'description' => _x( 'Media and text block with image to the right and text to the left', 'Block pattern description' ),
 );
diff --git a/lib/block-patterns/media-text-nature.php b/lib/block-patterns/media-text-nature.php
index 6dc4905b6fec0..7fe1d1ca9fe81 100644
--- a/lib/block-patterns/media-text-nature.php
+++ b/lib/block-patterns/media-text-nature.php
@@ -1,26 +1,26 @@
 <?php
 /**
- * Media + text 
+ * Media & text in a full height container
  *
  * @package WordPress
  */
 
 return array(
-	'title'       => __( 'Media + text' ),
-	'categories'  => array( 'nature' ),
+	'title'       => __( 'Media & text in a full height container' ),
+	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"customOverlayColor":"#ffffff","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
 	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"mediaId":2501,"mediaLink":"https://mywptesting.site/2021/02/button-bug/sand-rock-texture-dry-brown-soil-726223-pxhere-com_/","mediaType":"image","mediaWidth":56,"verticalAlignment":"center"} -->
-	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media"><img src="https://mywptesting.site/wp-content/uploads/2021/02/sand-rock-texture-dry-brown-soil-726223-pxhere.com_-1024x681.jpg" alt="" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"}},"textColor":"black"} -->
-	<h2 class="has-black-color has-text-color" style="font-size:32px"><strong>'. __("What's the problem?") . '</strong></h2>
+	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media"><img src="https://mywptesting.site/wp-content/uploads/2021/02/sand-rock-texture-dry-brown-soil-726223-pxhere.com_-1024x681.jpg" alt="" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
+	<h2 class="has-text-color" style="color:#000000;font-size:32px"><strong>'. __("What's the problem?") . '</strong></h2>
 	<!-- /wp:heading -->
 	
-	<!-- wp:paragraph {"style":{"typography":{"fontSize":"17px"}},"textColor":"black"} -->
-	<p class="has-black-color has-text-color" style="font-size:17px">'. __("Trees are more important today than ever before. More than 10,000 products are reportedly made from trees. Through chemistry, the humble woodpile is yielding chemicals, plastics and fabrics that were beyond comprehension when an axe first felled a Texas tree.") . '</p>
+	<!-- wp:paragraph {"style":{"typography":{"fontSize":"17px"},"color":{"text":"#000000"}}} -->
+	<p class="has-text-color" style="color:#000000;font-size:17px">'. __("Trees are more important today than ever before. More than 10,000 products are reportedly made from trees. Through chemistry, the humble woodpile is yielding chemicals, plastics and fabrics that were beyond comprehension when an axe first felled a Texas tree.") . '</p>
 	<!-- /wp:paragraph -->
-	
+
 	<!-- wp:buttons -->
-	<div class="wp-block-buttons"><!-- wp:button {"backgroundColor":"black","className":"is-style-fill"} -->
-	<div class="wp-block-button is-style-fill"><a class="wp-block-button__link has-black-background-color has-background">'. __("Learn more") . '</a></div>
+	<div class="wp-block-buttons"><!-- wp:button {"className":"is-style-fill"} -->
+	<div class="wp-block-button is-style-fill"><a class="wp-block-button__link">'. __("Learn more") . '</a></div>
 	<!-- /wp:button --></div>
 	<!-- /wp:buttons --></div></div>
 	<!-- /wp:media-text --></div></div>
diff --git a/lib/block-patterns/quote-portrait.php b/lib/block-patterns/quote-2.php
similarity index 92%
rename from lib/block-patterns/quote-portrait.php
rename to lib/block-patterns/quote-2.php
index 6a5ffe8eb0555..e31da2986df07 100644
--- a/lib/block-patterns/quote-portrait.php
+++ b/lib/block-patterns/quote-2.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * Quote with portrait
+ * Quote
  *
  * @package WordPress
  */
 
 return array(
-	'title'       => __( 'Quote with portrait' ),
-	'categories'  => array( 'nature' ),
+	'title'       => __( 'Quote' ),
+	'categories'  => array( 'text' ),
 	'content'     => '<!-- wp:group -->
 	<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:separator {"className":"is-style-default"} -->
 	<hr class="wp-block-separator is-style-default"/>
diff --git a/lib/block-patterns/two-columns-list.php b/lib/block-patterns/text-two-columns-2.php
similarity index 53%
rename from lib/block-patterns/two-columns-list.php
rename to lib/block-patterns/text-two-columns-2.php
index 8f96708f841e7..bc51ade8a24c2 100644
--- a/lib/block-patterns/two-columns-list.php
+++ b/lib/block-patterns/text-two-columns-2.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * Two columns list
+ * Two columns of text
  *
  * @package WordPress
  */
 
 return array(
-	'title'       => __( 'Two columns list' ),
-	'categories'  => array( 'arquitecture' ),
-	'content'     => '<!-- wp:columns {"align":"full","backgroundColor":"white"} -->
-	<div class="wp-block-columns alignfull has-white-background-color has-background"><!-- wp:column -->
+	'title'       => __( 'Two columns of text' ),
+	'categories'  => array( 'text' ),
+	'content'     => '<!-- wp:columns {"align":"full"} -->
+	<div class="wp-block-columns alignfull"><!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:spacer -->
 	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
@@ -18,8 +18,8 @@
 	<p class="has-black-color has-text-color" style="font-size:21px"><strong>'. __("We have worked with:") .'</strong></p>
 	<!-- /wp:paragraph -->
 	
-	<!-- wp:paragraph {"style":{"typography":{"fontSize":"49px","lineHeight":"1.2"},"color":{"link":"#0026ff","text":"#0026ff"}}} -->
-	<p class="has-text-color has-link-color" style="--wp--style--color--link:#0026ff;color:#0026ff;font-size:49px;line-height:1.2"><a href="https://wordpress.org">'. __("EARTHFUND™<br>ARCHWEEKLY<br>FUTURE ROADS<br>BUILDING NY") .'</a></p>
+	<!-- wp:paragraph {"style":{"typography":{"fontSize":"49px","lineHeight":"1.2"}}} -->
+	<p style="font-size:49px;line-height:1.2"><a href="https://wordpress.org">'. __("EARTHFUND™<br>ARCHWEEKLY<br>FUTURE ROADS<br>BUILDING NY") .'</a></p>
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:spacer -->
@@ -32,8 +32,8 @@
 	<div style="height:160px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
 	
-	<!-- wp:paragraph {"style":{"typography":{"fontSize":"49px","lineHeight":"1.2"},"color":{"text":"#0026ff","link":"#0026ff"}}} -->
-	<p class="has-text-color has-link-color" style="--wp--style--color--link:#0026ff;color:#0026ff;font-size:49px;line-height:1.2"><a href="https://wordpress.org">'. __("DUBAI ROOFS<br>MAY WATSON STUDIO<br>Y.O.L<br>RUDIMENTAR") .'</a></p>
+	<!-- wp:paragraph {"style":{"typography":{"fontSize":"49px","lineHeight":"1.2"}}} -->
+	<p style="font-size:49px;line-height:1.2"><a href="https://wordpress.org">'. __("DUBAI ROOFS<br>MAY WATSON STUDIO<br>Y.O.L<br>RUDIMENTAR") .'</a></p>
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:spacer -->
@@ -41,5 +41,5 @@
 	<!-- /wp:spacer --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->',
-	'description' => _x( 'Two columns list', 'Block pattern description' ),
+	'description' => _x( 'Two columns of text', 'Block pattern description' ),
 );
diff --git a/lib/block-patterns/text-two-columns-title-2.php b/lib/block-patterns/text-two-columns-title-2.php
deleted file mode 100644
index 95eb0fe55a48f..0000000000000
--- a/lib/block-patterns/text-two-columns-title-2.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Two columns text and title
- *
- * @package WordPress
- */
-
-return array(
-	'title'       => __( 'Two columns text and title' ),
-	'categories'  => array( 'art' ),
-	'content'     => '<!-- wp:group -->
-	<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":38}}} -->
-	<h2 style="font-size:38px"><strong>'. __("The voyage had begun, and had begun happily with a soft blue sky, and a calm sea.") .'</strong></h2>
-	<!-- /wp:heading -->
-	
-	<!-- wp:columns -->
-	<div class="wp-block-columns"><!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:paragraph {"fontSize":"small"} -->
-	<p style="font-size:18px">'. __("They followed her on to the deck. All the smoke and the houses had disappeared, and the ship was out in a wide space of sea very fresh and clear though pale in the early light. They had left London sitting on its mud. A very thin line of shadow tapered on the horizon, scarcely thick enough to stand the burden of Paris, which nevertheless rested upon it. They were free of roads, free of mankind, and the same exhilaration at their freedom ran through them all.") .'</p>
-	<!-- /wp:paragraph --></div>
-	<!-- /wp:column -->
-	
-	<!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:paragraph {"style":{"typography":{"fontSize":18}}} -->
-	<p style="font-size:18px"> '. __("The ship was making her way steadily through small waves which slapped her and then fizzled like effervescing water, leaving a little border of bubbles and foam on either side. The colourless October sky above was thinly clouded as if by the trail of wood-fire smoke, and the air was wonderfully salt and brisk. Indeed it was too cold to stand still. Mrs. Ambrose drew her arm within her husband's, and as they moved off it could be seen from the way in which her sloping cheek turned up to his that she had something private to communicate.") .'</p>
-	<!-- /wp:paragraph --></div>
-	<!-- /wp:column --></div>
-	<!-- /wp:columns --></div></div>
-	<!-- /wp:group -->',
-	'description' => _x( 'Two columns text and title', 'Block pattern description' ),
-);
diff --git a/lib/block-patterns/text-two-columns-title-offset.php b/lib/block-patterns/text-two-columns-title-offset.php
new file mode 100644
index 0000000000000..e1136452c23db
--- /dev/null
+++ b/lib/block-patterns/text-two-columns-title-offset.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Two columns of text with offset heading
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Two columns of text with offset heading' ),
+	'categories'  => array( 'text' ),
+	'content'     => '<!-- wp:group {"align":"full","style":{"color":{"background":"#f2f0e9"}}} -->
+	<div class="wp-block-group alignfull has-background" style="background-color:#f2f0e9"><!-- wp:columns {"align":"full"} -->
+	<div class="wp-block-columns alignfull"><!-- wp:column {"width":"60%"} -->
+	<div class="wp-block-column" style="flex-basis:60%"><!-- wp:spacer {"height":70} -->
+	<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+	
+	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"5vw"}},"textColor":"black"} -->
+	<p class="has-black-color has-text-color" style="font-size:5vw;line-height:1.1"><strong>'. __("Ancient Sea Representations") .'</strong></p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:spacer {"height":95} -->
+	<div style="height:95px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+	
+	<!-- wp:separator {"color":"black","className":"is-style-wide"} -->
+	<hr class="wp-block-separator has-text-color has-background has-black-background-color has-black-color is-style-wide"/>
+	<!-- /wp:separator --></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns -->
+	
+	<!-- wp:columns {"align":"full"} -->
+	<div class="wp-block-columns alignfull"><!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:spacer {"height":350} -->
+	<div style="height:350px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:paragraph {"textColor":"black","fontSize":"extra-small"} -->
+	<p class="has-black-color has-text-color has-extra-small-font-size">'. __("Winding veils round their heads, the women walked on deck. They were now moving steadily down the river, passing the dark shapes of ships at anchor, and London was a swarm of lights with a pale yellow canopy drooping above it. There were the lights of the great theatres, the lights of the long streets, lights that indicated huge squares of domestic comfort, lights that hung high in air.") .'</p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:paragraph {"textColor":"black","fontSize":"extra-small"} -->
+	<p class="has-black-color has-text-color has-extra-small-font-size">'. __("No darkness would ever settle upon those lamps, as no darkness had settled upon them for hundreds of years. It seemed dreadful that the town should blaze for ever in the same spot; dreadful at least to people going away to adventure upon the sea, and beholding it as a circumscribed mound, eternally burnt, eternally scarred. From the deck of the ship the great city appeared a crouched and cowardly figure, a sedentary miser.") .'</p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns --></div>
+	<!-- /wp:group -->',
+	'description' => _x( 'Two columns of text with offset heading', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/text-two-columns-title.php b/lib/block-patterns/text-two-columns-title.php
index f68be569266d5..4e00721c7a11e 100644
--- a/lib/block-patterns/text-two-columns-title.php
+++ b/lib/block-patterns/text-two-columns-title.php
@@ -7,49 +7,25 @@
 
 return array(
 	'title'       => __( 'Two columns text and title' ),
-	'categories'  => array( 'art' ),
-	'content'     => '<!-- wp:group {"align":"full","style":{"color":{"background":"#f2f0e9"}}} -->
-	<div class="wp-block-group alignfull has-background" style="background-color:#f2f0e9"><!-- wp:columns {"align":"full"} -->
-	<div class="wp-block-columns alignfull"><!-- wp:column {"width":"60%"} -->
-	<div class="wp-block-column" style="flex-basis:60%"><!-- wp:spacer {"height":70} -->
-	<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
+	'categories'  => array( 'text' ),
+	'content'     => '<!-- wp:group -->
+	<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":38}}} -->
+	<h2 style="font-size:38px"><strong>'. __("The voyage had begun, and had begun happily with a soft blue sky, and a calm sea.") .'</strong></h2>
+	<!-- /wp:heading -->
 	
-	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"5vw"}},"textColor":"black"} -->
-	<p class="has-black-color has-text-color" style="font-size:5vw;line-height:1.1"><strong>'. __("Ancient Sea Representations") .'</strong></p>
+	<!-- wp:columns -->
+	<div class="wp-block-columns"><!-- wp:column -->
+	<div class="wp-block-column"><!-- wp:paragraph {"fontSize":"small"} -->
+	<p style="font-size:18px">'. __("They followed her on to the deck. All the smoke and the houses had disappeared, and the ship was out in a wide space of sea very fresh and clear though pale in the early light. They had left London sitting on its mud. A very thin line of shadow tapered on the horizon, scarcely thick enough to stand the burden of Paris, which nevertheless rested upon it. They were free of roads, free of mankind, and the same exhilaration at their freedom ran through them all.") .'</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:spacer {"height":95} -->
-	<div style="height:95px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-	
-	<!-- wp:separator {"color":"black","className":"is-style-wide"} -->
-	<hr class="wp-block-separator has-text-color has-background has-black-background-color has-black-color is-style-wide"/>
-	<!-- /wp:separator --></div>
-	<!-- /wp:column --></div>
-	<!-- /wp:columns -->
-	
-	<!-- wp:columns {"align":"full"} -->
-	<div class="wp-block-columns alignfull"><!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:spacer {"height":350} -->
-	<div style="height:350px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer --></div>
-	<!-- /wp:column -->
-	
-	<!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:paragraph {"textColor":"black","fontSize":"extra-small"} -->
-	<p class="has-black-color has-text-color has-extra-small-font-size">'. __("Winding veils round their heads, the women walked on deck. They were now moving steadily down the river, passing the dark shapes of ships at anchor, and London was a swarm of lights with a pale yellow canopy drooping above it. There were the lights of the great theatres, the lights of the long streets, lights that indicated huge squares of domestic comfort, lights that hung high in air.") .'</p>
-	<!-- /wp:paragraph --></div>
-	<!-- /wp:column -->
-	
-	<!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:paragraph {"textColor":"black","fontSize":"extra-small"} -->
-	<p class="has-black-color has-text-color has-extra-small-font-size">'. __("No darkness would ever settle upon those lamps, as no darkness had settled upon them for hundreds of years. It seemed dreadful that the town should blaze for ever in the same spot; dreadful at least to people going away to adventure upon the sea, and beholding it as a circumscribed mound, eternally burnt, eternally scarred. From the deck of the ship the great city appeared a crouched and cowardly figure, a sedentary miser.") .'</p>
+	<div class="wp-block-column"><!-- wp:paragraph {"style":{"typography":{"fontSize":18}}} -->
+	<p style="font-size:18px"> '. __("The ship was making her way steadily through small waves which slapped her and then fizzled like effervescing water, leaving a little border of bubbles and foam on either side. The colourless October sky above was thinly clouded as if by the trail of wood-fire smoke, and the air was wonderfully salt and brisk. Indeed it was too cold to stand still. Mrs. Ambrose drew her arm within her husband's, and as they moved off it could be seen from the way in which her sloping cheek turned up to his that she had something private to communicate.") .'</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column --></div>
-	<!-- /wp:columns --></div>
+	<!-- /wp:columns --></div></div>
 	<!-- /wp:group -->',
 	'description' => _x( 'Two columns text and title', 'Block pattern description' ),
 );
diff --git a/lib/block-patterns/three-columns-media-text.php b/lib/block-patterns/three-columns-media-text.php
index efedf2ac9052c..b7d3944124d36 100644
--- a/lib/block-patterns/three-columns-media-text.php
+++ b/lib/block-patterns/three-columns-media-text.php
@@ -7,7 +7,7 @@
 
 return array(
 	'title'       => __( 'Three columns with images and text' ),
-	'categories'  => array( 'nature' ),
+	'categories'  => array( 'gallery' ),
 	'content'     => '<!-- wp:group {"align":"full","style":{"color":{"background":"#f8f4e4"}}} -->
 	<div class="wp-block-group alignfull has-background" style="background-color:#f8f4e4"><div class="wp-block-group__inner-container"><!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column -->
diff --git a/lib/block-patterns/three-columns-list.php b/lib/block-patterns/three-columns-text.php
similarity index 88%
rename from lib/block-patterns/three-columns-list.php
rename to lib/block-patterns/three-columns-text.php
index cb6a0ff54595b..213080a739070 100644
--- a/lib/block-patterns/three-columns-list.php
+++ b/lib/block-patterns/three-columns-text.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * Three columns list
+ * Three columns of text
  *
  * @package WordPress
  */
 
 return array(
-	'title'       => __( 'Three columns list' ),
-	'categories'  => array( 'art' ),
+	'title'       => __( 'Three columns of text' ),
+	'categories'  => array( 'text' ),
 	'content'     => '<!-- wp:columns {"align":"full","backgroundColor":"white","textColor":"black"} -->
 	<div class="wp-block-columns alignfull has-black-color has-white-background-color has-text-color has-background"><!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:heading {"level":3} -->
@@ -39,5 +39,5 @@
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->',
-	'description' => _x( 'Three columns list', 'Block pattern description' ),
+	'description' => _x( 'Three columns of text', 'Block pattern description' ),
 );
diff --git a/lib/block-patterns/three-images-gallery.php b/lib/block-patterns/three-images-gallery.php
index e52a900b4198a..b898681e097f8 100644
--- a/lib/block-patterns/three-images-gallery.php
+++ b/lib/block-patterns/three-images-gallery.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * Three Images gallery
+ * Three columns with offset images
  *
  * @package WordPress
  */
 
 return array(
-	'title'       => __( 'Three Images gallery' ),
-	'categories'  => array( 'arquitecture' ),
-	'content'     => '<!-- wp:columns {"align":"wide","backgroundColor":"white"} -->
-	<div class="wp-block-columns alignwide has-white-background-color has-background"><!-- wp:column {"width":"25%"} -->
+	'title'       => __( 'Three columns with offset images' ),
+	'categories'  => array( 'gallery' ),
+	'content'     => '<!-- wp:columns {"align":"wide"} -->
+	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"25%"} -->
 	<div class="wp-block-column" style="flex-basis:25%"><!-- wp:image {"id":240,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
 	<figure class="wp-block-image size-large is-style-default"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/wing-light-architecture-structure-wood-white-714046-pxhere.com_-576x1024.jpg" alt="" class="wp-image-240"/></figure>
 	<!-- /wp:image --></div>
@@ -39,5 +39,5 @@
 	<!-- /wp:spacer --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->',
-	'description' => _x( 'Three Images gallery', 'Block pattern description' ),
+	'description' => _x( 'Three columns with offset images', 'Block pattern description' ),
 );
diff --git a/lib/block-patterns/cover-columns.php b/lib/block-patterns/two-columns-header.php
similarity index 94%
rename from lib/block-patterns/cover-columns.php
rename to lib/block-patterns/two-columns-header.php
index 21c48ae7245da..5e69e6e96c46e 100644
--- a/lib/block-patterns/cover-columns.php
+++ b/lib/block-patterns/two-columns-header.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * Cover with two columns
+ * Large header with two columns
  *
  * @package WordPress
  */
 
 return array(
-	'title'       => __( 'Cover with two columns' ),
-	'categories'  => array( 'nature' ),
+	'title'       => __( 'Large header with two columns' ),
+	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"customOverlayColor":"#51503b","minHeight":800,"align":"full"} -->
 	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#51503b;min-height:800px"><div class="wp-block-cover__inner-container"><!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column -->
diff --git a/lib/block-patterns/two-images-gallery.php b/lib/block-patterns/two-images-gallery.php
index a0cbef60591f7..3ffabeb4857ba 100644
--- a/lib/block-patterns/two-images-gallery.php
+++ b/lib/block-patterns/two-images-gallery.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * Two Images side by side
+ * Two images side by side
  *
  * @package WordPress
  */
 
 return array(
-	'title'       => __( 'Two Images side by side' ),
-	'categories'  => array( 'nature' ),
+	'title'       => __( 'Two images side by side' ),
+	'categories'  => array( 'gallery' ),
 	'content'     => '<!-- wp:gallery {"ids":[259,258],"linkTo":"none","align":"wide"} -->
 	<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_IM8T5HVXU0-edited-1024x1024.jpg" alt="" data-id="259" data-full-url="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_IM8T5HVXU0-edited-scaled.jpg" data-link="https://blockpatterndesigns.mystagingwebsite.com/stocksnap_im8t5hvxu0-2/" class="wp-image-259"/></figure></li><li class="blocks-gallery-item"><figure><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_66J4T150FP-edited-1024x1024.jpg" alt="" data-id="258" data-full-url="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_66J4T150FP-edited-scaled.jpg" data-link="https://blockpatterndesigns.mystagingwebsite.com/stocksnap_66j4t150fp-2/" class="wp-image-258"/></figure></li></ul></figure>
 	<!-- /wp:gallery -->',
-	'description' => _x( 'Two Images side by side', 'Block pattern description' ),
+	'description' => _x( 'Two images side by side', 'Block pattern description' ),
 );

From b2c77c47bb502d018e465268e2795c461826ce2d Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Tue, 23 Mar 2021 13:39:42 +0100
Subject: [PATCH 06/44] linting

---
 lib/block-patterns.php                               |  4 ++--
 lib/block-patterns/cover-quote.php                   |  4 ++--
 lib/block-patterns/heading.php                       |  2 +-
 lib/block-patterns/large-header-text-button.php      |  6 +++---
 lib/block-patterns/media-text-arquitecture.php       |  4 ++--
 lib/block-patterns/media-text-art.php                |  4 ++--
 lib/block-patterns/media-text-nature.php             |  6 +++---
 lib/block-patterns/quote-2.php                       |  2 +-
 lib/block-patterns/text-two-columns-2.php            |  6 +++---
 lib/block-patterns/text-two-columns-title-offset.php |  6 +++---
 lib/block-patterns/text-two-columns-title.php        |  6 +++---
 lib/block-patterns/three-columns-media-text.php      |  6 +++---
 lib/block-patterns/three-columns-text.php            | 12 ++++++------
 lib/block-patterns/two-columns-header.php            |  4 ++--
 14 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index 39bce380c87c6..01db084c96cc6 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -195,7 +195,7 @@
 	'heading',
 	'three-images-gallery',
 	'text-two-columns-2',
-	'media-text-arquitecture'
+	'media-text-arquitecture',
 );
 
 foreach ( $core_block_patterns as $core_block_pattern ) {
@@ -207,4 +207,4 @@
 
 register_block_pattern_category( 'header', array( 'label' => _x( 'Headers', 'Block pattern category' ) ) );
 register_block_pattern_category( 'gallery', array( 'label' => _x( 'Gallery', 'Block pattern category' ) ) );
-register_block_pattern_category( 'text', array( 'label' => _x( 'Text', 'Block pattern category' ) ) );
\ No newline at end of file
+register_block_pattern_category( 'text', array( 'label' => _x( 'Text', 'Block pattern category' ) ) );
diff --git a/lib/block-patterns/cover-quote.php b/lib/block-patterns/cover-quote.php
index ad8139b713743..e825d598bb9ea 100644
--- a/lib/block-patterns/cover-quote.php
+++ b/lib/block-patterns/cover-quote.php
@@ -11,7 +11,7 @@
 	'content'     => '<!-- wp:cover {"url":"https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg","id":261,"dimRatio":60,"minHeight":800,"align":"full"} -->
 	<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background wp-image-261" alt="" src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container">
 	<!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"14vw"},"color":{"text":"#ffe074"}}} -->
-	<h2 class="alignwide has-text-color" style="color:#ffe074;font-size:14vw">'. __("Forest.") . '</h2>
+	<h2 class="alignwide has-text-color" style="color:#ffe074;font-size:14vw">' . __( 'Forest.' ) . '</h2>
 	<!-- /wp:heading -->
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"55%"} -->
@@ -21,7 +21,7 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:paragraph {"style":{"color":{"text":"#ffe074"},"typography":{"lineHeight":"1.3","fontSize":"12px"}}} -->
-	<p class="has-text-color" style="color:#ffe074;font-size:12px;line-height:1.3"><em>'. __("Even a child knows how valuable the forest is. The fresh, breathtaking smell of trees. Echoing birds flying above that dense magnitude. A stable climate, a sustainable diverse life and a source of culture. Yet, forests and other ecosystems hang in the balance, threatened to become croplands, pasture, and plantations.") . '</em></p>
+	<p class="has-text-color" style="color:#ffe074;font-size:12px;line-height:1.3"><em>' . __( 'Even a child knows how valuable the forest is. The fresh, breathtaking smell of trees. Echoing birds flying above that dense magnitude. A stable climate, a sustainable diverse life and a source of culture. Yet, forests and other ecosystems hang in the balance, threatened to become croplands, pasture, and plantations.' ) . '</em></p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
diff --git a/lib/block-patterns/heading.php b/lib/block-patterns/heading.php
index 4eae5130e709e..f774fc7ecdce1 100644
--- a/lib/block-patterns/heading.php
+++ b/lib/block-patterns/heading.php
@@ -9,7 +9,7 @@
 	'title'       => __( 'Heading' ),
 	'categories'  => array( 'text' ),
 	'content'     => '<!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"55px","lineHeight":"1.1"}}} -->
-	<h2 class="alignwide" style="font-size:55px;line-height:1.1">'. __("We're a studio in Berlin with an international practice in architecture, urban planning and interior design. We believe in sharing knowledge and promoting dialogue to increase the creative potential of collaboration.") .'</h2>
+	<h2 class="alignwide" style="font-size:55px;line-height:1.1">' . __( "We're a studio in Berlin with an international practice in architecture, urban planning and interior design. We believe in sharing knowledge and promoting dialogue to increase the creative potential of collaboration." ) . '</h2>
 	<!-- /wp:heading -->',
 	'description' => _x( 'Heading text', 'Block pattern description' ),
 );
diff --git a/lib/block-patterns/large-header-text-button.php b/lib/block-patterns/large-header-text-button.php
index 622b3abc33e49..028e49c1fbb57 100644
--- a/lib/block-patterns/large-header-text-button.php
+++ b/lib/block-patterns/large-header-text-button.php
@@ -10,18 +10,18 @@
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"url":"https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg","id":613,"hasParallax":true,"dimRatio":40,"overlayColor":"black","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
 	<div class="wp-block-cover alignfull has-background-dim-40 has-black-background-color has-background-dim has-parallax" style="background-image:url(https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":"6vw"}},"className":"alignwide has-white-color has-text-color"} -->
-<h2 class="alignwide has-white-color has-text-color" style="font-size:6vw"><strong><em>'. __("Overseas: 1500 — 1960") .'</em></strong></h1>
+<h2 class="alignwide has-white-color has-text-color" style="font-size:6vw"><strong><em>' . __( 'Overseas: 1500 — 1960' ) . '</em></strong></h1>
 	<!-- /wp:heading -->
 
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"60%"} -->
 	<div class="wp-block-column" style="flex-basis:60%"><!-- wp:paragraph {"style":{"color":{"text":"#ffffff"}}} -->
-	<p class="has-text-color" style="color:#ffffff">'. __("An exhibition about the different representations of the ocean throughout time, between the sixteenth and the twentieth century. Taking place in our Open Room in <em>Floor 2</em>.") .'</p>
+	<p class="has-text-color" style="color:#ffffff">' . __( 'An exhibition about the different representations of the ocean throughout time, between the sixteenth and the twentieth century. Taking place in our Open Room in <em>Floor 2</em>.' ) . '</p>
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:buttons -->
 	<div class="wp-block-buttons"><!-- wp:button {"borderRadius":0,"backgroundColor":"black","textColor":"white","className":"is-style-outline"} -->
-	<div class="wp-block-button is-style-outline"><a class="wp-block-button__link has-white-color has-black-background-color has-text-color has-background no-border-radius">'. __("Visit") .'</a></div>
+	<div class="wp-block-button is-style-outline"><a class="wp-block-button__link has-white-color has-black-background-color has-text-color has-background no-border-radius">' . __( 'Visit' ) . '</a></div>
 	<!-- /wp:button --></div>
 	<!-- /wp:buttons --></div>
 	<!-- /wp:column -->
diff --git a/lib/block-patterns/media-text-arquitecture.php b/lib/block-patterns/media-text-arquitecture.php
index 613c52148e00d..3e53a02b49c80 100644
--- a/lib/block-patterns/media-text-arquitecture.php
+++ b/lib/block-patterns/media-text-arquitecture.php
@@ -10,11 +10,11 @@
 	'categories'  => array( 'text' ),
 	'content'     => '<!-- wp:media-text {"align":"full","mediaId":1352,"mediaType":"image","verticalAlignment":"center"} -->
 	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_C7E4WYWEHZ-edited-768x1024.jpg" alt="" class="wp-image-1352 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"textColor":"black"} -->
-	<h3 class="has-text-align-center has-black-color has-text-color"><strong>'. __("Open Spaces") .'</strong></h3>
+	<h3 class="has-text-align-center has-black-color has-text-color"><strong>' . __( 'Open Spaces' ) . '</strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph {"align":"center","fontSize":"extra-small"} -->
-	<p class="has-text-align-center has-extra-small-font-size"><a href="https://blockpatterndesigns.mystagingwebsite.com">'. __("See case study ↗") .'</a></p>
+	<p class="has-text-align-center has-extra-small-font-size"><a href="https://blockpatterndesigns.mystagingwebsite.com">' . __( 'See case study ↗' ) . '</a></p>
 	<!-- /wp:paragraph --></div></div>
 	<!-- /wp:media-text -->',
 	'description' => _x( 'Media and text block with image to the left and text to the right', 'Block pattern description' ),
diff --git a/lib/block-patterns/media-text-art.php b/lib/block-patterns/media-text-art.php
index f036d989f1b77..21b6943d0cf4b 100644
--- a/lib/block-patterns/media-text-art.php
+++ b/lib/block-patterns/media-text-art.php
@@ -10,11 +10,11 @@
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:media-text {"align":"full","mediaPosition":"right","mediaId":615,"mediaLink":"https://blockpatterndesigns.mystagingwebsite.com/block-patterns-art/508741ldsdl/","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","className":"is-style-default"} -->
 	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/508741ldsdl-1024x870.jpg" alt="" class="wp-image-615 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"color":{"text":"#000000"}},"className":"has-text-color"} -->
-	<h2 class="has-text-color" style="color:#000000"><strong>'. __("Shore with Blue Sea") .'</strong></h2>
+	<h2 class="has-text-color" style="color:#000000"><strong>' . __( 'Shore with Blue Sea' ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"17px"},"color":{"text":"#636363"}}} -->
-	<p class="has-text-color" style="color:#636363;font-size:17px">'. __("Eleanor Harris&nbsp;(American, 1901-1942)") .'</p>
+	<p class="has-text-color" style="color:#636363;font-size:17px">' . __( 'Eleanor Harris&nbsp;(American, 1901-1942)' ) . '</p>
 	<!-- /wp:paragraph --></div></div>
 	<!-- /wp:media-text -->',
 	'description' => _x( 'Media and text block with image to the right and text to the left', 'Block pattern description' ),
diff --git a/lib/block-patterns/media-text-nature.php b/lib/block-patterns/media-text-nature.php
index 7fe1d1ca9fe81..fd4823de9dd71 100644
--- a/lib/block-patterns/media-text-nature.php
+++ b/lib/block-patterns/media-text-nature.php
@@ -11,16 +11,16 @@
 	'content'     => '<!-- wp:cover {"customOverlayColor":"#ffffff","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
 	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"mediaId":2501,"mediaLink":"https://mywptesting.site/2021/02/button-bug/sand-rock-texture-dry-brown-soil-726223-pxhere-com_/","mediaType":"image","mediaWidth":56,"verticalAlignment":"center"} -->
 	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media"><img src="https://mywptesting.site/wp-content/uploads/2021/02/sand-rock-texture-dry-brown-soil-726223-pxhere.com_-1024x681.jpg" alt="" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
-	<h2 class="has-text-color" style="color:#000000;font-size:32px"><strong>'. __("What's the problem?") . '</strong></h2>
+	<h2 class="has-text-color" style="color:#000000;font-size:32px"><strong>' . __( "What's the problem?" ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"17px"},"color":{"text":"#000000"}}} -->
-	<p class="has-text-color" style="color:#000000;font-size:17px">'. __("Trees are more important today than ever before. More than 10,000 products are reportedly made from trees. Through chemistry, the humble woodpile is yielding chemicals, plastics and fabrics that were beyond comprehension when an axe first felled a Texas tree.") . '</p>
+	<p class="has-text-color" style="color:#000000;font-size:17px">' . __( 'Trees are more important today than ever before. More than 10,000 products are reportedly made from trees. Through chemistry, the humble woodpile is yielding chemicals, plastics and fabrics that were beyond comprehension when an axe first felled a Texas tree.' ) . '</p>
 	<!-- /wp:paragraph -->
 
 	<!-- wp:buttons -->
 	<div class="wp-block-buttons"><!-- wp:button {"className":"is-style-fill"} -->
-	<div class="wp-block-button is-style-fill"><a class="wp-block-button__link">'. __("Learn more") . '</a></div>
+	<div class="wp-block-button is-style-fill"><a class="wp-block-button__link">' . __( 'Learn more' ) . '</a></div>
 	<!-- /wp:button --></div>
 	<!-- /wp:buttons --></div></div>
 	<!-- /wp:media-text --></div></div>
diff --git a/lib/block-patterns/quote-2.php b/lib/block-patterns/quote-2.php
index e31da2986df07..21eee33ddb032 100644
--- a/lib/block-patterns/quote-2.php
+++ b/lib/block-patterns/quote-2.php
@@ -18,7 +18,7 @@
 	<!-- /wp:image -->
 	
 	<!-- wp:quote {"align":"center","className":"is-style-large"} -->
-	<blockquote class="wp-block-quote has-text-align-center is-style-large"><p>'. __("\"Contributing makes me feel like I'm being useful to the planet.\"") .'</p><cite>'. __("— Anna Wong, <em>Volunteer</em>") .'</cite></blockquote>
+	<blockquote class="wp-block-quote has-text-align-center is-style-large"><p>' . __( "\"Contributing makes me feel like I'm being useful to the planet.\"" ) . '</p><cite>' . __( '— Anna Wong, <em>Volunteer</em>' ) . '</cite></blockquote>
 	<!-- /wp:quote -->
 	
 	<!-- wp:separator {"className":"is-style-default"} -->
diff --git a/lib/block-patterns/text-two-columns-2.php b/lib/block-patterns/text-two-columns-2.php
index bc51ade8a24c2..6db5beb3f1a87 100644
--- a/lib/block-patterns/text-two-columns-2.php
+++ b/lib/block-patterns/text-two-columns-2.php
@@ -15,11 +15,11 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"21px"}},"textColor":"black"} -->
-	<p class="has-black-color has-text-color" style="font-size:21px"><strong>'. __("We have worked with:") .'</strong></p>
+	<p class="has-black-color has-text-color" style="font-size:21px"><strong>' . __( 'We have worked with:' ) . '</strong></p>
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"49px","lineHeight":"1.2"}}} -->
-	<p style="font-size:49px;line-height:1.2"><a href="https://wordpress.org">'. __("EARTHFUND™<br>ARCHWEEKLY<br>FUTURE ROADS<br>BUILDING NY") .'</a></p>
+	<p style="font-size:49px;line-height:1.2"><a href="https://wordpress.org">' . __( 'EARTHFUND™<br>ARCHWEEKLY<br>FUTURE ROADS<br>BUILDING NY' ) . '</a></p>
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:spacer -->
@@ -33,7 +33,7 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"49px","lineHeight":"1.2"}}} -->
-	<p style="font-size:49px;line-height:1.2"><a href="https://wordpress.org">'. __("DUBAI ROOFS<br>MAY WATSON STUDIO<br>Y.O.L<br>RUDIMENTAR") .'</a></p>
+	<p style="font-size:49px;line-height:1.2"><a href="https://wordpress.org">' . __( 'DUBAI ROOFS<br>MAY WATSON STUDIO<br>Y.O.L<br>RUDIMENTAR' ) . '</a></p>
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:spacer -->
diff --git a/lib/block-patterns/text-two-columns-title-offset.php b/lib/block-patterns/text-two-columns-title-offset.php
index e1136452c23db..da381410d8462 100644
--- a/lib/block-patterns/text-two-columns-title-offset.php
+++ b/lib/block-patterns/text-two-columns-title-offset.php
@@ -16,7 +16,7 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"5vw"}},"textColor":"black"} -->
-	<p class="has-black-color has-text-color" style="font-size:5vw;line-height:1.1"><strong>'. __("Ancient Sea Representations") .'</strong></p>
+	<p class="has-black-color has-text-color" style="font-size:5vw;line-height:1.1"><strong>' . __( 'Ancient Sea Representations' ) . '</strong></p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
@@ -40,13 +40,13 @@
 	
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:paragraph {"textColor":"black","fontSize":"extra-small"} -->
-	<p class="has-black-color has-text-color has-extra-small-font-size">'. __("Winding veils round their heads, the women walked on deck. They were now moving steadily down the river, passing the dark shapes of ships at anchor, and London was a swarm of lights with a pale yellow canopy drooping above it. There were the lights of the great theatres, the lights of the long streets, lights that indicated huge squares of domestic comfort, lights that hung high in air.") .'</p>
+	<p class="has-black-color has-text-color has-extra-small-font-size">' . __( 'Winding veils round their heads, the women walked on deck. They were now moving steadily down the river, passing the dark shapes of ships at anchor, and London was a swarm of lights with a pale yellow canopy drooping above it. There were the lights of the great theatres, the lights of the long streets, lights that indicated huge squares of domestic comfort, lights that hung high in air.' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:paragraph {"textColor":"black","fontSize":"extra-small"} -->
-	<p class="has-black-color has-text-color has-extra-small-font-size">'. __("No darkness would ever settle upon those lamps, as no darkness had settled upon them for hundreds of years. It seemed dreadful that the town should blaze for ever in the same spot; dreadful at least to people going away to adventure upon the sea, and beholding it as a circumscribed mound, eternally burnt, eternally scarred. From the deck of the ship the great city appeared a crouched and cowardly figure, a sedentary miser.") .'</p>
+	<p class="has-black-color has-text-color has-extra-small-font-size">' . __( 'No darkness would ever settle upon those lamps, as no darkness had settled upon them for hundreds of years. It seemed dreadful that the town should blaze for ever in the same spot; dreadful at least to people going away to adventure upon the sea, and beholding it as a circumscribed mound, eternally burnt, eternally scarred. From the deck of the ship the great city appeared a crouched and cowardly figure, a sedentary miser.' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns --></div>
diff --git a/lib/block-patterns/text-two-columns-title.php b/lib/block-patterns/text-two-columns-title.php
index 4e00721c7a11e..9d40535109531 100644
--- a/lib/block-patterns/text-two-columns-title.php
+++ b/lib/block-patterns/text-two-columns-title.php
@@ -10,19 +10,19 @@
 	'categories'  => array( 'text' ),
 	'content'     => '<!-- wp:group -->
 	<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":38}}} -->
-	<h2 style="font-size:38px"><strong>'. __("The voyage had begun, and had begun happily with a soft blue sky, and a calm sea.") .'</strong></h2>
+	<h2 style="font-size:38px"><strong>' . __( 'The voyage had begun, and had begun happily with a soft blue sky, and a calm sea.' ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
 	<!-- wp:columns -->
 	<div class="wp-block-columns"><!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:paragraph {"fontSize":"small"} -->
-	<p style="font-size:18px">'. __("They followed her on to the deck. All the smoke and the houses had disappeared, and the ship was out in a wide space of sea very fresh and clear though pale in the early light. They had left London sitting on its mud. A very thin line of shadow tapered on the horizon, scarcely thick enough to stand the burden of Paris, which nevertheless rested upon it. They were free of roads, free of mankind, and the same exhilaration at their freedom ran through them all.") .'</p>
+	<p style="font-size:18px">' . __( 'They followed her on to the deck. All the smoke and the houses had disappeared, and the ship was out in a wide space of sea very fresh and clear though pale in the early light. They had left London sitting on its mud. A very thin line of shadow tapered on the horizon, scarcely thick enough to stand the burden of Paris, which nevertheless rested upon it. They were free of roads, free of mankind, and the same exhilaration at their freedom ran through them all.' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:paragraph {"style":{"typography":{"fontSize":18}}} -->
-	<p style="font-size:18px"> '. __("The ship was making her way steadily through small waves which slapped her and then fizzled like effervescing water, leaving a little border of bubbles and foam on either side. The colourless October sky above was thinly clouded as if by the trail of wood-fire smoke, and the air was wonderfully salt and brisk. Indeed it was too cold to stand still. Mrs. Ambrose drew her arm within her husband's, and as they moved off it could be seen from the way in which her sloping cheek turned up to his that she had something private to communicate.") .'</p>
+	<p style="font-size:18px"> ' . __( "The ship was making her way steadily through small waves which slapped her and then fizzled like effervescing water, leaving a little border of bubbles and foam on either side. The colourless October sky above was thinly clouded as if by the trail of wood-fire smoke, and the air was wonderfully salt and brisk. Indeed it was too cold to stand still. Mrs. Ambrose drew her arm within her husband's, and as they moved off it could be seen from the way in which her sloping cheek turned up to his that she had something private to communicate." ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns --></div></div>
diff --git a/lib/block-patterns/three-columns-media-text.php b/lib/block-patterns/three-columns-media-text.php
index b7d3944124d36..ed13ad70b90ed 100644
--- a/lib/block-patterns/three-columns-media-text.php
+++ b/lib/block-patterns/three-columns-media-text.php
@@ -20,7 +20,7 @@
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"5vw"}},"textColor":"black"} -->
-	<p class="has-black-color has-text-color" style="font-size:5vw;line-height:1.1"><strong>'. __("Positive growth.") . '</strong></p>
+	<p class="has-black-color has-text-color" style="font-size:5vw;line-height:1.1"><strong>' . __( 'Positive growth.' ) . '</strong></p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
@@ -40,7 +40,7 @@
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"33.38%"} -->
 	<div class="wp-block-column" style="flex-basis:33.38%"><!-- wp:paragraph {"textColor":"black","fontSize":"extra-small"} -->
-	<p class="has-black-color has-text-color has-extra-small-font-size">'. __("<em>Nature</em>, in the common sense, refers to essences unchanged by man; space, the air, the river, the leaf.&nbsp;<em>Art</em>&nbsp;is applied to the mixture of his will with the same things, as in a house, a canal, a statue, a picture. But his operations taken together are so insignificant, a little chipping, baking, patching, and washing, that in an impression so grand as that of the world on the human mind, they do not vary the result.") . '</p>
+	<p class="has-black-color has-text-color has-extra-small-font-size">' . __( '<em>Nature</em>, in the common sense, refers to essences unchanged by man; space, the air, the river, the leaf.&nbsp;<em>Art</em>&nbsp;is applied to the mixture of his will with the same things, as in a house, a canal, a statue, a picture. But his operations taken together are so insignificant, a little chipping, baking, patching, and washing, that in an impression so grand as that of the world on the human mind, they do not vary the result.' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
@@ -70,7 +70,7 @@
 	
 	<!-- wp:column {"verticalAlignment":"center","width":"33%"} -->
 	<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:33%"><!-- wp:paragraph {"textColor":"black","fontSize":"extra-small"} -->
-	<p class="has-black-color has-text-color has-extra-small-font-size">'. __("Undoubtedly we have no questions to ask which are unanswerable. We must trust the perfection of the creation so far, as to believe that whatever curiosity the order of things has awakened in our minds, the order of things can satisfy. Every man's condition is a solution in hieroglyphic to those inquiries he would put.") . '</p>
+	<p class="has-black-color has-text-color has-extra-small-font-size">' . __( "Undoubtedly we have no questions to ask which are unanswerable. We must trust the perfection of the creation so far, as to believe that whatever curiosity the order of things has awakened in our minds, the order of things can satisfy. Every man's condition is a solution in hieroglyphic to those inquiries he would put." ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns --></div></div>
diff --git a/lib/block-patterns/three-columns-text.php b/lib/block-patterns/three-columns-text.php
index 213080a739070..13a3862a0badf 100644
--- a/lib/block-patterns/three-columns-text.php
+++ b/lib/block-patterns/three-columns-text.php
@@ -11,31 +11,31 @@
 	'content'     => '<!-- wp:columns {"align":"full","backgroundColor":"white","textColor":"black"} -->
 	<div class="wp-block-columns alignfull has-black-color has-white-background-color has-text-color has-background"><!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:heading {"level":3} -->
-	<h3><strong><a href="http://wordpress.org" data-type="URL" data-id="wordpress.org">'. __("Virtual Tour ↗") .'</a></strong></h3>
+	<h3><strong><a href="http://wordpress.org" data-type="URL" data-id="wordpress.org">' . __( 'Virtual Tour ↗' ) . '</a></strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph -->
-	<p>'. __("Get a virtual tour of the museum. Ideal for schools and events.") .'</p>
+	<p>' . __( 'Get a virtual tour of the museum. Ideal for schools and events.' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:heading {"level":3} -->
-	<h3><strong><a href="https://wordpress.org">'. __("Open Exhibitions ↗") .'</a></strong></h3>
+	<h3><strong><a href="https://wordpress.org">' . __( 'Open Exhibitions ↗' ) . '</a></strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph -->
-	<p>'. __("Stay updated and see our current exhibitions here.") .'</p>
+	<p>' . __( 'Stay updated and see our current exhibitions here.' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:heading {"level":3} -->
-	<h3><strong><a href="https://wordpress.org">'. __("Useful Info ↗") .'</a></strong></h3>
+	<h3><strong><a href="https://wordpress.org">' . __( 'Useful Info ↗' ) . '</a></strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph -->
-	<p>'. __("Get to know our opening times, ticket prices and discounts.") .'</p>
+	<p>' . __( 'Get to know our opening times, ticket prices and discounts.' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->',
diff --git a/lib/block-patterns/two-columns-header.php b/lib/block-patterns/two-columns-header.php
index 5e69e6e96c46e..64c9cbde726ff 100644
--- a/lib/block-patterns/two-columns-header.php
+++ b/lib/block-patterns/two-columns-header.php
@@ -16,11 +16,11 @@
 	<!-- /wp:separator -->
 	
 	<!-- wp:heading {"style":{"color":{"text":"#ffe074"},"typography":{"fontSize":"16vw"}}} -->
-	<h2 class="has-text-color" style="color:#ffe074;font-size:16vw">'. __("80%*") . '</h2>
+	<h2 class="has-text-color" style="color:#ffe074;font-size:16vw">' . __( '80%*' ) . '</h2>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"12px","lineHeight":"1.3"},"color":{"text":"#ffe074","link":"#ffe074"}}} -->
-	<p class="has-text-color has-link-color" style="--wp--style--color--link:#ffe074;color:#ffe074;font-size:12px;line-height:1.3"><em>'. __("*Is how much industrial agriculture contributes to deforestation across the globe. Nature always wears the colors of the spirit. To a man laboring under calamity, the heat of his own fire hath sadness in it.") . '</em></p>
+	<p class="has-text-color has-link-color" style="--wp--style--color--link:#ffe074;color:#ffe074;font-size:12px;line-height:1.3"><em>' . __( '*Is how much industrial agriculture contributes to deforestation across the globe. Nature always wears the colors of the spirit. To a man laboring under calamity, the heat of his own fire hath sadness in it.' ) . '</em></p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	

From c87b78836265ddc6340f3a41f675989448a4d8f4 Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Tue, 23 Mar 2021 13:43:18 +0100
Subject: [PATCH 07/44] buttons block pattern

---
 lib/block-patterns.php               |  1 +
 lib/block-patterns/two-buttons-2.php | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 lib/block-patterns/two-buttons-2.php

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index 01db084c96cc6..870e710cb7f7f 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -196,6 +196,7 @@
 	'three-images-gallery',
 	'text-two-columns-2',
 	'media-text-arquitecture',
+	'two-buttons-2',
 );
 
 foreach ( $core_block_patterns as $core_block_pattern ) {
diff --git a/lib/block-patterns/two-buttons-2.php b/lib/block-patterns/two-buttons-2.php
new file mode 100644
index 0000000000000..dd7c39ddeeec3
--- /dev/null
+++ b/lib/block-patterns/two-buttons-2.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Two Buttons block pattern.
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'         => __( 'Two buttons' ),
+	'content'       => '<!-- wp:buttons {"contentJustification":"center"} -->
+	<div class="wp-block-buttons is-content-justification-center"><!-- wp:button {"borderRadius":0} -->
+	<div class="wp-block-button"><a class="wp-block-button__link no-border-radius">' . __( 'Our Work' ) . '</a></div>
+	<!-- /wp:button -->
+	
+	<!-- wp:button {"borderRadius":1,"className":"is-style-outline"} -->
+	<div class="wp-block-button is-style-outline"><a class="wp-block-button__link" style="border-radius:1px">' . __( 'Where We Are' ) . '</a></div>
+	<!-- /wp:button --></div>
+	<!-- /wp:buttons -->',
+	'viewportWidth' => 500,
+	'categories'    => array( 'buttons' ),
+	'description'   => _x( 'Two buttons, one filled and one outlined, side by side.', 'Block pattern description' ),
+);

From 8e378cc542eeb350bc8aa5dec321fd46e23cc7fc Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Tue, 23 Mar 2021 11:27:36 -0400
Subject: [PATCH 08/44] Remove URL links.

---
 lib/block-patterns/media-text-arquitecture.php | 2 +-
 lib/block-patterns/media-text-art.php          | 2 +-
 lib/block-patterns/two-images-gallery.php      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/block-patterns/media-text-arquitecture.php b/lib/block-patterns/media-text-arquitecture.php
index 3e53a02b49c80..3a5928f96b36e 100644
--- a/lib/block-patterns/media-text-arquitecture.php
+++ b/lib/block-patterns/media-text-arquitecture.php
@@ -14,7 +14,7 @@
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph {"align":"center","fontSize":"extra-small"} -->
-	<p class="has-text-align-center has-extra-small-font-size"><a href="https://blockpatterndesigns.mystagingwebsite.com">' . __( 'See case study ↗' ) . '</a></p>
+	<p class="has-text-align-center has-extra-small-font-size"><a href="#">' . __( 'See case study ↗' ) . '</a></p>
 	<!-- /wp:paragraph --></div></div>
 	<!-- /wp:media-text -->',
 	'description' => _x( 'Media and text block with image to the left and text to the right', 'Block pattern description' ),
diff --git a/lib/block-patterns/media-text-art.php b/lib/block-patterns/media-text-art.php
index 21b6943d0cf4b..3a5a33b95c4e1 100644
--- a/lib/block-patterns/media-text-art.php
+++ b/lib/block-patterns/media-text-art.php
@@ -8,7 +8,7 @@
 return array(
 	'title'       => __( 'Media & text with image on the right' ),
 	'categories'  => array( 'header' ),
-	'content'     => '<!-- wp:media-text {"align":"full","mediaPosition":"right","mediaId":615,"mediaLink":"https://blockpatterndesigns.mystagingwebsite.com/block-patterns-art/508741ldsdl/","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","className":"is-style-default"} -->
+	'content'     => '<!-- wp:media-text {"align":"full","mediaPosition":"right","mediaId":615,"mediaLink":"#","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","className":"is-style-default"} -->
 	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/508741ldsdl-1024x870.jpg" alt="" class="wp-image-615 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"color":{"text":"#000000"}},"className":"has-text-color"} -->
 	<h2 class="has-text-color" style="color:#000000"><strong>' . __( 'Shore with Blue Sea' ) . '</strong></h2>
 	<!-- /wp:heading -->
diff --git a/lib/block-patterns/two-images-gallery.php b/lib/block-patterns/two-images-gallery.php
index 3ffabeb4857ba..fa8bdf3de2a27 100644
--- a/lib/block-patterns/two-images-gallery.php
+++ b/lib/block-patterns/two-images-gallery.php
@@ -9,7 +9,7 @@
 	'title'       => __( 'Two images side by side' ),
 	'categories'  => array( 'gallery' ),
 	'content'     => '<!-- wp:gallery {"ids":[259,258],"linkTo":"none","align":"wide"} -->
-	<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_IM8T5HVXU0-edited-1024x1024.jpg" alt="" data-id="259" data-full-url="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_IM8T5HVXU0-edited-scaled.jpg" data-link="https://blockpatterndesigns.mystagingwebsite.com/stocksnap_im8t5hvxu0-2/" class="wp-image-259"/></figure></li><li class="blocks-gallery-item"><figure><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_66J4T150FP-edited-1024x1024.jpg" alt="" data-id="258" data-full-url="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_66J4T150FP-edited-scaled.jpg" data-link="https://blockpatterndesigns.mystagingwebsite.com/stocksnap_66j4t150fp-2/" class="wp-image-258"/></figure></li></ul></figure>
+	<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_IM8T5HVXU0-edited-1024x1024.jpg" alt="" data-id="259" data-full-url="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_IM8T5HVXU0-edited-scaled.jpg" data-link="#" class="wp-image-259"/></figure></li><li class="blocks-gallery-item"><figure><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_66J4T150FP-edited-1024x1024.jpg" alt="" data-id="258" data-full-url="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_66J4T150FP-edited-scaled.jpg" data-link="#" class="wp-image-258"/></figure></li></ul></figure>
 	<!-- /wp:gallery -->',
 	'description' => _x( 'Two images side by side', 'Block pattern description' ),
 );

From a44cd15ddf17c107f5718c961bfd10a7d8c76689 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Tue, 23 Mar 2021 11:37:17 -0400
Subject: [PATCH 09/44] Adjust categories.

---
 lib/block-patterns/text-two-columns-2.php            | 2 +-
 lib/block-patterns/text-two-columns-title-offset.php | 2 +-
 lib/block-patterns/text-two-columns-title.php        | 2 +-
 lib/block-patterns/three-columns-media-text.php      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/block-patterns/text-two-columns-2.php b/lib/block-patterns/text-two-columns-2.php
index 6db5beb3f1a87..45927d2253316 100644
--- a/lib/block-patterns/text-two-columns-2.php
+++ b/lib/block-patterns/text-two-columns-2.php
@@ -7,7 +7,7 @@
 
 return array(
 	'title'       => __( 'Two columns of text' ),
-	'categories'  => array( 'text' ),
+	'categories'  => array( 'columns', 'text' ),
 	'content'     => '<!-- wp:columns {"align":"full"} -->
 	<div class="wp-block-columns alignfull"><!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:spacer -->
diff --git a/lib/block-patterns/text-two-columns-title-offset.php b/lib/block-patterns/text-two-columns-title-offset.php
index da381410d8462..9d1aa798abea9 100644
--- a/lib/block-patterns/text-two-columns-title-offset.php
+++ b/lib/block-patterns/text-two-columns-title-offset.php
@@ -7,7 +7,7 @@
 
 return array(
 	'title'       => __( 'Two columns of text with offset heading' ),
-	'categories'  => array( 'text' ),
+	'categories'  => array( 'columns', 'text' ),
 	'content'     => '<!-- wp:group {"align":"full","style":{"color":{"background":"#f2f0e9"}}} -->
 	<div class="wp-block-group alignfull has-background" style="background-color:#f2f0e9"><!-- wp:columns {"align":"full"} -->
 	<div class="wp-block-columns alignfull"><!-- wp:column {"width":"60%"} -->
diff --git a/lib/block-patterns/text-two-columns-title.php b/lib/block-patterns/text-two-columns-title.php
index 9d40535109531..7707a67de7028 100644
--- a/lib/block-patterns/text-two-columns-title.php
+++ b/lib/block-patterns/text-two-columns-title.php
@@ -7,7 +7,7 @@
 
 return array(
 	'title'       => __( 'Two columns text and title' ),
-	'categories'  => array( 'text' ),
+	'categories'  => array( 'columns', 'text' ),
 	'content'     => '<!-- wp:group -->
 	<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":38}}} -->
 	<h2 style="font-size:38px"><strong>' . __( 'The voyage had begun, and had begun happily with a soft blue sky, and a calm sea.' ) . '</strong></h2>
diff --git a/lib/block-patterns/three-columns-media-text.php b/lib/block-patterns/three-columns-media-text.php
index ed13ad70b90ed..d579c3161e195 100644
--- a/lib/block-patterns/three-columns-media-text.php
+++ b/lib/block-patterns/three-columns-media-text.php
@@ -7,7 +7,7 @@
 
 return array(
 	'title'       => __( 'Three columns with images and text' ),
-	'categories'  => array( 'gallery' ),
+	'categories'  => array( 'columns' ),
 	'content'     => '<!-- wp:group {"align":"full","style":{"color":{"background":"#f8f4e4"}}} -->
 	<div class="wp-block-group alignfull has-background" style="background-color:#f8f4e4"><div class="wp-block-group__inner-container"><!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column -->

From 4c7fe17391a31b1c5b8811638e2d88dfa68e263d Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Tue, 23 Mar 2021 11:38:41 -0400
Subject: [PATCH 10/44] Ensure "Columns" category is registered.

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

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index 870e710cb7f7f..b0dcc1c4286da 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -206,6 +206,7 @@
 	);
 }
 
+register_block_pattern_category( 'columns', array( 'label' => _x( 'Columns', 'Block pattern category' ) ) );
 register_block_pattern_category( 'header', array( 'label' => _x( 'Headers', 'Block pattern category' ) ) );
 register_block_pattern_category( 'gallery', array( 'label' => _x( 'Gallery', 'Block pattern category' ) ) );
 register_block_pattern_category( 'text', array( 'label' => _x( 'Text', 'Block pattern category' ) ) );

From 6561f68a1703d192c2608175ca2e4765bd0e6515 Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Wed, 24 Mar 2021 11:35:07 +0100
Subject: [PATCH 11/44] alt text for images

---
 lib/block-patterns/media-text-arquitecture.php  | 2 +-
 lib/block-patterns/media-text-art.php           | 2 +-
 lib/block-patterns/media-text-nature.php        | 3 +--
 lib/block-patterns/quote-2.php                  | 2 +-
 lib/block-patterns/three-columns-media-text.php | 6 +++---
 lib/block-patterns/three-images-gallery.php     | 6 +++---
 lib/block-patterns/two-columns-header.php       | 2 +-
 lib/block-patterns/two-images-gallery.php       | 2 +-
 8 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/lib/block-patterns/media-text-arquitecture.php b/lib/block-patterns/media-text-arquitecture.php
index 3a5928f96b36e..e519e89d8ba4d 100644
--- a/lib/block-patterns/media-text-arquitecture.php
+++ b/lib/block-patterns/media-text-arquitecture.php
@@ -9,7 +9,7 @@
 	'title'       => __( 'Media and text with image on the right' ),
 	'categories'  => array( 'text' ),
 	'content'     => '<!-- wp:media-text {"align":"full","mediaId":1352,"mediaType":"image","verticalAlignment":"center"} -->
-	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_C7E4WYWEHZ-edited-768x1024.jpg" alt="" class="wp-image-1352 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"textColor":"black"} -->
+	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_C7E4WYWEHZ-edited-768x1024.jpg" alt="' . __( 'Close-up, abstract view of architecture.' ) . '" class="wp-image-1352 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"textColor":"black"} -->
 	<h3 class="has-text-align-center has-black-color has-text-color"><strong>' . __( 'Open Spaces' ) . '</strong></h3>
 	<!-- /wp:heading -->
 	
diff --git a/lib/block-patterns/media-text-art.php b/lib/block-patterns/media-text-art.php
index 3a5a33b95c4e1..331abc761138d 100644
--- a/lib/block-patterns/media-text-art.php
+++ b/lib/block-patterns/media-text-art.php
@@ -9,7 +9,7 @@
 	'title'       => __( 'Media & text with image on the right' ),
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:media-text {"align":"full","mediaPosition":"right","mediaId":615,"mediaLink":"#","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","className":"is-style-default"} -->
-	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/508741ldsdl-1024x870.jpg" alt="" class="wp-image-615 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"color":{"text":"#000000"}},"className":"has-text-color"} -->
+	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/508741ldsdl-1024x870.jpg" alt="' . __( 'A green and brown rural landscape leading into a bright blue ocean and slightly cloudy sky, done in oil paints.' ) . '" class="wp-image-615 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"color":{"text":"#000000"}},"className":"has-text-color"} -->
 	<h2 class="has-text-color" style="color:#000000"><strong>' . __( 'Shore with Blue Sea' ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
diff --git a/lib/block-patterns/media-text-nature.php b/lib/block-patterns/media-text-nature.php
index fd4823de9dd71..bce752a84a90c 100644
--- a/lib/block-patterns/media-text-nature.php
+++ b/lib/block-patterns/media-text-nature.php
@@ -10,14 +10,13 @@
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"customOverlayColor":"#ffffff","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
 	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"mediaId":2501,"mediaLink":"https://mywptesting.site/2021/02/button-bug/sand-rock-texture-dry-brown-soil-726223-pxhere-com_/","mediaType":"image","mediaWidth":56,"verticalAlignment":"center"} -->
-	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media"><img src="https://mywptesting.site/wp-content/uploads/2021/02/sand-rock-texture-dry-brown-soil-726223-pxhere.com_-1024x681.jpg" alt="" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
+	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media"><img src="https://mywptesting.site/wp-content/uploads/2021/02/sand-rock-texture-dry-brown-soil-726223-pxhere.com_-1024x681.jpg" alt="' . __( 'Close-up of dried, cracked earth.' ) . '" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
 	<h2 class="has-text-color" style="color:#000000;font-size:32px"><strong>' . __( "What's the problem?" ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"17px"},"color":{"text":"#000000"}}} -->
 	<p class="has-text-color" style="color:#000000;font-size:17px">' . __( 'Trees are more important today than ever before. More than 10,000 products are reportedly made from trees. Through chemistry, the humble woodpile is yielding chemicals, plastics and fabrics that were beyond comprehension when an axe first felled a Texas tree.' ) . '</p>
 	<!-- /wp:paragraph -->
-
 	<!-- wp:buttons -->
 	<div class="wp-block-buttons"><!-- wp:button {"className":"is-style-fill"} -->
 	<div class="wp-block-button is-style-fill"><a class="wp-block-button__link">' . __( 'Learn more' ) . '</a></div>
diff --git a/lib/block-patterns/quote-2.php b/lib/block-patterns/quote-2.php
index 21eee33ddb032..3bcf3e5226ead 100644
--- a/lib/block-patterns/quote-2.php
+++ b/lib/block-patterns/quote-2.php
@@ -14,7 +14,7 @@
 	<!-- /wp:separator -->
 	
 	<!-- wp:image {"align":"center","id":553,"width":150,"height":150,"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
-	<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_HQR8BJFZID-1.jpg" alt="" class="wp-image-553" width="150" height="150"/></figure></div>
+	<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_HQR8BJFZID-1.jpg" alt="' . __( 'A side profile of a woman in a russet-colored turtleneck and white bag. She looks up with her eyes closed.' ) . '" class="wp-image-553" width="150" height="150"/></figure></div>
 	<!-- /wp:image -->
 	
 	<!-- wp:quote {"align":"center","className":"is-style-large"} -->
diff --git a/lib/block-patterns/three-columns-media-text.php b/lib/block-patterns/three-columns-media-text.php
index d579c3161e195..0106346c00626 100644
--- a/lib/block-patterns/three-columns-media-text.php
+++ b/lib/block-patterns/three-columns-media-text.php
@@ -50,13 +50,13 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:image {"id":345,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_ZD6WAL4LGT-edited.jpg" alt="" class="wp-image-345"/></figure>
+	<figure class="wp-block-image size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_ZD6WAL4LGT-edited.jpg" alt="' . __( 'The sun setting through a dense forest of trees.' ) . '" class="wp-image-345"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"width":"33.62%"} -->
 	<div class="wp-block-column" style="flex-basis:33.62%"><!-- wp:image {"id":347,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_56RKHNDUQ2-edited-scaled.jpg" alt="" class="wp-image-347"/></figure>
+	<figure class="wp-block-image size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_56RKHNDUQ2-edited-scaled.jpg" alt="' . __( 'Wind turbines standing on a grassy plain, against a blue sky.' ) . '" class="wp-image-347"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->
@@ -64,7 +64,7 @@
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"67%"} -->
 	<div class="wp-block-column" style="flex-basis:67%"><!-- wp:image {"align":"right","id":348,"sizeSlug":"large","linkDestination":"none"} -->
-	<div class="wp-block-image"><figure class="alignright size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_H17J2YTARL-1024x683.jpg" alt="" class="wp-image-348"/></figure></div>
+	<div class="wp-block-image"><figure class="alignright size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_H17J2YTARL-1024x683.jpg" alt="' . __( 'The sun shining over a ridge leading down into the shore. In the distance, a car drives down a road.' ) . '" class="wp-image-348"/></figure></div>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
diff --git a/lib/block-patterns/three-images-gallery.php b/lib/block-patterns/three-images-gallery.php
index b898681e097f8..1549d08ea130d 100644
--- a/lib/block-patterns/three-images-gallery.php
+++ b/lib/block-patterns/three-images-gallery.php
@@ -11,7 +11,7 @@
 	'content'     => '<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"25%"} -->
 	<div class="wp-block-column" style="flex-basis:25%"><!-- wp:image {"id":240,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
-	<figure class="wp-block-image size-large is-style-default"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/wing-light-architecture-structure-wood-white-714046-pxhere.com_-576x1024.jpg" alt="" class="wp-image-240"/></figure>
+	<figure class="wp-block-image size-large is-style-default"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/wing-light-architecture-structure-wood-white-714046-pxhere.com_-576x1024.jpg" alt="' . __( 'Close-up, abstract view of geometric architecture.' ) . '" class="wp-image-240"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
@@ -25,13 +25,13 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:image {"id":237,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/wing-architecture-structure-wood-white-house-997338-pxhere.com_-683x1024.jpg" alt="" class="wp-image-237"/></figure>
+	<figure class="wp-block-image size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/wing-architecture-structure-wood-white-house-997338-pxhere.com_-683x1024.jpg" alt="' . __( 'Close-up, angled view of a window on a white building.' ) . '" class="wp-image-237"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"width":"45%"} -->
 	<div class="wp-block-column" style="flex-basis:45%"><!-- wp:image {"id":236,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
-	<figure class="wp-block-image size-large is-style-default"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/wing-architecture-structure-building-ceiling-geometric-99094-pxhere.com_-1024x683.jpg" alt="" class="wp-image-236"/></figure>
+	<figure class="wp-block-image size-large is-style-default"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/wing-architecture-structure-building-ceiling-geometric-99094-pxhere.com_-1024x683.jpg" alt="' . __( 'Close-up of the corner of a white, geometric building with both sharp points and round corners.' ) . '" class="wp-image-236"/></figure>
 	<!-- /wp:image -->
 	
 	<!-- wp:spacer {"height":285} -->
diff --git a/lib/block-patterns/two-columns-header.php b/lib/block-patterns/two-columns-header.php
index 64c9cbde726ff..1fa61e20b0ed2 100644
--- a/lib/block-patterns/two-columns-header.php
+++ b/lib/block-patterns/two-columns-header.php
@@ -26,7 +26,7 @@
 	
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:image {"id":265,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-nature-forest-light-plant-sunshine-1100731-pxhere.com_-1024x681.jpg" alt="" class="wp-image-265"/></figure>
+	<figure class="wp-block-image size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-nature-forest-light-plant-sunshine-1100731-pxhere.com_-1024x681.jpg" alt="' . __( 'Forest of bamboo trees, seen from the ground up. The sun shines through the canopy.' ) . '" class="wp-image-265"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns --></div></div>
diff --git a/lib/block-patterns/two-images-gallery.php b/lib/block-patterns/two-images-gallery.php
index fa8bdf3de2a27..399f78a4f6165 100644
--- a/lib/block-patterns/two-images-gallery.php
+++ b/lib/block-patterns/two-images-gallery.php
@@ -9,7 +9,7 @@
 	'title'       => __( 'Two images side by side' ),
 	'categories'  => array( 'gallery' ),
 	'content'     => '<!-- wp:gallery {"ids":[259,258],"linkTo":"none","align":"wide"} -->
-	<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_IM8T5HVXU0-edited-1024x1024.jpg" alt="" data-id="259" data-full-url="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_IM8T5HVXU0-edited-scaled.jpg" data-link="#" class="wp-image-259"/></figure></li><li class="blocks-gallery-item"><figure><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_66J4T150FP-edited-1024x1024.jpg" alt="" data-id="258" data-full-url="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_66J4T150FP-edited-scaled.jpg" data-link="#" class="wp-image-258"/></figure></li></ul></figure>
+	<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_IM8T5HVXU0-edited-1024x1024.jpg" alt="' . __( 'An aerial view of waves crashing against a shore.' ) . '" data-id="259" data-full-url="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_IM8T5HVXU0-edited-scaled.jpg" data-link="#" class="wp-image-259"/></figure></li><li class="blocks-gallery-item"><figure><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_66J4T150FP-edited-1024x1024.jpg" alt="' . __( 'An aerial view of a field. A road runs through the upper right corner.' ) . '" data-id="258" data-full-url="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_66J4T150FP-edited-scaled.jpg" data-link="#" class="wp-image-258"/></figure></li></ul></figure>
 	<!-- /wp:gallery -->',
 	'description' => _x( 'Two images side by side', 'Block pattern description' ),
 );

From c9ffb6253a1d775fd940a35e2244bff902e558b4 Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Wed, 24 Mar 2021 16:13:03 +0100
Subject: [PATCH 12/44] added missing alt text

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

diff --git a/lib/block-patterns/cover-quote.php b/lib/block-patterns/cover-quote.php
index e825d598bb9ea..14d4fee2be5a3 100644
--- a/lib/block-patterns/cover-quote.php
+++ b/lib/block-patterns/cover-quote.php
@@ -9,7 +9,7 @@
 	'title'       => __( 'Large header with left-aligned text' ),
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"url":"https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg","id":261,"dimRatio":60,"minHeight":800,"align":"full"} -->
-	<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background wp-image-261" alt="" src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container">
+	<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background wp-image-261" alt="' . __( 'A dense forest of tall, straight trees as seen from slightly above.' ) . '" src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container">
 	<!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"14vw"},"color":{"text":"#ffe074"}}} -->
 	<h2 class="alignwide has-text-color" style="color:#ffe074;font-size:14vw">' . __( 'Forest.' ) . '</h2>
 	<!-- /wp:heading -->

From faffc0fdae76c62f6d1f54bc65b36852a4d2187f Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Thu, 25 Mar 2021 10:35:54 -0400
Subject: [PATCH 13/44] Revise patterns for wider theme support.

Plus some minor code cleanup.
---
 lib/block-patterns.php                        |  3 +-
 lib/block-patterns/cover-quote.php            | 34 ------------------
 lib/block-patterns/heading.php                |  6 ++--
 lib/block-patterns/large-header-left.php      | 33 +++++++++++++++++
 .../large-header-text-button.php              |  4 +--
 .../media-text-arquitecture.php               |  2 +-
 lib/block-patterns/media-text-art.php         |  6 ++--
 lib/block-patterns/media-text-nature.php      |  6 ++--
 lib/block-patterns/quote-2.php                |  2 +-
 lib/block-patterns/text-two-columns-2.php     | 12 +++----
 .../text-two-columns-title-offset.php         | 20 +++++------
 lib/block-patterns/text-two-columns-title.php |  8 ++---
 .../three-columns-media-text.php              | 20 +++--------
 lib/block-patterns/three-columns-text.php     | 14 ++++----
 lib/block-patterns/three-images-gallery.php   |  2 +-
 lib/block-patterns/two-columns-header.php     | 35 -------------------
 lib/block-patterns/two-images-gallery.php     |  2 +-
 17 files changed, 80 insertions(+), 129 deletions(-)
 delete mode 100644 lib/block-patterns/cover-quote.php
 create mode 100644 lib/block-patterns/large-header-left.php
 delete mode 100644 lib/block-patterns/two-columns-header.php

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index b0dcc1c4286da..5d90866710c0f 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -183,10 +183,9 @@
 $core_block_patterns = array(
 	'media-text-nature',
 	'two-images-gallery',
-	'cover-quote',
-	'two-columns-header',
 	'three-columns-media-text',
 	'quote-2',
+	'large-header-left',
 	'large-header-text-button',
 	'media-text-art',
 	'text-two-columns-title',
diff --git a/lib/block-patterns/cover-quote.php b/lib/block-patterns/cover-quote.php
deleted file mode 100644
index 14d4fee2be5a3..0000000000000
--- a/lib/block-patterns/cover-quote.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Cover image with quote on top
- *
- * @package WordPress
- */
-
-return array(
-	'title'       => __( 'Large header with left-aligned text' ),
-	'categories'  => array( 'header' ),
-	'content'     => '<!-- wp:cover {"url":"https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg","id":261,"dimRatio":60,"minHeight":800,"align":"full"} -->
-	<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background wp-image-261" alt="' . __( 'A dense forest of tall, straight trees as seen from slightly above.' ) . '" src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container">
-	<!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"14vw"},"color":{"text":"#ffe074"}}} -->
-	<h2 class="alignwide has-text-color" style="color:#ffe074;font-size:14vw">' . __( 'Forest.' ) . '</h2>
-	<!-- /wp:heading -->
-	<!-- wp:columns {"align":"wide"} -->
-	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"55%"} -->
-	<div class="wp-block-column" style="flex-basis:55%">
-	<!-- wp:spacer {"height":330} -->
-	<div style="height:330px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-	
-	<!-- wp:paragraph {"style":{"color":{"text":"#ffe074"},"typography":{"lineHeight":"1.3","fontSize":"12px"}}} -->
-	<p class="has-text-color" style="color:#ffe074;font-size:12px;line-height:1.3"><em>' . __( 'Even a child knows how valuable the forest is. The fresh, breathtaking smell of trees. Echoing birds flying above that dense magnitude. A stable climate, a sustainable diverse life and a source of culture. Yet, forests and other ecosystems hang in the balance, threatened to become croplands, pasture, and plantations.' ) . '</em></p>
-	<!-- /wp:paragraph --></div>
-	<!-- /wp:column -->
-	
-	<!-- wp:column -->
-	<div class="wp-block-column"></div>
-	<!-- /wp:column --></div>
-	<!-- /wp:columns --></div></div>
-	<!-- /wp:cover -->',
-	'description' => _x( 'Cover image with quote on top', 'Block pattern description' ),
-);
diff --git a/lib/block-patterns/heading.php b/lib/block-patterns/heading.php
index f774fc7ecdce1..183f7ee5409ab 100644
--- a/lib/block-patterns/heading.php
+++ b/lib/block-patterns/heading.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Heading
+ * Heading.
  *
  * @package WordPress
  */
@@ -8,8 +8,8 @@
 return array(
 	'title'       => __( 'Heading' ),
 	'categories'  => array( 'text' ),
-	'content'     => '<!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"55px","lineHeight":"1.1"}}} -->
-	<h2 class="alignwide" style="font-size:55px;line-height:1.1">' . __( "We're a studio in Berlin with an international practice in architecture, urban planning and interior design. We believe in sharing knowledge and promoting dialogue to increase the creative potential of collaboration." ) . '</h2>
+	'content'     => '<!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"48px","lineHeight":"1.1"}}} -->
+	<h2 class="alignwide" style="font-size:48px;line-height:1.1">' . __( "We're a studio in Berlin with an international practice in architecture, urban planning and interior design. We believe in sharing knowledge and promoting dialogue to increase the creative potential of collaboration." ) . '</h2>
 	<!-- /wp:heading -->',
 	'description' => _x( 'Heading text', 'Block pattern description' ),
 );
diff --git a/lib/block-patterns/large-header-left.php b/lib/block-patterns/large-header-left.php
new file mode 100644
index 0000000000000..bf79479779067
--- /dev/null
+++ b/lib/block-patterns/large-header-left.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Large header with left-aligned text.
+ *
+ * @package WordPress
+ */
+
+return array(
+	'title'       => __( 'Large header with left-aligned text' ),
+	'categories'  => array( 'header' ),
+	'content'     => '<!-- wp:cover {"url":"https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg","id":261,"dimRatio":60,"minHeight":800,"align":"full"} -->
+		<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background wp-image-261" alt="" src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:heading {"align":"wide","style":{"color":{"text":"#ffe074"},"typography":{"fontSize":"64px"}}} -->
+		<h2 class="alignwide has-text-color" style="color:#ffe074;font-size:64px">' . __( 'Forest.' ) . '</h2>
+		<!-- /wp:heading -->
+
+		<!-- wp:columns {"align":"wide"} -->
+		<div class="wp-block-columns alignwide"><!-- wp:column {"width":"55%"} -->
+		<div class="wp-block-column" style="flex-basis:55%"><!-- wp:spacer {"height":330} -->
+		<div style="height:330px" aria-hidden="true" class="wp-block-spacer"></div>
+		<!-- /wp:spacer -->
+
+		<!-- wp:paragraph {"style":{"color":{"text":"#ffe074"},"typography":{"lineHeight":"1.3","fontSize":"12px"}}} -->
+		<p class="has-text-color" style="color:#ffe074;font-size:12px;line-height:1.3"><em>' . __( 'Even a child knows how valuable the forest is. The fresh, breathtaking smell of trees. Echoing birds flying above that dense magnitude. A stable climate, a sustainable diverse life and a source of culture. Yet, forests and other ecosystems hang in the balance, threatened to become croplands, pasture, and plantations.' ) . '</em></p>
+		<!-- /wp:paragraph --></div>
+		<!-- /wp:column -->
+
+		<!-- wp:column -->
+		<div class="wp-block-column"></div>
+		<!-- /wp:column --></div>
+		<!-- /wp:columns --></div></div>
+		<!-- /wp:cover -->',
+	'description' => _x( 'Cover image with quote on top', 'Block pattern description' ),
+);
diff --git a/lib/block-patterns/large-header-text-button.php b/lib/block-patterns/large-header-text-button.php
index 028e49c1fbb57..c16bd9e244f57 100644
--- a/lib/block-patterns/large-header-text-button.php
+++ b/lib/block-patterns/large-header-text-button.php
@@ -9,8 +9,8 @@
 	'title'       => __( 'Large header with text and a button.' ),
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"url":"https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg","id":613,"hasParallax":true,"dimRatio":40,"overlayColor":"black","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
-	<div class="wp-block-cover alignfull has-background-dim-40 has-black-background-color has-background-dim has-parallax" style="background-image:url(https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":"6vw"}},"className":"alignwide has-white-color has-text-color"} -->
-<h2 class="alignwide has-white-color has-text-color" style="font-size:6vw"><strong><em>' . __( 'Overseas: 1500 — 1960' ) . '</em></strong></h1>
+	<div class="wp-block-cover alignfull has-background-dim-40 has-black-background-color has-background-dim has-parallax" style="background-image:url(https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":"48px","lineHeight":"1.2"}},"className":"alignwide has-white-color has-text-color"} -->
+	<h2 class="alignwide has-white-color has-text-color" style="font-size:48px;line-height:1.2"><strong><em>' . __( 'Overseas:' ) . '</em></strong><br><strong><em>' . __( '1500 — 1960' ) . '</em></strong></h2>
 	<!-- /wp:heading -->
 
 	<!-- wp:columns {"align":"wide"} -->
diff --git a/lib/block-patterns/media-text-arquitecture.php b/lib/block-patterns/media-text-arquitecture.php
index e519e89d8ba4d..9c10c29e92b54 100644
--- a/lib/block-patterns/media-text-arquitecture.php
+++ b/lib/block-patterns/media-text-arquitecture.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Media and text with image on the right
+ * Media and text with image on the right.
  *
  * @package WordPress
  */
diff --git a/lib/block-patterns/media-text-art.php b/lib/block-patterns/media-text-art.php
index 331abc761138d..2979fce4104b2 100644
--- a/lib/block-patterns/media-text-art.php
+++ b/lib/block-patterns/media-text-art.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Media & text with image on the right
+ * Media & text with image on the right.
  *
  * @package WordPress
  */
@@ -13,8 +13,8 @@
 	<h2 class="has-text-color" style="color:#000000"><strong>' . __( 'Shore with Blue Sea' ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
-	<!-- wp:paragraph {"style":{"typography":{"fontSize":"17px"},"color":{"text":"#636363"}}} -->
-	<p class="has-text-color" style="color:#636363;font-size:17px">' . __( 'Eleanor Harris&nbsp;(American, 1901-1942)' ) . '</p>
+	<!-- wp:paragraph {"style":{"typography":{"fontSize":"17px"},"color":{"text":"#636363"},"typography":{"lineHeight":"1.1"}}} -->
+	<p class="has-text-color" style="color:#636363;font-size:17px;line-height:1.1">' . __( 'Eleanor Harris&nbsp;(American, 1901-1942)' ) . '</p>
 	<!-- /wp:paragraph --></div></div>
 	<!-- /wp:media-text -->',
 	'description' => _x( 'Media and text block with image to the right and text to the left', 'Block pattern description' ),
diff --git a/lib/block-patterns/media-text-nature.php b/lib/block-patterns/media-text-nature.php
index bce752a84a90c..ac71846de4e0e 100644
--- a/lib/block-patterns/media-text-nature.php
+++ b/lib/block-patterns/media-text-nature.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Media & text in a full height container
+ * Media & text in a full height container.
  *
  * @package WordPress
  */
@@ -9,8 +9,8 @@
 	'title'       => __( 'Media & text in a full height container' ),
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"customOverlayColor":"#ffffff","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
-	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"mediaId":2501,"mediaLink":"https://mywptesting.site/2021/02/button-bug/sand-rock-texture-dry-brown-soil-726223-pxhere-com_/","mediaType":"image","mediaWidth":56,"verticalAlignment":"center"} -->
-	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media"><img src="https://mywptesting.site/wp-content/uploads/2021/02/sand-rock-texture-dry-brown-soil-726223-pxhere.com_-1024x681.jpg" alt="' . __( 'Close-up of dried, cracked earth.' ) . '" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
+	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"mediaId":2501,"mediaLink":"https://mywptesting.site/2021/02/button-bug/sand-rock-texture-dry-brown-soil-726223-pxhere-com_/","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","imageFill":true} -->
+	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center is-image-fill" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media" style="background-image:url(https://mywptesting.site/wp-content/uploads/2021/02/sand-rock-texture-dry-brown-soil-726223-pxhere.com_-1024x681.jpg);background-position:50% 50%"><img src="https://mywptesting.site/wp-content/uploads/2021/02/sand-rock-texture-dry-brown-soil-726223-pxhere.com_-1024x681.jpg" alt="' . __( 'Close-up of dried, cracked earth.' ) . '" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
 	<h2 class="has-text-color" style="color:#000000;font-size:32px"><strong>' . __( "What's the problem?" ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
diff --git a/lib/block-patterns/quote-2.php b/lib/block-patterns/quote-2.php
index 3bcf3e5226ead..f3812bdb16f29 100644
--- a/lib/block-patterns/quote-2.php
+++ b/lib/block-patterns/quote-2.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Quote
+ * Quote.
  *
  * @package WordPress
  */
diff --git a/lib/block-patterns/text-two-columns-2.php b/lib/block-patterns/text-two-columns-2.php
index 45927d2253316..fbb64542d6bf7 100644
--- a/lib/block-patterns/text-two-columns-2.php
+++ b/lib/block-patterns/text-two-columns-2.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Two columns of text
+ * Two columns of text.
  *
  * @package WordPress
  */
@@ -9,7 +9,7 @@
 	'title'       => __( 'Two columns of text' ),
 	'categories'  => array( 'columns', 'text' ),
 	'content'     => '<!-- wp:columns {"align":"full"} -->
-	<div class="wp-block-columns alignfull"><!-- wp:column -->
+	<div class="wp-block-columns"><!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:spacer -->
 	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
@@ -18,8 +18,8 @@
 	<p class="has-black-color has-text-color" style="font-size:21px"><strong>' . __( 'We have worked with:' ) . '</strong></p>
 	<!-- /wp:paragraph -->
 	
-	<!-- wp:paragraph {"style":{"typography":{"fontSize":"49px","lineHeight":"1.2"}}} -->
-	<p style="font-size:49px;line-height:1.2"><a href="https://wordpress.org">' . __( 'EARTHFUND™<br>ARCHWEEKLY<br>FUTURE ROADS<br>BUILDING NY' ) . '</a></p>
+	<!-- wp:paragraph {"style":{"typography":{"fontSize":"24px","lineHeight":"1.2"}}} -->
+	<p style="font-size:24px;line-height:1.2"><a href="https://wordpress.org">' . __( 'EARTHFUND™<br>ARCHWEEKLY<br>FUTURE ROADS<br>BUILDING NY' ) . '</a></p>
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:spacer -->
@@ -32,8 +32,8 @@
 	<div style="height:160px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
 	
-	<!-- wp:paragraph {"style":{"typography":{"fontSize":"49px","lineHeight":"1.2"}}} -->
-	<p style="font-size:49px;line-height:1.2"><a href="https://wordpress.org">' . __( 'DUBAI ROOFS<br>MAY WATSON STUDIO<br>Y.O.L<br>RUDIMENTAR' ) . '</a></p>
+	<!-- wp:paragraph {"style":{"typography":{"fontSize":"24px","lineHeight":"1.2"}}} -->
+	<p style="font-size:24px;line-height:1.2"><a href="https://wordpress.org">' . __( 'DUBAI ROOFS<br>MAY WATSON STUDIO<br>Y.O.L<br>RUDIMENTAR' ) . '</a></p>
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:spacer -->
diff --git a/lib/block-patterns/text-two-columns-title-offset.php b/lib/block-patterns/text-two-columns-title-offset.php
index 9d1aa798abea9..ed15c0b784314 100644
--- a/lib/block-patterns/text-two-columns-title-offset.php
+++ b/lib/block-patterns/text-two-columns-title-offset.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Two columns of text with offset heading
+ * Two columns of text with offset heading.
  *
  * @package WordPress
  */
@@ -9,19 +9,19 @@
 	'title'       => __( 'Two columns of text with offset heading' ),
 	'categories'  => array( 'columns', 'text' ),
 	'content'     => '<!-- wp:group {"align":"full","style":{"color":{"background":"#f2f0e9"}}} -->
-	<div class="wp-block-group alignfull has-background" style="background-color:#f2f0e9"><!-- wp:columns {"align":"full"} -->
-	<div class="wp-block-columns alignfull"><!-- wp:column {"width":"60%"} -->
-	<div class="wp-block-column" style="flex-basis:60%"><!-- wp:spacer {"height":70} -->
+	<div class="wp-block-group alignfull has-background" style="background-color:#f2f0e9"><!-- wp:columns {"align":"wide"} -->
+	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"50%"} -->
+	<div class="wp-block-column" style="flex-basis:50%"><!-- wp:spacer {"height":70} -->
 	<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
 	
-	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"5vw"}},"textColor":"black"} -->
-	<p class="has-black-color has-text-color" style="font-size:5vw;line-height:1.1"><strong>' . __( 'Ancient Sea Representations' ) . '</strong></p>
+	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"30px"}},"textColor":"black"} -->
+	<p class="has-black-color has-text-color" style="font-size:30px;line-height:1.1"><strong>' . __( 'Ancient Sea Representations' ) . '</strong></p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
-	<!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:spacer {"height":95} -->
+	<!-- wp:column {"width":"50%"} -->
+	<div class="wp-block-column" style="flex-basis:50%"><!-- wp:spacer {"height":95} -->
 	<div style="height:95px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
 	
@@ -31,8 +31,8 @@
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->
 	
-	<!-- wp:columns {"align":"full"} -->
-	<div class="wp-block-columns alignfull"><!-- wp:column -->
+	<!-- wp:columns {"align":"wide"} -->
+	<div class="wp-block-columns alignwide"><!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:spacer {"height":350} -->
 	<div style="height:350px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer --></div>
diff --git a/lib/block-patterns/text-two-columns-title.php b/lib/block-patterns/text-two-columns-title.php
index 7707a67de7028..7e3f5e60485b0 100644
--- a/lib/block-patterns/text-two-columns-title.php
+++ b/lib/block-patterns/text-two-columns-title.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Two columns text and title
+ * Two columns text and title.
  *
  * @package WordPress
  */
@@ -9,13 +9,13 @@
 	'title'       => __( 'Two columns text and title' ),
 	'categories'  => array( 'columns', 'text' ),
 	'content'     => '<!-- wp:group -->
-	<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":38}}} -->
-	<h2 style="font-size:38px"><strong>' . __( 'The voyage had begun, and had begun happily with a soft blue sky, and a calm sea.' ) . '</strong></h2>
+	<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":38},"typography":{"lineHeight":"1.5"}}} -->
+	<h2 style="font-size:38px;line-height:1.5"><strong>' . __( 'The voyage had begun, and had begun happily with a soft blue sky, and a calm sea.' ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
 	<!-- wp:columns -->
 	<div class="wp-block-columns"><!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:paragraph {"fontSize":"small"} -->
+	<div class="wp-block-column"><!-- wp:paragraph {"style":{"typography":{"fontSize":18}}} -->
 	<p style="font-size:18px">' . __( 'They followed her on to the deck. All the smoke and the houses had disappeared, and the ship was out in a wide space of sea very fresh and clear though pale in the early light. They had left London sitting on its mud. A very thin line of shadow tapered on the horizon, scarcely thick enough to stand the burden of Paris, which nevertheless rested upon it. They were free of roads, free of mankind, and the same exhilaration at their freedom ran through them all.' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
diff --git a/lib/block-patterns/three-columns-media-text.php b/lib/block-patterns/three-columns-media-text.php
index 0106346c00626..4d90115dd4ab7 100644
--- a/lib/block-patterns/three-columns-media-text.php
+++ b/lib/block-patterns/three-columns-media-text.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Three columns with images and text
+ * Three columns with images and text.
  *
  * @package WordPress
  */
@@ -14,26 +14,14 @@
 	<div class="wp-block-column"><!-- wp:spacer -->
 	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
-	
+
 	<!-- wp:heading {"level":6,"textColor":"black"} -->
 	<h6 class="has-black-color has-text-color">ECOSYSTEM</h6>
 	<!-- /wp:heading -->
-	
+
 	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"5vw"}},"textColor":"black"} -->
-	<p class="has-black-color has-text-color" style="font-size:5vw;line-height:1.1"><strong>' . __( 'Positive growth.' ) . '</strong></p>
+	<p class="has-black-color has-text-color" style="font-size:5vw;line-height:1.1"><strong>Positive growth.</strong></p>
 	<!-- /wp:paragraph --></div>
-	<!-- /wp:column -->
-	
-	<!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:spacer -->
-	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer --></div>
-	<!-- /wp:column -->
-	
-	<!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:spacer -->
-	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->
 	
diff --git a/lib/block-patterns/three-columns-text.php b/lib/block-patterns/three-columns-text.php
index 13a3862a0badf..2445dfa7f77ec 100644
--- a/lib/block-patterns/three-columns-text.php
+++ b/lib/block-patterns/three-columns-text.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Three columns of text
+ * Three columns of text.
  *
  * @package WordPress
  */
@@ -10,8 +10,8 @@
 	'categories'  => array( 'text' ),
 	'content'     => '<!-- wp:columns {"align":"full","backgroundColor":"white","textColor":"black"} -->
 	<div class="wp-block-columns alignfull has-black-color has-white-background-color has-text-color has-background"><!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:heading {"level":3} -->
-	<h3><strong><a href="http://wordpress.org" data-type="URL" data-id="wordpress.org">' . __( 'Virtual Tour ↗' ) . '</a></strong></h3>
+	<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"24px"}}} -->
+	<h3 style="font-size:24px"><strong><a href="http://wordpress.org" data-type="URL" data-id="wordpress.org">' . __( 'Virtual Tour ↗' ) . '</a></strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph -->
@@ -20,8 +20,8 @@
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:heading {"level":3} -->
-	<h3><strong><a href="https://wordpress.org">' . __( 'Open Exhibitions ↗' ) . '</a></strong></h3>
+	<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"24px"}}} -->
+	<h3 style="font-size:24px"><strong><a href="https://wordpress.org">' . __( 'Open Exhibitions ↗' ) . '</a></strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph -->
@@ -30,8 +30,8 @@
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:heading {"level":3} -->
-	<h3><strong><a href="https://wordpress.org">' . __( 'Useful Info ↗' ) . '</a></strong></h3>
+	<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"24px"}}} -->
+	<h3 style="font-size:24px"><strong><a href="https://wordpress.org">' . __( 'Useful Info ↗' ) . '</a></strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph -->
diff --git a/lib/block-patterns/three-images-gallery.php b/lib/block-patterns/three-images-gallery.php
index 1549d08ea130d..ed498f0f86634 100644
--- a/lib/block-patterns/three-images-gallery.php
+++ b/lib/block-patterns/three-images-gallery.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Three columns with offset images
+ * Three columns with offset images.
  *
  * @package WordPress
  */
diff --git a/lib/block-patterns/two-columns-header.php b/lib/block-patterns/two-columns-header.php
deleted file mode 100644
index 1fa61e20b0ed2..0000000000000
--- a/lib/block-patterns/two-columns-header.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Large header with two columns
- *
- * @package WordPress
- */
-
-return array(
-	'title'       => __( 'Large header with two columns' ),
-	'categories'  => array( 'header' ),
-	'content'     => '<!-- wp:cover {"customOverlayColor":"#51503b","minHeight":800,"align":"full"} -->
-	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#51503b;min-height:800px"><div class="wp-block-cover__inner-container"><!-- wp:columns {"align":"wide"} -->
-	<div class="wp-block-columns alignwide"><!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:separator {"customColor":"#ffe074","className":"is-style-wide"} -->
-	<hr class="wp-block-separator has-text-color has-background is-style-wide" style="background-color:#ffe074;color:#ffe074"/>
-	<!-- /wp:separator -->
-	
-	<!-- wp:heading {"style":{"color":{"text":"#ffe074"},"typography":{"fontSize":"16vw"}}} -->
-	<h2 class="has-text-color" style="color:#ffe074;font-size:16vw">' . __( '80%*' ) . '</h2>
-	<!-- /wp:heading -->
-	
-	<!-- wp:paragraph {"style":{"typography":{"fontSize":"12px","lineHeight":"1.3"},"color":{"text":"#ffe074","link":"#ffe074"}}} -->
-	<p class="has-text-color has-link-color" style="--wp--style--color--link:#ffe074;color:#ffe074;font-size:12px;line-height:1.3"><em>' . __( '*Is how much industrial agriculture contributes to deforestation across the globe. Nature always wears the colors of the spirit. To a man laboring under calamity, the heat of his own fire hath sadness in it.' ) . '</em></p>
-	<!-- /wp:paragraph --></div>
-	<!-- /wp:column -->
-	
-	<!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:image {"id":265,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-nature-forest-light-plant-sunshine-1100731-pxhere.com_-1024x681.jpg" alt="' . __( 'Forest of bamboo trees, seen from the ground up. The sun shines through the canopy.' ) . '" class="wp-image-265"/></figure>
-	<!-- /wp:image --></div>
-	<!-- /wp:column --></div>
-	<!-- /wp:columns --></div></div>
-	<!-- /wp:cover -->',
-	'description' => _x( 'Cover with two columns with text on the left one and an image on the right one', 'Block pattern description' ),
-);
diff --git a/lib/block-patterns/two-images-gallery.php b/lib/block-patterns/two-images-gallery.php
index 399f78a4f6165..bd5c5a0036632 100644
--- a/lib/block-patterns/two-images-gallery.php
+++ b/lib/block-patterns/two-images-gallery.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Two images side by side
+ * Two images side by side.
  *
  * @package WordPress
  */

From 595f3d4700e3475d5d8b7b1ed140656189275f7e Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Thu, 25 Mar 2021 15:39:15 -0400
Subject: [PATCH 14/44] Replace images with optimized versions

---
 lib/block-patterns/large-header-left.php        | 4 ++--
 lib/block-patterns/large-header-text-button.php | 4 ++--
 lib/block-patterns/media-text-arquitecture.php  | 2 +-
 lib/block-patterns/media-text-art.php           | 2 +-
 lib/block-patterns/media-text-nature.php        | 4 ++--
 lib/block-patterns/quote-2.php                  | 2 +-
 lib/block-patterns/three-columns-media-text.php | 6 +++---
 lib/block-patterns/three-images-gallery.php     | 6 +++---
 lib/block-patterns/two-images-gallery.php       | 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/block-patterns/large-header-left.php b/lib/block-patterns/large-header-left.php
index bf79479779067..8f12f6739ad32 100644
--- a/lib/block-patterns/large-header-left.php
+++ b/lib/block-patterns/large-header-left.php
@@ -8,8 +8,8 @@
 return array(
 	'title'       => __( 'Large header with left-aligned text' ),
 	'categories'  => array( 'header' ),
-	'content'     => '<!-- wp:cover {"url":"https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg","id":261,"dimRatio":60,"minHeight":800,"align":"full"} -->
-		<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background wp-image-261" alt="" src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/tree-forest-grass-wilderness-plant-wood-153393-pxhere.com_.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:heading {"align":"wide","style":{"color":{"text":"#ffe074"},"typography":{"fontSize":"64px"}}} -->
+	'content'     => '<!-- wp:cover {"url":"https://cldup.com/k24D1s-zQt.jpg","id":261,"dimRatio":60,"minHeight":800,"align":"full"} -->
+		<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background wp-image-261" alt="" src="https://cldup.com/k24D1s-zQt.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:heading {"align":"wide","style":{"color":{"text":"#ffe074"},"typography":{"fontSize":"64px"}}} -->
 		<h2 class="alignwide has-text-color" style="color:#ffe074;font-size:64px">' . __( 'Forest.' ) . '</h2>
 		<!-- /wp:heading -->
 
diff --git a/lib/block-patterns/large-header-text-button.php b/lib/block-patterns/large-header-text-button.php
index c16bd9e244f57..16878a8e694e9 100644
--- a/lib/block-patterns/large-header-text-button.php
+++ b/lib/block-patterns/large-header-text-button.php
@@ -8,8 +8,8 @@
 return array(
 	'title'       => __( 'Large header with text and a button.' ),
 	'categories'  => array( 'header' ),
-	'content'     => '<!-- wp:cover {"url":"https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg","id":613,"hasParallax":true,"dimRatio":40,"overlayColor":"black","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
-	<div class="wp-block-cover alignfull has-background-dim-40 has-black-background-color has-background-dim has-parallax" style="background-image:url(https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/504382ldsdl-scaled.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":"48px","lineHeight":"1.2"}},"className":"alignwide has-white-color has-text-color"} -->
+	'content'     => '<!-- wp:cover {"url":"https://cldup.com/kRh-P5G84E.jpg","id":613,"hasParallax":true,"dimRatio":40,"overlayColor":"black","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
+	<div class="wp-block-cover alignfull has-background-dim-40 has-black-background-color has-background-dim has-parallax" style="background-image:url(https://cldup.com/kRh-P5G84E.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":"48px","lineHeight":"1.2"}},"className":"alignwide has-white-color has-text-color"} -->
 	<h2 class="alignwide has-white-color has-text-color" style="font-size:48px;line-height:1.2"><strong><em>' . __( 'Overseas:' ) . '</em></strong><br><strong><em>' . __( '1500 — 1960' ) . '</em></strong></h2>
 	<!-- /wp:heading -->
 
diff --git a/lib/block-patterns/media-text-arquitecture.php b/lib/block-patterns/media-text-arquitecture.php
index 9c10c29e92b54..e300d5d7fc2bb 100644
--- a/lib/block-patterns/media-text-arquitecture.php
+++ b/lib/block-patterns/media-text-arquitecture.php
@@ -9,7 +9,7 @@
 	'title'       => __( 'Media and text with image on the right' ),
 	'categories'  => array( 'text' ),
 	'content'     => '<!-- wp:media-text {"align":"full","mediaId":1352,"mediaType":"image","verticalAlignment":"center"} -->
-	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_C7E4WYWEHZ-edited-768x1024.jpg" alt="' . __( 'Close-up, abstract view of architecture.' ) . '" class="wp-image-1352 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"textColor":"black"} -->
+	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://cldup.com/l0MJWqJpIg.jpg" alt="' . __( 'Close-up, abstract view of architecture.' ) . '" class="wp-image-1352 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"textColor":"black"} -->
 	<h3 class="has-text-align-center has-black-color has-text-color"><strong>' . __( 'Open Spaces' ) . '</strong></h3>
 	<!-- /wp:heading -->
 	
diff --git a/lib/block-patterns/media-text-art.php b/lib/block-patterns/media-text-art.php
index 2979fce4104b2..b152183d304c0 100644
--- a/lib/block-patterns/media-text-art.php
+++ b/lib/block-patterns/media-text-art.php
@@ -9,7 +9,7 @@
 	'title'       => __( 'Media & text with image on the right' ),
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:media-text {"align":"full","mediaPosition":"right","mediaId":615,"mediaLink":"#","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","className":"is-style-default"} -->
-	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/03/508741ldsdl-1024x870.jpg" alt="' . __( 'A green and brown rural landscape leading into a bright blue ocean and slightly cloudy sky, done in oil paints.' ) . '" class="wp-image-615 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"color":{"text":"#000000"}},"className":"has-text-color"} -->
+	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://cldup.com/FuU8LZB5o1.jpg" alt="' . __( 'A green and brown rural landscape leading into a bright blue ocean and slightly cloudy sky, done in oil paints.' ) . '" class="wp-image-615 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"color":{"text":"#000000"}},"className":"has-text-color"} -->
 	<h2 class="has-text-color" style="color:#000000"><strong>' . __( 'Shore with Blue Sea' ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
diff --git a/lib/block-patterns/media-text-nature.php b/lib/block-patterns/media-text-nature.php
index ac71846de4e0e..28c1ec6d90ea1 100644
--- a/lib/block-patterns/media-text-nature.php
+++ b/lib/block-patterns/media-text-nature.php
@@ -9,8 +9,8 @@
 	'title'       => __( 'Media & text in a full height container' ),
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"customOverlayColor":"#ffffff","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
-	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"mediaId":2501,"mediaLink":"https://mywptesting.site/2021/02/button-bug/sand-rock-texture-dry-brown-soil-726223-pxhere-com_/","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","imageFill":true} -->
-	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center is-image-fill" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media" style="background-image:url(https://mywptesting.site/wp-content/uploads/2021/02/sand-rock-texture-dry-brown-soil-726223-pxhere.com_-1024x681.jpg);background-position:50% 50%"><img src="https://mywptesting.site/wp-content/uploads/2021/02/sand-rock-texture-dry-brown-soil-726223-pxhere.com_-1024x681.jpg" alt="' . __( 'Close-up of dried, cracked earth.' ) . '" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
+	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"mediaId":2501,"mediaLink":"https://cldup.com/xywOzusFF5.jpg","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","imageFill":true} -->
+	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center is-image-fill" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media" style="background-image:url(https://cldup.com/xywOzusFF5.jpg);background-position:50% 50%"><img src="https://cldup.com/xywOzusFF5.jpg" alt="' . __( 'Close-up of dried, cracked earth.' ) . '" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
 	<h2 class="has-text-color" style="color:#000000;font-size:32px"><strong>' . __( "What's the problem?" ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
diff --git a/lib/block-patterns/quote-2.php b/lib/block-patterns/quote-2.php
index f3812bdb16f29..c0a1df951d1a8 100644
--- a/lib/block-patterns/quote-2.php
+++ b/lib/block-patterns/quote-2.php
@@ -14,7 +14,7 @@
 	<!-- /wp:separator -->
 	
 	<!-- wp:image {"align":"center","id":553,"width":150,"height":150,"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
-	<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_HQR8BJFZID-1.jpg" alt="' . __( 'A side profile of a woman in a russet-colored turtleneck and white bag. She looks up with her eyes closed.' ) . '" class="wp-image-553" width="150" height="150"/></figure></div>
+	<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="https://cldup.com/W_ndYomxw0.jpg" alt="' . __( 'A side profile of a woman in a russet-colored turtleneck and white bag. She looks up with her eyes closed.' ) . '" class="wp-image-553" width="150" height="150"/></figure></div>
 	<!-- /wp:image -->
 	
 	<!-- wp:quote {"align":"center","className":"is-style-large"} -->
diff --git a/lib/block-patterns/three-columns-media-text.php b/lib/block-patterns/three-columns-media-text.php
index 4d90115dd4ab7..d11a03e7cafbc 100644
--- a/lib/block-patterns/three-columns-media-text.php
+++ b/lib/block-patterns/three-columns-media-text.php
@@ -38,13 +38,13 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:image {"id":345,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_ZD6WAL4LGT-edited.jpg" alt="' . __( 'The sun setting through a dense forest of trees.' ) . '" class="wp-image-345"/></figure>
+	<figure class="wp-block-image size-large"><img src="https://cldup.com/1PbDC8HHhu.jpg" alt="' . __( 'The sun setting through a dense forest of trees.' ) . '" class="wp-image-345"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"width":"33.62%"} -->
 	<div class="wp-block-column" style="flex-basis:33.62%"><!-- wp:image {"id":347,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_56RKHNDUQ2-edited-scaled.jpg" alt="' . __( 'Wind turbines standing on a grassy plain, against a blue sky.' ) . '" class="wp-image-347"/></figure>
+	<figure class="wp-block-image size-large"><img src="https://cldup.com/IPeC2jeViL.jpg" alt="' . __( 'Wind turbines standing on a grassy plain, against a blue sky.' ) . '" class="wp-image-347"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->
@@ -52,7 +52,7 @@
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"67%"} -->
 	<div class="wp-block-column" style="flex-basis:67%"><!-- wp:image {"align":"right","id":348,"sizeSlug":"large","linkDestination":"none"} -->
-	<div class="wp-block-image"><figure class="alignright size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_H17J2YTARL-1024x683.jpg" alt="' . __( 'The sun shining over a ridge leading down into the shore. In the distance, a car drives down a road.' ) . '" class="wp-image-348"/></figure></div>
+	<div class="wp-block-image"><figure class="alignright size-large"><img src="https://cldup.com/C6Ju0QAlrk.jpg" alt="' . __( 'The sun shining over a ridge leading down into the shore. In the distance, a car drives down a road.' ) . '" class="wp-image-348"/></figure></div>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
diff --git a/lib/block-patterns/three-images-gallery.php b/lib/block-patterns/three-images-gallery.php
index ed498f0f86634..ada7fe751f5dd 100644
--- a/lib/block-patterns/three-images-gallery.php
+++ b/lib/block-patterns/three-images-gallery.php
@@ -11,7 +11,7 @@
 	'content'     => '<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"25%"} -->
 	<div class="wp-block-column" style="flex-basis:25%"><!-- wp:image {"id":240,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
-	<figure class="wp-block-image size-large is-style-default"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/wing-light-architecture-structure-wood-white-714046-pxhere.com_-576x1024.jpg" alt="' . __( 'Close-up, abstract view of geometric architecture.' ) . '" class="wp-image-240"/></figure>
+	<figure class="wp-block-image size-large is-style-default"><img src="https://cldup.com/TE-RNaH1AQ.jpg" alt="' . __( 'Close-up, abstract view of geometric architecture.' ) . '" class="wp-image-240"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
@@ -25,13 +25,13 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:image {"id":237,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/wing-architecture-structure-wood-white-house-997338-pxhere.com_-683x1024.jpg" alt="' . __( 'Close-up, angled view of a window on a white building.' ) . '" class="wp-image-237"/></figure>
+	<figure class="wp-block-image size-large"><img src="https://cldup.com/QMLVxdDspo.jpg" alt="' . __( 'Close-up, angled view of a window on a white building.' ) . '" class="wp-image-237"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"width":"45%"} -->
 	<div class="wp-block-column" style="flex-basis:45%"><!-- wp:image {"id":236,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
-	<figure class="wp-block-image size-large is-style-default"><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/wing-architecture-structure-building-ceiling-geometric-99094-pxhere.com_-1024x683.jpg" alt="' . __( 'Close-up of the corner of a white, geometric building with both sharp points and round corners.' ) . '" class="wp-image-236"/></figure>
+	<figure class="wp-block-image size-large is-style-default"><img src="https://cldup.com/WcsOUyiWdV.jpg" alt="' . __( 'Close-up of the corner of a white, geometric building with both sharp points and round corners.' ) . '" class="wp-image-236"/></figure>
 	<!-- /wp:image -->
 	
 	<!-- wp:spacer {"height":285} -->
diff --git a/lib/block-patterns/two-images-gallery.php b/lib/block-patterns/two-images-gallery.php
index bd5c5a0036632..2c9ada912dce6 100644
--- a/lib/block-patterns/two-images-gallery.php
+++ b/lib/block-patterns/two-images-gallery.php
@@ -9,7 +9,7 @@
 	'title'       => __( 'Two images side by side' ),
 	'categories'  => array( 'gallery' ),
 	'content'     => '<!-- wp:gallery {"ids":[259,258],"linkTo":"none","align":"wide"} -->
-	<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_IM8T5HVXU0-edited-1024x1024.jpg" alt="' . __( 'An aerial view of waves crashing against a shore.' ) . '" data-id="259" data-full-url="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_IM8T5HVXU0-edited-scaled.jpg" data-link="#" class="wp-image-259"/></figure></li><li class="blocks-gallery-item"><figure><img src="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_66J4T150FP-edited-1024x1024.jpg" alt="' . __( 'An aerial view of a field. A road runs through the upper right corner.' ) . '" data-id="258" data-full-url="https://blockpatterndesigns.mystagingwebsite.com/wp-content/uploads/2021/02/StockSnap_66J4T150FP-edited-scaled.jpg" data-link="#" class="wp-image-258"/></figure></li></ul></figure>
+	<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="https://cldup.com/B0HioJENtD.jpg" alt="' . __( 'An aerial view of waves crashing against a shore.' ) . '" data-id="259" data-full-url="https://cldup.com/B0HioJENtD.jpg" data-link="#" class="wp-image-259"/></figure></li><li class="blocks-gallery-item"><figure><img src="https://cldup.com/yCvbhv-lUc.jpg" alt="' . __( 'An aerial view of a field. A road runs through the upper right corner.' ) . '" data-id="258" data-full-url="https://cldup.com/yCvbhv-lUc.jpg" data-link="#" class="wp-image-258"/></figure></li></ul></figure>
 	<!-- /wp:gallery -->',
 	'description' => _x( 'Two images side by side', 'Block pattern description' ),
 );

From 22b18b1bd940d26ab034b8f5a87b83fd5e32b1f9 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Fri, 26 Mar 2021 14:31:38 -0400
Subject: [PATCH 15/44] Fix line height and block markup error.

---
 lib/block-patterns/text-two-columns-title.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/block-patterns/text-two-columns-title.php b/lib/block-patterns/text-two-columns-title.php
index 7e3f5e60485b0..d741603559370 100644
--- a/lib/block-patterns/text-two-columns-title.php
+++ b/lib/block-patterns/text-two-columns-title.php
@@ -9,8 +9,8 @@
 	'title'       => __( 'Two columns text and title' ),
 	'categories'  => array( 'columns', 'text' ),
 	'content'     => '<!-- wp:group -->
-	<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":38},"typography":{"lineHeight":"1.5"}}} -->
-	<h2 style="font-size:38px;line-height:1.5"><strong>' . __( 'The voyage had begun, and had begun happily with a soft blue sky, and a calm sea.' ) . '</strong></h2>
+	<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":38,"lineHeight":"1.4"}}} -->
+	<h2 style="font-size:38px;line-height:1.4"><strong>' . __( 'The voyage had begun, and had begun happily with a soft blue sky, and a calm sea.' ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
 	<!-- wp:columns -->

From 334c2d20a120b42e2aec77fe35debe99d91c2840 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Fri, 26 Mar 2021 14:34:06 -0400
Subject: [PATCH 16/44] Remove extra space from text.

---
 lib/block-patterns/text-two-columns-title.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/block-patterns/text-two-columns-title.php b/lib/block-patterns/text-two-columns-title.php
index d741603559370..9516fd938236f 100644
--- a/lib/block-patterns/text-two-columns-title.php
+++ b/lib/block-patterns/text-two-columns-title.php
@@ -22,7 +22,7 @@
 	
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:paragraph {"style":{"typography":{"fontSize":18}}} -->
-	<p style="font-size:18px"> ' . __( "The ship was making her way steadily through small waves which slapped her and then fizzled like effervescing water, leaving a little border of bubbles and foam on either side. The colourless October sky above was thinly clouded as if by the trail of wood-fire smoke, and the air was wonderfully salt and brisk. Indeed it was too cold to stand still. Mrs. Ambrose drew her arm within her husband's, and as they moved off it could be seen from the way in which her sloping cheek turned up to his that she had something private to communicate." ) . '</p>
+	<p style="font-size:18px">' . __( "The ship was making her way steadily through small waves which slapped her and then fizzled like effervescing water, leaving a little border of bubbles and foam on either side. The colourless October sky above was thinly clouded as if by the trail of wood-fire smoke, and the air was wonderfully salt and brisk. Indeed it was too cold to stand still. Mrs. Ambrose drew her arm within her husband's, and as they moved off it could be seen from the way in which her sloping cheek turned up to his that she had something private to communicate." ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns --></div></div>

From 1f937a5bf4a578194b4fe91e773b73b11d18bb03 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 29 Mar 2021 14:13:48 -0400
Subject: [PATCH 17/44] Add "Three columns of text" to the columns category.

---
 lib/block-patterns/three-columns-text.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/block-patterns/three-columns-text.php b/lib/block-patterns/three-columns-text.php
index 2445dfa7f77ec..dc7a4fa180110 100644
--- a/lib/block-patterns/three-columns-text.php
+++ b/lib/block-patterns/three-columns-text.php
@@ -7,7 +7,7 @@
 
 return array(
 	'title'       => __( 'Three columns of text' ),
-	'categories'  => array( 'text' ),
+	'categories'  => array( 'columns,text' ),
 	'content'     => '<!-- wp:columns {"align":"full","backgroundColor":"white","textColor":"black"} -->
 	<div class="wp-block-columns alignfull has-black-color has-white-background-color has-text-color has-background"><!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"24px"}}} -->

From eb6b871ca7dd033761f818140120a027a4c0c1ed Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 29 Mar 2021 14:16:59 -0400
Subject: [PATCH 18/44] Update text for three columns pattern.

---
 lib/block-patterns/three-columns-text.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/block-patterns/three-columns-text.php b/lib/block-patterns/three-columns-text.php
index dc7a4fa180110..970de6b72fbdc 100644
--- a/lib/block-patterns/three-columns-text.php
+++ b/lib/block-patterns/three-columns-text.php
@@ -21,7 +21,7 @@
 	
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"24px"}}} -->
-	<h3 style="font-size:24px"><strong><a href="https://wordpress.org">' . __( 'Open Exhibitions ↗' ) . '</a></strong></h3>
+	<h3 style="font-size:24px"><strong><a href="https://wordpress.org">' . __( 'Current Shows ↗' ) . '</a></strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph -->

From ed279e19bbcf4a7380d37e4f243a1498cb775e93 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 29 Mar 2021 14:18:44 -0400
Subject: [PATCH 19/44] Set line height for three columns pattern.

---
 lib/block-patterns/three-columns-text.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/block-patterns/three-columns-text.php b/lib/block-patterns/three-columns-text.php
index 970de6b72fbdc..36092aaf6a17a 100644
--- a/lib/block-patterns/three-columns-text.php
+++ b/lib/block-patterns/three-columns-text.php
@@ -10,8 +10,8 @@
 	'categories'  => array( 'columns,text' ),
 	'content'     => '<!-- wp:columns {"align":"full","backgroundColor":"white","textColor":"black"} -->
 	<div class="wp-block-columns alignfull has-black-color has-white-background-color has-text-color has-background"><!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"24px"}}} -->
-	<h3 style="font-size:24px"><strong><a href="http://wordpress.org" data-type="URL" data-id="wordpress.org">' . __( 'Virtual Tour ↗' ) . '</a></strong></h3>
+	<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"24px","lineHeight":"1.3"}}} -->
+	<h3 style="font-size:24px;line-height:1.3"><strong><a href="http://wordpress.org" data-type="URL" data-id="wordpress.org">' . __( 'Virtual Tour ↗' ) . '</a></strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph -->
@@ -20,8 +20,8 @@
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"24px"}}} -->
-	<h3 style="font-size:24px"><strong><a href="https://wordpress.org">' . __( 'Current Shows ↗' ) . '</a></strong></h3>
+	<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"24px","lineHeight":"1.3"}}} -->
+	<h3 style="font-size:24px;line-height:1.3"><strong><a href="https://wordpress.org">' . __( 'Current Shows ↗' ) . '</a></strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph -->
@@ -30,8 +30,8 @@
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"24px"}}} -->
-	<h3 style="font-size:24px"><strong><a href="https://wordpress.org">' . __( 'Useful Info ↗' ) . '</a></strong></h3>
+	<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"24px","lineHeight":"1.3"}}} -->
+	<h3 style="font-size:24px;line-height:1.3"><strong><a href="https://wordpress.org">' . __( 'Useful Info ↗' ) . '</a></strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph -->

From cddeb898d69adc66d0928fe1dbdb0282c4421b86 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 29 Mar 2021 14:37:20 -0400
Subject: [PATCH 20/44] Update copy for Offset Title direction.

---
 lib/block-patterns/text-two-columns-title-offset.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/block-patterns/text-two-columns-title-offset.php b/lib/block-patterns/text-two-columns-title-offset.php
index ed15c0b784314..bf4670ee1931a 100644
--- a/lib/block-patterns/text-two-columns-title-offset.php
+++ b/lib/block-patterns/text-two-columns-title-offset.php
@@ -16,7 +16,7 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"30px"}},"textColor":"black"} -->
-	<p class="has-black-color has-text-color" style="font-size:30px;line-height:1.1"><strong>' . __( 'Ancient Sea Representations' ) . '</strong></p>
+	<p class="has-black-color has-text-color" style="font-size:30px;line-height:1.1"><strong>' . __( 'Oceanic Inspiration' ) . '</strong></p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	

From 5c3d7318f5b142eaf74cad733ef2a77e66f9f566 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 29 Mar 2021 15:08:57 -0400
Subject: [PATCH 21/44] Simplify the Two columns of text with offset heading
 pattern.

---
 .../text-two-columns-title-offset.php         | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/lib/block-patterns/text-two-columns-title-offset.php b/lib/block-patterns/text-two-columns-title-offset.php
index bf4670ee1931a..8c7c42cc3366b 100644
--- a/lib/block-patterns/text-two-columns-title-offset.php
+++ b/lib/block-patterns/text-two-columns-title-offset.php
@@ -9,23 +9,19 @@
 	'title'       => __( 'Two columns of text with offset heading' ),
 	'categories'  => array( 'columns', 'text' ),
 	'content'     => '<!-- wp:group {"align":"full","style":{"color":{"background":"#f2f0e9"}}} -->
-	<div class="wp-block-group alignfull has-background" style="background-color:#f2f0e9"><!-- wp:columns {"align":"wide"} -->
-	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"50%"} -->
-	<div class="wp-block-column" style="flex-basis:50%"><!-- wp:spacer {"height":70} -->
+	<div class="wp-block-group alignfull has-background" style="background-color:#f2f0e9"><!-- wp:spacer {"height":70} -->
 	<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
 	
-	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"30px"}},"textColor":"black"} -->
+	<!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->
+	<div class="wp-block-columns alignwide are-vertically-aligned-center"><!-- wp:column {"width":"50%"} -->
+	<div class="wp-block-column" style="flex-basis:50%"><!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"30px"}},"textColor":"black"} -->
 	<p class="has-black-color has-text-color" style="font-size:30px;line-height:1.1"><strong>' . __( 'Oceanic Inspiration' ) . '</strong></p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"width":"50%"} -->
-	<div class="wp-block-column" style="flex-basis:50%"><!-- wp:spacer {"height":95} -->
-	<div style="height:95px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-	
-	<!-- wp:separator {"color":"black","className":"is-style-wide"} -->
+	<div class="wp-block-column" style="flex-basis:50%"><!-- wp:separator {"color":"black","className":"is-style-wide"} -->
 	<hr class="wp-block-separator has-text-color has-background has-black-background-color has-black-color is-style-wide"/>
 	<!-- /wp:separator --></div>
 	<!-- /wp:column --></div>
@@ -33,9 +29,7 @@
 	
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:spacer {"height":350} -->
-	<div style="height:350px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer --></div>
+	<div class="wp-block-column"></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
@@ -49,7 +43,11 @@
 	<p class="has-black-color has-text-color has-extra-small-font-size">' . __( 'No darkness would ever settle upon those lamps, as no darkness had settled upon them for hundreds of years. It seemed dreadful that the town should blaze for ever in the same spot; dreadful at least to people going away to adventure upon the sea, and beholding it as a circumscribed mound, eternally burnt, eternally scarred. From the deck of the ship the great city appeared a crouched and cowardly figure, a sedentary miser.' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column --></div>
-	<!-- /wp:columns --></div>
+	<!-- /wp:columns -->
+
+	<!-- wp:spacer {"height":40} -->
+	<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer --></div>
 	<!-- /wp:group -->',
 	'description' => _x( 'Two columns of text with offset heading', 'Block pattern description' ),
 );

From 50fd2947db69a580b113ad011f93b53145e3c05c Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 29 Mar 2021 15:20:22 -0400
Subject: [PATCH 22/44] Add a small spacer to the "Three columns with images
 and text" pattern.

---
 lib/block-patterns/three-columns-media-text.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/block-patterns/three-columns-media-text.php b/lib/block-patterns/three-columns-media-text.php
index d11a03e7cafbc..30007f2e1f83e 100644
--- a/lib/block-patterns/three-columns-media-text.php
+++ b/lib/block-patterns/three-columns-media-text.php
@@ -21,7 +21,9 @@
 
 	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"5vw"}},"textColor":"black"} -->
 	<p class="has-black-color has-text-color" style="font-size:5vw;line-height:1.1"><strong>Positive growth.</strong></p>
-	<!-- /wp:paragraph --></div>
+	<!-- /wp:paragraph --><!-- wp:spacer {"height":5} -->
+	<div style="height:5px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->
 	

From 602311c07b7902458438c3923c27f8bb52d9c9dc Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Tue, 30 Mar 2021 12:16:39 +0200
Subject: [PATCH 23/44] change color values to use hexadecimal

---
 lib/block-patterns/large-header-text-button.php  | 10 +++++-----
 lib/block-patterns/media-text-arquitecture.php   |  4 ++--
 lib/block-patterns/text-two-columns-2.php        |  5 ++---
 .../text-two-columns-title-offset.php            | 16 ++++++++--------
 lib/block-patterns/three-columns-media-text.php  | 16 ++++++++--------
 lib/block-patterns/three-columns-text.php        |  6 +++---
 6 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/lib/block-patterns/large-header-text-button.php b/lib/block-patterns/large-header-text-button.php
index 16878a8e694e9..40be15a577a1b 100644
--- a/lib/block-patterns/large-header-text-button.php
+++ b/lib/block-patterns/large-header-text-button.php
@@ -8,8 +8,8 @@
 return array(
 	'title'       => __( 'Large header with text and a button.' ),
 	'categories'  => array( 'header' ),
-	'content'     => '<!-- wp:cover {"url":"https://cldup.com/kRh-P5G84E.jpg","id":613,"hasParallax":true,"dimRatio":40,"overlayColor":"black","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
-	<div class="wp-block-cover alignfull has-background-dim-40 has-black-background-color has-background-dim has-parallax" style="background-image:url(https://cldup.com/kRh-P5G84E.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":"48px","lineHeight":"1.2"}},"className":"alignwide has-white-color has-text-color"} -->
+	'content'     => '<!-- wp:cover {"url":"https://cldup.com/kRh-P5G84E.jpg","id":613,"hasParallax":true,"dimRatio":40,"customOverlayColor":"#000000","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
+	<div class="wp-block-cover alignfull has-background-dim-40 has-background-dim has-parallax" style="background-color:#000000;background-image:url(https://cldup.com/kRh-P5G84E.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":"48px","lineHeight":"1.2"}},"className":"alignwide has-white-color has-text-color"} -->
 	<h2 class="alignwide has-white-color has-text-color" style="font-size:48px;line-height:1.2"><strong><em>' . __( 'Overseas:' ) . '</em></strong><br><strong><em>' . __( '1500 — 1960' ) . '</em></strong></h2>
 	<!-- /wp:heading -->
 
@@ -18,10 +18,10 @@
 	<div class="wp-block-column" style="flex-basis:60%"><!-- wp:paragraph {"style":{"color":{"text":"#ffffff"}}} -->
 	<p class="has-text-color" style="color:#ffffff">' . __( 'An exhibition about the different representations of the ocean throughout time, between the sixteenth and the twentieth century. Taking place in our Open Room in <em>Floor 2</em>.' ) . '</p>
 	<!-- /wp:paragraph -->
-	
+
 	<!-- wp:buttons -->
-	<div class="wp-block-buttons"><!-- wp:button {"borderRadius":0,"backgroundColor":"black","textColor":"white","className":"is-style-outline"} -->
-	<div class="wp-block-button is-style-outline"><a class="wp-block-button__link has-white-color has-black-background-color has-text-color has-background no-border-radius">' . __( 'Visit' ) . '</a></div>
+	<div class="wp-block-buttons"><!-- wp:button {"borderRadius":0,"style":{"color":{"text":"#ffffff","background":"#000000"}},"className":"is-style-outline"} -->
+	<div class="wp-block-button is-style-outline"><a class="wp-block-button__link has-text-color has-background no-border-radius" style="background-color:#000000;color:#ffffff">' . __( 'Visit' ) . '</a></div>
 	<!-- /wp:button --></div>
 	<!-- /wp:buttons --></div>
 	<!-- /wp:column -->
diff --git a/lib/block-patterns/media-text-arquitecture.php b/lib/block-patterns/media-text-arquitecture.php
index e300d5d7fc2bb..ba4e9fe684d78 100644
--- a/lib/block-patterns/media-text-arquitecture.php
+++ b/lib/block-patterns/media-text-arquitecture.php
@@ -9,8 +9,8 @@
 	'title'       => __( 'Media and text with image on the right' ),
 	'categories'  => array( 'text' ),
 	'content'     => '<!-- wp:media-text {"align":"full","mediaId":1352,"mediaType":"image","verticalAlignment":"center"} -->
-	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://cldup.com/l0MJWqJpIg.jpg" alt="' . __( 'Close-up, abstract view of architecture.' ) . '" class="wp-image-1352 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"textColor":"black"} -->
-	<h3 class="has-text-align-center has-black-color has-text-color"><strong>' . __( 'Open Spaces' ) . '</strong></h3>
+	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://cldup.com/l0MJWqJpIg.jpg" alt="' . __( 'Close-up, abstract view of architecture.' ) . '" class="wp-image-1352 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"style":{"color":{"text":"#000000"}}} -->
+	<h3 class="has-text-align-center has-text-color"  style="color:#000000"><strong>' . __( 'Open Spaces' ) . '</strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph {"align":"center","fontSize":"extra-small"} -->
diff --git a/lib/block-patterns/text-two-columns-2.php b/lib/block-patterns/text-two-columns-2.php
index fbb64542d6bf7..fabb6bcd3ac0f 100644
--- a/lib/block-patterns/text-two-columns-2.php
+++ b/lib/block-patterns/text-two-columns-2.php
@@ -13,9 +13,8 @@
 	<div class="wp-block-column"><!-- wp:spacer -->
 	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
-	
-	<!-- wp:paragraph {"style":{"typography":{"fontSize":"21px"}},"textColor":"black"} -->
-	<p class="has-black-color has-text-color" style="font-size:21px"><strong>' . __( 'We have worked with:' ) . '</strong></p>
+	<!-- wp:paragraph {"style":{"typography":{"fontSize":"21px"}, "color":{"text":"#000000"}}} -->
+	<p class="has-text-color" style="font-size:21px;color:#000000;"><strong>' . __( 'We have worked with:' ) . '</strong></p>
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"24px","lineHeight":"1.2"}}} -->
diff --git a/lib/block-patterns/text-two-columns-title-offset.php b/lib/block-patterns/text-two-columns-title-offset.php
index 8c7c42cc3366b..a0ddbfdaa363a 100644
--- a/lib/block-patterns/text-two-columns-title-offset.php
+++ b/lib/block-patterns/text-two-columns-title-offset.php
@@ -15,14 +15,14 @@
 	
 	<!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->
 	<div class="wp-block-columns alignwide are-vertically-aligned-center"><!-- wp:column {"width":"50%"} -->
-	<div class="wp-block-column" style="flex-basis:50%"><!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"30px"}},"textColor":"black"} -->
-	<p class="has-black-color has-text-color" style="font-size:30px;line-height:1.1"><strong>' . __( 'Oceanic Inspiration' ) . '</strong></p>
+	<div class="wp-block-column" style="flex-basis:50%"><!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"30px"},"color":{"text":"#000000"}}} -->
+	<p class="has-text-color" style="color:#000000;font-size:30px;line-height:1.1"><strong>' . __( 'Oceanic Inspiration' ) . '</strong></p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"width":"50%"} -->
-	<div class="wp-block-column" style="flex-basis:50%"><!-- wp:separator {"color":"black","className":"is-style-wide"} -->
-	<hr class="wp-block-separator has-text-color has-background has-black-background-color has-black-color is-style-wide"/>
+	<div class="wp-block-column" style="flex-basis:50%"><!-- wp:separator {"customColor":"#000000","className":"is-style-wide"} -->
+	<hr class="wp-block-separator has-text-color has-background is-style-wide" style="background-color:#000000;color:#000000"/>
 	<!-- /wp:separator --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->
@@ -33,14 +33,14 @@
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:paragraph {"textColor":"black","fontSize":"extra-small"} -->
-	<p class="has-black-color has-text-color has-extra-small-font-size">' . __( 'Winding veils round their heads, the women walked on deck. They were now moving steadily down the river, passing the dark shapes of ships at anchor, and London was a swarm of lights with a pale yellow canopy drooping above it. There were the lights of the great theatres, the lights of the long streets, lights that indicated huge squares of domestic comfort, lights that hung high in air.' ) . '</p>
+	<div class="wp-block-column"><!-- wp:paragraph {"style":{"color":{"text":"#000000"}},"fontSize":"extra-small"} -->
+	<p class="has-text-color has-extra-small-font-size" style="color:#000000">' . __( 'Winding veils round their heads, the women walked on deck. They were now moving steadily down the river, passing the dark shapes of ships at anchor, and London was a swarm of lights with a pale yellow canopy drooping above it. There were the lights of the great theatres, the lights of the long streets, lights that indicated huge squares of domestic comfort, lights that hung high in air.' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:paragraph {"textColor":"black","fontSize":"extra-small"} -->
-	<p class="has-black-color has-text-color has-extra-small-font-size">' . __( 'No darkness would ever settle upon those lamps, as no darkness had settled upon them for hundreds of years. It seemed dreadful that the town should blaze for ever in the same spot; dreadful at least to people going away to adventure upon the sea, and beholding it as a circumscribed mound, eternally burnt, eternally scarred. From the deck of the ship the great city appeared a crouched and cowardly figure, a sedentary miser.' ) . '</p>
+	<div class="wp-block-column"><!-- wp:paragraph {"style":{"color":{"text":"#000000"}},"fontSize":"extra-small"} -->
+	<p class="has-text-color has-extra-small-font-size" style="color:#000000">' . __( 'No darkness would ever settle upon those lamps, as no darkness had settled upon them for hundreds of years. It seemed dreadful that the town should blaze for ever in the same spot; dreadful at least to people going away to adventure upon the sea, and beholding it as a circumscribed mound, eternally burnt, eternally scarred. From the deck of the ship the great city appeared a crouched and cowardly figure, a sedentary miser.' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->
diff --git a/lib/block-patterns/three-columns-media-text.php b/lib/block-patterns/three-columns-media-text.php
index 30007f2e1f83e..83cf1d2c5c482 100644
--- a/lib/block-patterns/three-columns-media-text.php
+++ b/lib/block-patterns/three-columns-media-text.php
@@ -15,12 +15,12 @@
 	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
 
-	<!-- wp:heading {"level":6,"textColor":"black"} -->
-	<h6 class="has-black-color has-text-color">ECOSYSTEM</h6>
+	<!-- wp:heading {"level":6,"style":{"color":{"text":"#000000"}}} -->
+	<h6 class="has-text-color" style="color:#000000">' . __( 'ECOSYSTEM' ) . '</h6>
 	<!-- /wp:heading -->
 
-	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"5vw"}},"textColor":"black"} -->
-	<p class="has-black-color has-text-color" style="font-size:5vw;line-height:1.1"><strong>Positive growth.</strong></p>
+	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"5vw"},"color":{"text":"#000000"}}} -->
+	<p class="has-text-color" style="color:#000000;font-size:5vw;line-height:1.1"><strong>' . __( 'Positive growth.' ) . '</strong></p>
 	<!-- /wp:paragraph --><!-- wp:spacer {"height":5} -->
 	<div style="height:5px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer --></div>
@@ -29,8 +29,8 @@
 	
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"33.38%"} -->
-	<div class="wp-block-column" style="flex-basis:33.38%"><!-- wp:paragraph {"textColor":"black","fontSize":"extra-small"} -->
-	<p class="has-black-color has-text-color has-extra-small-font-size">' . __( '<em>Nature</em>, in the common sense, refers to essences unchanged by man; space, the air, the river, the leaf.&nbsp;<em>Art</em>&nbsp;is applied to the mixture of his will with the same things, as in a house, a canal, a statue, a picture. But his operations taken together are so insignificant, a little chipping, baking, patching, and washing, that in an impression so grand as that of the world on the human mind, they do not vary the result.' ) . '</p>
+	<div class="wp-block-column" style="flex-basis:33.38%"><!-- wp:paragraph {"style":{"color":{"text":"#000000"}},"fontSize":"extra-small"} -->
+	<p class="has-text-color has-extra-small-font-size" style="color:#000000">' . __( '<em>Nature</em>, in the common sense, refers to essences unchanged by man; space, the air, the river, the leaf.&nbsp;<em>Art</em>&nbsp;is applied to the mixture of his will with the same things, as in a house, a canal, a statue, a picture. But his operations taken together are so insignificant, a little chipping, baking, patching, and washing, that in an impression so grand as that of the world on the human mind, they do not vary the result.' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
@@ -59,8 +59,8 @@
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"verticalAlignment":"center","width":"33%"} -->
-	<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:33%"><!-- wp:paragraph {"textColor":"black","fontSize":"extra-small"} -->
-	<p class="has-black-color has-text-color has-extra-small-font-size">' . __( "Undoubtedly we have no questions to ask which are unanswerable. We must trust the perfection of the creation so far, as to believe that whatever curiosity the order of things has awakened in our minds, the order of things can satisfy. Every man's condition is a solution in hieroglyphic to those inquiries he would put." ) . '</p>
+	<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:33%"><!-- wp:paragraph {"style":{"color":{"text":"#000000"}},"fontSize":"extra-small"} -->
+	<p class="has-text-color has-extra-small-font-size" style="color:#000000">' . __( "Undoubtedly we have no questions to ask which are unanswerable. We must trust the perfection of the creation so far, as to believe that whatever curiosity the order of things has awakened in our minds, the order of things can satisfy. Every man's condition is a solution in hieroglyphic to those inquiries he would put." ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns --></div></div>
diff --git a/lib/block-patterns/three-columns-text.php b/lib/block-patterns/three-columns-text.php
index 36092aaf6a17a..f2d9e7cd1839e 100644
--- a/lib/block-patterns/three-columns-text.php
+++ b/lib/block-patterns/three-columns-text.php
@@ -7,9 +7,9 @@
 
 return array(
 	'title'       => __( 'Three columns of text' ),
-	'categories'  => array( 'columns,text' ),
-	'content'     => '<!-- wp:columns {"align":"full","backgroundColor":"white","textColor":"black"} -->
-	<div class="wp-block-columns alignfull has-black-color has-white-background-color has-text-color has-background"><!-- wp:column -->
+	'categories'  => array( 'columns', 'text' ),
+	'content'     => '<!-- wp:columns {"align":"full","style":{"color":{"text":"#000000","background":"#ffffff"}}} -->
+	<div class="wp-block-columns alignfull has-text-color has-background" style="background-color:#ffffff;color:#000000"><!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"24px","lineHeight":"1.3"}}} -->
 	<h3 style="font-size:24px;line-height:1.3"><strong><a href="http://wordpress.org" data-type="URL" data-id="wordpress.org">' . __( 'Virtual Tour ↗' ) . '</a></strong></h3>
 	<!-- /wp:heading -->

From 0b08664aca2eac5917f2e7c485cc90ff805bd984 Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Tue, 30 Mar 2021 12:20:02 +0200
Subject: [PATCH 24/44] fixed syntax

---
 lib/block-patterns/media-text-art.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/block-patterns/media-text-art.php b/lib/block-patterns/media-text-art.php
index b152183d304c0..b0287151f21d9 100644
--- a/lib/block-patterns/media-text-art.php
+++ b/lib/block-patterns/media-text-art.php
@@ -13,7 +13,7 @@
 	<h2 class="has-text-color" style="color:#000000"><strong>' . __( 'Shore with Blue Sea' ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
-	<!-- wp:paragraph {"style":{"typography":{"fontSize":"17px"},"color":{"text":"#636363"},"typography":{"lineHeight":"1.1"}}} -->
+	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"17px"},"color":{"text":"#636363"}}} -->
 	<p class="has-text-color" style="color:#636363;font-size:17px;line-height:1.1">' . __( 'Eleanor Harris&nbsp;(American, 1901-1942)' ) . '</p>
 	<!-- /wp:paragraph --></div></div>
 	<!-- /wp:media-text -->',

From d73cc30dca97f3e4d21da679315d90539b1e10ac Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Tue, 30 Mar 2021 12:19:51 -0400
Subject: [PATCH 25/44] Update images to the final WP.org CDN URLs

---
 lib/block-patterns/large-header-left.php        | 4 ++--
 lib/block-patterns/large-header-text-button.php | 4 ++--
 lib/block-patterns/media-text-arquitecture.php  | 2 +-
 lib/block-patterns/media-text-art.php           | 2 +-
 lib/block-patterns/media-text-nature.php        | 4 ++--
 lib/block-patterns/quote-2.php                  | 2 +-
 lib/block-patterns/three-columns-media-text.php | 6 +++---
 lib/block-patterns/three-images-gallery.php     | 6 +++---
 lib/block-patterns/two-images-gallery.php       | 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/block-patterns/large-header-left.php b/lib/block-patterns/large-header-left.php
index 8f12f6739ad32..0d31f140ed486 100644
--- a/lib/block-patterns/large-header-left.php
+++ b/lib/block-patterns/large-header-left.php
@@ -8,8 +8,8 @@
 return array(
 	'title'       => __( 'Large header with left-aligned text' ),
 	'categories'  => array( 'header' ),
-	'content'     => '<!-- wp:cover {"url":"https://cldup.com/k24D1s-zQt.jpg","id":261,"dimRatio":60,"minHeight":800,"align":"full"} -->
-		<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background wp-image-261" alt="" src="https://cldup.com/k24D1s-zQt.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:heading {"align":"wide","style":{"color":{"text":"#ffe074"},"typography":{"fontSize":"64px"}}} -->
+	'content'     => '<!-- wp:cover {"url":"https://s.w.org/images/core/5.8/forest.jpg","id":261,"dimRatio":60,"minHeight":800,"align":"full"} -->
+		<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background wp-image-261" alt="" src="https://s.w.org/images/core/5.8/forest.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:heading {"align":"wide","style":{"color":{"text":"#ffe074"},"typography":{"fontSize":"64px"}}} -->
 		<h2 class="alignwide has-text-color" style="color:#ffe074;font-size:64px">' . __( 'Forest.' ) . '</h2>
 		<!-- /wp:heading -->
 
diff --git a/lib/block-patterns/large-header-text-button.php b/lib/block-patterns/large-header-text-button.php
index 40be15a577a1b..05e40c5d1e5ed 100644
--- a/lib/block-patterns/large-header-text-button.php
+++ b/lib/block-patterns/large-header-text-button.php
@@ -8,8 +8,8 @@
 return array(
 	'title'       => __( 'Large header with text and a button.' ),
 	'categories'  => array( 'header' ),
-	'content'     => '<!-- wp:cover {"url":"https://cldup.com/kRh-P5G84E.jpg","id":613,"hasParallax":true,"dimRatio":40,"customOverlayColor":"#000000","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
-	<div class="wp-block-cover alignfull has-background-dim-40 has-background-dim has-parallax" style="background-color:#000000;background-image:url(https://cldup.com/kRh-P5G84E.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":"48px","lineHeight":"1.2"}},"className":"alignwide has-white-color has-text-color"} -->
+	'content'     => '<!-- wp:cover {"url":"https://s.w.org/images/core/5.8/art-01.jpg","id":613,"hasParallax":true,"dimRatio":40,"customOverlayColor":"#000000","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
+	<div class="wp-block-cover alignfull has-background-dim-40 has-background-dim has-parallax" style="background-color:#000000;background-image:url(https://s.w.org/images/core/5.8/art-01.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":"48px","lineHeight":"1.2"}},"className":"alignwide has-white-color has-text-color"} -->
 	<h2 class="alignwide has-white-color has-text-color" style="font-size:48px;line-height:1.2"><strong><em>' . __( 'Overseas:' ) . '</em></strong><br><strong><em>' . __( '1500 — 1960' ) . '</em></strong></h2>
 	<!-- /wp:heading -->
 
diff --git a/lib/block-patterns/media-text-arquitecture.php b/lib/block-patterns/media-text-arquitecture.php
index ba4e9fe684d78..9b5efd586caec 100644
--- a/lib/block-patterns/media-text-arquitecture.php
+++ b/lib/block-patterns/media-text-arquitecture.php
@@ -9,7 +9,7 @@
 	'title'       => __( 'Media and text with image on the right' ),
 	'categories'  => array( 'text' ),
 	'content'     => '<!-- wp:media-text {"align":"full","mediaId":1352,"mediaType":"image","verticalAlignment":"center"} -->
-	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://cldup.com/l0MJWqJpIg.jpg" alt="' . __( 'Close-up, abstract view of architecture.' ) . '" class="wp-image-1352 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"style":{"color":{"text":"#000000"}}} -->
+	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/architecture-04.jpg" alt="' . __( 'Close-up, abstract view of architecture.' ) . '" class="wp-image-1352 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"style":{"color":{"text":"#000000"}}} -->
 	<h3 class="has-text-align-center has-text-color"  style="color:#000000"><strong>' . __( 'Open Spaces' ) . '</strong></h3>
 	<!-- /wp:heading -->
 	
diff --git a/lib/block-patterns/media-text-art.php b/lib/block-patterns/media-text-art.php
index b0287151f21d9..0911eff030a4d 100644
--- a/lib/block-patterns/media-text-art.php
+++ b/lib/block-patterns/media-text-art.php
@@ -9,7 +9,7 @@
 	'title'       => __( 'Media & text with image on the right' ),
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:media-text {"align":"full","mediaPosition":"right","mediaId":615,"mediaLink":"#","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","className":"is-style-default"} -->
-	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://cldup.com/FuU8LZB5o1.jpg" alt="' . __( 'A green and brown rural landscape leading into a bright blue ocean and slightly cloudy sky, done in oil paints.' ) . '" class="wp-image-615 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"color":{"text":"#000000"}},"className":"has-text-color"} -->
+	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/art-02.jpg" alt="' . __( 'A green and brown rural landscape leading into a bright blue ocean and slightly cloudy sky, done in oil paints.' ) . '" class="wp-image-615 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"color":{"text":"#000000"}},"className":"has-text-color"} -->
 	<h2 class="has-text-color" style="color:#000000"><strong>' . __( 'Shore with Blue Sea' ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
diff --git a/lib/block-patterns/media-text-nature.php b/lib/block-patterns/media-text-nature.php
index 28c1ec6d90ea1..c94db386ebecc 100644
--- a/lib/block-patterns/media-text-nature.php
+++ b/lib/block-patterns/media-text-nature.php
@@ -9,8 +9,8 @@
 	'title'       => __( 'Media & text in a full height container' ),
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"customOverlayColor":"#ffffff","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
-	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"mediaId":2501,"mediaLink":"https://cldup.com/xywOzusFF5.jpg","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","imageFill":true} -->
-	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center is-image-fill" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media" style="background-image:url(https://cldup.com/xywOzusFF5.jpg);background-position:50% 50%"><img src="https://cldup.com/xywOzusFF5.jpg" alt="' . __( 'Close-up of dried, cracked earth.' ) . '" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
+	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"mediaId":2501,"mediaLink":"https://s.w.org/images/core/5.8/soil.jpg","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","imageFill":true} -->
+	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center is-image-fill" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media" style="background-image:url(https://s.w.org/images/core/5.8/soil.jpg);background-position:50% 50%"><img src="https://s.w.org/images/core/5.8/soil.jpg" alt="' . __( 'Close-up of dried, cracked earth.' ) . '" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
 	<h2 class="has-text-color" style="color:#000000;font-size:32px"><strong>' . __( "What's the problem?" ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
diff --git a/lib/block-patterns/quote-2.php b/lib/block-patterns/quote-2.php
index c0a1df951d1a8..d84cdb420b56e 100644
--- a/lib/block-patterns/quote-2.php
+++ b/lib/block-patterns/quote-2.php
@@ -14,7 +14,7 @@
 	<!-- /wp:separator -->
 	
 	<!-- wp:image {"align":"center","id":553,"width":150,"height":150,"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
-	<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="https://cldup.com/W_ndYomxw0.jpg" alt="' . __( 'A side profile of a woman in a russet-colored turtleneck and white bag. She looks up with her eyes closed.' ) . '" class="wp-image-553" width="150" height="150"/></figure></div>
+	<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="https://s.w.org/images/core/5.8/portrait.jpg" alt="' . __( 'A side profile of a woman in a russet-colored turtleneck and white bag. She looks up with her eyes closed.' ) . '" class="wp-image-553" width="150" height="150"/></figure></div>
 	<!-- /wp:image -->
 	
 	<!-- wp:quote {"align":"center","className":"is-style-large"} -->
diff --git a/lib/block-patterns/three-columns-media-text.php b/lib/block-patterns/three-columns-media-text.php
index 83cf1d2c5c482..b4883bdb6c8a0 100644
--- a/lib/block-patterns/three-columns-media-text.php
+++ b/lib/block-patterns/three-columns-media-text.php
@@ -40,13 +40,13 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:image {"id":345,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://cldup.com/1PbDC8HHhu.jpg" alt="' . __( 'The sun setting through a dense forest of trees.' ) . '" class="wp-image-345"/></figure>
+	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/outside-01.jpg" alt="' . __( 'The sun setting through a dense forest of trees.' ) . '" class="wp-image-345"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"width":"33.62%"} -->
 	<div class="wp-block-column" style="flex-basis:33.62%"><!-- wp:image {"id":347,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://cldup.com/IPeC2jeViL.jpg" alt="' . __( 'Wind turbines standing on a grassy plain, against a blue sky.' ) . '" class="wp-image-347"/></figure>
+	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/outside-02.jpg" alt="' . __( 'Wind turbines standing on a grassy plain, against a blue sky.' ) . '" class="wp-image-347"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->
@@ -54,7 +54,7 @@
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"67%"} -->
 	<div class="wp-block-column" style="flex-basis:67%"><!-- wp:image {"align":"right","id":348,"sizeSlug":"large","linkDestination":"none"} -->
-	<div class="wp-block-image"><figure class="alignright size-large"><img src="https://cldup.com/C6Ju0QAlrk.jpg" alt="' . __( 'The sun shining over a ridge leading down into the shore. In the distance, a car drives down a road.' ) . '" class="wp-image-348"/></figure></div>
+	<div class="wp-block-image"><figure class="alignright size-large"><img src="https://s.w.org/images/core/5.8/outside-03.jpg" alt="' . __( 'The sun shining over a ridge leading down into the shore. In the distance, a car drives down a road.' ) . '" class="wp-image-348"/></figure></div>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
diff --git a/lib/block-patterns/three-images-gallery.php b/lib/block-patterns/three-images-gallery.php
index ada7fe751f5dd..c90f7b0df8559 100644
--- a/lib/block-patterns/three-images-gallery.php
+++ b/lib/block-patterns/three-images-gallery.php
@@ -11,7 +11,7 @@
 	'content'     => '<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"25%"} -->
 	<div class="wp-block-column" style="flex-basis:25%"><!-- wp:image {"id":240,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
-	<figure class="wp-block-image size-large is-style-default"><img src="https://cldup.com/TE-RNaH1AQ.jpg" alt="' . __( 'Close-up, abstract view of geometric architecture.' ) . '" class="wp-image-240"/></figure>
+	<figure class="wp-block-image size-large is-style-default"><img src="https://s.w.org/images/core/5.8/architecture-01.jpg" alt="' . __( 'Close-up, abstract view of geometric architecture.' ) . '" class="wp-image-240"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
@@ -25,13 +25,13 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:image {"id":237,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://cldup.com/QMLVxdDspo.jpg" alt="' . __( 'Close-up, angled view of a window on a white building.' ) . '" class="wp-image-237"/></figure>
+	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/architecture-02.jpg" alt="' . __( 'Close-up, angled view of a window on a white building.' ) . '" class="wp-image-237"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"width":"45%"} -->
 	<div class="wp-block-column" style="flex-basis:45%"><!-- wp:image {"id":236,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
-	<figure class="wp-block-image size-large is-style-default"><img src="https://cldup.com/WcsOUyiWdV.jpg" alt="' . __( 'Close-up of the corner of a white, geometric building with both sharp points and round corners.' ) . '" class="wp-image-236"/></figure>
+	<figure class="wp-block-image size-large is-style-default"><img src="https://s.w.org/images/core/5.8/architecture-03.jpg" alt="' . __( 'Close-up of the corner of a white, geometric building with both sharp points and round corners.' ) . '" class="wp-image-236"/></figure>
 	<!-- /wp:image -->
 	
 	<!-- wp:spacer {"height":285} -->
diff --git a/lib/block-patterns/two-images-gallery.php b/lib/block-patterns/two-images-gallery.php
index 2c9ada912dce6..ba2c453f8f388 100644
--- a/lib/block-patterns/two-images-gallery.php
+++ b/lib/block-patterns/two-images-gallery.php
@@ -9,7 +9,7 @@
 	'title'       => __( 'Two images side by side' ),
 	'categories'  => array( 'gallery' ),
 	'content'     => '<!-- wp:gallery {"ids":[259,258],"linkTo":"none","align":"wide"} -->
-	<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="https://cldup.com/B0HioJENtD.jpg" alt="' . __( 'An aerial view of waves crashing against a shore.' ) . '" data-id="259" data-full-url="https://cldup.com/B0HioJENtD.jpg" data-link="#" class="wp-image-259"/></figure></li><li class="blocks-gallery-item"><figure><img src="https://cldup.com/yCvbhv-lUc.jpg" alt="' . __( 'An aerial view of a field. A road runs through the upper right corner.' ) . '" data-id="258" data-full-url="https://cldup.com/yCvbhv-lUc.jpg" data-link="#" class="wp-image-258"/></figure></li></ul></figure>
+	<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="https://s.w.org/images/core/5.8/nature-above-01.jpg" alt="' . __( 'An aerial view of waves crashing against a shore.' ) . '" data-id="259" data-full-url="https://s.w.org/images/core/5.8/nature-above-01.jpg" data-link="#" class="wp-image-259"/></figure></li><li class="blocks-gallery-item"><figure><img src="https://s.w.org/images/core/5.8/nature-above-02.jpg" alt="' . __( 'An aerial view of a field. A road runs through the upper right corner.' ) . '" data-id="258" data-full-url="https://s.w.org/images/core/5.8/nature-above-02.jpg" data-link="#" class="wp-image-258"/></figure></li></ul></figure>
 	<!-- /wp:gallery -->',
 	'description' => _x( 'Two images side by side', 'Block pattern description' ),
 );

From 8a52fe48e82a5ac9b868caffd71ad7cf5c984a7c Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Mon, 5 Apr 2021 10:46:51 +0200
Subject: [PATCH 26/44] renamed patterns and unregistered duplicates

---
 lib/block-patterns.php                        | 71 +++++++++++--------
 lib/block-patterns/{quote-2.php => quote.php} |  0
 ...two-columns-2.php => text-two-columns.php} |  0
 .../{two-buttons-2.php => two-buttons.php}    |  0
 4 files changed, 43 insertions(+), 28 deletions(-)
 rename lib/block-patterns/{quote-2.php => quote.php} (100%)
 rename lib/block-patterns/{text-two-columns-2.php => text-two-columns.php} (100%)
 rename lib/block-patterns/{two-buttons-2.php => two-buttons.php} (100%)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index 5d90866710c0f..f00fe17d6394a 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -180,32 +180,47 @@
 	)
 );
 
-$core_block_patterns = array(
-	'media-text-nature',
-	'two-images-gallery',
-	'three-columns-media-text',
-	'quote-2',
-	'large-header-left',
-	'large-header-text-button',
-	'media-text-art',
-	'text-two-columns-title',
-	'three-columns-text',
-	'text-two-columns-title-offset',
-	'heading',
-	'three-images-gallery',
-	'text-two-columns-2',
-	'media-text-arquitecture',
-	'two-buttons-2',
-);
+add_action(
+	'init',
+	function() {
+
+		$core_block_patterns = array(
+			'media-text-nature',
+			'two-images-gallery',
+			'three-columns-media-text',
+			'quote',
+			'large-header-left',
+			'large-header-text-button',
+			'media-text-art',
+			'text-two-columns-title',
+			'three-columns-text',
+			'text-two-columns-title-offset',
+			'heading',
+			'three-images-gallery',
+			'text-two-columns',
+			'media-text-arquitecture',
+			'two-buttons',
+		);
+
+		if ( ! function_exists( 'unregister_block_pattern' ) ) {
+			return;
+		}
+
+		unregister_block_pattern( 'core/two-buttons' );
+		unregister_block_pattern( 'core/quote' );
+		unregister_block_pattern( 'core/text-two-columns' );
 
-foreach ( $core_block_patterns as $core_block_pattern ) {
-	register_block_pattern(
-		'core/' . $core_block_pattern,
-		require __DIR__ . '/block-patterns/' . $core_block_pattern . '.php'
-	);
-}
-
-register_block_pattern_category( 'columns', array( 'label' => _x( 'Columns', 'Block pattern category' ) ) );
-register_block_pattern_category( 'header', array( 'label' => _x( 'Headers', 'Block pattern category' ) ) );
-register_block_pattern_category( 'gallery', array( 'label' => _x( 'Gallery', 'Block pattern category' ) ) );
-register_block_pattern_category( 'text', array( 'label' => _x( 'Text', 'Block pattern category' ) ) );
+		register_block_pattern_category( 'columns', array( 'label' => _x( 'Columns', 'Block pattern category', 'default' ) ) );
+		register_block_pattern_category( 'header', array( 'label' => _x( 'Headers', 'Block pattern category', 'default' ) ) );
+		register_block_pattern_category( 'gallery', array( 'label' => _x( 'Gallery', 'Block pattern category', 'default' ) ) );
+		register_block_pattern_category( 'text', array( 'label' => _x( 'Text', 'Block pattern category', 'default' ) ) );
+
+		foreach ( $core_block_patterns as $core_block_pattern ) {
+			register_block_pattern(
+				'core/' . $core_block_pattern,
+				require __DIR__ . '/block-patterns/' . $core_block_pattern . '.php'
+			);
+		}
+
+	}
+);
diff --git a/lib/block-patterns/quote-2.php b/lib/block-patterns/quote.php
similarity index 100%
rename from lib/block-patterns/quote-2.php
rename to lib/block-patterns/quote.php
diff --git a/lib/block-patterns/text-two-columns-2.php b/lib/block-patterns/text-two-columns.php
similarity index 100%
rename from lib/block-patterns/text-two-columns-2.php
rename to lib/block-patterns/text-two-columns.php
diff --git a/lib/block-patterns/two-buttons-2.php b/lib/block-patterns/two-buttons.php
similarity index 100%
rename from lib/block-patterns/two-buttons-2.php
rename to lib/block-patterns/two-buttons.php

From 638fd1f2904670ed1ab31bd4b4a1a95dd8c221ff Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Mon, 5 Apr 2021 10:56:35 +0200
Subject: [PATCH 27/44] added context and domain to translations, escaped
 strings

---
 lib/block-patterns/heading.php                 |  6 +++---
 lib/block-patterns/large-header-left.php       |  8 ++++----
 .../large-header-text-button.php               | 10 +++++-----
 lib/block-patterns/media-text-arquitecture.php | 10 +++++-----
 lib/block-patterns/media-text-art.php          | 10 +++++-----
 lib/block-patterns/media-text-nature.php       | 12 ++++++------
 lib/block-patterns/quote.php                   |  8 ++++----
 .../text-two-columns-title-offset.php          | 10 +++++-----
 lib/block-patterns/text-two-columns-title.php  | 10 +++++-----
 lib/block-patterns/text-two-columns.php        | 10 +++++-----
 .../three-columns-media-text.php               | 18 +++++++++---------
 lib/block-patterns/three-columns-text.php      | 16 ++++++++--------
 lib/block-patterns/three-images-gallery.php    | 10 +++++-----
 lib/block-patterns/two-buttons.php             |  8 ++++----
 lib/block-patterns/two-images-gallery.php      |  6 +++---
 15 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/lib/block-patterns/heading.php b/lib/block-patterns/heading.php
index 183f7ee5409ab..902938770c3b1 100644
--- a/lib/block-patterns/heading.php
+++ b/lib/block-patterns/heading.php
@@ -6,10 +6,10 @@
  */
 
 return array(
-	'title'       => __( 'Heading' ),
+	'title'       => _x( 'Heading', 'Block pattern title', 'default' ),
 	'categories'  => array( 'text' ),
 	'content'     => '<!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"48px","lineHeight":"1.1"}}} -->
-	<h2 class="alignwide" style="font-size:48px;line-height:1.1">' . __( "We're a studio in Berlin with an international practice in architecture, urban planning and interior design. We believe in sharing knowledge and promoting dialogue to increase the creative potential of collaboration." ) . '</h2>
+	<h2 class="alignwide" style="font-size:48px;line-height:1.1">' . esc_html__( "We're a studio in Berlin with an international practice in architecture, urban planning and interior design. We believe in sharing knowledge and promoting dialogue to increase the creative potential of collaboration.", 'default' ) . '</h2>
 	<!-- /wp:heading -->',
-	'description' => _x( 'Heading text', 'Block pattern description' ),
+	'description' => _x( 'Heading text', 'Block pattern description', 'default' ),
 );
diff --git a/lib/block-patterns/large-header-left.php b/lib/block-patterns/large-header-left.php
index 0d31f140ed486..d4d4591aeb0b5 100644
--- a/lib/block-patterns/large-header-left.php
+++ b/lib/block-patterns/large-header-left.php
@@ -6,11 +6,11 @@
  */
 
 return array(
-	'title'       => __( 'Large header with left-aligned text' ),
+	'title'       => _x( 'Large header with left-aligned text', 'Block pattern title', 'default' ),
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"url":"https://s.w.org/images/core/5.8/forest.jpg","id":261,"dimRatio":60,"minHeight":800,"align":"full"} -->
 		<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background wp-image-261" alt="" src="https://s.w.org/images/core/5.8/forest.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:heading {"align":"wide","style":{"color":{"text":"#ffe074"},"typography":{"fontSize":"64px"}}} -->
-		<h2 class="alignwide has-text-color" style="color:#ffe074;font-size:64px">' . __( 'Forest.' ) . '</h2>
+		<h2 class="alignwide has-text-color" style="color:#ffe074;font-size:64px">' . esc_html__( 'Forest.', 'default' ) . '</h2>
 		<!-- /wp:heading -->
 
 		<!-- wp:columns {"align":"wide"} -->
@@ -20,7 +20,7 @@
 		<!-- /wp:spacer -->
 
 		<!-- wp:paragraph {"style":{"color":{"text":"#ffe074"},"typography":{"lineHeight":"1.3","fontSize":"12px"}}} -->
-		<p class="has-text-color" style="color:#ffe074;font-size:12px;line-height:1.3"><em>' . __( 'Even a child knows how valuable the forest is. The fresh, breathtaking smell of trees. Echoing birds flying above that dense magnitude. A stable climate, a sustainable diverse life and a source of culture. Yet, forests and other ecosystems hang in the balance, threatened to become croplands, pasture, and plantations.' ) . '</em></p>
+		<p class="has-text-color" style="color:#ffe074;font-size:12px;line-height:1.3"><em>' . esc_html__( 'Even a child knows how valuable the forest is. The fresh, breathtaking smell of trees. Echoing birds flying above that dense magnitude. A stable climate, a sustainable diverse life and a source of culture. Yet, forests and other ecosystems hang in the balance, threatened to become croplands, pasture, and plantations.', 'default' ) . '</em></p>
 		<!-- /wp:paragraph --></div>
 		<!-- /wp:column -->
 
@@ -29,5 +29,5 @@
 		<!-- /wp:column --></div>
 		<!-- /wp:columns --></div></div>
 		<!-- /wp:cover -->',
-	'description' => _x( 'Cover image with quote on top', 'Block pattern description' ),
+	'description' => _x( 'Cover image with quote on top', 'Block pattern description', 'default' ),
 );
diff --git a/lib/block-patterns/large-header-text-button.php b/lib/block-patterns/large-header-text-button.php
index 05e40c5d1e5ed..ec5e2fea71fec 100644
--- a/lib/block-patterns/large-header-text-button.php
+++ b/lib/block-patterns/large-header-text-button.php
@@ -6,22 +6,22 @@
  */
 
 return array(
-	'title'       => __( 'Large header with text and a button.' ),
+	'title'       => _x( 'Large header with text and a button.', 'Block pattern title', 'default' ),
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"url":"https://s.w.org/images/core/5.8/art-01.jpg","id":613,"hasParallax":true,"dimRatio":40,"customOverlayColor":"#000000","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
 	<div class="wp-block-cover alignfull has-background-dim-40 has-background-dim has-parallax" style="background-color:#000000;background-image:url(https://s.w.org/images/core/5.8/art-01.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":"48px","lineHeight":"1.2"}},"className":"alignwide has-white-color has-text-color"} -->
-	<h2 class="alignwide has-white-color has-text-color" style="font-size:48px;line-height:1.2"><strong><em>' . __( 'Overseas:' ) . '</em></strong><br><strong><em>' . __( '1500 — 1960' ) . '</em></strong></h2>
+	<h2 class="alignwide has-white-color has-text-color" style="font-size:48px;line-height:1.2"><strong><em>' . esc_html__( 'Overseas:', 'default' ) . '</em></strong><br><strong><em>' . esc_html__( '1500 — 1960', 'default' ) . '</em></strong></h2>
 	<!-- /wp:heading -->
 
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"60%"} -->
 	<div class="wp-block-column" style="flex-basis:60%"><!-- wp:paragraph {"style":{"color":{"text":"#ffffff"}}} -->
-	<p class="has-text-color" style="color:#ffffff">' . __( 'An exhibition about the different representations of the ocean throughout time, between the sixteenth and the twentieth century. Taking place in our Open Room in <em>Floor 2</em>.' ) . '</p>
+	<p class="has-text-color" style="color:#ffffff">' . esc_html__( 'An exhibition about the different representations of the ocean throughout time, between the sixteenth and the twentieth century. Taking place in our Open Room in <em>Floor 2</em>.', 'default' ) . '</p>
 	<!-- /wp:paragraph -->
 
 	<!-- wp:buttons -->
 	<div class="wp-block-buttons"><!-- wp:button {"borderRadius":0,"style":{"color":{"text":"#ffffff","background":"#000000"}},"className":"is-style-outline"} -->
-	<div class="wp-block-button is-style-outline"><a class="wp-block-button__link has-text-color has-background no-border-radius" style="background-color:#000000;color:#ffffff">' . __( 'Visit' ) . '</a></div>
+	<div class="wp-block-button is-style-outline"><a class="wp-block-button__link has-text-color has-background no-border-radius" style="background-color:#000000;color:#ffffff">' . esc_html__( 'Visit', 'default' ) . '</a></div>
 	<!-- /wp:button --></div>
 	<!-- /wp:buttons --></div>
 	<!-- /wp:column -->
@@ -31,5 +31,5 @@
 	<!-- /wp:column --></div>
 	<!-- /wp:columns --></div></div>
 	<!-- /wp:cover -->',
-	'description' => _x( 'Large header with background image and text and button on top', 'Block pattern description' ),
+	'description' => _x( 'Large header with background image and text and button on top', 'Block pattern description', 'default' ),
 );
diff --git a/lib/block-patterns/media-text-arquitecture.php b/lib/block-patterns/media-text-arquitecture.php
index 9b5efd586caec..3fcd7e0859a23 100644
--- a/lib/block-patterns/media-text-arquitecture.php
+++ b/lib/block-patterns/media-text-arquitecture.php
@@ -6,16 +6,16 @@
  */
 
 return array(
-	'title'       => __( 'Media and text with image on the right' ),
+	'title'       => _x( 'Media and text with image on the right', 'Block pattern title', 'default' ),
 	'categories'  => array( 'text' ),
 	'content'     => '<!-- wp:media-text {"align":"full","mediaId":1352,"mediaType":"image","verticalAlignment":"center"} -->
-	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/architecture-04.jpg" alt="' . __( 'Close-up, abstract view of architecture.' ) . '" class="wp-image-1352 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"style":{"color":{"text":"#000000"}}} -->
-	<h3 class="has-text-align-center has-text-color"  style="color:#000000"><strong>' . __( 'Open Spaces' ) . '</strong></h3>
+	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/architecture-04.jpg" alt="' . esc_html__( 'Close-up, abstract view of architecture.', 'default' ) . '" class="wp-image-1352 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"style":{"color":{"text":"#000000"}}} -->
+	<h3 class="has-text-align-center has-text-color"  style="color:#000000"><strong>' . esc_html__( 'Open Spaces', 'default' ) . '</strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph {"align":"center","fontSize":"extra-small"} -->
-	<p class="has-text-align-center has-extra-small-font-size"><a href="#">' . __( 'See case study ↗' ) . '</a></p>
+	<p class="has-text-align-center has-extra-small-font-size"><a href="#">' . esc_html__( 'See case study ↗', 'default' ) . '</a></p>
 	<!-- /wp:paragraph --></div></div>
 	<!-- /wp:media-text -->',
-	'description' => _x( 'Media and text block with image to the left and text to the right', 'Block pattern description' ),
+	'description' => _x( 'Media and text block with image to the left and text to the right', 'Block pattern description', 'default' ),
 );
diff --git a/lib/block-patterns/media-text-art.php b/lib/block-patterns/media-text-art.php
index 0911eff030a4d..c78512a90d65d 100644
--- a/lib/block-patterns/media-text-art.php
+++ b/lib/block-patterns/media-text-art.php
@@ -6,16 +6,16 @@
  */
 
 return array(
-	'title'       => __( 'Media & text with image on the right' ),
+	'title'       => _x( 'Media & text with image on the right', 'Block pattern title', 'default' ),
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:media-text {"align":"full","mediaPosition":"right","mediaId":615,"mediaLink":"#","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","className":"is-style-default"} -->
-	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/art-02.jpg" alt="' . __( 'A green and brown rural landscape leading into a bright blue ocean and slightly cloudy sky, done in oil paints.' ) . '" class="wp-image-615 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"color":{"text":"#000000"}},"className":"has-text-color"} -->
-	<h2 class="has-text-color" style="color:#000000"><strong>' . __( 'Shore with Blue Sea' ) . '</strong></h2>
+	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/art-02.jpg" alt="' . esc_html__( 'A green and brown rural landscape leading into a bright blue ocean and slightly cloudy sky, done in oil paints.', 'default' ) . '" class="wp-image-615 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"color":{"text":"#000000"}},"className":"has-text-color"} -->
+	<h2 class="has-text-color" style="color:#000000"><strong>' . esc_html__( 'Shore with Blue Sea', 'default' ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"17px"},"color":{"text":"#636363"}}} -->
-	<p class="has-text-color" style="color:#636363;font-size:17px;line-height:1.1">' . __( 'Eleanor Harris&nbsp;(American, 1901-1942)' ) . '</p>
+	<p class="has-text-color" style="color:#636363;font-size:17px;line-height:1.1">' . esc_html__( 'Eleanor Harris&nbsp;(American, 1901-1942)', 'default' ) . '</p>
 	<!-- /wp:paragraph --></div></div>
 	<!-- /wp:media-text -->',
-	'description' => _x( 'Media and text block with image to the right and text to the left', 'Block pattern description' ),
+	'description' => _x( 'Media and text block with image to the right and text to the left', 'Block pattern description', 'default' ),
 );
diff --git a/lib/block-patterns/media-text-nature.php b/lib/block-patterns/media-text-nature.php
index c94db386ebecc..b8f35009a93c2 100644
--- a/lib/block-patterns/media-text-nature.php
+++ b/lib/block-patterns/media-text-nature.php
@@ -6,23 +6,23 @@
  */
 
 return array(
-	'title'       => __( 'Media & text in a full height container' ),
+	'title'       => _x( 'Media & text in a full height container', 'Block pattern title', 'default' ),
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"customOverlayColor":"#ffffff","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
 	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"mediaId":2501,"mediaLink":"https://s.w.org/images/core/5.8/soil.jpg","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","imageFill":true} -->
-	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center is-image-fill" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media" style="background-image:url(https://s.w.org/images/core/5.8/soil.jpg);background-position:50% 50%"><img src="https://s.w.org/images/core/5.8/soil.jpg" alt="' . __( 'Close-up of dried, cracked earth.' ) . '" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
-	<h2 class="has-text-color" style="color:#000000;font-size:32px"><strong>' . __( "What's the problem?" ) . '</strong></h2>
+	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center is-image-fill" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media" style="background-image:url(https://s.w.org/images/core/5.8/soil.jpg);background-position:50% 50%"><img src="https://s.w.org/images/core/5.8/soil.jpg" alt="' . esc_html__( 'Close-up of dried, cracked earth.', 'default' ) . '" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
+	<h2 class="has-text-color" style="color:#000000;font-size:32px"><strong>' . esc_html__( "What's the problem?", 'default' ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"17px"},"color":{"text":"#000000"}}} -->
-	<p class="has-text-color" style="color:#000000;font-size:17px">' . __( 'Trees are more important today than ever before. More than 10,000 products are reportedly made from trees. Through chemistry, the humble woodpile is yielding chemicals, plastics and fabrics that were beyond comprehension when an axe first felled a Texas tree.' ) . '</p>
+	<p class="has-text-color" style="color:#000000;font-size:17px">' . esc_html__( 'Trees are more important today than ever before. More than 10,000 products are reportedly made from trees. Through chemistry, the humble woodpile is yielding chemicals, plastics and fabrics that were beyond comprehension when an axe first felled a Texas tree.', 'default' ) . '</p>
 	<!-- /wp:paragraph -->
 	<!-- wp:buttons -->
 	<div class="wp-block-buttons"><!-- wp:button {"className":"is-style-fill"} -->
-	<div class="wp-block-button is-style-fill"><a class="wp-block-button__link">' . __( 'Learn more' ) . '</a></div>
+	<div class="wp-block-button is-style-fill"><a class="wp-block-button__link">' . esc_html__( 'Learn more', 'default' ) . '</a></div>
 	<!-- /wp:button --></div>
 	<!-- /wp:buttons --></div></div>
 	<!-- /wp:media-text --></div></div>
 	<!-- /wp:cover -->',
-	'description' => _x( 'Media and text block with image to the left and text and button to the right', 'Block pattern description' ),
+	'description' => _x( 'Media and text block with image to the left and text and button to the right', 'Block pattern description', 'default' ),
 );
diff --git a/lib/block-patterns/quote.php b/lib/block-patterns/quote.php
index d84cdb420b56e..e4e628db77fda 100644
--- a/lib/block-patterns/quote.php
+++ b/lib/block-patterns/quote.php
@@ -6,7 +6,7 @@
  */
 
 return array(
-	'title'       => __( 'Quote' ),
+	'title'       => _x( 'Quote', 'Block pattern title', 'default' ),
 	'categories'  => array( 'text' ),
 	'content'     => '<!-- wp:group -->
 	<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:separator {"className":"is-style-default"} -->
@@ -14,16 +14,16 @@
 	<!-- /wp:separator -->
 	
 	<!-- wp:image {"align":"center","id":553,"width":150,"height":150,"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
-	<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="https://s.w.org/images/core/5.8/portrait.jpg" alt="' . __( 'A side profile of a woman in a russet-colored turtleneck and white bag. She looks up with her eyes closed.' ) . '" class="wp-image-553" width="150" height="150"/></figure></div>
+	<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="https://s.w.org/images/core/5.8/portrait.jpg" alt="' . esc_html__( 'A side profile of a woman in a russet-colored turtleneck and white bag. She looks up with her eyes closed.', 'default' ) . '" class="wp-image-553" width="150" height="150"/></figure></div>
 	<!-- /wp:image -->
 	
 	<!-- wp:quote {"align":"center","className":"is-style-large"} -->
-	<blockquote class="wp-block-quote has-text-align-center is-style-large"><p>' . __( "\"Contributing makes me feel like I'm being useful to the planet.\"" ) . '</p><cite>' . __( '— Anna Wong, <em>Volunteer</em>' ) . '</cite></blockquote>
+	<blockquote class="wp-block-quote has-text-align-center is-style-large"><p>' . esc_html__( "\"Contributing makes me feel like I'm being useful to the planet.\"", 'default' ) . '</p><cite>' . esc_html__( '— Anna Wong, <em>Volunteer</em>', 'default' ) . '</cite></blockquote>
 	<!-- /wp:quote -->
 	
 	<!-- wp:separator {"className":"is-style-default"} -->
 	<hr class="wp-block-separator is-style-default"/>
 	<!-- /wp:separator --></div></div>
 	<!-- /wp:group -->',
-	'description' => _x( 'Testimonial quote with portrait', 'Block pattern description' ),
+	'description' => _x( 'Testimonial quote with portrait', 'Block pattern description', 'default' ),
 );
diff --git a/lib/block-patterns/text-two-columns-title-offset.php b/lib/block-patterns/text-two-columns-title-offset.php
index a0ddbfdaa363a..e080234ef3af0 100644
--- a/lib/block-patterns/text-two-columns-title-offset.php
+++ b/lib/block-patterns/text-two-columns-title-offset.php
@@ -6,7 +6,7 @@
  */
 
 return array(
-	'title'       => __( 'Two columns of text with offset heading' ),
+	'title'       => _x( 'Two columns of text with offset heading', 'Block pattern title', 'default' ),
 	'categories'  => array( 'columns', 'text' ),
 	'content'     => '<!-- wp:group {"align":"full","style":{"color":{"background":"#f2f0e9"}}} -->
 	<div class="wp-block-group alignfull has-background" style="background-color:#f2f0e9"><!-- wp:spacer {"height":70} -->
@@ -16,7 +16,7 @@
 	<!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->
 	<div class="wp-block-columns alignwide are-vertically-aligned-center"><!-- wp:column {"width":"50%"} -->
 	<div class="wp-block-column" style="flex-basis:50%"><!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"30px"},"color":{"text":"#000000"}}} -->
-	<p class="has-text-color" style="color:#000000;font-size:30px;line-height:1.1"><strong>' . __( 'Oceanic Inspiration' ) . '</strong></p>
+	<p class="has-text-color" style="color:#000000;font-size:30px;line-height:1.1"><strong>' . esc_html__( 'Oceanic Inspiration', 'default' ) . '</strong></p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
@@ -34,13 +34,13 @@
 	
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:paragraph {"style":{"color":{"text":"#000000"}},"fontSize":"extra-small"} -->
-	<p class="has-text-color has-extra-small-font-size" style="color:#000000">' . __( 'Winding veils round their heads, the women walked on deck. They were now moving steadily down the river, passing the dark shapes of ships at anchor, and London was a swarm of lights with a pale yellow canopy drooping above it. There were the lights of the great theatres, the lights of the long streets, lights that indicated huge squares of domestic comfort, lights that hung high in air.' ) . '</p>
+	<p class="has-text-color has-extra-small-font-size" style="color:#000000">' . esc_html__( 'Winding veils round their heads, the women walked on deck. They were now moving steadily down the river, passing the dark shapes of ships at anchor, and London was a swarm of lights with a pale yellow canopy drooping above it. There were the lights of the great theatres, the lights of the long streets, lights that indicated huge squares of domestic comfort, lights that hung high in air.', 'default' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:paragraph {"style":{"color":{"text":"#000000"}},"fontSize":"extra-small"} -->
-	<p class="has-text-color has-extra-small-font-size" style="color:#000000">' . __( 'No darkness would ever settle upon those lamps, as no darkness had settled upon them for hundreds of years. It seemed dreadful that the town should blaze for ever in the same spot; dreadful at least to people going away to adventure upon the sea, and beholding it as a circumscribed mound, eternally burnt, eternally scarred. From the deck of the ship the great city appeared a crouched and cowardly figure, a sedentary miser.' ) . '</p>
+	<p class="has-text-color has-extra-small-font-size" style="color:#000000">' . esc_html__( 'No darkness would ever settle upon those lamps, as no darkness had settled upon them for hundreds of years. It seemed dreadful that the town should blaze for ever in the same spot; dreadful at least to people going away to adventure upon the sea, and beholding it as a circumscribed mound, eternally burnt, eternally scarred. From the deck of the ship the great city appeared a crouched and cowardly figure, a sedentary miser.', 'default' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->
@@ -49,5 +49,5 @@
 	<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer --></div>
 	<!-- /wp:group -->',
-	'description' => _x( 'Two columns of text with offset heading', 'Block pattern description' ),
+	'description' => _x( 'Two columns of text with offset heading', 'Block pattern description', 'default' ),
 );
diff --git a/lib/block-patterns/text-two-columns-title.php b/lib/block-patterns/text-two-columns-title.php
index 9516fd938236f..c21f8f220ed50 100644
--- a/lib/block-patterns/text-two-columns-title.php
+++ b/lib/block-patterns/text-two-columns-title.php
@@ -6,26 +6,26 @@
  */
 
 return array(
-	'title'       => __( 'Two columns text and title' ),
+	'title'       => _x( 'Two columns text and title', 'Block pattern title', 'default' ),
 	'categories'  => array( 'columns', 'text' ),
 	'content'     => '<!-- wp:group -->
 	<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":38,"lineHeight":"1.4"}}} -->
-	<h2 style="font-size:38px;line-height:1.4"><strong>' . __( 'The voyage had begun, and had begun happily with a soft blue sky, and a calm sea.' ) . '</strong></h2>
+	<h2 style="font-size:38px;line-height:1.4"><strong>' . esc_html__( 'The voyage had begun, and had begun happily with a soft blue sky, and a calm sea.', 'default' ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
 	<!-- wp:columns -->
 	<div class="wp-block-columns"><!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:paragraph {"style":{"typography":{"fontSize":18}}} -->
-	<p style="font-size:18px">' . __( 'They followed her on to the deck. All the smoke and the houses had disappeared, and the ship was out in a wide space of sea very fresh and clear though pale in the early light. They had left London sitting on its mud. A very thin line of shadow tapered on the horizon, scarcely thick enough to stand the burden of Paris, which nevertheless rested upon it. They were free of roads, free of mankind, and the same exhilaration at their freedom ran through them all.' ) . '</p>
+	<p style="font-size:18px">' . esc_html__( 'They followed her on to the deck. All the smoke and the houses had disappeared, and the ship was out in a wide space of sea very fresh and clear though pale in the early light. They had left London sitting on its mud. A very thin line of shadow tapered on the horizon, scarcely thick enough to stand the burden of Paris, which nevertheless rested upon it. They were free of roads, free of mankind, and the same exhilaration at their freedom ran through them all.', 'default' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:paragraph {"style":{"typography":{"fontSize":18}}} -->
-	<p style="font-size:18px">' . __( "The ship was making her way steadily through small waves which slapped her and then fizzled like effervescing water, leaving a little border of bubbles and foam on either side. The colourless October sky above was thinly clouded as if by the trail of wood-fire smoke, and the air was wonderfully salt and brisk. Indeed it was too cold to stand still. Mrs. Ambrose drew her arm within her husband's, and as they moved off it could be seen from the way in which her sloping cheek turned up to his that she had something private to communicate." ) . '</p>
+	<p style="font-size:18px">' . esc_html__( "The ship was making her way steadily through small waves which slapped her and then fizzled like effervescing water, leaving a little border of bubbles and foam on either side. The colourless October sky above was thinly clouded as if by the trail of wood-fire smoke, and the air was wonderfully salt and brisk. Indeed it was too cold to stand still. Mrs. Ambrose drew her arm within her husband's, and as they moved off it could be seen from the way in which her sloping cheek turned up to his that she had something private to communicate.", 'default' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns --></div></div>
 	<!-- /wp:group -->',
-	'description' => _x( 'Two columns text and title', 'Block pattern description' ),
+	'description' => _x( 'Two columns text and title', 'Block pattern description', 'default' ),
 );
diff --git a/lib/block-patterns/text-two-columns.php b/lib/block-patterns/text-two-columns.php
index fabb6bcd3ac0f..40f54b97297da 100644
--- a/lib/block-patterns/text-two-columns.php
+++ b/lib/block-patterns/text-two-columns.php
@@ -6,7 +6,7 @@
  */
 
 return array(
-	'title'       => __( 'Two columns of text' ),
+	'title'       => _x( 'Two columns of text', 'Block pattern title', 'default' ),
 	'categories'  => array( 'columns', 'text' ),
 	'content'     => '<!-- wp:columns {"align":"full"} -->
 	<div class="wp-block-columns"><!-- wp:column -->
@@ -14,11 +14,11 @@
 	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"21px"}, "color":{"text":"#000000"}}} -->
-	<p class="has-text-color" style="font-size:21px;color:#000000;"><strong>' . __( 'We have worked with:' ) . '</strong></p>
+	<p class="has-text-color" style="font-size:21px;color:#000000;"><strong>' . esc_html__( 'We have worked with:', 'default' ) . '</strong></p>
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"24px","lineHeight":"1.2"}}} -->
-	<p style="font-size:24px;line-height:1.2"><a href="https://wordpress.org">' . __( 'EARTHFUND™<br>ARCHWEEKLY<br>FUTURE ROADS<br>BUILDING NY' ) . '</a></p>
+	<p style="font-size:24px;line-height:1.2"><a href="https://wordpress.org">' . esc_html__( 'EARTHFUND™<br>ARCHWEEKLY<br>FUTURE ROADS<br>BUILDING NY', 'default' ) . '</a></p>
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:spacer -->
@@ -32,7 +32,7 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"24px","lineHeight":"1.2"}}} -->
-	<p style="font-size:24px;line-height:1.2"><a href="https://wordpress.org">' . __( 'DUBAI ROOFS<br>MAY WATSON STUDIO<br>Y.O.L<br>RUDIMENTAR' ) . '</a></p>
+	<p style="font-size:24px;line-height:1.2"><a href="https://wordpress.org">' . esc_html__( 'DUBAI ROOFS<br>MAY WATSON STUDIO<br>Y.O.L<br>RUDIMENTAR', 'default' ) . '</a></p>
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:spacer -->
@@ -40,5 +40,5 @@
 	<!-- /wp:spacer --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->',
-	'description' => _x( 'Two columns of text', 'Block pattern description' ),
+	'description' => _x( 'Two columns of text', 'Block pattern description', 'default' ),
 );
diff --git a/lib/block-patterns/three-columns-media-text.php b/lib/block-patterns/three-columns-media-text.php
index b4883bdb6c8a0..d03b992447135 100644
--- a/lib/block-patterns/three-columns-media-text.php
+++ b/lib/block-patterns/three-columns-media-text.php
@@ -6,7 +6,7 @@
  */
 
 return array(
-	'title'       => __( 'Three columns with images and text' ),
+	'title'       => _x( 'Three columns with images and text', 'Block pattern title', 'default' ),
 	'categories'  => array( 'columns' ),
 	'content'     => '<!-- wp:group {"align":"full","style":{"color":{"background":"#f8f4e4"}}} -->
 	<div class="wp-block-group alignfull has-background" style="background-color:#f8f4e4"><div class="wp-block-group__inner-container"><!-- wp:columns {"align":"wide"} -->
@@ -16,11 +16,11 @@
 	<!-- /wp:spacer -->
 
 	<!-- wp:heading {"level":6,"style":{"color":{"text":"#000000"}}} -->
-	<h6 class="has-text-color" style="color:#000000">' . __( 'ECOSYSTEM' ) . '</h6>
+	<h6 class="has-text-color" style="color:#000000">' . esc_html__( 'ECOSYSTEM', 'default' ) . '</h6>
 	<!-- /wp:heading -->
 
 	<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.1","fontSize":"5vw"},"color":{"text":"#000000"}}} -->
-	<p class="has-text-color" style="color:#000000;font-size:5vw;line-height:1.1"><strong>' . __( 'Positive growth.' ) . '</strong></p>
+	<p class="has-text-color" style="color:#000000;font-size:5vw;line-height:1.1"><strong>' . esc_html__( 'Positive growth.', 'default' ) . '</strong></p>
 	<!-- /wp:paragraph --><!-- wp:spacer {"height":5} -->
 	<div style="height:5px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer --></div>
@@ -30,7 +30,7 @@
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"33.38%"} -->
 	<div class="wp-block-column" style="flex-basis:33.38%"><!-- wp:paragraph {"style":{"color":{"text":"#000000"}},"fontSize":"extra-small"} -->
-	<p class="has-text-color has-extra-small-font-size" style="color:#000000">' . __( '<em>Nature</em>, in the common sense, refers to essences unchanged by man; space, the air, the river, the leaf.&nbsp;<em>Art</em>&nbsp;is applied to the mixture of his will with the same things, as in a house, a canal, a statue, a picture. But his operations taken together are so insignificant, a little chipping, baking, patching, and washing, that in an impression so grand as that of the world on the human mind, they do not vary the result.' ) . '</p>
+	<p class="has-text-color has-extra-small-font-size" style="color:#000000">' . esc_html__( '<em>Nature</em>, in the common sense, refers to essences unchanged by man; space, the air, the river, the leaf.&nbsp;<em>Art</em>&nbsp;is applied to the mixture of his will with the same things, as in a house, a canal, a statue, a picture. But his operations taken together are so insignificant, a little chipping, baking, patching, and washing, that in an impression so grand as that of the world on the human mind, they do not vary the result.', 'default' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
@@ -40,13 +40,13 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:image {"id":345,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/outside-01.jpg" alt="' . __( 'The sun setting through a dense forest of trees.' ) . '" class="wp-image-345"/></figure>
+	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/outside-01.jpg" alt="' . esc_html__( 'The sun setting through a dense forest of trees.', 'default' ) . '" class="wp-image-345"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"width":"33.62%"} -->
 	<div class="wp-block-column" style="flex-basis:33.62%"><!-- wp:image {"id":347,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/outside-02.jpg" alt="' . __( 'Wind turbines standing on a grassy plain, against a blue sky.' ) . '" class="wp-image-347"/></figure>
+	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/outside-02.jpg" alt="' . esc_html__( 'Wind turbines standing on a grassy plain, against a blue sky.', 'default' ) . '" class="wp-image-347"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->
@@ -54,16 +54,16 @@
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"67%"} -->
 	<div class="wp-block-column" style="flex-basis:67%"><!-- wp:image {"align":"right","id":348,"sizeSlug":"large","linkDestination":"none"} -->
-	<div class="wp-block-image"><figure class="alignright size-large"><img src="https://s.w.org/images/core/5.8/outside-03.jpg" alt="' . __( 'The sun shining over a ridge leading down into the shore. In the distance, a car drives down a road.' ) . '" class="wp-image-348"/></figure></div>
+	<div class="wp-block-image"><figure class="alignright size-large"><img src="https://s.w.org/images/core/5.8/outside-03.jpg" alt="' . esc_html__( 'The sun shining over a ridge leading down into the shore. In the distance, a car drives down a road.', 'default' ) . '" class="wp-image-348"/></figure></div>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"verticalAlignment":"center","width":"33%"} -->
 	<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:33%"><!-- wp:paragraph {"style":{"color":{"text":"#000000"}},"fontSize":"extra-small"} -->
-	<p class="has-text-color has-extra-small-font-size" style="color:#000000">' . __( "Undoubtedly we have no questions to ask which are unanswerable. We must trust the perfection of the creation so far, as to believe that whatever curiosity the order of things has awakened in our minds, the order of things can satisfy. Every man's condition is a solution in hieroglyphic to those inquiries he would put." ) . '</p>
+	<p class="has-text-color has-extra-small-font-size" style="color:#000000">' . esc_html__( "Undoubtedly we have no questions to ask which are unanswerable. We must trust the perfection of the creation so far, as to believe that whatever curiosity the order of things has awakened in our minds, the order of things can satisfy. Every man's condition is a solution in hieroglyphic to those inquiries he would put.", 'default' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns --></div></div>
 	<!-- /wp:group -->',
-	'description' => _x( 'Three columns with images and text', 'Block pattern description' ),
+	'description' => _x( 'Three columns with images and text', 'Block pattern description', 'default' ),
 );
diff --git a/lib/block-patterns/three-columns-text.php b/lib/block-patterns/three-columns-text.php
index f2d9e7cd1839e..10e5cb5938f14 100644
--- a/lib/block-patterns/three-columns-text.php
+++ b/lib/block-patterns/three-columns-text.php
@@ -6,38 +6,38 @@
  */
 
 return array(
-	'title'       => __( 'Three columns of text' ),
+	'title'       => _x( 'Three columns of text', 'Block pattern title', 'default' ),
 	'categories'  => array( 'columns', 'text' ),
 	'content'     => '<!-- wp:columns {"align":"full","style":{"color":{"text":"#000000","background":"#ffffff"}}} -->
 	<div class="wp-block-columns alignfull has-text-color has-background" style="background-color:#ffffff;color:#000000"><!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"24px","lineHeight":"1.3"}}} -->
-	<h3 style="font-size:24px;line-height:1.3"><strong><a href="http://wordpress.org" data-type="URL" data-id="wordpress.org">' . __( 'Virtual Tour ↗' ) . '</a></strong></h3>
+	<h3 style="font-size:24px;line-height:1.3"><strong><a href="http://wordpress.org" data-type="URL" data-id="wordpress.org">' . esc_html__( 'Virtual Tour ↗', 'default' ) . '</a></strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph -->
-	<p>' . __( 'Get a virtual tour of the museum. Ideal for schools and events.' ) . '</p>
+	<p>' . esc_html__( 'Get a virtual tour of the museum. Ideal for schools and events.', 'default' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"24px","lineHeight":"1.3"}}} -->
-	<h3 style="font-size:24px;line-height:1.3"><strong><a href="https://wordpress.org">' . __( 'Current Shows ↗' ) . '</a></strong></h3>
+	<h3 style="font-size:24px;line-height:1.3"><strong><a href="https://wordpress.org">' . esc_html__( 'Current Shows ↗', 'default' ) . '</a></strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph -->
-	<p>' . __( 'Stay updated and see our current exhibitions here.' ) . '</p>
+	<p>' . esc_html__( 'Stay updated and see our current exhibitions here.', 'default' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"24px","lineHeight":"1.3"}}} -->
-	<h3 style="font-size:24px;line-height:1.3"><strong><a href="https://wordpress.org">' . __( 'Useful Info ↗' ) . '</a></strong></h3>
+	<h3 style="font-size:24px;line-height:1.3"><strong><a href="https://wordpress.org">' . esc_html__( 'Useful Info ↗', 'default' ) . '</a></strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph -->
-	<p>' . __( 'Get to know our opening times, ticket prices and discounts.' ) . '</p>
+	<p>' . esc_html__( 'Get to know our opening times, ticket prices and discounts.', 'default' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->',
-	'description' => _x( 'Three columns of text', 'Block pattern description' ),
+	'description' => _x( 'Three columns of text', 'Block pattern description', 'default' ),
 );
diff --git a/lib/block-patterns/three-images-gallery.php b/lib/block-patterns/three-images-gallery.php
index c90f7b0df8559..b35bc3739e37e 100644
--- a/lib/block-patterns/three-images-gallery.php
+++ b/lib/block-patterns/three-images-gallery.php
@@ -6,12 +6,12 @@
  */
 
 return array(
-	'title'       => __( 'Three columns with offset images' ),
+	'title'       => _x( 'Three columns with offset images', 'Block pattern title', 'default' ),
 	'categories'  => array( 'gallery' ),
 	'content'     => '<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"25%"} -->
 	<div class="wp-block-column" style="flex-basis:25%"><!-- wp:image {"id":240,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
-	<figure class="wp-block-image size-large is-style-default"><img src="https://s.w.org/images/core/5.8/architecture-01.jpg" alt="' . __( 'Close-up, abstract view of geometric architecture.' ) . '" class="wp-image-240"/></figure>
+	<figure class="wp-block-image size-large is-style-default"><img src="https://s.w.org/images/core/5.8/architecture-01.jpg" alt="' . esc_html__( 'Close-up, abstract view of geometric architecture.', 'default' ) . '" class="wp-image-240"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
@@ -25,13 +25,13 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:image {"id":237,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/architecture-02.jpg" alt="' . __( 'Close-up, angled view of a window on a white building.' ) . '" class="wp-image-237"/></figure>
+	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/architecture-02.jpg" alt="' . esc_html__( 'Close-up, angled view of a window on a white building.', 'default' ) . '" class="wp-image-237"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"width":"45%"} -->
 	<div class="wp-block-column" style="flex-basis:45%"><!-- wp:image {"id":236,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
-	<figure class="wp-block-image size-large is-style-default"><img src="https://s.w.org/images/core/5.8/architecture-03.jpg" alt="' . __( 'Close-up of the corner of a white, geometric building with both sharp points and round corners.' ) . '" class="wp-image-236"/></figure>
+	<figure class="wp-block-image size-large is-style-default"><img src="https://s.w.org/images/core/5.8/architecture-03.jpg" alt="' . esc_html__( 'Close-up of the corner of a white, geometric building with both sharp points and round corners.', 'default' ) . '" class="wp-image-236"/></figure>
 	<!-- /wp:image -->
 	
 	<!-- wp:spacer {"height":285} -->
@@ -39,5 +39,5 @@
 	<!-- /wp:spacer --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->',
-	'description' => _x( 'Three columns with offset images', 'Block pattern description' ),
+	'description' => _x( 'Three columns with offset images', 'Block pattern description', 'default' ),
 );
diff --git a/lib/block-patterns/two-buttons.php b/lib/block-patterns/two-buttons.php
index dd7c39ddeeec3..b369fd31ff2ba 100644
--- a/lib/block-patterns/two-buttons.php
+++ b/lib/block-patterns/two-buttons.php
@@ -6,17 +6,17 @@
  */
 
 return array(
-	'title'         => __( 'Two buttons' ),
+	'title'         => _x( 'Two buttons', 'Block pattern title', 'default' ),
 	'content'       => '<!-- wp:buttons {"contentJustification":"center"} -->
 	<div class="wp-block-buttons is-content-justification-center"><!-- wp:button {"borderRadius":0} -->
-	<div class="wp-block-button"><a class="wp-block-button__link no-border-radius">' . __( 'Our Work' ) . '</a></div>
+	<div class="wp-block-button"><a class="wp-block-button__link no-border-radius">' . esc_html__( 'Our Work', 'default' ) . '</a></div>
 	<!-- /wp:button -->
 	
 	<!-- wp:button {"borderRadius":1,"className":"is-style-outline"} -->
-	<div class="wp-block-button is-style-outline"><a class="wp-block-button__link" style="border-radius:1px">' . __( 'Where We Are' ) . '</a></div>
+	<div class="wp-block-button is-style-outline"><a class="wp-block-button__link" style="border-radius:1px">' . esc_html__( 'Where We Are', 'default' ) . '</a></div>
 	<!-- /wp:button --></div>
 	<!-- /wp:buttons -->',
 	'viewportWidth' => 500,
 	'categories'    => array( 'buttons' ),
-	'description'   => _x( 'Two buttons, one filled and one outlined, side by side.', 'Block pattern description' ),
+	'description'   => _x( 'Two buttons, one filled and one outlined, side by side.', 'Block pattern description', 'default' ),
 );
diff --git a/lib/block-patterns/two-images-gallery.php b/lib/block-patterns/two-images-gallery.php
index ba2c453f8f388..8fd5333d7e595 100644
--- a/lib/block-patterns/two-images-gallery.php
+++ b/lib/block-patterns/two-images-gallery.php
@@ -6,10 +6,10 @@
  */
 
 return array(
-	'title'       => __( 'Two images side by side' ),
+	'title'       => _x( 'Two images side by side', 'Block pattern title', 'default' ),
 	'categories'  => array( 'gallery' ),
 	'content'     => '<!-- wp:gallery {"ids":[259,258],"linkTo":"none","align":"wide"} -->
-	<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="https://s.w.org/images/core/5.8/nature-above-01.jpg" alt="' . __( 'An aerial view of waves crashing against a shore.' ) . '" data-id="259" data-full-url="https://s.w.org/images/core/5.8/nature-above-01.jpg" data-link="#" class="wp-image-259"/></figure></li><li class="blocks-gallery-item"><figure><img src="https://s.w.org/images/core/5.8/nature-above-02.jpg" alt="' . __( 'An aerial view of a field. A road runs through the upper right corner.' ) . '" data-id="258" data-full-url="https://s.w.org/images/core/5.8/nature-above-02.jpg" data-link="#" class="wp-image-258"/></figure></li></ul></figure>
+	<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="https://s.w.org/images/core/5.8/nature-above-01.jpg" alt="' . esc_html__( 'An aerial view of waves crashing against a shore.', 'default' ) . '" data-id="259" data-full-url="https://s.w.org/images/core/5.8/nature-above-01.jpg" data-link="#" class="wp-image-259"/></figure></li><li class="blocks-gallery-item"><figure><img src="https://s.w.org/images/core/5.8/nature-above-02.jpg" alt="' . esc_html__( 'An aerial view of a field. A road runs through the upper right corner.', 'default' ) . '" data-id="258" data-full-url="https://s.w.org/images/core/5.8/nature-above-02.jpg" data-link="#" class="wp-image-258"/></figure></li></ul></figure>
 	<!-- /wp:gallery -->',
-	'description' => _x( 'Two images side by side', 'Block pattern description' ),
+	'description' => _x( 'Two images side by side', 'Block pattern description', 'default' ),
 );

From 4b860320484da3cf13b0d4373bb3b8b0c6f0a1e0 Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Mon, 5 Apr 2021 14:21:04 +0200
Subject: [PATCH 28/44] unregistered all the old default patterns

---
 lib/block-patterns.php | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index f00fe17d6394a..59add5acda9bb 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -185,6 +185,19 @@
 	function() {
 
 		$core_block_patterns = array(
+			'text-two-columns',
+			'two-buttons',
+			'two-images',
+			'text-two-columns-with-images',
+			'text-three-columns-buttons',
+			'large-header',
+			'large-header-button',
+			'three-buttons',
+			'heading-paragraph',
+			'quote',
+		);
+
+		$new_core_block_patterns = array(
 			'media-text-nature',
 			'two-images-gallery',
 			'three-columns-media-text',
@@ -206,16 +219,17 @@ function() {
 			return;
 		}
 
-		unregister_block_pattern( 'core/two-buttons' );
-		unregister_block_pattern( 'core/quote' );
-		unregister_block_pattern( 'core/text-two-columns' );
+		foreach ( $core_block_patterns as $core_block_pattern ) {
+			unregister_block_pattern( 'core/' . $core_block_pattern );
+		}
 
+		register_block_pattern_category( 'buttons', array( 'label' => _x( 'Buttons', 'Block pattern category', 'default' ) ) );
 		register_block_pattern_category( 'columns', array( 'label' => _x( 'Columns', 'Block pattern category', 'default' ) ) );
 		register_block_pattern_category( 'header', array( 'label' => _x( 'Headers', 'Block pattern category', 'default' ) ) );
 		register_block_pattern_category( 'gallery', array( 'label' => _x( 'Gallery', 'Block pattern category', 'default' ) ) );
 		register_block_pattern_category( 'text', array( 'label' => _x( 'Text', 'Block pattern category', 'default' ) ) );
 
-		foreach ( $core_block_patterns as $core_block_pattern ) {
+		foreach ( $new_core_block_patterns as $core_block_pattern ) {
 			register_block_pattern(
 				'core/' . $core_block_pattern,
 				require __DIR__ . '/block-patterns/' . $core_block_pattern . '.php'

From e343edbffee76c34a0993205dc508e85078da209 Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Mon, 5 Apr 2021 15:25:22 +0200
Subject: [PATCH 29/44] escape attributes with esc_attr__

---
 lib/block-patterns/media-text-arquitecture.php  | 2 +-
 lib/block-patterns/media-text-art.php           | 2 +-
 lib/block-patterns/media-text-nature.php        | 2 +-
 lib/block-patterns/quote.php                    | 2 +-
 lib/block-patterns/three-columns-media-text.php | 6 +++---
 lib/block-patterns/three-images-gallery.php     | 6 +++---
 lib/block-patterns/two-images-gallery.php       | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/block-patterns/media-text-arquitecture.php b/lib/block-patterns/media-text-arquitecture.php
index 3fcd7e0859a23..dbfcf85c91abf 100644
--- a/lib/block-patterns/media-text-arquitecture.php
+++ b/lib/block-patterns/media-text-arquitecture.php
@@ -9,7 +9,7 @@
 	'title'       => _x( 'Media and text with image on the right', 'Block pattern title', 'default' ),
 	'categories'  => array( 'text' ),
 	'content'     => '<!-- wp:media-text {"align":"full","mediaId":1352,"mediaType":"image","verticalAlignment":"center"} -->
-	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/architecture-04.jpg" alt="' . esc_html__( 'Close-up, abstract view of architecture.', 'default' ) . '" class="wp-image-1352 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"style":{"color":{"text":"#000000"}}} -->
+	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/architecture-04.jpg" alt="' . esc_attr__( 'Close-up, abstract view of architecture.', 'default' ) . '" class="wp-image-1352 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"style":{"color":{"text":"#000000"}}} -->
 	<h3 class="has-text-align-center has-text-color"  style="color:#000000"><strong>' . esc_html__( 'Open Spaces', 'default' ) . '</strong></h3>
 	<!-- /wp:heading -->
 	
diff --git a/lib/block-patterns/media-text-art.php b/lib/block-patterns/media-text-art.php
index c78512a90d65d..4f60ea509acc7 100644
--- a/lib/block-patterns/media-text-art.php
+++ b/lib/block-patterns/media-text-art.php
@@ -9,7 +9,7 @@
 	'title'       => _x( 'Media & text with image on the right', 'Block pattern title', 'default' ),
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:media-text {"align":"full","mediaPosition":"right","mediaId":615,"mediaLink":"#","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","className":"is-style-default"} -->
-	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/art-02.jpg" alt="' . esc_html__( 'A green and brown rural landscape leading into a bright blue ocean and slightly cloudy sky, done in oil paints.', 'default' ) . '" class="wp-image-615 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"color":{"text":"#000000"}},"className":"has-text-color"} -->
+	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/art-02.jpg" alt="' . esc_attr__( 'A green and brown rural landscape leading into a bright blue ocean and slightly cloudy sky, done in oil paints.', 'default' ) . '" class="wp-image-615 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"color":{"text":"#000000"}},"className":"has-text-color"} -->
 	<h2 class="has-text-color" style="color:#000000"><strong>' . esc_html__( 'Shore with Blue Sea', 'default' ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
diff --git a/lib/block-patterns/media-text-nature.php b/lib/block-patterns/media-text-nature.php
index b8f35009a93c2..5f532df265251 100644
--- a/lib/block-patterns/media-text-nature.php
+++ b/lib/block-patterns/media-text-nature.php
@@ -10,7 +10,7 @@
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"customOverlayColor":"#ffffff","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
 	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"mediaId":2501,"mediaLink":"https://s.w.org/images/core/5.8/soil.jpg","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","imageFill":true} -->
-	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center is-image-fill" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media" style="background-image:url(https://s.w.org/images/core/5.8/soil.jpg);background-position:50% 50%"><img src="https://s.w.org/images/core/5.8/soil.jpg" alt="' . esc_html__( 'Close-up of dried, cracked earth.', 'default' ) . '" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
+	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center is-image-fill" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media" style="background-image:url(https://s.w.org/images/core/5.8/soil.jpg);background-position:50% 50%"><img src="https://s.w.org/images/core/5.8/soil.jpg" alt="' . esc_attr__( 'Close-up of dried, cracked earth.', 'default' ) . '" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
 	<h2 class="has-text-color" style="color:#000000;font-size:32px"><strong>' . esc_html__( "What's the problem?", 'default' ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
diff --git a/lib/block-patterns/quote.php b/lib/block-patterns/quote.php
index e4e628db77fda..8b7a5bb081990 100644
--- a/lib/block-patterns/quote.php
+++ b/lib/block-patterns/quote.php
@@ -14,7 +14,7 @@
 	<!-- /wp:separator -->
 	
 	<!-- wp:image {"align":"center","id":553,"width":150,"height":150,"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
-	<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="https://s.w.org/images/core/5.8/portrait.jpg" alt="' . esc_html__( 'A side profile of a woman in a russet-colored turtleneck and white bag. She looks up with her eyes closed.', 'default' ) . '" class="wp-image-553" width="150" height="150"/></figure></div>
+	<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="https://s.w.org/images/core/5.8/portrait.jpg" alt="' . esc_attr__( 'A side profile of a woman in a russet-colored turtleneck and white bag. She looks up with her eyes closed.', 'default' ) . '" class="wp-image-553" width="150" height="150"/></figure></div>
 	<!-- /wp:image -->
 	
 	<!-- wp:quote {"align":"center","className":"is-style-large"} -->
diff --git a/lib/block-patterns/three-columns-media-text.php b/lib/block-patterns/three-columns-media-text.php
index d03b992447135..0ea9587c57818 100644
--- a/lib/block-patterns/three-columns-media-text.php
+++ b/lib/block-patterns/three-columns-media-text.php
@@ -40,13 +40,13 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:image {"id":345,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/outside-01.jpg" alt="' . esc_html__( 'The sun setting through a dense forest of trees.', 'default' ) . '" class="wp-image-345"/></figure>
+	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/outside-01.jpg" alt="' . esc_attr__( 'The sun setting through a dense forest of trees.', 'default' ) . '" class="wp-image-345"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"width":"33.62%"} -->
 	<div class="wp-block-column" style="flex-basis:33.62%"><!-- wp:image {"id":347,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/outside-02.jpg" alt="' . esc_html__( 'Wind turbines standing on a grassy plain, against a blue sky.', 'default' ) . '" class="wp-image-347"/></figure>
+	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/outside-02.jpg" alt="' . esc_attr__( 'Wind turbines standing on a grassy plain, against a blue sky.', 'default' ) . '" class="wp-image-347"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->
@@ -54,7 +54,7 @@
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"67%"} -->
 	<div class="wp-block-column" style="flex-basis:67%"><!-- wp:image {"align":"right","id":348,"sizeSlug":"large","linkDestination":"none"} -->
-	<div class="wp-block-image"><figure class="alignright size-large"><img src="https://s.w.org/images/core/5.8/outside-03.jpg" alt="' . esc_html__( 'The sun shining over a ridge leading down into the shore. In the distance, a car drives down a road.', 'default' ) . '" class="wp-image-348"/></figure></div>
+	<div class="wp-block-image"><figure class="alignright size-large"><img src="https://s.w.org/images/core/5.8/outside-03.jpg" alt="' . esc_attr__( 'The sun shining over a ridge leading down into the shore. In the distance, a car drives down a road.', 'default' ) . '" class="wp-image-348"/></figure></div>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
diff --git a/lib/block-patterns/three-images-gallery.php b/lib/block-patterns/three-images-gallery.php
index b35bc3739e37e..a8f3fcd48b0d2 100644
--- a/lib/block-patterns/three-images-gallery.php
+++ b/lib/block-patterns/three-images-gallery.php
@@ -11,7 +11,7 @@
 	'content'     => '<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"25%"} -->
 	<div class="wp-block-column" style="flex-basis:25%"><!-- wp:image {"id":240,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
-	<figure class="wp-block-image size-large is-style-default"><img src="https://s.w.org/images/core/5.8/architecture-01.jpg" alt="' . esc_html__( 'Close-up, abstract view of geometric architecture.', 'default' ) . '" class="wp-image-240"/></figure>
+	<figure class="wp-block-image size-large is-style-default"><img src="https://s.w.org/images/core/5.8/architecture-01.jpg" alt="' . esc_attr__( 'Close-up, abstract view of geometric architecture.', 'default' ) . '" class="wp-image-240"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
@@ -25,13 +25,13 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:image {"id":237,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/architecture-02.jpg" alt="' . esc_html__( 'Close-up, angled view of a window on a white building.', 'default' ) . '" class="wp-image-237"/></figure>
+	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/architecture-02.jpg" alt="' . esc_attr__( 'Close-up, angled view of a window on a white building.', 'default' ) . '" class="wp-image-237"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"width":"45%"} -->
 	<div class="wp-block-column" style="flex-basis:45%"><!-- wp:image {"id":236,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
-	<figure class="wp-block-image size-large is-style-default"><img src="https://s.w.org/images/core/5.8/architecture-03.jpg" alt="' . esc_html__( 'Close-up of the corner of a white, geometric building with both sharp points and round corners.', 'default' ) . '" class="wp-image-236"/></figure>
+	<figure class="wp-block-image size-large is-style-default"><img src="https://s.w.org/images/core/5.8/architecture-03.jpg" alt="' . esc_attr__( 'Close-up of the corner of a white, geometric building with both sharp points and round corners.', 'default' ) . '" class="wp-image-236"/></figure>
 	<!-- /wp:image -->
 	
 	<!-- wp:spacer {"height":285} -->
diff --git a/lib/block-patterns/two-images-gallery.php b/lib/block-patterns/two-images-gallery.php
index 8fd5333d7e595..3f941a8b72f4b 100644
--- a/lib/block-patterns/two-images-gallery.php
+++ b/lib/block-patterns/two-images-gallery.php
@@ -9,7 +9,7 @@
 	'title'       => _x( 'Two images side by side', 'Block pattern title', 'default' ),
 	'categories'  => array( 'gallery' ),
 	'content'     => '<!-- wp:gallery {"ids":[259,258],"linkTo":"none","align":"wide"} -->
-	<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="https://s.w.org/images/core/5.8/nature-above-01.jpg" alt="' . esc_html__( 'An aerial view of waves crashing against a shore.', 'default' ) . '" data-id="259" data-full-url="https://s.w.org/images/core/5.8/nature-above-01.jpg" data-link="#" class="wp-image-259"/></figure></li><li class="blocks-gallery-item"><figure><img src="https://s.w.org/images/core/5.8/nature-above-02.jpg" alt="' . esc_html__( 'An aerial view of a field. A road runs through the upper right corner.', 'default' ) . '" data-id="258" data-full-url="https://s.w.org/images/core/5.8/nature-above-02.jpg" data-link="#" class="wp-image-258"/></figure></li></ul></figure>
+	<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="https://s.w.org/images/core/5.8/nature-above-01.jpg" alt="' . esc_attr__( 'An aerial view of waves crashing against a shore.', 'default' ) . '" data-id="259" data-full-url="https://s.w.org/images/core/5.8/nature-above-01.jpg" data-link="#" class="wp-image-259"/></figure></li><li class="blocks-gallery-item"><figure><img src="https://s.w.org/images/core/5.8/nature-above-02.jpg" alt="' . esc_attr__( 'An aerial view of a field. A road runs through the upper right corner.', 'default' ) . '" data-id="258" data-full-url="https://s.w.org/images/core/5.8/nature-above-02.jpg" data-link="#" class="wp-image-258"/></figure></li></ul></figure>
 	<!-- /wp:gallery -->',
 	'description' => _x( 'Two images side by side', 'Block pattern description', 'default' ),
 );

From 047a4f5e6d9ce6a7e5c74867cb68fae2a286bcce Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Mon, 5 Apr 2021 15:33:05 +0200
Subject: [PATCH 30/44] escaped strings with html tags using wp_kses_post

---
 lib/block-patterns/large-header-text-button.php | 2 +-
 lib/block-patterns/quote.php                    | 2 +-
 lib/block-patterns/text-two-columns.php         | 4 ++--
 lib/block-patterns/three-columns-media-text.php | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/block-patterns/large-header-text-button.php b/lib/block-patterns/large-header-text-button.php
index ec5e2fea71fec..0ca707bee637f 100644
--- a/lib/block-patterns/large-header-text-button.php
+++ b/lib/block-patterns/large-header-text-button.php
@@ -16,7 +16,7 @@
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"60%"} -->
 	<div class="wp-block-column" style="flex-basis:60%"><!-- wp:paragraph {"style":{"color":{"text":"#ffffff"}}} -->
-	<p class="has-text-color" style="color:#ffffff">' . esc_html__( 'An exhibition about the different representations of the ocean throughout time, between the sixteenth and the twentieth century. Taking place in our Open Room in <em>Floor 2</em>.', 'default' ) . '</p>
+	<p class="has-text-color" style="color:#ffffff">' . wp_kses_post( __( 'An exhibition about the different representations of the ocean throughout time, between the sixteenth and the twentieth century. Taking place in our Open Room in <em>Floor 2</em>.', 'default' ) ) . '</p>
 	<!-- /wp:paragraph -->
 
 	<!-- wp:buttons -->
diff --git a/lib/block-patterns/quote.php b/lib/block-patterns/quote.php
index 8b7a5bb081990..d09812303d47e 100644
--- a/lib/block-patterns/quote.php
+++ b/lib/block-patterns/quote.php
@@ -18,7 +18,7 @@
 	<!-- /wp:image -->
 	
 	<!-- wp:quote {"align":"center","className":"is-style-large"} -->
-	<blockquote class="wp-block-quote has-text-align-center is-style-large"><p>' . esc_html__( "\"Contributing makes me feel like I'm being useful to the planet.\"", 'default' ) . '</p><cite>' . esc_html__( '— Anna Wong, <em>Volunteer</em>', 'default' ) . '</cite></blockquote>
+	<blockquote class="wp-block-quote has-text-align-center is-style-large"><p>' . esc_html__( "\"Contributing makes me feel like I'm being useful to the planet.\"", 'default' ) . '</p><cite>' . wp_kses_post( __( '— Anna Wong, <em>Volunteer</em>', 'default' ) ) . '</cite></blockquote>
 	<!-- /wp:quote -->
 	
 	<!-- wp:separator {"className":"is-style-default"} -->
diff --git a/lib/block-patterns/text-two-columns.php b/lib/block-patterns/text-two-columns.php
index 40f54b97297da..a3972519cff81 100644
--- a/lib/block-patterns/text-two-columns.php
+++ b/lib/block-patterns/text-two-columns.php
@@ -18,7 +18,7 @@
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"24px","lineHeight":"1.2"}}} -->
-	<p style="font-size:24px;line-height:1.2"><a href="https://wordpress.org">' . esc_html__( 'EARTHFUND™<br>ARCHWEEKLY<br>FUTURE ROADS<br>BUILDING NY', 'default' ) . '</a></p>
+	<p style="font-size:24px;line-height:1.2"><a href="https://wordpress.org">' . wp_kses_post( __( 'EARTHFUND™<br>ARCHWEEKLY<br>FUTURE ROADS<br>BUILDING NY', 'default' ) ). '</a></p>
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:spacer -->
@@ -32,7 +32,7 @@
 	<!-- /wp:spacer -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"24px","lineHeight":"1.2"}}} -->
-	<p style="font-size:24px;line-height:1.2"><a href="https://wordpress.org">' . esc_html__( 'DUBAI ROOFS<br>MAY WATSON STUDIO<br>Y.O.L<br>RUDIMENTAR', 'default' ) . '</a></p>
+	<p style="font-size:24px;line-height:1.2"><a href="https://wordpress.org">' . wp_kses_post( __( 'DUBAI ROOFS<br>MAY WATSON STUDIO<br>Y.O.L<br>RUDIMENTAR', 'default' ) ) . '</a></p>
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:spacer -->
diff --git a/lib/block-patterns/three-columns-media-text.php b/lib/block-patterns/three-columns-media-text.php
index 0ea9587c57818..8bea9f891910c 100644
--- a/lib/block-patterns/three-columns-media-text.php
+++ b/lib/block-patterns/three-columns-media-text.php
@@ -30,7 +30,7 @@
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"33.38%"} -->
 	<div class="wp-block-column" style="flex-basis:33.38%"><!-- wp:paragraph {"style":{"color":{"text":"#000000"}},"fontSize":"extra-small"} -->
-	<p class="has-text-color has-extra-small-font-size" style="color:#000000">' . esc_html__( '<em>Nature</em>, in the common sense, refers to essences unchanged by man; space, the air, the river, the leaf.&nbsp;<em>Art</em>&nbsp;is applied to the mixture of his will with the same things, as in a house, a canal, a statue, a picture. But his operations taken together are so insignificant, a little chipping, baking, patching, and washing, that in an impression so grand as that of the world on the human mind, they do not vary the result.', 'default' ) . '</p>
+	<p class="has-text-color has-extra-small-font-size" style="color:#000000">' . wp_kses_post( __( '<em>Nature</em>, in the common sense, refers to essences unchanged by man; space, the air, the river, the leaf.&nbsp;<em>Art</em>&nbsp;is applied to the mixture of his will with the same things, as in a house, a canal, a statue, a picture. But his operations taken together are so insignificant, a little chipping, baking, patching, and washing, that in an impression so grand as that of the world on the human mind, they do not vary the result.', 'default' ) ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	

From 7ced16e8a79f0f479148a421cf4c5ac18fe57366 Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Mon, 5 Apr 2021 15:34:00 +0200
Subject: [PATCH 31/44] linting

---
 lib/block-patterns/text-two-columns.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/block-patterns/text-two-columns.php b/lib/block-patterns/text-two-columns.php
index a3972519cff81..7ab157d8ca1ae 100644
--- a/lib/block-patterns/text-two-columns.php
+++ b/lib/block-patterns/text-two-columns.php
@@ -18,7 +18,7 @@
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"24px","lineHeight":"1.2"}}} -->
-	<p style="font-size:24px;line-height:1.2"><a href="https://wordpress.org">' . wp_kses_post( __( 'EARTHFUND™<br>ARCHWEEKLY<br>FUTURE ROADS<br>BUILDING NY', 'default' ) ). '</a></p>
+	<p style="font-size:24px;line-height:1.2"><a href="https://wordpress.org">' . wp_kses_post( __( 'EARTHFUND™<br>ARCHWEEKLY<br>FUTURE ROADS<br>BUILDING NY', 'default' ) ) . '</a></p>
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:spacer -->

From e679c01e3b9ec9107f206fc243f7edbb8fe2a99c Mon Sep 17 00:00:00 2001
From: Maggie <maggie.cabrera@automattic.com>
Date: Mon, 5 Apr 2021 15:26:53 +0200
Subject: [PATCH 32/44] Update lib/block-patterns/media-text-arquitecture.php

Co-authored-by: Kjell Reigstad <kjell@kjellr.com>
---
 lib/block-patterns/media-text-arquitecture.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/block-patterns/media-text-arquitecture.php b/lib/block-patterns/media-text-arquitecture.php
index dbfcf85c91abf..eb1ba4a4b8e0a 100644
--- a/lib/block-patterns/media-text-arquitecture.php
+++ b/lib/block-patterns/media-text-arquitecture.php
@@ -7,7 +7,7 @@
 
 return array(
 	'title'       => _x( 'Media and text with image on the right', 'Block pattern title', 'default' ),
-	'categories'  => array( 'text' ),
+	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:media-text {"align":"full","mediaId":1352,"mediaType":"image","verticalAlignment":"center"} -->
 	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/architecture-04.jpg" alt="' . esc_attr__( 'Close-up, abstract view of architecture.', 'default' ) . '" class="wp-image-1352 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"style":{"color":{"text":"#000000"}}} -->
 	<h3 class="has-text-align-center has-text-color"  style="color:#000000"><strong>' . esc_html__( 'Open Spaces', 'default' ) . '</strong></h3>

From bd7c8e312bffffb50478943fc4e7a2971048aad7 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Tue, 13 Apr 2021 13:11:42 -0400
Subject: [PATCH 33/44] Add blockTypes prop for compatibility with #30469.

---
 lib/block-patterns/heading.php | 1 +
 lib/block-patterns/quote.php   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/block-patterns/heading.php b/lib/block-patterns/heading.php
index 902938770c3b1..3c7d7a7d38a9e 100644
--- a/lib/block-patterns/heading.php
+++ b/lib/block-patterns/heading.php
@@ -8,6 +8,7 @@
 return array(
 	'title'       => _x( 'Heading', 'Block pattern title', 'default' ),
 	'categories'  => array( 'text' ),
+	'blockTypes'    => array( 'core/heading' ),
 	'content'     => '<!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"48px","lineHeight":"1.1"}}} -->
 	<h2 class="alignwide" style="font-size:48px;line-height:1.1">' . esc_html__( "We're a studio in Berlin with an international practice in architecture, urban planning and interior design. We believe in sharing knowledge and promoting dialogue to increase the creative potential of collaboration.", 'default' ) . '</h2>
 	<!-- /wp:heading -->',
diff --git a/lib/block-patterns/quote.php b/lib/block-patterns/quote.php
index d09812303d47e..70fafea3488fb 100644
--- a/lib/block-patterns/quote.php
+++ b/lib/block-patterns/quote.php
@@ -8,6 +8,7 @@
 return array(
 	'title'       => _x( 'Quote', 'Block pattern title', 'default' ),
 	'categories'  => array( 'text' ),
+	'blockTypes'    => array( 'core/quote' ),
 	'content'     => '<!-- wp:group -->
 	<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:separator {"className":"is-style-default"} -->
 	<hr class="wp-block-separator is-style-default"/>

From 5fce33f031b575f3d7e8f1f8feecf445a8e1db8a Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Tue, 13 Apr 2021 14:49:58 -0400
Subject: [PATCH 34/44] Add categories for uncategorized patterns.

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

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index 59add5acda9bb..330f69db61ea8 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -159,6 +159,7 @@
 	'paragraph/large-with-background-color',
 	array(
 		'title'         => __( 'Large Paragraph with background color', 'gutenberg' ),
+		'categories'    => array( 'Text' ),
 		'blockTypes'    => array( 'core/paragraph' ),
 		'viewportWidth' => 500,
 		'content'       => '<!-- wp:paragraph {"style":{"color":{"link":"#FFFFFF","text":"#FFFFFF","background":"#000000"},"typography":{"lineHeight":"1.3","fontSize":"26px"}}} -->
@@ -170,6 +171,7 @@
 	'social-links/shared-background-color',
 	array(
 		'title'         => __( 'Social links with a shared background color', 'gutenberg' ),
+		'categories'    => array( 'Buttons' ),
 		'blockTypes'    => array( 'core/social-links' ),
 		'viewportWidth' => 500,
 		'content'       => '<!-- wp:social-links {"customIconColor":"#ffffff","iconColorValue":"#ffffff","customIconBackgroundColor":"#3962e3","iconBackgroundColorValue":"#3962e3","className":"has-icon-color"} -->

From 09ce72c4ead5228beb6838501d354e214da2d666 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Tue, 13 Apr 2021 14:55:35 -0400
Subject: [PATCH 35/44] Add code comment.

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

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index 330f69db61ea8..a8d44d3409f2b 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -182,6 +182,8 @@
 	)
 );
 
+// Deactivate the legacy patterns bundled with WordPress, and add new block patterns for testing. 
+// More details in this trac issue: https://core.trac.wordpress.org/ticket/52846
 add_action(
 	'init',
 	function() {

From 03c53274929a2f5fbada5458bbfdbc9a47dc3f62 Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Wed, 14 Apr 2021 14:17:27 +0200
Subject: [PATCH 36/44] linting

---
 lib/block-patterns.php         | 2 +-
 lib/block-patterns/heading.php | 2 +-
 lib/block-patterns/quote.php   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index a8d44d3409f2b..6e1464e5ed259 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -182,7 +182,7 @@
 	)
 );
 
-// Deactivate the legacy patterns bundled with WordPress, and add new block patterns for testing. 
+// Deactivate the legacy patterns bundled with WordPress, and add new block patterns for testing.
 // More details in this trac issue: https://core.trac.wordpress.org/ticket/52846
 add_action(
 	'init',
diff --git a/lib/block-patterns/heading.php b/lib/block-patterns/heading.php
index 3c7d7a7d38a9e..571ff91fa36c4 100644
--- a/lib/block-patterns/heading.php
+++ b/lib/block-patterns/heading.php
@@ -8,7 +8,7 @@
 return array(
 	'title'       => _x( 'Heading', 'Block pattern title', 'default' ),
 	'categories'  => array( 'text' ),
-	'blockTypes'    => array( 'core/heading' ),
+	'blockTypes'  => array( 'core/heading' ),
 	'content'     => '<!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"48px","lineHeight":"1.1"}}} -->
 	<h2 class="alignwide" style="font-size:48px;line-height:1.1">' . esc_html__( "We're a studio in Berlin with an international practice in architecture, urban planning and interior design. We believe in sharing knowledge and promoting dialogue to increase the creative potential of collaboration.", 'default' ) . '</h2>
 	<!-- /wp:heading -->',
diff --git a/lib/block-patterns/quote.php b/lib/block-patterns/quote.php
index 70fafea3488fb..80f06acfabd96 100644
--- a/lib/block-patterns/quote.php
+++ b/lib/block-patterns/quote.php
@@ -8,7 +8,7 @@
 return array(
 	'title'       => _x( 'Quote', 'Block pattern title', 'default' ),
 	'categories'  => array( 'text' ),
-	'blockTypes'    => array( 'core/quote' ),
+	'blockTypes'  => array( 'core/quote' ),
 	'content'     => '<!-- wp:group -->
 	<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:separator {"className":"is-style-default"} -->
 	<hr class="wp-block-separator is-style-default"/>

From 393fce9fa59f4de8a39ac7e2ff0414cce94355e2 Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Wed, 14 Apr 2021 15:48:53 +0200
Subject: [PATCH 37/44] more linting

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

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index 6e1464e5ed259..be749306e955c 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -183,7 +183,7 @@
 );
 
 // Deactivate the legacy patterns bundled with WordPress, and add new block patterns for testing.
-// More details in this trac issue: https://core.trac.wordpress.org/ticket/52846
+// More details in the trac issue (https://core.trac.wordpress.org/ticket/52846). 
 add_action(
 	'init',
 	function() {

From eb3092ea65c38def38473b93a67652b72d45bb5e Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Thu, 15 Apr 2021 14:08:23 +0200
Subject: [PATCH 38/44] updated snapshot related to 2 buttons block

---
 lib/block-patterns.php                                   | 2 +-
 .../various/__snapshots__/adding-patterns.test.js.snap   | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index be749306e955c..3c3695d4ac049 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -183,7 +183,7 @@
 );
 
 // Deactivate the legacy patterns bundled with WordPress, and add new block patterns for testing.
-// More details in the trac issue (https://core.trac.wordpress.org/ticket/52846). 
+// More details in the trac issue (https://core.trac.wordpress.org/ticket/52846).
 add_action(
 	'init',
 	function() {
diff --git a/packages/e2e-tests/specs/editor/various/__snapshots__/adding-patterns.test.js.snap b/packages/e2e-tests/specs/editor/various/__snapshots__/adding-patterns.test.js.snap
index 85eaf50e88cea..9679577647e4f 100644
--- a/packages/e2e-tests/specs/editor/various/__snapshots__/adding-patterns.test.js.snap
+++ b/packages/e2e-tests/specs/editor/various/__snapshots__/adding-patterns.test.js.snap
@@ -2,12 +2,21 @@
 
 exports[`adding patterns should insert a block pattern 1`] = `
 "<!-- wp:buttons {\\"contentJustification\\":\\"center\\"} -->
+<<<<<<< HEAD
 <div class=\\"wp-block-buttons is-content-justification-center\\"><!-- wp:button {\\"style\\":{\\"color\\":{\\"background\\":\\"#ba0c49\\",\\"text\\":\\"#fffffa\\"},\\"border\\":{\\"radius\\":2}}} -->
 <div class=\\"wp-block-button\\"><a class=\\"wp-block-button__link has-text-color has-background\\" style=\\"border-radius:2px;background-color:#ba0c49;color:#fffffa\\">Download now</a></div>
 <!-- /wp:button -->
 
 <!-- wp:button {\\"style\\":{\\"color\\":{\\"text\\":\\"#ba0c49\\"},\\"border\\":{\\"radius\\":2}},\\"className\\":\\"is-style-outline\\"} -->
 <div class=\\"wp-block-button is-style-outline\\"><a class=\\"wp-block-button__link has-text-color\\" style=\\"border-radius:2px;color:#ba0c49\\">About Cervantes</a></div>
+=======
+<div class=\\"wp-block-buttons is-content-justification-center\\"><!-- wp:button {\\"borderRadius\\":0} -->
+<div class=\\"wp-block-button\\"><a class=\\"wp-block-button__link no-border-radius\\">Our Work</a></div>
+<!-- /wp:button -->
+
+<!-- wp:button {\\"borderRadius\\":1,\\"className\\":\\"is-style-outline\\"} -->
+<div class=\\"wp-block-button is-style-outline\\"><a class=\\"wp-block-button__link\\" style=\\"border-radius:1px\\">Where We Are</a></div>
+>>>>>>> updated snapshot related to 2 buttons block
 <!-- /wp:button --></div>
 <!-- /wp:buttons -->"
 `;

From 6f71de437fd2e7ef90929f6eac52a613a8f7ab68 Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Mon, 19 Apr 2021 10:14:25 +0200
Subject: [PATCH 39/44] fixed conflict

---
 .../various/__snapshots__/adding-patterns.test.js.snap   | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/various/__snapshots__/adding-patterns.test.js.snap b/packages/e2e-tests/specs/editor/various/__snapshots__/adding-patterns.test.js.snap
index 9679577647e4f..5f7e8ab13b1cc 100644
--- a/packages/e2e-tests/specs/editor/various/__snapshots__/adding-patterns.test.js.snap
+++ b/packages/e2e-tests/specs/editor/various/__snapshots__/adding-patterns.test.js.snap
@@ -2,21 +2,12 @@
 
 exports[`adding patterns should insert a block pattern 1`] = `
 "<!-- wp:buttons {\\"contentJustification\\":\\"center\\"} -->
-<<<<<<< HEAD
-<div class=\\"wp-block-buttons is-content-justification-center\\"><!-- wp:button {\\"style\\":{\\"color\\":{\\"background\\":\\"#ba0c49\\",\\"text\\":\\"#fffffa\\"},\\"border\\":{\\"radius\\":2}}} -->
-<div class=\\"wp-block-button\\"><a class=\\"wp-block-button__link has-text-color has-background\\" style=\\"border-radius:2px;background-color:#ba0c49;color:#fffffa\\">Download now</a></div>
-<!-- /wp:button -->
-
-<!-- wp:button {\\"style\\":{\\"color\\":{\\"text\\":\\"#ba0c49\\"},\\"border\\":{\\"radius\\":2}},\\"className\\":\\"is-style-outline\\"} -->
-<div class=\\"wp-block-button is-style-outline\\"><a class=\\"wp-block-button__link has-text-color\\" style=\\"border-radius:2px;color:#ba0c49\\">About Cervantes</a></div>
-=======
 <div class=\\"wp-block-buttons is-content-justification-center\\"><!-- wp:button {\\"borderRadius\\":0} -->
 <div class=\\"wp-block-button\\"><a class=\\"wp-block-button__link no-border-radius\\">Our Work</a></div>
 <!-- /wp:button -->
 
 <!-- wp:button {\\"borderRadius\\":1,\\"className\\":\\"is-style-outline\\"} -->
 <div class=\\"wp-block-button is-style-outline\\"><a class=\\"wp-block-button__link\\" style=\\"border-radius:1px\\">Where We Are</a></div>
->>>>>>> updated snapshot related to 2 buttons block
 <!-- /wp:button --></div>
 <!-- /wp:buttons -->"
 `;

From 001c639fb12ce3282f6de90e38419bc2647ae85c Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Mon, 19 Apr 2021 12:02:33 +0200
Subject: [PATCH 40/44] fixed adding patterns snapshot

---
 .../editor/various/__snapshots__/adding-patterns.test.js.snap | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/various/__snapshots__/adding-patterns.test.js.snap b/packages/e2e-tests/specs/editor/various/__snapshots__/adding-patterns.test.js.snap
index 5f7e8ab13b1cc..27ddbf03e863d 100644
--- a/packages/e2e-tests/specs/editor/various/__snapshots__/adding-patterns.test.js.snap
+++ b/packages/e2e-tests/specs/editor/various/__snapshots__/adding-patterns.test.js.snap
@@ -2,11 +2,11 @@
 
 exports[`adding patterns should insert a block pattern 1`] = `
 "<!-- wp:buttons {\\"contentJustification\\":\\"center\\"} -->
-<div class=\\"wp-block-buttons is-content-justification-center\\"><!-- wp:button {\\"borderRadius\\":0} -->
+<div class=\\"wp-block-buttons is-content-justification-center\\"><!-- wp:button {\\"style\\":{\\"border\\":{\\"radius\\":0}}} -->
 <div class=\\"wp-block-button\\"><a class=\\"wp-block-button__link no-border-radius\\">Our Work</a></div>
 <!-- /wp:button -->
 
-<!-- wp:button {\\"borderRadius\\":1,\\"className\\":\\"is-style-outline\\"} -->
+<!-- wp:button {\\"style\\":{\\"border\\":{\\"radius\\":1}},\\"className\\":\\"is-style-outline\\"} -->
 <div class=\\"wp-block-button is-style-outline\\"><a class=\\"wp-block-button__link\\" style=\\"border-radius:1px\\">Where We Are</a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons -->"

From f92728888883ffe3428c72a71d09e5941d8c7f71 Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Mon, 19 Apr 2021 12:50:06 +0200
Subject: [PATCH 41/44] removed IDs from gallery to fix e2e tests

---
 lib/block-patterns/two-images-gallery.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/block-patterns/two-images-gallery.php b/lib/block-patterns/two-images-gallery.php
index 3f941a8b72f4b..ec9e413ee3120 100644
--- a/lib/block-patterns/two-images-gallery.php
+++ b/lib/block-patterns/two-images-gallery.php
@@ -8,8 +8,8 @@
 return array(
 	'title'       => _x( 'Two images side by side', 'Block pattern title', 'default' ),
 	'categories'  => array( 'gallery' ),
-	'content'     => '<!-- wp:gallery {"ids":[259,258],"linkTo":"none","align":"wide"} -->
-	<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="https://s.w.org/images/core/5.8/nature-above-01.jpg" alt="' . esc_attr__( 'An aerial view of waves crashing against a shore.', 'default' ) . '" data-id="259" data-full-url="https://s.w.org/images/core/5.8/nature-above-01.jpg" data-link="#" class="wp-image-259"/></figure></li><li class="blocks-gallery-item"><figure><img src="https://s.w.org/images/core/5.8/nature-above-02.jpg" alt="' . esc_attr__( 'An aerial view of a field. A road runs through the upper right corner.', 'default' ) . '" data-id="258" data-full-url="https://s.w.org/images/core/5.8/nature-above-02.jpg" data-link="#" class="wp-image-258"/></figure></li></ul></figure>
+	'content'     => '<!-- wp:gallery {"ids":[null,null],"linkTo":"none","align":"wide"} -->
+	<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="https://s.w.org/images/core/5.8/nature-above-01.jpg" alt="' . esc_attr__( 'An aerial view of waves crashing against a shore.', 'default' ) . '" data-full-url="https://s.w.org/images/core/5.8/nature-above-01.jpg" data-link="#" /></figure></li><li class="blocks-gallery-item"><figure><img src="https://s.w.org/images/core/5.8/nature-above-02.jpg" alt="' . esc_attr__( 'An aerial view of a field. A road runs through the upper right corner.', 'default' ) . '" data-full-url="https://s.w.org/images/core/5.8/nature-above-02.jpg" data-link="#" /></figure></li></ul></figure>
 	<!-- /wp:gallery -->',
 	'description' => _x( 'Two images side by side', 'Block pattern description', 'default' ),
 );

From 91a3e21c8b16623bf36ea7bdfe3558e8c2b14a1d Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Mon, 19 Apr 2021 13:21:44 +0200
Subject: [PATCH 42/44] removed unnecesary data attributes

---
 lib/block-patterns/three-columns-text.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/block-patterns/three-columns-text.php b/lib/block-patterns/three-columns-text.php
index 10e5cb5938f14..8d6b14b8ba467 100644
--- a/lib/block-patterns/three-columns-text.php
+++ b/lib/block-patterns/three-columns-text.php
@@ -11,7 +11,7 @@
 	'content'     => '<!-- wp:columns {"align":"full","style":{"color":{"text":"#000000","background":"#ffffff"}}} -->
 	<div class="wp-block-columns alignfull has-text-color has-background" style="background-color:#ffffff;color:#000000"><!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"24px","lineHeight":"1.3"}}} -->
-	<h3 style="font-size:24px;line-height:1.3"><strong><a href="http://wordpress.org" data-type="URL" data-id="wordpress.org">' . esc_html__( 'Virtual Tour ↗', 'default' ) . '</a></strong></h3>
+	<h3 style="font-size:24px;line-height:1.3"><strong><a href="http://wordpress.org">' . esc_html__( 'Virtual Tour ↗', 'default' ) . '</a></strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph -->

From a1b552979e4f4062bff89023288506873ea0a34e Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Mon, 19 Apr 2021 17:10:53 +0200
Subject: [PATCH 43/44] removed unnecesary ids

---
 lib/block-patterns/large-header-left.php        |  4 ++--
 lib/block-patterns/large-header-text-button.php |  2 +-
 lib/block-patterns/media-text-arquitecture.php  |  6 +++---
 lib/block-patterns/media-text-art.php           |  4 ++--
 lib/block-patterns/media-text-nature.php        |  4 ++--
 lib/block-patterns/quote.php                    |  4 ++--
 lib/block-patterns/three-columns-media-text.php | 12 ++++++------
 lib/block-patterns/three-images-gallery.php     | 12 ++++++------
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lib/block-patterns/large-header-left.php b/lib/block-patterns/large-header-left.php
index d4d4591aeb0b5..0d6344ba7d2cb 100644
--- a/lib/block-patterns/large-header-left.php
+++ b/lib/block-patterns/large-header-left.php
@@ -8,8 +8,8 @@
 return array(
 	'title'       => _x( 'Large header with left-aligned text', 'Block pattern title', 'default' ),
 	'categories'  => array( 'header' ),
-	'content'     => '<!-- wp:cover {"url":"https://s.w.org/images/core/5.8/forest.jpg","id":261,"dimRatio":60,"minHeight":800,"align":"full"} -->
-		<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background wp-image-261" alt="" src="https://s.w.org/images/core/5.8/forest.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:heading {"align":"wide","style":{"color":{"text":"#ffe074"},"typography":{"fontSize":"64px"}}} -->
+	'content'     => '<!-- wp:cover {"url":"https://s.w.org/images/core/5.8/forest.jpg","dimRatio":60,"minHeight":800,"align":"full"} -->
+		<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background " alt="" src="https://s.w.org/images/core/5.8/forest.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:heading {"align":"wide","style":{"color":{"text":"#ffe074"},"typography":{"fontSize":"64px"}}} -->
 		<h2 class="alignwide has-text-color" style="color:#ffe074;font-size:64px">' . esc_html__( 'Forest.', 'default' ) . '</h2>
 		<!-- /wp:heading -->
 
diff --git a/lib/block-patterns/large-header-text-button.php b/lib/block-patterns/large-header-text-button.php
index 0ca707bee637f..8db97494e9dff 100644
--- a/lib/block-patterns/large-header-text-button.php
+++ b/lib/block-patterns/large-header-text-button.php
@@ -8,7 +8,7 @@
 return array(
 	'title'       => _x( 'Large header with text and a button.', 'Block pattern title', 'default' ),
 	'categories'  => array( 'header' ),
-	'content'     => '<!-- wp:cover {"url":"https://s.w.org/images/core/5.8/art-01.jpg","id":613,"hasParallax":true,"dimRatio":40,"customOverlayColor":"#000000","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
+	'content'     => '<!-- wp:cover {"url":"https://s.w.org/images/core/5.8/art-01.jpg","hasParallax":true,"dimRatio":40,"customOverlayColor":"#000000","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
 	<div class="wp-block-cover alignfull has-background-dim-40 has-background-dim has-parallax" style="background-color:#000000;background-image:url(https://s.w.org/images/core/5.8/art-01.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":"48px","lineHeight":"1.2"}},"className":"alignwide has-white-color has-text-color"} -->
 	<h2 class="alignwide has-white-color has-text-color" style="font-size:48px;line-height:1.2"><strong><em>' . esc_html__( 'Overseas:', 'default' ) . '</em></strong><br><strong><em>' . esc_html__( '1500 — 1960', 'default' ) . '</em></strong></h2>
 	<!-- /wp:heading -->
diff --git a/lib/block-patterns/media-text-arquitecture.php b/lib/block-patterns/media-text-arquitecture.php
index eb1ba4a4b8e0a..0b3b5dde986c8 100644
--- a/lib/block-patterns/media-text-arquitecture.php
+++ b/lib/block-patterns/media-text-arquitecture.php
@@ -8,9 +8,9 @@
 return array(
 	'title'       => _x( 'Media and text with image on the right', 'Block pattern title', 'default' ),
 	'categories'  => array( 'header' ),
-	'content'     => '<!-- wp:media-text {"align":"full","mediaId":1352,"mediaType":"image","verticalAlignment":"center"} -->
-	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/architecture-04.jpg" alt="' . esc_attr__( 'Close-up, abstract view of architecture.', 'default' ) . '" class="wp-image-1352 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"style":{"color":{"text":"#000000"}}} -->
-	<h3 class="has-text-align-center has-text-color"  style="color:#000000"><strong>' . esc_html__( 'Open Spaces', 'default' ) . '</strong></h3>
+	'content'     => '<!-- wp:media-text {"align":"full","mediaType":"image","verticalAlignment":"center"} -->
+	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/architecture-04.jpg" alt="' . esc_attr__( 'Close-up, abstract view of architecture.', 'default' ) . '"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"style":{"color":{"text":"#000000"}}} -->
+	<h3 class="has-text-align-center has-text-color" style="color:#000000"><strong>' . esc_html__( 'Open Spaces', 'default' ) . '</strong></h3>
 	<!-- /wp:heading -->
 	
 	<!-- wp:paragraph {"align":"center","fontSize":"extra-small"} -->
diff --git a/lib/block-patterns/media-text-art.php b/lib/block-patterns/media-text-art.php
index 4f60ea509acc7..a497bfd6f76de 100644
--- a/lib/block-patterns/media-text-art.php
+++ b/lib/block-patterns/media-text-art.php
@@ -8,8 +8,8 @@
 return array(
 	'title'       => _x( 'Media & text with image on the right', 'Block pattern title', 'default' ),
 	'categories'  => array( 'header' ),
-	'content'     => '<!-- wp:media-text {"align":"full","mediaPosition":"right","mediaId":615,"mediaLink":"#","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","className":"is-style-default"} -->
-	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/art-02.jpg" alt="' . esc_attr__( 'A green and brown rural landscape leading into a bright blue ocean and slightly cloudy sky, done in oil paints.', 'default' ) . '" class="wp-image-615 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"color":{"text":"#000000"}},"className":"has-text-color"} -->
+	'content'     => '<!-- wp:media-text {"align":"full","mediaPosition":"right","mediaLink":"#","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","className":"is-style-default"} -->
+	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/art-02.jpg" alt="' . esc_attr__( 'A green and brown rural landscape leading into a bright blue ocean and slightly cloudy sky, done in oil paints.', 'default' ) . '"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"color":{"text":"#000000"}}} -->
 	<h2 class="has-text-color" style="color:#000000"><strong>' . esc_html__( 'Shore with Blue Sea', 'default' ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
diff --git a/lib/block-patterns/media-text-nature.php b/lib/block-patterns/media-text-nature.php
index 5f532df265251..3e5a263445969 100644
--- a/lib/block-patterns/media-text-nature.php
+++ b/lib/block-patterns/media-text-nature.php
@@ -9,8 +9,8 @@
 	'title'       => _x( 'Media & text in a full height container', 'Block pattern title', 'default' ),
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"customOverlayColor":"#ffffff","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
-	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"mediaId":2501,"mediaLink":"https://s.w.org/images/core/5.8/soil.jpg","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","imageFill":true} -->
-	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center is-image-fill" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media" style="background-image:url(https://s.w.org/images/core/5.8/soil.jpg);background-position:50% 50%"><img src="https://s.w.org/images/core/5.8/soil.jpg" alt="' . esc_attr__( 'Close-up of dried, cracked earth.', 'default' ) . '" class="wp-image-2501 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
+	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"mediaLink":"https://s.w.org/images/core/5.8/soil.jpg","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","imageFill":true} -->
+	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center is-image-fill" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media" style="background-image:url(https://s.w.org/images/core/5.8/soil.jpg);background-position:50% 50%"><img src="https://s.w.org/images/core/5.8/soil.jpg" alt="' . esc_attr__( 'Close-up of dried, cracked earth.', 'default' ) . '"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
 	<h2 class="has-text-color" style="color:#000000;font-size:32px"><strong>' . esc_html__( "What's the problem?", 'default' ) . '</strong></h2>
 	<!-- /wp:heading -->
 	
diff --git a/lib/block-patterns/quote.php b/lib/block-patterns/quote.php
index 80f06acfabd96..61535496b777f 100644
--- a/lib/block-patterns/quote.php
+++ b/lib/block-patterns/quote.php
@@ -14,8 +14,8 @@
 	<hr class="wp-block-separator is-style-default"/>
 	<!-- /wp:separator -->
 	
-	<!-- wp:image {"align":"center","id":553,"width":150,"height":150,"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
-	<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="https://s.w.org/images/core/5.8/portrait.jpg" alt="' . esc_attr__( 'A side profile of a woman in a russet-colored turtleneck and white bag. She looks up with her eyes closed.', 'default' ) . '" class="wp-image-553" width="150" height="150"/></figure></div>
+	<!-- wp:image {"align":"center","width":150,"height":150,"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
+	<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="https://s.w.org/images/core/5.8/portrait.jpg" alt="' . esc_attr__( 'A side profile of a woman in a russet-colored turtleneck and white bag. She looks up with her eyes closed.', 'default' ) . '" width="150" height="150"/></figure></div>
 	<!-- /wp:image -->
 	
 	<!-- wp:quote {"align":"center","className":"is-style-large"} -->
diff --git a/lib/block-patterns/three-columns-media-text.php b/lib/block-patterns/three-columns-media-text.php
index 8bea9f891910c..c9788b4e9ea05 100644
--- a/lib/block-patterns/three-columns-media-text.php
+++ b/lib/block-patterns/three-columns-media-text.php
@@ -39,22 +39,22 @@
 	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
 	
-	<!-- wp:image {"id":345,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/outside-01.jpg" alt="' . esc_attr__( 'The sun setting through a dense forest of trees.', 'default' ) . '" class="wp-image-345"/></figure>
+	<!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
+	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/outside-01.jpg" alt="' . esc_attr__( 'The sun setting through a dense forest of trees.', 'default' ) . '" /></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"width":"33.62%"} -->
-	<div class="wp-block-column" style="flex-basis:33.62%"><!-- wp:image {"id":347,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/outside-02.jpg" alt="' . esc_attr__( 'Wind turbines standing on a grassy plain, against a blue sky.', 'default' ) . '" class="wp-image-347"/></figure>
+	<div class="wp-block-column" style="flex-basis:33.62%"><!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
+	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/outside-02.jpg" alt="' . esc_attr__( 'Wind turbines standing on a grassy plain, against a blue sky.', 'default' ) . '" /></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->
 	
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"67%"} -->
-	<div class="wp-block-column" style="flex-basis:67%"><!-- wp:image {"align":"right","id":348,"sizeSlug":"large","linkDestination":"none"} -->
-	<div class="wp-block-image"><figure class="alignright size-large"><img src="https://s.w.org/images/core/5.8/outside-03.jpg" alt="' . esc_attr__( 'The sun shining over a ridge leading down into the shore. In the distance, a car drives down a road.', 'default' ) . '" class="wp-image-348"/></figure></div>
+	<div class="wp-block-column" style="flex-basis:67%"><!-- wp:image {"align":"right","sizeSlug":"large","linkDestination":"none"} -->
+	<div class="wp-block-image"><figure class="alignright size-large"><img src="https://s.w.org/images/core/5.8/outside-03.jpg" alt="' . esc_attr__( 'The sun shining over a ridge leading down into the shore. In the distance, a car drives down a road.', 'default' ) . '" /></figure></div>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
diff --git a/lib/block-patterns/three-images-gallery.php b/lib/block-patterns/three-images-gallery.php
index a8f3fcd48b0d2..fd8248e00c0a0 100644
--- a/lib/block-patterns/three-images-gallery.php
+++ b/lib/block-patterns/three-images-gallery.php
@@ -10,8 +10,8 @@
 	'categories'  => array( 'gallery' ),
 	'content'     => '<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"25%"} -->
-	<div class="wp-block-column" style="flex-basis:25%"><!-- wp:image {"id":240,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
-	<figure class="wp-block-image size-large is-style-default"><img src="https://s.w.org/images/core/5.8/architecture-01.jpg" alt="' . esc_attr__( 'Close-up, abstract view of geometric architecture.', 'default' ) . '" class="wp-image-240"/></figure>
+	<div class="wp-block-column" style="flex-basis:25%"><!-- wp:image {"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
+	<figure class="wp-block-image size-large is-style-default"><img src="https://s.w.org/images/core/5.8/architecture-01.jpg" alt="' . esc_attr__( 'Close-up, abstract view of geometric architecture.', 'default' ) . '" /></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
@@ -24,14 +24,14 @@
 	<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
 	
-	<!-- wp:image {"id":237,"sizeSlug":"large","linkDestination":"none"} -->
-	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/architecture-02.jpg" alt="' . esc_attr__( 'Close-up, angled view of a window on a white building.', 'default' ) . '" class="wp-image-237"/></figure>
+	<!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
+	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/architecture-02.jpg" alt="' . esc_attr__( 'Close-up, angled view of a window on a white building.', 'default' ) . '" /></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"width":"45%"} -->
-	<div class="wp-block-column" style="flex-basis:45%"><!-- wp:image {"id":236,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
-	<figure class="wp-block-image size-large is-style-default"><img src="https://s.w.org/images/core/5.8/architecture-03.jpg" alt="' . esc_attr__( 'Close-up of the corner of a white, geometric building with both sharp points and round corners.', 'default' ) . '" class="wp-image-236"/></figure>
+	<div class="wp-block-column" style="flex-basis:45%"><!-- wp:image {"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
+	<figure class="wp-block-image size-large is-style-default"><img src="https://s.w.org/images/core/5.8/architecture-03.jpg" alt="' . esc_attr__( 'Close-up of the corner of a white, geometric building with both sharp points and round corners.', 'default' ) . '" /></figure>
 	<!-- /wp:image -->
 	
 	<!-- wp:spacer {"height":285} -->

From 1cb81968614ac7b3ec62809e980182ce22802c7d Mon Sep 17 00:00:00 2001
From: Maggie Cabrera <maggie.cabrera@automattic.com>
Date: Mon, 19 Apr 2021 18:17:49 +0200
Subject: [PATCH 44/44] changed ids to null

---
 lib/block-patterns/large-header-left.php        | 2 +-
 lib/block-patterns/large-header-text-button.php | 2 +-
 lib/block-patterns/media-text-arquitecture.php  | 2 +-
 lib/block-patterns/media-text-art.php           | 2 +-
 lib/block-patterns/media-text-nature.php        | 2 +-
 lib/block-patterns/quote.php                    | 2 +-
 lib/block-patterns/three-columns-media-text.php | 6 +++---
 lib/block-patterns/three-images-gallery.php     | 6 +++---
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/block-patterns/large-header-left.php b/lib/block-patterns/large-header-left.php
index 0d6344ba7d2cb..6b2da58036007 100644
--- a/lib/block-patterns/large-header-left.php
+++ b/lib/block-patterns/large-header-left.php
@@ -8,7 +8,7 @@
 return array(
 	'title'       => _x( 'Large header with left-aligned text', 'Block pattern title', 'default' ),
 	'categories'  => array( 'header' ),
-	'content'     => '<!-- wp:cover {"url":"https://s.w.org/images/core/5.8/forest.jpg","dimRatio":60,"minHeight":800,"align":"full"} -->
+	'content'     => '<!-- wp:cover {"url":"https://s.w.org/images/core/5.8/forest.jpg","id":null,"dimRatio":60,"minHeight":800,"align":"full"} -->
 		<div class="wp-block-cover alignfull has-background-dim-60 has-background-dim" style="min-height:800px"><img class="wp-block-cover__image-background " alt="" src="https://s.w.org/images/core/5.8/forest.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:heading {"align":"wide","style":{"color":{"text":"#ffe074"},"typography":{"fontSize":"64px"}}} -->
 		<h2 class="alignwide has-text-color" style="color:#ffe074;font-size:64px">' . esc_html__( 'Forest.', 'default' ) . '</h2>
 		<!-- /wp:heading -->
diff --git a/lib/block-patterns/large-header-text-button.php b/lib/block-patterns/large-header-text-button.php
index 8db97494e9dff..6f7d4d9f5a411 100644
--- a/lib/block-patterns/large-header-text-button.php
+++ b/lib/block-patterns/large-header-text-button.php
@@ -8,7 +8,7 @@
 return array(
 	'title'       => _x( 'Large header with text and a button.', 'Block pattern title', 'default' ),
 	'categories'  => array( 'header' ),
-	'content'     => '<!-- wp:cover {"url":"https://s.w.org/images/core/5.8/art-01.jpg","hasParallax":true,"dimRatio":40,"customOverlayColor":"#000000","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
+	'content'     => '<!-- wp:cover {"url":"https://s.w.org/images/core/5.8/art-01.jpg","id":null,"hasParallax":true,"dimRatio":40,"customOverlayColor":"#000000","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
 	<div class="wp-block-cover alignfull has-background-dim-40 has-background-dim has-parallax" style="background-color:#000000;background-image:url(https://s.w.org/images/core/5.8/art-01.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:heading {"style":{"typography":{"fontSize":"48px","lineHeight":"1.2"}},"className":"alignwide has-white-color has-text-color"} -->
 	<h2 class="alignwide has-white-color has-text-color" style="font-size:48px;line-height:1.2"><strong><em>' . esc_html__( 'Overseas:', 'default' ) . '</em></strong><br><strong><em>' . esc_html__( '1500 — 1960', 'default' ) . '</em></strong></h2>
 	<!-- /wp:heading -->
diff --git a/lib/block-patterns/media-text-arquitecture.php b/lib/block-patterns/media-text-arquitecture.php
index 0b3b5dde986c8..ba7cf9521e7e5 100644
--- a/lib/block-patterns/media-text-arquitecture.php
+++ b/lib/block-patterns/media-text-arquitecture.php
@@ -8,7 +8,7 @@
 return array(
 	'title'       => _x( 'Media and text with image on the right', 'Block pattern title', 'default' ),
 	'categories'  => array( 'header' ),
-	'content'     => '<!-- wp:media-text {"align":"full","mediaType":"image","verticalAlignment":"center"} -->
+	'content'     => '<!-- wp:media-text {"align":"full","mediaId":null,"mediaType":"image","verticalAlignment":"center"} -->
 	<div class="wp-block-media-text alignfull is-stacked-on-mobile is-vertically-aligned-center"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/architecture-04.jpg" alt="' . esc_attr__( 'Close-up, abstract view of architecture.', 'default' ) . '"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"center","level":3,"style":{"color":{"text":"#000000"}}} -->
 	<h3 class="has-text-align-center has-text-color" style="color:#000000"><strong>' . esc_html__( 'Open Spaces', 'default' ) . '</strong></h3>
 	<!-- /wp:heading -->
diff --git a/lib/block-patterns/media-text-art.php b/lib/block-patterns/media-text-art.php
index a497bfd6f76de..85ed71d41a6f1 100644
--- a/lib/block-patterns/media-text-art.php
+++ b/lib/block-patterns/media-text-art.php
@@ -8,7 +8,7 @@
 return array(
 	'title'       => _x( 'Media & text with image on the right', 'Block pattern title', 'default' ),
 	'categories'  => array( 'header' ),
-	'content'     => '<!-- wp:media-text {"align":"full","mediaPosition":"right","mediaLink":"#","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","className":"is-style-default"} -->
+	'content'     => '<!-- wp:media-text {"align":"full","mediaPosition":"right","mediaId":null,"mediaLink":"#","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","className":"is-style-default"} -->
 	<div class="wp-block-media-text alignfull has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-center is-style-default" style="grid-template-columns:auto 56%"><figure class="wp-block-media-text__media"><img src="https://s.w.org/images/core/5.8/art-02.jpg" alt="' . esc_attr__( 'A green and brown rural landscape leading into a bright blue ocean and slightly cloudy sky, done in oil paints.', 'default' ) . '"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"color":{"text":"#000000"}}} -->
 	<h2 class="has-text-color" style="color:#000000"><strong>' . esc_html__( 'Shore with Blue Sea', 'default' ) . '</strong></h2>
 	<!-- /wp:heading -->
diff --git a/lib/block-patterns/media-text-nature.php b/lib/block-patterns/media-text-nature.php
index 3e5a263445969..e51f8514531b7 100644
--- a/lib/block-patterns/media-text-nature.php
+++ b/lib/block-patterns/media-text-nature.php
@@ -9,7 +9,7 @@
 	'title'       => _x( 'Media & text in a full height container', 'Block pattern title', 'default' ),
 	'categories'  => array( 'header' ),
 	'content'     => '<!-- wp:cover {"customOverlayColor":"#ffffff","minHeight":100,"minHeightUnit":"vh","contentPosition":"center center","align":"full"} -->
-	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"mediaLink":"https://s.w.org/images/core/5.8/soil.jpg","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","imageFill":true} -->
+	<div class="wp-block-cover alignfull has-background-dim" style="background-color:#ffffff;min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:media-text {"mediaId":null,"mediaLink":"https://s.w.org/images/core/5.8/soil.jpg","mediaType":"image","mediaWidth":56,"verticalAlignment":"center","imageFill":true} -->
 	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center is-image-fill" style="grid-template-columns:56% auto"><figure class="wp-block-media-text__media" style="background-image:url(https://s.w.org/images/core/5.8/soil.jpg);background-position:50% 50%"><img src="https://s.w.org/images/core/5.8/soil.jpg" alt="' . esc_attr__( 'Close-up of dried, cracked earth.', 'default' ) . '"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"},"color":{"text":"#000000"}}} -->
 	<h2 class="has-text-color" style="color:#000000;font-size:32px"><strong>' . esc_html__( "What's the problem?", 'default' ) . '</strong></h2>
 	<!-- /wp:heading -->
diff --git a/lib/block-patterns/quote.php b/lib/block-patterns/quote.php
index 61535496b777f..bbb844472f05c 100644
--- a/lib/block-patterns/quote.php
+++ b/lib/block-patterns/quote.php
@@ -14,7 +14,7 @@
 	<hr class="wp-block-separator is-style-default"/>
 	<!-- /wp:separator -->
 	
-	<!-- wp:image {"align":"center","width":150,"height":150,"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
+	<!-- wp:image {"align":"center","id":null,"width":150,"height":150,"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
 	<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="https://s.w.org/images/core/5.8/portrait.jpg" alt="' . esc_attr__( 'A side profile of a woman in a russet-colored turtleneck and white bag. She looks up with her eyes closed.', 'default' ) . '" width="150" height="150"/></figure></div>
 	<!-- /wp:image -->
 	
diff --git a/lib/block-patterns/three-columns-media-text.php b/lib/block-patterns/three-columns-media-text.php
index c9788b4e9ea05..e1636e451d98b 100644
--- a/lib/block-patterns/three-columns-media-text.php
+++ b/lib/block-patterns/three-columns-media-text.php
@@ -39,13 +39,13 @@
 	<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
 	
-	<!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
+	<!-- wp:image {"id":null,"sizeSlug":"large","linkDestination":"none"} -->
 	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/outside-01.jpg" alt="' . esc_attr__( 'The sun setting through a dense forest of trees.', 'default' ) . '" /></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"width":"33.62%"} -->
-	<div class="wp-block-column" style="flex-basis:33.62%"><!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
+	<div class="wp-block-column" style="flex-basis:33.62%"><!-- wp:image {"id":null,"sizeSlug":"large","linkDestination":"none"} -->
 	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/outside-02.jpg" alt="' . esc_attr__( 'Wind turbines standing on a grassy plain, against a blue sky.', 'default' ) . '" /></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column --></div>
@@ -53,7 +53,7 @@
 	
 	<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"67%"} -->
-	<div class="wp-block-column" style="flex-basis:67%"><!-- wp:image {"align":"right","sizeSlug":"large","linkDestination":"none"} -->
+	<div class="wp-block-column" style="flex-basis:67%"><!-- wp:image {"align":"right","id":null,"sizeSlug":"large","linkDestination":"none"} -->
 	<div class="wp-block-image"><figure class="alignright size-large"><img src="https://s.w.org/images/core/5.8/outside-03.jpg" alt="' . esc_attr__( 'The sun shining over a ridge leading down into the shore. In the distance, a car drives down a road.', 'default' ) . '" /></figure></div>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
diff --git a/lib/block-patterns/three-images-gallery.php b/lib/block-patterns/three-images-gallery.php
index fd8248e00c0a0..8b5d9be1bbc4a 100644
--- a/lib/block-patterns/three-images-gallery.php
+++ b/lib/block-patterns/three-images-gallery.php
@@ -10,7 +10,7 @@
 	'categories'  => array( 'gallery' ),
 	'content'     => '<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"25%"} -->
-	<div class="wp-block-column" style="flex-basis:25%"><!-- wp:image {"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
+	<div class="wp-block-column" style="flex-basis:25%"><!-- wp:image {"id":null,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
 	<figure class="wp-block-image size-large is-style-default"><img src="https://s.w.org/images/core/5.8/architecture-01.jpg" alt="' . esc_attr__( 'Close-up, abstract view of geometric architecture.', 'default' ) . '" /></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
@@ -24,13 +24,13 @@
 	<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
 	
-	<!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
+	<!-- wp:image {"id":null,"sizeSlug":"large","linkDestination":"none"} -->
 	<figure class="wp-block-image size-large"><img src="https://s.w.org/images/core/5.8/architecture-02.jpg" alt="' . esc_attr__( 'Close-up, angled view of a window on a white building.', 'default' ) . '" /></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column {"width":"45%"} -->
-	<div class="wp-block-column" style="flex-basis:45%"><!-- wp:image {"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
+	<div class="wp-block-column" style="flex-basis:45%"><!-- wp:image {"id":null,"sizeSlug":"large","linkDestination":"none","className":"is-style-default"} -->
 	<figure class="wp-block-image size-large is-style-default"><img src="https://s.w.org/images/core/5.8/architecture-03.jpg" alt="' . esc_attr__( 'Close-up of the corner of a white, geometric building with both sharp points and round corners.', 'default' ) . '" /></figure>
 	<!-- /wp:image -->