diff --git a/design-tokens/$metadata.json b/design-tokens/$metadata.json
index 323181d60e..8b4c971ace 100644
--- a/design-tokens/$metadata.json
+++ b/design-tokens/$metadata.json
@@ -1,12 +1,15 @@
 {
   "tokenSetOrder": [
-    "Base/Core",
-    "Base/Semantic",
-    "Base/Fluid",
-    "Brand/Digdir",
-    "Brand/Tilsynet",
+    "System/light",
+    "System/dark",
+    "System/Style",
+    "Brand/1/Light",
+    "Brand/1/Dark",
+    "Brand/2",
     "Brand/Altinn",
     "Brand/Brreg",
+    "Base/Semantic",
+    "Base/Fluid",
     "Viewport/@320",
     "Viewport/@375",
     "Viewport/@576",
diff --git a/design-tokens/$themes.json b/design-tokens/$themes.json
index 554a2b63f5..be7e15faf2 100644
--- a/design-tokens/$themes.json
+++ b/design-tokens/$themes.json
@@ -4,8 +4,8 @@
     "name": "Default",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "Base/Core": "source",
-      "Base/Semantic": "enabled"
+      "Base/Semantic": "enabled",
+      "System/Style": "source"
     },
     "$figmaCollectionId": "VariableCollectionId:7721:2966",
     "$figmaModeId": "7721:0",
@@ -149,9 +149,9 @@
     "id": "edeff752fe55f2581f6ceee82c66aac8b8a8622d",
     "name": "Digdir",
     "selectedTokenSets": {
-      "Brand/Digdir": "enabled",
       "Base/Semantic": "enabled",
-      "Base/Core": "source"
+      "Brand/1/Light": "enabled",
+      "System/Style": "source"
     },
     "$figmaStyleReferences": {
       "heading.heading-xlarge": "S:3c153973cb7a9a9c750db73e13e99baee56692e7,",
@@ -411,33 +411,6 @@
       "component-mode-gap.small": "d67d4cc3a0577f04850073ab08bf641d940e2c05",
       "component-mode-gap.medium": "c7d623fb1de89532a2ab4b4bfeb3e15e9f70107b",
       "component-mode-gap.large": "5f29fbde252e39a188bcfa6d35775216efe0f1e5",
-      "brand.alt1.100": "4aad3c2d1e9705bdfd285550a9e08950d7ce7c17",
-      "brand.alt1.200": "b29c57317b25742516666bd260e5bfe5c751164f",
-      "brand.alt1.300": "88b9cb771cfc628a54a546c7b924528dd0cde449",
-      "brand.alt1.400": "f9bc97ac5c9470f249fc22c2106ae9cc0e79c96a",
-      "brand.alt1.500": "e4a075d5ad1ac4c1a91fc3064b9abab52e543b87",
-      "brand.alt1.600": "e0e5a45e03ef29ed89b590e5c14438191a25a2c4",
-      "brand.alt1.700": "89ce4f02f32c61f6e48842e7cee289650b27f290",
-      "brand.alt1.800": "44fd7844e26551a870ffb7a9d50f554d648391bd",
-      "brand.alt1.900": "a316c90203c239c2727aedccb255e53abb2d2c89",
-      "brand.alt2.100": "52a17010b7a9ea59231d205c9165ef271894e96d",
-      "brand.alt2.200": "b80ed7f8c02c73bd0c951e4aa92cf9521aac0e52",
-      "brand.alt2.300": "2f18fe7a8a2697237825a4b78fb062a00d36e2ba",
-      "brand.alt2.400": "602f7440f7e436d816f0a69297d81a795f123335",
-      "brand.alt2.500": "8da24db700818fa2345724afba0e708c10bb0344",
-      "brand.alt2.600": "3cb486e824b5cd0ddd5cd945e0234bdb2c46ba35",
-      "brand.alt2.700": "02ee1a451119cf90d88bedb933ffce6cee41913e",
-      "brand.alt2.800": "afa77811a6432c0ef38fffbeaba36a15862cef20",
-      "brand.alt2.900": "3ffc5b092459e773b9c551876f7e7655b37f4bbf",
-      "brand.alt3.100": "86ae2e670ba5b48721b7c545405af49103769e96",
-      "brand.alt3.200": "4407368e2ce6e3f9351b5f63339b24a0f4cb75d7",
-      "brand.alt3.300": "dda69b2d21b3622c773c0dcdb9ac69c79ca68530",
-      "brand.alt3.400": "5c6e30f4339fbeff0a7d3b3a59ccf9f7d9a12163",
-      "brand.alt3.500": "cca87ae300b4afe35de08b67ba37151550449136",
-      "brand.alt3.600": "07d10df79bc3bdc1f90feb12853451b8ef2a1012",
-      "brand.alt3.700": "89e7c552d409c7149d1567bca1b715c70b5b9c03",
-      "brand.alt3.800": "6043cf9d056f718d8566ffd7f4f8ba4ca4558612",
-      "brand.alt3.900": "9c008ccc7703add21d2ca7e7ead0e897bc6cfd86",
       "semantic.surface.primary.light": "3dff5fed1bb86b9a135dc2559c45e9c21f5ddd94",
       "semantic.surface.primary.light-hover": "0ce4ac0cfd64af0e59fa30c432ad2253ad1d225d",
       "semantic.surface.primary.light-active": "12d48db064c5a1da3d54a4617714849a886a11b3",
@@ -624,7 +597,34 @@
       "border_width.active": "82d06b8c6fdeea622611fa744ff261661a211760",
       "border_width.tab_focus": "3ddf887f27c7dff953b8399c667e16448ae252d7",
       "semantic.surface.neutral.strong": "18e3ba1f54c2b363135f1498775fb4e96e9074da",
-      "semantic.surface.neutral.strong-hover": "efcf3d7a4016df005cd2d858ef733ceb8b2d6bca"
+      "semantic.surface.neutral.strong-hover": "efcf3d7a4016df005cd2d858ef733ceb8b2d6bca",
+      "Colors.alt1.100": "4aad3c2d1e9705bdfd285550a9e08950d7ce7c17",
+      "Colors.alt1.200": "b29c57317b25742516666bd260e5bfe5c751164f",
+      "Colors.alt1.300": "88b9cb771cfc628a54a546c7b924528dd0cde449",
+      "Colors.alt1.400": "f9bc97ac5c9470f249fc22c2106ae9cc0e79c96a",
+      "Colors.alt1.500": "e4a075d5ad1ac4c1a91fc3064b9abab52e543b87",
+      "Colors.alt1.600": "e0e5a45e03ef29ed89b590e5c14438191a25a2c4",
+      "Colors.alt1.700": "89ce4f02f32c61f6e48842e7cee289650b27f290",
+      "Colors.alt1.800": "44fd7844e26551a870ffb7a9d50f554d648391bd",
+      "Colors.alt1.900": "a316c90203c239c2727aedccb255e53abb2d2c89",
+      "Colors.alt2.100": "52a17010b7a9ea59231d205c9165ef271894e96d",
+      "Colors.alt2.200": "b80ed7f8c02c73bd0c951e4aa92cf9521aac0e52",
+      "Colors.alt2.300": "2f18fe7a8a2697237825a4b78fb062a00d36e2ba",
+      "Colors.alt2.400": "602f7440f7e436d816f0a69297d81a795f123335",
+      "Colors.alt2.500": "8da24db700818fa2345724afba0e708c10bb0344",
+      "Colors.alt2.600": "3cb486e824b5cd0ddd5cd945e0234bdb2c46ba35",
+      "Colors.alt2.700": "02ee1a451119cf90d88bedb933ffce6cee41913e",
+      "Colors.alt2.800": "afa77811a6432c0ef38fffbeaba36a15862cef20",
+      "Colors.alt2.900": "3ffc5b092459e773b9c551876f7e7655b37f4bbf",
+      "Colors.alt3.100": "86ae2e670ba5b48721b7c545405af49103769e96",
+      "Colors.alt3.200": "4407368e2ce6e3f9351b5f63339b24a0f4cb75d7",
+      "Colors.alt3.300": "dda69b2d21b3622c773c0dcdb9ac69c79ca68530",
+      "Colors.alt3.400": "5c6e30f4339fbeff0a7d3b3a59ccf9f7d9a12163",
+      "Colors.alt3.500": "cca87ae300b4afe35de08b67ba37151550449136",
+      "Colors.alt3.600": "07d10df79bc3bdc1f90feb12853451b8ef2a1012",
+      "Colors.alt3.700": "89e7c552d409c7149d1567bca1b715c70b5b9c03",
+      "Colors.alt3.800": "6043cf9d056f718d8566ffd7f4f8ba4ca4558612",
+      "Colors.alt3.900": "9c008ccc7703add21d2ca7e7ead0e897bc6cfd86"
     },
     "group": "Brand"
   },
