diff --git a/packages/ui-scripts/lib/build/tokensStudio/$themes.json b/packages/ui-scripts/lib/build/tokensStudio/$themes.json
index 713e3f2022..5f02b2ab7e 100644
--- a/packages/ui-scripts/lib/build/tokensStudio/$themes.json
+++ b/packages/ui-scripts/lib/build/tokensStudio/$themes.json
@@ -778,6 +778,18 @@
       "grid.spacingLarge": "3843f18ae7187580f8650dc29b3d8c6fefdb0048",
       "grid.spacingMedium": "b0535a60312bc079e91bda9e187960ba42c0ca37",
       "grid.spacingSmall": "4b26e00705857d4cffef087619f5e49681f4afbd",
+      "gridCol.mediumMin": "5f92298c5902a6ce6301f6a5900503a229003a86",
+      "gridCol.LargeMin": "ba880cd596e74be533217bb3dc37752c38984a96",
+      "gridCol.XLargeMin": "209b9112d2777e53d426ae068fcf2efe9aa6137f",
+      "gridCol.spacingLarge": "6740a19f93acd0f27b29c7d963a73d86af225f5f",
+      "gridCol.spacingMedium": "9e0a67555ce787b1e86aa8da5599f1affda26326",
+      "gridCol.spacingSmall": "7622c74b0fac3a137eedf84c3a4b429d34d58b34",
+      "gridRow.mediumMin": "12fda492e70c9147af86814898ee273633dc39fc",
+      "gridRow.LargeMin": "d38a9d35c0d73911dc97b0462663cc4e319cabb0",
+      "gridRow.XLargeMin": "d7497d215de3287906ddc29c65c902be23c975f8",
+      "gridRow.spacingLarge": "5407f9048c9c633129c52f8b1dffea3a5b149283",
+      "gridRow.spacingMedium": "ebafb533a086b8a45a32e9e5eeee15617989fec0",
+      "gridRow.spacingSmall": "22a203dc6d89518e04cde28567ba812a6ae8b701",
       "formFieldGroup.borderColor": "bad836e90a1f74d5014811c8fc97f1278fd05da2",
       "formFieldGroup.errorBorderColor": "b0243703bc1e631746c0e20119b35a89a8e3b3ba",
       "formFieldGroup.borderRadius": "3ec3ef812a4921f5289dd93ec85e629a08a9699c",
@@ -794,7 +806,6 @@
       "formFieldLayout.gapPrimitives": "2dc0c1193037d6722acf7cfde83e552602712b22",
       "formFieldLayout.stackedOrInlineBreakpoint": "bdd78ce607134a5be644ca150067c9032dc7b00e",
       "formFieldLayout.gapInputs": "64919a72daad97f28569c3630eacd218a6999575",
-      "formFieldLayout.gapColumns": "430a8affd17344270c1400387f6ec98f0d3749c5",
       "formFieldMessage.hintTextColor": "376aca078b03f6abf41cb4e946710858da2d721d",
       "formFieldMessage.errorTextColor": "663a0f658d742868513126254e17ba76d466cd0c",
       "formFieldMessage.successTextColor": "40f3676445a42c6e70bb3b3e807eb7fb2fa6bd81",
@@ -974,24 +985,24 @@
       "modal.mediumMaxWidth": "6d066c4e34eee4f36de5207f05decc8048faf10e",
       "modal.smallMaxWidth": "492b12480d2564b807279915f45f5cfe0ee3f72d",
       "modal.borderWidth": "6f7aa6279d753cb953cf9104016bd2e0c9f6acac",
