diff --git a/mayland-blocks/experimental-theme.json b/mayland-blocks/experimental-theme.json
index 3e87c5edd6..867dc3282c 100644
--- a/mayland-blocks/experimental-theme.json
+++ b/mayland-blocks/experimental-theme.json
@@ -1,6 +1,6 @@
 {
-	"global": {
-		"settings": {
+	"settings": {
+		"defaults": {
 			"color": {
 				"gradients": [ ],
 				"palette": [
@@ -107,78 +107,63 @@
 					"wide": "1022px"
 				}
 			}
-		},
-		"styles": {
-			"color": {
-				"background": "var(--wp--preset--color--background)",
-				"text": "var(--wp--preset--color--foreground)",
-				"link": "var(--wp--preset--color--foreground)"
-			},
-			"typography": {
-				"fontSize": "var(--wp--preset--font-size--normal)",
-				"lineHeight": "var(--wp--custom--line-height--body)",
-				"fontFamily": "var(--wp--preset--font-family--poppins)"
-			}
 		}
 	},
-	"core/heading/h1": {
-		"styles": {
+	"styles": {
+		"color": {
+			"background": "var(--wp--preset--color--background)",
+			"text": "var(--wp--preset--color--foreground)",
+			"link": "var(--wp--preset--color--foreground)"
+		},
+		"typography": {
+			"fontSize": "var(--wp--preset--font-size--normal)",
+			"lineHeight": "var(--wp--custom--line-height--body)",
+			"fontFamily": "var(--wp--preset--font-family--poppins)"
+		},
+
+		"core/heading/h1": {
 			"typography": {
 				"fontSize": "41.47px",
 				"lineHeight": "var(--wp--custom--line-height--headings)"
 			}
-		}
-	},
-	"core/heading/h2": {
-		"styles": {
+		},
+		"core/heading/h2": {
 			"typography": {
 				"fontSize": "var(--wp--preset--font-size--huge)",
 				"lineHeight": "var(--wp--custom--line-height--headings)"
 			}
-		}
-	},
-	"core/heading/h3": {
-		"styles": {
+		},
+		"core/heading/h3": {
 			"typography": {
 				"fontSize": "var(--wp--preset--font-size--large)",
 				"lineHeight": "var(--wp--custom--line-height--headings)"
 			}
-		}
-	},
-	"core/heading/h4": {
-		"styles": {
+		},
+		"core/heading/h4": {
 			"typography": {
 				"fontSize": "24px",
 				"lineHeight": "var(--wp--custom--line-height--headings)"
 			}
-		}
-	},
-	"core/heading/h5": {
-		"styles": {
+		},
+		"core/heading/h5": {
 			"typography": {
 				"fontSize": "var(--wp--preset--font-size--normal)",
 				"lineHeight": "var(--wp--custom--line-height--headings)"
 			}
-		}
-	},
-	"core/heading/h6": {
-		"styles": {
+		},
+		"core/heading/h6": {
 			"typography": {
 				"fontSize": "var(--wp--preset--font-size--small)",
 				"lineHeight": "var(--wp--custom--line-height--headings)"
 			}
-		}
-	},
-	"core/post-title/h1": {
-		"styles": {
+		},
+		"core/post-title/h1": {
 			"typography": {
 				"fontSize": "var(--wp--preset--font-size--huge)",
 				"lineHeight": "var(--wp--custom--line-height--headings)"
 			}
-		}
-	},
-	"core/post-date": {
-		"styles": {
+		},
+		"core/post-date": {
 			"color": {
 				"text": "var(--wp--preset--color--foreground-light)",
 				"link": "var(--wp--preset--color--foreground-light)"
@@ -186,17 +171,13 @@
 			"typography": {
 				"fontSize": "var(--wp--preset--font-size--small)"
 			}
-		}
-	},
-	"core/site-title": {
-		"styles": {
+		},
+		"core/site-title": {
 			"typography": {
 				"fontSize": "var(--wp--preset--font-size--large)"
 			}
-		}
-	},
-	"core/navigation": {
-		"styles": {
+		},
+		"core/navigation": {
 			"typography": {
 				"fontSize": "var(--wp--preset--font-size--small)"
 			}