@@ -634,39 +634,12 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "Brand/Altinn": "enabled",
-      "Base/Core": "source",
-      "Base/Semantic": "enabled"
+      "Base/Semantic": "enabled",
+      "System/Style": "source"
     },
     "$figmaCollectionId": "VariableCollectionId:6324:1609",
     "$figmaModeId": "6324:2",
     "$figmaVariableReferences": {
-      "brand.alt1.100": "4aad3c2d1e9705bdfd285550a9e08950d7ce7c17",
-      "brand.alt1.200": "b29c57317b25742516666bd260e5bfe5c751164f",
-      "brand.alt1.300": "88b9cb771cfc628a54a546c7b924528dd0cde449",
-      "brand.alt1.400": "f9bc97ac5c9470f249fc22c2106ae9cc0e79c96a",
-      "brand.alt1.500": "e4a075d5ad1ac4c1a91fc3064b9abab52e543b87",
-      "brand.alt1.600": "e0e5a45e03ef29ed89b590e5c14438191a25a2c4",
-      "brand.alt1.700": "89ce4f02f32c61f6e48842e7cee289650b27f290",
-      "brand.alt1.800": "44fd7844e26551a870ffb7a9d50f554d648391bd",
-      "brand.alt1.900": "a316c90203c239c2727aedccb255e53abb2d2c89",
-      "brand.alt2.100": "52a17010b7a9ea59231d205c9165ef271894e96d",
-      "brand.alt2.200": "b80ed7f8c02c73bd0c951e4aa92cf9521aac0e52",
-      "brand.alt2.300": "2f18fe7a8a2697237825a4b78fb062a00d36e2ba",
-      "brand.alt2.400": "602f7440f7e436d816f0a69297d81a795f123335",
-      "brand.alt2.500": "8da24db700818fa2345724afba0e708c10bb0344",
-      "brand.alt2.600": "3cb486e824b5cd0ddd5cd945e0234bdb2c46ba35",
-      "brand.alt2.700": "02ee1a451119cf90d88bedb933ffce6cee41913e",
-      "brand.alt2.800": "afa77811a6432c0ef38fffbeaba36a15862cef20",
-      "brand.alt2.900": "3ffc5b092459e773b9c551876f7e7655b37f4bbf",
-      "brand.alt3.100": "86ae2e670ba5b48721b7c545405af49103769e96",
-      "brand.alt3.200": "4407368e2ce6e3f9351b5f63339b24a0f4cb75d7",
-      "brand.alt3.300": "dda69b2d21b3622c773c0dcdb9ac69c79ca68530",
-      "brand.alt3.400": "5c6e30f4339fbeff0a7d3b3a59ccf9f7d9a12163",
-      "brand.alt3.500": "cca87ae300b4afe35de08b67ba37151550449136",
-      "brand.alt3.600": "07d10df79bc3bdc1f90feb12853451b8ef2a1012",
-      "brand.alt3.700": "89e7c552d409c7149d1567bca1b715c70b5b9c03",
-      "brand.alt3.800": "6043cf9d056f718d8566ffd7f4f8ba4ca4558612",
-      "brand.alt3.900": "9c008ccc7703add21d2ca7e7ead0e897bc6cfd86",
       "semantic.surface.primary.light": "3dff5fed1bb86b9a135dc2559c45e9c21f5ddd94",
       "semantic.surface.primary.light-hover": "0ce4ac0cfd64af0e59fa30c432ad2253ad1d225d",
       "semantic.surface.primary.light-active": "12d48db064c5a1da3d54a4617714849a886a11b3",
@@ -853,7 +826,34 @@
       "border_width.active": "82d06b8c6fdeea622611fa744ff261661a211760",
       "border_width.tab_focus": "3ddf887f27c7dff953b8399c667e16448ae252d7",
       "semantic.surface.neutral.strong": "18e3ba1f54c2b363135f1498775fb4e96e9074da",
-      "semantic.surface.neutral.strong-hover": "efcf3d7a4016df005cd2d858ef733ceb8b2d6bca"
+      "semantic.surface.neutral.strong-hover": "efcf3d7a4016df005cd2d858ef733ceb8b2d6bca",
+      "Colors.alt1.100": "4aad3c2d1e9705bdfd285550a9e08950d7ce7c17",
+      "Colors.alt1.200": "b29c57317b25742516666bd260e5bfe5c751164f",
+      "Colors.alt1.300": "88b9cb771cfc628a54a546c7b924528dd0cde449",
+      "Colors.alt1.400": "f9bc97ac5c9470f249fc22c2106ae9cc0e79c96a",
+      "Colors.alt1.500": "e4a075d5ad1ac4c1a91fc3064b9abab52e543b87",
+      "Colors.alt1.600": "e0e5a45e03ef29ed89b590e5c14438191a25a2c4",
+      "Colors.alt1.700": "89ce4f02f32c61f6e48842e7cee289650b27f290",
+      "Colors.alt1.800": "44fd7844e26551a870ffb7a9d50f554d648391bd",
+      "Colors.alt1.900": "a316c90203c239c2727aedccb255e53abb2d2c89",
+      "Colors.alt2.100": "52a17010b7a9ea59231d205c9165ef271894e96d",
+      "Colors.alt2.200": "b80ed7f8c02c73bd0c951e4aa92cf9521aac0e52",
+      "Colors.alt2.300": "2f18fe7a8a2697237825a4b78fb062a00d36e2ba",
+      "Colors.alt2.400": "602f7440f7e436d816f0a69297d81a795f123335",
+      "Colors.alt2.500": "8da24db700818fa2345724afba0e708c10bb0344",
+      "Colors.alt2.600": "3cb486e824b5cd0ddd5cd945e0234bdb2c46ba35",
+      "Colors.alt2.700": "02ee1a451119cf90d88bedb933ffce6cee41913e",
+      "Colors.alt2.800": "afa77811a6432c0ef38fffbeaba36a15862cef20",
+      "Colors.alt2.900": "3ffc5b092459e773b9c551876f7e7655b37f4bbf",
+      "Colors.alt3.100": "86ae2e670ba5b48721b7c545405af49103769e96",
+      "Colors.alt3.200": "4407368e2ce6e3f9351b5f63339b24a0f4cb75d7",
+      "Colors.alt3.300": "dda69b2d21b3622c773c0dcdb9ac69c79ca68530",
+      "Colors.alt3.400": "5c6e30f4339fbeff0a7d3b3a59ccf9f7d9a12163",
+      "Colors.alt3.500": "cca87ae300b4afe35de08b67ba37151550449136",
+      "Colors.alt3.600": "07d10df79bc3bdc1f90feb12853451b8ef2a1012",
+      "Colors.alt3.700": "89e7c552d409c7149d1567bca1b715c70b5b9c03",
+      "Colors.alt3.800": "6043cf9d056f718d8566ffd7f4f8ba4ca4558612",
+      "Colors.alt3.900": "9c008ccc7703add21d2ca7e7ead0e897bc6cfd86"
     },
     "group": "Brand"
   },