-      "header.backgroundColor": "0fda78175e458da5896c1eec46f1ed27c91442b9",
-      "header.inverseBackgroundColor": "32f5436713e714826b94be26ad0e03c1724a02f1",
-      "header.borderColor": "2435591e0ef1afa5fc810b13b2225d419e6a28ed",
-      "header.inverseBorderColor": "486e96ea5e9c587ca386fb8789590aa04552ff25",
-      "header.padding": "36b815188c8695957135805e71d53c5ac75a4d54",
-      "header.paddingCompact": "7d4a403d369a2ad7cfe242e62f5a4dbae9bbca47",
-      "header.borderWidth": "0dab99e979e5697990cc95e36829535bdced9086",
-      "body.inverseBackgroundColor": "64676d4b58ca84ce43a59f2605eeb3b3fc7cb60a",
-      "body.padding": "e216ea8f2284b70ff23de9e1db148d459921d192",
-      "body.paddingCompact": "af56db7da95b99e589f9a13dc29a5bd451a6a5c4",
-      "footer.borderColor": "618f64b3791cb64080f13eae48232bb511955e06",
-      "footer.inverseBorderColor": "9a4dcd2447e27e5800a65ff5127585e2060ea422",
-      "footer.borderRadius": "35abe24a753c9e27419576a6ccd4e61982926168",
-      "footer.borderWidth": "224a911c2722b03a2018f3032cd4362dfd5962d1",
-      "footer.backgroundColor": "6258c27705a4b6b6cf0acd9f153c95ca76212961",
-      "footer.inverseBackgroundColor": "619b512404155ac8d1fd177aee294f99dacc887b",
-      "footer.padding": "14a2b2401dd003b300babe73895a32c53db3c6dc",
-      "footer.paddingCompact": "0271a1acdc4493f2cd1a742f190780faddf7a185",
+      "modalHeader.backgroundColor": "0fda78175e458da5896c1eec46f1ed27c91442b9",
+      "modalHeader.inverseBackgroundColor": "32f5436713e714826b94be26ad0e03c1724a02f1",
+      "modalHeader.borderColor": "2435591e0ef1afa5fc810b13b2225d419e6a28ed",
+      "modalHeader.inverseBorderColor": "486e96ea5e9c587ca386fb8789590aa04552ff25",
+      "modalHeader.padding": "36b815188c8695957135805e71d53c5ac75a4d54",
+      "modalHeader.paddingCompact": "7d4a403d369a2ad7cfe242e62f5a4dbae9bbca47",
+      "modalHeader.borderWidth": "0dab99e979e5697990cc95e36829535bdced9086",
+      "modalBody.inverseBackgroundColor": "64676d4b58ca84ce43a59f2605eeb3b3fc7cb60a",
+      "modalBody.padding": "e216ea8f2284b70ff23de9e1db148d459921d192",
+      "modalBody.paddingCompact": "af56db7da95b99e589f9a13dc29a5bd451a6a5c4",
+      "modalFooter.borderColor": "618f64b3791cb64080f13eae48232bb511955e06",
+      "modalFooter.inverseBorderColor": "9a4dcd2447e27e5800a65ff5127585e2060ea422",
+      "modalFooter.borderRadius": "35abe24a753c9e27419576a6ccd4e61982926168",
+      "modalFooter.borderWidth": "224a911c2722b03a2018f3032cd4362dfd5962d1",
+      "modalFooter.backgroundColor": "6258c27705a4b6b6cf0acd9f153c95ca76212961",
+      "modalFooter.inverseBackgroundColor": "619b512404155ac8d1fd177aee294f99dacc887b",
+      "modalFooter.padding": "14a2b2401dd003b300babe73895a32c53db3c6dc",
+      "modalFooter.paddingCompact": "0271a1acdc4493f2cd1a742f190780faddf7a185",
       "options.background": "88e51d1af9570c7f8f59f473c5cbb255f23086a0",
       "options.labelColor": "22ced550fbccef93557b757fbd5d71bac06f23aa",
       "options.labelFontWeight": "4a903db6c5ab89357357c12b6e218956b00dd187",
@@ -2247,6 +2258,18 @@
       "grid.spacingLarge": "3843f18ae7187580f8650dc29b3d8c6fefdb0048",
       "grid.spacingMedium": "b0535a60312bc079e91bda9e187960ba42c0ca37",
       "grid.spacingSmall": "4b26e00705857d4cffef087619f5e49681f4afbd",
+      "gridCol.mediumMin": "5f92298c5902a6ce6301f6a5900503a229003a86",
+      "gridCol.LargeMin": "ba880cd596e74be533217bb3dc37752c38984a96",
+      "gridCol.XLargeMin": "209b9112d2777e53d426ae068fcf2efe9aa6137f",
+      "gridCol.spacingLarge": "6740a19f93acd0f27b29c7d963a73d86af225f5f",
+      "gridCol.spacingMedium": "9e0a67555ce787b1e86aa8da5599f1affda26326",
+      "gridCol.spacingSmall": "7622c74b0fac3a137eedf84c3a4b429d34d58b34",
+      "gridRow.mediumMin": "12fda492e70c9147af86814898ee273633dc39fc",
+      "gridRow.LargeMin": "d38a9d35c0d73911dc97b0462663cc4e319cabb0",
+      "gridRow.XLargeMin": "d7497d215de3287906ddc29c65c902be23c975f8",
+      "gridRow.spacingLarge": "5407f9048c9c633129c52f8b1dffea3a5b149283",
+      "gridRow.spacingMedium": "ebafb533a086b8a45a32e9e5eeee15617989fec0",
+      "gridRow.spacingSmall": "22a203dc6d89518e04cde28567ba812a6ae8b701",
       "formFieldGroup.borderColor": "bad836e90a1f74d5014811c8fc97f1278fd05da2",
       "formFieldGroup.errorBorderColor": "b0243703bc1e631746c0e20119b35a89a8e3b3ba",
       "formFieldGroup.borderRadius": "3ec3ef812a4921f5289dd93ec85e629a08a9699c",
