@primer/primitives 7.13.0-rc.129a477 → 7.13.0

package/tokens-next-private/figma/themes/dark.json

@@ -8,9 +8,10 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/cyan-bright",
-    "collection": "pattern/mode",
+    "refId": "mode/color/ansi/cyan-bright",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -22,9 +23,10 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/cyan",
-    "collection": "pattern/mode",
+    "refId": "mode/color/ansi/cyan",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -36,10 +38,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/sublimelinter/gutter/mark",
+    "refId": "mode/color/prettylights/syntax/sublimelinter/gutter/mark",
     "reference": "base/color/dark/base/color/gray/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -51,10 +54,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/meta/diff/range",
+    "refId": "mode/color/prettylights/syntax/meta/diff/range",
     "reference": "base/color/dark/base/color/purple/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -66,10 +70,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/markup/ignored/bg",
+    "refId": "mode/color/prettylights/syntax/markup/ignored/bg",
     "reference": "base/color/dark/base/color/blue/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -81,10 +86,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/markup/ignored/text",
+    "refId": "mode/color/prettylights/syntax/markup/ignored/text",
     "reference": "base/color/dark/base/color/gray/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -96,10 +102,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/markup/changed/bg",
+    "refId": "mode/color/prettylights/syntax/markup/changed/bg",
     "reference": "base/color/dark/base/color/orange/8",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -111,10 +118,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/markup/changed/text",
+    "refId": "mode/color/prettylights/syntax/markup/changed/text",
     "reference": "base/color/dark/base/color/orange/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -126,10 +134,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/markup/inserted/bg",
+    "refId": "mode/color/prettylights/syntax/markup/inserted/bg",
     "reference": "base/color/dark/base/color/green/8",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -141,10 +150,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/markup/inserted/text",
+    "refId": "mode/color/prettylights/syntax/markup/inserted/text",
     "reference": "base/color/dark/base/color/green/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -156,10 +166,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/markup/deleted/bg",
+    "refId": "mode/color/prettylights/syntax/markup/deleted/bg",
     "reference": "base/color/dark/base/color/red/8",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -171,10 +182,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/markup/deleted/text",
+    "refId": "mode/color/prettylights/syntax/markup/deleted/text",
     "reference": "base/color/dark/base/color/red/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -186,10 +198,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/markup/bold",
+    "refId": "mode/color/prettylights/syntax/markup/bold",
     "reference": "base/color/dark/base/color/gray/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -201,10 +214,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/markup/italic",
+    "refId": "mode/color/prettylights/syntax/markup/italic",
     "reference": "base/color/dark/base/color/gray/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -216,10 +230,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/markup/heading",
+    "refId": "mode/color/prettylights/syntax/markup/heading",
     "reference": "base/color/dark/base/color/blue/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -231,10 +246,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/markup/list",
+    "refId": "mode/color/prettylights/syntax/markup/list",
     "reference": "base/color/dark/base/color/yellow/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -246,10 +262,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/string-regexp",
+    "refId": "mode/color/prettylights/syntax/string-regexp",
     "reference": "base/color/dark/base/color/green/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -261,10 +278,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/carriage/return/bg",
+    "refId": "mode/color/prettylights/syntax/carriage/return/bg",
     "reference": "base/color/dark/base/color/red/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -276,10 +294,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/carriage/return/text",
+    "refId": "mode/color/prettylights/syntax/carriage/return/text",
     "reference": "base/color/dark/base/color/gray/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -291,10 +310,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/invalid/illegal/bg",
+    "refId": "mode/color/prettylights/syntax/invalid/illegal/bg",
     "reference": "base/color/dark/base/color/red/7",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -306,10 +326,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/invalid/illegal/text",
+    "refId": "mode/color/prettylights/syntax/invalid/illegal/text",
     "reference": "base/color/dark/base/color/gray/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -321,10 +342,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/brackethighlighter/angle",
+    "refId": "mode/color/prettylights/syntax/brackethighlighter/angle",
     "reference": "base/color/dark/base/color/gray/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -336,10 +358,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/brackethighlighter/unmatched",
+    "refId": "mode/color/prettylights/syntax/brackethighlighter/unmatched",
     "reference": "base/color/dark/base/color/red/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -351,10 +374,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/variable",
+    "refId": "mode/color/prettylights/syntax/variable",
     "reference": "base/color/dark/base/color/orange/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -366,10 +390,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/string",
+    "refId": "mode/color/prettylights/syntax/string",
     "reference": "base/color/dark/base/color/blue/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -381,10 +406,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/keyword",
+    "refId": "mode/color/prettylights/syntax/keyword",
     "reference": "base/color/dark/base/color/red/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -396,10 +422,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/entity-tag",
+    "refId": "mode/color/prettylights/syntax/entity-tag",
     "reference": "base/color/dark/base/color/green/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -411,10 +438,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/storage/modifier/import",
+    "refId": "mode/color/prettylights/syntax/storage/modifier/import",
     "reference": "base/color/dark/base/color/gray/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -426,10 +454,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/entity",
+    "refId": "mode/color/prettylights/syntax/entity",
     "reference": "base/color/dark/base/color/purple/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -441,10 +470,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/constant-other-reference-link",
+    "refId": "mode/color/prettylights/syntax/constant-other-reference-link",
     "reference": "base/color/dark/base/color/blue/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -456,10 +486,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/constant",
+    "refId": "mode/color/prettylights/syntax/constant",
     "reference": "base/color/dark/base/color/blue/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -471,10 +502,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/prettylights/syntax/comment",
+    "refId": "mode/color/prettylights/syntax/comment",
     "reference": "base/color/dark/base/color/gray/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -486,10 +518,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/magenta-bright",
+    "refId": "mode/color/ansi/magenta-bright",
     "reference": "base/color/dark/base/color/purple/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -501,10 +534,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/magenta",
+    "refId": "mode/color/ansi/magenta",
     "reference": "base/color/dark/base/color/purple/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -516,10 +550,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/blue-bright",
+    "refId": "mode/color/ansi/blue-bright",
     "reference": "base/color/dark/base/color/blue/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -531,10 +566,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/blue",
+    "refId": "mode/color/ansi/blue",
     "reference": "base/color/dark/base/color/blue/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -546,10 +582,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/yellow-bright",
+    "refId": "mode/color/ansi/yellow-bright",
     "reference": "base/color/dark/base/color/yellow/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -561,10 +598,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/yellow",
+    "refId": "mode/color/ansi/yellow",
     "reference": "base/color/dark/base/color/yellow/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -576,10 +614,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/green-bright",
+    "refId": "mode/color/ansi/green-bright",
     "reference": "base/color/dark/base/color/green/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -591,10 +630,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/green",
