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

package/tokens-next-private/figma/themes/light.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": "light",
+    "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": "light",
+    "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/light/base/color/gray/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/purple/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/blue/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/gray/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/orange/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/orange/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/green/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/green/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/red/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/red/7",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/gray/9",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/gray/9",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/blue/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/yellow/9",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/green/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/red/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/gray/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/red/7",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/gray/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/gray/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/red/7",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/orange/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/blue/8",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/red/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/blue/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/gray/9",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/purple/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/blue/8",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/blue/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/gray/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/purple/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/purple/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/blue/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/blue/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/yellow/7",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/yellow/8",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/green/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/green/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/red/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/red/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/gray/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/gray/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/gray/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/gray/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "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/light/base/color/gray/9",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "syntax",
     "scopes": ["ALL_SCOPES"]
   },
   {
@@ -715,6 +762,7 @@
     "reference": "base/color/light/base/color/pink/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -731,6 +779,7 @@
     "reference": "base/color/light/base/color/pink/3",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -746,6 +795,7 @@
     "reference": "base/color/light/base/color/purple/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -762,6 +812,7 @@
     "reference": "base/color/light/base/color/purple/3",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -777,6 +828,7 @@
     "reference": "base/color/light/base/color/red/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -793,6 +845,7 @@
     "reference": "base/color/light/base/color/red/3",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -808,6 +861,7 @@
     "reference": "base/color/light/base/color/red/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -824,6 +878,7 @@
     "reference": "base/color/light/base/color/red/3",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -839,6 +894,7 @@
     "reference": "base/color/light/base/color/orange/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -855,6 +911,7 @@
     "reference": "base/color/light/base/color/orange/3",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -870,6 +927,7 @@
     "reference": "base/color/light/base/color/yellow/4",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -886,21 +944,23 @@
     "reference": "base/color/light/base/color/yellow/3",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
     "name": "borderColor/success-emphasis",
     "value": {
-      "r": 0.17647058823529413,
-      "g": 0.6431372549019608,
-      "b": 0.3058823529411765,
+      "r": 0.10196078431372549,
+      "g": 0.4980392156862745,
+      "b": 0.21568627450980393,
       "a": 1
     },
     "type": "COLOR",
     "refId": "mode/borderColor/success-emphasis",
-    "reference": "base/color/light/base/color/green/4",
+    "reference": "base/color/light/base/color/green/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -917,6 +977,7 @@
     "reference": "base/color/light/base/color/green/3",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -932,6 +993,7 @@
     "reference": "base/color/light/base/color/blue/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -948,6 +1010,7 @@
     "reference": "base/color/light/base/color/blue/3",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -963,6 +1026,7 @@
     "reference": "base/color/light/base/color/gray/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -979,6 +1043,7 @@
     "reference": "base/color/light/base/color/gray/3",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -994,6 +1059,7 @@
     "reference": "base/color/light/base/color/transparent",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -1009,6 +1075,7 @@
     "reference": "base/color/light/base/color/gray/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -1024,6 +1091,7 @@
     "reference": "base/color/light/base/color/gray/2",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -1039,6 +1107,7 @@
     "reference": "base/color/light/base/color/pink/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1054,6 +1123,7 @@
     "reference": "base/color/light/base/color/pink/0",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1069,6 +1139,7 @@
     "reference": "base/color/light/base/color/purple/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1084,6 +1155,7 @@
     "reference": "base/color/light/base/color/purple/0",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1099,6 +1171,7 @@
     "reference": "base/color/light/base/color/red/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1114,6 +1187,7 @@
     "reference": "base/color/light/base/color/red/0",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1129,6 +1203,7 @@
     "reference": "base/color/light/base/color/red/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1144,6 +1219,7 @@
     "reference": "base/color/light/base/color/red/0",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1159,6 +1235,7 @@
     "reference": "base/color/light/base/color/orange/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1174,6 +1251,7 @@
     "reference": "base/color/light/base/color/orange/0",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1189,6 +1267,7 @@
     "reference": "base/color/light/base/color/yellow/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1204,6 +1283,7 @@
     "reference": "base/color/light/base/color/yellow/0",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1220,6 +1300,7 @@
     "reference": "base/color/light/base/color/green/4",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1235,6 +1316,7 @@
     "reference": "base/color/light/base/color/green/0",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1250,6 +1332,7 @@
     "reference": "base/color/light/base/color/blue/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1265,6 +1348,7 @@
     "reference": "base/color/light/base/color/blue/0",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1280,6 +1364,7 @@
     "reference": "base/color/light/base/color/gray/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1296,6 +1381,7 @@
     "reference": "base/color/light/base/color/gray/1",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1311,6 +1397,7 @@
     "reference": "base/color/light/base/color/transparent",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1326,6 +1413,7 @@
     "reference": "base/color/light/base/color/gray/0",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1341,6 +1429,7 @@
     "reference": "base/color/light/base/color/gray/9",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1356,6 +1445,7 @@
     "reference": "base/color/light/base/color/gray/9",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1371,7 +1461,8 @@
     "reference": "base/color/light/base/color/gray/0",
     "collection": "mode",
     "mode": "light",
-    "scopes": ["FRAME_FILL", "SHAPE_FILL"]
+    "group": "semantic",
+    "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"]
   },
   {
     "name": "bgColor/muted",
@@ -1386,7 +1477,8 @@
     "reference": "base/color/light/base/color/gray/0",
     "collection": "mode",
     "mode": "light",
-    "scopes": ["FRAME_FILL", "SHAPE_FILL"]
+    "group": "semantic",
+    "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"]
   },
   {
     "name": "bgColor/default",
@@ -1401,7 +1493,8 @@
     "reference": "base/color/light/base/color/white",
     "collection": "mode",
     "mode": "light",
-    "scopes": ["FRAME_FILL", "SHAPE_FILL"]
+    "group": "semantic",
+    "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"]
   },
   {
     "name": "fgColor/sponsors-onInverse",
@@ -1416,6 +1509,7 @@
     "reference": "base/color/light/base/color/pink/4",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1431,6 +1525,7 @@
     "reference": "base/color/light/base/color/pink/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1446,6 +1541,7 @@
     "reference": "base/color/light/base/color/purple/4",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1461,6 +1557,7 @@
     "reference": "base/color/light/base/color/purple/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1476,6 +1573,7 @@
     "reference": "base/color/light/base/color/red/4",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1492,6 +1590,7 @@
     "reference": "base/color/light/base/color/red/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1507,6 +1606,7 @@
     "reference": "base/color/light/base/color/orange/3",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1522,6 +1622,7 @@
     "reference": "base/color/light/base/color/orange/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1537,6 +1638,7 @@
     "reference": "base/color/light/base/color/yellow/3",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1552,6 +1654,7 @@
     "reference": "base/color/light/base/color/yellow/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1567,6 +1670,7 @@
     "reference": "base/color/light/base/color/green/3",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1582,6 +1686,7 @@
     "reference": "base/color/light/base/color/green/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1597,6 +1702,7 @@
     "reference": "base/color/light/base/color/blue/3",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1612,6 +1718,7 @@
     "reference": "base/color/light/base/color/blue/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1627,6 +1734,7 @@
     "reference": "base/color/light/base/color/gray/4",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1642,6 +1750,7 @@
     "reference": "base/color/light/base/color/gray/5",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1657,6 +1766,7 @@
     "reference": "base/color/light/base/color/gray/4",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1672,6 +1782,7 @@
     "reference": "base/color/light/base/color/gray/0",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1687,6 +1798,7 @@
     "reference": "base/color/light/base/color/white",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1703,6 +1815,7 @@
     "reference": "base/color/light/base/color/gray/6",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1718,6 +1831,7 @@
     "reference": "base/color/light/base/color/black",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1729,10 +1843,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/underlineNav/borderColor/active",
+    "refId": "mode/underlineNav/borderColor/active",
     "reference": "base/color/light/base/color/coral/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -1744,10 +1859,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/treeViewItem/leadingVisual/iconColor/rest",
+    "refId": "mode/treeViewItem/leadingVisual/iconColor/rest",
     "reference": "base/color/light/base/color/blue/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1759,10 +1875,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/timelineBadge/bgColor",
+    "refId": "mode/timelineBadge/bgColor",
     "reference": "base/color/light/base/color/gray/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1774,10 +1891,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/sideNav/bgColor/selected",
+    "refId": "mode/sideNav/bgColor/selected",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1789,10 +1907,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/selectMenu/bgColor/active",
+    "refId": "mode/selectMenu/bgColor/active",
     "reference": "base/color/light/base/color/blue/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1804,10 +1923,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/selectMenu/borderColor",
+    "refId": "mode/selectMenu/borderColor",
     "reference": "base/color/light/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -1820,10 +1940,11 @@
     },
     "type": "COLOR",
     "alpha": 0.2,