@@ -2263,7 +2286,6 @@
       "formFieldLayout.gapPrimitives": "2dc0c1193037d6722acf7cfde83e552602712b22",
       "formFieldLayout.stackedOrInlineBreakpoint": "bdd78ce607134a5be644ca150067c9032dc7b00e",
       "formFieldLayout.gapInputs": "64919a72daad97f28569c3630eacd218a6999575",
-      "formFieldLayout.gapColumns": "430a8affd17344270c1400387f6ec98f0d3749c5",
       "formFieldMessage.hintTextColor": "376aca078b03f6abf41cb4e946710858da2d721d",
       "formFieldMessage.errorTextColor": "663a0f658d742868513126254e17ba76d466cd0c",
       "formFieldMessage.successTextColor": "40f3676445a42c6e70bb3b3e807eb7fb2fa6bd81",
@@ -2443,24 +2465,24 @@
       "modal.mediumMaxWidth": "6d066c4e34eee4f36de5207f05decc8048faf10e",
       "modal.smallMaxWidth": "492b12480d2564b807279915f45f5cfe0ee3f72d",
       "modal.borderWidth": "6f7aa6279d753cb953cf9104016bd2e0c9f6acac",
-      "header.backgroundColor": "0fda78175e458da5896c1eec46f1ed27c91442b9",
-      "header.inverseBackgroundColor": "32f5436713e714826b94be26ad0e03c1724a02f1",
-      "header.borderColor": "2435591e0ef1afa5fc810b13b2225d419e6a28ed",
-      "header.inverseBorderColor": "486e96ea5e9c587ca386fb8789590aa04552ff25",
-      "header.padding": "36b815188c8695957135805e71d53c5ac75a4d54",
-      "header.paddingCompact": "7d4a403d369a2ad7cfe242e62f5a4dbae9bbca47",
-      "header.borderWidth": "0dab99e979e5697990cc95e36829535bdced9086",
-      "body.inverseBackgroundColor": "64676d4b58ca84ce43a59f2605eeb3b3fc7cb60a",
-      "body.padding": "e216ea8f2284b70ff23de9e1db148d459921d192",
-      "body.paddingCompact": "af56db7da95b99e589f9a13dc29a5bd451a6a5c4",
-      "footer.borderColor": "618f64b3791cb64080f13eae48232bb511955e06",
-      "footer.inverseBorderColor": "9a4dcd2447e27e5800a65ff5127585e2060ea422",
-      "footer.borderRadius": "35abe24a753c9e27419576a6ccd4e61982926168",
-      "footer.borderWidth": "224a911c2722b03a2018f3032cd4362dfd5962d1",
-      "footer.backgroundColor": "6258c27705a4b6b6cf0acd9f153c95ca76212961",
-      "footer.inverseBackgroundColor": "619b512404155ac8d1fd177aee294f99dacc887b",
-      "footer.padding": "14a2b2401dd003b300babe73895a32c53db3c6dc",
-      "footer.paddingCompact": "0271a1acdc4493f2cd1a742f190780faddf7a185",
+      "modalHeader.backgroundColor": "0fda78175e458da5896c1eec46f1ed27c91442b9",
+      "modalHeader.inverseBackgroundColor": "32f5436713e714826b94be26ad0e03c1724a02f1",
+      "modalHeader.borderColor": "2435591e0ef1afa5fc810b13b2225d419e6a28ed",
+      "modalHeader.inverseBorderColor": "486e96ea5e9c587ca386fb8789590aa04552ff25",
+      "modalHeader.padding": "36b815188c8695957135805e71d53c5ac75a4d54",
+      "modalHeader.paddingCompact": "7d4a403d369a2ad7cfe242e62f5a4dbae9bbca47",
+      "modalHeader.borderWidth": "0dab99e979e5697990cc95e36829535bdced9086",
+      "modalBody.inverseBackgroundColor": "64676d4b58ca84ce43a59f2605eeb3b3fc7cb60a",
+      "modalBody.padding": "e216ea8f2284b70ff23de9e1db148d459921d192",
+      "modalBody.paddingCompact": "af56db7da95b99e589f9a13dc29a5bd451a6a5c4",
+      "modalFooter.borderColor": "618f64b3791cb64080f13eae48232bb511955e06",
+      "modalFooter.inverseBorderColor": "9a4dcd2447e27e5800a65ff5127585e2060ea422",
+      "modalFooter.borderRadius": "35abe24a753c9e27419576a6ccd4e61982926168",
+      "modalFooter.borderWidth": "224a911c2722b03a2018f3032cd4362dfd5962d1",
+      "modalFooter.backgroundColor": "6258c27705a4b6b6cf0acd9f153c95ca76212961",
+      "modalFooter.inverseBackgroundColor": "619b512404155ac8d1fd177aee294f99dacc887b",
+      "modalFooter.padding": "14a2b2401dd003b300babe73895a32c53db3c6dc",
+      "modalFooter.paddingCompact": "0271a1acdc4493f2cd1a742f190780faddf7a185",
       "options.background": "88e51d1af9570c7f8f59f473c5cbb255f23086a0",
       "options.labelColor": "22ced550fbccef93557b757fbd5d71bac06f23aa",
       "options.labelFontWeight": "4a903db6c5ab89357357c12b6e218956b00dd187",