@@ -861,41 +861,14 @@
     "id": "df8b73b683752ef5f35b3cf293bbe5a0cba9f88d",
     "name": "Tilsynet",
     "selectedTokenSets": {
-      "Brand/Tilsynet": "enabled",
-      "Base/Core": "source",
-      "Base/Semantic": "enabled"
+      "Base/Semantic": "enabled",
+      "Brand/2": "enabled",
+      "System/Style": "source"
     },
     "$figmaStyleReferences": {},
     "$figmaCollectionId": "VariableCollectionId:6324:1609",
     "$figmaModeId": "6324:3",
     "$figmaVariableReferences": {
-      "brand.alt1.100": "4aad3c2d1e9705bdfd285550a9e08950d7ce7c17",
-      "brand.alt1.200": "b29c57317b25742516666bd260e5bfe5c751164f",
-      "brand.alt1.300": "88b9cb771cfc628a54a546c7b924528dd0cde449",
-      "brand.alt1.400": "f9bc97ac5c9470f249fc22c2106ae9cc0e79c96a",
-      "brand.alt1.500": "e4a075d5ad1ac4c1a91fc3064b9abab52e543b87",
-      "brand.alt1.600": "e0e5a45e03ef29ed89b590e5c14438191a25a2c4",
-      "brand.alt1.700": "89ce4f02f32c61f6e48842e7cee289650b27f290",
-      "brand.alt1.800": "44fd7844e26551a870ffb7a9d50f554d648391bd",
-      "brand.alt1.900": "a316c90203c239c2727aedccb255e53abb2d2c89",
-      "brand.alt2.100": "52a17010b7a9ea59231d205c9165ef271894e96d",
-      "brand.alt2.200": "b80ed7f8c02c73bd0c951e4aa92cf9521aac0e52",
-      "brand.alt2.300": "2f18fe7a8a2697237825a4b78fb062a00d36e2ba",
-      "brand.alt2.400": "602f7440f7e436d816f0a69297d81a795f123335",
-      "brand.alt2.500": "8da24db700818fa2345724afba0e708c10bb0344",
-      "brand.alt2.600": "3cb486e824b5cd0ddd5cd945e0234bdb2c46ba35",
-      "brand.alt2.700": "02ee1a451119cf90d88bedb933ffce6cee41913e",
-      "brand.alt2.800": "afa77811a6432c0ef38fffbeaba36a15862cef20",
-      "brand.alt2.900": "3ffc5b092459e773b9c551876f7e7655b37f4bbf",
-      "brand.alt3.100": "86ae2e670ba5b48721b7c545405af49103769e96",
-      "brand.alt3.200": "4407368e2ce6e3f9351b5f63339b24a0f4cb75d7",
-      "brand.alt3.300": "dda69b2d21b3622c773c0dcdb9ac69c79ca68530",
-      "brand.alt3.400": "5c6e30f4339fbeff0a7d3b3a59ccf9f7d9a12163",
-      "brand.alt3.500": "cca87ae300b4afe35de08b67ba37151550449136",
-      "brand.alt3.600": "07d10df79bc3bdc1f90feb12853451b8ef2a1012",
-      "brand.alt3.700": "89e7c552d409c7149d1567bca1b715c70b5b9c03",
-      "brand.alt3.800": "6043cf9d056f718d8566ffd7f4f8ba4ca4558612",
-      "brand.alt3.900": "9c008ccc7703add21d2ca7e7ead0e897bc6cfd86",
       "semantic.surface.primary.light": "3dff5fed1bb86b9a135dc2559c45e9c21f5ddd94",
       "semantic.surface.primary.light-hover": "0ce4ac0cfd64af0e59fa30c432ad2253ad1d225d",
       "semantic.surface.primary.light-active": "12d48db064c5a1da3d54a4617714849a886a11b3",
@@ -1082,7 +1055,34 @@
       "border_width.active": "82d06b8c6fdeea622611fa744ff261661a211760",
       "border_width.tab_focus": "3ddf887f27c7dff953b8399c667e16448ae252d7",
       "semantic.surface.neutral.strong": "18e3ba1f54c2b363135f1498775fb4e96e9074da",
-      "semantic.surface.neutral.strong-hover": "efcf3d7a4016df005cd2d858ef733ceb8b2d6bca"
+      "semantic.surface.neutral.strong-hover": "efcf3d7a4016df005cd2d858ef733ceb8b2d6bca",
+      "Colors.alt1.100": "4aad3c2d1e9705bdfd285550a9e08950d7ce7c17",
+      "Colors.alt1.200": "b29c57317b25742516666bd260e5bfe5c751164f",
+      "Colors.alt1.300": "88b9cb771cfc628a54a546c7b924528dd0cde449",
+      "Colors.alt1.400": "f9bc97ac5c9470f249fc22c2106ae9cc0e79c96a",
+      "Colors.alt1.500": "e4a075d5ad1ac4c1a91fc3064b9abab52e543b87",
+      "Colors.alt1.600": "e0e5a45e03ef29ed89b590e5c14438191a25a2c4",
+      "Colors.alt1.700": "89ce4f02f32c61f6e48842e7cee289650b27f290",
+      "Colors.alt1.800": "44fd7844e26551a870ffb7a9d50f554d648391bd",
+      "Colors.alt1.900": "a316c90203c239c2727aedccb255e53abb2d2c89",
+      "Colors.alt2.100": "52a17010b7a9ea59231d205c9165ef271894e96d",
+      "Colors.alt2.200": "b80ed7f8c02c73bd0c951e4aa92cf9521aac0e52",
+      "Colors.alt2.300": "2f18fe7a8a2697237825a4b78fb062a00d36e2ba",
+      "Colors.alt2.400": "602f7440f7e436d816f0a69297d81a795f123335",
+      "Colors.alt2.500": "8da24db700818fa2345724afba0e708c10bb0344",
+      "Colors.alt2.600": "3cb486e824b5cd0ddd5cd945e0234bdb2c46ba35",
+      "Colors.alt2.700": "02ee1a451119cf90d88bedb933ffce6cee41913e",
+      "Colors.alt2.800": "afa77811a6432c0ef38fffbeaba36a15862cef20",
+      "Colors.alt2.900": "3ffc5b092459e773b9c551876f7e7655b37f4bbf",
+      "Colors.alt3.100": "86ae2e670ba5b48721b7c545405af49103769e96",
+      "Colors.alt3.200": "4407368e2ce6e3f9351b5f63339b24a0f4cb75d7",
+      "Colors.alt3.300": "dda69b2d21b3622c773c0dcdb9ac69c79ca68530",
+      "Colors.alt3.400": "5c6e30f4339fbeff0a7d3b3a59ccf9f7d9a12163",
+      "Colors.alt3.500": "cca87ae300b4afe35de08b67ba37151550449136",
+      "Colors.alt3.600": "07d10df79bc3bdc1f90feb12853451b8ef2a1012",
+      "Colors.alt3.700": "89e7c552d409c7149d1567bca1b715c70b5b9c03",
+      "Colors.alt3.800": "6043cf9d056f718d8566ffd7f4f8ba4ca4558612",
+      "Colors.alt3.900": "9c008ccc7703add21d2ca7e7ead0e897bc6cfd86"
     },
     "group": "Brand"
   },
