diff --git a/doc-site/.vitepress/theme/styles/nve_theme.css b/doc-site/.vitepress/theme/styles/nve_theme.css
index 872713a4..f5fe7e2b 100644
--- a/doc-site/.vitepress/theme/styles/nve_theme.css
+++ b/doc-site/.vitepress/theme/styles/nve_theme.css
@@ -120,7 +120,7 @@
   --color-shades-functional-yellow-800: #bf9722;
   --color-shades-functional-yellow-850: #b08c21;
   --color-shades-functional-yellow-900: #a88324;
-  --color-shades-functional-yellow-950: #977726;
+  --color-shades-functional-yellow-950: #836721;
   --color-shades-functional-yellow-999: #7a5f29;
   --color-shades-functional-yellow-000: #fff9e9;
   --color-shades-functional-yellow-050: #fff5d9;
@@ -260,8 +260,10 @@
   --color-neutrals-foreground-primary: var(--color-shades-grey-999);
   --color-neutrals-foreground-secondary: var(--color-shades-functional-neutralgrey-800);
   --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-600);
+  --color-neutrals-foreground-faint: var(--color-shades-functional-neutralgrey-150);
   --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-000);
   --color-neutrals-border-default: var(--color-shades-grey-500);
+  --color-neutrals-border-emphasized: var(--color-shades-grey-999);
   --color-neutrals-border-mute: var(--color-shades-grey-300);
   --color-neutrals-border-subtle: var(--color-shades-grey-150);
   --color-neutrals-border-disabled: var(--color-shades-grey-500);
@@ -758,7 +760,7 @@
   --color-shades-functional-yellow-800: #bf9722;
   --color-shades-functional-yellow-850: #b08c21;
   --color-shades-functional-yellow-900: #a88324;
-  --color-shades-functional-yellow-950: #977726;
+  --color-shades-functional-yellow-950: #836721;
   --color-shades-functional-yellow-999: #7a5f29;
   --color-shades-functional-yellow-000: #fff9e9;
   --color-shades-functional-yellow-050: #fff5d9;
@@ -896,10 +898,12 @@
   --color-neutrals-background-secondary-dim: var(--color-shades-grey-850);
   --color-neutrals-background-tertiary-dim: var(--color-shades-grey-700);
   --color-neutrals-foreground-primary: var(--color-shades-grey-000);
-  --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-200);
   --color-neutrals-foreground-secondary: var(--color-shades-functional-neutralgrey-100);
-  --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-000);
+  --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-200);
+  --color-neutrals-foreground-faint: var(--color-shades-functional-neutralgrey-800);
+  --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-999);
   --color-neutrals-border-default: var(--color-shades-grey-300);
+  --color-neutrals-border-emphasized: var(--color-shades-grey-000);
   --color-neutrals-border-mute: var(--color-shades-grey-600);
   --color-neutrals-border-subtle: var(--color-shades-grey-800);
   --color-neutrals-border-disabled: var(--color-shades-grey-500);
@@ -941,12 +945,12 @@
   --color-interactive-danger-foreground-disabled: var(--color-shades-grey-950);
   --color-interactive-danger-border-focus: var(--color-shades-functional-blue-500);
   --color-feedback-background-default-neutral: var(--color-shades-functional-neutralgrey-800);
-  --color-feedback-background-default-info: var(--color-shades-functional-blue-950);
+  --color-feedback-background-default-info: var(--color-shades-functional-blue-850);
   --color-feedback-background-default-error: var(--color-shades-functional-red-850);
-  --color-feedback-background-default-warning: var(--color-shades-functional-yellow-999);
-  --color-feedback-background-default-success: var(--color-shades-functional-green-900);
+  --color-feedback-background-default-warning: var(--color-shades-functional-yellow-950);
+  --color-feedback-background-default-success: var(--color-shades-functional-green-850);
   --color-feedback-background-subtle-neutral: var(--color-shades-functional-neutralgrey-850);
-  --color-feedback-background-subtle-info: var(--color-shades-functional-blue-999);
+  --color-feedback-background-subtle-info: var(--color-shades-functional-blue-900);
   --color-feedback-background-subtle-error: var(--color-shades-functional-red-900);
   --color-feedback-background-subtle-warning: var(--color-shades-functional-yellow-999);
   --color-feedback-background-subtle-success: var(--color-shades-functional-green-900);
@@ -954,7 +958,7 @@
   --color-feedback-background-emphasized-info: var(--color-shades-functional-blue-800);
   --color-feedback-background-emphasized-error: var(--color-shades-functional-red-700);
   --color-feedback-background-emphasized-warning: var(--color-shades-functional-yellow-600);
-  --color-feedback-background-emphasized-success: var(--color-shades-functional-green-900);
+  --color-feedback-background-emphasized-success: var(--color-shades-functional-green-800);
   --color-feedback-foreground-neutral: var(--color-shades-functional-neutralgrey-000);
   --color-feedback-foreground-info: var(--color-shades-functional-blue-300);
   --color-feedback-foreground-error: var(--color-shades-functional-red-400);
@@ -994,7 +998,7 @@
   --color-feedback-border-emphasized-info: var(--color-shades-functional-blue-700);
   --color-feedback-border-emphasized-error: var(--color-shades-functional-red-400);
   --color-feedback-border-emphasized-warning: var(--color-shades-functional-yellow-700);
-  --color-feedback-border-emphasized-success: var(--color-shades-functional-green-800);
+  --color-feedback-border-emphasized-success: var(--color-shades-functional-green-700);
   --color-dangerlevel-background-mute-level1: var(--color-shades-functional-green-150);
   --color-dangerlevel-background-mute-level2: var(--color-shades-functional-yellow-200);
   --color-dangerlevel-background-mute-level3: var(--color-shades-functional-orange-150);