-    "refId": "pattern/mode/overlay/backdrop/bgColor",
+    "refId": "mode/overlay/backdrop/bgColor",
     "reference": "base/color/light/base/color/gray/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1835,10 +1956,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/overlay/bgColor",
+    "refId": "mode/overlay/bgColor",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1850,10 +1972,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/menu/bgColor/active",
+    "refId": "mode/menu/bgColor/active",
     "reference": "base/color/light/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1865,26 +1988,28 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/buttonCounter/danger/fgColor/hover",
+    "refId": "mode/buttonCounter/danger/fgColor/hover",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
     "name": "buttonCounter/danger/fgColor/rest",
     "value": {
       "r": 0.7607843137254902,
-      "g": 0.3568627450980392,
+      "g": 0.10980392156862745,
       "b": 0.17254901960784313,
       "a": 1
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/buttonCounter/danger/fgColor/rest",
+    "refId": "mode/buttonCounter/danger/fgColor/rest",
     "reference": "base/color/light/base/color/red/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1897,10 +2022,11 @@
     },
     "type": "COLOR",
     "alpha": 0.2,
-    "refId": "pattern/mode/buttonCounter/danger/bgColor/hover",
+    "refId": "mode/buttonCounter/danger/bgColor/hover",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1912,10 +2038,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/buttonCounter/outline/fgColor/hover",
+    "refId": "mode/buttonCounter/outline/fgColor/hover",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1927,10 +2054,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/buttonCounter/outline/fgColor/rest",
+    "refId": "mode/buttonCounter/outline/fgColor/rest",
     "reference": "base/color/light/base/color/blue/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -1943,42 +2071,45 @@
     },
     "type": "COLOR",
     "alpha": 0.2,