+    "refId": "mode/color/ansi/green",
     "reference": "base/color/dark/base/color/green/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -606,10 +646,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/red-bright",
+    "refId": "mode/color/ansi/red-bright",
     "reference": "base/color/dark/base/color/red/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -621,10 +662,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/red",
+    "refId": "mode/color/ansi/red",
     "reference": "base/color/dark/base/color/red/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -636,10 +678,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/gray",
+    "refId": "mode/color/ansi/gray",
     "reference": "base/color/dark/base/color/gray/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -651,10 +694,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/white-bright",
+    "refId": "mode/color/ansi/white-bright",
     "reference": "base/color/dark/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -666,10 +710,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/white",
+    "refId": "mode/color/ansi/white",
     "reference": "base/color/dark/base/color/gray/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -681,10 +726,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/black-bright",
+    "refId": "mode/color/ansi/black-bright",
     "reference": "base/color/dark/base/color/gray/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -696,10 +742,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/color/ansi/black",
+    "refId": "mode/color/ansi/black",
     "reference": "base/color/dark/base/color/gray/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -715,6 +762,7 @@
     "reference": "base/color/dark/base/color/pink/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -731,6 +779,7 @@
     "reference": "base/color/dark/base/color/pink/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -746,6 +795,7 @@
     "reference": "base/color/dark/base/color/purple/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -762,6 +812,7 @@
     "reference": "base/color/dark/base/color/purple/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -777,6 +828,7 @@
     "reference": "base/color/dark/base/color/red/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -793,6 +845,7 @@
     "reference": "base/color/dark/base/color/red/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -808,6 +861,7 @@
     "reference": "base/color/dark/base/color/red/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -824,6 +878,7 @@
     "reference": "base/color/dark/base/color/red/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -839,6 +894,7 @@
     "reference": "base/color/dark/base/color/orange/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -855,6 +911,7 @@
     "reference": "base/color/dark/base/color/orange/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -870,6 +927,7 @@
     "reference": "base/color/dark/base/color/yellow/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -877,7 +935,7 @@
     "value": {
       "r": 0.7333333333333333,
       "g": 0.5019607843137255,
-      "b": 0.5647058823529412,
+      "b": 0.03529411764705882,
       "a": 0.4
     },
     "type": "COLOR",
@@ -886,6 +944,7 @@
     "reference": "base/color/dark/base/color/yellow/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -901,6 +960,7 @@
     "reference": "base/color/dark/base/color/green/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -917,6 +977,7 @@
     "reference": "base/color/dark/base/color/green/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -932,6 +993,7 @@
     "reference": "base/color/dark/base/color/blue/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -948,6 +1010,7 @@
     "reference": "base/color/dark/base/color/blue/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -963,6 +1026,7 @@
     "reference": "base/color/dark/base/color/gray/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -979,6 +1043,7 @@
     "reference": "base/color/dark/base/color/gray/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -994,6 +1059,7 @@
     "reference": "base/color/dark/base/color/transparent",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -1009,6 +1075,7 @@
     "reference": "base/color/dark/base/color/gray/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -1024,6 +1091,7 @@
     "reference": "base/color/dark/base/color/gray/6",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -1039,6 +1107,7 @@
     "reference": "base/color/dark/base/color/pink/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1055,6 +1124,7 @@
     "reference": "base/color/dark/base/color/pink/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1070,6 +1140,7 @@
     "reference": "base/color/dark/base/color/purple/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1086,6 +1157,7 @@
     "reference": "base/color/dark/base/color/purple/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1101,6 +1173,7 @@
     "reference": "base/color/dark/base/color/red/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1117,6 +1190,7 @@
     "reference": "base/color/dark/base/color/red/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1132,6 +1206,7 @@
     "reference": "base/color/dark/base/color/red/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1148,6 +1223,7 @@
     "reference": "base/color/dark/base/color/red/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1163,6 +1239,7 @@
     "reference": "base/color/dark/base/color/orange/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1179,6 +1256,7 @@
     "reference": "base/color/dark/base/color/orange/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1194,6 +1272,7 @@
     "reference": "base/color/dark/base/color/yellow/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1201,7 +1280,7 @@
     "value": {
       "r": 0.7333333333333333,
       "g": 0.5019607843137255,
-      "b": 0.5647058823529412,
+      "b": 0.03529411764705882,
       "a": 0.15
     },
     "type": "COLOR",
@@ -1210,6 +1289,7 @@
     "reference": "base/color/dark/base/color/yellow/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1225,6 +1305,7 @@
     "reference": "base/color/dark/base/color/green/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1241,6 +1322,7 @@
     "reference": "base/color/dark/base/color/green/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1256,6 +1338,7 @@
     "reference": "base/color/dark/base/color/blue/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1272,6 +1355,7 @@
     "reference": "base/color/dark/base/color/blue/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1287,6 +1371,7 @@
     "reference": "base/color/dark/base/color/gray/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1303,6 +1388,7 @@
     "reference": "base/color/dark/base/color/gray/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1318,6 +1404,7 @@
     "reference": "base/color/dark/base/color/transparent",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1333,6 +1420,7 @@
     "reference": "base/color/dark/base/color/gray/8",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1348,6 +1436,7 @@
     "reference": "base/color/dark/base/color/white",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1363,6 +1452,7 @@
     "reference": "base/color/dark/base/color/gray/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1378,7 +1468,8 @@
     "reference": "base/color/dark/base/color/black",
     "collection": "mode",
     "mode": "dark",