diff --git a/doc-site/.vitepress/theme/styles/rme_theme.css b/doc-site/.vitepress/theme/styles/rme_theme.css
index ca667f16..9e02039d 100644
--- a/doc-site/.vitepress/theme/styles/rme_theme.css
+++ b/doc-site/.vitepress/theme/styles/rme_theme.css
@@ -120,7 +120,7 @@
   --color-shades-functional-yellow-800: #bf9722;
   --color-shades-functional-yellow-850: #b08c21;
   --color-shades-functional-yellow-900: #a88324;
-  --color-shades-functional-yellow-950: #977726;
+  --color-shades-functional-yellow-950: #836721;
   --color-shades-functional-yellow-999: #7a5f29;
   --color-shades-functional-yellow-000: #fff9e9;
   --color-shades-functional-yellow-050: #fff5d9;
@@ -260,8 +260,10 @@
   --color-neutrals-foreground-primary: var(--color-shades-grey-999);
   --color-neutrals-foreground-secondary: var(--color-shades-functional-neutralgrey-800);
   --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-600);
+  --color-neutrals-foreground-faint: var(--color-shades-functional-neutralgrey-150);
   --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-000);
   --color-neutrals-border-default: var(--color-shades-grey-500);
+  --color-neutrals-border-emphasized: var(--color-shades-grey-999);
   --color-neutrals-border-mute: var(--color-shades-grey-300);
   --color-neutrals-border-subtle: var(--color-shades-grey-150);
   --color-neutrals-border-disabled: var(--color-shades-grey-500);
@@ -758,7 +760,7 @@
   --color-shades-functional-yellow-800: #bf9722;
   --color-shades-functional-yellow-850: #b08c21;
   --color-shades-functional-yellow-900: #a88324;
-  --color-shades-functional-yellow-950: #977726;
+  --color-shades-functional-yellow-950: #836721;
   --color-shades-functional-yellow-999: #7a5f29;
   --color-shades-functional-yellow-000: #fff9e9;
   --color-shades-functional-yellow-050: #fff5d9;
@@ -896,10 +898,12 @@
   --color-neutrals-background-secondary-dim: var(--color-shades-grey-850);
   --color-neutrals-background-tertiary-dim: var(--color-shades-grey-700);
   --color-neutrals-foreground-primary: var(--color-shades-grey-000);
-  --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-200);
   --color-neutrals-foreground-secondary: var(--color-shades-functional-neutralgrey-100);
-  --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-000);
+  --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-200);
+  --color-neutrals-foreground-faint: var(--color-shades-functional-neutralgrey-800);
+  --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-999);
   --color-neutrals-border-default: var(--color-shades-grey-300);
+  --color-neutrals-border-emphasized: var(--color-shades-grey-000);
   --color-neutrals-border-mute: var(--color-shades-grey-600);
   --color-neutrals-border-subtle: var(--color-shades-grey-800);
   --color-neutrals-border-disabled: var(--color-shades-grey-500);
@@ -941,12 +945,12 @@
   --color-interactive-danger-foreground-disabled: var(--color-shades-grey-950);
   --color-interactive-danger-border-focus: var(--color-shades-functional-blue-500);
   --color-feedback-background-default-neutral: var(--color-shades-functional-neutralgrey-800);
-  --color-feedback-background-default-info: var(--color-shades-functional-blue-950);
+  --color-feedback-background-default-info: var(--color-shades-functional-blue-850);
   --color-feedback-background-default-error: var(--color-shades-functional-red-850);
-  --color-feedback-background-default-warning: var(--color-shades-functional-yellow-999);
-  --color-feedback-background-default-success: var(--color-shades-functional-green-900);
+  --color-feedback-background-default-warning: var(--color-shades-functional-yellow-950);
+  --color-feedback-background-default-success: var(--color-shades-functional-green-850);
   --color-feedback-background-subtle-neutral: var(--color-shades-functional-neutralgrey-850);
-  --color-feedback-background-subtle-info: var(--color-shades-functional-blue-999);
+  --color-feedback-background-subtle-info: var(--color-shades-functional-blue-900);
   --color-feedback-background-subtle-error: var(--color-shades-functional-red-900);
   --color-feedback-background-subtle-warning: var(--color-shades-functional-yellow-999);
   --color-feedback-background-subtle-success: var(--color-shades-functional-green-900);
@@ -954,7 +958,7 @@
   --color-feedback-background-emphasized-info: var(--color-shades-functional-blue-800);
   --color-feedback-background-emphasized-error: var(--color-shades-functional-red-700);
   --color-feedback-background-emphasized-warning: var(--color-shades-functional-yellow-600);
-  --color-feedback-background-emphasized-success: var(--color-shades-functional-green-900);
+  --color-feedback-background-emphasized-success: var(--color-shades-functional-green-800);
   --color-feedback-foreground-neutral: var(--color-shades-functional-neutralgrey-000);
   --color-feedback-foreground-info: var(--color-shades-functional-blue-300);
   --color-feedback-foreground-error: var(--color-shades-functional-red-400);
@@ -994,7 +998,7 @@
   --color-feedback-border-emphasized-info: var(--color-shades-functional-blue-700);
   --color-feedback-border-emphasized-error: var(--color-shades-functional-red-400);
   --color-feedback-border-emphasized-warning: var(--color-shades-functional-yellow-700);
-  --color-feedback-border-emphasized-success: var(--color-shades-functional-green-800);
+  --color-feedback-border-emphasized-success: var(--color-shades-functional-green-700);
   --color-dangerlevel-background-mute-level1: var(--color-shades-functional-green-150);
   --color-dangerlevel-background-mute-level2: var(--color-shades-functional-yellow-200);
   --color-dangerlevel-background-mute-level3: var(--color-shades-functional-orange-150);
