diff --git a/quadrat/experimental-theme.json b/quadrat/experimental-theme.json
index 792b78ec1b..76233a43a7 100644
--- a/quadrat/experimental-theme.json
+++ b/quadrat/experimental-theme.json
@@ -117,7 +117,10 @@
 						"lineHeight": 2
 					},
 					"border": {
-						"radius": "0"
+						"radius": "0",
+						"width": "0",
+						"style": "solid",
+						"color": "var(--wp--custom--button--color--text)"
 					},
 					"color": {
 						"text": "var(--wp--preset--color--blue)",
@@ -163,6 +166,11 @@
 						"fontSize": "var(--wp--preset--font-size--small)"
 					}
 				},
+				"code": {
+					"typography": {
+						"fontFamily": "monospace"
+					}
+				},
 				"quote": {
 					"typography": {
 						"textAlign": "left"
@@ -288,6 +296,12 @@
 						"h6": 1.4
 					}
 				}
+			},
+			"border": {
+				"customColor": true,
+				"customRadius": true,
+				"customStyle": true,
+				"customWidth": true
 			}
 		}
 	},
@@ -325,7 +339,10 @@
 				"lineHeight": "var(--wp--custom--button--typography--line-height)"
 			},
 			"border": {
-				"radius": "var(--wp--custom--button--border--radius)"
+				"radius": "var(--wp--custom--button--border--radius)",
+				"style": "var(--wp--custom--button--border--style)",
+				"width": "var(--wp--custom--button--border--width)",
+				"color": "var(--wp--custom--button--border--color)"
 			}
 		},
 		"core/heading/h1": {