-    "scopes": ["FRAME_FILL", "SHAPE_FILL"]
+    "group": "semantic",
+    "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"]
   },
   {
     "name": "bgColor/muted",
@@ -1393,7 +1484,8 @@
     "reference": "base/color/dark/base/color/gray/8",
     "collection": "mode",
     "mode": "dark",
-    "scopes": ["FRAME_FILL", "SHAPE_FILL"]
+    "group": "semantic",
+    "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"]
   },
   {
     "name": "bgColor/default",
@@ -1408,7 +1500,8 @@
     "reference": "base/color/dark/base/color/gray/9",
     "collection": "mode",
     "mode": "dark",
-    "scopes": ["FRAME_FILL", "SHAPE_FILL"]
+    "group": "semantic",
+    "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"]
   },
   {
     "name": "fgColor/sponsors-onInverse",
@@ -1423,6 +1516,7 @@
     "reference": "base/color/dark/base/color/pink/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1438,6 +1532,7 @@
     "reference": "base/color/dark/base/color/pink/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1453,6 +1548,7 @@
     "reference": "base/color/dark/base/color/purple/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1468,6 +1564,7 @@
     "reference": "base/color/dark/base/color/purple/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1483,6 +1580,7 @@
     "reference": "base/color/dark/base/color/red/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1499,6 +1597,7 @@
     "reference": "base/color/dark/base/color/red/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1514,6 +1613,7 @@
     "reference": "base/color/dark/base/color/red/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1529,6 +1629,7 @@
     "reference": "base/color/dark/base/color/orange/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1544,6 +1645,7 @@
     "reference": "base/color/dark/base/color/orange/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1559,6 +1661,7 @@
     "reference": "base/color/dark/base/color/yellow/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1574,6 +1677,7 @@
     "reference": "base/color/dark/base/color/yellow/3",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1589,6 +1693,7 @@
     "reference": "base/color/dark/base/color/green/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1604,6 +1709,7 @@
     "reference": "base/color/dark/base/color/green/3",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1619,6 +1725,7 @@
     "reference": "base/color/dark/base/color/blue/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1635,6 +1742,7 @@
     "reference": "base/color/dark/base/color/blue/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1650,6 +1758,7 @@
     "reference": "base/color/dark/base/color/gray/5",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1665,6 +1774,7 @@
     "reference": "base/color/dark/base/color/gray/4",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1680,6 +1790,7 @@
     "reference": "base/color/dark/base/color/gray/3",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1695,6 +1806,7 @@
     "reference": "base/color/dark/base/color/gray/9",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1710,6 +1822,7 @@
     "reference": "base/color/dark/base/color/white",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1726,6 +1839,7 @@
     "reference": "base/color/dark/base/color/gray/3",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1742,6 +1856,7 @@
     "reference": "base/color/dark/base/color/gray/0",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1753,10 +1868,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/underlineNav/borderColor/active",
+    "refId": "mode/underlineNav/borderColor/active",
     "reference": "base/color/dark/base/color/coral/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -1768,10 +1884,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/timelineBadge/bgColor",
+    "refId": "mode/timelineBadge/bgColor",
     "reference": "base/color/dark/base/color/gray/7",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1783,10 +1900,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/sideNav/bgColor/selected",
+    "refId": "mode/sideNav/bgColor/selected",
     "reference": "base/color/dark/base/color/gray/7",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1798,10 +1916,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/selectMenu/bgColor/active",
+    "refId": "mode/selectMenu/bgColor/active",
     "reference": "base/color/dark/base/color/blue/8",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1813,10 +1932,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/selectMenu/borderColor",
+    "refId": "mode/selectMenu/borderColor",
     "reference": "base/color/dark/base/color/gray/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -1829,10 +1949,11 @@
     },
     "type": "COLOR",
     "alpha": 0.4,
-    "refId": "pattern/mode/overlay/backdrop/bgColor",
+    "refId": "mode/overlay/backdrop/bgColor",
     "reference": "base/color/dark/base/color/gray/8",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1844,10 +1965,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/overlay/bgColor",
+    "refId": "mode/overlay/bgColor",
     "reference": "base/color/dark/base/color/gray/8",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1859,10 +1981,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/menu/bgColor/active",
+    "refId": "mode/menu/bgColor/active",
     "reference": "base/color/dark/base/color/gray/8",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1874,26 +1997,28 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/buttonCounter/danger/fgColor/hover",
+    "refId": "mode/buttonCounter/danger/fgColor/hover",
     "reference": "base/color/dark/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
     "name": "buttonCounter/danger/bgColor/rest",
     "value": {
       "r": 0.28627450980392155,
-      "g": 0.12549019607843137,
-      "b": 0.12549019607843137,
+      "g": 0.00784313725490196,
+      "b": 0.00784313725490196,
       "a": 0.2
     },
     "type": "COLOR",
     "alpha": 0.2,
-    "refId": "pattern/mode/buttonCounter/danger/bgColor/rest",
+    "refId": "mode/buttonCounter/danger/bgColor/rest",
     "reference": "base/color/dark/base/color/red/9",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1906,10 +2031,11 @@
     },
     "type": "COLOR",
     "alpha": 0.2,
-    "refId": "pattern/mode/buttonCounter/danger/bgColor/hover",
+    "refId": "mode/buttonCounter/danger/bgColor/hover",
     "reference": "base/color/dark/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1921,10 +2047,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/buttonCounter/outline/fgColor/hover",
+    "refId": "mode/buttonCounter/outline/fgColor/hover",
     "reference": "base/color/dark/base/color/blue/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1936,58 +2063,62 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/buttonCounter/outline/fgColor/rest",
+    "refId": "mode/buttonCounter/outline/fgColor/rest",
     "reference": "base/color/dark/base/color/blue/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
     "name": "buttonCounter/outline/bgColor/hover",
     "value": {
-      "r": 0.3137254901960784,
+      "r": 0.0196078431372549,
       "g": 0.11372549019607843,
       "b": 0.30196078431372547,
       "a": 0.2
     },
     "type": "COLOR",
     "alpha": 0.2,
-    "refId": "pattern/mode/buttonCounter/outline/bgColor/hover",
+    "refId": "mode/buttonCounter/outline/bgColor/hover",
     "reference": "base/color/dark/base/color/blue/9",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
     "name": "buttonCounter/outline/bgColor/rest",
     "value": {
-      "r": 0.3137254901960784,
+      "r": 0.0196078431372549,
       "g": 0.11372549019607843,
       "b": 0.30196078431372547,
       "a": 0.2
     },
     "type": "COLOR",
     "alpha": 0.2,
-    "refId": "pattern/mode/buttonCounter/outline/bgColor/rest",
+    "refId": "mode/buttonCounter/outline/bgColor/rest",
     "reference": "base/color/dark/base/color/blue/9",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
     "name": "buttonCounter/primary/bgColor/rest",
     "value": {
-      "r": 0.25098039215686274,
+      "r": 0.01568627450980392,
       "g": 0.14901960784313725,
-      "b": 0.9411764705882353,
+      "b": 0.058823529411764705,
       "a": 0.2
     },
     "type": "COLOR",
     "alpha": 0.2,
-    "refId": "pattern/mode/buttonCounter/primary/bgColor/rest",
+    "refId": "mode/buttonCounter/primary/bgColor/rest",
     "reference": "base/color/dark/base/color/green/9",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2000,10 +2131,11 @@
     },
     "type": "COLOR",
     "alpha": 1,
-    "refId": "pattern/mode/buttonCounter/invisible/bgColor/rest",
+    "refId": "mode/buttonCounter/invisible/bgColor/rest",
     "reference": "base/color/dark/base/color/gray/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2015,10 +2147,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/buttonCounter/default/bgColor/rest",