diff --git a/doc-site/.vitepress/theme/styles/varsom_theme.css b/doc-site/.vitepress/theme/styles/varsom_theme.css
index 1384dc58..894e0431 100644
--- a/doc-site/.vitepress/theme/styles/varsom_theme.css
+++ b/doc-site/.vitepress/theme/styles/varsom_theme.css
@@ -120,7 +120,7 @@
   --color-shades-functional-yellow-800: #bf9722;
   --color-shades-functional-yellow-850: #b08c21;
   --color-shades-functional-yellow-900: #a88324;
-  --color-shades-functional-yellow-950: #977726;
+  --color-shades-functional-yellow-950: #836721;
   --color-shades-functional-yellow-999: #7a5f29;
   --color-shades-functional-yellow-000: #fff9e9;
   --color-shades-functional-yellow-050: #fff5d9;
@@ -260,8 +260,10 @@
   --color-neutrals-foreground-primary: var(--color-shades-grey-999);
   --color-neutrals-foreground-secondary: var(--color-shades-functional-neutralgrey-800);
   --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-600);
+  --color-neutrals-foreground-faint: var(--color-shades-functional-neutralgrey-150);
   --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-000);
   --color-neutrals-border-default: var(--color-shades-grey-500);
+  --color-neutrals-border-emphasized: var(--color-shades-grey-999);
   --color-neutrals-border-mute: var(--color-shades-grey-300);
   --color-neutrals-border-subtle: var(--color-shades-grey-150);
   --color-neutrals-border-disabled: var(--color-shades-grey-500);
@@ -758,7 +760,7 @@
   --color-shades-functional-yellow-800: #bf9722;
   --color-shades-functional-yellow-850: #b08c21;
   --color-shades-functional-yellow-900: #a88324;
-  --color-shades-functional-yellow-950: #977726;
+  --color-shades-functional-yellow-950: #836721;
   --color-shades-functional-yellow-999: #7a5f29;
   --color-shades-functional-yellow-000: #fff9e9;
   --color-shades-functional-yellow-050: #fff5d9;
@@ -896,10 +898,12 @@
   --color-neutrals-background-secondary-dim: var(--color-shades-grey-850);
   --color-neutrals-background-tertiary-dim: var(--color-shades-grey-700);
   --color-neutrals-foreground-primary: var(--color-shades-grey-000);
-  --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-200);
   --color-neutrals-foreground-secondary: var(--color-shades-functional-neutralgrey-100);
-  --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-000);
+  --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-200);
+  --color-neutrals-foreground-faint: var(--color-shades-functional-neutralgrey-800);
+  --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-999);
   --color-neutrals-border-default: var(--color-shades-grey-300);
+  --color-neutrals-border-emphasized: var(--color-shades-grey-000);
   --color-neutrals-border-mute: var(--color-shades-grey-600);
   --color-neutrals-border-subtle: var(--color-shades-grey-800);
   --color-neutrals-border-disabled: var(--color-shades-grey-500);
@@ -941,12 +945,12 @@
   --color-interactive-danger-foreground-disabled: var(--color-shades-grey-950);
   --color-interactive-danger-border-focus: var(--color-shades-functional-blue-500);
   --color-feedback-background-default-neutral: var(--color-shades-functional-neutralgrey-800);
-  --color-feedback-background-default-info: var(--color-shades-functional-blue-950);
+  --color-feedback-background-default-info: var(--color-shades-functional-blue-850);
   --color-feedback-background-default-error: var(--color-shades-functional-red-850);
-  --color-feedback-background-default-warning: var(--color-shades-functional-yellow-999);
-  --color-feedback-background-default-success: var(--color-shades-functional-green-900);
+  --color-feedback-background-default-warning: var(--color-shades-functional-yellow-950);
+  --color-feedback-background-default-success: var(--color-shades-functional-green-850);
   --color-feedback-background-subtle-neutral: var(--color-shades-functional-neutralgrey-850);
-  --color-feedback-background-subtle-info: var(--color-shades-functional-blue-999);
+  --color-feedback-background-subtle-info: var(--color-shades-functional-blue-900);
   --color-feedback-background-subtle-error: var(--color-shades-functional-red-900);
   --color-feedback-background-subtle-warning: var(--color-shades-functional-yellow-999);
   --color-feedback-background-subtle-success: var(--color-shades-functional-green-900);
@@ -954,7 +958,7 @@
   --color-feedback-background-emphasized-info: var(--color-shades-functional-blue-800);
   --color-feedback-background-emphasized-error: var(--color-shades-functional-red-700);
   --color-feedback-background-emphasized-warning: var(--color-shades-functional-yellow-600);
-  --color-feedback-background-emphasized-success: var(--color-shades-functional-green-900);
+  --color-feedback-background-emphasized-success: var(--color-shades-functional-green-800);
   --color-feedback-foreground-neutral: var(--color-shades-functional-neutralgrey-000);
   --color-feedback-foreground-info: var(--color-shades-functional-blue-300);
   --color-feedback-foreground-error: var(--color-shades-functional-red-400);
@@ -994,7 +998,7 @@
   --color-feedback-border-emphasized-info: var(--color-shades-functional-blue-700);
   --color-feedback-border-emphasized-error: var(--color-shades-functional-red-400);
   --color-feedback-border-emphasized-warning: var(--color-shades-functional-yellow-700);
-  --color-feedback-border-emphasized-success: var(--color-shades-functional-green-800);
+  --color-feedback-border-emphasized-success: var(--color-shades-functional-green-700);
   --color-dangerlevel-background-mute-level1: var(--color-shades-functional-green-150);
   --color-dangerlevel-background-mute-level2: var(--color-shades-functional-yellow-200);
   --color-dangerlevel-background-mute-level3: var(--color-shades-functional-orange-150);
