aural-ui 3.0.6 → 4.0.1

package/dist/icons/command-icon/CommandIcon.stories.tsx

@@ -11,9 +11,9 @@ const meta: Meta<typeof CommandIcon> = {
     backgrounds: {
       default: "dark",
       values: [
-        { name: "dark", value: "#0a0a0a" },
-        { name: "darker", value: "#000000" },
-        { name: "light", value: "#ffffff" },
+        { name: "dark", value: "var(--color-fm-surface-primary)" },
+        { name: "darker", value: "var(--color-fm-neutral-0)" },
+        { name: "light", value: "var(--color-fm-neutral-1100)" },
       ],
     },
     docs: {
@@ -40,59 +40,59 @@ const meta: Meta<typeof CommandIcon> = {
                 background: transparent ;
               }
               body {
-                background: #0a0a0a ;
+                background: var(--color-fm-surface-primary) ;
               }
               #storybook-docs {
-                background: #0a0a0a ;
+                background: var(--color-fm-surface-primary) ;
               }
               .sbdocs-preview {
                 background: transparent ;
                 border: none ;
               }
               .sbdocs-h1, .sbdocs-h2, .sbdocs-h3, .sbdocs-h4, .sbdocs-h5, .sbdocs-h6 {
-                color: white ;
+                color: var(--color-fm-icon-active) ;
               }
               .sbdocs-p, .sbdocs-li {
-                color: rgba(255, 255, 255, 0.7) ;
+                color: var(--color-fm-secondary) ;
               }
               .sbdocs-code {
-                background: rgba(255, 255, 255, 0.1) ;
-                color: rgba(168, 85, 247, 1) ;
-                border: 1px solid rgba(255, 255, 255, 0.1) ;
+                background: var(--color-fm-surface-secondary) ;
+                color: var(--color-fm-secondary-500) ;
+                border: 1px solid var(--color-fm-divider-secondary) ;
               }
               .sbdocs-pre {
-                background: rgba(0, 0, 0, 0.4) ;
-                border: 1px solid rgba(255, 255, 255, 0.1) ;
+                background: var(--color-fm-surface-secondary) ;
+                border: 1px solid var(--color-fm-divider-secondary) ;
               }
               .sbdocs-table {
-                background: rgba(255, 255, 255, 0.05) ;
-                border: 1px solid rgba(255, 255, 255, 0.1) ;
+                background: var(--color-fm-surface-secondary) ;
+                border: 1px solid var(--color-fm-divider-secondary) ;
               }
               .sbdocs-table th {
-                background: rgba(255, 255, 255, 0.05) ;
-                color: white ;
-                border-bottom: 1px solid rgba(255, 255, 255, 0.1) ;
+                background: var(--color-fm-surface-secondary) ;
+                color: var(--color-fm-icon-active) ;
+                border-bottom: 1px solid var(--color-fm-divider-secondary) ;
               }
               .sbdocs-table td {
-                color: rgba(255, 255, 255, 0.7) ;
-                border-bottom: 1px solid rgba(255, 255, 255, 0.05) ;
+                color: var(--color-fm-secondary) ;
+                border-bottom: 1px solid var(--color-fm-divider-tertiary) ;
               }
             `}
           </style>
 
-          <div className="min-h-screen bg-gradient-to-br from-gray-900 via-purple-900/20 to-gray-900">
+          <div className="bg-fm-surface-primary min-h-screen">
             {/* Header */}
-            <div className="relative overflow-hidden border-b border-white/10 bg-black/20 backdrop-blur-xl">
-              <div className="absolute inset-0 bg-gradient-to-r from-blue-500/10 via-transparent to-cyan-500/10" />
+            <div className="border-fm-divider-secondary bg-fm-surface-secondary relative overflow-hidden border-b backdrop-blur-xl">
+              <div className="from-fm-icon-info/10 to-fm-icon-info/10 absolute inset-0 bg-linear-to-r via-transparent" />
               <div className="relative !mx-auto max-w-7xl px-6 py-16">
                 <div className="!space-y-6 text-center">
-                  <div className="!mx-auto flex h-24 w-24 items-center justify-center rounded-2xl border border-blue-500/30 bg-gradient-to-br from-blue-500/20 to-cyan-500/20">
-                    <CommandIcon className="h-12 w-12 text-blue-400" />
+                  <div className="border-fm-icon-info/30 from-fm-icon-info/20 to-fm-icon-info/20 !mx-auto flex h-24 w-24 items-center justify-center rounded-2xl border bg-linear-to-br">
+                    <CommandIcon className="text-fm-icon-info h-12 w-12" />
                   </div>
                   <h1 className="!text-fm-primary text-5xl font-bold">
                     CommandIcon
                   </h1>
-                  <p className="!mx-auto max-w-3xl text-xl leading-relaxed !text-white/70">
+                  <p className="text-fm-secondary! !mx-auto max-w-3xl text-xl leading-relaxed">
                     A distinctive command key icon representing keyboard
                     shortcuts, system commands, and power user functionality.
                     Built with accessibility in mind using Radix UI's
@@ -102,28 +102,28 @@ const meta: Meta<typeof CommandIcon> = {
                   {/* Stats */}
                   <div className="flex items-center justify-center gap-8 pt-8">
                     <div className="text-center">
-                      <div className="text-3xl font-bold text-blue-300">
+                      <div className="text-fm-icon-info text-3xl font-bold">
                         Accessible
                       </div>
-                      <div className="text-sm text-white/60">
+                      <div className="text-fm-tertiary text-sm">
                         Screen reader friendly
                       </div>
                     </div>
-                    <div className="h-8 w-px bg-white/20" />
+                    <div className="bg-fm-divider-primary h-8 w-px" />
                     <div className="text-center">
-                      <div className="text-3xl font-bold text-cyan-300">
+                      <div className="text-fm-icon-info text-3xl font-bold">
                         Scalable
                       </div>
-                      <div className="text-sm text-white/60">
+                      <div className="text-fm-tertiary text-sm">
                         Any size needed
                       </div>
                     </div>
-                    <div className="h-8 w-px bg-white/20" />
+                    <div className="bg-fm-divider-primary h-8 w-px" />
                     <div className="text-center">
-                      <div className="text-3xl font-bold text-indigo-300">
+                      <div className="text-fm-icon-info text-3xl font-bold">
                         Shortcuts
                       </div>
-                      <div className="text-sm text-white/60">
+                      <div className="text-fm-tertiary text-sm">
                         Command symbols
                       </div>
                     </div>
@@ -136,16 +136,16 @@ const meta: Meta<typeof CommandIcon> = {
             <div className="!mx-auto max-w-7xl !space-y-16 px-6 py-12">
               {/* Quick Usage */}
               <div className="!space-y-8">
-                <h2 className="text-center text-3xl font-bold !text-white">
+                <h2 className="text-fm-icon-active! text-center text-3xl font-bold">
                   Quick Start
                 </h2>
                 <div className="grid grid-cols-1 gap-8 lg:grid-cols-2">
                   <div className="!space-y-4">
-                    <h3 className="text-xl font-semibold !text-blue-300">
+                    <h3 className="text-fm-icon-info! text-xl font-semibold">
                       Basic Usage
                     </h3>
-                    <div className="rounded-lg bg-black/40 p-4">
-                      <pre className="overflow-x-auto text-sm !text-green-300">
+                    <div className="bg-fm-surface-secondary rounded-lg p-4">
+                      <pre className="text-fm-icon-positive! overflow-x-auto text-sm">
                         {`import { CommandIcon } from "@icons/command-icon"
 
 function ShortcutHint() {
@@ -161,13 +161,15 @@ function ShortcutHint() {
                   </div>
 
                   <div className="!space-y-4">
-                    <h3 className="text-xl font-semibold !text-blue-300">
+                    <h3 className="text-fm-icon-info! text-xl font-semibold">
                       Live Preview
                     </h3>
-                    <div className="flex h-32 items-center justify-center rounded-lg border border-white/10 bg-white/5">
-                      <div className="flex items-center gap-3 rounded-lg border border-blue-500/20 bg-blue-500/10 px-4 py-2">
-                        <CommandIcon className="h-4 w-4 text-blue-400" />
-                        <span className="text-white">+ K to search</span>
+                    <div className="border-fm-divider-secondary bg-fm-surface-secondary flex h-32 items-center justify-center rounded-lg border">
+                      <div className="border-fm-icon-info/20 bg-fm-icon-info/10 flex items-center gap-3 rounded-lg border px-4 py-2">
+                        <CommandIcon className="text-fm-icon-info h-4 w-4" />
+                        <span className="text-fm-icon-active">
+                          + K to search
+                        </span>
                       </div>
                     </div>
                   </div>
@@ -176,108 +178,116 @@ function ShortcutHint() {
 
               {/* Props Documentation */}
               <div className="!space-y-8">
-                <h2 className="text-center text-3xl font-bold !text-white">
+                <h2 className="text-fm-icon-active! text-center text-3xl font-bold">
                   Props & Configuration
                 </h2>
 
-                <div className="overflow-hidden rounded-lg border border-white/10 bg-white/5">
-                  <div className="bg-white/5 p-4">
-                    <h3 className="text-xl font-semibold !text-white">Props</h3>
+                <div className="border-fm-divider-secondary bg-fm-surface-secondary overflow-hidden rounded-lg border">
+                  <div className="bg-fm-surface-secondary p-4">
+                    <h3 className="text-fm-icon-active! text-xl font-semibold">
+                      Props
+                    </h3>
                   </div>
                   <table className="!my-0 w-full">
-                    <thead className="bg-white/5">
-                      <tr className="border-b border-white/10">
-                        <th className="px-6 py-4 text-left text-sm font-semibold !text-white">
+                    <thead className="bg-fm-surface-secondary">
+                      <tr className="border-fm-divider-secondary border-b">
+                        <th className="text-fm-icon-active! px-6 py-4 text-left text-sm font-semibold">
                           Prop
                         </th>
-                        <th className="px-6 py-4 text-left text-sm font-semibold !text-white">
+                        <th className="text-fm-icon-active! px-6 py-4 text-left text-sm font-semibold">
                           Type
                         </th>
-                        <th className="px-6 py-4 text-left text-sm font-semibold !text-white">
+                        <th className="text-fm-icon-active! px-6 py-4 text-left text-sm font-semibold">
                           Default
                         </th>
-                        <th className="px-6 py-4 text-left text-sm font-semibold !text-white">
+                        <th className="text-fm-icon-active! px-6 py-4 text-left text-sm font-semibold">
                           Description
                         </th>
                       </tr>
                     </thead>
                     <tbody>
                       {" "}
-                      <tr className="!bg-black/10">
-                        <td className="px-6 py-4 font-mono text-sm !text-blue-300">
+                      <tr className="bg-fm-surface-secondary!">
+                        <td className="text-fm-icon-info! px-6 py-4 font-mono text-sm">
                           withAccessibility
                         </td>
-                        <td className="px-6 py-4 text-sm !text-white/70">
+                        <td className="text-fm-secondary! px-6 py-4 text-sm">
                           boolean
                         </td>
-                        <td className="px-6 py-4 text-sm !text-white/50">
+                        <td className="text-fm-placeholder! px-6 py-4 text-sm">
                           true
                         </td>
-                        <td className="px-6 py-4 text-sm !text-white/70">
+                        <td className="text-fm-secondary! px-6 py-4 text-sm">
                           Whether to wrap the icon with accessibility feature
                         </td>
                       </tr>
-                      <tr className="border-b border-white/5 !bg-black/10">
-                        <td className="px-6 py-4 font-mono text-sm !text-blue-300">
+                      <tr className="border-fm-divider-tertiary bg-fm-surface-secondary! border-b">
+                        <td className="text-fm-icon-info! px-6 py-4 font-mono text-sm">
                           height
                         </td>
-                        <td className="px-6 py-4 text-sm !text-white/70">
+                        <td className="text-fm-secondary! px-6 py-4 text-sm">
                           number | string
                         </td>
-                        <td className="px-6 py-4 text-sm !text-white/50">24</td>
-                        <td className="px-6 py-4 text-sm !text-white/70">
+                        <td className="text-fm-placeholder! px-6 py-4 text-sm">
+                          24
+                        </td>
+                        <td className="text-fm-secondary! px-6 py-4 text-sm">
                           Height of the icon in pixels
                         </td>
                       </tr>
-                      <tr className="border-b border-white/5">
-                        <td className="px-6 py-4 font-mono text-sm !text-blue-300">
+                      <tr className="border-fm-divider-tertiary border-b">
+                        <td className="text-fm-icon-info! px-6 py-4 font-mono text-sm">
                           stroke
                         </td>
-                        <td className="px-6 py-4 text-sm !text-white/70">
+                        <td className="text-fm-secondary! px-6 py-4 text-sm">
                           string
                         </td>
-                        <td className="px-6 py-4 text-sm !text-white/50">
+                        <td className="text-fm-placeholder! px-6 py-4 text-sm">
                           currentColor
                         </td>
-                        <td className="px-6 py-4 text-sm !text-white/70">
+                        <td className="text-fm-secondary! px-6 py-4 text-sm">
                           Stroke color of the icon
                         </td>
                       </tr>
-                      <tr className="border-b border-white/5 !bg-black/10">
-                        <td className="px-6 py-4 font-mono text-sm !text-blue-300">
+                      <tr className="border-fm-divider-tertiary bg-fm-surface-secondary! border-b">
+                        <td className="text-fm-icon-info! px-6 py-4 font-mono text-sm">
                           className
                         </td>
-                        <td className="px-6 py-4 text-sm !text-white/70">
+                        <td className="text-fm-secondary! px-6 py-4 text-sm">
                           string
                         </td>
-                        <td className="px-6 py-4 text-sm !text-white/50">-</td>
-                        <td className="px-6 py-4 text-sm !text-white/70">
+                        <td className="text-fm-placeholder! px-6 py-4 text-sm">
+                          -
+                        </td>
+                        <td className="text-fm-secondary! px-6 py-4 text-sm">
                           CSS classes for styling (use for overrides)
                         </td>
                       </tr>
-                      <tr className="border-b border-white/5">
-                        <td className="px-6 py-4 font-mono text-sm !text-blue-300">
+                      <tr className="border-fm-divider-tertiary border-b">
+                        <td className="text-fm-icon-info! px-6 py-4 font-mono text-sm">
                           strokeWidth
                         </td>
-                        <td className="px-6 py-4 text-sm !text-white/70">
+                        <td className="text-fm-secondary! px-6 py-4 text-sm">
                           number | string
                         </td>
-                        <td className="px-6 py-4 text-sm !text-white/50">
+                        <td className="text-fm-placeholder! px-6 py-4 text-sm">
                           1.5
                         </td>
-                        <td className="px-6 py-4 text-sm !text-white/70">
+                        <td className="text-fm-secondary! px-6 py-4 text-sm">
                           Stroke width of the command symbol
                         </td>
                       </tr>
-                      <tr className="!bg-black/10">
-                        <td className="px-6 py-4 font-mono text-sm !text-blue-300">
+                      <tr className="bg-fm-surface-secondary!">
+                        <td className="text-fm-icon-info! px-6 py-4 font-mono text-sm">
                           ...svgProps
                         </td>
-                        <td className="px-6 py-4 text-sm !text-white/70">
+                        <td className="text-fm-secondary! px-6 py-4 text-sm">
                           SVGProps
                         </td>
-                        <td className="px-6 py-4 text-sm !text-white/50">-</td>
-                        <td className="px-6 py-4 text-sm !text-white/70">
+                        <td className="text-fm-placeholder! px-6 py-4 text-sm">
+                          -
+                        </td>
+                        <td className="text-fm-secondary! px-6 py-4 text-sm">
                           All standard SVG element props
                         </td>
                       </tr>
@@ -288,50 +298,62 @@ function ShortcutHint() {
 
               {/* Size Variations */}
               <div className="!space-y-8">
-                <h2 className="text-center text-3xl font-bold !text-white">
+                <h2 className="text-fm-icon-active! text-center text-3xl font-bold">
                   Size Variations
                 </h2>
-                <div className="rounded-lg border border-white/10 bg-white/5 p-8">
+                <div className="border-fm-divider-secondary bg-fm-surface-secondary rounded-lg border p-8">
                   <div className="!space-y-6">
                     <div className="grid grid-cols-1 gap-8 md:grid-cols-2">
                       <div className="!space-y-4">
-                        <h3 className="text-lg font-semibold !text-blue-300">
+                        <h3 className="text-fm-icon-info! text-lg font-semibold">
                           Standard Sizes
                         </h3>
-                        <div className="flex items-end gap-6 rounded-lg bg-black/20 p-6">
+                        <div className="bg-fm-surface-secondary flex items-end gap-6 rounded-lg p-6">
                           <div className="text-center">
-                            <CommandIcon className="!mx-auto mb-2 h-3 w-3 text-blue-400" />
-                            <span className="text-xs text-white/60">12px</span>
+                            <CommandIcon className="text-fm-icon-info !mx-auto mb-2 h-3 w-3" />
+                            <span className="text-fm-tertiary text-xs">
+                              12px
+                            </span>
                           </div>
                           <div className="text-center">
-                            <CommandIcon className="!mx-auto mb-2 h-4 w-4 text-blue-400" />
-                            <span className="text-xs text-white/60">16px</span>
+                            <CommandIcon className="text-fm-icon-info !mx-auto mb-2 h-4 w-4" />
+                            <span className="text-fm-tertiary text-xs">
+                              16px
+                            </span>
                           </div>
                           <div className="text-center">
-                            <CommandIcon className="!mx-auto mb-2 h-5 w-5 text-blue-400" />
-                            <span className="text-xs text-white/60">20px</span>
+                            <CommandIcon className="text-fm-icon-info !mx-auto mb-2 h-5 w-5" />
+                            <span className="text-fm-tertiary text-xs">
+                              20px
+                            </span>
                           </div>
                           <div className="text-center">
-                            <CommandIcon className="!mx-auto mb-2 h-6 w-6 text-blue-400" />
-                            <span className="text-xs text-white/60">24px</span>
+                            <CommandIcon className="text-fm-icon-info !mx-auto mb-2 h-6 w-6" />
+                            <span className="text-fm-tertiary text-xs">
+                              24px
+                            </span>
                           </div>
                           <div className="text-center">
-                            <CommandIcon className="!mx-auto mb-2 h-8 w-8 text-blue-400" />
-                            <span className="text-xs text-white/60">32px</span>
+                            <CommandIcon className="text-fm-icon-info !mx-auto mb-2 h-8 w-8" />
+                            <span className="text-fm-tertiary text-xs">
+                              32px
+                            </span>
                           </div>
                           <div className="text-center">
-                            <CommandIcon className="!mx-auto mb-2 h-12 w-12 text-blue-400" />
-                            <span className="text-xs text-white/60">48px</span>
+                            <CommandIcon className="text-fm-icon-info !mx-auto mb-2 h-12 w-12" />
+                            <span className="text-fm-tertiary text-xs">
+                              48px
+                            </span>
                           </div>
                         </div>
                       </div>
 
                       <div className="!space-y-4">
-                        <h3 className="text-lg font-semibold !text-blue-300">
+                        <h3 className="text-fm-icon-info! text-lg font-semibold">
                           Code Example
                         </h3>
-                        <div className="rounded-lg bg-black/40 p-4">
-                          <pre className="overflow-x-auto text-sm !text-cyan-300">
+                        <div className="bg-fm-surface-secondary rounded-lg p-4">
+                          <pre className="text-fm-icon-info! overflow-x-auto text-sm">
                             {`// Small (16px)
 <CommandIcon className="h-4 w-4 " />
 
@@ -353,56 +375,56 @@ function ShortcutHint() {
 
               {/* Color Variations */}
               <div className="!space-y-8">
-                <h2 className="text-center text-3xl font-bold !text-white">
+                <h2 className="text-fm-icon-active! text-center text-3xl font-bold">
                   Color Variations
                 </h2>
                 <div className="grid grid-cols-1 gap-8 lg:grid-cols-2">
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-blue-300">
+                    <h3 className="text-fm-icon-info! text-lg font-semibold">
                       Semantic Colors
                     </h3>
-                    <div className="!space-y-4 rounded-lg border border-white/10 bg-white/5 p-6">
+                    <div className="border-fm-divider-secondary bg-fm-surface-secondary !space-y-4 rounded-lg border p-6">
                       <div className="flex items-center gap-4">
-                        <CommandIcon className="h-6 w-6 text-blue-400" />
+                        <CommandIcon className="text-fm-icon-info h-6 w-6" />
                         <div>
-                          <div className="text-sm font-medium text-white">
+                          <div className="text-fm-icon-active text-sm font-medium">
                             Primary
                           </div>
-                          <div className="text-xs text-white/60">
-                            text-blue-400
+                          <div className="text-fm-tertiary text-xs">
+                            text-fm-icon-info
                           </div>
                         </div>
                       </div>
                       <div className="flex items-center gap-4">
-                        <CommandIcon className="h-6 w-6 text-gray-400" />
+                        <CommandIcon className="text-fm-placeholder h-6 w-6" />
                         <div>
-                          <div className="text-sm font-medium text-white">
+                          <div className="text-fm-icon-active text-sm font-medium">
                             Secondary
                           </div>
-                          <div className="text-xs text-white/60">
-                            text-gray-400
+                          <div className="text-fm-tertiary text-xs">
+                            text-fm-placeholder
                           </div>
                         </div>
                       </div>
                       <div className="flex items-center gap-4">
-                        <CommandIcon className="h-6 w-6 text-cyan-400" />
+                        <CommandIcon className="text-fm-icon-info h-6 w-6" />
                         <div>
-                          <div className="text-sm font-medium text-white">
+                          <div className="text-fm-icon-active text-sm font-medium">
                             Accent
                           </div>
-                          <div className="text-xs text-white/60">
-                            text-cyan-400
+                          <div className="text-fm-tertiary text-xs">
+                            text-fm-icon-info
                           </div>
                         </div>
                       </div>
                       <div className="flex items-center gap-4">
-                        <CommandIcon className="h-6 w-6 text-white/40" />
+                        <CommandIcon className="text-fm-placeholder h-6 w-6" />
                         <div>
-                          <div className="text-sm font-medium text-white">
+                          <div className="text-fm-icon-active text-sm font-medium">
                             Disabled
                           </div>
-                          <div className="text-xs text-white/60">
-                            text-white/40
+                          <div className="text-fm-tertiary text-xs">
+                            text-fm-placeholder
                           </div>
                         </div>
                       </div>
@@ -410,11 +432,11 @@ function ShortcutHint() {
                   </div>
 
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-blue-300">
+                    <h3 className="text-fm-icon-info! text-lg font-semibold">
                       Custom Colors
                     </h3>
-                    <div className="rounded-lg bg-black/40 p-4">
-                      <pre className="overflow-x-auto text-sm !text-green-300">
+                    <div className="bg-fm-surface-secondary rounded-lg p-4">
+                      <pre className="text-fm-icon-positive! overflow-x-auto text-sm">
                         {`// Using Tailwind classes with 
 <CommandIcon className="h-6 w-6 text-blue-400 " />
 <CommandIcon className="h-6 w-6 text-cyan-500 " />
@@ -439,59 +461,63 @@ function ShortcutHint() {
 
               {/* Usage Examples */}
               <div className="!space-y-8">
-                <h2 className="text-center text-3xl font-bold !text-white">
+                <h2 className="text-fm-icon-active! text-center text-3xl font-bold">
                   Usage Examples
                 </h2>
 
                 <div className="grid grid-cols-1 gap-8 lg:grid-cols-2">
                   {/* Keyboard Shortcuts */}
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-blue-300">
+                    <h3 className="text-fm-icon-info! text-lg font-semibold">
                       Keyboard Shortcuts
                     </h3>
                     <div className="!space-y-4">
-                      <div className="rounded-lg border border-white/10 bg-white/5 p-4">
+                      <div className="border-fm-divider-secondary bg-fm-surface-secondary rounded-lg border p-4">
                         <div className="space-y-3">
                           <div className="flex items-center justify-between">
-                            <span className="text-white">Quick Search</span>
+                            <span className="text-fm-icon-active">
+                              Quick Search
+                            </span>
                             <div className="flex items-center gap-1">
-                              <kbd className="flex h-6 w-6 items-center justify-center rounded border border-white/20 bg-white/10 text-xs">
-                                <CommandIcon className="h-3 w-3 text-white/70" />
+                              <kbd className="border-fm-divider-primary bg-fm-surface-secondary flex h-6 w-6 items-center justify-center rounded border text-xs">
+                                <CommandIcon className="text-fm-secondary h-3 w-3" />
                               </kbd>
-                              <span className="text-white/60">+</span>
-                              <kbd className="flex h-6 w-6 items-center justify-center rounded border border-white/20 bg-white/10 text-xs text-white/70">
+                              <span className="text-fm-tertiary">+</span>
+                              <kbd className="border-fm-divider-primary bg-fm-surface-secondary text-fm-secondary flex h-6 w-6 items-center justify-center rounded border text-xs">
                                 K
                               </kbd>
                             </div>
                           </div>
                           <div className="flex items-center justify-between">
-                            <span className="text-white">New File</span>
+                            <span className="text-fm-icon-active">
+                              New File
+                            </span>
                             <div className="flex items-center gap-1">
-                              <kbd className="flex h-6 w-6 items-center justify-center rounded border border-white/20 bg-white/10 text-xs">
-                                <CommandIcon className="h-3 w-3 text-white/70" />
+                              <kbd className="border-fm-divider-primary bg-fm-surface-secondary flex h-6 w-6 items-center justify-center rounded border text-xs">
+                                <CommandIcon className="text-fm-secondary h-3 w-3" />
                               </kbd>
-                              <span className="text-white/60">+</span>
-                              <kbd className="flex h-6 w-6 items-center justify-center rounded border border-white/20 bg-white/10 text-xs text-white/70">
+                              <span className="text-fm-tertiary">+</span>
+                              <kbd className="border-fm-divider-primary bg-fm-surface-secondary text-fm-secondary flex h-6 w-6 items-center justify-center rounded border text-xs">
                                 N
                               </kbd>
                             </div>
                           </div>
                           <div className="flex items-center justify-between">
-                            <span className="text-white">Save</span>
+                            <span className="text-fm-icon-active">Save</span>
                             <div className="flex items-center gap-1">
-                              <kbd className="flex h-6 w-6 items-center justify-center rounded border border-white/20 bg-white/10 text-xs">
-                                <CommandIcon className="h-3 w-3 text-white/70" />
+                              <kbd className="border-fm-divider-primary bg-fm-surface-secondary flex h-6 w-6 items-center justify-center rounded border text-xs">
+                                <CommandIcon className="text-fm-secondary h-3 w-3" />
                               </kbd>
-                              <span className="text-white/60">+</span>
-                              <kbd className="flex h-6 w-6 items-center justify-center rounded border border-white/20 bg-white/10 text-xs text-white/70">
+                              <span className="text-fm-tertiary">+</span>
+                              <kbd className="border-fm-divider-primary bg-fm-surface-secondary text-fm-secondary flex h-6 w-6 items-center justify-center rounded border text-xs">
                                 S
                               </kbd>
                             </div>
                           </div>
                         </div>
                       </div>
-                      <div className="rounded-lg bg-black/40 p-4">
-                        <pre className="overflow-x-auto text-sm !text-green-300">
+                      <div className="bg-fm-surface-secondary rounded-lg p-4">
+                        <pre className="text-fm-icon-positive! overflow-x-auto text-sm">
                           {`// Keyboard shortcut display
 <div className="flex items-center gap-1">
   <kbd className="flex h-6 w-6 items-center justify-center rounded border border-white/20 bg-white/10">
@@ -515,40 +541,44 @@ function ShortcutHint() {
 
                   {/* Command Palette */}
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-blue-300">
+                    <h3 className="text-fm-icon-info! text-lg font-semibold">
                       Command Palette
                     </h3>
                     <div className="!space-y-4">
-                      <div className="rounded-lg border border-white/10 bg-white/5 p-4">
+                      <div className="border-fm-divider-secondary bg-fm-surface-secondary rounded-lg border p-4">
                         <div className="space-y-3">
-                          <div className="flex items-center gap-3 border-b border-white/10 pb-3">
-                            <CommandIcon className="h-5 w-5 text-blue-400" />
+                          <div className="border-fm-divider-secondary flex items-center gap-3 border-b pb-3">
+                            <CommandIcon className="text-fm-icon-info h-5 w-5" />
                             <input
                               type="text"
                               placeholder="Type a command..."
-                              className="flex-1 bg-transparent text-white placeholder-white/50 focus:outline-none"
+                              className="text-fm-icon-active flex-1 bg-transparent placeholder-white/50 focus:outline-none"
                             />
                           </div>
                           <div className="space-y-1">
-                            <div className="flex items-center gap-3 rounded px-2 py-1 hover:bg-white/10">
-                              <CommandIcon className="h-4 w-4 text-white/60" />
-                              <span className="text-white">
+                            <div className="hover:bg-fm-surface-secondary flex items-center gap-3 rounded px-2 py-1">
+                              <CommandIcon className="text-fm-tertiary h-4 w-4" />
+                              <span className="text-fm-icon-active">
                                 Create new file
                               </span>
                             </div>
-                            <div className="flex items-center gap-3 rounded px-2 py-1 hover:bg-white/10">
-                              <CommandIcon className="h-4 w-4 text-white/60" />
-                              <span className="text-white">Open recent</span>
+                            <div className="hover:bg-fm-surface-secondary flex items-center gap-3 rounded px-2 py-1">
+                              <CommandIcon className="text-fm-tertiary h-4 w-4" />
+                              <span className="text-fm-icon-active">
+                                Open recent
+                              </span>
                             </div>
-                            <div className="flex items-center gap-3 rounded px-2 py-1 hover:bg-white/10">
-                              <CommandIcon className="h-4 w-4 text-white/60" />
-                              <span className="text-white">Toggle sidebar</span>
+                            <div className="hover:bg-fm-surface-secondary flex items-center gap-3 rounded px-2 py-1">
+                              <CommandIcon className="text-fm-tertiary h-4 w-4" />
+                              <span className="text-fm-icon-active">
+                                Toggle sidebar
+                              </span>
                             </div>
                           </div>
                         </div>
                       </div>
-                      <div className="rounded-lg bg-black/40 p-4">
-                        <pre className="overflow-x-auto text-sm !text-green-300">
+                      <div className="bg-fm-surface-secondary rounded-lg p-4">
+                        <pre className="text-fm-icon-positive! overflow-x-auto text-sm">
                           {`// Command palette header
 <div className="flex items-center gap-3 border-b border-white/10 pb-3">
   <CommandIcon className="h-5 w-5 text-blue-400 " />
@@ -571,22 +601,22 @@ function ShortcutHint() {
 
                   {/* Button Integration */}
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-blue-300">
+                    <h3 className="text-fm-icon-info! text-lg font-semibold">
                       Button Integration
                     </h3>
                     <div className="!space-y-4">
                       <div className="flex gap-4">
-                        <button className="flex items-center gap-2 rounded-lg border border-blue-500/30 bg-blue-500/20 px-4 py-2 text-blue-200 transition-colors hover:bg-blue-500/30">
+                        <button className="border-fm-icon-info/30 bg-fm-icon-info/20 text-fm-icon-info hover:bg-fm-icon-info/30 flex items-center gap-2 rounded-lg border px-4 py-2 transition-colors">
                           <CommandIcon className="h-4 w-4" />
                           Open Command Menu
                         </button>
-                        <button className="flex items-center gap-2 rounded-lg border border-gray-500/30 bg-gray-500/20 px-4 py-2 text-gray-200 transition-colors hover:bg-gray-500/30">
+                        <button className="border-fm-divider-primary bg-fm-surface-tertiary/20 text-fm-secondary hover:bg-fm-surface-tertiary/30 flex items-center gap-2 rounded-lg border px-4 py-2 transition-colors">
                           <CommandIcon className="h-4 w-4" />
                           Shortcuts
                         </button>
                       </div>
-                      <div className="rounded-lg bg-black/40 p-4">
-                        <pre className="overflow-x-auto text-sm !text-green-300">
+                      <div className="bg-fm-surface-secondary rounded-lg p-4">
+                        <pre className="text-fm-icon-positive! overflow-x-auto text-sm">
                           {`// Command menu button
 <button className="flex items-center gap-2 bg-blue-500/20 border border-blue-500/30 px-4 py-2 rounded-lg">
   <CommandIcon className="h-4 w-4 " />
@@ -605,25 +635,25 @@ function ShortcutHint() {
 
                   {/* Help Documentation */}
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-blue-300">
+                    <h3 className="text-fm-icon-info! text-lg font-semibold">
                       Help Documentation
                     </h3>
                     <div className="!space-y-4">
-                      <div className="rounded-lg border border-white/10 bg-white/5 p-4">
+                      <div className="border-fm-divider-secondary bg-fm-surface-secondary rounded-lg border p-4">
                         <div className="space-y-4">
                           <div className="flex items-start gap-3">
-                            <CommandIcon className="mt-0.5 h-5 w-5 flex-shrink-0 text-blue-400" />
+                            <CommandIcon className="text-fm-icon-info mt-0.5 h-5 w-5 flex-shrink-0" />
                             <div>
-                              <h4 className="font-medium !text-white">
+                              <h4 className="text-fm-icon-active! font-medium">
                                 Power User Tips
                               </h4>
-                              <p className="text-sm !text-white/70">
+                              <p className="text-fm-secondary! text-sm">
                                 Use Command key combinations to navigate faster
                                 and boost your productivity.
                               </p>
                             </div>
                           </div>
-                          <div className="ml-8 space-y-2 text-sm text-white/60">
+                          <div className="text-fm-tertiary ml-8 space-y-2 text-sm">
                             <div>
                               <CommandIcon className="mr-2 inline h-3 w-3" />+
                               K: Quick search
@@ -639,8 +669,8 @@ function ShortcutHint() {
                           </div>
                         </div>
                       </div>
-                      <div className="rounded-lg bg-black/40 p-4">
-                        <pre className="overflow-x-auto text-sm !text-green-300">
+                      <div className="bg-fm-surface-secondary rounded-lg p-4">
+                        <pre className="text-fm-icon-positive! overflow-x-auto text-sm">
                           {`// Help section with command icon
 <div className="flex items-start gap-3">
   <CommandIcon className="mt-0.5 h-5 w-5 flex-shrink-0 text-blue-400 " />
@@ -666,64 +696,64 @@ function ShortcutHint() {
 
               {/* Accessibility */}
               <div className="!space-y-8">
-                <h2 className="text-center text-3xl font-bold !text-white">
+                <h2 className="text-fm-icon-active! text-center text-3xl font-bold">
                   Accessibility Features
                 </h2>
                 <div className="grid grid-cols-1 gap-8 md:grid-cols-2">
-                  <div className="!space-y-4 rounded-lg border border-white/10 bg-white/5 p-6">
-                    <h3 className="text-lg font-semibold !text-green-300">
+                  <div className="border-fm-divider-secondary bg-fm-surface-secondary !space-y-4 rounded-lg border p-6">
+                    <h3 className="text-fm-icon-positive! text-lg font-semibold">
                       ✅ Built-in Features
                     </h3>
-                    <ul className="!space-y-2 text-sm !text-white/70">
-                      <li className="!text-white/70">
+                    <ul className="text-fm-secondary! !space-y-2 text-sm">
+                      <li className="text-fm-secondary!">
                         Uses Radix UI AccessibleIcon wrapper
                       </li>
-                      <li className="!text-white/70">
+                      <li className="text-fm-secondary!">
                         Provides screen reader label "Command icon"
                       </li>
-                      <li className="!text-white/70">
+                      <li className="text-fm-secondary!">
                         Supports keyboard navigation when interactive
                       </li>
-                      <li className="!text-white/70">
+                      <li className="text-fm-secondary!">
                         Maintains proper color contrast ratios
                       </li>
-                      <li className="!text-white/70">
+                      <li className="text-fm-secondary!">
                         Scales with user's font size preferences
                       </li>
                     </ul>
                   </div>
 
-                  <div className="!space-y-4 rounded-lg border border-white/10 bg-white/5 p-6">
-                    <h3 className="text-lg font-semibold !text-blue-300">
+                  <div className="border-fm-divider-secondary bg-fm-surface-secondary !space-y-4 rounded-lg border p-6">
+                    <h3 className="text-fm-icon-info! text-lg font-semibold">
                       💡 Best Practices
                     </h3>
-                    <ul className="!space-y-2 text-sm text-white/70">
-                      <li className="!text-white/70">
+                    <ul className="text-fm-secondary !space-y-2 text-sm">
+                      <li className="text-fm-secondary!">
                         Always pair with descriptive text or alt text
                       </li>
-                      <li className="!text-white/70">
+                      <li className="text-fm-secondary!">
                         Use consistent shortcut patterns across your app
                       </li>
-                      <li className="!text-white/70">
+                      <li className="text-fm-secondary!">
                         Provide alternative navigation methods
                       </li>
-                      <li className="!text-white/70">
+                      <li className="text-fm-secondary!">
                         Add focus states for interactive elements
                       </li>
-                      <li className="!text-white/70">
+                      <li className="text-fm-secondary!">
                         Consider screen reader announcements for shortcuts
                       </li>
                     </ul>
                   </div>
                 </div>
 
-                <div className="rounded-lg border border-white/10 bg-white/5 p-6">
-                  <h3 className="mb-4 text-lg font-semibold !text-purple-300">
+                <div className="border-fm-divider-secondary bg-fm-surface-secondary rounded-lg border p-6">
+                  <h3 className="text-fm-secondary-600! mb-4 text-lg font-semibold">
                     Proper ARIA Implementation
                   </h3>
                   <div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
-                    <div className="rounded-lg bg-black/40 p-4">
-                      <pre className="overflow-x-auto text-sm !text-cyan-300">
+                    <div className="bg-fm-surface-secondary rounded-lg p-4">
+                      <pre className="text-fm-icon-info! overflow-x-auto text-sm">
                         {`// Keyboard shortcut with proper ARIA
 <button 
   aria-label="Open command palette (Cmd+K)"
@@ -759,13 +789,13 @@ function ShortcutHint() {
                       </pre>
                     </div>
                     <div className="!space-y-4">
-                      <p className="text-sm !text-white/70">
+                      <p className="text-fm-secondary! text-sm">
                         Always provide context-appropriate ARIA labels for
                         command interfaces. The Command icon should indicate
                         keyboard-driven functionality and shortcuts.
                       </p>
-                      <div className="rounded-lg border border-blue-500/20 bg-blue-500/10 p-4">
-                        <div className="flex items-center gap-2 text-sm text-blue-200">
+                      <div className="border-fm-icon-info/20 bg-fm-icon-info/10 rounded-lg border p-4">
+                        <div className="text-fm-icon-info flex items-center gap-2 text-sm">
                           <CommandIcon className="h-4 w-4" />
                           <span>
                             Consider the user's platform (⌘ on Mac, Ctrl on
@@ -780,48 +810,60 @@ function ShortcutHint() {
 
               {/* Related Icons */}
               <div className="!space-y-8">
-                <h2 className="text-center text-3xl font-bold !text-white">
+                <h2 className="text-fm-icon-active! text-center text-3xl font-bold">
                   Related Icons
                 </h2>
                 <div className="grid grid-cols-2 gap-6 md:grid-cols-4">
-                  <div className="!space-y-3 rounded-lg border border-white/10 bg-white/5 p-4 text-center">
-                    <div className="!mx-auto flex h-12 w-12 items-center justify-center rounded-lg bg-purple-500/20">
+                  <div className="border-fm-divider-secondary bg-fm-surface-secondary !space-y-3 rounded-lg border p-4 text-center">
+                    <div className="bg-fm-secondary-500/20 !mx-auto flex h-12 w-12 items-center justify-center rounded-lg">
                       <span className="text-2xl">⌨️</span>
                     </div>
                     <div>
-                      <div className="font-medium text-white">KeyboardIcon</div>
-                      <div className="text-xs text-white/60">
+                      <div className="text-fm-icon-active font-medium">
+                        KeyboardIcon
+                      </div>
+                      <div className="text-fm-tertiary text-xs">
                         Keyboard input
                       </div>
                     </div>
                   </div>
-                  <div className="!space-y-3 rounded-lg border border-white/10 bg-white/5 p-4 text-center">
-                    <div className="!mx-auto flex h-12 w-12 items-center justify-center rounded-lg bg-green-500/20">
+                  <div className="border-fm-divider-secondary bg-fm-surface-secondary !space-y-3 rounded-lg border p-4 text-center">
+                    <div className="bg-fm-icon-positive/20 !mx-auto flex h-12 w-12 items-center justify-center rounded-lg">
                       <span className="text-2xl">🔍</span>
                     </div>
                     <div>
-                      <div className="font-medium text-white">SearchIcon</div>
-                      <div className="text-xs text-white/60">
+                      <div className="text-fm-icon-active font-medium">
+                        SearchIcon
+                      </div>
+                      <div className="text-fm-tertiary text-xs">
                         Search function
                       </div>
                     </div>
                   </div>
-                  <div className="!space-y-3 rounded-lg border border-white/10 bg-white/5 p-4 text-center">
-                    <div className="!mx-auto flex h-12 w-12 items-center justify-center rounded-lg bg-orange-500/20">
+                  <div className="border-fm-divider-secondary bg-fm-surface-secondary !space-y-3 rounded-lg border p-4 text-center">
+                    <div className="bg-fm-icon-warning/20 !mx-auto flex h-12 w-12 items-center justify-center rounded-lg">
                       <span className="text-2xl">⚙️</span>
                     </div>
                     <div>
-                      <div className="font-medium text-white">SettingsIcon</div>
-                      <div className="text-xs text-white/60">Configuration</div>
+                      <div className="text-fm-icon-active font-medium">
+                        SettingsIcon
+                      </div>
+                      <div className="text-fm-tertiary text-xs">
+                        Configuration
+                      </div>
                     </div>
                   </div>
-                  <div className="!space-y-3 rounded-lg border border-white/10 bg-white/5 p-4 text-center">
-                    <div className="!mx-auto flex h-12 w-12 items-center justify-center rounded-lg bg-pink-500/20">
+                  <div className="border-fm-divider-secondary bg-fm-surface-secondary !space-y-3 rounded-lg border p-4 text-center">
+                    <div className="bg-fm-secondary-500/20 !mx-auto flex h-12 w-12 items-center justify-center rounded-lg">
                       <span className="text-2xl">📋</span>
                     </div>
                     <div>
-                      <div className="font-medium text-white">MenuIcon</div>
-                      <div className="text-xs text-white/60">Menu options</div>
+                      <div className="text-fm-icon-active font-medium">
+                        MenuIcon
+                      </div>
+                      <div className="text-fm-tertiary text-xs">
+                        Menu options
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -829,14 +871,14 @@ function ShortcutHint() {
             </div>
 
             {/* Footer */}
-            <div className="border-t border-white/10 bg-black/20 backdrop-blur-xl">
+            <div className="border-fm-divider-secondary bg-fm-surface-secondary border-t backdrop-blur-xl">
               <div className="!mx-auto max-w-7xl px-6 py-8">
                 <div className="!space-y-4 text-center">
-                  <p className="!text-white/60">
+                  <p className="text-fm-tertiary!">
                     CommandIcon is part of the Aural UI icon library, built with
                     accessibility and keyboard navigation in mind.
                   </p>
-                  <p className="text-sm !text-white/40">
+                  <p className="text-fm-placeholder! text-sm">
                     All icons use Radix UI's AccessibleIcon for screen reader
                     compatibility and follow WCAG guidelines.
                   </p>
@@ -885,8 +927,8 @@ const storyParameters = {
   backgrounds: {
     default: "dark",
     values: [
-      { name: "dark", value: "#0a0a0a" },
-      { name: "darker", value: "#000000" },
+      { name: "dark", value: "var(--color-fm-surface-primary)" },
+      { name: "darker", value: "var(--color-fm-neutral-0)" },
     ],
   },
 }
@@ -895,12 +937,12 @@ export const Default: Story = {
   args: {
     width: 24,
     height: 24,
-    className: "text-blue-400 ",
+    className: "text-fm-icon-info ",
     withAccessibility: true,
   },
   parameters: storyParameters,
   render: (args) => (
-    <div className="flex h-32 min-h-dvh items-center justify-center rounded-lg bg-gradient-to-br from-gray-900 to-gray-800">
+    <div className="from-fm-surface-primary to-fm-surface-secondary flex h-32 min-h-dvh items-center justify-center rounded-lg bg-linear-to-br">
       <CommandIcon {...args} />
     </div>
   ),
@@ -917,30 +959,30 @@ export const SizeVariations: Story = {
     },
   },
   render: () => (
-    <div className="flex h-64 min-h-dvh items-center justify-center gap-8 rounded-lg bg-gradient-to-br from-gray-900 to-gray-800 p-8">
+    <div className="from-fm-surface-primary to-fm-surface-secondary flex h-64 min-h-dvh items-center justify-center gap-8 rounded-lg bg-linear-to-br p-8">
       <div className="text-center">
-        <CommandIcon className="!mx-auto mb-2 h-3 w-3 text-blue-400" />
-        <span className="text-xs text-white/60">12px</span>
+        <CommandIcon className="text-fm-icon-info !mx-auto mb-2 h-3 w-3" />
+        <span className="text-fm-tertiary text-xs">12px</span>
       </div>
       <div className="text-center">
-        <CommandIcon className="!mx-auto mb-2 h-4 w-4 text-blue-400" />
-        <span className="text-xs text-white/60">16px</span>
+        <CommandIcon className="text-fm-icon-info !mx-auto mb-2 h-4 w-4" />
+        <span className="text-fm-tertiary text-xs">16px</span>
       </div>
       <div className="text-center">
-        <CommandIcon className="!mx-auto mb-2 h-5 w-5 text-blue-400" />
-        <span className="text-xs text-white/60">20px</span>
+        <CommandIcon className="text-fm-icon-info !mx-auto mb-2 h-5 w-5" />
+        <span className="text-fm-tertiary text-xs">20px</span>
       </div>
       <div className="text-center">
-        <CommandIcon className="!mx-auto mb-2 h-6 w-6 text-blue-400" />
-        <span className="text-xs text-white/60">24px</span>
+        <CommandIcon className="text-fm-icon-info !mx-auto mb-2 h-6 w-6" />
+        <span className="text-fm-tertiary text-xs">24px</span>
       </div>
       <div className="text-center">
-        <CommandIcon className="!mx-auto mb-2 h-8 w-8 text-blue-400" />
-        <span className="text-xs text-white/60">32px</span>
+        <CommandIcon className="text-fm-icon-info !mx-auto mb-2 h-8 w-8" />
+        <span className="text-fm-tertiary text-xs">32px</span>
       </div>
       <div className="text-center">
-        <CommandIcon className="!mx-auto mb-2 h-12 w-12 text-blue-400" />
-        <span className="text-xs text-white/60">48px</span>
+        <CommandIcon className="text-fm-icon-info !mx-auto mb-2 h-12 w-12" />
+        <span className="text-fm-tertiary text-xs">48px</span>
       </div>
     </div>
   ),
@@ -957,34 +999,34 @@ export const ColorVariations: Story = {
     },
   },
   render: () => (
-    <div className="grid min-h-dvh grid-cols-2 items-center justify-center gap-6 rounded-lg bg-gradient-to-br from-gray-900 to-gray-800 p-8 md:grid-cols-4">
+    <div className="from-fm-surface-primary to-fm-surface-secondary grid min-h-dvh grid-cols-2 items-center justify-center gap-6 rounded-lg bg-linear-to-br p-8 md:grid-cols-4">
       <div className="text-center">
-        <div className="!mx-auto mb-3 flex h-16 w-16 items-center justify-center rounded-lg border border-blue-500/30 bg-blue-500/20">
-          <CommandIcon className="h-8 w-8 text-blue-400" />
+        <div className="border-fm-icon-info/30 bg-fm-icon-info/20 !mx-auto mb-3 flex h-16 w-16 items-center justify-center rounded-lg border">
+          <CommandIcon className="text-fm-icon-info h-8 w-8" />
         </div>
-        <div className="text-sm font-medium text-white">Primary</div>
-        <div className="text-xs text-blue-400">text-blue-400</div>
+        <div className="text-fm-icon-active text-sm font-medium">Primary</div>
+        <div className="text-fm-icon-info text-xs">text-fm-icon-info</div>
       </div>
       <div className="text-center">
-        <div className="!mx-auto mb-3 flex h-16 w-16 items-center justify-center rounded-lg border border-gray-500/30 bg-gray-500/20">
-          <CommandIcon className="h-8 w-8 text-gray-400" />
+        <div className="border-fm-divider-primary bg-fm-surface-tertiary/20 !mx-auto mb-3 flex h-16 w-16 items-center justify-center rounded-lg border">
+          <CommandIcon className="text-fm-placeholder h-8 w-8" />
         </div>
-        <div className="text-sm font-medium text-white">Secondary</div>
-        <div className="text-xs text-gray-400">text-gray-400</div>
+        <div className="text-fm-icon-active text-sm font-medium">Secondary</div>
+        <div className="text-fm-placeholder text-xs">text-fm-placeholder</div>
       </div>
       <div className="text-center">
-        <div className="!mx-auto mb-3 flex h-16 w-16 items-center justify-center rounded-lg border border-cyan-500/30 bg-cyan-500/20">
-          <CommandIcon className="h-8 w-8 text-cyan-400" />
+        <div className="border-fm-icon-info/30 bg-fm-icon-info/20 !mx-auto mb-3 flex h-16 w-16 items-center justify-center rounded-lg border">
+          <CommandIcon className="text-fm-icon-info h-8 w-8" />
         </div>
-        <div className="text-sm font-medium text-white">Accent</div>
-        <div className="text-xs text-cyan-400">text-cyan-400</div>
+        <div className="text-fm-icon-active text-sm font-medium">Accent</div>
+        <div className="text-fm-icon-info text-xs">text-fm-icon-info</div>
       </div>
       <div className="text-center">
-        <div className="!mx-auto mb-3 flex h-16 w-16 items-center justify-center rounded-lg border border-white/10 bg-white/5">
-          <CommandIcon className="h-8 w-8 text-white/40" />
+        <div className="border-fm-divider-secondary bg-fm-surface-secondary !mx-auto mb-3 flex h-16 w-16 items-center justify-center rounded-lg border">
+          <CommandIcon className="text-fm-placeholder h-8 w-8" />
         </div>
-        <div className="text-sm font-medium text-white">Disabled</div>
-        <div className="text-xs text-white/40">text-white/40</div>
+        <div className="text-fm-icon-active text-sm font-medium">Disabled</div>
+        <div className="text-fm-placeholder text-xs">text-fm-placeholder</div>
       </div>
     </div>
   ),
@@ -1001,32 +1043,34 @@ export const UsageExamples: Story = {
     },
   },
   render: () => (
-    <div className="min-h-dvh !space-y-8 rounded-lg bg-gradient-to-br from-gray-900 to-gray-800 p-8">
+    <div className="from-fm-surface-primary to-fm-surface-secondary min-h-dvh !space-y-8 rounded-lg bg-linear-to-br p-8">
       {/* Keyboard Shortcuts */}
       <div className="!space-y-2">
-        <h3 className="text-sm font-medium text-white">Keyboard Shortcuts</h3>
-        <div className="rounded-lg border border-white/10 bg-white/5 p-4">
+        <h3 className="text-fm-icon-active text-sm font-medium">
+          Keyboard Shortcuts
+        </h3>
+        <div className="border-fm-divider-secondary bg-fm-surface-secondary rounded-lg border p-4">
           <div className="space-y-3">
             <div className="flex items-center justify-between">
-              <span className="text-white">Quick Search</span>
+              <span className="text-fm-icon-active">Quick Search</span>
               <div className="flex items-center gap-1">
-                <kbd className="flex h-6 w-6 items-center justify-center rounded border border-white/20 bg-white/10 text-xs">
-                  <CommandIcon className="h-3 w-3 text-white/70" />
+                <kbd className="border-fm-divider-primary bg-fm-surface-secondary flex h-6 w-6 items-center justify-center rounded border text-xs">
+                  <CommandIcon className="text-fm-secondary h-3 w-3" />
                 </kbd>
-                <span className="text-white/60">+</span>
-                <kbd className="flex h-6 w-6 items-center justify-center rounded border border-white/20 bg-white/10 text-xs text-white/70">
+                <span className="text-fm-tertiary">+</span>
+                <kbd className="border-fm-divider-primary bg-fm-surface-secondary text-fm-secondary flex h-6 w-6 items-center justify-center rounded border text-xs">
                   K
                 </kbd>
               </div>
             </div>
             <div className="flex items-center justify-between">
-              <span className="text-white">New File</span>
+              <span className="text-fm-icon-active">New File</span>
               <div className="flex items-center gap-1">
-                <kbd className="flex h-6 w-6 items-center justify-center rounded border border-white/20 bg-white/10 text-xs">
-                  <CommandIcon className="h-3 w-3 text-white/70" />
+                <kbd className="border-fm-divider-primary bg-fm-surface-secondary flex h-6 w-6 items-center justify-center rounded border text-xs">
+                  <CommandIcon className="text-fm-secondary h-3 w-3" />
                 </kbd>
-                <span className="text-white/60">+</span>
-                <kbd className="flex h-6 w-6 items-center justify-center rounded border border-white/20 bg-white/10 text-xs text-white/70">
+                <span className="text-fm-tertiary">+</span>
+                <kbd className="border-fm-divider-primary bg-fm-surface-secondary text-fm-secondary flex h-6 w-6 items-center justify-center rounded border text-xs">
                   N
                 </kbd>
               </div>
@@ -1037,25 +1081,27 @@ export const UsageExamples: Story = {
 
       {/* Command Palette */}
       <div className="!space-y-2">
-        <h3 className="text-sm font-medium text-white">Command Palette</h3>
-        <div className="rounded-lg border border-white/10 bg-white/5 p-4">
+        <h3 className="text-fm-icon-active text-sm font-medium">
+          Command Palette
+        </h3>
+        <div className="border-fm-divider-secondary bg-fm-surface-secondary rounded-lg border p-4">
           <div className="space-y-3">
-            <div className="flex items-center gap-3 border-b border-white/10 pb-3">
-              <CommandIcon className="h-5 w-5 text-blue-400" />
+            <div className="border-fm-divider-secondary flex items-center gap-3 border-b pb-3">
+              <CommandIcon className="text-fm-icon-info h-5 w-5" />
               <input
                 type="text"
                 placeholder="Type a command..."
-                className="flex-1 bg-transparent text-white placeholder-white/50 focus:outline-none"
+                className="text-fm-icon-active flex-1 bg-transparent placeholder-white/50 focus:outline-none"
               />
             </div>
             <div className="space-y-1">
-              <div className="flex items-center gap-3 rounded px-2 py-1 hover:bg-white/10">
-                <CommandIcon className="h-4 w-4 text-white/60" />
-                <span className="text-white">Create new file</span>
+              <div className="hover:bg-fm-surface-secondary flex items-center gap-3 rounded px-2 py-1">
+                <CommandIcon className="text-fm-tertiary h-4 w-4" />
+                <span className="text-fm-icon-active">Create new file</span>
               </div>
-              <div className="flex items-center gap-3 rounded px-2 py-1 hover:bg-white/10">
-                <CommandIcon className="h-4 w-4 text-white/60" />
-                <span className="text-white">Toggle sidebar</span>
+              <div className="hover:bg-fm-surface-secondary flex items-center gap-3 rounded px-2 py-1">
+                <CommandIcon className="text-fm-tertiary h-4 w-4" />
+                <span className="text-fm-icon-active">Toggle sidebar</span>
               </div>
             </div>
           </div>
@@ -1064,13 +1110,15 @@ export const UsageExamples: Story = {
 
       {/* Button Integration */}
       <div className="!space-y-2">
-        <h3 className="text-sm font-medium text-white">Button Integration</h3>
+        <h3 className="text-fm-icon-active text-sm font-medium">
+          Button Integration
+        </h3>
         <div className="flex gap-4">
-          <button className="flex items-center gap-2 rounded-lg border border-blue-500/30 bg-blue-500/20 px-4 py-2 text-blue-200 transition-colors hover:bg-blue-500/30">
+          <button className="border-fm-icon-info/30 bg-fm-icon-info/20 text-fm-icon-info hover:bg-fm-icon-info/30 flex items-center gap-2 rounded-lg border px-4 py-2 transition-colors">
             <CommandIcon className="h-4 w-4" />
             Open Command Menu
           </button>
-          <button className="flex items-center gap-2 rounded-lg border border-gray-500/30 bg-gray-500/20 px-4 py-2 text-gray-200 transition-colors hover:bg-gray-500/30">
+          <button className="border-fm-divider-primary bg-fm-surface-tertiary/20 text-fm-secondary hover:bg-fm-surface-tertiary/30 flex items-center gap-2 rounded-lg border px-4 py-2 transition-colors">
             <CommandIcon className="h-4 w-4" />
             Shortcuts
           </button>
@@ -1093,12 +1141,12 @@ export const Playground: Story = {
   args: {
     width: 32,
     height: 32,
-    className: "text-blue-400 ",
+    className: "text-fm-icon-info ",
     strokeWidth: 1.5,
   },
   render: (args) => (
-    <div className="flex h-64 min-h-dvh items-center justify-center rounded-lg bg-gradient-to-br from-gray-900 to-gray-800">
-      <div className="rounded-lg border border-white/10 bg-white/5 p-8">
+    <div className="from-fm-surface-primary to-fm-surface-secondary flex h-64 min-h-dvh items-center justify-center rounded-lg bg-linear-to-br">
+      <div className="border-fm-divider-secondary bg-fm-surface-secondary rounded-lg border p-8">
         <CommandIcon {...args} />
       </div>
     </div>