-    "refId": "pattern/mode/buttonCounter/outline/bgColor/hover",
+    "refId": "mode/buttonCounter/outline/bgColor/hover",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
     "name": "buttonCounter/primary/bgColor/rest",
     "value": {
-      "r": 0.13333333333333333,
-      "g": 0.8666666666666667,
+      "r": 0,
+      "g": 0.17647058823529413,
       "b": 0.06666666666666667,
       "a": 0.2
     },
     "type": "COLOR",
     "alpha": 0.2,
-    "refId": "pattern/mode/buttonCounter/primary/bgColor/rest",
+    "refId": "mode/buttonCounter/primary/bgColor/rest",
     "reference": "base/color/light/base/color/green/9",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
     "name": "button/danger/bgColor/active",
     "value": {
-      "r": 0.596078431372549,
-      "g": 0.788235294117647,
-      "b": 0.13333333333333333,
-      "a": 0.8117647058823529
+      "r": 0.5450980392156862,
+      "g": 0.03137254901960784,
+      "b": 0.12549019607843137,
+      "a": 1
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/button/danger/bgColor/active",
+    "refId": "mode/button/danger/bgColor/active",
     "reference": "base/color/light/base/color/red/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -1990,10 +2121,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/bgColor/hover",
+    "refId": "mode/button/danger/bgColor/hover",
     "reference": "base/color/light/base/color/red/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2005,10 +2137,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/iconColor/hover",
+    "refId": "mode/button/danger/iconColor/hover",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2020,10 +2153,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/fgColor/active",
+    "refId": "mode/button/danger/fgColor/active",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2035,10 +2169,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/fgColor/hover",
+    "refId": "mode/button/danger/fgColor/hover",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2050,10 +2185,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/bgColor/disabled",
+    "refId": "mode/button/outline/bgColor/disabled",
     "reference": "base/color/light/base/color/gray/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2065,10 +2201,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/fgColor/active",
+    "refId": "mode/button/outline/fgColor/active",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2080,10 +2217,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/fgColor/hover",
+    "refId": "mode/button/outline/fgColor/hover",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2096,10 +2234,11 @@
     },
     "type": "COLOR",
     "alpha": 0.15,