diff --git a/package-lock.json b/package-lock.json
index acec7e26..bff3c32c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1239,8 +1239,7 @@
       "version": "0.2.9",
       "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.9.tgz",
       "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@github/catalyst": {
       "version": "1.7.0",
@@ -1707,7 +1706,6 @@
       "integrity": "sha512-ODsoD39Lq6vR6aBgvjTnA3nZGliknKboc9Gtxr7E4WDNqY24MxANKcuDQSF0jzapvGb3KWOEDrKfve4HoWGK+g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@octokit/auth-token": "^6.0.0",
         "@octokit/graphql": "^9.0.1",
@@ -3447,7 +3445,6 @@
       "integrity": "sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~6.21.0"
       }
@@ -3598,7 +3595,6 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz",
       "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.35.1",
         "@typescript-eslint/types": "8.35.1",
@@ -4261,7 +4257,6 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5654,7 +5649,6 @@
       "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "env-paths": "^2.2.1",
         "import-fresh": "^3.3.0",
@@ -6060,7 +6054,8 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/custom-element-jet-brains-integration": {
       "version": "1.7.0",
@@ -6737,7 +6732,6 @@
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.1.tgz",
       "integrity": "sha512-zmxXPNMOXmwm9E0yQLi5uqXHs7uq2UIiqEKo3Gq+3fwo1XrJ+hijAZImyF7hclW3E6oHz43Yk3RP8at6OTKflQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -6831,7 +6825,6 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-10.3.0.tgz",
       "integrity": "sha512-A0u9snqjCfYaPnqqOaH6MBLVWDUIN4trXn8J3x67uDcXvR7X6Ut8p16N+nYhMCQ9Y7edg2BIRGzfyZsY0IdqoQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "natural-compare": "^1.4.0",
@@ -9676,7 +9669,6 @@
       "integrity": "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "marked": "bin/marked.js"
       },
@@ -12143,7 +12135,6 @@
       "dev": true,
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -13129,7 +13120,6 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
       "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
-      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -13326,7 +13316,6 @@
       "integrity": "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13638,7 +13627,6 @@
       "integrity": "sha512-78E9voJHwnXQMiQdiqswVLZwJIzdBKJ1GdI5Zx6XwoFKUIk09/sSrr+05QFzvYb8q6Y9pPV45zzDuYa3907TZA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -13762,7 +13750,6 @@
       "integrity": "sha512-6qGjWccl5yoyugHt3jTgztJ9Y0JVzyH8/Voc/D8PlLat9pwxQYXz7W1Dpnq5h0/G5GCYGUaDSlYcyk3AMh5A6g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@semantic-release/commit-analyzer": "^13.0.1",
         "@semantic-release/error": "^4.0.0",
@@ -14661,7 +14648,6 @@
       "resolved": "https://registry.npmjs.org/style-dictionary/-/style-dictionary-5.1.1.tgz",
       "integrity": "sha512-scRFwr2VrerXy6BzO2Ym8AI0dRGkAIoS2YhooagytxCFkoXPYCLhvIxg3VO/yD2i4VeU4aGmHG80+ZLdPDb0uw==",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@bundled-es-modules/deepmerge": "^4.3.1",
         "@bundled-es-modules/glob": "^11.0.3",
@@ -14976,7 +14962,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -15093,8 +15078,7 @@
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "license": "0BSD",
-      "peer": true
+      "license": "0BSD"
     },
     "node_modules/tsscmp": {
       "version": "1.0.6",
@@ -15162,7 +15146,6 @@
       "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -15400,7 +15383,6 @@
       "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
@@ -15549,7 +15531,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -15664,7 +15645,6 @@
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.2.0.tgz",
       "integrity": "sha512-CydUvFOQKD928UzZhTp4pr2vWz1L+H99t7Pkln2QSPdvmURT0MoC4wUccfCnuEaihNsu9aYYyk+bep8rlfkUXw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "debug": "^4.4.0",
         "eslint-scope": "^8.2.0",
diff --git a/public/css/nve.css b/public/css/nve.css
index 3173bcbf..87aae6ba 100644
--- a/public/css/nve.css
+++ b/public/css/nve.css
@@ -126,7 +126,7 @@
   --color-shades-functional-yellow-800: #bf9722;
   --color-shades-functional-yellow-850: #b08c21;
   --color-shades-functional-yellow-900: #a88324;
-  --color-shades-functional-yellow-950: #977726;
+  --color-shades-functional-yellow-950: #836721;
   --color-shades-functional-yellow-999: #7a5f29;
   --color-shades-functional-yellow-000: #fff9e9;
   --color-shades-functional-yellow-050: #fff5d9;
@@ -266,8 +266,10 @@
   --color-neutrals-foreground-primary: var(--color-shades-grey-999);
   --color-neutrals-foreground-secondary: var(--color-shades-functional-neutralgrey-800);
   --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-600);
+  --color-neutrals-foreground-faint: var(--color-shades-functional-neutralgrey-150);
   --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-000);
   --color-neutrals-border-default: var(--color-shades-grey-500);
+  --color-neutrals-border-emphasized: var(--color-shades-grey-999);
   --color-neutrals-border-mute: var(--color-shades-grey-300);
   --color-neutrals-border-subtle: var(--color-shades-grey-150);
   --color-neutrals-border-disabled: var(--color-shades-grey-500);
