From f66d5dd3589f6cc8f88ccffe328311f4d56f4590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Mon, 29 Nov 2021 18:48:45 +0100
Subject: [PATCH 1/2] Sort keys alphabetically so it is easier to compare

---
 src/wp-includes/theme.json | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/wp-includes/theme.json b/src/wp-includes/theme.json
index f2c71be11a40..9d4dcb014603 100644
--- a/src/wp-includes/theme.json
+++ b/src/wp-includes/theme.json
@@ -8,12 +8,12 @@
 			"width": false
 		},
 		"color": {
+			"background": true,
 			"custom": true,
 			"customDuotone": true,
  			"customGradient": true,
- 			"link": false,
-			"background": true,
-			"text": true,
+			"defaultGradients": true,
+			"defaultPalette": true,
 			"duotone": [
 				{
 					"name":  "Dark grayscale" ,
@@ -118,6 +118,7 @@
 					"slug": "midnight"
 				}
 			],
+			"link": false,
 			"palette": [
 				{
 					"name": "Black",
@@ -179,7 +180,8 @@
 					"slug": "vivid-purple",
 					"color": "#9b51e0"
 				}
-			]
+			],
+			"text": true
 		},
 		"spacing": {
 			"blockGap": null,
@@ -190,12 +192,6 @@
 		"typography": {
 			"customFontSize": true,
 			"dropCap": true,
-			"fontStyle": true,
-			"fontWeight": true,
-			"letterSpacing": true,
-			"lineHeight": false,
-			"textDecoration": true,
-			"textTransform": true,
 			"fontSizes": [
 				{
 					"name": "Small",
@@ -222,7 +218,13 @@
 					"slug": "huge",
 					"size": "42px"
 				}
-			]
+			],
+			"fontStyle": true,
+			"fontWeight": true,
+			"letterSpacing": true,
+			"lineHeight": false,
+			"textDecoration": true,
+			"textTransform": true
 		},
 		"blocks": {
 			"core/button": {

From 6f7703456b8c0cdda6951541a82fd5df96d0a32d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Mon, 29 Nov 2021 18:49:05 +0100
Subject: [PATCH 2/2] Add missing appearanceTools flag

---
 src/wp-includes/theme.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/wp-includes/theme.json b/src/wp-includes/theme.json
index 9d4dcb014603..f072d0afc790 100644
--- a/src/wp-includes/theme.json
+++ b/src/wp-includes/theme.json
@@ -1,6 +1,7 @@
 {
 	"version": 2,
 	"settings": {
+		"appearanceTools": false,
 		"border": {
 			"color": false,
 			"radius": false,