diff --git a/.github/workflows/build-design-tokens.yml b/.github/workflows/build-design-tokens.yml
index 6345a59..fc96fc4 100644
--- a/.github/workflows/build-design-tokens.yml
+++ b/.github/workflows/build-design-tokens.yml
@@ -25,8 +25,6 @@ jobs:
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: 9
 
       - name: Setup Node
         uses: actions/setup-node@v4
diff --git a/packages/design-tokens/sd.config.mjs b/packages/design-tokens/sd.config.mjs
index 0314ffb..3b6c64e 100644
--- a/packages/design-tokens/sd.config.mjs
+++ b/packages/design-tokens/sd.config.mjs
@@ -63,7 +63,7 @@ StyleDictionary.registerFormat({
 });
 
 const sd = new StyleDictionary({
-  source: ['tokens/**/*.json', '!tokens/$metadata.json'],
+  source: ['tokens/tokens.json'],
   preprocessors: ['tokens-studio'],
   platforms: {
     css: {
diff --git a/packages/design-tokens/tokens/$metadata.json b/packages/design-tokens/tokens/$metadata.json
deleted file mode 100644
index 62fc583..0000000
--- a/packages/design-tokens/tokens/$metadata.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "tokenSetOrder": ["colors", "typography"]
-}
diff --git a/packages/design-tokens/tokens/colors.json b/packages/design-tokens/tokens/colors.json
deleted file mode 100644
index 17db2fd..0000000
--- a/packages/design-tokens/tokens/colors.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "color": {
-    "primary": { "value": "#3B82F6", "type": "color" },
-    "primary-hover": { "value": "#2563EB", "type": "color" },
-    "secondary": { "value": "#8B5CF6", "type": "color" },
-    "surface": { "value": "#F8FAFC", "type": "color" },
-    "surface-elevated": { "value": "#FFFFFF", "type": "color" },
-    "text-default": { "value": "#111827", "type": "color" },
-    "text-muted": { "value": "#6B7280", "type": "color" },
-    "text-inverse": { "value": "#FFFFFF", "type": "color" },
-    "border": { "value": "#E5E7EB", "type": "color" },
-    "success": { "value": "#10B981", "type": "color" },
-    "warning": { "value": "#F59E0B", "type": "color" },
-    "error": { "value": "#EF4444", "type": "color" }
-  }
-}
diff --git a/packages/design-tokens/tokens/typography.json b/packages/design-tokens/tokens/tokens.json
similarity index 52%
rename from packages/design-tokens/tokens/typography.json
rename to packages/design-tokens/tokens/tokens.json
index 4e04a9b..59a33af 100644
--- a/packages/design-tokens/tokens/typography.json
+++ b/packages/design-tokens/tokens/tokens.json
@@ -1,4 +1,18 @@
 {
+  "color": {
+    "primary": { "value": "#3B82F6", "type": "color" },
+    "primary-hover": { "value": "#2563EB", "type": "color" },
+    "secondary": { "value": "#8B5CF6", "type": "color" },
+    "surface": { "value": "#F8FAFC", "type": "color" },
+    "surface-elevated": { "value": "#FFFFFF", "type": "color" },
+    "text-default": { "value": "#111827", "type": "color" },
+    "text-muted": { "value": "#6B7280", "type": "color" },
+    "text-inverse": { "value": "#FFFFFF", "type": "color" },
+    "border": { "value": "#E5E7EB", "type": "color" },
+    "success": { "value": "#10B981", "type": "color" },
+    "warning": { "value": "#F59E0B", "type": "color" },
+    "error": { "value": "#EF4444", "type": "color" }
+  },
   "font-size": {
     "xl": { "value": "2rem", "type": "fontSizes" },
     "lg": { "value": "1.5rem", "type": "fontSizes" },