diff --git a/public/css/nve_dark.css b/public/css/nve_dark.css
index 72e972b6..d130f681 100644
--- a/public/css/nve_dark.css
+++ b/public/css/nve_dark.css
@@ -126,7 +126,7 @@
   --color-shades-functional-yellow-800: #bf9722;
   --color-shades-functional-yellow-850: #b08c21;
   --color-shades-functional-yellow-900: #a88324;
-  --color-shades-functional-yellow-950: #977726;
+  --color-shades-functional-yellow-950: #836721;
   --color-shades-functional-yellow-999: #7a5f29;
   --color-shades-functional-yellow-000: #fff9e9;
   --color-shades-functional-yellow-050: #fff5d9;
@@ -264,10 +264,12 @@
   --color-neutrals-background-secondary-dim: var(--color-shades-grey-850);
   --color-neutrals-background-tertiary-dim: var(--color-shades-grey-700);
   --color-neutrals-foreground-primary: var(--color-shades-grey-000);
-  --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-200);
   --color-neutrals-foreground-secondary: var(--color-shades-functional-neutralgrey-100);
-  --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-000);
+  --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-200);
+  --color-neutrals-foreground-faint: var(--color-shades-functional-neutralgrey-800);
+  --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-999);
   --color-neutrals-border-default: var(--color-shades-grey-300);
+  --color-neutrals-border-emphasized: var(--color-shades-grey-000);
   --color-neutrals-border-mute: var(--color-shades-grey-600);
   --color-neutrals-border-subtle: var(--color-shades-grey-800);
   --color-neutrals-border-disabled: var(--color-shades-grey-500);
@@ -309,12 +311,12 @@
   --color-interactive-danger-foreground-disabled: var(--color-shades-grey-950);
   --color-interactive-danger-border-focus: var(--color-shades-functional-blue-500);
   --color-feedback-background-default-neutral: var(--color-shades-functional-neutralgrey-800);
-  --color-feedback-background-default-info: var(--color-shades-functional-blue-950);
+  --color-feedback-background-default-info: var(--color-shades-functional-blue-850);
   --color-feedback-background-default-error: var(--color-shades-functional-red-850);
-  --color-feedback-background-default-warning: var(--color-shades-functional-yellow-999);
-  --color-feedback-background-default-success: var(--color-shades-functional-green-900);
+  --color-feedback-background-default-warning: var(--color-shades-functional-yellow-950);
+  --color-feedback-background-default-success: var(--color-shades-functional-green-850);
   --color-feedback-background-subtle-neutral: var(--color-shades-functional-neutralgrey-850);
-  --color-feedback-background-subtle-info: var(--color-shades-functional-blue-999);
+  --color-feedback-background-subtle-info: var(--color-shades-functional-blue-900);
   --color-feedback-background-subtle-error: var(--color-shades-functional-red-900);
   --color-feedback-background-subtle-warning: var(--color-shades-functional-yellow-999);
   --color-feedback-background-subtle-success: var(--color-shades-functional-green-900);
@@ -322,7 +324,7 @@
   --color-feedback-background-emphasized-info: var(--color-shades-functional-blue-800);
   --color-feedback-background-emphasized-error: var(--color-shades-functional-red-700);
   --color-feedback-background-emphasized-warning: var(--color-shades-functional-yellow-600);
-  --color-feedback-background-emphasized-success: var(--color-shades-functional-green-900);
+  --color-feedback-background-emphasized-success: var(--color-shades-functional-green-800);
   --color-feedback-foreground-neutral: var(--color-shades-functional-neutralgrey-000);
   --color-feedback-foreground-info: var(--color-shades-functional-blue-300);
   --color-feedback-foreground-error: var(--color-shades-functional-red-400);
@@ -362,7 +364,7 @@
   --color-feedback-border-emphasized-info: var(--color-shades-functional-blue-700);
   --color-feedback-border-emphasized-error: var(--color-shades-functional-red-400);
   --color-feedback-border-emphasized-warning: var(--color-shades-functional-yellow-700);
-  --color-feedback-border-emphasized-success: var(--color-shades-functional-green-800);
+  --color-feedback-border-emphasized-success: var(--color-shades-functional-green-700);
   --color-dangerlevel-background-mute-level1: var(--color-shades-functional-green-150);
   --color-dangerlevel-background-mute-level2: var(--color-shades-functional-yellow-200);
   --color-dangerlevel-background-mute-level3: var(--color-shades-functional-orange-150);
diff --git a/public/css/rme.css b/public/css/rme.css
index f312c710..898a1321 100644
--- a/public/css/rme.css
+++ b/public/css/rme.css
@@ -126,7 +126,7 @@
   --color-shades-functional-yellow-800: #bf9722;
   --color-shades-functional-yellow-850: #b08c21;
   --color-shades-functional-yellow-900: #a88324;
-  --color-shades-functional-yellow-950: #977726;
+  --color-shades-functional-yellow-950: #836721;
   --color-shades-functional-yellow-999: #7a5f29;
   --color-shades-functional-yellow-000: #fff9e9;
   --color-shades-functional-yellow-050: #fff5d9;
@@ -266,8 +266,10 @@
   --color-neutrals-foreground-primary: var(--color-shades-grey-999);
   --color-neutrals-foreground-secondary: var(--color-shades-functional-neutralgrey-800);
   --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-600);
+  --color-neutrals-foreground-faint: var(--color-shades-functional-neutralgrey-150);
   --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-000);
   --color-neutrals-border-default: var(--color-shades-grey-500);
+  --color-neutrals-border-emphasized: var(--color-shades-grey-999);
   --color-neutrals-border-mute: var(--color-shades-grey-300);
   --color-neutrals-border-subtle: var(--color-shades-grey-150);
   --color-neutrals-border-disabled: var(--color-shades-grey-500);
