aural-ui 3.0.7 → 4.0.1

package/dist/icons/expand-icon/ExpandIcon.stories.tsx

@@ -11,9 +11,9 @@ const meta: Meta<typeof ExpandIcon> = {
     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,57 +40,59 @@ const meta: Meta<typeof ExpandIcon> = {
                 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-emerald-900/20 to-gray-900">
+          <div className="from-fm-surface-primary via-fm-icon-positive/5 to-fm-surface-primary min-h-screen bg-linear-to-br">
             {/* 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-emerald-500/10 via-transparent to-teal-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-positive/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-emerald-500/30 bg-gradient-to-br from-emerald-500/20 to-teal-500/20">
-                    <ExpandIcon className="h-12 w-12 text-emerald-400" />
+                  <div className="border-fm-icon-positive/30 from-fm-icon-positive/20 to-fm-icon-info/20 !mx-auto flex h-24 w-24 items-center justify-center rounded-2xl border bg-linear-to-br">
+                    <ExpandIcon className="text-fm-icon-positive h-12 w-12" />
                   </div>
-                  <h1 className="text-5xl font-bold !text-white">ExpandIcon</h1>
-                  <p className="!mx-auto max-w-3xl text-xl leading-relaxed !text-white/70">
+                  <h1 className="text-fm-icon-active! text-5xl font-bold">
+                    ExpandIcon
+                  </h1>
+                  <p className="text-fm-secondary! !mx-auto max-w-3xl text-xl leading-relaxed">
                     A fullscreen and expand control icon for maximizing
                     interface elements. Features diagonal arrows pointing
                     outward, essential for media players, modal dialogs, image
@@ -101,28 +103,28 @@ const meta: Meta<typeof ExpandIcon> = {
                   {/* Stats */}
                   <div className="flex items-center justify-center gap-8 pt-8">
                     <div className="text-center">
-                      <div className="text-3xl font-bold text-emerald-300">
+                      <div className="text-fm-icon-positive text-3xl font-bold">
                         Fullscreen
                       </div>
-                      <div className="text-sm text-white/60">
+                      <div className="text-fm-tertiary text-sm">
                         Maximize content
                       </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-teal-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-green-300">
+                      <div className="text-fm-icon-positive text-3xl font-bold">
                         Universal
                       </div>
-                      <div className="text-sm text-white/60">
+                      <div className="text-fm-tertiary text-sm">
                         Standard expand symbol
                       </div>
                     </div>
@@ -135,16 +137,16 @@ const meta: Meta<typeof ExpandIcon> = {
             <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-emerald-300">
+                    <h3 className="text-fm-icon-positive! 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 { ExpandIcon } from "@icons/expand-icon"
 
 function VideoPlayer() {
@@ -163,12 +165,12 @@ function VideoPlayer() {
                   </div>
 
                   <div className="!space-y-4">
-                    <h3 className="text-xl font-semibold !text-emerald-300">
+                    <h3 className="text-fm-icon-positive! 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">
-                      <button className="rounded-lg border border-emerald-500/20 bg-emerald-500/10 p-3 transition-colors hover:bg-emerald-500/20">
-                        <ExpandIcon className="h-6 w-6 text-emerald-400" />
+                    <div className="border-fm-divider-secondary bg-fm-surface-secondary flex h-32 items-center justify-center rounded-lg border">
+                      <button className="border-fm-icon-positive/20 bg-fm-icon-positive/10 hover:bg-fm-icon-positive/20 rounded-lg border p-3 transition-colors">
+                        <ExpandIcon className="text-fm-icon-positive h-6 w-6" />
                       </button>
                     </div>
                   </div>
@@ -177,122 +179,130 @@ function VideoPlayer() {
 
               {/* 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-emerald-300">
+                      <tr className="border-fm-divider-tertiary bg-fm-surface-secondary! border-b">
+                        <td className="text-fm-icon-positive! 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-emerald-300">
+                      <tr className="border-fm-divider-tertiary border-b">
+                        <td className="text-fm-icon-positive! 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-emerald-300">
+                      <tr className="border-fm-divider-tertiary bg-fm-surface-secondary! border-b">
+                        <td className="text-fm-icon-positive! 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">
                           string | number
                         </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">
                           Width of the stroke
                         </td>
                       </tr>
-                      <tr className="border-b border-white/5">
-                        <td className="px-6 py-4 font-mono text-sm !text-emerald-300">
+                      <tr className="border-fm-divider-tertiary border-b">
+                        <td className="text-fm-icon-positive! px-6 py-4 font-mono text-sm">
                           strokeLinecap
                         </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">
                           square
                         </td>
-                        <td className="px-6 py-4 text-sm !text-white/70">
+                        <td className="text-fm-secondary! px-6 py-4 text-sm">
                           Style of line endings (square for crisp corners)
                         </td>
                       </tr>
-                      <tr className="border-b border-white/5 !bg-black/10">
-                        <td className="px-6 py-4 font-mono text-sm !text-emerald-300">
+                      <tr className="border-fm-divider-tertiary bg-fm-surface-secondary! border-b">
+                        <td className="text-fm-icon-positive! 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="!bg-black/10">
-                        <td className="px-6 py-4 font-mono text-sm !text-emerald-300">
+                      <tr className="bg-fm-surface-secondary!">
+                        <td className="text-fm-icon-positive! 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>
@@ -303,50 +313,62 @@ function VideoPlayer() {
 
               {/* 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-emerald-300">
+                        <h3 className="text-fm-icon-positive! 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">
-                            <ExpandIcon className="!mx-auto mb-2 h-3 w-3 text-emerald-400" />
-                            <span className="text-xs text-white/60">12px</span>
+                            <ExpandIcon className="text-fm-icon-positive !mx-auto mb-2 h-3 w-3" />
+                            <span className="text-fm-tertiary text-xs">
+                              12px
+                            </span>
                           </div>
                           <div className="text-center">
-                            <ExpandIcon className="!mx-auto mb-2 h-4 w-4 text-emerald-400" />
-                            <span className="text-xs text-white/60">16px</span>
+                            <ExpandIcon className="text-fm-icon-positive !mx-auto mb-2 h-4 w-4" />
+                            <span className="text-fm-tertiary text-xs">
+                              16px
+                            </span>
                           </div>
                           <div className="text-center">
-                            <ExpandIcon className="!mx-auto mb-2 h-5 w-5 text-emerald-400" />
-                            <span className="text-xs text-white/60">20px</span>
+                            <ExpandIcon className="text-fm-icon-positive !mx-auto mb-2 h-5 w-5" />
+                            <span className="text-fm-tertiary text-xs">
+                              20px
+                            </span>
                           </div>
                           <div className="text-center">
-                            <ExpandIcon className="!mx-auto mb-2 h-6 w-6 text-emerald-400" />
-                            <span className="text-xs text-white/60">24px</span>
+                            <ExpandIcon className="text-fm-icon-positive !mx-auto mb-2 h-6 w-6" />
+                            <span className="text-fm-tertiary text-xs">
+                              24px
+                            </span>
                           </div>
                           <div className="text-center">
-                            <ExpandIcon className="!mx-auto mb-2 h-8 w-8 text-emerald-400" />
-                            <span className="text-xs text-white/60">32px</span>
+                            <ExpandIcon className="text-fm-icon-positive !mx-auto mb-2 h-8 w-8" />
+                            <span className="text-fm-tertiary text-xs">
+                              32px
+                            </span>
                           </div>
                           <div className="text-center">
-                            <ExpandIcon className="!mx-auto mb-2 h-12 w-12 text-emerald-400" />
-                            <span className="text-xs text-white/60">48px</span>
+                            <ExpandIcon className="text-fm-icon-positive !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-emerald-300">
+                        <h3 className="text-fm-icon-positive! 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) - compact controls
 <ExpandIcon className="h-4 w-4" />
 
@@ -368,56 +390,56 @@ function VideoPlayer() {
 
               {/* 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-emerald-300">
+                    <h3 className="text-fm-icon-positive! 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">
-                        <ExpandIcon className="h-6 w-6 text-emerald-400" />
+                        <ExpandIcon className="text-fm-icon-positive h-6 w-6" />
                         <div>
-                          <div className="text-sm font-medium text-white">
+                          <div className="text-fm-icon-active text-sm font-medium">
                             Expand/Fullscreen
                           </div>
-                          <div className="text-xs text-white/60">
-                            text-emerald-400
+                          <div className="text-fm-tertiary text-xs">
+                            text-fm-icon-positive
                           </div>
                         </div>
                       </div>
                       <div className="flex items-center gap-4">
-                        <ExpandIcon className="h-6 w-6 text-teal-400" />
+                        <ExpandIcon 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">
                             Maximize View
                           </div>
-                          <div className="text-xs text-white/60">
-                            text-teal-400
+                          <div className="text-fm-tertiary text-xs">
+                            text-fm-icon-info
                           </div>
                         </div>
                       </div>
                       <div className="flex items-center gap-4">
-                        <ExpandIcon className="h-6 w-6 text-green-400" />
+                        <ExpandIcon className="text-fm-icon-positive h-6 w-6" />
                         <div>
-                          <div className="text-sm font-medium text-white">
+                          <div className="text-fm-icon-active text-sm font-medium">
                             Active/Available
                           </div>
-                          <div className="text-xs text-white/60">
-                            text-green-400
+                          <div className="text-fm-tertiary text-xs">
+                            text-fm-icon-positive
                           </div>
                         </div>
                       </div>
                       <div className="flex items-center gap-4">
-                        <ExpandIcon className="h-6 w-6 text-cyan-400" />
+                        <ExpandIcon 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">
                             Focus Mode
                           </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>
@@ -425,11 +447,11 @@ function VideoPlayer() {
                   </div>
 
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-emerald-300">
+                    <h3 className="text-fm-icon-positive! 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
 <ExpandIcon className="h-6 w-6 text-emerald-400" />
 <ExpandIcon className="h-6 w-6 text-teal-500" />
@@ -454,56 +476,58 @@ function VideoPlayer() {
 
               {/* 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">
                   {/* Video Player */}
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-emerald-300">
+                    <h3 className="text-fm-icon-positive! text-lg font-semibold">
                       Video Player
                     </h3>
                     <div className="!space-y-4">
-                      <div className="rounded-lg border border-white/10 bg-white/5 p-6">
-                        <div className="relative mb-4 aspect-video overflow-hidden rounded-lg bg-black/50">
-                          <div className="absolute inset-0 flex items-center justify-center bg-gradient-to-br from-gray-800 to-gray-900">
-                            <div className="flex h-16 w-16 items-center justify-center rounded-full bg-white/20">
+                      <div className="border-fm-divider-secondary bg-fm-surface-secondary rounded-lg border p-6">
+                        <div className="bg-fm-surface-secondary relative mb-4 aspect-video overflow-hidden rounded-lg">
+                          <div className="from-fm-surface-secondary to-fm-surface-primary absolute inset-0 flex items-center justify-center bg-linear-to-br">
+                            <div className="bg-fm-divider-primary flex h-16 w-16 items-center justify-center rounded-full">
                               <div className="ml-1 h-0 w-0 border-y-[8px] border-l-[12px] border-y-transparent border-l-white" />
                             </div>
                           </div>
-                          <div className="absolute right-0 bottom-0 left-0 bg-gradient-to-t from-black/80 to-transparent p-4">
+                          <div className="from-fm-surface-primary/80 absolute right-0 bottom-0 left-0 bg-linear-to-t to-transparent p-4">
                             <div className="flex items-center justify-between">
                               <div className="flex items-center gap-3">
-                                <button className="rounded p-2 transition-colors hover:bg-white/20">
+                                <button className="hover:bg-fm-divider-primary rounded p-2 transition-colors">
                                   <div className="h-0 w-0 border-y-[6px] border-l-[8px] border-y-transparent border-l-white" />
                                 </button>
-                                <span className="text-sm text-white">
+                                <span className="text-fm-icon-active text-sm">
                                   0:42 / 2:18
                                 </span>
                               </div>
                               <div className="flex items-center gap-2">
-                                <button className="rounded p-2 transition-colors hover:bg-white/20">
-                                  <span className="text-xs text-white">HD</span>
+                                <button className="hover:bg-fm-divider-primary rounded p-2 transition-colors">
+                                  <span className="text-fm-icon-active text-xs">
+                                    HD
+                                  </span>
                                 </button>
-                                <button className="rounded border border-emerald-500/30 bg-emerald-500/10 p-2 transition-colors hover:bg-emerald-500/20">
-                                  <ExpandIcon className="h-4 w-4 text-emerald-400" />
+                                <button className="border-fm-icon-positive/30 bg-fm-icon-positive/10 hover:bg-fm-icon-positive/20 rounded border p-2 transition-colors">
+                                  <ExpandIcon className="text-fm-icon-positive h-4 w-4" />
                                 </button>
                               </div>
                             </div>
                           </div>
                         </div>
                         <div className="text-center">
-                          <div className="text-sm font-medium text-white">
+                          <div className="text-fm-icon-active text-sm font-medium">
                             "Exploring the Universe"
                           </div>
-                          <div className="text-xs text-white/60">
+                          <div className="text-fm-tertiary text-xs">
                             Click expand to enter fullscreen mode
                           </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">
                           {`// Video player with fullscreen control
 <div className="video-player">
   <video ref={videoRef} className="video-element" />
@@ -531,41 +555,41 @@ function VideoPlayer() {
 
                   {/* Image Gallery */}
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-emerald-300">
+                    <h3 className="text-fm-icon-positive! text-lg font-semibold">
                       Image Gallery
                     </h3>
                     <div className="!space-y-4">
-                      <div className="rounded-lg border border-white/10 bg-white/5 p-6">
+                      <div className="border-fm-divider-secondary bg-fm-surface-secondary rounded-lg border p-6">
                         <div className="mb-4 grid grid-cols-2 gap-3">
                           {[1, 2, 3, 4].map((img) => (
                             <div
                               key={img}
-                              className="group relative aspect-square overflow-hidden rounded-lg bg-gradient-to-br from-gray-700 to-gray-800"
+                              className="group from-fm-surface-secondary to-fm-surface-secondary relative aspect-square overflow-hidden rounded-lg bg-linear-to-br"
                             >
-                              <div className="absolute inset-0 flex items-center justify-center bg-black/20 opacity-0 transition-opacity group-hover:opacity-100">
-                                <button className="rounded-lg border border-emerald-500/30 bg-emerald-500/20 p-3 transition-colors hover:bg-emerald-500/30">
-                                  <ExpandIcon className="h-5 w-5 text-emerald-400" />
+                              <div className="bg-fm-surface-secondary absolute inset-0 flex items-center justify-center opacity-0 transition-opacity group-hover:opacity-100">
+                                <button className="border-fm-icon-positive/30 bg-fm-icon-positive/20 hover:bg-fm-icon-positive/30 rounded-lg border p-3 transition-colors">
+                                  <ExpandIcon className="text-fm-icon-positive h-5 w-5" />
                                 </button>
                               </div>
                               <div className="absolute right-2 bottom-2 opacity-0 transition-opacity group-hover:opacity-100">
-                                <button className="rounded border border-white/20 bg-black/60 p-1.5 transition-colors hover:border-emerald-500/30 hover:bg-emerald-500/20">
-                                  <ExpandIcon className="h-3 w-3 text-white" />
+                                <button className="border-fm-divider-primary bg-fm-surface-secondary hover:border-fm-icon-positive/30 hover:bg-fm-icon-positive/20 rounded border p-1.5 transition-colors">
+                                  <ExpandIcon className="text-fm-icon-active h-3 w-3" />
                                 </button>
                               </div>
                             </div>
                           ))}
                         </div>
                         <div className="text-center">
-                          <div className="text-sm font-medium text-white">
+                          <div className="text-fm-icon-active text-sm font-medium">
                             Photography Portfolio
                           </div>
-                          <div className="text-xs text-white/60">
+                          <div className="text-fm-tertiary text-xs">
                             Hover over images to see expand options
                           </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">
                           {`// Image gallery with lightbox expand
 <div className="image-gallery">
   {images.map((image, index) => (
@@ -597,58 +621,58 @@ function VideoPlayer() {
 
                   {/* Modal Dialog */}
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-emerald-300">
+                    <h3 className="text-fm-icon-positive! text-lg font-semibold">
                       Modal Dialog
                     </h3>
                     <div className="!space-y-4">
-                      <div className="rounded-lg border border-white/10 bg-white/5 p-6">
-                        <div className="rounded-lg border border-white/20 bg-black/50 p-6">
+                      <div className="border-fm-divider-secondary bg-fm-surface-secondary rounded-lg border p-6">
+                        <div className="border-fm-divider-primary bg-fm-surface-secondary rounded-lg border p-6">
                           <div className="mb-4 flex items-start justify-between">
                             <div>
-                              <h4 className="text-lg font-semibold text-white">
+                              <h4 className="text-fm-icon-active text-lg font-semibold">
                                 Document Preview
                               </h4>
-                              <p className="text-sm text-white/60">
+                              <p className="text-fm-tertiary text-sm">
                                 quarterly-report-2024.pdf
                               </p>
                             </div>
                             <div className="flex items-center gap-2">
-                              <button className="rounded border border-emerald-500/30 bg-emerald-500/10 p-2 transition-colors hover:bg-emerald-500/20">
-                                <ExpandIcon className="h-4 w-4 text-emerald-400" />
+                              <button className="border-fm-icon-positive/30 bg-fm-icon-positive/10 hover:bg-fm-icon-positive/20 rounded border p-2 transition-colors">
+                                <ExpandIcon className="text-fm-icon-positive h-4 w-4" />
                               </button>
-                              <button className="rounded p-2 transition-colors hover:bg-white/20">
+                              <button className="hover:bg-fm-divider-primary rounded p-2 transition-colors">
                                 <div className="relative h-4 w-4">
-                                  <div className="absolute inset-0 rotate-45 border border-white"></div>
-                                  <div className="absolute inset-0 -rotate-45 border border-white"></div>
+                                  <div className="border-fm-divider-contrast absolute inset-0 rotate-45 border"></div>
+                                  <div className="border-fm-divider-contrast absolute inset-0 -rotate-45 border"></div>
                                 </div>
                               </button>
                             </div>
                           </div>
-                          <div className="mb-4 flex aspect-[4/5] items-center justify-center rounded border border-white/20 bg-white/10">
+                          <div className="border-fm-divider-primary bg-fm-surface-secondary mb-4 flex aspect-[4/5] items-center justify-center rounded border">
                             <div className="text-center">
-                              <div className="mx-auto mb-2 h-20 w-16 rounded bg-white/20"></div>
-                              <div className="text-xs text-white/60">
+                              <div className="bg-fm-divider-primary mx-auto mb-2 h-20 w-16 rounded"></div>
+                              <div className="text-fm-tertiary text-xs">
                                 PDF Preview
                               </div>
                             </div>
                           </div>
                           <div className="flex items-center justify-between">
-                            <span className="text-xs text-white/60">
+                            <span className="text-fm-tertiary text-xs">
                               Page 1 of 24
                             </span>
                             <div className="flex gap-2">
-                              <button className="rounded bg-white/10 px-3 py-1 text-xs text-white transition-colors hover:bg-white/20">
+                              <button className="bg-fm-surface-secondary text-fm-icon-active hover:bg-fm-divider-primary rounded px-3 py-1 text-xs transition-colors">
                                 Download
                               </button>
-                              <button className="rounded bg-emerald-500/20 px-3 py-1 text-xs text-emerald-200 transition-colors hover:bg-emerald-500/30">
+                              <button className="bg-fm-icon-positive/20 text-fm-icon-positive hover:bg-fm-icon-positive/30 rounded px-3 py-1 text-xs transition-colors">
                                 Full View
                               </button>
                             </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">
                           {`// Modal with expand to fullscreen
 <Modal isOpen={isModalOpen} onClose={closeModal}>
   <div className="modal-header">
@@ -678,49 +702,49 @@ function VideoPlayer() {
 
                   {/* Dashboard Widget */}
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-emerald-300">
+                    <h3 className="text-fm-icon-positive! text-lg font-semibold">
                       Dashboard Widget
                     </h3>
                     <div className="!space-y-4">
-                      <div className="rounded-lg border border-white/10 bg-white/5 p-6">
-                        <div className="rounded-lg border border-white/10 bg-black/30 p-4">
+                      <div className="border-fm-divider-secondary bg-fm-surface-secondary rounded-lg border p-6">
+                        <div className="border-fm-divider-secondary bg-fm-surface-secondary rounded-lg border p-4">
                           <div className="mb-4 flex items-center justify-between">
                             <div>
-                              <h4 className="text-sm font-semibold text-white">
+                              <h4 className="text-fm-icon-active text-sm font-semibold">
                                 Analytics Overview
                               </h4>
-                              <p className="text-xs text-white/60">
+                              <p className="text-fm-tertiary text-xs">
                                 Last 30 days
                               </p>
                             </div>
-                            <button className="rounded border border-emerald-500/30 bg-emerald-500/10 p-1.5 transition-colors hover:bg-emerald-500/20">
-                              <ExpandIcon className="h-3 w-3 text-emerald-400" />
+                            <button className="border-fm-icon-positive/30 bg-fm-icon-positive/10 hover:bg-fm-icon-positive/20 rounded border p-1.5 transition-colors">
+                              <ExpandIcon className="text-fm-icon-positive h-3 w-3" />
                             </button>
                           </div>
                           <div className="mb-4 grid grid-cols-2 gap-4">
                             <div className="text-center">
-                              <div className="text-2xl font-bold text-emerald-400">
+                              <div className="text-fm-icon-positive text-2xl font-bold">
                                 12.5K
                               </div>
-                              <div className="text-xs text-white/60">
+                              <div className="text-fm-tertiary text-xs">
                                 Visitors
                               </div>
                             </div>
                             <div className="text-center">
-                              <div className="text-2xl font-bold text-teal-400">
+                              <div className="text-fm-icon-info text-2xl font-bold">
                                 84%
                               </div>
-                              <div className="text-xs text-white/60">
+                              <div className="text-fm-tertiary text-xs">
                                 Conversion
                               </div>
                             </div>
                           </div>
-                          <div className="flex h-16 items-end gap-1 rounded bg-white/5 p-2">
+                          <div className="bg-fm-surface-secondary flex h-16 items-end gap-1 rounded p-2">
                             {[0.3, 0.7, 0.5, 0.8, 0.6, 0.9, 0.4, 0.7].map(
                               (height, i) => (
                                 <div
                                   key={i}
-                                  className="flex-1 rounded-sm bg-emerald-400/60"
+                                  className="bg-fm-icon-positive/60 flex-1 rounded-sm"
                                   style={{ height: `${height * 100}%` }}
                                 />
                               )
@@ -728,8 +752,8 @@ function VideoPlayer() {
                           </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">
                           {`// Dashboard widget with expand option
 <div className="dashboard-widget">
   <div className="widget-header">
@@ -759,65 +783,65 @@ function VideoPlayer() {
 
               {/* 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 "Expand 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!">
                         Uses square strokeLinecap for crisp visual clarity
                       </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-emerald-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">
                       💡 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 provide descriptive aria-labels for expand
                         actions
                       </li>
-                      <li className="!text-white/70">
+                      <li className="text-fm-secondary!">
                         Use consistent placement in media control groups
                       </li>
-                      <li className="!text-white/70">
+                      <li className="text-fm-secondary!">
                         Ensure sufficient touch target size (44px minimum)
                       </li>
-                      <li className="!text-white/70">
+                      <li className="text-fm-secondary!">
                         Provide visible focus states for keyboard users
                       </li>
-                      <li className="!text-white/70">
+                      <li className="text-fm-secondary!">
                         Consider Escape key handling for fullscreen mode
                       </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-blue-300">
+                <div className="border-fm-divider-secondary bg-fm-surface-secondary rounded-lg border p-6">
+                  <h3 className="text-fm-icon-info! 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">
                         {`// Video player fullscreen control
 <div className="video-controls">
   <button 
@@ -861,13 +885,13 @@ function VideoPlayer() {
                       </pre>
                     </div>
                     <div className="!space-y-4">
-                      <p className="text-sm !text-white/70">
+                      <p className="text-fm-secondary! text-sm">
                         When using ExpandIcon for fullscreen controls, always
                         provide clear context about what will be expanded and
                         how users can exit fullscreen mode.
                       </p>
-                      <div className="rounded-lg border border-emerald-500/20 bg-emerald-500/10 p-4">
-                        <div className="flex items-center gap-2 text-sm text-emerald-200">
+                      <div className="border-fm-icon-positive/20 bg-fm-icon-positive/10 rounded-lg border p-4">
+                        <div className="text-fm-icon-positive flex items-center gap-2 text-sm">
                           <ExpandIcon className="h-4 w-4" />
                           <span>
                             Include keyboard shortcuts (F11, Escape) in tooltips
@@ -881,48 +905,56 @@ function VideoPlayer() {
 
               {/* 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-red-500/20">
-                      <span className="!text-2xl !text-white">⤡</span>
+                  <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-negative/20 !mx-auto flex h-12 w-12 items-center justify-center rounded-lg">
+                      <span className="text-fm-icon-active! !text-2xl">⤡</span>
                     </div>
                     <div>
-                      <div className="font-medium text-white">CollapseIcon</div>
-                      <div className="text-xs text-white/60">
+                      <div className="text-fm-icon-active font-medium">
+                        CollapseIcon
+                      </div>
+                      <div className="text-fm-tertiary text-xs">
                         Exit fullscreen
                       </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-blue-500/20">
-                      <span className="!text-2xl !text-white">⛶</span>
+                  <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-info/20 !mx-auto flex h-12 w-12 items-center justify-center rounded-lg">
+                      <span className="text-fm-icon-active! !text-2xl">⛶</span>
                     </div>
                     <div>
-                      <div className="font-medium text-white">MaximizeIcon</div>
-                      <div className="text-xs text-white/60">
+                      <div className="text-fm-icon-active font-medium">
+                        MaximizeIcon
+                      </div>
+                      <div className="text-fm-tertiary text-xs">
                         Window maximize
                       </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-purple-500/20">
-                      <span className="!text-2xl !text-white">🔍</span>
+                  <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-fm-icon-active! !text-2xl">🔍</span>
                     </div>
                     <div>
-                      <div className="font-medium text-white">ZoomInIcon</div>
-                      <div className="text-xs text-white/60">Zoom in</div>
+                      <div className="text-fm-icon-active font-medium">
+                        ZoomInIcon
+                      </div>
+                      <div className="text-fm-tertiary text-xs">Zoom in</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-yellow-500/20">
-                      <span className="!text-2xl !text-white">⊞</span>
+                  <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-fm-icon-active! !text-2xl">⊞</span>
                     </div>
                     <div>
-                      <div className="font-medium text-white">WindowIcon</div>
-                      <div className="text-xs text-white/60">
+                      <div className="text-fm-icon-active font-medium">
+                        WindowIcon
+                      </div>
+                      <div className="text-fm-tertiary text-xs">
                         Window controls
                       </div>
                     </div>
@@ -932,15 +964,15 @@ function VideoPlayer() {
             </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!">
                     ExpandIcon is part of the Aural UI icon library, built with
                     accessibility and fullscreen interaction best practices 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 for interactive
                     elements and keyboard navigation.
@@ -999,20 +1031,20 @@ 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)" },
     ],
   },
 }
 
 export const Default: Story = {
   args: {
-    className: "h-8 w-8 text-emerald-400",
+    className: "h-8 w-8 text-fm-icon-positive",
     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">
       <ExpandIcon {...args} />
     </div>
   ),
@@ -1029,30 +1061,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">
-        <ExpandIcon className="!mx-auto mb-2 h-3 w-3 text-emerald-400" />
-        <span className="text-xs text-white/60">12px</span>
+        <ExpandIcon className="text-fm-icon-positive !mx-auto mb-2 h-3 w-3" />
+        <span className="text-fm-tertiary text-xs">12px</span>
       </div>
       <div className="text-center">
-        <ExpandIcon className="!mx-auto mb-2 h-4 w-4 text-emerald-400" />
-        <span className="text-xs text-white/60">16px</span>
+        <ExpandIcon className="text-fm-icon-positive !mx-auto mb-2 h-4 w-4" />
+        <span className="text-fm-tertiary text-xs">16px</span>
       </div>
       <div className="text-center">
-        <ExpandIcon className="!mx-auto mb-2 h-5 w-5 text-emerald-400" />
-        <span className="text-xs text-white/60">20px</span>
+        <ExpandIcon className="text-fm-icon-positive !mx-auto mb-2 h-5 w-5" />
+        <span className="text-fm-tertiary text-xs">20px</span>
       </div>
       <div className="text-center">
-        <ExpandIcon className="!mx-auto mb-2 h-6 w-6 text-emerald-400" />
-        <span className="text-xs text-white/60">24px</span>
+        <ExpandIcon className="text-fm-icon-positive !mx-auto mb-2 h-6 w-6" />
+        <span className="text-fm-tertiary text-xs">24px</span>
       </div>
       <div className="text-center">
-        <ExpandIcon className="!mx-auto mb-2 h-8 w-8 text-emerald-400" />
-        <span className="text-xs text-white/60">32px</span>
+        <ExpandIcon className="text-fm-icon-positive !mx-auto mb-2 h-8 w-8" />
+        <span className="text-fm-tertiary text-xs">32px</span>
       </div>
       <div className="text-center">
-        <ExpandIcon className="!mx-auto mb-2 h-12 w-12 text-emerald-400" />
-        <span className="text-xs text-white/60">48px</span>
+        <ExpandIcon className="text-fm-icon-positive !mx-auto mb-2 h-12 w-12" />
+        <span className="text-fm-tertiary text-xs">48px</span>
       </div>
     </div>
   ),
@@ -1069,34 +1101,38 @@ 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-emerald-500/30 bg-emerald-500/20">
-          <ExpandIcon className="h-8 w-8 text-emerald-400" />
+        <div className="border-fm-icon-positive/30 bg-fm-icon-positive/20 !mx-auto mb-3 flex h-16 w-16 items-center justify-center rounded-lg border">
+          <ExpandIcon className="text-fm-icon-positive h-8 w-8" />
+        </div>
+        <div className="text-fm-icon-active text-sm font-medium">Expand</div>
+        <div className="text-fm-icon-positive text-xs">
+          text-fm-icon-positive
         </div>
-        <div className="text-sm font-medium text-white">Expand</div>
-        <div className="text-xs text-emerald-400">text-emerald-400</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-teal-500/30 bg-teal-500/20">
-          <ExpandIcon className="h-8 w-8 text-teal-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">
+          <ExpandIcon className="text-fm-icon-info h-8 w-8" />
         </div>
-        <div className="text-sm font-medium text-white">Maximize</div>
-        <div className="text-xs text-teal-400">text-teal-400</div>
+        <div className="text-fm-icon-active text-sm font-medium">Maximize</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-green-500/30 bg-green-500/20">
-          <ExpandIcon className="h-8 w-8 text-green-400" />
+        <div className="border-fm-icon-positive/30 bg-fm-icon-positive/20 !mx-auto mb-3 flex h-16 w-16 items-center justify-center rounded-lg border">
+          <ExpandIcon className="text-fm-icon-positive h-8 w-8" />
+        </div>
+        <div className="text-fm-icon-active text-sm font-medium">Active</div>
+        <div className="text-fm-icon-positive text-xs">
+          text-fm-icon-positive
         </div>
-        <div className="text-sm font-medium text-white">Active</div>
-        <div className="text-xs text-green-400">text-green-400</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">
-          <ExpandIcon 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">
+          <ExpandIcon className="text-fm-icon-info h-8 w-8" />
         </div>
-        <div className="text-sm font-medium text-white">Focus</div>
-        <div className="text-xs text-cyan-400">text-cyan-400</div>
+        <div className="text-fm-icon-active text-sm font-medium">Focus</div>
+        <div className="text-fm-icon-info text-xs">text-fm-icon-info</div>
       </div>
     </div>
   ),
@@ -1113,20 +1149,20 @@ 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">
       {/* Video Player */}
       <div className="!space-y-2">
-        <h3 className="text-sm font-medium text-white">
+        <h3 className="text-fm-icon-active text-sm font-medium">
           Video Player Controls
         </h3>
-        <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="flex items-center justify-between">
             <div className="flex items-center gap-3">
               <div className="h-0 w-0 border-y-[6px] border-l-[8px] border-y-transparent border-l-white" />
-              <span className="text-sm text-white">0:42 / 2:18</span>
+              <span className="text-fm-icon-active text-sm">0:42 / 2:18</span>
             </div>
-            <button className="rounded border border-emerald-500/30 bg-emerald-500/10 p-2 transition-colors hover:bg-emerald-500/20">
-              <ExpandIcon className="h-4 w-4 text-emerald-400" />
+            <button className="border-fm-icon-positive/30 bg-fm-icon-positive/10 hover:bg-fm-icon-positive/20 rounded border p-2 transition-colors">
+              <ExpandIcon className="text-fm-icon-positive h-4 w-4" />
             </button>
           </div>
         </div>
@@ -1134,12 +1170,14 @@ export const UsageExamples: Story = {
 
       {/* Image Gallery */}
       <div className="!space-y-2">
-        <h3 className="text-sm font-medium text-white">Image Gallery</h3>
-        <div className="rounded-lg border border-white/10 bg-white/5 p-4">
-          <div className="group relative aspect-square rounded-lg bg-gradient-to-br from-gray-700 to-gray-800">
+        <h3 className="text-fm-icon-active text-sm font-medium">
+          Image Gallery
+        </h3>
+        <div className="border-fm-divider-secondary bg-fm-surface-secondary rounded-lg border p-4">
+          <div className="group from-fm-surface-secondary to-fm-surface-secondary relative aspect-square rounded-lg bg-linear-to-br">
             <div className="absolute top-2 right-2">
-              <button className="rounded border border-white/20 bg-black/60 p-1.5 transition-colors hover:border-emerald-500/30 hover:bg-emerald-500/20">
-                <ExpandIcon className="h-3 w-3 text-white" />
+              <button className="border-fm-divider-primary bg-fm-surface-secondary hover:border-fm-icon-positive/30 hover:bg-fm-icon-positive/20 rounded border p-1.5 transition-colors">
+                <ExpandIcon className="text-fm-icon-active h-3 w-3" />
               </button>
             </div>
           </div>
@@ -1162,12 +1200,12 @@ export const Playground: Story = {
   args: {
     width: 24,
     height: 24,
-    className: "text-emerald-400",
+    className: "text-fm-icon-positive",
     strokeLinecap: "square",
   },
   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">
         <ExpandIcon {...args} />
       </div>
     </div>