@@ -1091,43 +1091,16 @@
     "name": "Brreg",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "Base/Core": "source",
       "Base/Semantic": "enabled",
-      "Brand/Brreg": "enabled"
+      "Brand/Brreg": "enabled",
+      "System/Style": "source"
     },
     "$figmaVariableReferences": {
       "brand.alt1.50": "741f3f885aa3f266feda96defb70e59752495075",
-      "brand.alt1.100": "4aad3c2d1e9705bdfd285550a9e08950d7ce7c17",
-      "brand.alt1.200": "b29c57317b25742516666bd260e5bfe5c751164f",
-      "brand.alt1.300": "88b9cb771cfc628a54a546c7b924528dd0cde449",
-      "brand.alt1.400": "f9bc97ac5c9470f249fc22c2106ae9cc0e79c96a",
-      "brand.alt1.500": "e4a075d5ad1ac4c1a91fc3064b9abab52e543b87",
-      "brand.alt1.600": "e0e5a45e03ef29ed89b590e5c14438191a25a2c4",
-      "brand.alt1.700": "89ce4f02f32c61f6e48842e7cee289650b27f290",
-      "brand.alt1.800": "44fd7844e26551a870ffb7a9d50f554d648391bd",
-      "brand.alt1.900": "a316c90203c239c2727aedccb255e53abb2d2c89",
       "brand.alt1.950": "5a21346d98b9551420c6d77d799907443471f148",
       "brand.alt2.50": "a569ff243a8905ea0d7112238902e664ada0ceb9",
-      "brand.alt2.100": "52a17010b7a9ea59231d205c9165ef271894e96d",
-      "brand.alt2.200": "b80ed7f8c02c73bd0c951e4aa92cf9521aac0e52",
-      "brand.alt2.300": "2f18fe7a8a2697237825a4b78fb062a00d36e2ba",
-      "brand.alt2.400": "602f7440f7e436d816f0a69297d81a795f123335",
-      "brand.alt2.500": "8da24db700818fa2345724afba0e708c10bb0344",
-      "brand.alt2.600": "3cb486e824b5cd0ddd5cd945e0234bdb2c46ba35",
-      "brand.alt2.700": "02ee1a451119cf90d88bedb933ffce6cee41913e",
-      "brand.alt2.800": "afa77811a6432c0ef38fffbeaba36a15862cef20",
-      "brand.alt2.900": "3ffc5b092459e773b9c551876f7e7655b37f4bbf",
       "brand.alt2.950": "8f867a646531f2e46fd77b36ae09abd5b3d13e65",
       "brand.alt3.50": "330386bdb47ed063b0ecd51e81405b460f902eca",
-      "brand.alt3.100": "86ae2e670ba5b48721b7c545405af49103769e96",
-      "brand.alt3.200": "4407368e2ce6e3f9351b5f63339b24a0f4cb75d7",
-      "brand.alt3.300": "dda69b2d21b3622c773c0dcdb9ac69c79ca68530",
-      "brand.alt3.400": "5c6e30f4339fbeff0a7d3b3a59ccf9f7d9a12163",
-      "brand.alt3.500": "cca87ae300b4afe35de08b67ba37151550449136",
-      "brand.alt3.600": "07d10df79bc3bdc1f90feb12853451b8ef2a1012",
-      "brand.alt3.700": "89e7c552d409c7149d1567bca1b715c70b5b9c03",
-      "brand.alt3.800": "6043cf9d056f718d8566ffd7f4f8ba4ca4558612",
-      "brand.alt3.900": "9c008ccc7703add21d2ca7e7ead0e897bc6cfd86",
       "brand.alt3.950": "6d5135e5d69f592ea56413a28bf129cc2121b63b",
       "semantic.surface.primary.light": "3dff5fed1bb86b9a135dc2559c45e9c21f5ddd94",
       "semantic.surface.primary.light-hover": "0ce4ac0cfd64af0e59fa30c432ad2253ad1d225d",
@@ -1315,7 +1288,34 @@
       "border_width.active": "82d06b8c6fdeea622611fa744ff261661a211760",
       "border_width.tab_focus": "3ddf887f27c7dff953b8399c667e16448ae252d7",
       "semantic.surface.neutral.strong": "18e3ba1f54c2b363135f1498775fb4e96e9074da",
-      "semantic.surface.neutral.strong-hover": "efcf3d7a4016df005cd2d858ef733ceb8b2d6bca"
+      "semantic.surface.neutral.strong-hover": "efcf3d7a4016df005cd2d858ef733ceb8b2d6bca",
+      "Colors.alt1.100": "4aad3c2d1e9705bdfd285550a9e08950d7ce7c17",
+      "Colors.alt1.200": "b29c57317b25742516666bd260e5bfe5c751164f",
+      "Colors.alt1.300": "88b9cb771cfc628a54a546c7b924528dd0cde449",
+      "Colors.alt1.400": "f9bc97ac5c9470f249fc22c2106ae9cc0e79c96a",
+      "Colors.alt1.500": "e4a075d5ad1ac4c1a91fc3064b9abab52e543b87",
+      "Colors.alt1.600": "e0e5a45e03ef29ed89b590e5c14438191a25a2c4",
+      "Colors.alt1.700": "89ce4f02f32c61f6e48842e7cee289650b27f290",
+      "Colors.alt1.800": "44fd7844e26551a870ffb7a9d50f554d648391bd",
+      "Colors.alt1.900": "a316c90203c239c2727aedccb255e53abb2d2c89",
+      "Colors.alt2.100": "52a17010b7a9ea59231d205c9165ef271894e96d",
+      "Colors.alt2.200": "b80ed7f8c02c73bd0c951e4aa92cf9521aac0e52",
+      "Colors.alt2.300": "2f18fe7a8a2697237825a4b78fb062a00d36e2ba",
+      "Colors.alt2.400": "602f7440f7e436d816f0a69297d81a795f123335",
+      "Colors.alt2.500": "8da24db700818fa2345724afba0e708c10bb0344",
+      "Colors.alt2.600": "3cb486e824b5cd0ddd5cd945e0234bdb2c46ba35",
+      "Colors.alt2.700": "02ee1a451119cf90d88bedb933ffce6cee41913e",
+      "Colors.alt2.800": "afa77811a6432c0ef38fffbeaba36a15862cef20",
+      "Colors.alt2.900": "3ffc5b092459e773b9c551876f7e7655b37f4bbf",
+      "Colors.alt3.100": "86ae2e670ba5b48721b7c545405af49103769e96",
+      "Colors.alt3.200": "4407368e2ce6e3f9351b5f63339b24a0f4cb75d7",
+      "Colors.alt3.300": "dda69b2d21b3622c773c0dcdb9ac69c79ca68530",
+      "Colors.alt3.400": "5c6e30f4339fbeff0a7d3b3a59ccf9f7d9a12163",
+      "Colors.alt3.500": "cca87ae300b4afe35de08b67ba37151550449136",
+      "Colors.alt3.600": "07d10df79bc3bdc1f90feb12853451b8ef2a1012",
+      "Colors.alt3.700": "89e7c552d409c7149d1567bca1b715c70b5b9c03",
+      "Colors.alt3.800": "6043cf9d056f718d8566ffd7f4f8ba4ca4558612",
+      "Colors.alt3.900": "9c008ccc7703add21d2ca7e7ead0e897bc6cfd86"
     },
     "$figmaCollectionId": "VariableCollectionId:6324:1609",
     "$figmaModeId": "6324:4",