diff --git a/public/css/rme_dark.css b/public/css/rme_dark.css
index 44e8be51..93f1b726 100644
--- a/public/css/rme_dark.css
+++ b/public/css/rme_dark.css
@@ -126,7 +126,7 @@
   --color-shades-functional-yellow-800: #bf9722;
   --color-shades-functional-yellow-850: #b08c21;
   --color-shades-functional-yellow-900: #a88324;
-  --color-shades-functional-yellow-950: #977726;
+  --color-shades-functional-yellow-950: #836721;
   --color-shades-functional-yellow-999: #7a5f29;
   --color-shades-functional-yellow-000: #fff9e9;
   --color-shades-functional-yellow-050: #fff5d9;
@@ -264,10 +264,12 @@
   --color-neutrals-background-secondary-dim: var(--color-shades-grey-850);
   --color-neutrals-background-tertiary-dim: var(--color-shades-grey-700);
   --color-neutrals-foreground-primary: var(--color-shades-grey-000);
-  --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-200);
   --color-neutrals-foreground-secondary: var(--color-shades-functional-neutralgrey-100);
-  --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-000);
+  --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-200);
+  --color-neutrals-foreground-faint: var(--color-shades-functional-neutralgrey-800);
+  --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-999);
   --color-neutrals-border-default: var(--color-shades-grey-300);
+  --color-neutrals-border-emphasized: var(--color-shades-grey-000);
   --color-neutrals-border-mute: var(--color-shades-grey-600);
   --color-neutrals-border-subtle: var(--color-shades-grey-800);
   --color-neutrals-border-disabled: var(--color-shades-grey-500);
@@ -309,12 +311,12 @@
   --color-interactive-danger-foreground-disabled: var(--color-shades-grey-950);
   --color-interactive-danger-border-focus: var(--color-shades-functional-blue-500);
   --color-feedback-background-default-neutral: var(--color-shades-functional-neutralgrey-800);
-  --color-feedback-background-default-info: var(--color-shades-functional-blue-950);
+  --color-feedback-background-default-info: var(--color-shades-functional-blue-850);
   --color-feedback-background-default-error: var(--color-shades-functional-red-850);
-  --color-feedback-background-default-warning: var(--color-shades-functional-yellow-999);
-  --color-feedback-background-default-success: var(--color-shades-functional-green-900);
+  --color-feedback-background-default-warning: var(--color-shades-functional-yellow-950);
+  --color-feedback-background-default-success: var(--color-shades-functional-green-850);
   --color-feedback-background-subtle-neutral: var(--color-shades-functional-neutralgrey-850);
-  --color-feedback-background-subtle-info: var(--color-shades-functional-blue-999);
+  --color-feedback-background-subtle-info: var(--color-shades-functional-blue-900);
   --color-feedback-background-subtle-error: var(--color-shades-functional-red-900);
   --color-feedback-background-subtle-warning: var(--color-shades-functional-yellow-999);
   --color-feedback-background-subtle-success: var(--color-shades-functional-green-900);
@@ -322,7 +324,7 @@
   --color-feedback-background-emphasized-info: var(--color-shades-functional-blue-800);
   --color-feedback-background-emphasized-error: var(--color-shades-functional-red-700);
   --color-feedback-background-emphasized-warning: var(--color-shades-functional-yellow-600);
-  --color-feedback-background-emphasized-success: var(--color-shades-functional-green-900);
+  --color-feedback-background-emphasized-success: var(--color-shades-functional-green-800);
   --color-feedback-foreground-neutral: var(--color-shades-functional-neutralgrey-000);
   --color-feedback-foreground-info: var(--color-shades-functional-blue-300);
   --color-feedback-foreground-error: var(--color-shades-functional-red-400);
@@ -362,7 +364,7 @@
   --color-feedback-border-emphasized-info: var(--color-shades-functional-blue-700);
   --color-feedback-border-emphasized-error: var(--color-shades-functional-red-400);
   --color-feedback-border-emphasized-warning: var(--color-shades-functional-yellow-700);
-  --color-feedback-border-emphasized-success: var(--color-shades-functional-green-800);
+  --color-feedback-border-emphasized-success: var(--color-shades-functional-green-700);
   --color-dangerlevel-background-mute-level1: var(--color-shades-functional-green-150);
   --color-dangerlevel-background-mute-level2: var(--color-shades-functional-yellow-200);
   --color-dangerlevel-background-mute-level3: var(--color-shades-functional-orange-150);
diff --git a/public/css/varsom.css b/public/css/varsom.css
index 7fe28904..0f486ba9 100644
--- a/public/css/varsom.css
+++ b/public/css/varsom.css
@@ -126,7 +126,7 @@
   --color-shades-functional-yellow-800: #bf9722;
   --color-shades-functional-yellow-850: #b08c21;
   --color-shades-functional-yellow-900: #a88324;
-  --color-shades-functional-yellow-950: #977726;
+  --color-shades-functional-yellow-950: #836721;
   --color-shades-functional-yellow-999: #7a5f29;
   --color-shades-functional-yellow-000: #fff9e9;
   --color-shades-functional-yellow-050: #fff5d9;
@@ -266,8 +266,10 @@
   --color-neutrals-foreground-primary: var(--color-shades-grey-999);
   --color-neutrals-foreground-secondary: var(--color-shades-functional-neutralgrey-800);
   --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-600);
+  --color-neutrals-foreground-faint: var(--color-shades-functional-neutralgrey-150);
   --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-000);
   --color-neutrals-border-default: var(--color-shades-grey-500);
+  --color-neutrals-border-emphasized: var(--color-shades-grey-999);
   --color-neutrals-border-mute: var(--color-shades-grey-300);
   --color-neutrals-border-subtle: var(--color-shades-grey-150);
   --color-neutrals-border-disabled: var(--color-shades-grey-500);