@@ -3874,7 +3896,6 @@
       "formFieldLayout.lineHeight": "ae5fb66212715de00bd9904f7d178e03342d018d",
       "formFieldLayout.gapPrimitives": "2dc0c1193037d6722acf7cfde83e552602712b22",
       "formFieldLayout.gapInputs": "64919a72daad97f28569c3630eacd218a6999575",
-      "formFieldLayout.gapColumns": "430a8affd17344270c1400387f6ec98f0d3749c5",
       "formFieldLayout.stackedOrInlineBreakpoint": "bdd78ce607134a5be644ca150067c9032dc7b00e",
       "formFieldMessage.hintTextColor": "376aca078b03f6abf41cb4e946710858da2d721d",
       "formFieldMessage.errorTextColor": "663a0f658d742868513126254e17ba76d466cd0c",
@@ -3889,6 +3910,18 @@
       "grid.spacingLarge": "3843f18ae7187580f8650dc29b3d8c6fefdb0048",
       "grid.spacingMedium": "b0535a60312bc079e91bda9e187960ba42c0ca37",
       "grid.spacingSmall": "4b26e00705857d4cffef087619f5e49681f4afbd",
+      "gridCol.mediumMin": "5f92298c5902a6ce6301f6a5900503a229003a86",
+      "gridCol.LargeMin": "ba880cd596e74be533217bb3dc37752c38984a96",
+      "gridCol.XLargeMin": "209b9112d2777e53d426ae068fcf2efe9aa6137f",
+      "gridCol.spacingLarge": "6740a19f93acd0f27b29c7d963a73d86af225f5f",
+      "gridCol.spacingMedium": "9e0a67555ce787b1e86aa8da5599f1affda26326",
+      "gridCol.spacingSmall": "7622c74b0fac3a137eedf84c3a4b429d34d58b34",
+      "gridRow.mediumMin": "12fda492e70c9147af86814898ee273633dc39fc",
+      "gridRow.LargeMin": "d38a9d35c0d73911dc97b0462663cc4e319cabb0",
+      "gridRow.XLargeMin": "d7497d215de3287906ddc29c65c902be23c975f8",
+      "gridRow.spacingLarge": "5407f9048c9c633129c52f8b1dffea3a5b149283",
+      "gridRow.spacingMedium": "ebafb533a086b8a45a32e9e5eeee15617989fec0",
+      "gridRow.spacingSmall": "22a203dc6d89518e04cde28567ba812a6ae8b701",
       "heading.h1FontSize": "50ba66b4083f6b764d606d533d006121317a9d24",
       "heading.h2FontSize": "425f824ca9474600adb8b7482a60de06973b3953",
       "heading.h3FontSize": "497ed1789e8c19384c7910a2d6db0764316b14e3",
@@ -4045,24 +4078,24 @@
       "modal.mediumMaxWidth": "6d066c4e34eee4f36de5207f05decc8048faf10e",
       "modal.smallMaxWidth": "492b12480d2564b807279915f45f5cfe0ee3f72d",
       "modal.borderWidth": "6f7aa6279d753cb953cf9104016bd2e0c9f6acac",
