diff --git a/.dss/core-hashes.sha256 b/.dss/core-hashes.sha256
index c6a4856..df028e9 100644
--- a/.dss/core-hashes.sha256
+++ b/.dss/core-hashes.sha256
@@ -1,5 +1,5 @@
 # DSS Core Structure Hashes
-# Generated: 2025-12-11T18:01:18-03:00
+# Generated: 2025-12-11T18:41:28-03:00
 # Source: Figma sync pipeline
 # DO NOT EDIT MANUALLY
 
@@ -14,10 +14,13 @@ ccc17aa88f182490792a09db9676a0ff17f96a675a0386cc4a01030e0e00a626  dss-claude-plu
 faa776ce958698f0a6a887baa65cab35cf9e9d6ded84930a3900d82f1c1eef6b  dss-claude-plugin/core/skins/classic.json
 cd6289fed900da096b865bf91e940ff572df868391b31e25d222c055b9e56724  dss-claude-plugin/core/skins/workbench.json
 3242ccb81ca30197e78251453f4594c271afe02502204900329f03ee92a9b7a3  dss/core_tokens/tokens.json
-f74658540c8d2838e17de647f0c788de674e3d95dcebc89bfa103f6dc656487c  .dss/data/_system/analysis-admin-ui.json
-0a0d403395d0d87eb9dd70f28c91d69f7637eedb1e2b562a51185d7dfbf3ebfd  .dss/data/_system/analysis-storybook.json
+650056fbb2c6549de22f2a3f0ca1e3d740d23556577a66e2cd9d822e882fec69  .dss/data/_system/analysis-admin-ui.json
+17179447014e8559284bc11f6879b5c51a0e37f5354083f179f994fd0ea37e7c  .dss/data/_system/analysis-storybook.json
 75ecdaeee10d7b0c4383f08b26384fbdf0ac381c99f89cd21ea6b3e4895e3b9d  .dss/data/_system/style-dictionary.config.json
 d972e3ebdd7ae2e213a3ae79064a6a0d0aa10bfa20e5dfcbe907f2811ebb2593  .dss/data/_system/figma-components.json
 d2f926b311963cbf5748f99f6fde1f88a04efd0533ea73a90318a78a53dfeafd  .dss/data/_system/components.json
 6ea9af5cc6ea337e3128b7c4395888f51aa5b4208afcc6a77fd4b465efa2222f  .dss/data/_system/styles.json
 4321119e41b6763a49d654978161b02dead66116ecca6c7f215e021cacfeeab1  .dss/data/_system/ds.config.json
+3242ccb81ca30197e78251453f4594c271afe02502204900329f03ee92a9b7a3  .dss/data/_system/tokens/base.json
+30075805ef7affddbe77a6be274558399eb3a79c022b60a2082bd0f358ed9890  .dss/data/_system/tokens/resolved-meta.json
+9175c3bf0581b652d10704a2d85f1ec9fc68809e90850c01d9acd1d571618a6a  .dss/data/_system/tokens/tokens.json
diff --git a/.dss/data/_system/analysis-admin-ui.json b/.dss/data/_system/analysis-admin-ui.json
index a46501e..04d9b81 100644
--- a/.dss/data/_system/analysis-admin-ui.json
+++ b/.dss/data/_system/analysis-admin-ui.json
@@ -1 +1 @@
-{"target":"admin-ui","analyzed_at":"2025-12-10T21:38:46-03:00","stats":{"js":168,"css":20,"html":4},"status":"analyzed"}
+{"target":"admin-ui","analyzed_at":"2025-12-11T18:40:54-03:00","stats":{"js":      36,"css":      41,"html":       4},"status":"analyzed"}
diff --git a/.dss/data/_system/analysis-storybook.json b/.dss/data/_system/analysis-storybook.json
index 16dcfcf..b1d4f63 100644
--- a/.dss/data/_system/analysis-storybook.json
+++ b/.dss/data/_system/analysis-storybook.json
@@ -1 +1 @@
-{"target":"storybook","analyzed_at":"2025-12-10T21:38:46-03:00","stats":{"stories":14,"mdx":0},"status":"analyzed"}
+{"target":"storybook","analyzed_at":"2025-12-11T18:40:56-03:00","stats":{"stories":      14,"mdx":       0},"status":"analyzed"}
diff --git a/.dss/data/_system/tokens/base.json b/.dss/data/_system/tokens/base.json
new file mode 100644
index 0000000..07d27c2
--- /dev/null
+++ b/.dss/data/_system/tokens/base.json
@@ -0,0 +1,9 @@
+{
+  "_meta": {
+    "version": "1.0.0",
+    "generated": null,
+    "source": "awaiting Figma sync",
+    "status": "empty"
+  },
+  "tokens": {}
+}
diff --git a/.mcp.json b/.mcp.json
index 9484085..e3ad100 100644
--- a/.mcp.json
+++ b/.mcp.json
@@ -1,4 +1,17 @@
 {
   "$schema": "https://raw.githubusercontent.com/anthropics/claude-code/main/schemas/mcp-servers.schema.json",
-  "mcpServers": {}
+  "mcpServers": {
+    "dss": {
+      "command": "/Users/bsarlo/Documents/SoFi/dss/.venv/bin/python3",
+      "args": ["/Users/bsarlo/Documents/SoFi/dss/dss-claude-plugin/servers/dss-mcp-server.py"],
+      "env": {
+        "PYTHONPATH": "/Users/bsarlo/Documents/SoFi/dss:/Users/bsarlo/Documents/SoFi/dss/dss-claude-plugin",
+        "DSS_HOME": "/Users/bsarlo/Documents/SoFi/dss/.dss",
+        "DSS_DATABASE": "/Users/bsarlo/Documents/SoFi/dss/.dss/dss.db",
+        "DSS_CACHE": "/Users/bsarlo/Documents/SoFi/dss/.dss/cache",
+        "DSS_BASE_PATH": "/Users/bsarlo/Documents/SoFi/dss"
+      },
+      "description": "Design System Server MCP - local development"
+    }
+  }
 }
