diff --git a/quadrat/child-theme.json b/quadrat/child-theme.json
deleted file mode 100644
index 39350ae6a0..0000000000
--- a/quadrat/child-theme.json
+++ /dev/null
@@ -1,420 +0,0 @@
-{
-	"customTemplates": [
-		{
-			"name": "page-without-title",
-			"title": "Page without title",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		}
-	],
-	"settings": {
-		"color": {
-			"gradients": [],
-			"palette": [
-				{
-					"slug": "primary",
-					"color": "#FFD1D1",
-					"name": "Primary"
-				},
-				{
-					"slug": "tertiary",
-					"color": "#151853",
-					"name": "Tertiary"
-				},
-				{
-					"slug": "background",
-					"color": "#292C6D",
-					"name": "Background"
-				}
-
-			]
-		},
-		"custom": {
-			"button": {
-				"border": {
-					"color": "var(--wp--custom--color--foreground)",
-					"radius": "0",
-					"width": "3px"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--foreground)",
-					"text": "var(--wp--custom--color--background)"
-				},
-				"hover": {
-					"color": {
-						"text": "var(--wp--custom--color--foreground)",
-						"background": "var(--wp--custom--color--background)"
-					},
-					"border": {
-						"color": "var(--wp--custom--color--foreground)"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700"
-				}
-			},
-			"color": {
-				"foreground": "var(--wp--preset--color--primary)",
-				"background": "var(--wp--preset--color--background)",
-				"primary": "var(--wp--preset--color--primary)",
-				"secondary": "var(--wp--preset--color--primary)",
-				"tertiary": "var(--wp--preset--color--tertiary)"
-			},
-			"colorPalettes": [
-				{
-					"label": "Blue",
-					"slug": "blue",
-					"colors": {
-						"primary": "#FDF5E2",
-						"tertiary": "#123B62",
-						"background": "#204A72"
-					}
-				},
-				{
-					"label": "Dark Blue",
-					"slug": "dark-blue",
-					"colors": {
-						"primary": "#F9DAAD",
-						"tertiary": "#071F2C",
-						"background": "#0E2B3B"
-					}
-				},
-				{
-					"label": "Green",
-					"slug": "green",
-					"colors": {
-						"primary": "#F5D5CA",
-						"tertiary": "#0A2C25",
-						"background": "#103931"
-					}
-				},
-				{
-					"label": "Red",
-					"slug": "red",
-					"colors": {
-						"primary": "#CEEDFF",
-						"tertiary": "#721A18",
-						"background": "#822726"
-					}
-				},
-				{
-					"label": "Light Green",
-					"slug": "light-green",
-					"colors": {
-						"primary": "#0C1946",
-						"tertiary": "#DBE9DD",
-						"background": "#EBF3EC"
-					}
-				},
-				{
-					"label": "White",
-					"slug": "white",
-					"colors": {
-						"primary": "#2B2B2B",
-						"tertiary": "#F8F8F8",
-						"background": "#FFFFFF"
-					}
-				},
-				{
-					"label": "Light Pink",
-					"slug": "light-pink",
-					"colors": {
-						"primary": "#151853",
-						"tertiary": "#FCD0D0",
-						"background": "#FFE2E2"
-					}
-				},
-				{
-					"label": "Light Yellow",
-					"slug": "light-yellow",
-					"colors": {
-						"primary": "#0E2B3B",
-						"tertiary": "#FBEAD2",
-						"background": "#FFF4E3"
-					}
-				},
-				{
-					"label": "Light Blue",
-					"slug": "light-blue",
-					"colors": {
-						"primary": "#460707",
-						"tertiary": "#DEE9F1",
-						"background": "#EDF4F9"
-					}
-				}
-			],
-			"form": {
-				"border": {
-					"color": "var(--wp--custom--color--foreground)",
-					"style": "solid",
-					"width": "2px"
-				},
-				"padding": "20px"
-			},
-			"fontSizes": {
-				"tiny": "16px"
-			},
-			"body": {
-				"typography": {
-					"lineHeight": 1.7
-				}
-			},
-			"heading": {
-				"typography": {
-					"fontWeight": "500"
-				}
-			},
-			"layout": {
-				"contentSize":"664px"
-			},
-			"line-height": {
-				"body": 1.7
-			},
-			"gap": {
-				"baseline": "10px",
-				"horizontal": "min(34px, 5vw)",
-				"vertical": "min(34px, 5vw)"
-			},
-			"paragraph": {
-				"dropcap": {
-					"margin": "0 .2em .2em 0",
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--huge)",
-						"fontWeight": "400"
-					}
-				}
-			},
-			"pullquote": {
-				"citation": {
-					"typography": {
-						"fontStyle": "normal",
-						"fontWeight": 400
-					}
-				}
-			},
-			"quote": {
-				"citation": {
-					"typography": {
-						"fontStyle": "normal",
-						"fontWeight": "400"
-					}
-				}
-			}
-		},
-		"layout": {
-			"contentSize": "664px",
-			"wideSize": "1128px"
-		},
-		"typography": {
-			"customFontSize": true,
-			"customLineHeight": true,
-			"fontFamilies": [
-				{
-					"fontFamily": "\"DM Sans\", sans-serif",
-					"slug": "dm-sans",
-					"name": "DM Sans",
-					"google": "family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700"
-				}
-			],
-			"fontSizes": [
-				{
-					"name": "Small",
-					"size": "18px",
-					"slug": "small"
-				},
-				{
-					"name": "Normal",
-					"size": "20px",
-					"slug": "normal"
-				},
-				{
-					"name": "Medium",
-					"size": "22px",
-					"slug": "medium"
-				},
-				{
-					"name": "Large",
-					"size": "min(max(28px, 5vw), 38px)",
-					"slug": "large"
-				},
-				{
-					"name": "Huge",
-					"size": "min(max(36px, 5vw), 48px)",
-					"slug": "huge"
-				}
-			]
-		}
-	},
-	"styles": {
-		"blocks": {
-			"core/button": {
-				"color": {
-					"background": "var(--wp--custom--button--color--background)",
-					"text": "var(--wp--custom--button--color--text)"
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)"
-				}
-			},
-			"core/code": {
-				"border": {
-					"width": "0px"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--tertiary)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "400",
-					"lineHeight": "1.6"
-				}
-			},
-			"core/navigation": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
-			},
-			"core/navigation-link": {
-				"color": {
-					"background": "transparent",
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			},
-			"core/post-title": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "min(max(48px, 7vw), 80px)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": 1.2
-				}
-			},
-			"list": {
-				"padding": {
-					"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
-				}
-			},
-			"core/quote": {
-				"border": {
-					"width": "0px"
-				},
-				"spacing": {
-					"padding": {
-						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )"
-					}
-				},
-				"typography": {
-					"fontSize": "25px",
-					"fontWeight": "normal",
-					"lineHeight": "40px"
-				}
-			},
-			"core/pullquote": {
-				"typography": {
-					"fontStyle": "normal",
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"fontWeight": "400",
-					"lineHeight": "1.4"
-				},
-				"spacing": {
-					"padding": {
-						"left": "0px",
-						"right": "0px"
-					}
-				},
-				"border": {
-					"width": "1px 0 0 0"
-				}
-			},
-			"core/post-template": {
-				"elements": {
-					"h2": {
-						"typography": {
-							"fontSize": "min(max(28px, 5vw), 38px)"
-						}
-					}
-				}
-			},
-			"core/query-pagination": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "500"
-				}
-			},
-			"core/site-title": {
-				"color": {
-					"link": "var(--wp--custom--color--primary)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": 700,
-					"textTransform": "uppercase"
-				}
-			}
-		},
-		"elements": {
-			"h1": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "min(max(48px, 7vw), 80px)",
-					"lineHeight": 1.2
-				}
-			},
-			"h2": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"lineHeight": 1.2
-				}
-			},
-			"h3": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--preset--font-size--large)",
-					"lineHeight": 1.2
-				}
-			},
-			"h4": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--preset--font-size--medium)",
-					"lineHeight": 1.4
-				}
-			},
-			"h5": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": 1.4
-				}
-			},
-			"h6": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--preset--font-size--small)",
-					"lineHeight": 1.4
-				}
-			},
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			}
-		},
-		"typography": {
-			"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-			"fontWeight": "400"
-		},
-		"core/site-logo": {
-			"spacing": {
-				"padding": {
-					"left": "35px"
-				}
-			}
-		}
-	}
-}
diff --git a/quadrat/theme.json b/quadrat/theme.json
index b44f1d8be1..f1cd782c82 100644
--- a/quadrat/theme.json
+++ b/quadrat/theme.json
@@ -1,33 +1,6 @@
 {
-	"$schema": "https://json.schemastore.org/theme-v1.json",
 	"version": 1,
-	"templateParts": [
-		{
-			"name": "header",
-			"area": "header"
-		},
-		{
-			"name": "footer",
-			"area": "footer"
-		}
-	],
 	"customTemplates": [
-		{
-			"name": "blank",
-			"title": "Blank",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		},
-		{
-			"name": "header-footer-only",
-			"title": "Header and Footer Only",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		},
 		{
 			"name": "page-without-title",
 			"title": "Page without title",
@@ -38,12 +11,6 @@
 		}
 	],
 	"settings": {
-		"border": {
-			"customColor": true,
-			"customRadius": true,
-			"customStyle": true,
-			"customWidth": true
-		},
 		"color": {
 			"gradients": [],
 			"palette": [
@@ -62,17 +29,14 @@
 					"color": "#292C6D",
 					"name": "Background"
 				}
+
 			]
 		},
 		"custom": {
-			"alignment": {
-				"alignedMaxWidth": "50%"
-			},
 			"button": {
 				"border": {
 					"color": "var(--wp--custom--color--foreground)",
 					"radius": "0",
-					"style": "solid",
 					"width": "3px"
 				},
 				"color": {
@@ -88,18 +52,9 @@
 						"color": "var(--wp--custom--color--foreground)"
 					}
 				},
-				"spacing": {
-					"padding": {
-						"top": "0.667em",
-						"bottom": "0.667em",
-						"left": "1.333em",
-						"right": "1.333em"
-					}
-				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700",
-					"lineHeight": 2
+					"fontWeight": "700"
 				}
 			},
 			"color": {
@@ -192,68 +147,16 @@
 					}
 				}
 			],