-      "header.backgroundColor": "0fda78175e458da5896c1eec46f1ed27c91442b9",
-      "header.borderColor": "2435591e0ef1afa5fc810b13b2225d419e6a28ed",
-      "header.inverseBackgroundColor": "32f5436713e714826b94be26ad0e03c1724a02f1",
-      "header.inverseBorderColor": "486e96ea5e9c587ca386fb8789590aa04552ff25",
-      "header.padding": "36b815188c8695957135805e71d53c5ac75a4d54",
-      "header.paddingCompact": "7d4a403d369a2ad7cfe242e62f5a4dbae9bbca47",
-      "header.borderWidth": "0dab99e979e5697990cc95e36829535bdced9086",
-      "footer.borderColor": "618f64b3791cb64080f13eae48232bb511955e06",
-      "footer.borderRadius": "35abe24a753c9e27419576a6ccd4e61982926168",
-      "footer.inverseBorderColor": "9a4dcd2447e27e5800a65ff5127585e2060ea422",
-      "footer.borderWidth": "224a911c2722b03a2018f3032cd4362dfd5962d1",
-      "footer.backgroundColor": "6258c27705a4b6b6cf0acd9f153c95ca76212961",
-      "footer.inverseBackgroundColor": "619b512404155ac8d1fd177aee294f99dacc887b",
-      "footer.padding": "14a2b2401dd003b300babe73895a32c53db3c6dc",
-      "footer.paddingCompact": "0271a1acdc4493f2cd1a742f190780faddf7a185",
-      "body.inverseBackgroundColor": "64676d4b58ca84ce43a59f2605eeb3b3fc7cb60a",
-      "body.padding": "e216ea8f2284b70ff23de9e1db148d459921d192",
-      "body.paddingCompact": "af56db7da95b99e589f9a13dc29a5bd451a6a5c4",
+      "modalHeader.backgroundColor": "0fda78175e458da5896c1eec46f1ed27c91442b9",
+      "modalHeader.borderColor": "2435591e0ef1afa5fc810b13b2225d419e6a28ed",
+      "modalHeader.inverseBackgroundColor": "32f5436713e714826b94be26ad0e03c1724a02f1",
+      "modalHeader.inverseBorderColor": "486e96ea5e9c587ca386fb8789590aa04552ff25",
+      "modalHeader.padding": "36b815188c8695957135805e71d53c5ac75a4d54",
+      "modalHeader.paddingCompact": "7d4a403d369a2ad7cfe242e62f5a4dbae9bbca47",
+      "modalHeader.borderWidth": "0dab99e979e5697990cc95e36829535bdced9086",
+      "modalFooter.borderColor": "618f64b3791cb64080f13eae48232bb511955e06",
+      "modalFooter.borderRadius": "35abe24a753c9e27419576a6ccd4e61982926168",
+      "modalFooter.inverseBorderColor": "9a4dcd2447e27e5800a65ff5127585e2060ea422",
+      "modalFooter.borderWidth": "224a911c2722b03a2018f3032cd4362dfd5962d1",
+      "modalFooter.backgroundColor": "6258c27705a4b6b6cf0acd9f153c95ca76212961",
+      "modalFooter.inverseBackgroundColor": "619b512404155ac8d1fd177aee294f99dacc887b",
+      "modalFooter.padding": "14a2b2401dd003b300babe73895a32c53db3c6dc",
+      "modalFooter.paddingCompact": "0271a1acdc4493f2cd1a742f190780faddf7a185",
+      "modalBody.inverseBackgroundColor": "64676d4b58ca84ce43a59f2605eeb3b3fc7cb60a",
+      "modalBody.padding": "e216ea8f2284b70ff23de9e1db148d459921d192",
+      "modalBody.paddingCompact": "af56db7da95b99e589f9a13dc29a5bd451a6a5c4",
       "options.background": "88e51d1af9570c7f8f59f473c5cbb255f23086a0",
       "options.labelColor": "22ced550fbccef93557b757fbd5d71bac06f23aa",
       "options.labelFontWeight": "4a903db6c5ab89357357c12b6e218956b00dd187",
@@ -5341,7 +5374,6 @@
       "formFieldLayout.lineHeight": "ae5fb66212715de00bd9904f7d178e03342d018d",
       "formFieldLayout.gapPrimitives": "2dc0c1193037d6722acf7cfde83e552602712b22",
       "formFieldLayout.gapInputs": "64919a72daad97f28569c3630eacd218a6999575",
-      "formFieldLayout.gapColumns": "430a8affd17344270c1400387f6ec98f0d3749c5",
       "formFieldLayout.stackedOrInlineBreakpoint": "bdd78ce607134a5be644ca150067c9032dc7b00e",
       "formFieldMessage.hintTextColor": "376aca078b03f6abf41cb4e946710858da2d721d",
       "formFieldMessage.errorTextColor": "663a0f658d742868513126254e17ba76d466cd0c",