diff --git a/admin-ui/src/stories/ColorPrimitives.stories.js b/admin-ui/src/stories/ColorPrimitives.stories.js
index 14cee57..70c7a97 100644
--- a/admin-ui/src/stories/ColorPrimitives.stories.js
+++ b/admin-ui/src/stories/ColorPrimitives.stories.js
@@ -1,7 +1,7 @@
 /**
  * Color Primitives - Foundation
  * Full Tailwind color palette organized by category
- * @generated 2025-12-10T21:48:22.317702
+ * @generated 2025-12-11T18:41:28.962171
  */
 export default {
   title: 'Foundation/Colors/Primitives',
diff --git a/admin-ui/src/stories/ComponentsDataDisplay.stories.js b/admin-ui/src/stories/ComponentsDataDisplay.stories.js
index 6ab6f31..2ade5e5 100644
--- a/admin-ui/src/stories/ComponentsDataDisplay.stories.js
+++ b/admin-ui/src/stories/ComponentsDataDisplay.stories.js
@@ -1,7 +1,7 @@
 /**
  * Data Display
  * Components for displaying data
- * @generated 2025-12-10T21:48:22.319651
+ * @generated 2025-12-11T18:41:28.963727
  */
 export default {
   title: 'Components/Data Display',
diff --git a/admin-ui/src/stories/ComponentsFeedback.stories.js b/admin-ui/src/stories/ComponentsFeedback.stories.js
index 72d9f91..d39aab2 100644
--- a/admin-ui/src/stories/ComponentsFeedback.stories.js
+++ b/admin-ui/src/stories/ComponentsFeedback.stories.js
@@ -1,7 +1,7 @@
 /**
  * Feedback
  * User feedback components
- * @generated 2025-12-10T21:48:22.319831
+ * @generated 2025-12-11T18:41:28.963874
  */
 export default {
   title: 'Components/Feedback',
diff --git a/admin-ui/src/stories/ComponentsFormComponents.stories.js b/admin-ui/src/stories/ComponentsFormComponents.stories.js
index b4c33e5..7f2f802 100644
--- a/admin-ui/src/stories/ComponentsFormComponents.stories.js
+++ b/admin-ui/src/stories/ComponentsFormComponents.stories.js
@@ -1,7 +1,7 @@
 /**
  * Form Components
  * Input controls and form elements
- * @generated 2025-12-10T21:48:22.319378
+ * @generated 2025-12-11T18:41:28.963371
  */
 export default {
   title: 'Components/Form Components',
diff --git a/admin-ui/src/stories/ComponentsLayout.stories.js b/admin-ui/src/stories/ComponentsLayout.stories.js
index eb16ca1..2e408ec 100644
--- a/admin-ui/src/stories/ComponentsLayout.stories.js
+++ b/admin-ui/src/stories/ComponentsLayout.stories.js
@@ -1,7 +1,7 @@
 /**
  * Layout
  * Layout and structure components
- * @generated 2025-12-10T21:48:22.320304
+ * @generated 2025-12-11T18:41:28.964213
  */
 export default {
   title: 'Components/Layout',
diff --git a/admin-ui/src/stories/ComponentsNavigation.stories.js b/admin-ui/src/stories/ComponentsNavigation.stories.js
index fb56e82..65d89e2 100644
--- a/admin-ui/src/stories/ComponentsNavigation.stories.js
+++ b/admin-ui/src/stories/ComponentsNavigation.stories.js
@@ -1,7 +1,7 @@
 /**
  * Navigation
  * Navigation components
- * @generated 2025-12-10T21:48:22.319990
+ * @generated 2025-12-11T18:41:28.963979
  */
 export default {
   title: 'Components/Navigation',
diff --git a/admin-ui/src/stories/ComponentsOverlay.stories.js b/admin-ui/src/stories/ComponentsOverlay.stories.js
index c9a18ae..cb14816 100644
--- a/admin-ui/src/stories/ComponentsOverlay.stories.js
+++ b/admin-ui/src/stories/ComponentsOverlay.stories.js
@@ -1,7 +1,7 @@
 /**
  * Overlay
  * Modal and overlay components
- * @generated 2025-12-10T21:48:22.320136
+ * @generated 2025-12-11T18:41:28.964095
  */
 export default {
   title: 'Components/Overlay',
diff --git a/admin-ui/src/stories/Overview.stories.js b/admin-ui/src/stories/Overview.stories.js
index 8fb2ead..ba23bd6 100644
--- a/admin-ui/src/stories/Overview.stories.js
+++ b/admin-ui/src/stories/Overview.stories.js
@@ -1,6 +1,6 @@
 /**
  * Design System Overview
- * @generated 2025-12-10T21:48:22.316923
+ * @generated 2025-12-11T18:41:28.961736
  */
 export default {
   title: 'Overview',
diff --git a/admin-ui/src/stories/Radius.stories.js b/admin-ui/src/stories/Radius.stories.js
index 16dfb79..4b9ae9e 100644
--- a/admin-ui/src/stories/Radius.stories.js
+++ b/admin-ui/src/stories/Radius.stories.js
@@ -1,6 +1,6 @@
 /**
  * Border Radius - Foundation
- * @generated 2025-12-10T21:48:22.318737
+ * @generated 2025-12-11T18:41:28.962806
  */
 export default {
   title: 'Foundation/Radius',
diff --git a/admin-ui/src/stories/SemanticColors.stories.js b/admin-ui/src/stories/SemanticColors.stories.js
index 927b31f..b47f52d 100644
--- a/admin-ui/src/stories/SemanticColors.stories.js
+++ b/admin-ui/src/stories/SemanticColors.stories.js
@@ -1,7 +1,7 @@
 /**
  * Semantic Colors - Design Tokens
  * Resolved color tokens for light theme
- * @generated 2025-12-10T21:48:22.319129
+ * @generated 2025-12-11T18:41:28.963202
  */
 export default {
   title: 'Tokens/Semantic Colors',
diff --git a/admin-ui/src/stories/Shadows.stories.js b/admin-ui/src/stories/Shadows.stories.js
index 1083fad..40c5de5 100644
--- a/admin-ui/src/stories/Shadows.stories.js
+++ b/admin-ui/src/stories/Shadows.stories.js
@@ -1,7 +1,7 @@
 /**
  * Shadows - Foundation
  * Box shadow scale
- * @generated 2025-12-10T21:48:22.318898
+ * @generated 2025-12-11T18:41:28.962994
  */
 export default {
   title: 'Foundation/Effects/Shadows',
diff --git a/admin-ui/src/stories/Spacing.stories.js b/admin-ui/src/stories/Spacing.stories.js
index d628822..d954e32 100644
--- a/admin-ui/src/stories/Spacing.stories.js
+++ b/admin-ui/src/stories/Spacing.stories.js
@@ -1,6 +1,6 @@
 /**
  * Spacing Primitives - Foundation
- * @generated 2025-12-10T21:48:22.318244
+ * @generated 2025-12-11T18:41:28.962384
  */
 export default {
   title: 'Foundation/Spacing',
diff --git a/admin-ui/src/stories/Typography.stories.js b/admin-ui/src/stories/Typography.stories.js
index 99a76b2..b883477 100644
--- a/admin-ui/src/stories/Typography.stories.js
+++ b/admin-ui/src/stories/Typography.stories.js
@@ -1,7 +1,7 @@
 /**
  * Typography - Foundation
  * Font families, sizes, weights, and composed styles
- * @generated 2025-12-10T21:48:22.318522
+ * @generated 2025-12-11T18:41:28.962604
  */
 export default {
   title: 'Foundation/Typography',