diff --git a/packages/tokens/src/tokens.dark.json b/packages/tokens/src/tokens.dark.json
index eaa4fdc..52eae17 100644
--- a/packages/tokens/src/tokens.dark.json
+++ b/packages/tokens/src/tokens.dark.json
@@ -25,7 +25,7 @@
   },
   "primary": {
     "$type": "color",
-    "$value": "rgba(4, 56, 154, 1)"
+    "$value": "rgba(5, 62, 170, 1)"
   },
   "primary-foreground": {
     "$type": "color",
@@ -33,7 +33,7 @@
   },
   "secondary": {
     "$type": "color",
-    "$value": "rgba(46, 110, 229, 1)"
+    "$value": "rgba(6, 75, 203, 1)"
   },
   "secondary-foreground": {
     "$type": "color",
@@ -49,7 +49,7 @@
   },
   "accent": {
     "$type": "color",
-    "$value": "rgba(38, 38, 38, 1)"
+    "$value": "rgba(3, 37, 97, 1)"
   },
   "accent-foreground": {
     "$type": "color",
diff --git a/packages/tokens/src/tokens.groenvermogen-nkph2.dark.json b/packages/tokens/src/tokens.groenvermogen-nkph2.dark.json
index e987804..d0134ac 100644
--- a/packages/tokens/src/tokens.groenvermogen-nkph2.dark.json
+++ b/packages/tokens/src/tokens.groenvermogen-nkph2.dark.json
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.groenvermogen-nkph2.json b/packages/tokens/src/tokens.groenvermogen-nkph2.json
index f32c6dd..e63ca03 100644
--- a/packages/tokens/src/tokens.groenvermogen-nkph2.json
+++ b/packages/tokens/src/tokens.groenvermogen-nkph2.json
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.json b/packages/tokens/src/tokens.json
index 02c8327..505e470 100644
--- a/packages/tokens/src/tokens.json
+++ b/packages/tokens/src/tokens.json
@@ -33,7 +33,7 @@
   },
   "secondary": {
     "$type": "color",
-    "$value": "rgba(46, 110, 229, 1)"
+    "$value": "rgba(6, 75, 203, 1)"
   },
   "secondary-foreground": {
     "$type": "color",
@@ -49,7 +49,7 @@
   },
   "accent": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(234, 240, 252, 1)"
   },
   "accent-foreground": {
     "$type": "color",
@@ -65,7 +65,7 @@
   },
   "input": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "ring": {
     "$type": "color",
@@ -197,19 +197,19 @@
   },
   "custom-accent-dark-input50": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(234, 240, 252, 1)"
   },
   "custom-accent-dark-calendar50": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(234, 240, 252, 1)"
   },
   "custom-input-dark-input80": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input-dark-input30": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input50-dark-input80": {
     "$type": "color",
diff --git a/packages/tokens/src/tokens.studielink-aii.dark.json b/packages/tokens/src/tokens.studielink-aii.dark.json
index 33146a2..362113d 100644
--- a/packages/tokens/src/tokens.studielink-aii.dark.json
+++ b/packages/tokens/src/tokens.studielink-aii.dark.json
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.studielink-aii.json b/packages/tokens/src/tokens.studielink-aii.json
index 9579831..bc92f59 100644
--- a/packages/tokens/src/tokens.studielink-aii.json
+++ b/packages/tokens/src/tokens.studielink-aii.json
@@ -65,7 +65,7 @@
   },
   "input": {
     "$type": "color",
-    "$value": "rgba(229, 229, 229, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "ring": {
     "$type": "color",
@@ -205,11 +205,11 @@
   },
   "custom-input-dark-input80": {
     "$type": "color",
-    "$value": "rgba(229, 229, 229, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input-dark-input30": {
     "$type": "color",
-    "$value": "rgba(229, 229, 229, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input50-dark-input80": {
     "$type": "color",
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.surf-blue-purple.dark.json b/packages/tokens/src/tokens.surf-blue-purple.dark.json
index 5583967..e62aa27 100644
--- a/packages/tokens/src/tokens.surf-blue-purple.dark.json
+++ b/packages/tokens/src/tokens.surf-blue-purple.dark.json
@@ -25,7 +25,7 @@
   },
   "primary": {
     "$type": "color",
-    "$value": "rgba(4, 56, 154, 1)"
+    "$value": "rgba(5, 62, 170, 1)"
   },
   "primary-foreground": {
     "$type": "color",
@@ -33,7 +33,7 @@
   },
   "secondary": {
     "$type": "color",
-    "$value": "rgba(157, 93, 231, 1)"
+    "$value": "rgba(118, 45, 203, 1)"
   },
   "secondary-foreground": {
     "$type": "color",
@@ -49,7 +49,7 @@
   },
   "accent": {
     "$type": "color",
-    "$value": "rgba(38, 38, 38, 1)"
+    "$value": "rgba(50, 7, 101, 1)"
   },
   "accent-foreground": {
     "$type": "color",
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.surf-blue-purple.json b/packages/tokens/src/tokens.surf-blue-purple.json
index 7cf8bb3..176babd 100644
--- a/packages/tokens/src/tokens.surf-blue-purple.json
+++ b/packages/tokens/src/tokens.surf-blue-purple.json
@@ -33,7 +33,7 @@
   },
   "secondary": {
     "$type": "color",
-    "$value": "rgba(157, 93, 231, 1)"
+    "$value": "rgba(118, 45, 203, 1)"
   },
   "secondary-foreground": {
     "$type": "color",
@@ -49,7 +49,7 @@
   },
   "accent": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(237, 228, 251, 1)"
   },
   "accent-foreground": {
     "$type": "color",
@@ -65,7 +65,7 @@
   },
   "input": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "ring": {
     "$type": "color",
@@ -197,19 +197,19 @@
   },
   "custom-accent-dark-input50": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(237, 228, 251, 1)"
   },
   "custom-accent-dark-calendar50": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(237, 228, 251, 1)"
   },
   "custom-input-dark-input80": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input-dark-input30": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input50-dark-input80": {
     "$type": "color",
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.surf-blue-turquoise.dark.json b/packages/tokens/src/tokens.surf-blue-turquoise.dark.json
index 1f60ced..c435823 100644
--- a/packages/tokens/src/tokens.surf-blue-turquoise.dark.json
+++ b/packages/tokens/src/tokens.surf-blue-turquoise.dark.json
@@ -25,7 +25,7 @@
   },
   "primary": {
     "$type": "color",
-    "$value": "rgba(4, 56, 154, 1)"
+    "$value": "rgba(5, 62, 170, 1)"
   },
   "primary-foreground": {
     "$type": "color",
@@ -49,7 +49,7 @@
   },
   "accent": {
     "$type": "color",
-    "$value": "rgba(38, 38, 38, 1)"
+    "$value": "rgba(28, 97, 92, 1)"
   },
   "accent-foreground": {
     "$type": "color",
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.surf-blue-turquoise.json b/packages/tokens/src/tokens.surf-blue-turquoise.json
index 3b02f76..7966e8c 100644
--- a/packages/tokens/src/tokens.surf-blue-turquoise.json
+++ b/packages/tokens/src/tokens.surf-blue-turquoise.json
@@ -49,7 +49,7 @@
   },
   "accent": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(221, 247, 244, 1)"
   },
   "accent-foreground": {
     "$type": "color",
@@ -65,7 +65,7 @@
   },
   "input": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "ring": {
     "$type": "color",
@@ -197,19 +197,19 @@
   },
   "custom-accent-dark-input50": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(221, 247, 244, 1)"
   },
   "custom-accent-dark-calendar50": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(221, 247, 244, 1)"
   },
   "custom-input-dark-input80": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input-dark-input30": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input50-dark-input80": {
     "$type": "color",
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.surf-green.dark.json b/packages/tokens/src/tokens.surf-green.dark.json
index 0a703b9..4f4a382 100644
--- a/packages/tokens/src/tokens.surf-green.dark.json
+++ b/packages/tokens/src/tokens.surf-green.dark.json
@@ -49,7 +49,7 @@
   },
   "accent": {
     "$type": "color",
-    "$value": "rgba(38, 38, 38, 1)"
+    "$value": "rgba(1, 101, 61, 1)"
   },
   "accent-foreground": {
     "$type": "color",
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.surf-green.json b/packages/tokens/src/tokens.surf-green.json
index b97ee88..19bd46a 100644
--- a/packages/tokens/src/tokens.surf-green.json
+++ b/packages/tokens/src/tokens.surf-green.json
@@ -49,7 +49,7 @@
   },
   "accent": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(221, 253, 240, 1)"
   },
   "accent-foreground": {
     "$type": "color",
@@ -65,7 +65,7 @@
   },
   "input": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "ring": {
     "$type": "color",
@@ -197,19 +197,19 @@
   },
   "custom-accent-dark-input50": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(221, 253, 240, 1)"
   },
   "custom-accent-dark-calendar50": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(221, 253, 240, 1)"
   },
   "custom-input-dark-input80": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input-dark-input30": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input50-dark-input80": {
     "$type": "color",
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.surf-orange.dark.json b/packages/tokens/src/tokens.surf-orange.dark.json
index e4f6a71..f4ec81c 100644
--- a/packages/tokens/src/tokens.surf-orange.dark.json
+++ b/packages/tokens/src/tokens.surf-orange.dark.json
@@ -49,7 +49,7 @@
   },
   "accent": {
     "$type": "color",
-    "$value": "rgba(41, 37, 36, 1)"
+    "$value": "rgba(159, 74, 26, 1)"
   },
   "accent-foreground": {
     "$type": "color",
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.surf-orange.json b/packages/tokens/src/tokens.surf-orange.json
index 9014fe7..77e9e05 100644
--- a/packages/tokens/src/tokens.surf-orange.json
+++ b/packages/tokens/src/tokens.surf-orange.json
@@ -49,7 +49,7 @@
   },
   "accent": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(255, 233, 217, 1)"
   },
   "accent-foreground": {
     "$type": "color",
@@ -65,7 +65,7 @@
   },
   "input": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "ring": {
     "$type": "color",
@@ -197,19 +197,19 @@
   },
   "custom-accent-dark-input50": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(255, 233, 217, 1)"
   },
   "custom-accent-dark-calendar50": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(255, 233, 217, 1)"
   },
   "custom-input-dark-input80": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input-dark-input30": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input50-dark-input80": {
     "$type": "color",
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.surf-pilot.dark.json b/packages/tokens/src/tokens.surf-pilot.dark.json
new file mode 100644
index 0000000..59ed8c2
--- /dev/null
+++ b/packages/tokens/src/tokens.surf-pilot.dark.json
@@ -0,0 +1,930 @@
+{
+  "background": {
+    "$type": "color",
+    "$value": "rgba(10, 10, 10, 1)"
+  },
+  "foreground": {
+    "$type": "color",
+    "$value": "rgba(250, 250, 250, 1)"
+  },
+  "card": {
+    "$type": "color",
+    "$value": "rgba(23, 23, 23, 1)"
+  },
+  "card-foreground": {
+    "$type": "color",
+    "$value": "rgba(250, 250, 250, 1)"
+  },
+  "popover": {
+    "$type": "color",
+    "$value": "rgba(41, 37, 36, 1)"
+  },
+  "popover-foreground": {
+    "$type": "color",
+    "$value": "rgba(250, 250, 250, 1)"
+  },
+  "primary": {
+    "$type": "color",
+    "$value": "rgba(212, 212, 212, 1)"
+  },
+  "primary-foreground": {
+    "$type": "color",
+    "$value": "rgba(0, 0, 0, 1)"
+  },
+  "secondary": {
+    "$type": "color",
+    "$value": "rgba(82, 82, 82, 1)"
+  },
+  "secondary-foreground": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 1)"
+  },
+  "muted": {
+    "$type": "color",
+    "$value": "rgba(38, 38, 38, 1)"
+  },
+  "muted-foreground": {
+    "$type": "color",
+    "$value": "rgba(212, 212, 212, 1)"
+  },
+  "accent": {
+    "$type": "color",
+    "$value": "rgba(64, 64, 64, 1)"
+  },
+  "accent-foreground": {
+    "$type": "color",
+    "$value": "rgba(250, 250, 250, 1)"
+  },
+  "destructive": {
+    "$type": "color",
+    "$value": "rgba(248, 113, 113, 1)"
+  },
+  "border": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.1)"
+  },
+  "input": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.15)"
+  },
+  "ring": {
+    "$type": "color",
+    "$value": "rgba(115, 115, 115, 1)"
+  },
+  "chart-1": {
+    "$type": "color",
+    "$value": "rgba(29, 78, 216, 1)"
+  },
+  "chart-2": {
+    "$type": "color",
+    "$value": "rgba(16, 185, 129, 1)"
+  },
+  "chart-3": {
+    "$type": "color",
+    "$value": "rgba(245, 158, 11, 1)"
+  },
+  "chart-4": {
+    "$type": "color",
+    "$value": "rgba(168, 85, 247, 1)"
+  },
+  "chart-5": {
+    "$type": "color",
+    "$value": "rgba(244, 63, 94, 1)"
+  },
+  "sidebar": {
+    "$type": "color",
+    "$value": "rgba(23, 23, 23, 1)"
+  },
+  "sidebar-foreground": {
+    "$type": "color",
+    "$value": "rgba(250, 250, 250, 1)"
+  },
+  "sidebar-primary": {
+    "$type": "color",
+    "$value": "rgba(29, 78, 216, 1)"
+  },
+  "sidebar-primary-foreground": {
+    "$type": "color",
+    "$value": "rgba(250, 250, 250, 1)"
+  },
+  "sidebar-accent": {
+    "$type": "color",
+    "$value": "rgba(38, 38, 38, 1)"
+  },
+  "sidebar-accent-foreground": {
+    "$type": "color",
+    "$value": "rgba(250, 250, 250, 1)"
+  },
+  "sidebar-border": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.1)"
+  },
+  "sidebar-ring": {
+    "$type": "color",
+    "$value": "rgba(82, 82, 82, 1)"
+  },
+  "font-sans": {
+    "$type": "fontFamily",
+    "$value": "Source Sans 3, sans-serif"
+  },
+  "font-mono": {
+    "$type": "fontFamily",
+    "$value": "Geist Mono, monospace"
+  },
+  "destructive-foreground": {
+    "$type": "color",
+    "$value": "rgba(254, 242, 242, 1)"
+  },
+  "ring-offset": {
+    "$type": "color",
+    "$value": "rgba(10, 10, 10, 1)"
+  },
+  "alpha-5": {
+    "$type": "color",
+    "$value": "rgba(10, 10, 10, 0.95)"
+  },
+  "alpha-10": {
+    "$type": "color",
+    "$value": "rgba(10, 10, 10, 0.9)"
+  },
+  "alpha-20": {
+    "$type": "color",
+    "$value": "rgba(10, 10, 10, 0.8)"
+  },
+  "alpha-30": {
+    "$type": "color",
+    "$value": "rgba(10, 10, 10, 0.7)"
+  },
+  "alpha-40": {
+    "$type": "color",
+    "$value": "rgba(10, 10, 10, 0.6)"
+  },
+  "alpha-50": {
+    "$type": "color",
+    "$value": "rgba(10, 10, 10, 0.5)"
+  },
+  "alpha-60": {
+    "$type": "color",
+    "$value": "rgba(10, 10, 10, 0.4)"
+  },
+  "alpha-70": {
+    "$type": "color",
+    "$value": "rgba(10, 10, 10, 0.3)"
+  },
+  "alpha-80": {
+    "$type": "color",
+    "$value": "rgba(10, 10, 10, 0.2)"
+  },
+  "alpha-90": {
+    "$type": "color",
+    "$value": "rgba(10, 10, 10, 0.1)"
+  },
+  "custom-background-dark-input30": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.05)"
+  },
+  "custom-transparent-dark-input30": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.05)"
+  },
+  "custom-transparent": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0)"
+  },
+  "custom-background-dark-calendar30": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.05)"
+  },
+  "custom-accent-dark-input50": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.08)"
+  },
+  "custom-accent-dark-calendar50": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.08)"
+  },
+  "custom-input-dark-input80": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.12)"
+  },
+  "custom-input-dark-input30": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.15)"
+  },
+  "custom-input50-dark-input80": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.15)"
+  },
+  "custom-input30-dark-transparent": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0)"
+  },
+  "custom-input30-dark-input30": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.15)"
+  },
+  "custom-muted-dark-input50": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.08)"
+  },
+  "custom-destructive-dark-destructive60": {
+    "$type": "color",
+    "$value": "rgba(248, 113, 113, 0.6)"
+  },
+  "custom-destructive-dark-destructive70": {
+    "$type": "color",
+    "$value": "rgba(248, 113, 113, 0.7)"
+  },
+  "custom-destructive-dark-destructive90": {
+    "$type": "color",
+    "$value": "rgba(248, 113, 113, 0.9)"
+  },
+  "custom-destructive10-dark-destructive20": {
+    "$type": "color",
+    "$value": "rgba(248, 113, 113, 0.2)"
+  },
+  "custom-destructive20-dark-destructive40": {
+    "$type": "color",
+    "$value": "rgba(248, 113, 113, 0.4)"
+  },
+  "custom-destructive20-dark-destructive30": {
+    "$type": "color",
+    "$value": "rgba(248, 113, 113, 0.3)"
+  },
+  "custom-destructive40-dark-destructive60": {
+    "$type": "color",
+    "$value": "rgba(248, 113, 113, 0.6)"
+  },
+  "custom-destructive40-dark-destructive40": {
+    "$type": "color",
+    "$value": "rgba(248, 113, 113, 0.4)"
+  },
+  "custom-amber900-dark-amber50": {
+    "$type": "color",
+    "$value": "rgba(255, 251, 235, 1)"
+  },
+  "custom-amber50-dark-amber950": {
+    "$type": "color",
+    "$value": "rgba(69, 26, 3, 1)"
+  },
+  "custom-amber200-dark-amber900": {
+    "$type": "color",
+    "$value": "rgba(120, 53, 15, 1)"
+  },
+  "custom-neutral800-dark-neutral300": {
+    "$type": "color",
+    "$value": "rgba(212, 212, 212, 1)"
+  },
+  "custom-dark-input": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.15)"
+  },
+  "custom-outline": {
+    "$type": "color",
+    "$value": "rgba(115, 115, 115, 0.5)"
+  },
+  "custom-outline10-dark-outline20": {
+    "$type": "color",
+    "$value": "rgba(115, 115, 115, 0.2)"
+  },
+  "custom-blue-500-dark-blue-600": {
+    "$type": "color",
+    "$value": "rgba(37, 99, 235, 1)"
+  },
+  "custom-border-dark-input-dark": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.15)"
+  },
+  "custom-ring-dark-input-dark": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.15)"
+  },
+  "custom-ring-dark-input-dark-2": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.15)"
+  },
+  "custom-popover70": {
+    "$type": "color",
+    "$value": "rgba(38, 38, 38, 0.7)"
+  },
+  "custom-foreground10": {
+    "$type": "color",
+    "$value": "rgba(250, 250, 250, 0.1)"
+  },
+  "custom-ring-dark-input-dark-3": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.15)"
+  },
+  "custom-bg-background20-dark-bg-background10": {
+    "$type": "color",
+    "$value": "rgba(10, 10, 10, 0.1)"
+  },
+  "custom-bg-primary5-dark-bg-primary10": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.1)"
+  },
+  "custom-alpha-30-dark-alpha-20": {
+    "$type": "color",
+    "$value": "rgba(10, 10, 10, 0.8)"
+  },
+  "breakpoint-sm": {
+    "$type": "dimension",
+    "$value": "640px"
+  },
+  "breakpoint-md": {
+    "$type": "dimension",
+    "$value": "768px"
+  },
+  "breakpoint-lg": {
+    "$type": "dimension",
+    "$value": "1024px"
+  },
+  "breakpoint-xl": {
+    "$type": "dimension",
+    "$value": "1280px"
+  },
+  "breakpoint-2xl": {
+    "$type": "dimension",
+    "$value": "1536px"
+  },
+  "container-3xs": {
+    "$type": "dimension",
+    "$value": "256px"
+  },
+  "text-xs-font-size": {
+    "$type": "dimension",
+    "$value": "0.875rem"
+  },
+  "text-xs-line-height": {
+    "$type": "dimension",
+    "$value": "1.25rem"
+  },
+  "text-sm-font-size": {
+    "$type": "dimension",
+    "$value": "1rem"
+  },
+  "text-sm-line-height": {
+    "$type": "dimension",
+    "$value": "1.5rem"
+  },
+  "text-base-font-size": {
+    "$type": "dimension",
+    "$value": "1.125rem"
+  },
+  "text-base-line-height": {
+    "$type": "dimension",
+    "$value": "1.75rem"
+  },
+  "text-lg-font-size": {
+    "$type": "dimension",
+    "$value": "1.25rem"
+  },
+  "text-lg-line-height": {
+    "$type": "dimension",
+    "$value": "1.75rem"
+  },
+  "text-xl-font-size": {
+    "$type": "dimension",
+    "$value": "1.5rem"
+  },
+  "text-xl-line-height": {
+    "$type": "dimension",
+    "$value": "2rem"
+  },
+  "text-2xl-font-size": {
+    "$type": "dimension",
+    "$value": "1.875rem"
+  },
+  "text-2xl-line-height": {
+    "$type": "dimension",
+    "$value": "2.25rem"
+  },
+  "text-3xl-font-size": {
+    "$type": "dimension",
+    "$value": "2.25rem"
+  },
+  "text-3xl-line-height": {
+    "$type": "dimension",
+    "$value": "2.5rem"
+  },
+  "text-4xl-font-size": {
+    "$type": "dimension",
+    "$value": "3rem"
+  },
+  "text-4xl-line-height": {
+    "$type": "dimension",
+    "$value": "3rem"
+  },
+  "text-5xl-font-size": {
+    "$type": "dimension",
+    "$value": "3.75rem"
+  },
+  "text-5xl-line-height": {
+    "$type": "dimension",
+    "$value": "3.75rem"
+  },
+  "text-6xl-font-size": {
+    "$type": "dimension",
+    "$value": "4.5rem"
+  },
+  "text-6xl-line-height": {
+    "$type": "dimension",
+    "$value": "4.5rem"
+  },
+  "text-7xl-font-size": {
+    "$type": "dimension",
+    "$value": "6rem"
+  },
+  "text-7xl-line-height": {
+    "$type": "dimension",
+    "$value": "6rem"
+  },
+  "text-8xl-font-size": {
+    "$type": "dimension",
+    "$value": "8rem"
+  },
+  "text-8xl-line-height": {
+    "$type": "dimension",
+    "$value": "8rem"
+  },
+  "text-9xl-font-size": {
+    "$type": "dimension",
+    "$value": "10rem"
+  },
+  "text-9xl-line-height": {
+    "$type": "dimension",
+    "$value": "10rem"
+  },
+  "container-2xs": {
+    "$type": "dimension",
+    "$value": "288px"
+  },
+  "container-xs": {
+    "$type": "dimension",
+    "$value": "320px"
+  },
+  "container-sm": {
+    "$type": "dimension",
+    "$value": "384px"
+  },
+  "container-md": {
+    "$type": "dimension",
+    "$value": "448px"
+  },
+  "container-lg": {
+    "$type": "dimension",
+    "$value": "512px"
+  },
+  "container-xl": {
+    "$type": "dimension",
+    "$value": "576px"
+  },
+  "container-2xl": {
+    "$type": "dimension",
+    "$value": "672px"
+  },
+  "container-3xl": {
+    "$type": "dimension",
+    "$value": "768px"
+  },
+  "container-4xl": {
+    "$type": "dimension",
+    "$value": "896px"
+  },
+  "container-5xl": {
+    "$type": "dimension",
+    "$value": "1024px"
+  },
+  "container-6xl": {
+    "$type": "dimension",
+    "$value": "1152px"
+  },
+  "container-7xl": {
+    "$type": "dimension",
+    "$value": "1280px"
+  },
+  "font-weight-thin": {
+    "$type": "number",
+    "$value": "100"
+  },
+  "font-weight-extralight": {
+    "$type": "number",
+    "$value": "200"
+  },
+  "font-weight-light": {
+    "$type": "number",
+    "$value": "300"
+  },
+  "font-weight-normal": {
+    "$type": "number",
+    "$value": "400"
+  },
+  "font-weight-medium": {
+    "$type": "number",
+    "$value": "500"
+  },
+  "font-weight-semibold": {
+    "$type": "number",
+    "$value": "600"
+  },
+  "font-weight-bold": {
+    "$type": "number",
+    "$value": "700"
+  },
+  "font-weight-extrabold": {
+    "$type": "number",
+    "$value": "800"
+  },
+  "font-weight-black": {
+    "$type": "number",
+    "$value": "900"
+  },
+  "radius-xs": {
+    "$type": "dimension",
+    "$value": "0.125rem"
+  },
+  "radius-sm": {
+    "$type": "dimension",
+    "$value": "0.375rem"
+  },
+  "radius-md": {
+    "$type": "dimension",
+    "$value": "0.5rem"
+  },
+  "radius-lg": {
+    "$type": "dimension",
+    "$value": "0.625rem"
+  },
+  "radius-xl": {
+    "$type": "dimension",
+    "$value": "0.875rem"
+  },
+  "radius-2xl": {
+    "$type": "dimension",
+    "$value": "1.125rem"
+  },
+  "radius-3xl": {
+    "$type": "dimension",
+    "$value": "1.375rem"
+  },
+  "radius-4xl": {
+    "$type": "dimension",
+    "$value": "1.625rem"
+  },
+  "shadow-2xs-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-2xs-offset-y": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "shadow-2xs-blur-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-2xs-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-xs-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-xs-offset-y": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "shadow-xs-blur-radius": {
+    "$type": "dimension",
+    "$value": "2px"
+  },
+  "shadow-xs-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-sm-1-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-sm-1-offset-y": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "shadow-sm-1-blur-radius": {
+    "$type": "dimension",
+    "$value": "3px"
+  },
+  "shadow-sm-1-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-sm-2-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-sm-2-offset-y": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "shadow-sm-2-blur-radius": {
+    "$type": "dimension",
+    "$value": "2px"
+  },
+  "shadow-sm-2-spread-radius": {
+    "$type": "dimension",
+    "$value": "-1px"
+  },
+  "inset-shadow-2xs-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "inset-shadow-2xs-offset-y": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "inset-shadow-2xs-blur-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "inset-shadow-2xs-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "inset-shadow-xs-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "inset-shadow-xs-offset-y": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "inset-shadow-xs-blur-radius": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "inset-shadow-xs-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "inset-shadow-sm-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "inset-shadow-sm-offset-y": {
+    "$type": "dimension",
+    "$value": "2px"
+  },
+  "inset-shadow-sm-blur-radius": {
+    "$type": "dimension",
+    "$value": "4px"
+  },
+  "inset-shadow-sm-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-xs-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-xs-offset-y": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "drop-shadow-xs-blur-radius": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "drop-shadow-xs-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-sm-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-sm-offset-y": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "drop-shadow-sm-blur-radius": {
+    "$type": "dimension",
+    "$value": "2px"
+  },
+  "drop-shadow-sm-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "blur-xs": {
+    "$type": "dimension",
+    "$value": "4px"
+  },
+  "blur-sm": {
+    "$type": "dimension",
+    "$value": "8px"
+  },
+  "blur-md": {
+    "$type": "dimension",
+    "$value": "12px"
+  },
+  "blur-lg": {
+    "$type": "dimension",
+    "$value": "16px"
+  },
+  "blur-xl": {
+    "$type": "dimension",
+    "$value": "24px"
+  },
+  "blur-2xl": {
+    "$type": "dimension",
+    "$value": "40px"
+  },
+  "blur-3xl": {
+    "$type": "dimension",
+    "$value": "64px"
+  },
+  "shadow-md-1-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-md-1-offset-y": {
+    "$type": "dimension",
+    "$value": "4px"
+  },
+  "shadow-md-1-blur-radius": {
+    "$type": "dimension",
+    "$value": "6px"
+  },
+  "shadow-md-1-spread-radius": {
+    "$type": "dimension",
+    "$value": "-1px"
+  },
+  "shadow-md-2-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-md-2-offset-y": {
+    "$type": "dimension",
+    "$value": "2px"
+  },
+  "shadow-md-2-blur-radius": {
+    "$type": "dimension",
+    "$value": "4px"
+  },
+  "shadow-md-2-spread-radius": {
+    "$type": "dimension",
+    "$value": "-2px"
+  },
+  "shadow-lg-1-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-lg-1-offset-y": {
+    "$type": "dimension",
+    "$value": "10px"
+  },
+  "shadow-lg-1-blur-radius": {
+    "$type": "dimension",
+    "$value": "15px"
+  },
+  "shadow-lg-1-spread-radius": {
+    "$type": "dimension",
+    "$value": "-3px"
+  },
+  "shadow-lg-2-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-lg-2-offset-y": {
+    "$type": "dimension",
+    "$value": "4px"
+  },
+  "shadow-lg-2-blur-radius": {
+    "$type": "dimension",
+    "$value": "6px"
+  },
+  "shadow-lg-2-spread-radius": {
+    "$type": "dimension",
+    "$value": "-4px"
+  },
+  "shadow-xl-1-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-xl-1-offset-y": {
+    "$type": "dimension",
+    "$value": "20px"
+  },
+  "shadow-xl-1-blur-radius": {
+    "$type": "dimension",
+    "$value": "25px"
+  },
+  "shadow-xl-1-spread-radius": {
+    "$type": "dimension",
+    "$value": "-5px"
+  },
+  "shadow-xl-2-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-xl-2-offset-y": {
+    "$type": "dimension",
+    "$value": "8px"
+  },
+  "shadow-xl-2-blur-radius": {
+    "$type": "dimension",
+    "$value": "10px"
+  },
+  "shadow-xl-2-spread-radius": {
+    "$type": "dimension",
+    "$value": "-6px"
+  },
+  "shadow-2xl-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-2xl-offset-y": {
+    "$type": "dimension",
+    "$value": "25px"
+  },
+  "shadow-2xl-blur-radius": {
+    "$type": "dimension",
+    "$value": "50px"
+  },
+  "shadow-2xl-spread-radius": {
+    "$type": "dimension",
+    "$value": "-12px"
+  },
+  "drop-shadow-md-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-md-offset-y": {
+    "$type": "dimension",
+    "$value": "3px"
+  },
+  "drop-shadow-md-blur-radius": {
+    "$type": "dimension",
+    "$value": "3px"
+  },
+  "drop-shadow-md-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-lg-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-lg-offset-y": {
+    "$type": "dimension",
+    "$value": "4px"
+  },
+  "drop-shadow-lg-blur-radius": {
+    "$type": "dimension",
+    "$value": "4px"
+  },
+  "drop-shadow-lg-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-xl-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-xl-offset-y": {
+    "$type": "dimension",
+    "$value": "9px"
+  },
+  "drop-shadow-xl-blur-radius": {
+    "$type": "dimension",
+    "$value": "7px"
+  },
+  "drop-shadow-xl-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-2xl-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-2xl-offset-y": {
+    "$type": "dimension",
+    "$value": "25px"
+  },
+  "drop-shadow-2xl-blur-radius": {
+    "$type": "dimension",
+    "$value": "25px"
+  },
+  "drop-shadow-2xl-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "radius-none": {
+    "$type": "dimension",
+    "$value": "0rem"
+  },
+  "radius-full": {
+    "$type": "dimension",
+    "$value": "624.9375rem"
+  }
+}
diff --git a/packages/tokens/src/tokens.surf-pilot.json b/packages/tokens/src/tokens.surf-pilot.json
new file mode 100644
index 0000000..96d84dc
--- /dev/null
+++ b/packages/tokens/src/tokens.surf-pilot.json
@@ -0,0 +1,930 @@
+{
+  "background": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 1)"
+  },
+  "foreground": {
+    "$type": "color",
+    "$value": "rgba(10, 10, 10, 1)"
+  },
+  "card": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 1)"
+  },
+  "card-foreground": {
+    "$type": "color",
+    "$value": "rgba(12, 10, 9, 1)"
+  },
+  "popover": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 1)"
+  },
+  "popover-foreground": {
+    "$type": "color",
+    "$value": "rgba(12, 10, 9, 1)"
+  },
+  "primary": {
+    "$type": "color",
+    "$value": "rgba(23, 23, 23, 1)"
+  },
+  "primary-foreground": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 1)"
+  },
+  "secondary": {
+    "$type": "color",
+    "$value": "rgba(163, 163, 163, 1)"
+  },
+  "secondary-foreground": {
+    "$type": "color",
+    "$value": "rgba(0, 0, 0, 1)"
+  },
+  "muted": {
+    "$type": "color",
+    "$value": "rgba(245, 245, 244, 1)"
+  },
+  "muted-foreground": {
+    "$type": "color",
+    "$value": "rgba(82, 82, 82, 1)"
+  },
+  "accent": {
+    "$type": "color",
+    "$value": "rgba(245, 245, 245, 1)"
+  },
+  "accent-foreground": {
+    "$type": "color",
+    "$value": "rgba(23, 23, 23, 1)"
+  },
+  "destructive": {
+    "$type": "color",
+    "$value": "rgba(220, 38, 38, 1)"
+  },
+  "border": {
+    "$type": "color",
+    "$value": "rgba(214, 211, 209, 1)"
+  },
+  "input": {
+    "$type": "color",
+    "$value": "rgba(212, 212, 212, 1)"
+  },
+  "ring": {
+    "$type": "color",
+    "$value": "rgba(168, 162, 158, 1)"
+  },
+  "chart-1": {
+    "$type": "color",
+    "$value": "rgba(234, 88, 12, 1)"
+  },
+  "chart-2": {
+    "$type": "color",
+    "$value": "rgba(13, 148, 136, 1)"
+  },
+  "chart-3": {
+    "$type": "color",
+    "$value": "rgba(22, 78, 99, 1)"
+  },
+  "chart-4": {
+    "$type": "color",
+    "$value": "rgba(251, 191, 36, 1)"
+  },
+  "chart-5": {
+    "$type": "color",
+    "$value": "rgba(245, 158, 11, 1)"
+  },
+  "sidebar": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 1)"
+  },
+  "sidebar-foreground": {
+    "$type": "color",
+    "$value": "rgba(12, 10, 9, 1)"
+  },
+  "sidebar-primary": {
+    "$type": "color",
+    "$value": "rgba(28, 25, 23, 1)"
+  },
+  "sidebar-primary-foreground": {
+    "$type": "color",
+    "$value": "rgba(250, 250, 249, 1)"
+  },
+  "sidebar-accent": {
+    "$type": "color",
+    "$value": "rgba(245, 245, 244, 1)"
+  },
+  "sidebar-accent-foreground": {
+    "$type": "color",
+    "$value": "rgba(28, 25, 23, 1)"
+  },
+  "sidebar-border": {
+    "$type": "color",
+    "$value": "rgba(214, 211, 209, 1)"
+  },
+  "sidebar-ring": {
+    "$type": "color",
+    "$value": "rgba(168, 162, 158, 1)"
+  },
+  "font-sans": {
+    "$type": "fontFamily",
+    "$value": "Source Sans 3, sans-serif"
+  },
+  "font-mono": {
+    "$type": "fontFamily",
+    "$value": "Geist Mono, monospace"
+  },
+  "destructive-foreground": {
+    "$type": "color",
+    "$value": "rgba(254, 242, 242, 1)"
+  },
+  "ring-offset": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 1)"
+  },
+  "alpha-5": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.95)"
+  },
+  "alpha-10": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.9)"
+  },
+  "alpha-20": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.8)"
+  },
+  "alpha-30": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.7)"
+  },
+  "alpha-40": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.6)"
+  },
+  "alpha-50": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.5)"
+  },
+  "alpha-60": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.4)"
+  },
+  "alpha-70": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.3)"
+  },
+  "alpha-80": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.2)"
+  },
+  "alpha-90": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.1)"
+  },
+  "custom-background-dark-input30": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 1)"
+  },
+  "custom-transparent-dark-input30": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0)"
+  },
+  "custom-transparent": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0)"
+  },
+  "custom-background-dark-calendar30": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 1)"
+  },
+  "custom-accent-dark-input50": {
+    "$type": "color",
+    "$value": "rgba(245, 245, 245, 1)"
+  },
+  "custom-accent-dark-calendar50": {
+    "$type": "color",
+    "$value": "rgba(245, 245, 245, 1)"
+  },
+  "custom-input-dark-input80": {
+    "$type": "color",
+    "$value": "rgba(212, 212, 212, 1)"
+  },
+  "custom-input-dark-input30": {
+    "$type": "color",
+    "$value": "rgba(212, 212, 212, 1)"
+  },
+  "custom-input50-dark-input80": {
+    "$type": "color",
+    "$value": "rgba(229, 229, 229, 0.5)"
+  },
+  "custom-input30-dark-transparent": {
+    "$type": "color",
+    "$value": "rgba(229, 229, 229, 0.3)"
+  },
+  "custom-input30-dark-input30": {
+    "$type": "color",
+    "$value": "rgba(229, 229, 229, 0.3)"
+  },
+  "custom-muted-dark-input50": {
+    "$type": "color",
+    "$value": "rgba(245, 245, 244, 1)"
+  },
+  "custom-destructive-dark-destructive60": {
+    "$type": "color",
+    "$value": "rgba(220, 38, 38, 1)"
+  },
+  "custom-destructive-dark-destructive70": {
+    "$type": "color",
+    "$value": "rgba(220, 38, 38, 1)"
+  },
+  "custom-destructive-dark-destructive90": {
+    "$type": "color",
+    "$value": "rgba(220, 38, 38, 1)"
+  },
+  "custom-destructive10-dark-destructive20": {
+    "$type": "color",
+    "$value": "rgba(220, 38, 38, 0.1)"
+  },
+  "custom-destructive20-dark-destructive40": {
+    "$type": "color",
+    "$value": "rgba(220, 38, 38, 0.2)"
+  },
+  "custom-destructive20-dark-destructive30": {
+    "$type": "color",
+    "$value": "rgba(220, 38, 38, 0.2)"
+  },
+  "custom-destructive40-dark-destructive60": {
+    "$type": "color",
+    "$value": "rgba(220, 38, 38, 0.4)"
+  },
+  "custom-destructive40-dark-destructive40": {
+    "$type": "color",
+    "$value": "rgba(220, 38, 38, 0.4)"
+  },
+  "custom-amber900-dark-amber50": {
+    "$type": "color",
+    "$value": "rgba(120, 53, 15, 1)"
+  },
+  "custom-amber50-dark-amber950": {
+    "$type": "color",
+    "$value": "rgba(255, 251, 235, 1)"
+  },
+  "custom-amber200-dark-amber900": {
+    "$type": "color",
+    "$value": "rgba(253, 230, 138, 1)"
+  },
+  "custom-neutral800-dark-neutral300": {
+    "$type": "color",
+    "$value": "rgba(38, 38, 38, 1)"
+  },
+  "custom-dark-input": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0)"
+  },
+  "custom-outline": {
+    "$type": "color",
+    "$value": "rgba(163, 163, 163, 0.5)"
+  },
+  "custom-outline10-dark-outline20": {
+    "$type": "color",
+    "$value": "rgba(163, 163, 163, 0.1)"
+  },
+  "custom-blue-500-dark-blue-600": {
+    "$type": "color",
+    "$value": "rgba(59, 130, 246, 1)"
+  },
+  "custom-border-dark-input-dark": {
+    "$type": "color",
+    "$value": "rgba(214, 211, 209, 1)"
+  },
+  "custom-ring-dark-input-dark": {
+    "$type": "color",
+    "$value": "rgba(168, 162, 158, 1)"
+  },
+  "custom-ring-dark-input-dark-2": {
+    "$type": "color",
+    "$value": "rgba(168, 162, 158, 1)"
+  },
+  "custom-popover70": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.7)"
+  },
+  "custom-foreground10": {
+    "$type": "color",
+    "$value": "rgba(10, 10, 10, 0.1)"
+  },
+  "custom-ring-dark-input-dark-3": {
+    "$type": "color",
+    "$value": "rgba(168, 162, 158, 1)"
+  },
+  "custom-bg-background20-dark-bg-background10": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.2)"
+  },
+  "custom-bg-primary5-dark-bg-primary10": {
+    "$type": "color",
+    "$value": "rgba(23, 23, 23, 0.05)"
+  },
+  "custom-alpha-30-dark-alpha-20": {
+    "$type": "color",
+    "$value": "rgba(255, 255, 255, 0.7)"
+  },
+  "breakpoint-sm": {
+    "$type": "dimension",
+    "$value": "640px"
+  },
+  "breakpoint-md": {
+    "$type": "dimension",
+    "$value": "768px"
+  },
+  "breakpoint-lg": {
+    "$type": "dimension",
+    "$value": "1024px"
+  },
+  "breakpoint-xl": {
+    "$type": "dimension",
+    "$value": "1280px"
+  },
+  "breakpoint-2xl": {
+    "$type": "dimension",
+    "$value": "1536px"
+  },
+  "container-3xs": {
+    "$type": "dimension",
+    "$value": "256px"
+  },
+  "text-xs-font-size": {
+    "$type": "dimension",
+    "$value": "0.875rem"
+  },
+  "text-xs-line-height": {
+    "$type": "dimension",
+    "$value": "1.25rem"
+  },
+  "text-sm-font-size": {
+    "$type": "dimension",
+    "$value": "1rem"
+  },
+  "text-sm-line-height": {
+    "$type": "dimension",
+    "$value": "1.5rem"
+  },
+  "text-base-font-size": {
+    "$type": "dimension",
+    "$value": "1.125rem"
+  },
+  "text-base-line-height": {
+    "$type": "dimension",
+    "$value": "1.75rem"
+  },
+  "text-lg-font-size": {
+    "$type": "dimension",
+    "$value": "1.25rem"
+  },
+  "text-lg-line-height": {
+    "$type": "dimension",
+    "$value": "1.75rem"
+  },
+  "text-xl-font-size": {
+    "$type": "dimension",
+    "$value": "1.5rem"
+  },
+  "text-xl-line-height": {
+    "$type": "dimension",
+    "$value": "2rem"
+  },
+  "text-2xl-font-size": {
+    "$type": "dimension",
+    "$value": "1.875rem"
+  },
+  "text-2xl-line-height": {
+    "$type": "dimension",
+    "$value": "2.25rem"
+  },
+  "text-3xl-font-size": {
+    "$type": "dimension",
+    "$value": "2.25rem"
+  },
+  "text-3xl-line-height": {
+    "$type": "dimension",
+    "$value": "2.5rem"
+  },
+  "text-4xl-font-size": {
+    "$type": "dimension",
+    "$value": "3rem"
+  },
+  "text-4xl-line-height": {
+    "$type": "dimension",
+    "$value": "3rem"
+  },
+  "text-5xl-font-size": {
+    "$type": "dimension",
+    "$value": "3.75rem"
+  },
+  "text-5xl-line-height": {
+    "$type": "dimension",
+    "$value": "3.75rem"
+  },
+  "text-6xl-font-size": {
+    "$type": "dimension",
+    "$value": "4.5rem"
+  },
+  "text-6xl-line-height": {
+    "$type": "dimension",
+    "$value": "4.5rem"
+  },
+  "text-7xl-font-size": {
+    "$type": "dimension",
+    "$value": "6rem"
+  },
+  "text-7xl-line-height": {
+    "$type": "dimension",
+    "$value": "6rem"
+  },
+  "text-8xl-font-size": {
+    "$type": "dimension",
+    "$value": "8rem"
+  },
+  "text-8xl-line-height": {
+    "$type": "dimension",
+    "$value": "8rem"
+  },
+  "text-9xl-font-size": {
+    "$type": "dimension",
+    "$value": "10rem"
+  },
+  "text-9xl-line-height": {
+    "$type": "dimension",
+    "$value": "10rem"
+  },
+  "container-2xs": {
+    "$type": "dimension",
+    "$value": "288px"
+  },
+  "container-xs": {
+    "$type": "dimension",
+    "$value": "320px"
+  },
+  "container-sm": {
+    "$type": "dimension",
+    "$value": "384px"
+  },
+  "container-md": {
+    "$type": "dimension",
+    "$value": "448px"
+  },
+  "container-lg": {
+    "$type": "dimension",
+    "$value": "512px"
+  },
+  "container-xl": {
+    "$type": "dimension",
+    "$value": "576px"
+  },
+  "container-2xl": {
+    "$type": "dimension",
+    "$value": "672px"
+  },
+  "container-3xl": {
+    "$type": "dimension",
+    "$value": "768px"
+  },
+  "container-4xl": {
+    "$type": "dimension",
+    "$value": "896px"
+  },
+  "container-5xl": {
+    "$type": "dimension",
+    "$value": "1024px"
+  },
+  "container-6xl": {
+    "$type": "dimension",
+    "$value": "1152px"
+  },
+  "container-7xl": {
+    "$type": "dimension",
+    "$value": "1280px"
+  },
+  "font-weight-thin": {
+    "$type": "number",
+    "$value": "100"
+  },
+  "font-weight-extralight": {
+    "$type": "number",
+    "$value": "200"
+  },
+  "font-weight-light": {
+    "$type": "number",
+    "$value": "300"
+  },
+  "font-weight-normal": {
+    "$type": "number",
+    "$value": "400"
+  },
+  "font-weight-medium": {
+    "$type": "number",
+    "$value": "500"
+  },
+  "font-weight-semibold": {
+    "$type": "number",
+    "$value": "600"
+  },
+  "font-weight-bold": {
+    "$type": "number",
+    "$value": "700"
+  },
+  "font-weight-extrabold": {
+    "$type": "number",
+    "$value": "800"
+  },
+  "font-weight-black": {
+    "$type": "number",
+    "$value": "900"
+  },
+  "radius-xs": {
+    "$type": "dimension",
+    "$value": "0.125rem"
+  },
+  "radius-sm": {
+    "$type": "dimension",
+    "$value": "0.375rem"
+  },
+  "radius-md": {
+    "$type": "dimension",
+    "$value": "0.5rem"
+  },
+  "radius-lg": {
+    "$type": "dimension",
+    "$value": "0.625rem"
+  },
+  "radius-xl": {
+    "$type": "dimension",
+    "$value": "0.875rem"
+  },
+  "radius-2xl": {
+    "$type": "dimension",
+    "$value": "1.125rem"
+  },
+  "radius-3xl": {
+    "$type": "dimension",
+    "$value": "1.375rem"
+  },
+  "radius-4xl": {
+    "$type": "dimension",
+    "$value": "1.625rem"
+  },
+  "shadow-2xs-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-2xs-offset-y": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "shadow-2xs-blur-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-2xs-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-xs-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-xs-offset-y": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "shadow-xs-blur-radius": {
+    "$type": "dimension",
+    "$value": "2px"
+  },
+  "shadow-xs-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-sm-1-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-sm-1-offset-y": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "shadow-sm-1-blur-radius": {
+    "$type": "dimension",
+    "$value": "3px"
+  },
+  "shadow-sm-1-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-sm-2-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-sm-2-offset-y": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "shadow-sm-2-blur-radius": {
+    "$type": "dimension",
+    "$value": "2px"
+  },
+  "shadow-sm-2-spread-radius": {
+    "$type": "dimension",
+    "$value": "-1px"
+  },
+  "inset-shadow-2xs-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "inset-shadow-2xs-offset-y": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "inset-shadow-2xs-blur-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "inset-shadow-2xs-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "inset-shadow-xs-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "inset-shadow-xs-offset-y": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "inset-shadow-xs-blur-radius": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "inset-shadow-xs-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "inset-shadow-sm-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "inset-shadow-sm-offset-y": {
+    "$type": "dimension",
+    "$value": "2px"
+  },
+  "inset-shadow-sm-blur-radius": {
+    "$type": "dimension",
+    "$value": "4px"
+  },
+  "inset-shadow-sm-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-xs-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-xs-offset-y": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "drop-shadow-xs-blur-radius": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "drop-shadow-xs-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-sm-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-sm-offset-y": {
+    "$type": "dimension",
+    "$value": "1px"
+  },
+  "drop-shadow-sm-blur-radius": {
+    "$type": "dimension",
+    "$value": "2px"
+  },
+  "drop-shadow-sm-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "blur-xs": {
+    "$type": "dimension",
+    "$value": "4px"
+  },
+  "blur-sm": {
+    "$type": "dimension",
+    "$value": "8px"
+  },
+  "blur-md": {
+    "$type": "dimension",
+    "$value": "12px"
+  },
+  "blur-lg": {
+    "$type": "dimension",
+    "$value": "16px"
+  },
+  "blur-xl": {
+    "$type": "dimension",
+    "$value": "24px"
+  },
+  "blur-2xl": {
+    "$type": "dimension",
+    "$value": "40px"
+  },
+  "blur-3xl": {
+    "$type": "dimension",
+    "$value": "64px"
+  },
+  "shadow-md-1-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-md-1-offset-y": {
+    "$type": "dimension",
+    "$value": "4px"
+  },
+  "shadow-md-1-blur-radius": {
+    "$type": "dimension",
+    "$value": "6px"
+  },
+  "shadow-md-1-spread-radius": {
+    "$type": "dimension",
+    "$value": "-1px"
+  },
+  "shadow-md-2-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-md-2-offset-y": {
+    "$type": "dimension",
+    "$value": "2px"
+  },
+  "shadow-md-2-blur-radius": {
+    "$type": "dimension",
+    "$value": "4px"
+  },
+  "shadow-md-2-spread-radius": {
+    "$type": "dimension",
+    "$value": "-2px"
+  },
+  "shadow-lg-1-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-lg-1-offset-y": {
+    "$type": "dimension",
+    "$value": "10px"
+  },
+  "shadow-lg-1-blur-radius": {
+    "$type": "dimension",
+    "$value": "15px"
+  },
+  "shadow-lg-1-spread-radius": {
+    "$type": "dimension",
+    "$value": "-3px"
+  },
+  "shadow-lg-2-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-lg-2-offset-y": {
+    "$type": "dimension",
+    "$value": "4px"
+  },
+  "shadow-lg-2-blur-radius": {
+    "$type": "dimension",
+    "$value": "6px"
+  },
+  "shadow-lg-2-spread-radius": {
+    "$type": "dimension",
+    "$value": "-4px"
+  },
+  "shadow-xl-1-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-xl-1-offset-y": {
+    "$type": "dimension",
+    "$value": "20px"
+  },
+  "shadow-xl-1-blur-radius": {
+    "$type": "dimension",
+    "$value": "25px"
+  },
+  "shadow-xl-1-spread-radius": {
+    "$type": "dimension",
+    "$value": "-5px"
+  },
+  "shadow-xl-2-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-xl-2-offset-y": {
+    "$type": "dimension",
+    "$value": "8px"
+  },
+  "shadow-xl-2-blur-radius": {
+    "$type": "dimension",
+    "$value": "10px"
+  },
+  "shadow-xl-2-spread-radius": {
+    "$type": "dimension",
+    "$value": "-6px"
+  },
+  "shadow-2xl-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "shadow-2xl-offset-y": {
+    "$type": "dimension",
+    "$value": "25px"
+  },
+  "shadow-2xl-blur-radius": {
+    "$type": "dimension",
+    "$value": "50px"
+  },
+  "shadow-2xl-spread-radius": {
+    "$type": "dimension",
+    "$value": "-12px"
+  },
+  "drop-shadow-md-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-md-offset-y": {
+    "$type": "dimension",
+    "$value": "3px"
+  },
+  "drop-shadow-md-blur-radius": {
+    "$type": "dimension",
+    "$value": "3px"
+  },
+  "drop-shadow-md-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-lg-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-lg-offset-y": {
+    "$type": "dimension",
+    "$value": "4px"
+  },
+  "drop-shadow-lg-blur-radius": {
+    "$type": "dimension",
+    "$value": "4px"
+  },
+  "drop-shadow-lg-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-xl-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-xl-offset-y": {
+    "$type": "dimension",
+    "$value": "9px"
+  },
+  "drop-shadow-xl-blur-radius": {
+    "$type": "dimension",
+    "$value": "7px"
+  },
+  "drop-shadow-xl-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-2xl-offset-x": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "drop-shadow-2xl-offset-y": {
+    "$type": "dimension",
+    "$value": "25px"
+  },
+  "drop-shadow-2xl-blur-radius": {
+    "$type": "dimension",
+    "$value": "25px"
+  },
+  "drop-shadow-2xl-spread-radius": {
+    "$type": "dimension",
+    "$value": "0px"
+  },
+  "radius-none": {
+    "$type": "dimension",
+    "$value": "0rem"
+  },
+  "radius-full": {
+    "$type": "dimension",
+    "$value": "624.9375rem"
+  }
+}
diff --git a/packages/tokens/src/tokens.surf-purple-orange.dark.json b/packages/tokens/src/tokens.surf-purple-orange.dark.json
index dc0d521..08e027e 100644
--- a/packages/tokens/src/tokens.surf-purple-orange.dark.json
+++ b/packages/tokens/src/tokens.surf-purple-orange.dark.json
@@ -49,7 +49,7 @@
   },
   "accent": {
     "$type": "color",
-    "$value": "rgba(41, 37, 36, 1)"
+    "$value": "rgba(159, 74, 26, 1)"
   },
   "accent-foreground": {
     "$type": "color",
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.surf-purple-orange.json b/packages/tokens/src/tokens.surf-purple-orange.json
index 4e42c6c..7ebde3d 100644
--- a/packages/tokens/src/tokens.surf-purple-orange.json
+++ b/packages/tokens/src/tokens.surf-purple-orange.json
@@ -49,7 +49,7 @@
   },
   "accent": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(255, 233, 217, 1)"
   },
   "accent-foreground": {
     "$type": "color",
@@ -65,7 +65,7 @@
   },
   "input": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "ring": {
     "$type": "color",
@@ -197,19 +197,19 @@
   },
   "custom-accent-dark-input50": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(255, 233, 217, 1)"
   },
   "custom-accent-dark-calendar50": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(255, 233, 217, 1)"
   },
   "custom-input-dark-input80": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input-dark-input30": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input50-dark-input80": {
     "$type": "color",
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.surf-purple.dark.json b/packages/tokens/src/tokens.surf-purple.dark.json
index 7cd6c08..9a27c31 100644
--- a/packages/tokens/src/tokens.surf-purple.dark.json
+++ b/packages/tokens/src/tokens.surf-purple.dark.json
@@ -33,7 +33,7 @@
   },
   "secondary": {
     "$type": "color",
-    "$value": "rgba(157, 93, 231, 1)"
+    "$value": "rgba(118, 45, 203, 1)"
   },
   "secondary-foreground": {
     "$type": "color",
@@ -49,7 +49,7 @@
   },
   "accent": {
     "$type": "color",
-    "$value": "rgba(41, 37, 36, 1)"
+    "$value": "rgba(66, 9, 132, 1)"
   },
   "accent-foreground": {
     "$type": "color",
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.surf-purple.json b/packages/tokens/src/tokens.surf-purple.json
index 11c5c5c..38fc07d 100644
--- a/packages/tokens/src/tokens.surf-purple.json
+++ b/packages/tokens/src/tokens.surf-purple.json
@@ -33,7 +33,7 @@
   },
   "secondary": {
     "$type": "color",
-    "$value": "rgba(157, 93, 231, 1)"
+    "$value": "rgba(118, 45, 203, 1)"
   },
   "secondary-foreground": {
     "$type": "color",
@@ -49,7 +49,7 @@
   },
   "accent": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(237, 228, 251, 1)"
   },
   "accent-foreground": {
     "$type": "color",
@@ -65,7 +65,7 @@
   },
   "input": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "ring": {
     "$type": "color",
@@ -197,19 +197,19 @@
   },
   "custom-accent-dark-input50": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(237, 228, 251, 1)"
   },
   "custom-accent-dark-calendar50": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(237, 228, 251, 1)"
   },
   "custom-input-dark-input80": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input-dark-input30": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input50-dark-input80": {
     "$type": "color",
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.surf-yellow.dark.json b/packages/tokens/src/tokens.surf-yellow.dark.json
index 75516a5..ee437b5 100644
--- a/packages/tokens/src/tokens.surf-yellow.dark.json
+++ b/packages/tokens/src/tokens.surf-yellow.dark.json
@@ -49,7 +49,7 @@
   },
   "accent": {
     "$type": "color",
-    "$value": "rgba(41, 37, 36, 1)"
+    "$value": "rgba(138, 121, 0, 1)"
   },
   "accent-foreground": {
     "$type": "color",
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",
diff --git a/packages/tokens/src/tokens.surf-yellow.json b/packages/tokens/src/tokens.surf-yellow.json
index d74ed4e..8f02d55 100644
--- a/packages/tokens/src/tokens.surf-yellow.json
+++ b/packages/tokens/src/tokens.surf-yellow.json
@@ -49,7 +49,7 @@
   },
   "accent": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(255, 249, 214, 1)"
   },
   "accent-foreground": {
     "$type": "color",
@@ -65,7 +65,7 @@
   },
   "input": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "ring": {
     "$type": "color",
@@ -197,19 +197,19 @@
   },
   "custom-accent-dark-input50": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(255, 249, 214, 1)"
   },
   "custom-accent-dark-calendar50": {
     "$type": "color",
-    "$value": "rgba(245, 245, 244, 1)"
+    "$value": "rgba(255, 249, 214, 1)"
   },
   "custom-input-dark-input80": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input-dark-input30": {
     "$type": "color",