diff --git a/public/css/varsom_dark.css b/public/css/varsom_dark.css
index ef5c999e..bcdf5294 100644
--- a/public/css/varsom_dark.css
+++ b/public/css/varsom_dark.css
@@ -126,7 +126,7 @@
   --color-shades-functional-yellow-800: #bf9722;
   --color-shades-functional-yellow-850: #b08c21;
   --color-shades-functional-yellow-900: #a88324;
-  --color-shades-functional-yellow-950: #977726;
+  --color-shades-functional-yellow-950: #836721;
   --color-shades-functional-yellow-999: #7a5f29;
   --color-shades-functional-yellow-000: #fff9e9;
   --color-shades-functional-yellow-050: #fff5d9;
@@ -264,10 +264,12 @@
   --color-neutrals-background-secondary-dim: var(--color-shades-grey-850);
   --color-neutrals-background-tertiary-dim: var(--color-shades-grey-700);
   --color-neutrals-foreground-primary: var(--color-shades-grey-000);
-  --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-200);
   --color-neutrals-foreground-secondary: var(--color-shades-functional-neutralgrey-100);
-  --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-000);
+  --color-neutrals-foreground-subtle: var(--color-shades-functional-neutralgrey-200);
+  --color-neutrals-foreground-faint: var(--color-shades-functional-neutralgrey-800);
+  --color-neutrals-foreground-inverted: var(--color-shades-functional-neutralgrey-999);
   --color-neutrals-border-default: var(--color-shades-grey-300);
+  --color-neutrals-border-emphasized: var(--color-shades-grey-000);
   --color-neutrals-border-mute: var(--color-shades-grey-600);
   --color-neutrals-border-subtle: var(--color-shades-grey-800);
   --color-neutrals-border-disabled: var(--color-shades-grey-500);
@@ -309,12 +311,12 @@
   --color-interactive-danger-foreground-disabled: var(--color-shades-grey-950);
   --color-interactive-danger-border-focus: var(--color-shades-functional-blue-500);
   --color-feedback-background-default-neutral: var(--color-shades-functional-neutralgrey-800);
-  --color-feedback-background-default-info: var(--color-shades-functional-blue-950);
+  --color-feedback-background-default-info: var(--color-shades-functional-blue-850);
   --color-feedback-background-default-error: var(--color-shades-functional-red-850);
-  --color-feedback-background-default-warning: var(--color-shades-functional-yellow-999);
-  --color-feedback-background-default-success: var(--color-shades-functional-green-900);
+  --color-feedback-background-default-warning: var(--color-shades-functional-yellow-950);
+  --color-feedback-background-default-success: var(--color-shades-functional-green-850);
   --color-feedback-background-subtle-neutral: var(--color-shades-functional-neutralgrey-850);
-  --color-feedback-background-subtle-info: var(--color-shades-functional-blue-999);
+  --color-feedback-background-subtle-info: var(--color-shades-functional-blue-900);
   --color-feedback-background-subtle-error: var(--color-shades-functional-red-900);
   --color-feedback-background-subtle-warning: var(--color-shades-functional-yellow-999);
   --color-feedback-background-subtle-success: var(--color-shades-functional-green-900);
@@ -322,7 +324,7 @@
   --color-feedback-background-emphasized-info: var(--color-shades-functional-blue-800);
   --color-feedback-background-emphasized-error: var(--color-shades-functional-red-700);
   --color-feedback-background-emphasized-warning: var(--color-shades-functional-yellow-600);
-  --color-feedback-background-emphasized-success: var(--color-shades-functional-green-900);
+  --color-feedback-background-emphasized-success: var(--color-shades-functional-green-800);
   --color-feedback-foreground-neutral: var(--color-shades-functional-neutralgrey-000);
   --color-feedback-foreground-info: var(--color-shades-functional-blue-300);
   --color-feedback-foreground-error: var(--color-shades-functional-red-400);
@@ -362,7 +364,7 @@
   --color-feedback-border-emphasized-info: var(--color-shades-functional-blue-700);
   --color-feedback-border-emphasized-error: var(--color-shades-functional-red-400);
   --color-feedback-border-emphasized-warning: var(--color-shades-functional-yellow-700);
-  --color-feedback-border-emphasized-success: var(--color-shades-functional-green-800);
+  --color-feedback-border-emphasized-success: var(--color-shades-functional-green-700);
   --color-dangerlevel-background-mute-level1: var(--color-shades-functional-green-150);
   --color-dangerlevel-background-mute-level2: var(--color-shades-functional-yellow-200);
   --color-dangerlevel-background-mute-level3: var(--color-shades-functional-orange-150);
diff --git a/tokens/$themes.json b/tokens/$themes.json
index 8b61d1b9..7529dff6 100644
--- a/tokens/$themes.json
+++ b/tokens/$themes.json
@@ -766,10 +766,12 @@
       "color.neutrals.background.secondary-dim": "414fbcc0b42c04fbd1299717a5181225d92f7d22",
       "color.neutrals.background.tertiary-dim": "5115dd3c64f36f7344f90d7e3e4e66ef4cfca41f",
       "color.neutrals.foreground.primary": "7b2ff23323a73b6f8edd49f2c37edea6954b8aaa",
-      "color.neutrals.foreground.subtle": "6e13c02d15cf3087e46295c3477f15f4a909eff1",
       "color.neutrals.foreground.secondary": "10c4639425f61a800abba08dfa494d39ada3b4d3",
+      "color.neutrals.foreground.subtle": "6e13c02d15cf3087e46295c3477f15f4a909eff1",
+      "color.neutrals.foreground.faint": "8c234986013c9d4dc75e34485850dd3b54a7d913",
       "color.neutrals.foreground.inverted": "8005180da696d48ef536a96c6de2bebeca01a6d4",
       "color.neutrals.border.default": "20ca8407100173ab471d9cc300f1a3983368f183",
