diff --git a/styles/blocks/01-display.json b/styles/blocks/01-display.json
new file mode 100644
index 00000000..ada8c7ad
--- /dev/null
+++ b/styles/blocks/01-display.json
@@ -0,0 +1,13 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/theme.json",
+	"version": 3,
+	"title": "Display",
+	"slug": "text-display",
+	"blockTypes": ["core/heading", "core/paragraph"],
+	"styles": {
+		"typography": {
+			"fontSize": "var:preset|font-size|xx-large",
+			"lineHeight": "1.2"
+		}
+	}
+}
diff --git a/styles/blocks/02-subtitle.json b/styles/blocks/02-subtitle.json
new file mode 100644
index 00000000..a8ee9776
--- /dev/null
+++ b/styles/blocks/02-subtitle.json
@@ -0,0 +1,13 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/theme.json",
+	"version": 3,
+	"title": "Subtitle",
+	"slug": "text-subtitle",
+	"blockTypes": ["core/heading", "core/paragraph"],
+	"styles": {
+		"typography": {
+			"fontSize": "var:preset|font-size|x-large",
+			"lineHeight": "1.2"
+		}
+	}
+}
diff --git a/styles/blocks/pill.json b/styles/blocks/03-annotation.json
similarity index 67%
rename from styles/blocks/pill.json
rename to styles/blocks/03-annotation.json
index 40c2d71a..970b20a5 100644
--- a/styles/blocks/pill.json
+++ b/styles/blocks/03-annotation.json
@@ -1,27 +1,28 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/theme.json",
 	"version": 3,
-	"title": "Pill",
-	"slug": "pill",
+	"title": "Annotation",
+	"slug": "text-annotation",
 	"blockTypes": ["core/heading", "core/paragraph"],
 	"styles": {
+		"css": "display: inline-flex",
 		"typography": {
 			"fontSize": "var:preset|font-size|small",
-			"lineHeight": "1",
+			"lineHeight": "1.5",
 			"letterSpacing": "normal"
 		},
 		"border": {
 			"color": "currentColor",
 			"style": "solid",
 			"width": "1px",
-			"radius": "999px"
+			"radius": "16px"
 		},
 		"spacing": {
 			"padding": {
-				"top": "0.31rem",
-				"right": "var:preset|spacing|20",
-				"bottom": "0.31rem",
-				"left": "var:preset|spacing|20"
+				"top": "0.2rem",
+				"right": "0.6rem",
+				"bottom": "0.25rem",
+				"left": "0.6rem"
 			}
 		},
 		"elements": {