@@ -5356,6 +5388,18 @@
       "grid.spacingLarge": "3843f18ae7187580f8650dc29b3d8c6fefdb0048",
       "grid.spacingMedium": "b0535a60312bc079e91bda9e187960ba42c0ca37",
       "grid.spacingSmall": "4b26e00705857d4cffef087619f5e49681f4afbd",
+      "gridCol.mediumMin": "5f92298c5902a6ce6301f6a5900503a229003a86",
+      "gridCol.LargeMin": "ba880cd596e74be533217bb3dc37752c38984a96",
+      "gridCol.XLargeMin": "209b9112d2777e53d426ae068fcf2efe9aa6137f",
+      "gridCol.spacingLarge": "6740a19f93acd0f27b29c7d963a73d86af225f5f",
+      "gridCol.spacingMedium": "9e0a67555ce787b1e86aa8da5599f1affda26326",
+      "gridCol.spacingSmall": "7622c74b0fac3a137eedf84c3a4b429d34d58b34",
+      "gridRow.mediumMin": "12fda492e70c9147af86814898ee273633dc39fc",
+      "gridRow.LargeMin": "d38a9d35c0d73911dc97b0462663cc4e319cabb0",
+      "gridRow.XLargeMin": "d7497d215de3287906ddc29c65c902be23c975f8",
+      "gridRow.spacingLarge": "5407f9048c9c633129c52f8b1dffea3a5b149283",
+      "gridRow.spacingMedium": "ebafb533a086b8a45a32e9e5eeee15617989fec0",
+      "gridRow.spacingSmall": "22a203dc6d89518e04cde28567ba812a6ae8b701",
       "heading.h1FontSize": "50ba66b4083f6b764d606d533d006121317a9d24",
       "heading.h2FontSize": "425f824ca9474600adb8b7482a60de06973b3953",
       "heading.h3FontSize": "497ed1789e8c19384c7910a2d6db0764316b14e3",
@@ -5512,24 +5556,24 @@
       "modal.mediumMaxWidth": "6d066c4e34eee4f36de5207f05decc8048faf10e",
       "modal.smallMaxWidth": "492b12480d2564b807279915f45f5cfe0ee3f72d",
       "modal.borderWidth": "6f7aa6279d753cb953cf9104016bd2e0c9f6acac",
-      "header.backgroundColor": "0fda78175e458da5896c1eec46f1ed27c91442b9",
-      "header.borderColor": "2435591e0ef1afa5fc810b13b2225d419e6a28ed",
-      "header.inverseBackgroundColor": "32f5436713e714826b94be26ad0e03c1724a02f1",
-      "header.inverseBorderColor": "486e96ea5e9c587ca386fb8789590aa04552ff25",
-      "header.padding": "36b815188c8695957135805e71d53c5ac75a4d54",
-      "header.paddingCompact": "7d4a403d369a2ad7cfe242e62f5a4dbae9bbca47",
-      "header.borderWidth": "0dab99e979e5697990cc95e36829535bdced9086",
-      "footer.borderColor": "618f64b3791cb64080f13eae48232bb511955e06",
-      "footer.borderRadius": "35abe24a753c9e27419576a6ccd4e61982926168",
-      "footer.inverseBorderColor": "9a4dcd2447e27e5800a65ff5127585e2060ea422",
-      "footer.borderWidth": "224a911c2722b03a2018f3032cd4362dfd5962d1",
-      "footer.backgroundColor": "6258c27705a4b6b6cf0acd9f153c95ca76212961",
-      "footer.inverseBackgroundColor": "619b512404155ac8d1fd177aee294f99dacc887b",
-      "footer.padding": "14a2b2401dd003b300babe73895a32c53db3c6dc",
-      "footer.paddingCompact": "0271a1acdc4493f2cd1a742f190780faddf7a185",
-      "body.inverseBackgroundColor": "64676d4b58ca84ce43a59f2605eeb3b3fc7cb60a",
-      "body.padding": "e216ea8f2284b70ff23de9e1db148d459921d192",
-      "body.paddingCompact": "af56db7da95b99e589f9a13dc29a5bd451a6a5c4",
+      "modalHeader.backgroundColor": "0fda78175e458da5896c1eec46f1ed27c91442b9",
+      "modalHeader.borderColor": "2435591e0ef1afa5fc810b13b2225d419e6a28ed",
+      "modalHeader.inverseBackgroundColor": "32f5436713e714826b94be26ad0e03c1724a02f1",
+      "modalHeader.inverseBorderColor": "486e96ea5e9c587ca386fb8789590aa04552ff25",
+      "modalHeader.padding": "36b815188c8695957135805e71d53c5ac75a4d54",
+      "modalHeader.paddingCompact": "7d4a403d369a2ad7cfe242e62f5a4dbae9bbca47",
+      "modalHeader.borderWidth": "0dab99e979e5697990cc95e36829535bdced9086",
+      "modalFooter.borderColor": "618f64b3791cb64080f13eae48232bb511955e06",
+      "modalFooter.borderRadius": "35abe24a753c9e27419576a6ccd4e61982926168",
+      "modalFooter.inverseBorderColor": "9a4dcd2447e27e5800a65ff5127585e2060ea422",
+      "modalFooter.borderWidth": "224a911c2722b03a2018f3032cd4362dfd5962d1",
+      "modalFooter.backgroundColor": "6258c27705a4b6b6cf0acd9f153c95ca76212961",
+      "modalFooter.inverseBackgroundColor": "619b512404155ac8d1fd177aee294f99dacc887b",
+      "modalFooter.padding": "14a2b2401dd003b300babe73895a32c53db3c6dc",
+      "modalFooter.paddingCompact": "0271a1acdc4493f2cd1a742f190780faddf7a185",
+      "modalBody.inverseBackgroundColor": "64676d4b58ca84ce43a59f2605eeb3b3fc7cb60a",
+      "modalBody.padding": "e216ea8f2284b70ff23de9e1db148d459921d192",
+      "modalBody.paddingCompact": "af56db7da95b99e589f9a13dc29a5bd451a6a5c4",
       "options.background": "88e51d1af9570c7f8f59f473c5cbb255f23086a0",
       "options.labelColor": "22ced550fbccef93557b757fbd5d71bac06f23aa",
       "options.labelFontWeight": "4a903db6c5ab89357357c12b6e218956b00dd187",