+    "refId": "mode/buttonCounter/default/bgColor/rest",
     "reference": "base/color/dark/base/color/gray/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2030,10 +2163,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/borderColor/hover",
+    "refId": "mode/button/danger/borderColor/hover",
     "reference": "base/color/dark/base/color/red/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2046,10 +2180,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/button/danger/bgColor/active",
+    "refId": "mode/button/danger/bgColor/active",
     "reference": "base/color/dark/base/color/red/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2061,10 +2196,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/bgColor/hover",
+    "refId": "mode/button/danger/bgColor/hover",
     "reference": "base/color/dark/base/color/red/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2076,10 +2212,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/iconColor/hover",
+    "refId": "mode/button/danger/iconColor/hover",
     "reference": "base/color/dark/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2091,10 +2228,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/fgColor/active",
+    "refId": "mode/button/danger/fgColor/active",
     "reference": "base/color/dark/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2106,10 +2244,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/fgColor/hover",
+    "refId": "mode/button/danger/fgColor/hover",
     "reference": "base/color/dark/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2121,10 +2260,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/bgColor/disabled",
+    "refId": "mode/button/outline/bgColor/disabled",
     "reference": "base/color/dark/base/color/gray/9",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2136,10 +2276,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/bgColor/active",
+    "refId": "mode/button/outline/bgColor/active",
     "reference": "base/color/dark/base/color/blue/7",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2151,10 +2292,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/bgColor/hover",
+    "refId": "mode/button/outline/bgColor/hover",
     "reference": "base/color/dark/base/color/gray/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2166,10 +2308,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/bgColor/rest",
+    "refId": "mode/button/outline/bgColor/rest",
     "reference": "base/color/dark/base/color/gray/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2181,10 +2324,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/fgColor/active",
+    "refId": "mode/button/outline/fgColor/active",
     "reference": "base/color/dark/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2196,10 +2340,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/fgColor/hover",
+    "refId": "mode/button/outline/fgColor/hover",
     "reference": "base/color/dark/base/color/blue/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2211,10 +2356,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/fgColor/rest",
+    "refId": "mode/button/outline/fgColor/rest",
     "reference": "base/color/dark/base/color/blue/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2226,10 +2372,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/invisible/fgColor/hover",
+    "refId": "mode/button/invisible/fgColor/hover",
     "reference": "base/color/dark/base/color/blue/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2242,10 +2389,11 @@
     },
     "type": "COLOR",
     "alpha": 0.1,
-    "refId": "pattern/mode/button/primary/borderColor/rest",
+    "refId": "mode/button/primary/borderColor/rest",
     "reference": "base/color/dark/base/color/gray/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2258,10 +2406,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/button/primary/bgColor/disabled",
+    "refId": "mode/button/primary/bgColor/disabled",
     "reference": "base/color/dark/base/color/green/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2273,10 +2422,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/primary/iconColor/rest",
+    "refId": "mode/button/primary/iconColor/rest",
     "reference": "base/color/dark/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2289,10 +2439,11 @@
     },
     "type": "COLOR",
     "alpha": 0.5,
-    "refId": "pattern/mode/button/primary/fgColor/disabled",
+    "refId": "mode/button/primary/fgColor/disabled",
     "reference": "base/color/dark/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2304,10 +2455,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/primary/fgColor/rest",
+    "refId": "mode/button/primary/fgColor/rest",
     "reference": "base/color/dark/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2319,10 +2471,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/counter/borderColor",
+    "refId": "mode/counter/borderColor",
     "reference": "base/color/dark/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2334,10 +2487,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlKnob/bgColor/checked",
+    "refId": "mode/controlKnob/bgColor/checked",
     "reference": "base/color/dark/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2349,10 +2503,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlKnob/bgColor/rest",
+    "refId": "mode/controlKnob/bgColor/rest",
     "reference": "base/color/dark/base/color/black",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2364,10 +2519,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlTrack/borderColor/rest",
+    "refId": "mode/controlTrack/borderColor/rest",
     "reference": "base/color/dark/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2380,10 +2536,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/controlTrack/bgColor/active",
+    "refId": "mode/controlTrack/bgColor/active",
     "reference": "base/color/dark/base/color/gray/7",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2396,10 +2553,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/controlTrack/bgColor/hover",
+    "refId": "mode/controlTrack/bgColor/hover",
     "reference": "base/color/dark/base/color/gray/7",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2411,10 +2569,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlTrack/bgColor/rest",
+    "refId": "mode/controlTrack/bgColor/rest",
     "reference": "base/color/dark/base/color/gray/7",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2426,10 +2585,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/checked/fgColor/disabled",
+    "refId": "mode/control/checked/fgColor/disabled",
     "reference": "base/color/dark/base/color/black",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2441,10 +2601,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/danger/fgColor/hover",
+    "refId": "mode/control/danger/fgColor/hover",
     "reference": "base/color/dark/base/color/red/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2456,10 +2617,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/transparent/borderColor/active",
+    "refId": "mode/control/transparent/borderColor/active",
     "reference": "base/color/dark/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2471,10 +2633,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/transparent/borderColor/hover",
+    "refId": "mode/control/transparent/borderColor/hover",
     "reference": "base/color/dark/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2486,10 +2649,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/transparent/borderColor/rest",
+    "refId": "mode/control/transparent/borderColor/rest",
     "reference": "base/color/dark/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2502,10 +2666,11 @@
     },
     "type": "COLOR",
     "alpha": 0.08,
-    "refId": "pattern/mode/control/transparent/bgColor/selected",
+    "refId": "mode/control/transparent/bgColor/selected",
     "reference": "base/color/dark/base/color/gray/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2517,10 +2682,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/transparent/bgColor/disabled",
+    "refId": "mode/control/transparent/bgColor/disabled",
     "reference": "base/color/dark/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2533,10 +2699,11 @@
     },
     "type": "COLOR",
     "alpha": 0.2,
-    "refId": "pattern/mode/control/transparent/bgColor/active",
+    "refId": "mode/control/transparent/bgColor/active",
     "reference": "base/color/dark/base/color/gray/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2549,10 +2716,11 @@
     },
     "type": "COLOR",
     "alpha": 0.12,
-    "refId": "pattern/mode/control/transparent/bgColor/hover",
+    "refId": "mode/control/transparent/bgColor/hover",
     "reference": "base/color/dark/base/color/gray/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2564,10 +2732,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/transparent/bgColor/rest",
+    "refId": "mode/control/transparent/bgColor/rest",
     "reference": "base/color/dark/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2579,10 +2748,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/borderColor/selected",
+    "refId": "mode/control/borderColor/selected",
     "reference": "base/color/dark/base/color/gray/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2595,10 +2765,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/control/borderColor/emphasis",
