From 021a32ad8636637932e523192fbec83a69b9c114 Mon Sep 17 00:00:00 2001
From: Justin Tadlock <justintadlock@gmail.com>
Date: Mon, 24 Jun 2024 22:27:32 -0500
Subject: [PATCH] Update section styles with latest Gutenberg/WordPress
 changes.

This moves section styles within global style variations to the `styles.variations` property. It also removes the `blockTypes` definitions for each style variation.

See: https://github.com/WordPress/gutenberg/pull/62712
---
 styles/global/a-little-bit-bookish.json |  53 +++---
 styles/global/boundaries.json           | 139 +++++++-------
 styles/global/chestnut-rose.json        |  54 +++---
 styles/global/extant.json               | 205 ++++++++++-----------
 styles/global/memories.json             | 231 +++++++++++-------------
 styles/global/saga.json                 | 176 +++++++++---------
 styles/global/th5.json                  | 155 ++++++++--------
 styles/global/thunderbird.json          | 117 ++++++------
 styles/global/unravel.json              |  94 +++++-----
 9 files changed, 572 insertions(+), 652 deletions(-)

diff --git a/styles/global/a-little-bit-bookish.json b/styles/global/a-little-bit-bookish.json
index 90a65f2d..ac484a05 100644
--- a/styles/global/a-little-bit-bookish.json
+++ b/styles/global/a-little-bit-bookish.json
@@ -317,39 +317,36 @@
 					"fontSize": "var:preset|font-size|md",
 					"lineHeight": "var:custom|line-height|md"
 				}
