diff --git a/canon-docs/src/components/CodeBlock/styles.module.css b/canon-docs/src/components/CodeBlock/styles.module.css
index c522573f37..03ec72d6c4 100644
--- a/canon-docs/src/components/CodeBlock/styles.module.css
+++ b/canon-docs/src/components/CodeBlock/styles.module.css
@@ -4,7 +4,7 @@
   position: relative;
   background: transparent;
   overflow-x: auto;
-  font-family: var(--canon-font-monospace);
+  font-family: var(--font-mono);
   background-color: #fff;
   margin-bottom: 1rem;
 }
diff --git a/canon-docs/src/components/CustomTheme/customTheme.tsx b/canon-docs/src/components/CustomTheme/customTheme.tsx
index 66b4afc47c..87c72ecdcb 100644
--- a/canon-docs/src/components/CustomTheme/customTheme.tsx
+++ b/canon-docs/src/components/CustomTheme/customTheme.tsx
@@ -11,13 +11,13 @@ import { createTheme } from '@uiw/codemirror-themes';
 import { tags as t } from '@lezer/highlight';
 
 const defaultTheme = `:root {
-  --canon-bg-accent: #000;
+  --canon-bg-solid: #000;
 }`;
 
 const myTheme = createTheme({
   theme: 'light',
   settings: {
-    background: 'var(--canon-bg-surface-1)',
+    background: 'var(--surface-1)',
     backgroundImage: '',
     foreground: '#6182B8',
     caret: '#5d00ff',
diff --git a/canon-docs/src/components/HeadlessBanners/styles.module.css b/canon-docs/src/components/HeadlessBanners/styles.module.css
index c87787634e..384327c394 100644
--- a/canon-docs/src/components/HeadlessBanners/styles.module.css
+++ b/canon-docs/src/components/HeadlessBanners/styles.module.css
@@ -1,16 +1,16 @@
 .container {
   display: flex;
   background-color: var(--panel);
-  padding: var(--canon-space-6);
-  border-radius: var(--canon-radius-2);
+  padding: 1.5rem;
+  border-radius: 0.25rem;
   border: 1px solid var(--border);
-  margin-bottom: var(--canon-space-6);
-  gap: var(--canon-space-6);
+  margin-bottom: 1.5rem;
+  gap: 1.5rem;
   transition: background-color 0.2s ease-in-out;
 }
 
 .icon path {
-  fill: var(--canon-fg-primary);
+  fill: var(--primary);
 }
 
 .content {
@@ -31,12 +31,12 @@
   cursor: pointer;
   background-color: var(--bg);
   border: 1px solid var(--border);
-  border-radius: var(--canon-radius-2);
-  padding: 0 var(--canon-space-3);
+  border-radius: 0.25rem;
+  padding: 0 0.75rem;
   height: 28px;
   border-radius: 100px;
-  margin-top: var(--canon-space-3);
-  font-size: var(--canon-font-size-3);
+  margin-top: 0.75rem;
+  font-size: 0.875rem;
   color: var(--primary);
-  gap: var(--canon-space-2);
+  gap: 0.5rem;
 }
diff --git a/canon-docs/src/components/Sidebar/Sidebar.module.css b/canon-docs/src/components/Sidebar/Sidebar.module.css
index 91fb0fff1f..bfb2e6f648 100644
--- a/canon-docs/src/components/Sidebar/Sidebar.module.css
+++ b/canon-docs/src/components/Sidebar/Sidebar.module.css
@@ -55,8 +55,8 @@
 }
 
 .sectionTitle {
-  font-size: var(--canon-font-size-3);
-  font-weight: var(--canon-font-weight-bold);
+  font-size: 0.875rem;
+  font-weight: 600;
   padding: 12px 0;
   color: var(--primary);
   margin-top: 24px;
diff --git a/canon-docs/src/components/Tabs/parts.tsx b/canon-docs/src/components/Tabs/parts.tsx
index 3d02683cef..2a394d248b 100644
--- a/canon-docs/src/components/Tabs/parts.tsx
+++ b/canon-docs/src/components/Tabs/parts.tsx
@@ -1,7 +1,6 @@
 'use client';
 
 import { Tabs as TabsPrimitive } from '@base-ui-components/react/tabs';
-import { Text } from '../../../../packages/canon';
 import styles from './styles.module.css';
 
 export const Root = ({
@@ -27,14 +26,8 @@ export const Tab = (props: React.ComponentProps<typeof TabsPrimitive.Tab>) => (
     {...props}
     render={({ children, ...rest }, state) => {
       return (
-        <button className={styles.tab} {...rest}>
-          <Text
-            variant="subtitle"
-            weight="bold"
-            color={state.selected ? 'primary' : 'secondary'}
-          >
-            {children}
-          </Text>
+        <button className={styles.tab} data-selected={state.selected} {...rest}>
+          {children}
         </button>
       );
     }}
diff --git a/canon-docs/src/components/Tabs/styles.module.css b/canon-docs/src/components/Tabs/styles.module.css
index 5789b08345..8fdffc3f4b 100644
--- a/canon-docs/src/components/Tabs/styles.module.css
+++ b/canon-docs/src/components/Tabs/styles.module.css
@@ -4,16 +4,28 @@
 
 .list {
   display: flex;
-  gap: var(--canon-space-6);
+  gap: 24px;
   border-bottom: 1px solid var(--border);
   position: relative;
-  margin-bottom: var(--canon-space-6);
+  margin-bottom: 24px;
 }
 
 .tab {
   all: unset;
   cursor: pointer;
-  padding-bottom: 8px;
+  padding-bottom: 12px;
+  font-size: 14px;
+  font-weight: 600;
+  color: var(--primary);
+
+  &[data-selected='false'] {
+    color: var(--secondary);
+  }
+
+  &[data-selected='false']:hover {
+    color: var(--primary);
+    transition: color 0.2s ease-in-out;
+  }
 }
 
 .indicator {
diff --git a/canon-docs/src/components/Toolbar/nav.module.css b/canon-docs/src/components/Toolbar/nav.module.css
index c102b2bd6f..56501f186e 100644
--- a/canon-docs/src/components/Toolbar/nav.module.css
+++ b/canon-docs/src/components/Toolbar/nav.module.css
@@ -20,15 +20,15 @@
   display: flex;
   position: relative;
   z-index: 0;
-  gap: var(--canon-space-8);
+  gap: 2rem;
 }
 
 .tab {
   all: unset;
   height: 60px;
   color: var(--secondary);
-  font-size: var(--canon-font-size-3);
-  font-weight: var(--canon-font-weight-bold);
+  font-size: 0.875rem;
+  font-weight: 600;
   cursor: pointer;
 
   &:hover {
diff --git a/canon-docs/src/components/Toolbar/styles.module.css b/canon-docs/src/components/Toolbar/styles.module.css
index f74ce57b77..5700e876ab 100644
--- a/canon-docs/src/components/Toolbar/styles.module.css
+++ b/canon-docs/src/components/Toolbar/styles.module.css
@@ -3,14 +3,14 @@
   top: 16px;
   left: 0;
   right: 0;
-  border-radius: 8px;
+  border-radius: 0.5rem;
   z-index: 10;
   background-color: var(--panel);
   height: 60px;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 0 var(--canon-space-6);
+  padding: 0 1.5rem;
   box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.025);
   border: 1px solid var(--border);
 }
@@ -18,5 +18,5 @@
 .actions {
   display: flex;
   align-items: center;
-  gap: var(--canon-space-4);
+  gap: 1rem;
 }
diff --git a/canon-docs/src/components/Toolbar/theme-name.module.css b/canon-docs/src/components/Toolbar/theme-name.module.css
index 3d46705d94..02644e8ea0 100644
--- a/canon-docs/src/components/Toolbar/theme-name.module.css
+++ b/canon-docs/src/components/Toolbar/theme-name.module.css
@@ -30,8 +30,8 @@
 }
 
 .SelectValue {
-  font-size: var(--canon-font-size-3);
-  font-weight: var(--canon-font-weight-regular);
+  font-size: 0.875rem;
+  font-weight: 400;
 }
 
 .Positioner {
@@ -81,8 +81,8 @@
   padding-block: 0.5rem;
   padding-left: 0.625rem;
   padding-right: 1rem;
-  font-size: var(--canon-font-size-3);
-  font-weight: var(--canon-font-weight-bold);
+  font-size: 0.875rem;
+  font-weight: 600;
   display: grid;
   gap: 0.5rem;
   align-items: center;