+    "refId": "mode/control/borderColor/emphasis",
     "reference": "base/color/dark/base/color/gray/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2610,10 +2781,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/fgColor/placeholder",
+    "refId": "mode/control/fgColor/placeholder",
     "reference": "base/color/dark/base/color/gray/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2625,10 +2797,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/fgColor/rest",
+    "refId": "mode/control/fgColor/rest",
     "reference": "base/color/dark/base/color/gray/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2640,10 +2813,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/bgColor/selected",
+    "refId": "mode/control/bgColor/selected",
     "reference": "base/color/dark/base/color/gray/8",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2656,10 +2830,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/control/bgColor/active",
+    "refId": "mode/control/bgColor/active",
     "reference": "base/color/dark/base/color/gray/7",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2672,10 +2847,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/control/bgColor/hover",
+    "refId": "mode/control/bgColor/hover",
     "reference": "base/color/dark/base/color/gray/7",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2687,10 +2863,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/bgColor/rest",
+    "refId": "mode/control/bgColor/rest",
     "reference": "base/color/dark/base/color/gray/7",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2702,10 +2879,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/avatarStack/fade/bgColor/muted",
+    "refId": "mode/avatarStack/fade/bgColor/muted",
     "reference": "base/color/dark/base/color/gray/7",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2717,10 +2895,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/avatarStack/fade/bgColor/default",
+    "refId": "mode/avatarStack/fade/bgColor/default",
     "reference": "base/color/dark/base/color/gray/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2733,10 +2912,11 @@
     },
     "type": "COLOR",
     "alpha": 0.1,
-    "refId": "pattern/mode/avatar/bgColor",
+    "refId": "mode/avatar/bgColor",
     "reference": "base/color/dark/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2748,10 +2928,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/headerSearch/borderColor",
+    "refId": "mode/headerSearch/borderColor",
     "reference": "base/color/dark/base/color/gray/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2763,10 +2944,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/headerSearch/bgColor",
+    "refId": "mode/headerSearch/bgColor",
     "reference": "base/color/dark/base/color/gray/9",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2778,10 +2960,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/header/borderColor/divider",
+    "refId": "mode/header/borderColor/divider",
     "reference": "base/color/dark/base/color/gray/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2794,10 +2977,11 @@
     },
     "type": "COLOR",
     "alpha": 0.95,
-    "refId": "pattern/mode/header/bgColor",
+    "refId": "mode/header/bgColor",
     "reference": "base/color/dark/base/color/gray/8",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2809,10 +2993,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/header/fgColor/logo",
+    "refId": "mode/header/fgColor/logo",
     "reference": "base/color/dark/base/color/gray/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2825,10 +3010,11 @@
     },
     "type": "COLOR",
     "alpha": 0.7,
-    "refId": "pattern/mode/header/fgColor/default",
+    "refId": "mode/header/fgColor/default",
     "reference": "base/color/dark/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2840,10 +3026,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/syntax/fgColor/variable",
+    "refId": "mode/codeMirror/syntax/fgColor/variable",
     "reference": "base/color/dark/base/color/orange/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2855,10 +3042,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/syntax/fgColor/support",
+    "refId": "mode/codeMirror/syntax/fgColor/support",
     "reference": "base/color/dark/base/color/blue/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2870,10 +3058,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/syntax/fgColor/string",
+    "refId": "mode/codeMirror/syntax/fgColor/string",
     "reference": "base/color/dark/base/color/blue/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2885,10 +3074,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/syntax/fgColor/storage",
+    "refId": "mode/codeMirror/syntax/fgColor/storage",
     "reference": "base/color/dark/base/color/red/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2900,10 +3090,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/syntax/fgColor/keyword",
+    "refId": "mode/codeMirror/syntax/fgColor/keyword",
     "reference": "base/color/dark/base/color/red/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2915,10 +3106,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/syntax/fgColor/entity",
+    "refId": "mode/codeMirror/syntax/fgColor/entity",
     "reference": "base/color/dark/base/color/purple/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2930,10 +3122,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/syntax/fgColor/constant",
+    "refId": "mode/codeMirror/syntax/fgColor/constant",
     "reference": "base/color/dark/base/color/blue/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2945,10 +3138,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/syntax/fgColor/comment",
+    "refId": "mode/codeMirror/syntax/fgColor/comment",
     "reference": "base/color/dark/base/color/gray/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2961,10 +3155,11 @@
     },
     "type": "COLOR",
     "alpha": 0.4,
-    "refId": "pattern/mode/diffBlob/deletion/bgColor/word",
+    "refId": "mode/diffBlob/deletion/bgColor/word",
     "reference": "base/color/dark/base/color/red/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2977,10 +3172,11 @@
     },
     "type": "COLOR",
     "alpha": 0.15,
-    "refId": "pattern/mode/diffBlob/deletion/bgColor/line",
+    "refId": "mode/diffBlob/deletion/bgColor/line",
     "reference": "base/color/dark/base/color/red/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2993,10 +3189,11 @@
     },
     "type": "COLOR",
     "alpha": 0.3,
-    "refId": "pattern/mode/diffBlob/deletion/bgColor/num",
+    "refId": "mode/diffBlob/deletion/bgColor/num",
     "reference": "base/color/dark/base/color/red/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3009,10 +3206,11 @@
     },
     "type": "COLOR",
     "alpha": 0.4,
-    "refId": "pattern/mode/diffBlob/addition/bgColor/word",
+    "refId": "mode/diffBlob/addition/bgColor/word",
     "reference": "base/color/dark/base/color/green/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3025,10 +3223,11 @@
     },
     "type": "COLOR",
     "alpha": 0.15,
-    "refId": "pattern/mode/diffBlob/addition/bgColor/line",
+    "refId": "mode/diffBlob/addition/bgColor/line",
     "reference": "base/color/dark/base/color/green/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3041,10 +3240,11 @@
     },
     "type": "COLOR",
     "alpha": 0.3,
-    "refId": "pattern/mode/diffBlob/addition/bgColor/num",
+    "refId": "mode/diffBlob/addition/bgColor/num",
     "reference": "base/color/dark/base/color/green/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3057,10 +3257,11 @@
     },
     "type": "COLOR",
     "alpha": 0.4,
-    "refId": "pattern/mode/highlight/neutral/bgColor",
+    "refId": "mode/highlight/neutral/bgColor",
     "reference": "base/color/dark/base/color/yellow/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3072,10 +3273,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/topicTag/borderColor",