+			}
+		},
+		"variations": {
+			"card": {
+				"border": {
+					"color": "var:custom|global|border-color",
+					"style": "var:custom|global|border-style",
+					"width": "var:custom|global|border-width"
+				},
+				"color": {
+					"background": "var:preset|color|neutral-50"
+				}
 			},
-			"variations": {
-				"card": {
-					"blockTypes": [ "core/group" ],
-					"border": {
+			"card-footer": {
+				"border": {
+					"top": {
 						"color": "var:custom|global|border-color",
 						"style": "var:custom|global|border-style",
-						"width": "var:custom|global|border-width"
-					},
-					"color": {
-						"background": "var:preset|color|neutral-50"
+						"width": "1px"
 					}
 				},
-				"card-footer": {
-					"blockTypes": [ "core/group" ],
-					"border": {
-						"top": {
-							"color": "var:custom|global|border-color",
-							"style": "var:custom|global|border-style",
-							"width": "1px"
-						}
-					},
-					"color": {
-						"background": "transparent"
-					}
-				},
-				"site-footer": {
-					"blockTypes": [ "core/group" ],
-					"border": {
-						"top": {
-							"color": "var:custom|global|border-color",
-							"width": "var:custom|global|border-width"
-						}
+				"color": {
+					"background": "transparent"
+				}
+			},
+			"site-footer": {
+				"border": {
+					"top": {
+						"color": "var:custom|global|border-color",
+						"width": "var:custom|global|border-width"
 					}
 				}
 			}
diff --git a/styles/global/boundaries.json b/styles/global/boundaries.json
index 6db805ca..3c638e18 100644
--- a/styles/global/boundaries.json
+++ b/styles/global/boundaries.json
@@ -443,92 +443,81 @@
 						"width": "var:custom|global|border-width"
 					}
 				}
-			},
-			"variations": {
-				"archive-header": {
-					"blockTypes": [ "core/group" ],
-					"border": {
-						"color": "var:custom|global|border-color",
-						"style": "var:custom|global|border-style",
-						"width": "0 0 var(--wp--custom--global--border-width)"
-					},
-					"spacing": {
-						"padding": {
-							"top": "var:preset|spacing|plus-6",
-							"bottom": "var:preset|spacing|plus-6"
-						}
+			}
+		},
+		"variations": {
+			"archive-header": {
+				"border": {
+					"color": "var:custom|global|border-color",
+					"style": "var:custom|global|border-style",
+					"width": "0 0 var(--wp--custom--global--border-width)"
+				},
+				"spacing": {
+					"padding": {
+						"top": "var:preset|spacing|plus-6",
+						"bottom": "var:preset|spacing|plus-6"
 					}
+				}
+			},
+			"card": {
+				"border": {
+					"color": "var:custom|global|border-color",
+					"style": "var:custom|global|border-style",
+					"width": "var:custom|global|border-width"
 				},
-				"card": {
-					"blockTypes": [ "core/group" ],
-					"border": {
+				"color": {
+					"background": "var:preset|color|base"
+				}
+			},
+			"card-footer": {
+				"border": {
+					"top": {
 						"color": "var:custom|global|border-color",
 						"style": "var:custom|global|border-style",
 						"width": "var:custom|global|border-width"
-					},
-					"color": {
-						"background": "var:preset|color|base"
-					}
-				},
-				"card-footer": {
-					"blockTypes": [ "core/group" ],
-					"border": {
-						"top": {
-							"color": "var:custom|global|border-color",
-							"style": "var:custom|global|border-style",
-							"width": "var:custom|global|border-width"
-						}
-					},
-					"color": {
-						"background": "transparent"
 					}
 				},
-				"comment-meta": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"text": "var:preset|color|neutral-500"
-					}
-				},
-				"post-byline": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"text": "var:preset|color|neutral-500"
-					}
+				"color": {
+					"background": "transparent"
+				}
+			},
+			"comment-meta": {
+				"color": {
+					"text": "var:preset|color|neutral-500"
+				}
+			},
+			"post-byline": {
+				"color": {
+					"text": "var:preset|color|neutral-500"
+				}
+			},
+			"post-meta": {
+				"color": {
+					"text": "var:preset|color|neutral-500"
+				}
+			},
+			"site-footer": {
+				"color": {
+					"background": "transparent"
 				},
-				"post-meta": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"text": "var:preset|color|neutral-500"
+				"border": {
+					"top": {
+						"color": "var:custom|global|border-color",
+						"style": "var:custom|global|border-style",
+						"width": "var:custom|global|border-width"
 					}
-				},
-				"site-footer": {
-					"blockTypes": [
-						"core/columns",
-						"core/group"
-					],
-					"color": {
-						"background": "transparent"
-					},
-					"border": {
-						"top": {
-							"color": "var:custom|global|border-color",
-							"style": "var:custom|global|border-style",
-							"width": "var:custom|global|border-width"
-						}
+				}
+			},
+			"site-header": {
+				"border": {
+					"bottom": {
+						"color": "var:custom|global|border-color",
+						"style": "var:custom|global|border-style",
+						"width": "var:custom|global|border-width"
 					}
 				},
-				"site-header": {
-					"blockTypes": [ "core/group" ],
-					"border": {
-						"bottom": {
-							"color": "var:custom|global|border-color",
-							"style": "var:custom|global|border-style",
-							"width": "var:custom|global|border-width"
-						}
-					},
-					"color": {
-						"background": "transparent"
-					}
+				"color": {
+					"background": "transparent"
 				}
 			}
 		}
diff --git a/styles/global/chestnut-rose.json b/styles/global/chestnut-rose.json
index 97c755bb..49d16fdf 100644
--- a/styles/global/chestnut-rose.json
+++ b/styles/global/chestnut-rose.json
@@ -429,36 +429,32 @@
 					"fontSize": "var:preset|font-size|xs",
 					"lineHeight": "var:custom|line-height|xs"
 				}
+			}
+		},
+		"variations": {
+			"comment-meta": {
+				"typography": {
+					"fontSize": "var:preset|font-size|xs",
+					"lineHeight": "var:custom|line-height|xs"
+				}
 			},
-			"variations": {
-				"comment-meta": {
-					"blockTypes": [ "core/group" ],
-					"typography": {
-						"fontSize": "var:preset|font-size|xs",
-						"lineHeight": "var:custom|line-height|xs"
-					}
-				},
-				"post-byline": {
-					"blockTypes": [ "core/group" ],
-					"typography": {
-						"fontSize": "var:preset|font-size|xs",
-						"lineHeight": "var:custom|line-height|xs"
-					}
-				},
-				"post-meta": {
-					"blockTypes": [ "core/group" ],
-					"typography": {
-						"fontSize": "var:preset|font-size|xs",
-						"lineHeight": "var:custom|line-height|xs"
-					}
-				},
-				"section-1": {
-					"blockTypes": [ "core/group" ],
-					"elements": {
-						"heading": {
-							"color": {
-								"text": "currentColor"
-							}
+			"post-byline": {
+				"typography": {
+					"fontSize": "var:preset|font-size|xs",
+					"lineHeight": "var:custom|line-height|xs"
+				}
+			},
+			"post-meta": {
+				"typography": {
+					"fontSize": "var:preset|font-size|xs",
+					"lineHeight": "var:custom|line-height|xs"
+				}
+			},
+			"section-1": {
+				"elements": {
+					"heading": {
+						"color": {
+							"text": "currentColor"
 						}
 					}
 				}
diff --git a/styles/global/extant.json b/styles/global/extant.json
index 6906be41..b7c88912 100644
--- a/styles/global/extant.json
+++ b/styles/global/extant.json
@@ -438,143 +438,134 @@
 					"fontSize": "var:preset|font-size|xs",
 					"lineHeight": "var:custom|line-height|xs"
 				}
+			}
+		},
+		"variations": {
+			"card": {
+				"border": {
+					"color": "var:custom|global|border-color",
+					"style": "var:custom|global|border-style",
+					"width": "var:custom|global|border-width"
+				},
+				"color": {
+					"background": "var:preset|color|base"
+				},
+				"shadow": "var:preset|shadow|md"
 			},
-			"variations": {
-				"card": {
-					"blockTypes": [ "core/group" ],
-					"border": {
+			"card-footer": {
+				"border": {
+					"top": {
 						"color": "var:custom|global|border-color",
 						"style": "var:custom|global|border-style",
 						"width": "var:custom|global|border-width"
-					},
-					"color": {
-						"background": "var:preset|color|base"
-					},
-					"shadow": "var:preset|shadow|md"
-				},
-				"card-footer": {
-					"blockTypes": [ "core/group" ],
-					"border": {
-						"top": {
-							"color": "var:custom|global|border-color",
-							"style": "var:custom|global|border-style",
-							"width": "var:custom|global|border-width"
-						}
-					},
-					"color": {
-						"background": "transparent"
 					}
 				},
-				"comment-meta": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"text": "var:preset|color|neutral-500"
-					},
-					"elements": {
-						"link": {
+				"color": {
+					"background": "transparent"
+				}
+			},
+			"comment-meta": {
+				"color": {
+					"text": "var:preset|color|neutral-500"
+				},
+				"elements": {
+					"link": {
+						"color": {
+							"text": "var:preset|color|neutral-900"
+						},
+						"typography": {
+							"textDecoration": "none"
+						},
+						":focus": {
 							"color": {
-								"text": "var:preset|color|neutral-900"
+								"text": "var:preset|color|primary-700"
 							},
 							"typography": {
-								"textDecoration": "none"
-							},
-							":focus": {
-								"color": {
-									"text": "var:preset|color|primary-700"
-								},
-								"typography": {
-									"textDecoration": "underline"
-								}
+								"textDecoration": "underline"
+							}
+						},
+						":hover": {
+							"color": {
+								"text": "var:preset|color|primary-700"
 							},
-							":hover": {
-								"color": {
-									"text": "var:preset|color|primary-700"
-								},
-								"typography": {
-									"textDecoration": "underline"
-								}
+							"typography": {
+								"textDecoration": "underline"
 							}
 						}
 					}
+				}
+			},
+			"post-byline": {
+				"color": {
+					"text": "var:preset|color|neutral-500"
 				},
-				"post-byline": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"text": "var:preset|color|neutral-500"
-					},
-					"elements": {
-						"link": {
+				"elements": {
+					"link": {
+						"color": {
+							"text": "var:preset|color|neutral-900"
+						},
+						"typography": {
+							"textDecoration": "none"
+						},
+						":focus": {
 							"color": {
-								"text": "var:preset|color|neutral-900"
+								"text": "var:preset|color|primary-700"
 							},
 							"typography": {
-								"textDecoration": "none"
-							},
-							":focus": {
-								"color": {
-									"text": "var:preset|color|primary-700"
-								},
-								"typography": {
-									"textDecoration": "underline"
-								}
+								"textDecoration": "underline"
+							}
+						},
+						":hover": {
+							"color": {
+								"text": "var:preset|color|primary-700"
 							},
-							":hover": {
-								"color": {
-									"text": "var:preset|color|primary-700"
-								},
-								"typography": {
-									"textDecoration": "underline"
-								}
+							"typography": {
+								"textDecoration": "underline"
 							}
 						}
 					}
+				}
+			},
+			"post-meta": {
+				"color": {
+					"text": "var:preset|color|neutral-500"
 				},
-				"post-meta": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"text": "var:preset|color|neutral-500"
-					},
-					"elements": {
-						"link": {
+				"elements": {
+					"link": {
+						"color": {
+							"text": "var:preset|color|neutral-900"
+						},
+						"typography": {
+							"textDecoration": "none"
+						},
+						":focus": {
 							"color": {
-								"text": "var:preset|color|neutral-900"
+								"text": "var:preset|color|primary-700"
 							},
 							"typography": {
-								"textDecoration": "none"
-							},
-							":focus": {
-								"color": {
-									"text": "var:preset|color|primary-700"
-								},
-								"typography": {
-									"textDecoration": "underline"
-								}
+								"textDecoration": "underline"
+							}
+						},
+						":hover": {
+							"color": {
+								"text": "var:preset|color|primary-700"
 							},
-							":hover": {
-								"color": {
-									"text": "var:preset|color|primary-700"
-								},
-								"typography": {
-									"textDecoration": "underline"
-								}
+							"typography": {
+								"textDecoration": "underline"
 							}
 						}
 					}
-				},
-				"site-footer": {
-					"blockTypes": [
-						"core/columns",
-						"core/group"
-					],
-					"border": {
-						"top": {
-							"color": "var:preset|color|neutral-100",
-							"width": "1px"
-						}
-					},
-					"color": {
-						"background": "var:preset|color|neutral-50"
+				}
+			},
+			"site-footer": {
+				"border": {
+					"top": {
+						"color": "var:preset|color|neutral-100",
+						"width": "1px"
 					}
+				},
+				"color": {
+					"background": "var:preset|color|neutral-50"
 				}
 			}
 		}
diff --git a/styles/global/memories.json b/styles/global/memories.json
index 31bb596e..bac75021 100644
--- a/styles/global/memories.json
+++ b/styles/global/memories.json
@@ -462,149 +462,134 @@
 						}
 					}
 				}
-			},
-			"variations": {
-				"archive-header": {
-					"blockTypes": [ "core/group" ],
-					"border": {
-						"top": {
-							"color": "var:preset|color|neutral-300",
-							"style": "solid",
-							"width": "1px"
-						},
-						"bottom": {
-							"color": "var:preset|color|neutral-300",
-							"style": "solid",
-							"width": "1px"
-						}
-					},
-					"color": {
-						"background": "var:preset|color|neutral-100"
-					},
-					"spacing": {
-						"padding": {
-							"top": "var:preset|spacing|plus-6",
-							"bottom": "var:preset|spacing|plus-6",
-							"left": "var:preset|spacing|plus-3",
-							"right": "var:preset|spacing|plus-3"
-						}
-					}
-				},
-				"card": {
-					"blockTypes": [ "core/group" ],
-					"border": {
+			}
+		},
+		"variations": {
+			"archive-header": {
+				"border": {
+					"top": {
 						"color": "var:preset|color|neutral-300",
 						"style": "solid",
 						"width": "1px"
 					},
-					"color": {
-						"background": "var:preset|color|neutral-100"
+					"bottom": {
+						"color": "var:preset|color|neutral-300",
+						"style": "solid",
+						"width": "1px"
 					}
 				},
-				"card-footer": {
-					"blockTypes": [ "core/group" ],
-					"border": {
-						"top": {
-							"color": "var:custom|global|border-color",
-							"style": "var:custom|global|border-style",
-							"width": "var:custom|global|border-width"
-						}
-					},
-					"color": {
-						"background": "transparent"
-					}
+				"color": {
+					"background": "var:preset|color|neutral-100"
 				},
-				"comment-meta": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"text": "var:preset|color|neutral-500"
-					},
-					"typography": {
-						"fontWeight": "500"
+				"spacing": {
+					"padding": {
+						"top": "var:preset|spacing|plus-6",
+						"bottom": "var:preset|spacing|plus-6",
+						"left": "var:preset|spacing|plus-3",
+						"right": "var:preset|spacing|plus-3"
 					}
+				}
+			},
+			"card": {
+				"border": {
+					"color": "var:preset|color|neutral-300",
+					"style": "solid",
+					"width": "1px"
 				},
-				"post-byline": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"text": "var:preset|color|neutral-500"
-					},
-					"typography": {
-						"fontWeight": "500"
+				"color": {
+					"background": "var:preset|color|neutral-100"
+				}
+			},
+			"card-footer": {
+				"border": {
+					"top": {
+						"color": "var:custom|global|border-color",
+						"style": "var:custom|global|border-style",
+						"width": "var:custom|global|border-width"
 					}
 				},
-				"post-meta": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"text": "var:preset|color|neutral-500"
-					},
-					"typography": {
-						"fontWeight": "500"
-					}
+				"color": {
+					"background": "transparent"
+				}
+			},
+			"comment-meta": {
+				"color": {
+					"text": "var:preset|color|neutral-500"
 				},
-				"section-1": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"background": "var:preset|color|primary-700"
-					}
+				"typography": {
+					"fontWeight": "500"
+				}
+			},
+			"post-byline": {
+				"color": {
+					"text": "var:preset|color|neutral-500"
 				},
-				"section-3": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"background": "transparent"
+				"typography": {
+					"fontWeight": "500"
+				}
+			},
+			"post-meta": {
+				"color": {
+					"text": "var:preset|color|neutral-500"
+				},
+				"typography": {
+					"fontWeight": "500"
+				}
+			},
+			"section-1": {
+				"color": {
+					"background": "var:preset|color|primary-700"
+				}
+			},
+			"section-3": {
+				"color": {
+					"background": "transparent"
+				},
+				"border": {
+					"top": {
+						"color": "var:preset|color|neutral-300",
+						"style": "solid",
+						"width": "1px"
 					},
-					"border": {
-						"top": {
-							"color": "var:preset|color|neutral-300",
-							"style": "solid",
-							"width": "1px"
-						},
-						"bottom": {
-							"color": "var:preset|color|neutral-300",
-							"style": "solid",
-							"width": "1px"
-						}
+					"bottom": {
+						"color": "var:preset|color|neutral-300",
+						"style": "solid",
+						"width": "1px"
 					}
-				},
-				"site-footer": {
-					"blockTypes": [
-						"core/columns",
-						"core/group"
-					],
-					"border": {
-						"top": {
-							"color": "var:preset|color|neutral-300",
-							"style": "solid",
-							"width": "1px"
-						},
-						"bottom": {
-							"color": "var:preset|color|primary-500",
-							"style": "solid",
-							"width": "6px"
-						}
+				}
+			},
+			"site-footer": {
+				"border": {
+					"top": {
+						"color": "var:preset|color|neutral-300",
+						"style": "solid",
+						"width": "1px"
 					},
-					"color": {
-						"background": "var:preset|color|neutral-100"
+					"bottom": {
+						"color": "var:preset|color|primary-500",
+						"style": "solid",
+						"width": "6px"
 					}
 				},
-				"site-header": {
-					"blockTypes": [
-						"core/group"
-					],
-					"border": {
-						"top": {
-							"color": "var:preset|color|primary-500",
-							"style": "solid",
-							"width": "6px"
-						},
-						"bottom": {
-							"color": "var:preset|color|neutral-100",
-							"style": "solid",
-							"width": "1px"
-						}
+				"color": {
+					"background": "var:preset|color|neutral-100"
+				}
+			},
+			"site-header": {
+				"border": {
+					"top": {
+						"color": "var:preset|color|primary-500",
+						"style": "solid",
+						"width": "6px"
 					},
-					"color": {
-						"background": "var:preset|color|neutral-50"
+					"bottom": {
+						"color": "var:preset|color|neutral-100",
+						"style": "solid",
+						"width": "1px"
 					}
+				},
+				"color": {
+					"background": "var:preset|color|neutral-50"
 				}
 			}
 		}
diff --git a/styles/global/saga.json b/styles/global/saga.json
index 3d29287f..05d6c589 100644
--- a/styles/global/saga.json
+++ b/styles/global/saga.json
@@ -298,116 +298,106 @@
 					"fontFamily": "var:preset|font-family|primary",
 					"fontStyle": "italic"
 				}
+			}
+		},
+		"variations": {
+			"card": {
+				"border": {
+					"color": "var:custom|global|border-color",
+					"style": "var:custom|global|border-style",
+					"width": "var:custom|global|border-width"
+				},
+				"color": {
+					"background": "var:preset|color|base"
+				}
 			},
-			"variations": {
-				"card": {
-					"blockTypes": [ "core/group" ],
-					"border": {
+			"card-footer": {
+				"border": {
+					"top": {
 						"color": "var:custom|global|border-color",
-						"style": "var:custom|global|border-style",
-						"width": "var:custom|global|border-width"
-					},
-					"color": {
-						"background": "var:preset|color|base"
+						"style": "double",
+						"width": "3px"
 					}
 				},
-				"card-footer": {
-					"blockTypes": [ "core/group" ],
-					"border": {
-						"top": {
-							"color": "var:custom|global|border-color",
-							"style": "double",
-							"width": "3px"
-						}
-					},
-					"color": {
-						"background": "transparent"
-					}
-				},
-				"comment-meta": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"text": "var:preset|color|neutral-500"
-					}
+				"color": {
+					"background": "transparent"
+				}
+			},
+			"comment-meta": {
+				"color": {
+					"text": "var:preset|color|neutral-500"
+				}
+			},
+			"post-byline": {
+				"color": {
+					"text": "var:preset|color|neutral-500"
 				},
-				"post-byline": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"text": "var:preset|color|neutral-500"
-					},
-					"blocks": {
-						"core/post-author-name": {
-							"elements": {
-								"link": {
-									"color": {
-										"text": "var:preset|color|neutral-900"
-									},
+				"blocks": {
+					"core/post-author-name": {
+						"elements": {
+							"link": {
+								"color": {
+									"text": "var:preset|color|neutral-900"
+								},
+								"typography": {
+									"fontFamily": "var:preset|font-family|primary",
+									"fontStyle": "italic",
+									"textDecoration": "none"
+								},
+								":focus": {
 									"typography": {
-										"fontFamily": "var:preset|font-family|primary",
-										"fontStyle": "italic",
-										"textDecoration": "none"
-									},
-									":focus": {
-										"typography": {
-											"textDecoration": "underline"
-										}
-									},
-									":hover": {
-										"typography": {
-											"textDecoration": "underline"
-										}
+										"textDecoration": "underline"
+									}
+								},
+								":hover": {
+									"typography": {
+										"textDecoration": "underline"
 									}
 								}
 							}
 						}
 					}
+				}
+			},
+			"post-meta": {
+				"color": {
+					"text": "var:preset|color|neutral-500"
+				}
+			},
+			"section-1": {
+				"color": {
+					"background": "var:preset|color|neutral-950",
+					"text": "var:preset|color|white"
 				},
-				"post-meta": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"text": "var:preset|color|neutral-500"
-					}
-				},
-				"section-1": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"background": "var:preset|color|neutral-950",
-						"text": "var:preset|color|white"
-					},
-					"elements": {
-						"button": {
+				"elements": {
+					"button": {
+						"color": {
+							"background": "var:preset|color|primary-700",
+							"text": "var:preset|color|white"
+						},
+						":focus": {
 							"color": {
-								"background": "var:preset|color|primary-700",
-								"text": "var:preset|color|white"
-							},
-							":focus": {
-								"color": {
-									"background": "var:preset|color|primary-900"
-								}
-							},
-							":hover": {
-								"color": {
-									"background": "var:preset|color|primary-900"
-								}
+								"background": "var:preset|color|primary-900"
+							}
+						},
+						":hover": {
+							"color": {
+								"background": "var:preset|color|primary-900"
 							}
 						}
 					}
-				},
-				"site-footer": {
-					"blockTypes": [
-						"core/columns",
-						"core/group"
-					],
-					"border": {
-						"top": {
-							"color": "var:preset|color|neutral-100",
-							"style": "double",
-							"width": "3px"
-						}
-					},
-					"color": {
-						"background": "var:preset|color|neutral-50"
+				}
+			},
+			"site-footer": {
+				"border": {
+					"top": {
+						"color": "var:preset|color|neutral-100",
+						"style": "double",
+						"width": "3px"
 					}
+				},
+				"color": {
+					"background": "var:preset|color|neutral-50"
 				}
 			}
 		}
diff --git a/styles/global/th5.json b/styles/global/th5.json
index 86b02aad..4aa65b80 100644
--- a/styles/global/th5.json
+++ b/styles/global/th5.json
@@ -450,97 +450,84 @@
 					"fontFamily": "var:preset|font-family|primary",
 					"fontWeight": "400"
 				}
-			},
-			"variations": {
-				"archive-header": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"background": "var:preset|color|neutral-100"
-					},
-					"spacing": {
-						"padding": {
-							"top": "var:preset|spacing|plus-6",
-							"bottom": "var:preset|spacing|plus-6"
-						}
-					}
-				},
-				"card": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"background": "var:preset|color|neutral-50"
-					}
-				},
-				"card-footer": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"background": "var:preset|color|neutral-100"
-					}
-				},
-				"comment-meta": {
-					"blockTypes": [ "core/group" ],
-					"typography": {
-						"fontFamily": "var:preset|font-family|primary"
-					}
-				},
-				"post-byline": {
-					"blockTypes": [ "core/group" ],
-					"typography": {
-						"fontFamily": "var:preset|font-family|primary"
-					}
+			}
+		},
+		"variations": {
+			"archive-header": {
+				"color": {
+					"background": "var:preset|color|neutral-100"
 				},
-				"post-meta": {
-					"blockTypes": [ "core/group" ],
-					"typography": {
-						"fontFamily": "var:preset|font-family|primary"
+				"spacing": {
+					"padding": {
+						"top": "var:preset|spacing|plus-6",
+						"bottom": "var:preset|spacing|plus-6"
 					}
-				},
-				"section-1": {
-					"blockTypes": [ "core/group" ],
-					"elements": {
-						"button": {
+				}
+			},
+			"card": {
+				"color": {
+					"background": "var:preset|color|neutral-50"
+				}
+			},
+			"card-footer": {
+				"color": {
+					"background": "var:preset|color|neutral-100"
+				}
+			},
+			"comment-meta": {
+				"typography": {
+					"fontFamily": "var:preset|font-family|primary"
+				}
+			},
+			"post-byline": {
+				"typography": {
+					"fontFamily": "var:preset|font-family|primary"
+				}
+			},
+			"post-meta": {
+				"typography": {
+					"fontFamily": "var:preset|font-family|primary"
+				}
+			},
+			"section-1": {
+				"elements": {
+					"button": {
+						"color": {
+							"background": "var:custom|global|fill|background",
+							"text": "var:custom|global|fill|color"
+						},
+						":focus": {
+							"color": {
+								"background": "var:custom|global|fill|hover-background",
+								"text": "var:custom|global|fill|hover-color"
+							}
+						},
+						":hover": {
 							"color": {
-								"background": "var:custom|global|fill|background",
-								"text": "var:custom|global|fill|color"
-							},
-							":focus": {
-								"color": {
-									"background": "var:custom|global|fill|hover-background",
-									"text": "var:custom|global|fill|hover-color"
-								}
-							},
-							":hover": {
-								"color": {
-									"background": "var:custom|global|fill|hover-background",
-									"text": "var:custom|global|fill|hover-color"
-								}
+								"background": "var:custom|global|fill|hover-background",
+								"text": "var:custom|global|fill|hover-color"
 							}
 						}
 					}
+				}
+			},
+			"section-2": {
+				"color": {
+					"background": "var:preset|color|neutral-100"
+				}
+			},
+			"section-3": {
+				"color": {
+					"background": "var:preset|color|neutral-100",
+					"gradient": "var:preset|gradient|90-deg-neutral-50-transparent"
+				}
+			},
+			"site-footer": {
+				"color": {
+					"background": "var:preset|color|neutral-100"
 				},
-				"section-2": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"background": "var:preset|color|neutral-100"
-					}
-				},
-				"section-3": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"background": "var:preset|color|neutral-100",
-						"gradient": "var:preset|gradient|90-deg-neutral-50-transparent"
-					}
-				},
-				"site-footer": {
-					"blockTypes": [
-						"core/columns",
-						"core/group"
-					],
-					"color": {
-						"background": "var:preset|color|neutral-100"
-					},
-					"typography": {
-						"fontFamily": "var:preset|font-family|primary"
-					}
+				"typography": {
+					"fontFamily": "var:preset|font-family|primary"
 				}
 			}
 		}
diff --git a/styles/global/thunderbird.json b/styles/global/thunderbird.json
index b76a9592..5630ef6a 100644
--- a/styles/global/thunderbird.json
+++ b/styles/global/thunderbird.json
@@ -434,76 +434,65 @@
 				"typography": {
 					"fontFamily": "var:preset|font-family|primary"
 				}
+			}
+		},
+		"variations": {
+			"card": {
+				"border": {
+					"color": "var:preset|color|neutral-300",
+					"style": "solid",
+					"width": "1px"
+				},
+				"color": {
+					"background": "var:preset|color|white"
+				}
 			},
-			"variations": {
-				"card": {
-					"blockTypes": [ "core/group" ],
-					"border": {
-						"color": "var:preset|color|neutral-300",
-						"style": "solid",
+			"card-footer": {
+				"color": {
+					"background": "var:preset|color|neutral-50"
+				}
+			},
+			"comment-meta": {
+				"color": {
+					"text": "var:preset|color|neutral-500"
+				}
+			},
+			"post-byline": {
+				"color": {
+					"text": "var:preset|color|neutral-500"
+				}
+			},
+			"post-meta": {
+				"color": {
+					"text": "var:preset|color|neutral-500"
+				}
+			},
+			"section-3": {
+				"color": {
+					"background": "var:preset|gradient|270-deg-white-transparent"
+				}
+			},
+			"site-footer": {
+				"border": {
+					"top": {
+						"color": "var:preset|color|neutral-100",
 						"width": "1px"
-					},
-					"color": {
-						"background": "var:preset|color|white"
 					}
 				},
-				"card-footer": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"background": "var:preset|color|neutral-50"
-					}
-				},
-				"comment-meta": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"text": "var:preset|color|neutral-500"
-					}
-				},
-				"post-byline": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"text": "var:preset|color|neutral-500"
-					}
-				},
-				"post-meta": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"text": "var:preset|color|neutral-500"
-					}
-				},
-				"section-3": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"background": "var:preset|gradient|270-deg-white-transparent"
-					}
-				},
-				"site-footer": {
-					"blockTypes": [
-						"core/columns",
-						"core/group"
-					],
-					"border": {
-						"top": {
-							"color": "var:preset|color|neutral-100",
-							"width": "1px"
-						}
-					},
-					"color": {
-						"background": "var:preset|color|white"
+				"color": {
+					"background": "var:preset|color|white"
+				}
+			},
+			"site-header": {
+				"border": {
+					"bottom": {
+						"color": "var:preset|color|neutral-100",
+						"style": "solid",
+						"width": "1px"
 					}
 				},
-				"site-header": {
-					"blockTypes": [ "core/group" ],
-					"border": {
-						"bottom": {
-							"color": "var:preset|color|neutral-100",
-							"style": "solid",
-							"width": "1px"
-						}
-					},
-					"color": {
-						"background": "var:preset|color|white"
-					}
+				"color": {
+					"background": "var:preset|color|white"
 				}
 			}
 		}
diff --git a/styles/global/unravel.json b/styles/global/unravel.json
index 026663ef..514daf74 100644
--- a/styles/global/unravel.json
+++ b/styles/global/unravel.json
@@ -489,67 +489,63 @@
 					"fontFamily": "var:preset|font-family|tertiary",
 					"fontStyle": "italic"
 				}
+			}
+		},
+		"variations": {
+			"card": {
+				"border": {
+					"color": "var:custom|global|border-color",
+					"style": "double",
+					"width": "3px"
+				}
 			},
-			"variations": {
-				"card": {
-					"blockTypes": [ "core/group" ],
-					"border": {
+			"card-footer": {
+				"border": {
+					"top": {
 						"color": "var:custom|global|border-color",
-						"style": "double",
-						"width": "3px"
+						"style": "solid",
+						"width": "1px"
 					}
 				},
-				"card-footer": {
-					"blockTypes": [ "core/group" ],
-					"border": {
-						"top": {
-							"color": "var:custom|global|border-color",
-							"style": "solid",
-							"width": "1px"
-						}
-					},
-					"color": {
-						"background": "transparent"
-					}
+				"color": {
+					"background": "transparent"
+				}
+			},
+			"section-1": {
+				"color": {
+					"background": "var:preset|color|primary-50",
+					"text": "var:preset|color|primary-900"
 				},
-				"section-1": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"background": "var:preset|color|primary-50",
-						"text": "var:preset|color|primary-900"
-					},
-					"elements": {
-						"button": {
+				"elements": {
+					"button": {
+						"color": {
+							"background": "var:custom|global|fill|background",
+							"text": "var:custom|global|fill|color"
+						},
+						":focus": {
 							"color": {
-								"background": "var:custom|global|fill|background",
-								"text": "var:custom|global|fill|color"
-							},
-							":focus": {
-								"color": {
-									"background": "var:custom|global|fill|hover-background",
-									"text": "var:custom|global|fill|hover-color"
-								}
-							},
-							":hover": {
-								"color": {
-									"background": "var:custom|global|fill|hover-background",
-									"text": "var:custom|global|fill|hover-color"
-								}
+								"background": "var:custom|global|fill|hover-background",
+								"text": "var:custom|global|fill|hover-color"
 							}
 						},
-						"link": {
+						":hover": {
 							"color": {
-								"text": "var:preset|color|primary-500"
+								"background": "var:custom|global|fill|hover-background",
+								"text": "var:custom|global|fill|hover-color"
 							}
 						}
+					},
+					"link": {
+						"color": {
+							"text": "var:preset|color|primary-500"
+						}
 					}
-				},
-				"section-2": {
-					"blockTypes": [ "core/group" ],
-					"color": {
-						"background": "var:preset|color|neutral-50",
-						"text": { "ref": "styles.color.contrast" }
-					}
+				}
+			},
+			"section-2": {
+				"color": {
+					"background": "var:preset|color|neutral-50",
+					"text": { "ref": "styles.color.contrast" }
 				}
 			}
 		}