-    "refId": "pattern/mode/button/primary/borderColor/rest",
+    "refId": "mode/button/primary/borderColor/rest",
     "reference": "base/color/light/base/color/black",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2112,10 +2251,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/button/primary/bgColor/disabled",
+    "refId": "mode/button/primary/bgColor/disabled",
     "reference": "base/color/light/base/color/green/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2128,10 +2268,11 @@
     },
     "type": "COLOR",
     "alpha": 0.8,
-    "refId": "pattern/mode/button/primary/iconColor/rest",
+    "refId": "mode/button/primary/iconColor/rest",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2144,10 +2285,11 @@
     },
     "type": "COLOR",
     "alpha": 0.8,
-    "refId": "pattern/mode/button/primary/fgColor/disabled",
+    "refId": "mode/button/primary/fgColor/disabled",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2159,10 +2301,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/primary/fgColor/rest",
+    "refId": "mode/button/primary/fgColor/rest",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2174,10 +2317,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/counter/borderColor",
+    "refId": "mode/counter/borderColor",
     "reference": "base/color/light/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2189,10 +2333,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlKnob/bgColor/checked",
+    "refId": "mode/controlKnob/bgColor/checked",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2204,10 +2349,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlKnob/bgColor/rest",
+    "refId": "mode/controlKnob/bgColor/rest",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2219,10 +2365,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlTrack/borderColor/rest",
+    "refId": "mode/controlTrack/borderColor/rest",
     "reference": "base/color/light/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2235,10 +2382,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/controlTrack/bgColor/active",
+    "refId": "mode/controlTrack/bgColor/active",
     "reference": "base/color/light/base/color/gray/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2251,10 +2399,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/controlTrack/bgColor/hover",
+    "refId": "mode/controlTrack/bgColor/hover",
     "reference": "base/color/light/base/color/gray/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2266,10 +2415,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlTrack/bgColor/rest",
+    "refId": "mode/controlTrack/bgColor/rest",
     "reference": "base/color/light/base/color/gray/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2281,10 +2431,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/transparent/borderColor/active",
+    "refId": "mode/control/transparent/borderColor/active",
     "reference": "base/color/light/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2296,10 +2447,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/transparent/borderColor/hover",
+    "refId": "mode/control/transparent/borderColor/hover",
     "reference": "base/color/light/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2311,10 +2463,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/transparent/borderColor/rest",
+    "refId": "mode/control/transparent/borderColor/rest",
     "reference": "base/color/light/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2326,10 +2479,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/transparent/bgColor/selected",
+    "refId": "mode/control/transparent/bgColor/selected",
     "reference": "base/color/light/base/color/gray/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2342,10 +2496,11 @@
     },
     "type": "COLOR",
     "alpha": 0.4,
-    "refId": "pattern/mode/control/transparent/bgColor/active",
+    "refId": "mode/control/transparent/bgColor/active",
     "reference": "base/color/light/base/color/gray/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2358,10 +2513,11 @@
     },
     "type": "COLOR",
     "alpha": 0.2,
-    "refId": "pattern/mode/control/transparent/bgColor/hover",
+    "refId": "mode/control/transparent/bgColor/hover",
     "reference": "base/color/light/base/color/gray/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2373,10 +2529,11 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/transparent/bgColor/rest",
+    "refId": "mode/control/transparent/bgColor/rest",
     "reference": "base/color/light/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2388,10 +2545,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/borderColor/selected",
+    "refId": "mode/control/borderColor/selected",
     "reference": "base/color/light/base/color/gray/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2404,10 +2562,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/control/borderColor/emphasis",
+    "refId": "mode/control/borderColor/emphasis",
     "reference": "base/color/light/base/color/gray/4",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2419,10 +2578,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/fgColor/placeholder",
+    "refId": "mode/control/fgColor/placeholder",
     "reference": "base/color/light/base/color/gray/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2434,10 +2594,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/fgColor/rest",
+    "refId": "mode/control/fgColor/rest",
     "reference": "base/color/light/base/color/gray/9",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2449,10 +2610,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/bgColor/selected",