+    "refId": "mode/topicTag/borderColor",
     "reference": "base/color/dark/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3091,6 +3293,7 @@
     "reference": "mode/borderColor/success-emphasis",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3106,6 +3309,7 @@
     "reference": "mode/borderColor/success-muted",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3121,6 +3325,7 @@
     "reference": "mode/bgColor/disabled",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3137,6 +3342,7 @@
     "reference": "mode/borderColor/default",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3152,6 +3358,7 @@
     "reference": "mode/bgColor/success-emphasis",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3168,6 +3375,7 @@
     "reference": "mode/bgColor/success-muted",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3183,6 +3391,7 @@
     "reference": "mode/fgColor/danger-onInverse",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3198,6 +3407,7 @@
     "reference": "mode/fgColor/success-onInverse",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3213,6 +3423,7 @@
     "reference": "mode/fgColor/success",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3228,6 +3439,7 @@
     "reference": "mode/fgColor/accent-onInverse",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3243,6 +3455,7 @@
     "reference": "mode/fgColor/accent",
     "collection": "mode",
     "mode": "dark",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3254,10 +3467,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/underlineNav/iconColor/rest",
+    "refId": "mode/underlineNav/iconColor/rest",
     "reference": "mode/fgColor/muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3269,10 +3483,11 @@
       "a": 0.4
     },
     "type": "COLOR",
-    "refId": "pattern/mode/underlineNav/borderColor/hover",
+    "refId": "mode/underlineNav/borderColor/hover",
     "reference": "mode/borderColor/neutral-muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3284,10 +3499,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/treeViewItem/leadingVisual/iconColor/rest",
+    "refId": "mode/treeViewItem/leadingVisual/iconColor/rest",
     "reference": "mode/fgColor/muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3299,10 +3515,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/focus/outlineColor",
+    "refId": "mode/focus/outlineColor",
     "reference": "mode/borderColor/accent-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3315,10 +3532,11 @@
     },
     "type": "COLOR",
     "alpha": 0.5,
-    "refId": "pattern/mode/buttonCounter/danger/fgColor/disabled",
+    "refId": "mode/buttonCounter/danger/fgColor/disabled",
     "reference": "mode/fgColor/danger",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3330,10 +3548,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/buttonCounter/danger/fgColor/rest",
+    "refId": "mode/buttonCounter/danger/fgColor/rest",
     "reference": "mode/fgColor/danger",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3346,10 +3565,11 @@
     },
     "type": "COLOR",
     "alpha": 0.05,
-    "refId": "pattern/mode/buttonCounter/danger/bgColor/disabled",
+    "refId": "mode/buttonCounter/danger/bgColor/disabled",
     "reference": "mode/bgColor/danger-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3362,10 +3582,11 @@
     },
     "type": "COLOR",
     "alpha": 0.5,
-    "refId": "pattern/mode/buttonCounter/outline/fgColor/disabled",
+    "refId": "mode/buttonCounter/outline/fgColor/disabled",
     "reference": "mode/fgColor/accent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3378,10 +3599,11 @@
     },
     "type": "COLOR",
     "alpha": 0.05,
-    "refId": "pattern/mode/buttonCounter/outline/bgColor/disabled",
+    "refId": "mode/buttonCounter/outline/bgColor/disabled",
     "reference": "mode/bgColor/accent-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3393,10 +3615,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/borderColor/active",
-    "reference": "pattern/mode/button/danger/bgColor/active",
-    "collection": "pattern/mode",
+    "refId": "mode/button/danger/borderColor/active",
+    "reference": "mode/button/danger/bgColor/active",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3408,10 +3631,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/borderColor/rest",
+    "refId": "mode/button/danger/borderColor/rest",
     "reference": "mode/borderColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3423,10 +3647,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/bgColor/rest",
-    "reference": "pattern/mode/control/bgColor/rest",
-    "collection": "pattern/mode",
+    "refId": "mode/button/danger/bgColor/rest",
+    "reference": "mode/control/bgColor/rest",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3438,10 +3663,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/iconColor/rest",
+    "refId": "mode/button/danger/iconColor/rest",
     "reference": "mode/fgColor/danger",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3454,10 +3680,11 @@
     },
     "type": "COLOR",
     "alpha": 0.5,
-    "refId": "pattern/mode/button/danger/fgColor/disabled",
+    "refId": "mode/button/danger/fgColor/disabled",
     "reference": "mode/fgColor/danger",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3469,10 +3696,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/fgColor/rest",
+    "refId": "mode/button/danger/fgColor/rest",
     "reference": "mode/fgColor/danger",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3485,10 +3713,11 @@
     },
     "type": "COLOR",
     "alpha": 0.5,
-    "refId": "pattern/mode/button/outline/fgColor/disabled",
+    "refId": "mode/button/outline/fgColor/disabled",
     "reference": "mode/fgColor/accent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3500,10 +3729,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/invisible/borderColor/hover",
-    "reference": "pattern/mode/control/transparent/borderColor/hover",
-    "collection": "pattern/mode",
+    "refId": "mode/button/invisible/borderColor/hover",
+    "reference": "mode/control/transparent/borderColor/hover",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3515,10 +3745,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/invisible/borderColor/rest",
-    "reference": "pattern/mode/control/transparent/borderColor/rest",
-    "collection": "pattern/mode",
+    "refId": "mode/button/invisible/borderColor/rest",
+    "reference": "mode/control/transparent/borderColor/rest",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3530,10 +3761,11 @@
       "a": 0.2
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/invisible/bgColor/active",
-    "reference": "pattern/mode/control/transparent/bgColor/active",
-    "collection": "pattern/mode",
+    "refId": "mode/button/invisible/bgColor/active",
+    "reference": "mode/control/transparent/bgColor/active",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3545,10 +3777,11 @@
       "a": 0.12
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/invisible/bgColor/hover",
-    "reference": "pattern/mode/control/transparent/bgColor/hover",
-    "collection": "pattern/mode",
+    "refId": "mode/button/invisible/bgColor/hover",
+    "reference": "mode/control/transparent/bgColor/hover",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3560,10 +3793,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/invisible/bgColor/rest",
-    "reference": "pattern/mode/control/transparent/bgColor/rest",
-    "collection": "pattern/mode",
+    "refId": "mode/button/invisible/bgColor/rest",
+    "reference": "mode/control/transparent/bgColor/rest",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3575,10 +3809,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/invisible/fgColor/rest",
+    "refId": "mode/button/invisible/fgColor/rest",
     "reference": "mode/fgColor/accent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3590,10 +3825,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/primary/borderColor/disabled",
-    "reference": "pattern/mode/button/primary/bgColor/disabled",
-    "collection": "pattern/mode",
+    "refId": "mode/button/primary/borderColor/disabled",
+    "reference": "mode/button/primary/bgColor/disabled",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3605,10 +3841,11 @@
       "a": 0.1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/primary/borderColor/hover",