-			"fontSizes": {
-				"tiny": "16px"
-			},
 			"form": {
-				"padding": "20px",
 				"border": {
 					"color": "var(--wp--custom--color--foreground)",
-					"radius": "0",
 					"style": "solid",
 					"width": "2px"
 				},
-				"checkbox": {
-					"checked": {
-						"content": "\"\\2715\"",
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"position": {
-							"left": "3px",
-							"top": "3px"
-						},
-						"sizing": {
-							"height": "12px",
-							"width": "12px"
-						}
-					},
-					"unchecked": {
-						"content": "\"\"",
-						"position": {
-							"left": "0",
-							"top": "0.2em"
-						},
-						"sizing": {
-							"height": "16px",
-							"width": "16px"
-						}
-					}
-				},
-				"color": {
-					"background": "transparent",
-					"boxShadow": "none",
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"label": {
-					"spacing": {
-						"margin": {
-							"bottom": "var(--wp--custom--gap--baseline)"
-						}
-					},
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontWeight": "normal",
-						"letterSpacing": "normal",
-						"textTransform": "none"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
+				"padding": "20px"
 			},
-			"gallery": {
-				"caption": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
+			"fontSizes": {
+				"tiny": "16px"
 			},
 			"body": {
 				"typography": {
@@ -262,26 +165,14 @@
 			},
 			"heading": {
 				"typography": {
-					"fontWeight": "500",
-					"lineHeight": 1.125
-				}
-			},
-			"latest-posts": {
-				"meta": {
-					"color": {
-						"text": "var(--wp--custom--color--primary)"
-					}
+					"fontWeight": "500"
 				}
 			},
 			"layout": {
-				"contentSize": "664px"
+				"contentSize":"664px"
 			},
-			"list": {
-				"spacing": {
-					"padding": {
-						"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
-					}
-				}
+			"line-height": {
+				"body": 1.7
 			},
 			"gap": {
 				"baseline": "10px",
@@ -297,85 +188,27 @@
 					}
 				}
 			},
-			"post-author": {
-				"typography": {
-					"fontWeight": "normal"
-				}
-			},
-			"post-comment": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
-				}
-			},
 			"pullquote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontFamily": "inherit",
 						"fontStyle": "normal",
 						"fontWeight": 400
-					},
-					"spacing": {
-						"margin": {
-							"top": "var(--wp--custom--gap--vertical)"
-						}
 					}