+    "refId": "mode/control/bgColor/selected",
     "reference": "base/color/light/base/color/gray/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2465,10 +2627,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/control/bgColor/active",
+    "refId": "mode/control/bgColor/active",
     "reference": "base/color/light/base/color/gray/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2481,10 +2644,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/control/bgColor/hover",
+    "refId": "mode/control/bgColor/hover",
     "reference": "base/color/light/base/color/gray/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2496,10 +2660,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/bgColor/rest",
+    "refId": "mode/control/bgColor/rest",
     "reference": "base/color/light/base/color/gray/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2511,10 +2676,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/avatarStack/fade/bgColor/muted",
+    "refId": "mode/avatarStack/fade/bgColor/muted",
     "reference": "base/color/light/base/color/gray/2",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2526,10 +2692,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/avatarStack/fade/bgColor/default",
+    "refId": "mode/avatarStack/fade/bgColor/default",
     "reference": "base/color/light/base/color/gray/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2541,10 +2708,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/avatar/bgColor",
+    "refId": "mode/avatar/bgColor",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2556,10 +2724,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/headerSearch/borderColor",
+    "refId": "mode/headerSearch/borderColor",
     "reference": "base/color/light/base/color/gray/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2571,10 +2740,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/headerSearch/bgColor",
+    "refId": "mode/headerSearch/bgColor",
     "reference": "base/color/light/base/color/gray/9",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2586,10 +2756,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/header/borderColor/divider",
+    "refId": "mode/header/borderColor/divider",
     "reference": "base/color/light/base/color/gray/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2601,10 +2772,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/header/bgColor",
+    "refId": "mode/header/bgColor",
     "reference": "base/color/light/base/color/gray/9",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2616,10 +2788,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/header/fgColor/logo",
+    "refId": "mode/header/fgColor/logo",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2632,10 +2805,11 @@
     },
     "type": "COLOR",
     "alpha": 0.7,
-    "refId": "pattern/mode/header/fgColor/default",
+    "refId": "mode/header/fgColor/default",
     "reference": "base/color/light/base/color/white",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2647,10 +2821,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/syntax/fgColor/variable",
+    "refId": "mode/codeMirror/syntax/fgColor/variable",
     "reference": "base/color/light/base/color/orange/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2662,10 +2837,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/syntax/fgColor/support",
+    "refId": "mode/codeMirror/syntax/fgColor/support",
     "reference": "base/color/light/base/color/blue/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2677,10 +2853,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/syntax/fgColor/string",
+    "refId": "mode/codeMirror/syntax/fgColor/string",
     "reference": "base/color/light/base/color/blue/8",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2692,10 +2869,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/syntax/fgColor/storage",
+    "refId": "mode/codeMirror/syntax/fgColor/storage",
     "reference": "base/color/light/base/color/red/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2707,10 +2885,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/syntax/fgColor/keyword",
+    "refId": "mode/codeMirror/syntax/fgColor/keyword",
     "reference": "base/color/light/base/color/red/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2722,10 +2901,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/syntax/fgColor/entity",
+    "refId": "mode/codeMirror/syntax/fgColor/entity",
     "reference": "base/color/light/base/color/purple/5",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2737,10 +2917,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/syntax/fgColor/constant",
+    "refId": "mode/codeMirror/syntax/fgColor/constant",
     "reference": "base/color/light/base/color/blue/6",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2752,10 +2933,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/syntax/fgColor/comment",
+    "refId": "mode/codeMirror/syntax/fgColor/comment",
     "reference": "base/color/light/base/color/gray/9",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -2768,10 +2950,11 @@
     },
     "type": "COLOR",
     "alpha": 0.4,
-    "refId": "pattern/mode/diffBlob/hunk/bgColor/num",
+    "refId": "mode/diffBlob/hunk/bgColor/num",
     "reference": "base/color/light/base/color/blue/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2784,10 +2967,11 @@
     },
     "type": "COLOR",
     "alpha": 0.4,
-    "refId": "pattern/mode/diffBlob/deletion/bgColor/word",
+    "refId": "mode/diffBlob/deletion/bgColor/word",
     "reference": "base/color/light/base/color/red/3",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2799,10 +2983,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/diffBlob/deletion/bgColor/line",