+      "color.neutrals.border.emphasized": "eb05ea9fb11b7d919631446adecd9a48b7ebf586",
       "color.neutrals.border.mute": "5d9a8fc9b75c1ce8463f3178e9e6414b4d18b75a",
       "color.neutrals.border.subtle": "283146ae0147ec4b20f312edb29074250f5359fa",
       "color.neutrals.border.disabled": "a8444debb4e0f90291787d98e1b17d825155c091",
@@ -1132,8 +1134,10 @@
       "color.neutrals.foreground.primary": "7b2ff23323a73b6f8edd49f2c37edea6954b8aaa",
       "color.neutrals.foreground.secondary": "10c4639425f61a800abba08dfa494d39ada3b4d3",
       "color.neutrals.foreground.subtle": "6e13c02d15cf3087e46295c3477f15f4a909eff1",
+      "color.neutrals.foreground.faint": "8c234986013c9d4dc75e34485850dd3b54a7d913",
       "color.neutrals.foreground.inverted": "8005180da696d48ef536a96c6de2bebeca01a6d4",
       "color.neutrals.border.default": "20ca8407100173ab471d9cc300f1a3983368f183",
+      "color.neutrals.border.emphasized": "eb05ea9fb11b7d919631446adecd9a48b7ebf586",
       "color.neutrals.border.mute": "5d9a8fc9b75c1ce8463f3178e9e6414b4d18b75a",
       "color.neutrals.border.subtle": "283146ae0147ec4b20f312edb29074250f5359fa",
       "color.neutrals.border.disabled": "a8444debb4e0f90291787d98e1b17d825155c091",
diff --git a/tokens/brand/nve.json b/tokens/brand/nve.json
index 5f9c4016..c15219fe 100644
--- a/tokens/brand/nve.json
+++ b/tokens/brand/nve.json
@@ -519,7 +519,7 @@
         },
         "950": {
           "$type": "color",
-          "$value": "#977726"
+          "$value": "#836721"
         },
         "999": {
           "$type": "color",
diff --git a/tokens/public/theme/dark.json b/tokens/public/theme/dark.json
index be482877..9ae89a1d 100644
--- a/tokens/public/theme/dark.json
+++ b/tokens/public/theme/dark.json
@@ -91,17 +91,21 @@
           "$type": "color",
           "$value": "{color-shades.grey.000}"
         },
+        "secondary": {
+          "$type": "color",
+          "$value": "{color-shades.functional.neutralgrey.100}"
+        },
         "subtle": {
           "$type": "color",
           "$value": "{color-shades.functional.neutralgrey.200}"
         },
-        "secondary": {
+        "faint": {
           "$type": "color",
-          "$value": "{color-shades.functional.neutralgrey.100}"
+          "$value": "{color-shades.functional.neutralgrey.800}"
         },
         "inverted": {
           "$type": "color",
-          "$value": "{color-shades.functional.neutralgrey.000}"
+          "$value": "{color-shades.functional.neutralgrey.999}"
         }
       },
       "border": {
@@ -109,6 +113,10 @@
           "$type": "color",
           "$value": "{color-shades.grey.300}"
         },
+        "emphasized": {
+          "$type": "color",
+          "$value": "{color-shades.grey.000}"
+        },
         "mute": {
           "$type": "color",
           "$value": "{color-shades.grey.600}"
@@ -322,7 +330,7 @@
           },
           "info": {
             "$type": "color",
-            "$value": "{color-shades.functional.blue.950}"
+            "$value": "{color-shades.functional.blue.850}"
           },
           "error": {
             "$type": "color",
@@ -330,11 +338,11 @@
           },
           "warning": {
             "$type": "color",
-            "$value": "{color-shades.functional.yellow.999}"
+            "$value": "{color-shades.functional.yellow.950}"
           },
           "success": {
             "$type": "color",
-            "$value": "{color-shades.functional.green.900}"
+            "$value": "{color-shades.functional.green.850}"
           }
         },
         "subtle": {
@@ -344,7 +352,7 @@
           },
           "info": {
             "$type": "color",
-            "$value": "{color-shades.functional.blue.999}"
+            "$value": "{color-shades.functional.blue.900}"
           },
           "error": {
             "$type": "color",
@@ -378,7 +386,7 @@
           },
           "success": {
             "$type": "color",
-            "$value": "{color-shades.functional.green.900}"
+            "$value": "{color-shades.functional.green.800}"
           }
         }
       },
@@ -558,7 +566,7 @@
           },
           "success": {
             "$type": "color",
-            "$value": "{color-shades.functional.green.800}"
+            "$value": "{color-shades.functional.green.700}"
           }
         }
       }
diff --git a/tokens/public/theme/light.json b/tokens/public/theme/light.json
index e6b3d669..53ec26d3 100644
--- a/tokens/public/theme/light.json
+++ b/tokens/public/theme/light.json
@@ -97,6 +97,10 @@
           "$type": "color",
           "$value": "{color-shades.functional.neutralgrey.600}"
         },
+        "faint": {
+          "$type": "color",
+          "$value": "{color-shades.functional.neutralgrey.150}"
+        },
         "inverted": {
           "$type": "color",
           "$value": "{color-shades.functional.neutralgrey.000}"
@@ -107,6 +111,10 @@
           "$type": "color",
           "$value": "{color-shades.grey.500}"
         },
+        "emphasized": {
+          "$type": "color",
+          "$value": "{color-shades.grey.999}"
+        },
         "mute": {
           "$type": "color",
           "$value": "{color-shades.grey.300}"