diff --git a/lib/theme.json b/lib/theme.json
index 0c6ebf8590ca2..abb6db078d828 100644
--- a/lib/theme.json
+++ b/lib/theme.json
@@ -2,68 +2,59 @@
 	"version": 2,
 	"settings": {
 		"appearanceTools": false,
+		"border": {
+			"color": false,
+			"radius": false,
+			"style": false,
+			"width": false
+		},
 		"color": {
 			"background": true,
-			"palette": [
-				{
-					"name": "Black",
-					"slug": "black",
-					"color": "#000000"
-				},
-				{
-					"name": "Cyan bluish gray",
-					"slug": "cyan-bluish-gray",
-					"color": "#abb8c3"
-				},
-				{
-					"name": "White",
-					"slug": "white",
-					"color": "#ffffff"
-				},
-				{
-					"name": "Pale pink",
-					"slug": "pale-pink",
-					"color": "#f78da7"
-				},
+			"custom": true,
+			"customDuotone": true,
+			"customGradient": true,
+			"defaultGradients": true,
+			"defaultPalette": true,
+			"duotone": [
 				{
-					"name": "Vivid red",
-					"slug": "vivid-red",
-					"color": "#cf2e2e"
+					"name":  "Dark grayscale" ,
+					"colors": [ "#000000", "#7f7f7f" ],
+					"slug": "dark-grayscale"
 				},
 				{
-					"name": "Luminous vivid orange",
-					"slug": "luminous-vivid-orange",
-					"color": "#ff6900"
+					"name":  "Grayscale" ,
+					"colors": [ "#000000", "#ffffff" ],
+					"slug": "grayscale"
 				},
 				{
-					"name": "Luminous vivid amber",
-					"slug": "luminous-vivid-amber",
-					"color": "#fcb900"
+					"name":  "Purple and yellow" ,
+					"colors": [ "#8c00b7", "#fcff41" ],
+					"slug": "purple-yellow"
 				},
 				{
-					"name": "Light green cyan",
-					"slug": "light-green-cyan",
-					"color": "#7bdcb5"
+					"name":  "Blue and red" ,
+					"colors": [ "#000097", "#ff4747" ],
+					"slug": "blue-red"
 				},
 				{
-					"name": "Vivid green cyan",
-					"slug": "vivid-green-cyan",
-					"color": "#00d084"
+					"name":  "Midnight" ,
+					"colors": [ "#000000", "#00a5ff" ],
+					"slug": "midnight"
 				},
 				{
-					"name": "Pale cyan blue",
-					"slug": "pale-cyan-blue",
-					"color": "#8ed1fc"
+					"name":  "Magenta and yellow" ,
+					"colors": [ "#c7005a", "#fff278" ],
+					"slug": "magenta-yellow"
 				},
 				{
-					"name": "Vivid cyan blue",
-					"slug": "vivid-cyan-blue",
-					"color": "#0693e3"
+					"name":  "Purple and green" ,
+					"colors": [ "#a60072", "#67ff66" ],
+					"slug": "purple-green"
 				},
 				{
-					"name": "Vivid purple",
-					"slug": "vivid-purple",
-					"color": "#9b51e0"
+					"name":  "Blue and orange" ,
+					"colors": [ "#1900d8", "#ffa96b" ],
+					"slug": "blue-orange"
 				}
 			],
 			"gradients": [
@@ -128,65 +119,80 @@
 					"slug": "midnight"
 				}
 			],
-			"duotone": [
+			"link": false,
+			"palette": [
 				{
-					"name":  "Dark grayscale" ,
-					"colors": [ "#000000", "#7f7f7f" ],
-					"slug": "dark-grayscale"
+					"name": "Black",
+					"slug": "black",
+					"color": "#000000"
 				},
 				{
-					"name":  "Grayscale" ,
-					"colors": [ "#000000", "#ffffff" ],
-					"slug": "grayscale"
+					"name": "Cyan bluish gray",
+					"slug": "cyan-bluish-gray",
+					"color": "#abb8c3"
 				},
 				{
-					"name":  "Purple and yellow" ,
-					"colors": [ "#8c00b7", "#fcff41" ],
-					"slug": "purple-yellow"
+					"name": "White",
+					"slug": "white",
+					"color": "#ffffff"
 				},
 				{
-					"name":  "Blue and red" ,
-					"colors": [ "#000097", "#ff4747" ],
-					"slug": "blue-red"
+					"name": "Pale pink",
+					"slug": "pale-pink",
+					"color": "#f78da7"
 				},
 				{
-					"name":  "Midnight" ,
-					"colors": [ "#000000", "#00a5ff" ],
-					"slug": "midnight"
+					"name": "Vivid red",
+					"slug": "vivid-red",
+					"color": "#cf2e2e"
 				},
 				{
-					"name":  "Magenta and yellow" ,
-					"colors": [ "#c7005a", "#fff278" ],
-					"slug": "magenta-yellow"
+					"name": "Luminous vivid orange",
+					"slug": "luminous-vivid-orange",
+					"color": "#ff6900"
 				},
 				{
-					"name":  "Purple and green" ,
-					"colors": [ "#a60072", "#67ff66" ],
-					"slug": "purple-green"
+					"name": "Luminous vivid amber",
+					"slug": "luminous-vivid-amber",
+					"color": "#fcb900"
 				},
 				{
-					"name":  "Blue and orange" ,
-					"colors": [ "#1900d8", "#ffa96b" ],
-					"slug": "blue-orange"
+					"name": "Light green cyan",
+					"slug": "light-green-cyan",
+					"color": "#7bdcb5"
+				},
+				{
+					"name": "Vivid green cyan",
+					"slug": "vivid-green-cyan",
+					"color": "#00d084"
+				},
+				{
+					"name": "Pale cyan blue",
+					"slug": "pale-cyan-blue",
+					"color": "#8ed1fc"
+				},
+				{
+					"name": "Vivid cyan blue",
+					"slug": "vivid-cyan-blue",
+					"color": "#0693e3"
+				},
+				{
+					"name": "Vivid purple",
+					"slug": "vivid-purple",
+					"color": "#9b51e0"
 				}
 			],
-			"custom": true,
-			"customDuotone": true,
-			"customGradient": true,
-			"defaultGradients": true,
-			"defaultPalette": true,
-			"link": false,
 			"text": true
 		},
+		"spacing": {
+			"blockGap": null,
+			"margin": false,
+			"padding": false,
+			"units": [ "px", "em", "rem", "vh", "vw", "%" ]
+		},
 		"typography": {
-			"dropCap": true,
 			"customFontSize": true,
-			"fontStyle": true,
-			"fontWeight": true,
-			"lineHeight": false,
-			"textTransform": true,
-			"textDecoration": true,
-			"letterSpacing": true,
+			"dropCap": true,
 			"fontSizes": [
 				{
 					"name": "Small",
@@ -213,19 +219,13 @@
 					"slug": "huge",
 					"size": "42px"
 				}
-			]
-		},
-		"spacing": {
-			"blockGap": null,
-			"margin": false,
-			"padding": false,
-			"units": [ "px", "em", "rem", "vh", "vw", "%" ]
-		},
-		"border": {
-			"color": false,
-			"radius": false,
-			"style": false,
-			"width": false
+			],
+			"fontStyle": true,
+			"fontWeight": true,
+			"letterSpacing": true,
+			"lineHeight": false,
+			"textDecoration": true,
+			"textTransform": true
 		},
 		"blocks": {
 			"core/button": {