+    "refId": "mode/diffBlob/deletion/bgColor/line",
     "reference": "base/color/light/base/color/red/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2814,10 +2999,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/diffBlob/deletion/bgColor/num",
+    "refId": "mode/diffBlob/deletion/bgColor/num",
     "reference": "base/color/light/base/color/red/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2829,10 +3015,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/diffBlob/addition/bgColor/word",
+    "refId": "mode/diffBlob/addition/bgColor/word",
     "reference": "base/color/light/base/color/green/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2844,10 +3031,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/diffBlob/addition/bgColor/line",
+    "refId": "mode/diffBlob/addition/bgColor/line",
     "reference": "base/color/light/base/color/green/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2860,10 +3048,11 @@
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/diffBlob/addition/bgColor/num",
+    "refId": "mode/diffBlob/addition/bgColor/num",
     "reference": "base/color/light/base/color/green/1",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2875,10 +3064,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/highlight/neutral/bgColor",
+    "refId": "mode/highlight/neutral/bgColor",
     "reference": "base/color/light/base/color/yellow/0",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2890,18 +3080,19 @@
       "a": 0
     },
     "type": "COLOR",
-    "refId": "pattern/mode/topicTag/borderColor",
+    "refId": "mode/topicTag/borderColor",
     "reference": "base/color/light/base/color/transparent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
     "name": "borderColor/open-emphasis",
     "value": {
-      "r": 0.17647058823529413,
-      "g": 0.6431372549019608,
-      "b": 0.3058823529411765,
+      "r": 0.10196078431372549,
+      "g": 0.4980392156862745,
+      "b": 0.21568627450980393,
       "a": 1
     },
     "type": "COLOR",
@@ -2909,6 +3100,7 @@
     "reference": "mode/borderColor/success-emphasis",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2924,6 +3116,7 @@
     "reference": "mode/borderColor/success-muted",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2939,6 +3132,7 @@
     "reference": "mode/bgColor/disabled",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2955,6 +3149,7 @@
     "reference": "mode/borderColor/default",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -2970,6 +3165,7 @@
     "reference": "mode/bgColor/success-emphasis",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -2985,6 +3181,7 @@
     "reference": "mode/bgColor/success-muted",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3000,6 +3197,7 @@
     "reference": "mode/fgColor/danger-onInverse",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3015,6 +3213,7 @@
     "reference": "mode/fgColor/danger",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3030,6 +3229,7 @@
     "reference": "mode/fgColor/success-onInverse",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3045,6 +3245,7 @@
     "reference": "mode/fgColor/success",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3060,6 +3261,7 @@
     "reference": "mode/fgColor/accent-onInverse",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3075,6 +3277,7 @@
     "reference": "mode/fgColor/accent",
     "collection": "mode",
     "mode": "light",
+    "group": "semantic",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3086,10 +3289,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3101,10 +3305,11 @@
       "a": 0.2
     },
     "type": "COLOR",
-    "refId": "pattern/mode/underlineNav/borderColor/hover",
+    "refId": "mode/underlineNav/borderColor/hover",
     "reference": "mode/borderColor/neutral-muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3116,10 +3321,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3132,10 +3338,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3148,10 +3355,11 @@
     },
     "type": "COLOR",
     "alpha": 0.1,
-    "refId": "pattern/mode/buttonCounter/danger/bgColor/rest",
+    "refId": "mode/buttonCounter/danger/bgColor/rest",
     "reference": "mode/bgColor/danger-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3164,58 +3372,62 @@
     },
     "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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
     "name": "buttonCounter/outline/fgColor/disabled",
     "value": {
-      "r": 0.5647058823529412,
+      "r": 0.03529411764705882,
       "g": 0.4117647058823529,
       "b": 0.8549019607843137,
       "a": 0.5
     },
     "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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
     "name": "buttonCounter/outline/bgColor/disabled",
     "value": {
-      "r": 0.5647058823529412,
+      "r": 0.03529411764705882,
       "g": 0.4117647058823529,
       "b": 0.8549019607843137,
       "a": 0.05
     },
     "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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
     "name": "buttonCounter/outline/bgColor/rest",
     "value": {
-      "r": 0.5647058823529412,
+      "r": 0.03529411764705882,
       "g": 0.4117647058823529,
       "b": 0.8549019607843137,
       "a": 0.1
     },
     "type": "COLOR",
     "alpha": 0.1,