diff --git a/design-tokens/Base/Semantic.json b/design-tokens/Base/Semantic.json
index 27df3ecdcb..b6be3581c7 100644
--- a/design-tokens/Base/Semantic.json
+++ b/design-tokens/Base/Semantic.json
@@ -408,6 +408,162 @@
           "type": "color"
         }
       }
+    },
+    "accent": {
+      "background": {
+        "value": "#",
+        "type": "color"
+      },
+      "background-subtle": {
+        "value": "#",
+        "type": "color"
+      }
+    },
+    "success": {
+      "background": {
+        "value": "{green.1}",
+        "type": "color"
+      },
+      "background-subtle": {
+        "value": "{green.2}",
+        "type": "color"
+      },
+      "surface": {
+        "value": "{green.3}",
+        "type": "color"
+      },
+      "surface-hover": {
+        "value": "{green.4}",
+        "type": "color"
+      },
+      "surface-active": {
+        "value": "{green.5}",
+        "type": "color"
+      },
+      "border-subtle": {
+        "value": "{green.6}",
+        "type": "color"
+      },
+      "border": {
+        "value": "{green.7}",
+        "type": "color"
+      },
+      "border-strong": {
+        "value": "{green.8}",
+        "type": "color"
+      },
+      "border-base": {
+        "value": "{green.9}",
+        "type": "color"
+      },
+      "border-base-hover": {
+        "value": "{green.10}",
+        "type": "color"
+      },
+      "border-base-active": {
+        "value": "{green.11}",
+        "type": "color"
+      }
+    },
+    "danger": {
+      "background": {
+        "value": "{green.1}",
+        "type": "color"
+      },
+      "background-subtle": {
+        "value": "{green.2}",
+        "type": "color"
+      },
+      "surface": {
+        "value": "{green.3}",
+        "type": "color"
+      },
+      "surface-hover": {
+        "value": "{green.4}",
+        "type": "color"
+      },
+      "surface-active": {
+        "value": "{green.5}",
+        "type": "color"
+      },
+      "border-subtle": {
+        "value": "{green.6}",
+        "type": "color"
+      },
+      "border": {
+        "value": "{green.7}",
+        "type": "color"
+      },
+      "border-strong": {
+        "value": "{green.8}",
+        "type": "color"
+      },
+      "border-base": {
+        "value": "{green.9}",
+        "type": "color"
+      },
+      "border-base-hover": {
+        "value": "{green.10}",
+        "type": "color"
+      },
+      "border-base-active": {
+        "value": "{green.11}",
+        "type": "color"
+      },
+      "text-subtle": {
+        "value": "{green.12}",
+        "type": "color"
+      }
+    },
+    "warning": {
+      "background": {
+        "value": "{green.1}",
+        "type": "color"
+      },
+      "background-subtle": {
+        "value": "{green.2}",
+        "type": "color"
+      },
+      "surface": {
+        "value": "{green.3}",
+        "type": "color"
+      },
+      "surface-hover": {
+        "value": "{green.4}",
+        "type": "color"
+      },
+      "surface-active": {
+        "value": "{green.5}",
+        "type": "color"
+      },
+      "border-subtle": {
+        "value": "{green.6}",
+        "type": "color"
+      },
+      "border": {
+        "value": "{green.7}",
+        "type": "color"
+      },
+      "border-strong": {
+        "value": "{green.8}",
+        "type": "color"
+      },
+      "border-base": {
+        "value": "{green.9}",
+        "type": "color"
+      },
+      "border-base-hover": {
+        "value": "{green.10}",
+        "type": "color"
+      },
+      "border-base-active": {
+        "value": "{green.11}",
+        "type": "color"
+      },
+      "text-subtle": {
+        "value": "{green.12}",
+        "type": "color"
+      }
     }
   },
   "typography": {
@@ -993,5 +1149,57 @@
       "value": "{shadow.500}",
       "type": "boxShadow"
     }