-				},
-				"typography": {
-					"textAlign": "left"
 				}
 			},
 			"quote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontStyle": "normal",
 						"fontWeight": "400"
 					}
-				},
-				"typography": {
-					"textAlign": "left"
-				}
-			},
-			"separator": {
-				"opacity": 1,
-				"margin": "var(--wp--custom--gap--vertical) auto",
-				"width": "150px"
-			},
-			"table": {
-				"figcaption": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)"
-					}
-				}
-			},
-			"video": {
-				"caption": {
-					"textAlign": "center",
-					"margin": "var(--wp--custom--gap--vertical) auto"
 				}
-			},
-			"line-height": {
-				"body": 1.7
 			}
 		},
 		"layout": {
 			"contentSize": "664px",
 			"wideSize": "1128px"
 		},
-		"spacing": {
-			"blockGap": true,
-			"customPadding": true,
-			"units": [
-				"%",
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
-		},
 		"typography": {
 			"customFontSize": true,
 			"customLineHeight": true,
@@ -419,9 +252,6 @@
 	"styles": {
 		"blocks": {
 			"core/button": {
-				"border": {
-					"radius": "var(--wp--custom--button--border--radius)"
-				},
 				"color": {
 					"background": "var(--wp--custom--button--color--background)",
 					"text": "var(--wp--custom--button--color--text)"
@@ -429,40 +259,20 @@
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--button--typography--line-height)"
+					"fontWeight": "var(--wp--custom--button--typography--font-weight)"
 				}
 			},
 			"core/code": {
 				"border": {
-					"color": "#CCCCCC",
-					"radius": "0px",
-					"style": "solid",
 					"width": "0px"
 				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)",
-						"right": "var(--wp--custom--gap--horizontal)",
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+				"color": {
+					"background": "var(--wp--custom--color--tertiary)"
 				},
 				"typography": {
-					"fontFamily": "monospace",
 					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "400",
 					"lineHeight": "1.6"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--tertiary)"
-				}
-			},
-			"core/gallery": {
-				"spacing": {
-					"margin": {
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"core/navigation": {
@@ -470,80 +280,29 @@
 					"fontSize": "var(--wp--preset--font-size--normal)"
 				}
 			},
-			"core/post-title": {
-				"spacing": {
-					"margin": {
-						"bottom": "0"
-					}
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "min(max(48px, 7vw), 80px)",
-					"lineHeight": 1.2,
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)"
-				}
-			},
-			"core/post-date": {
+			"core/navigation-link": {
 				"color": {
-					"link": "var(--wp--custom--color--foreground)",
+					"background": "transparent",
 					"text": "var(--wp--custom--color--foreground)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
-			"core/pullquote": {
-				"border": {
-					"style": "solid",
-					"width": "1px 0 0 0"
-				},
+			"core/post-title": {
 				"typography": {
-					"fontStyle": "normal",
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"fontWeight": "400",
-					"lineHeight": "1.4"
-				},
-				"spacing": {
-					"padding": {
-						"left": "0px",
-						"right": "0px",
-						"top": "var(--wp--custom--gap--horizontal)",
-						"bottom": "var(--wp--custom--gap--horizontal)"
-					}
-				}
-			},
-			"core/separator": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"border": {
-					"color": "currentColor",
-					"style": "solid",
-					"width": "0 0 1px 0"
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
+					"fontSize": "min(max(48px, 7vw), 80px)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": 1.2
 				}
 			},
-			"core/site-title": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": 700,
-					"textTransform": "uppercase"
-				},
-				"color": {
-					"link": "var(--wp--custom--color--primary)"
+			"list": {
+				"padding": {
+					"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
 				}
 			},
 			"core/quote": {
 				"border": {
-					"color": "var(--wp--custom--color--primary)",
-					"style": "solid",
 					"width": "0px"
 				},
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontWeight": "400"
-					}
-				},
 				"spacing": {
 					"padding": {
 						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )"
@@ -551,20 +310,25 @@
 				},
 				"typography": {
 					"fontSize": "25px",
-					"fontStyle": "normal",
 					"fontWeight": "normal",
 					"lineHeight": "40px"
 				}
 			},
-			"core/navigation-link": {
-				"color": {
-					"background": "transparent",
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			},
-			"list": {
-				"padding": {
-					"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
+			"core/pullquote": {
+				"typography": {
+					"fontStyle": "normal",
+					"fontSize": "var(--wp--preset--font-size--huge)",
+					"fontWeight": "400",
+					"lineHeight": "1.4"
+				},
+				"spacing": {
+					"padding": {
+						"left": "0px",
+						"right": "0px"
+					}
+				},
+				"border": {
+					"width": "1px 0 0 0"
 				}
 			},
 			"core/post-template": {
@@ -581,95 +345,59 @@
 					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "500"
 				}
+			},
+			"core/site-title": {
+				"color": {
+					"link": "var(--wp--custom--color--primary)"
+				},
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--normal)",
+					"fontWeight": 700,
+					"textTransform": "uppercase"
+				}
 			}
 		},
-		"color": {
-			"background": "var(--wp--custom--color--background)",
-			"text": "var(--wp--custom--color--foreground)"
-		},
 		"elements": {
 			"h1": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": 1.2,
-					"fontSize": "min(max(48px, 7vw), 80px)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "min(max(48px, 7vw), 80px)",
+					"lineHeight": 1.2
 				}
 			},
 			"h2": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": 1.2,
-					"fontSize": "var(--wp--preset--font-size--huge)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--huge)",
+					"lineHeight": 1.2
 				}
 			},
 			"h3": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": 1.2,
-					"fontSize": "var(--wp--preset--font-size--large)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"lineHeight": 1.2
 				}
 			},
 			"h4": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": 1.4,
-					"fontSize": "var(--wp--preset--font-size--medium)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--medium)",
+					"lineHeight": 1.4
 				}
 			},
 			"h5": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": 1.4,
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--normal)",
+					"lineHeight": 1.4
 				}
 			},
 			"h6": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": 1.4,
-					"fontSize": "var(--wp--preset--font-size--small)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"lineHeight": 1.4
 				}
 			},
 			"link": {
@@ -678,13 +406,8 @@
 				}
 			}
 		},
-		"spacing": {
-			"blockGap": "calc(2 * var(--wp--custom--gap--baseline))"
-		},
 		"typography": {
-			"lineHeight": "var(--wp--custom--body--typography--line-height)",
 			"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-			"fontSize": "var(--wp--preset--font-size--normal)",
 			"fontWeight": "400"
 		},
 		"core/site-logo": {
@@ -695,4 +418,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}