-    "refId": "pattern/mode/buttonCounter/outline/bgColor/rest",
+    "refId": "mode/buttonCounter/outline/bgColor/rest",
     "reference": "mode/bgColor/accent-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3228,10 +3440,11 @@
     },
     "type": "COLOR",
     "alpha": 1,
-    "refId": "pattern/mode/buttonCounter/invisible/bgColor/rest",
+    "refId": "mode/buttonCounter/invisible/bgColor/rest",
     "reference": "mode/bgColor/neutral-muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3244,10 +3457,11 @@
     },
     "type": "COLOR",
     "alpha": 1,
-    "refId": "pattern/mode/buttonCounter/default/bgColor/rest",
+    "refId": "mode/buttonCounter/default/bgColor/rest",
     "reference": "mode/bgColor/neutral-muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3259,10 +3473,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/borderColor/active",
+    "refId": "mode/button/danger/borderColor/active",
     "reference": "mode/borderColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3274,10 +3489,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/danger/borderColor/hover",
+    "refId": "mode/button/danger/borderColor/hover",
     "reference": "mode/borderColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3289,10 +3505,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3304,10 +3521,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3319,10 +3537,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3335,10 +3554,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3350,10 +3570,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3365,10 +3586,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/borderColor/active",
+    "refId": "mode/button/outline/borderColor/active",
     "reference": "mode/borderColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3380,26 +3602,28 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/borderColor/hover",
+    "refId": "mode/button/outline/borderColor/hover",
     "reference": "mode/borderColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
     "name": "button/outline/bgColor/active",
     "value": {
-      "r": 0.41568627450980394,
+      "r": 0.027450980392156862,
       "g": 0.3411764705882353,
       "b": 0.7294117647058823,
       "a": 1
     },
     "type": "COLOR",
     "isMix": true,
-    "refId": "pattern/mode/button/outline/bgColor/active",
+    "refId": "mode/button/outline/bgColor/active",
     "reference": "mode/bgColor/accent-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3411,10 +3635,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/bgColor/hover",
+    "refId": "mode/button/outline/bgColor/hover",
     "reference": "mode/bgColor/accent-emphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3426,26 +3651,28 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/bgColor/rest",
-    "reference": "pattern/mode/control/bgColor/rest",
-    "collection": "pattern/mode",
+    "refId": "mode/button/outline/bgColor/rest",
+    "reference": "mode/control/bgColor/rest",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
     "name": "button/outline/fgColor/disabled",
     "value": {
-      "r": 0.5647058823529412,
+      "r": 0.03529411764705882,
       "g": 0.4117647058823529,
       "b": 0.8549019607843137,
       "a": 0.5
     },
     "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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3457,10 +3684,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/outline/fgColor/rest",
+    "refId": "mode/button/outline/fgColor/rest",
     "reference": "mode/fgColor/accent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3472,10 +3700,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3487,10 +3716,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3502,10 +3732,11 @@
       "a": 0.4
     },
     "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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3517,10 +3748,11 @@
       "a": 0.2
     },
     "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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3532,10 +3764,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3547,10 +3780,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/button/invisible/fgColor/hover",
+    "refId": "mode/button/invisible/fgColor/hover",
     "reference": "mode/fgColor/accent",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3562,10 +3796,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3577,10 +3812,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3592,10 +3828,11 @@
       "a": 0.15
     },
     "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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3608,10 +3845,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3624,10 +3862,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3639,10 +3878,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3654,10 +3894,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3669,10 +3910,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3684,10 +3926,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3699,10 +3942,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3714,10 +3958,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3729,10 +3974,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3744,10 +3990,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3759,10 +4006,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3774,10 +4022,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3789,10 +4038,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3804,10 +4054,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/controlTrack/fgColor/disabled",