-    "$value": "rgba(214, 211, 209, 1)"
+    "$value": "rgba(212, 212, 212, 1)"
   },
   "custom-input50-dark-input80": {
     "$type": "color",
@@ -353,31 +353,31 @@
   },
   "text-xs-font-size": {
     "$type": "dimension",
-    "$value": "0.75rem"
+    "$value": "0.875rem"
   },
   "text-xs-line-height": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.25rem"
   },
   "text-sm-font-size": {
     "$type": "dimension",
-    "$value": "0.875rem"
+    "$value": "1rem"
   },
   "text-sm-line-height": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-base-font-size": {
     "$type": "dimension",
-    "$value": "1rem"
+    "$value": "1.125rem"
   },
   "text-base-line-height": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.75rem"
   },
   "text-lg-font-size": {
     "$type": "dimension",
-    "$value": "1.125rem"
+    "$value": "1.25rem"
   },
   "text-lg-line-height": {
     "$type": "dimension",
@@ -385,75 +385,75 @@
   },
   "text-xl-font-size": {
     "$type": "dimension",
-    "$value": "1.25rem"
+    "$value": "1.5rem"
   },
   "text-xl-line-height": {
     "$type": "dimension",
-    "$value": "1.75rem"
+    "$value": "2rem"
   },
   "text-2xl-font-size": {
     "$type": "dimension",
-    "$value": "1.5rem"
+    "$value": "1.875rem"
   },
   "text-2xl-line-height": {
     "$type": "dimension",
-    "$value": "2rem"
+    "$value": "2.25rem"
   },
   "text-3xl-font-size": {
     "$type": "dimension",
-    "$value": "1.875rem"
+    "$value": "2.25rem"
   },
   "text-3xl-line-height": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "2.5rem"
   },
   "text-4xl-font-size": {
     "$type": "dimension",
-    "$value": "2.25rem"
+    "$value": "3rem"
   },
   "text-4xl-line-height": {
     "$type": "dimension",
-    "$value": "2.5rem"
+    "$value": "3rem"
   },
   "text-5xl-font-size": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-5xl-line-height": {
     "$type": "dimension",
-    "$value": "3rem"
+    "$value": "3.75rem"
   },
   "text-6xl-font-size": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-6xl-line-height": {
     "$type": "dimension",
-    "$value": "3.75rem"
+    "$value": "4.5rem"
   },
   "text-7xl-font-size": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-7xl-line-height": {
     "$type": "dimension",
-    "$value": "4.5rem"
+    "$value": "6rem"
   },
   "text-8xl-font-size": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-8xl-line-height": {
     "$type": "dimension",
-    "$value": "6rem"
+    "$value": "8rem"
   },
   "text-9xl-font-size": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "text-9xl-line-height": {
     "$type": "dimension",
-    "$value": "8rem"
+    "$value": "10rem"
   },
   "container-2xs": {
     "$type": "dimension",