diff --git a/packages/ui-scripts/lib/build/tokensStudio/canvas/component/FormFieldLayout.json b/packages/ui-scripts/lib/build/tokensStudio/canvas/component/FormFieldLayout.json
index 628e200a88..beb0d1f5ca 100644
--- a/packages/ui-scripts/lib/build/tokensStudio/canvas/component/FormFieldLayout.json
+++ b/packages/ui-scripts/lib/build/tokensStudio/canvas/component/FormFieldLayout.json
@@ -36,10 +36,6 @@
       "value": "0.75rem",
       "type": "spacing"
     },
-    "gapColumns": {
-      "value": "0.375rem",
-      "type": "spacing"
-    },
     "stackedOrInlineBreakpoint": {
       "value": "48em",
       "type": "sizing"
diff --git a/packages/ui-scripts/lib/build/tokensStudio/canvas/component/Grid.json b/packages/ui-scripts/lib/build/tokensStudio/canvas/component/Grid.json
index cfe138dcb1..657d60379f 100644
--- a/packages/ui-scripts/lib/build/tokensStudio/canvas/component/Grid.json
+++ b/packages/ui-scripts/lib/build/tokensStudio/canvas/component/Grid.json
@@ -24,5 +24,57 @@
       "value": "{spacing.spaceMd}",
       "type": "spacing"
     }
+  },
+  "gridCol": {
+    "mediumMin": {
+      "value": "48em",
+      "type": "sizing"
+    },
+    "LargeMin": {
+      "value": "62em",
+      "type": "sizing"
+    },
+    "XLargeMin": {
+      "value": "75em",
+      "type": "sizing"
+    },
+    "spacingLarge": {
+      "value": "2.25rem",
+      "type": "spacing"
+    },
+    "spacingMedium": {
+      "value": "{spacing.spaceXl}",
+      "type": "spacing"
+    },
+    "spacingSmall": {
+      "value": "{spacing.spaceMd}",
+      "type": "spacing"
+    }
+  },
+  "gridRow": {
+    "mediumMin": {
+      "value": "48em",
+      "type": "sizing"
+    },
+    "LargeMin": {
+      "value": "62em",
+      "type": "sizing"
+    },
+    "XLargeMin": {
+      "value": "75em",
+      "type": "sizing"
+    },
+    "spacingLarge": {
+      "value": "2.25rem",
+      "type": "spacing"
+    },
+    "spacingMedium": {
+      "value": "{spacing.spaceXl}",
+      "type": "spacing"
+    },
+    "spacingSmall": {
+      "value": "{spacing.spaceMd}",
+      "type": "spacing"
+    }
   }
 }
\ No newline at end of file
diff --git a/packages/ui-scripts/lib/build/tokensStudio/canvas/component/Modal.json b/packages/ui-scripts/lib/build/tokensStudio/canvas/component/Modal.json
index 5e982dedce..c5fe41671d 100644
--- a/packages/ui-scripts/lib/build/tokensStudio/canvas/component/Modal.json
+++ b/packages/ui-scripts/lib/build/tokensStudio/canvas/component/Modal.json
@@ -75,7 +75,7 @@
       "type": "borderWidth"
     }
   },