+    "refId": "mode/controlTrack/fgColor/disabled",
     "reference": "mode/fgColor/onEmphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3819,10 +4070,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3834,10 +4086,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3849,42 +4102,45 @@
       "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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
     "name": "control/checked/borderColor/active",
     "value": {
-      "r": 0.41568627450980394,
+      "r": 0.027450980392156862,
       "g": 0.3411764705882353,
       "b": 0.7294117647058823,
       "a": 1
     },
     "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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
     "name": "control/checked/borderColor/hover",
     "value": {
-      "r": 0.49019607843137253,
+      "r": 0.03137254901960784,
       "g": 0.3764705882352941,
       "b": 0.792156862745098,
       "a": 1
     },
     "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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3896,10 +4152,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -3911,10 +4168,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/checked/fgColor/disabled",
+    "refId": "mode/control/checked/fgColor/disabled",
     "reference": "mode/fgColor/onEmphasis",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3926,10 +4184,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -3941,42 +4200,45 @@
       "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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
     "name": "control/checked/bgColor/active",
     "value": {
-      "r": 0.41568627450980394,
+      "r": 0.027450980392156862,
       "g": 0.3411764705882353,
       "b": 0.7294117647058823,
       "a": 1
     },
     "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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
     "name": "control/checked/bgColor/hover",
     "value": {
-      "r": 0.49019607843137253,
+      "r": 0.03137254901960784,
       "g": 0.3764705882352941,
       "b": 0.792156862745098,
       "a": 1
     },
     "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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -3988,10 +4250,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4004,10 +4267,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4019,10 +4283,11 @@
       "a": 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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4034,10 +4299,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/danger/fgColor/hover",
+    "refId": "mode/control/danger/fgColor/hover",
     "reference": "mode/fgColor/danger",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4049,10 +4315,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4064,10 +4331,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4079,10 +4347,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4094,25 +4363,27 @@
       "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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
     "name": "control/borderColor/success",
     "value": {
-      "r": 0.17647058823529413,
-      "g": 0.6431372549019608,
-      "b": 0.3058823529411765,
+      "r": 0.10196078431372549,
+      "g": 0.4980392156862745,
+      "b": 0.21568627450980393,
       "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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4124,10 +4395,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4139,10 +4411,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4154,10 +4427,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4169,10 +4443,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/avatar/borderColor",
+    "refId": "mode/avatar/borderColor",
     "reference": "mode/borderColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4184,10 +4459,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4199,10 +4475,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4214,10 +4491,11 @@
       "a": 0.5
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/activeline/bgColor",
+    "refId": "mode/codeMirror/activeline/bgColor",
     "reference": "mode/bgColor/neutral-muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4229,10 +4507,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4244,10 +4523,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4259,10 +4539,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4274,10 +4555,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4289,10 +4571,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4304,10 +4587,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4319,10 +4603,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/bgColor",
+    "refId": "mode/codeMirror/bgColor",
     "reference": "mode/bgColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4334,10 +4619,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/codeMirror/fgColor",
+    "refId": "mode/codeMirror/fgColor",
     "reference": "mode/fgColor/default",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4349,10 +4635,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4364,10 +4651,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4379,10 +4667,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4394,10 +4683,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4409,10 +4699,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4424,10 +4715,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4439,10 +4731,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/page/header/bgColor",
+    "refId": "mode/page/header/bgColor",
     "reference": "mode/bgColor/muted",
-    "collection": "pattern/mode",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4454,10 +4747,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4469,10 +4763,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4484,10 +4779,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": "light",
+    "group": "component",
     "scopes": ["TEXT_FILL", "SHAPE_FILL"]
   },
   {
@@ -4499,10 +4795,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4514,10 +4811,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4529,10 +4827,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": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4544,10 +4843,11 @@
       "a": 1
     },
     "type": "COLOR",
-    "refId": "pattern/mode/control/transparent/bgColor/disabled",
-    "reference": "pattern/mode/control/bgColor/disabled",
-    "collection": "pattern/mode",
+    "refId": "mode/control/transparent/bgColor/disabled",
+    "reference": "mode/control/bgColor/disabled",
+    "collection": "mode",
     "mode": "light",
+    "group": "component",
     "scopes": ["FRAME_FILL", "SHAPE_FILL"]
   },
   {
@@ -4559,10 +4859,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4574,10 +4875,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   },
   {
@@ -4589,10 +4891,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": "light",
+    "group": "component",
     "scopes": ["STROKE_COLOR"]
   }
 ]