-    "reference": "pattern/mode/button/primary/borderColor/rest",
-    "collection": "pattern/mode",
+    "refId": "mode/button/primary/borderColor/hover",
+    "reference": "mode/button/primary/borderColor/rest",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3621,10 +3858,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/button/primary/bgColor/active",
+    "refId": "mode/button/primary/bgColor/active",
     "reference": "mode/bgColor/success-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3637,10 +3875,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/button/primary/bgColor/hover",
+    "refId": "mode/button/primary/bgColor/hover",
     "reference": "mode/bgColor/success-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3652,10 +3891,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/primary/bgColor/rest",
+    "refId": "mode/button/primary/bgColor/rest",
     "reference": "mode/bgColor/success-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3667,10 +3907,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/default/borderColor/active",
+    "refId": "mode/button/default/borderColor/active",
     "reference": "mode/borderColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3682,10 +3923,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/default/borderColor/hover",
+    "refId": "mode/button/default/borderColor/hover",
     "reference": "mode/borderColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3697,10 +3939,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/default/borderColor/rest",
+    "refId": "mode/button/default/borderColor/rest",
     "reference": "mode/borderColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3712,10 +3955,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/default/bgColor/selected",
-    "reference": "pattern/mode/control/bgColor/active",
-    "collection": "pattern/mode",
+    "refId": "mode/button/default/bgColor/selected",
+    "reference": "mode/control/bgColor/active",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3727,10 +3971,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/default/bgColor/active",
-    "reference": "pattern/mode/control/bgColor/active",
-    "collection": "pattern/mode",
+    "refId": "mode/button/default/bgColor/active",
+    "reference": "mode/control/bgColor/active",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3742,10 +3987,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/default/bgColor/hover",
-    "reference": "pattern/mode/control/bgColor/hover",
-    "collection": "pattern/mode",
+    "refId": "mode/button/default/bgColor/hover",
+    "reference": "mode/control/bgColor/hover",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3757,10 +4003,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/default/bgColor/rest",
-    "reference": "pattern/mode/control/bgColor/rest",
-    "collection": "pattern/mode",
+    "refId": "mode/button/default/bgColor/rest",
+    "reference": "mode/control/bgColor/rest",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3772,10 +4019,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/default/fgColor/rest",
-    "reference": "pattern/mode/control/fgColor/rest",
-    "collection": "pattern/mode",
+    "refId": "mode/button/default/fgColor/rest",
+    "reference": "mode/control/fgColor/rest",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3787,10 +4035,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlKnob/borderColor/rest",
-    "reference": "pattern/mode/control/borderColor/emphasis",
-    "collection": "pattern/mode",
+    "refId": "mode/controlKnob/borderColor/rest",
+    "reference": "mode/control/borderColor/emphasis",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3802,10 +4051,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlTrack/borderColor/disabled",
+    "refId": "mode/controlTrack/borderColor/disabled",
     "reference": "mode/fgColor/disabled",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3817,10 +4067,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlTrack/fgColor/disabled",
+    "refId": "mode/controlTrack/fgColor/disabled",
     "reference": "mode/fgColor/muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3832,10 +4083,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlTrack/fgColor/rest",
+    "refId": "mode/controlTrack/fgColor/rest",
     "reference": "mode/fgColor/muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3847,10 +4099,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlTrack/bgColor/disabled",
+    "refId": "mode/controlTrack/bgColor/disabled",
     "reference": "mode/fgColor/disabled",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3862,10 +4115,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/checked/borderColor/disabled",
+    "refId": "mode/control/checked/borderColor/disabled",
     "reference": "mode/fgColor/disabled",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3878,10 +4132,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/control/checked/borderColor/active",
+    "refId": "mode/control/checked/borderColor/active",
     "reference": "mode/bgColor/accent-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3894,10 +4149,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/control/checked/borderColor/hover",
+    "refId": "mode/control/checked/borderColor/hover",
     "reference": "mode/bgColor/accent-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3909,10 +4165,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/checked/borderColor/rest",
+    "refId": "mode/control/checked/borderColor/rest",
     "reference": "mode/bgColor/accent-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3924,10 +4181,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/checked/fgColor/rest",
+    "refId": "mode/control/checked/fgColor/rest",
     "reference": "mode/fgColor/onEmphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3939,10 +4197,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/checked/bgColor/disabled",
+    "refId": "mode/control/checked/bgColor/disabled",
     "reference": "mode/fgColor/disabled",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3955,10 +4214,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/control/checked/bgColor/active",
+    "refId": "mode/control/checked/bgColor/active",
     "reference": "mode/bgColor/accent-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3971,10 +4231,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/control/checked/bgColor/hover",
+    "refId": "mode/control/checked/bgColor/hover",
     "reference": "mode/bgColor/accent-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3986,10 +4247,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/checked/bgColor/rest",
+    "refId": "mode/control/checked/bgColor/rest",
     "reference": "mode/bgColor/accent-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4002,10 +4264,11 @@
     },
     "type": "COLOR",
     "alpha": 0.4,
-    "refId": "pattern/mode/control/danger/bgColor/active",
+    "refId": "mode/control/danger/bgColor/active",
     "reference": "mode/bgColor/danger-muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4017,10 +4280,11 @@
       "a": 0.1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/danger/bgColor/hover",
+    "refId": "mode/control/danger/bgColor/hover",
     "reference": "mode/bgColor/danger-muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4032,10 +4296,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/danger/fgColor/rest",
+    "refId": "mode/control/danger/fgColor/rest",
     "reference": "mode/fgColor/danger",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4047,10 +4312,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/iconColor/rest",
+    "refId": "mode/control/iconColor/rest",
     "reference": "mode/fgColor/muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4062,10 +4328,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/borderColor/warning",
+    "refId": "mode/control/borderColor/warning",
     "reference": "mode/borderColor/attention-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4077,10 +4344,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/borderColor/danger",
+    "refId": "mode/control/borderColor/danger",
     "reference": "mode/borderColor/danger-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4092,10 +4360,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/borderColor/success",
+    "refId": "mode/control/borderColor/success",
     "reference": "mode/borderColor/success-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4107,10 +4376,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/borderColor/rest",
+    "refId": "mode/control/borderColor/rest",
     "reference": "mode/borderColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4122,10 +4392,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/fgColor/disabled",
+    "refId": "mode/control/fgColor/disabled",
     "reference": "mode/fgColor/disabled",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4137,10 +4408,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/bgColor/disabled",
+    "refId": "mode/control/bgColor/disabled",
     "reference": "mode/bgColor/disabled",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4152,10 +4424,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/lines/bgColor",