-  "header": {
+  "modalHeader": {
     "backgroundColor": {
       "value": "{color.background.container}",
       "type": "color"
@@ -105,7 +105,7 @@
       "type": "borderWidth"
     }
   },
-  "footer": {
+  "modalFooter": {
     "borderColor": {
       "value": "{color.stroke.container.base}",
       "type": "color"
@@ -139,7 +139,7 @@
       "type": "spacing"
     }
   },
-  "body": {
+  "modalBody": {
     "inverseBackgroundColor": {
       "value": "{color.background.dark}",
       "type": "color"
diff --git a/packages/ui-scripts/lib/build/tokensStudio/rebrand/component/FormFieldLayout.json b/packages/ui-scripts/lib/build/tokensStudio/rebrand/component/FormFieldLayout.json
index 0f5996d981..c4d3f89613 100644
--- a/packages/ui-scripts/lib/build/tokensStudio/rebrand/component/FormFieldLayout.json
+++ b/packages/ui-scripts/lib/build/tokensStudio/rebrand/component/FormFieldLayout.json
@@ -39,10 +39,6 @@
     "gapInputs": {
       "value": "0.75rem",
       "type": "spacing"
-    },
-    "gapColumns": {
-      "value": "0.375rem",
-      "type": "spacing"
     }
   }
 }
\ No newline at end of file
diff --git a/packages/ui-scripts/lib/build/tokensStudio/rebrand/component/Grid.json b/packages/ui-scripts/lib/build/tokensStudio/rebrand/component/Grid.json
index ba286698e0..657d60379f 100644
--- a/packages/ui-scripts/lib/build/tokensStudio/rebrand/component/Grid.json
+++ b/packages/ui-scripts/lib/build/tokensStudio/rebrand/component/Grid.json
@@ -13,7 +13,59 @@
       "type": "sizing"
     },
     "spacingLarge": {
-      "value": "{spacing.space2xl}",
+      "value": "2.25rem",
+      "type": "spacing"
+    },
+    "spacingMedium": {
+      "value": "{spacing.spaceXl}",
+      "type": "spacing"
+    },
+    "spacingSmall": {
+      "value": "{spacing.spaceMd}",
+      "type": "spacing"
+    }
+  },
+  "gridCol": {
+    "mediumMin": {
+      "value": "48em",
+      "type": "sizing"
+    },
+    "LargeMin": {
+      "value": "62em",
+      "type": "sizing"
+    },
+    "XLargeMin": {
+      "value": "75em",
+      "type": "sizing"
+    },
+    "spacingLarge": {
+      "value": "2.25rem",
+      "type": "spacing"
+    },
+    "spacingMedium": {
+      "value": "{spacing.spaceXl}",
+      "type": "spacing"
+    },
+    "spacingSmall": {
+      "value": "{spacing.spaceMd}",
+      "type": "spacing"
+    }
+  },
+  "gridRow": {
+    "mediumMin": {
+      "value": "48em",
+      "type": "sizing"
+    },
+    "LargeMin": {
+      "value": "62em",
+      "type": "sizing"
+    },
+    "XLargeMin": {
+      "value": "75em",
+      "type": "sizing"
+    },
+    "spacingLarge": {
+      "value": "2.25rem",
       "type": "spacing"
     },
     "spacingMedium": {
diff --git a/packages/ui-scripts/lib/build/tokensStudio/rebrand/component/Modal.json b/packages/ui-scripts/lib/build/tokensStudio/rebrand/component/Modal.json
index d8cf69ae1b..4358f0da66 100644
--- a/packages/ui-scripts/lib/build/tokensStudio/rebrand/component/Modal.json
+++ b/packages/ui-scripts/lib/build/tokensStudio/rebrand/component/Modal.json
@@ -75,7 +75,7 @@
       "type": "borderWidth"
     }
   },
-  "header": {
+  "modalHeader": {
     "backgroundColor": {
       "value": "{color.background.container}",
       "type": "color"
@@ -105,7 +105,7 @@
       "type": "borderWidth"
     }
   },
-  "body": {
+  "modalBody": {
     "inverseBackgroundColor": {
       "value": "{color.background.dark}",
       "type": "color"
@@ -119,7 +119,7 @@
       "type": "spacing"
     }
   },
-  "footer": {
+  "modalFooter": {
     "borderColor": {
       "value": "{color.stroke.container.base}",
       "type": "color"