+  },
+  "color": {
+    "accent": {
+      "background": {
+        "value": "{green.1}",
+        "type": "color"
+      },
+      "background-subtle": {
+        "value": "{green.2}",
+        "type": "color"
+      },
+      "surface": {
+        "value": "{green.3}",
+        "type": "color"
+      },
+      "surface-hover": {
+        "value": "{green.4}",
+        "type": "color"
+      },
+      "surface-active": {
+        "value": "{green.5}",
+        "type": "color"
+      },
+      "border-subtle": {
+        "value": "{green.6}",
+        "type": "color"
+      },
+      "border": {
+        "value": "{green.7}",
+        "type": "color"
+      },
+      "border-strong": {
+        "value": "{green.8}",
+        "type": "color"
+      },
+      "border-base": {
+        "value": "{green.9}",
+        "type": "color"
+      },
+      "border-base-hover": {
+        "value": "{green.10}",
+        "type": "color"
+      },
+      "border-base-active": {
+        "value": "{green.11}",
+        "type": "color"
+      },
+      "text-subtle": {
+        "value": "{green.12}",
+        "type": "color"
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/design-tokens/Brand/Digdir.json b/design-tokens/Brand/1/Dark.json
similarity index 91%
rename from design-tokens/Brand/Digdir.json
rename to design-tokens/Brand/1/Dark.json
index e4a39952d7..aa51a460af 100644
--- a/design-tokens/Brand/Digdir.json
+++ b/design-tokens/Brand/1/Dark.json
@@ -143,55 +143,55 @@
     "surface": {
       "first": {
         "subtle": {
-          "value": "{brand.alt1.200}",
+          "value": "{Colors.alt1.200}",
           "type": "color"
         },
         "subtle-hover": {
-          "value": "{brand.alt1.300}",
+          "value": "{Colors.alt1.300}",
           "type": "color"
         },
         "subtle-active": {
-          "value": "{brand.alt1.400}",
+          "value": "{Colors.alt1.400}",
           "type": "color"
         },
         "strong": {
-          "value": "{brand.alt1.800}",
+          "value": "{Colors.alt1.800}",
           "type": "color"
         }
       },
       "second": {
         "subtle": {
-          "value": "{brand.alt2.200}",
+          "value": "{Colors.alt2.200}",
           "type": "color"
         },
         "subtle-hover": {
-          "value": "{brand.alt2.300}",
+          "value": "{Colors.alt2.300}",
           "type": "color"
         },
         "subtle-active": {
-          "value": "{brand.alt2.400}",
+          "value": "{Colors.alt2.400}",
           "type": "color"
         },
         "strong": {
-          "value": "{brand.alt2.900}",
+          "value": "{Colors.alt2.900}",
           "type": "color"
         }
       },
       "third": {
         "subtle": {
-          "value": "{brand.alt3.200}",
+          "value": "{Colors.alt3.200}",
           "type": "color"
         },
         "subtle-hover": {
-          "value": "{brand.alt3.300}",
+          "value": "{Colors.alt3.300}",
           "type": "color"
         },
         "subtle-active": {
-          "value": "{brand.alt3.400}",
+          "value": "{Colors.alt3.400}",
           "type": "color"
         },
         "strong": {
-          "value": "{brand.alt3.800}",
+          "value": "{Colors.alt3.800}",
           "type": "color"
         }
       },
@@ -271,43 +271,43 @@
     "border": {
       "first": {
         "default": {
-          "value": "{brand.alt1.600}",
+          "value": "{Colors.alt1.600}",
           "type": "color"
         },
         "hover": {
-          "value": "{brand.alt1.700}",
+          "value": "{Colors.alt1.700}",
           "type": "color"
         },
         "active": {
-          "value": "{brand.alt1.800}",
+          "value": "{Colors.alt1.800}",
           "type": "color"
         }
       },
       "second": {
         "default": {
-          "value": "{brand.alt2.600}",
+          "value": "{Colors.alt2.600}",
           "type": "color"
         },
         "hover": {
-          "value": "{brand.alt2.700}",
+          "value": "{Colors.alt2.700}",
           "type": "color"
         },
         "active": {
-          "value": "{brand.alt2.800}",
+          "value": "{Colors.alt2.800}",
           "type": "color"
         }
       },
       "third": {
         "default": {
-          "value": "{brand.alt3.600}",
+          "value": "{Colors.alt3.600}",
           "type": "color"
         },
         "hover": {
-          "value": "{brand.alt3.700}",
+          "value": "{Colors.alt3.700}",
           "type": "color"
         },
         "active": {
-          "value": "{brand.alt3.800}",
+          "value": "{Colors.alt3.800}",
           "type": "color"
         }
       },
diff --git a/design-tokens/Brand/1/Light.json b/design-tokens/Brand/1/Light.json
new file mode 100644
index 0000000000..eeff26a486
--- /dev/null
+++ b/design-tokens/Brand/1/Light.json
@@ -0,0 +1,238 @@
+{
+  "Colors": {
+    "alt1": {
+      "100": {
+        "value": "#feefef",
+        "type": "color",
+        "description": "AAA 12.8 on grey 800\nAA 6.4 as bkdg for interaction blue"
+      },
+      "200": {
+        "value": "#fddfe0",
+        "type": "color",
+        "description": "Light error color\nAAA 11.4 on grey 800\nAA 5.7 as bkdg for interaction blue"
+      },
+      "300": {
+        "value": "#fbbfc1",
+        "type": "color",
+        "description": "AAA 9 on grey 800\nAA 4.5 as bkdg for interaction blue"
+      },
+      "400": {
+        "value": "#f89fa1",
+        "type": "color",
+        "description": "AAA 7.1 on grey 800\nAA18 3.5 as bkdg for interaction blue"
+      },
+      "500": {
+        "value": "#f67f82",
+        "type": "color",
+        "description": "AA 5.6 on grey 800"
+      },
+      "600": {
+        "value": "#f45f63",
+        "type": "color",
+        "description": "AA 4.5 on grey 800"
+      },
+      "700": {
+        "value": "#dc5659",
+        "type": "color",
+        "description": "AA18 3.7 on grey 800"
+      },
+      "800": {
+        "value": "#c34c4f",
+        "type": "color",
+        "description": "AA 4.7 on white"
+      },
+      "900": {
+        "value": "#B83D41",
+        "type": "color"
+      }
+    },
+    "alt2": {
+      "100": {
+        "value": "#fcf7e9",
+        "type": "color",
+        "description": "AAA 13.3 on grey 800\nAA 6.7 as bkdg for interaction blue"
+      },
+      "200": {
+        "value": "#faeec2",
+        "type": "color",
+        "description": "Light warning color\nAAA 12.3 on grey 800\nAA 1.1 as bkdg for interaction blue"
+      },
+      "300": {
+        "value": "#f5dda6",
+        "type": "color",
+        "description": "AAA 10 on grey 800\nAA 5.4 as bkdg for interaction blue"
+      },
+      "400": {
+        "value": "#efcc79",
+        "type": "color",
+        "description": "AAA 9.2 on grey 800\nAA 4.6 as bkdg for interaction blue"
+      },
+      "500": {
+        "value": "#eabb4d",
+        "type": "color",
+        "description": "AAA 7.9 on grey 800\nAA18 4 as bkdg for interaction blue"
+      },
+      "600": {
+        "value": "#e5aa20",
+        "type": "color",
+        "description": "AA 6.8 on grey 800\nAA18 3.4 as bkdg for interaction blue"
+      },
+      "700": {
+        "value": "#ce991d",
+        "type": "color",
+        "description": "AA 5.5 on grey 800"
+      },
+      "800": {
+        "value": "#b7881a",
+        "type": "color",
+        "description": "AA18 4.4 on grey 800\nAA18 3.2 on white"
+      },
+      "900": {
+        "value": "#A17717",
+        "type": "color"
+      }
+    },
+    "alt3": {
+      "100": {
+        "value": "#e9f5ff",
+        "type": "color",
+        "description": "AAA 12.9 on grey 800\nAA 6.5 as bkdg for interaction blue"
+      },
+      "200": {
+        "value": "#d2eafd",
+        "type": "color",
+        "description": "Light information color \nAAA 11.5 on grey 800\nAA 5.8 as bkdg for interaction blue"
+      },
+      "300": {
+        "value": "#a5d6fb",
+        "type": "color",
+        "description": "AAA 9.2 on grey 800\nAA 4.6 as bkdg for interaction blue"
+      },
+      "400": {
+        "value": "#78c1f9",
+        "type": "color",
+        "description": "AAA 7.3 on grey 800\nAA18 3.7 as bkdg for interaction blue"
+      },
+      "500": {
+        "value": "#4badf7",
+        "type": "color",
+        "description": "AA 5.8 on grey 800"
+      },
+      "600": {
+        "value": "#1e98f5",
+        "type": "color",
+        "description": "AA 4.6 on grey 800"
+      },
+      "700": {
+        "value": "#1b88dd",
+        "type": "color",
+        "description": "AA18 3.8 on grey 800"
+      },
+      "800": {
+        "value": "#156aac",
+        "type": "color",
+        "description": "AA 5.6 on white"
+      },
+      "900": {
+        "value": "#125A91",
+        "type": "color"
+      }
+    },
+    "neutral": {
+      "100": {
+        "value": "#feefef",
+        "type": "color",
+        "description": "AAA 12.8 on grey 800\nAA 6.4 as bkdg for interaction blue"
+      },
+      "200": {
+        "value": "#fddfe0",
+        "type": "color",
+        "description": "Light error color\nAAA 11.4 on grey 800\nAA 5.7 as bkdg for interaction blue"
+      },
+      "300": {
+        "value": "#fbbfc1",
+        "type": "color",
+        "description": "AAA 9 on grey 800\nAA 4.5 as bkdg for interaction blue"
+      },
+      "400": {
+        "value": "#f89fa1",
+        "type": "color",
+        "description": "AAA 7.1 on grey 800\nAA18 3.5 as bkdg for interaction blue"
+      },
+      "500": {
+        "value": "#f67f82",
+        "type": "color",
+        "description": "AA 5.6 on grey 800"
+      },
+      "600": {
+        "value": "#f45f63",
+        "type": "color",
+        "description": "AA 4.5 on grey 800"
+      },
+      "700": {
+        "value": "#dc5659",
+        "type": "color",
+        "description": "AA18 3.7 on grey 800"
+      },
+      "800": {
+        "value": "#c34c4f",
+        "type": "color",
+        "description": "AA 4.7 on white"
+      },
+      "900": {
+        "value": "#B83D41",
+        "type": "color"
+      }
+    },
+    "accent": {
+      "background": {
+        "value": "#fefeff",
+        "type": "color"
+      },
+      "background-subtle": {
+        "value": "#eef4fa",
+        "type": "color"
+      },
+      "surface": {
+        "value": "#e2edf7",
+        "type": "color"
+      },
+      "surface-hover": {
+        "value": "#c3daef",
+        "type": "color"
+      },
+      "surface-active": {
+        "value": "#a4c7e6",
+        "type": "color"
+      },
+      "border-subtle": {
+        "value": "#aecde9",
+        "type": "color"
+      },
+      "border": {
+        "value": "#4b90ce",
+        "type": "color"
+      },
+      "border-strong": {
+        "value": "#4b90ce",
+        "type": "color"
+      },
+      "border-base": {
+        "value": "#0163ba",
+        "type": "color"
+      },
+      "border-base-hover": {
+        "value": "#004d93",
+        "type": "color"
+      },
+      "border-base-active": {
+        "value": "#00396d",
+        "type": "color"
+      },
+      "text-subtle": {
+        "value": "#00315c",
+        "type": "color"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/design-tokens/Brand/Tilsynet.json b/design-tokens/Brand/2.json
similarity index 90%
rename from design-tokens/Brand/Tilsynet.json
rename to design-tokens/Brand/2.json
index ff78b13678..33b3dd9942 100644
--- a/design-tokens/Brand/Tilsynet.json
+++ b/design-tokens/Brand/2.json
@@ -119,55 +119,55 @@
     "surface": {
       "first": {
         "subtle": {
-          "value": "{brand.alt1.200}",
+          "value": "{Colors.alt1.200}",
           "type": "color"
         },
         "subtle-hover": {
-          "value": "{brand.alt1.300}",
+          "value": "{Colors.alt1.300}",
           "type": "color"
         },
         "subtle-active": {
-          "value": "{brand.alt1.400}",
+          "value": "{Colors.alt1.400}",
           "type": "color"
         },
         "strong": {
-          "value": "{brand.alt1.800}",
+          "value": "{Colors.alt1.800}",
           "type": "color"
         }
       },
       "second": {
         "subtle": {
-          "value": "{brand.alt2.200}",
+          "value": "{Colors.alt2.200}",
           "type": "color"
         },
         "subtle-hover": {
-          "value": "{brand.alt2.300}",
+          "value": "{Colors.alt2.300}",
           "type": "color"
         },
         "subtle-active": {
-          "value": "{brand.alt2.400}",
+          "value": "{Colors.alt2.400}",
           "type": "color"
         },
         "strong": {
-          "value": "{brand.alt2.900}",
+          "value": "{Colors.alt2.900}",
           "type": "color"
         }
       },
       "third": {
         "subtle": {
-          "value": "{brand.alt3.200}",
+          "value": "{Colors.alt3.200}",
           "type": "color"
         },
         "subtle-hover": {
-          "value": "{brand.alt3.300}",
+          "value": "{Colors.alt3.300}",
           "type": "color"
         },
         "subtle-active": {
-          "value": "{brand.alt3.400}",
+          "value": "{Colors.alt3.400}",
           "type": "color"
         },
         "strong": {
-          "value": "{brand.alt3.800}",
+          "value": "{Colors.alt3.800}",
           "type": "color"
         }
       },
@@ -247,43 +247,43 @@
     "border": {
       "first": {
         "default": {
-          "value": "{brand.alt1.600}",
+          "value": "{Colors.alt1.600}",
           "type": "color"
         },
         "hover": {
-          "value": "{brand.alt1.700}",
+          "value": "{Colors.alt1.700}",
           "type": "color"
         },
         "active": {
-          "value": "{brand.alt1.800}",
+          "value": "{Colors.alt1.800}",
           "type": "color"
         }
       },
       "second": {
         "default": {
-          "value": "{brand.alt2.600}",
+          "value": "{Colors.alt2.600}",
           "type": "color"
         },
         "hover": {
-          "value": "{brand.alt2.700}",
+          "value": "{Colors.alt2.700}",
           "type": "color"
         },
         "active": {
-          "value": "{brand.alt2.800}",
+          "value": "{Colors.alt2.800}",
           "type": "color"
         }
       },
       "third": {
         "default": {
-          "value": "{brand.alt3.600}",
+          "value": "{Colors.alt3.600}",
           "type": "color"
         },
         "hover": {
-          "value": "{brand.alt3.700}",
+          "value": "{Colors.alt3.700}",
           "type": "color"
         },
         "active": {
-          "value": "{brand.alt3.800}",
+          "value": "{Colors.alt3.800}",
           "type": "color"
         }
       },
diff --git a/design-tokens/Brand/Altinn.json b/design-tokens/Brand/Altinn.json
index d7ca030efb..dfb05e26b1 100644
--- a/design-tokens/Brand/Altinn.json
+++ b/design-tokens/Brand/Altinn.json
@@ -146,55 +146,55 @@
     "surface": {
       "first": {
         "subtle": {
-          "value": "{brand.alt1.200}",
+          "value": "{Colors.alt1.200}",
           "type": "color"
         },
         "subtle-hover": {
-          "value": "{brand.alt1.300}",
+          "value": "{Colors.alt1.300}",
           "type": "color"
         },
         "subtle-active": {
-          "value": "{brand.alt1.400}",
+          "value": "{Colors.alt1.400}",
           "type": "color"
         },
         "strong": {
-          "value": "{brand.alt1.800}",
+          "value": "{Colors.alt1.800}",
           "type": "color"
         }
       },
       "second": {
         "subtle": {
-          "value": "{brand.alt2.200}",
+          "value": "{Colors.alt2.200}",
           "type": "color"
         },
         "subtle-hover": {
-          "value": "{brand.alt2.300}",
+          "value": "{Colors.alt2.300}",
           "type": "color"
         },
         "subtle-active": {
-          "value": "{brand.alt2.400}",
+          "value": "{Colors.alt2.400}",
           "type": "color"
         },
         "strong": {
-          "value": "{brand.alt2.900}",
+          "value": "{Colors.alt2.900}",
           "type": "color"
         }
       },
       "third": {
         "subtle": {
-          "value": "{brand.alt3.200}",
+          "value": "{Colors.alt3.200}",
           "type": "color"
         },
         "subtle-hover": {
-          "value": "{brand.alt3.300}",
+          "value": "{Colors.alt3.300}",
           "type": "color"
         },
         "subtle-active": {
-          "value": "{brand.alt3.400}",
+          "value": "{Colors.alt3.400}",
           "type": "color"
         },
         "strong": {
-          "value": "{brand.alt3.800}",
+          "value": "{Colors.alt3.800}",
           "type": "color"
         }
       },
@@ -274,43 +274,43 @@
     "border": {
       "first": {
         "default": {
-          "value": "{brand.alt1.600}",
+          "value": "{Colors.alt1.600}",
           "type": "color"
         },
         "hover": {
-          "value": "{brand.alt1.700}",
+          "value": "{Colors.alt1.700}",
           "type": "color"
         },
         "active": {
-          "value": "{brand.alt1.800}",
+          "value": "{Colors.alt1.800}",
           "type": "color"
         }
       },
       "second": {
         "default": {
-          "value": "{brand.alt2.600}",
+          "value": "{Colors.alt2.600}",
           "type": "color"
         },
         "hover": {
-          "value": "{brand.alt2.700}",
+          "value": "{Colors.alt2.700}",
           "type": "color"
         },
         "active": {
-          "value": "{brand.alt2.800}",
+          "value": "{Colors.alt2.800}",
           "type": "color"
         }
       },
       "third": {
         "default": {
-          "value": "{brand.alt3.600}",
+          "value": "{Colors.alt3.600}",
           "type": "color"
         },
         "hover": {
-          "value": "{brand.alt3.700}",
+          "value": "{Colors.alt3.700}",
           "type": "color"
         },
         "active": {
-          "value": "{brand.alt3.800}",
+          "value": "{Colors.alt3.800}",
           "type": "color"
         }
       },
diff --git a/design-tokens/Brand/Brreg.json b/design-tokens/Brand/Brreg.json
index c13b0538cf..9877c46eba 100644
--- a/design-tokens/Brand/Brreg.json
+++ b/design-tokens/Brand/Brreg.json
@@ -143,55 +143,55 @@
     "surface": {
       "first": {
         "subtle": {
-          "value": "{brand.alt1.100}",
+          "value": "{Colors.alt1.100}",
           "type": "color"
         },
         "subtle-hover": {
-          "value": "{brand.alt1.300}",
+          "value": "{Colors.alt1.300}",
           "type": "color"
         },
         "subtle-active": {
-          "value": "{brand.alt1.400}",
+          "value": "{Colors.alt1.400}",
           "type": "color"
         },
         "strong": {
-          "value": "{brand.alt1.700}",
+          "value": "{Colors.alt1.700}",
           "type": "color"
         }
       },
       "second": {
         "subtle": {
-          "value": "{brand.alt2.200}",
+          "value": "{Colors.alt2.200}",
           "type": "color"
         },
         "subtle-hover": {
-          "value": "{brand.alt2.300}",
+          "value": "{Colors.alt2.300}",
           "type": "color"
         },
         "subtle-active": {
-          "value": "{brand.alt2.400}",
+          "value": "{Colors.alt2.400}",
           "type": "color"
         },
         "strong": {
-          "value": "{brand.alt2.700}",
+          "value": "{Colors.alt2.700}",
           "type": "color"
         }
       },
       "third": {
         "subtle": {
-          "value": "{brand.alt3.100}",
+          "value": "{Colors.alt3.100}",
           "type": "color"
         },
         "subtle-hover": {
-          "value": "{brand.alt3.200}",
+          "value": "{Colors.alt3.200}",
           "type": "color"
         },
         "subtle-active": {
-          "value": "{brand.alt3.300}",
+          "value": "{Colors.alt3.300}",
           "type": "color"
         },
         "strong": {
-          "value": "{brand.alt3.700}",
+          "value": "{Colors.alt3.700}",
           "type": "color"
         }
       },
@@ -271,43 +271,43 @@
     "border": {
       "first": {
         "default": {
-          "value": "{brand.alt1.600}",
+          "value": "{Colors.alt1.600}",
           "type": "color"
         },
         "hover": {
-          "value": "{brand.alt1.700}",
+          "value": "{Colors.alt1.700}",
           "type": "color"
         },
         "active": {
-          "value": "{brand.alt1.800}",
+          "value": "{Colors.alt1.800}",
           "type": "color"
         }
       },
       "second": {
         "default": {
-          "value": "{brand.alt2.600}",
+          "value": "{Colors.alt2.600}",
           "type": "color"
         },
         "hover": {
-          "value": "{brand.alt2.700}",
+          "value": "{Colors.alt2.700}",
           "type": "color"
         },
         "active": {
-          "value": "{brand.alt2.800}",
+          "value": "{Colors.alt2.800}",
           "type": "color"
         }
       },
       "third": {
         "default": {
-          "value": "{brand.alt3.400}",
+          "value": "{Colors.alt3.400}",
           "type": "color"
         },
         "hover": {
-          "value": "{brand.alt3.500}",
+          "value": "{Colors.alt3.500}",
           "type": "color"
         },
         "active": {
-          "value": "{brand.alt3.600}",
+          "value": "{Colors.alt3.600}",
           "type": "color"
         }
       },
diff --git a/design-tokens/Base/Core.json b/design-tokens/System/Style.json
similarity index 100%
rename from design-tokens/Base/Core.json
rename to design-tokens/System/Style.json
diff --git a/design-tokens/System/dark.json b/design-tokens/System/dark.json
new file mode 100644
index 0000000000..c1ae856624
--- /dev/null
+++ b/design-tokens/System/dark.json
@@ -0,0 +1,56 @@
+{
+  "green": {
+    "1": {
+      "value": "#0b290f",
+      "type": "color"
+    },
+    "2": {
+      "value": "#08200c",
+      "type": "color"
+    },
+    "3": {
+      "value": "#0f3814",
+      "type": "color"
+    },
+    "4": {
+      "value": "#114218",
+      "type": "color"
+    },
+    "5": {
+      "value": "#144c1c",
+      "type": "color"
+    },
+    "6": {
+      "value": "#185e22",
+      "type": "color"
+    },
+    "7": {
+      "value": "#207a2c",
+      "type": "color"
+    },
+    "8": {
+      "value": "#207a2c",
+      "type": "color"
+    },
+    "9": {
+      "value": "#248c33",
+      "type": "color"
+    },
+    "10": {
+      "value": "#248c33",
+      "type": "color"
+    },
+    "11": {
+      "value": "#1d7129",
+      "type": "color"
+    },
+    "12": {
+      "value": "#64be70",
+      "type": "color"
+    },
+    "13": {
+      "value": "#a2d8aa",
+      "type": "color"
+    }
+  }
+}
\ No newline at end of file
diff --git a/design-tokens/System/light.json b/design-tokens/System/light.json
new file mode 100644
index 0000000000..822bed1427
--- /dev/null
+++ b/design-tokens/System/light.json
@@ -0,0 +1,56 @@
+{
+  "green": {
+    "1": {
+      "value": "#fcfefc",
+      "type": "color"
+    },
+    "2": {
+      "value": "#e9f6ea",
+      "type": "color"
+    },
+    "3": {
+      "value": "#d9efdc",
+      "type": "color"
+    },
+    "4": {
+      "value": "#b9e1be",
+      "type": "color"
+    },
+    "5": {
+      "value": "#94d29d",
+      "type": "color"
+    },
+    "6": {
+      "value": "#9ed6a5",
+      "type": "color"
+    },
+    "7": {
+      "value": "#29a03a",
+      "type": "color"
+    },
+    "8": {
+      "value": "#29a03a",
+      "type": "color"
+    },
+    "9": {
+      "value": "#2ca63d",
+      "type": "color"
+    },
+    "10": {
+      "value": "#248c33",
+      "type": "color"
+    },
+    "11": {
+      "value": "#1d7129",
+      "type": "color"
+    },
+    "12": {
+      "value": "#185c21",
+      "type": "color"
+    },
+    "13": {
+      "value": "#0f3814",
+      "type": "color"
+    }
+  }
+}
\ No newline at end of file