+    "refId": "mode/codeMirror/lines/bgColor",
     "reference": "mode/bgColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4167,10 +4440,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/matchingBracket/fgColor",
+    "refId": "mode/codeMirror/matchingBracket/fgColor",
     "reference": "mode/fgColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4182,10 +4456,11 @@
       "a": 0.15
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/activeline/bgColor",
+    "refId": "mode/codeMirror/activeline/bgColor",
     "reference": "mode/bgColor/neutral-muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4197,10 +4472,11 @@
       "a": 0.4
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/selection/bgColor",
+    "refId": "mode/codeMirror/selection/bgColor",
     "reference": "mode/borderColor/accent-muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4212,10 +4488,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/cursor/fgColor",
+    "refId": "mode/codeMirror/cursor/fgColor",
     "reference": "mode/fgColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4227,10 +4504,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/lineNumber/fgColor",
+    "refId": "mode/codeMirror/lineNumber/fgColor",
     "reference": "mode/fgColor/muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4242,10 +4520,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/gutterMarker/fgColor/muted",
+    "refId": "mode/codeMirror/gutterMarker/fgColor/muted",
     "reference": "mode/fgColor/muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4257,10 +4536,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/gutterMarker/fgColor/default",
+    "refId": "mode/codeMirror/gutterMarker/fgColor/default",
     "reference": "mode/bgColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4272,10 +4552,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/gutters/bgColor",
+    "refId": "mode/codeMirror/gutters/bgColor",
     "reference": "mode/bgColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4287,10 +4568,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/bgColor",
+    "refId": "mode/codeMirror/bgColor",
     "reference": "mode/bgColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4302,10 +4584,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/fgColor",
+    "refId": "mode/codeMirror/fgColor",
     "reference": "mode/fgColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4317,10 +4600,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/diffStat/addition/bgColor",
+    "refId": "mode/diffStat/addition/bgColor",
     "reference": "mode/bgColor/success-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4332,10 +4616,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/diffBlob/expander/iconColor",
+    "refId": "mode/diffBlob/expander/iconColor",
     "reference": "mode/fgColor/muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4347,10 +4632,11 @@
       "a": 0.4
     },
     "type": "COLOR",
-    "refId": "pattern/mode/diffBlob/hunk/bgColor/num",
+    "refId": "mode/diffBlob/hunk/bgColor/num",
     "reference": "mode/borderColor/accent-muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4362,10 +4648,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/diffBlob/deletion/fgColor/num",
+    "refId": "mode/diffBlob/deletion/fgColor/num",
     "reference": "mode/fgColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4377,10 +4664,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/diffBlob/deletion/fgColor/text",
+    "refId": "mode/diffBlob/deletion/fgColor/text",
     "reference": "mode/fgColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4392,10 +4680,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/diffBlob/addition/fgColor/num",
+    "refId": "mode/diffBlob/addition/fgColor/num",
     "reference": "mode/fgColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4407,10 +4696,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/diffBlob/addition/fgColor/text",
+    "refId": "mode/diffBlob/addition/fgColor/text",
     "reference": "mode/fgColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4422,10 +4712,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/page/header/bgColor",
+    "refId": "mode/page/header/bgColor",
     "reference": "mode/bgColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4437,10 +4728,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/bgColor/disabled",
-    "reference": "pattern/mode/control/bgColor/disabled",
-    "collection": "pattern/mode",
+    "refId": "mode/button/danger/bgColor/disabled",
+    "reference": "mode/control/bgColor/disabled",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4452,10 +4744,11 @@
       "a": 0.4
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/borderColor/selected",
+    "refId": "mode/button/outline/borderColor/selected",
     "reference": "mode/borderColor/muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4467,10 +4760,11 @@
       "a": 0.4
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/borderColor/hover",
+    "refId": "mode/button/outline/borderColor/hover",
     "reference": "mode/borderColor/muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4482,10 +4776,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/invisible/bgColor/disabled",
-    "reference": "pattern/mode/control/bgColor/disabled",
-    "collection": "pattern/mode",
+    "refId": "mode/button/invisible/bgColor/disabled",
+    "reference": "mode/control/bgColor/disabled",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4497,10 +4792,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/invisible/fgColor/disabled",
-    "reference": "pattern/mode/control/fgColor/disabled",
-    "collection": "pattern/mode",
+    "refId": "mode/button/invisible/fgColor/disabled",
+    "reference": "mode/control/fgColor/disabled",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4512,10 +4808,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/default/bgColor/disabled",
-    "reference": "pattern/mode/control/bgColor/disabled",
-    "collection": "pattern/mode",
+    "refId": "mode/button/default/bgColor/disabled",
+    "reference": "mode/control/bgColor/disabled",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4527,10 +4824,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlKnob/borderColor/checked",
-    "reference": "pattern/mode/control/checked/bgColor/rest",
-    "collection": "pattern/mode",
+    "refId": "mode/controlKnob/borderColor/checked",
+    "reference": "mode/control/checked/bgColor/rest",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4542,10 +4840,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlKnob/borderColor/disabled",
-    "reference": "pattern/mode/control/bgColor/disabled",
-    "collection": "pattern/mode",
+    "refId": "mode/controlKnob/borderColor/disabled",
+    "reference": "mode/control/bgColor/disabled",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4557,10 +4856,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlKnob/bgColor/disabled",
-    "reference": "pattern/mode/control/bgColor/disabled",
-    "collection": "pattern/mode",
+    "refId": "mode/controlKnob/bgColor/disabled",
+    "reference": "mode/control/bgColor/disabled",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4572,10 +4872,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/borderColor/disabled",
+    "refId": "mode/control/borderColor/disabled",
     "reference": "mode/borderColor/disabled",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4587,10 +4888,11 @@
       "a": 0.4
     },
     "type": "COLOR",
-    "refId": "pattern/mode/avatar/borderColor",
+    "refId": "mode/avatar/borderColor",
     "reference": "mode/borderColor/muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4602,10 +4904,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/invisible/borderColor/disabled",
-    "reference": "pattern/mode/control/borderColor/disabled",
-    "collection": "pattern/mode",
+    "refId": "mode/button/invisible/borderColor/disabled",
+    "reference": "mode/control/borderColor/disabled",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4617,10 +4920,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/default/borderColor/disabled",
-    "reference": "pattern/mode/control/borderColor/disabled",
-    "collection": "pattern/mode",
+    "refId": "mode/button/default/borderColor/disabled",
+    "reference": "mode/control/borderColor/disabled",
+    "collection": "mode",
     "mode": "dark",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   }
 ]