aural-ui 3.0.7 → 4.0.1

package/dist/icons/git-branch-icon/GitBranchIcon.stories.tsx

@@ -11,9 +11,9 @@ const meta: Meta<typeof GitBranchIcon> = {
     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,42 +40,42 @@ const meta: Meta<typeof GitBranchIcon> = {
                 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) ;
               }
               @keyframes search-pulse {
                 0%, 100% { transform: scale(1); opacity: 1; }
@@ -94,19 +94,19 @@ const meta: Meta<typeof GitBranchIcon> = {
             `}
           </style>
 
-          <div className="min-h-screen bg-gradient-to-br from-gray-900 via-indigo-900/20 to-gray-900">
+          <div className="from-fm-surface-primary via-fm-icon-info/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-indigo-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-indigo-500/30 bg-gradient-to-br from-indigo-500/20 to-cyan-500/20">
-                    <GitBranchIcon className="h-12 w-12 text-indigo-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">
+                    <GitBranchIcon className="text-fm-icon-info h-12 w-12" />
                   </div>
                   <h1 className="!text-fm-primary text-5xl font-bold">
                     GitBranchIcon
                   </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 Git branch icon symbolizing version control, branching,
                     and collaborative development. Ideal for use in features
                     like commit histories, branch selectors, repositories, or
@@ -117,26 +117,30 @@ const meta: Meta<typeof GitBranchIcon> = {
                   {/* Stats */}
                   <div className="flex items-center justify-center gap-8 pt-8">
                     <div className="text-center">
-                      <div className="text-3xl font-bold text-indigo-300">
+                      <div className="text-fm-icon-info text-3xl font-bold">
                         Branch
                       </div>
-                      <div className="text-sm text-white/60">
+                      <div className="text-fm-tertiary text-sm">
                         Create features
                       </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">
                         Merge
                       </div>
-                      <div className="text-sm text-white/60">Combine code</div>
+                      <div className="text-fm-tertiary text-sm">
+                        Combine code
+                      </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-blue-300">
+                      <div className="text-fm-icon-info text-3xl font-bold">
                         Deploy
                       </div>
-                      <div className="text-sm text-white/60">Ship changes</div>
+                      <div className="text-fm-tertiary text-sm">
+                        Ship changes
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -147,17 +151,17 @@ const meta: Meta<typeof GitBranchIcon> = {
             <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">
                   {/* Basic Usage */}
                   <div className="!space-y-4">
-                    <h3 className="text-xl font-semibold !text-indigo-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 { GitBranchIcon } from "@icons/git-branch-icon"
 
 function BranchButton() {
@@ -177,11 +181,11 @@ function BranchButton() {
 
                   {/* Live Preview */}
                   <div className="!space-y-4">
-                    <h3 className="text-xl font-semibold !text-indigo-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">
-                      <button className="flex items-center gap-2 rounded border border-indigo-500/30 bg-indigo-500/10 px-4 py-2 text-indigo-300 hover:cursor-pointer hover:bg-indigo-500/20">
+                    <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-info/30 bg-fm-icon-info/10 text-fm-icon-info hover:bg-fm-icon-info/20 flex items-center gap-2 rounded border px-4 py-2 hover:cursor-pointer">
                         <GitBranchIcon className="h-4 w-4" />
                         Branches
                       </button>
@@ -192,122 +196,130 @@ function BranchButton() {
 
               {/* 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-indigo-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-indigo-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 lines
                         </td>
                       </tr>
-                      <tr className="border-b border-white/5 !bg-black/10">
-                        <td className="px-6 py-4 font-mono text-sm !text-indigo-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">
                           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">
                           Thickness of the stroke lines
                         </td>
                       </tr>
-                      <tr className="border-b border-white/5">
-                        <td className="px-6 py-4 font-mono text-sm !text-indigo-300">
+                      <tr className="border-fm-divider-tertiary border-b">
+                        <td className="text-fm-icon-info! 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 (e.g., butt, round, square)
                         </td>
                       </tr>
-                      <tr className="border-b border-white/5 !bg-black/10">
-                        <td className="px-6 py-4 font-mono text-sm !text-indigo-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 size, color, etc.)
                         </td>
                       </tr>
-                      <tr className="!bg-black/10">
-                        <td className="px-6 py-4 font-mono text-sm !text-indigo-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 supported by React
                         </td>
                       </tr>
@@ -318,50 +330,62 @@ function BranchButton() {
 
               {/* 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-indigo-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">
-                            <GitBranchIcon className="!mx-auto mb-2 h-3 w-3 text-indigo-400" />
-                            <span className="text-xs text-white/60">12px</span>
+                            <GitBranchIcon 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">
-                            <GitBranchIcon className="!mx-auto mb-2 h-4 w-4 text-indigo-400" />
-                            <span className="text-xs text-white/60">16px</span>
+                            <GitBranchIcon 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">
-                            <GitBranchIcon className="!mx-auto mb-2 h-5 w-5 text-indigo-400" />
-                            <span className="text-xs text-white/60">20px</span>
+                            <GitBranchIcon 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">
-                            <GitBranchIcon className="!mx-auto mb-2 h-6 w-6 text-indigo-400" />
-                            <span className="text-xs text-white/60">24px</span>
+                            <GitBranchIcon 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">
-                            <GitBranchIcon className="!mx-auto mb-2 h-8 w-8 text-indigo-400" />
-                            <span className="text-xs text-white/60">32px</span>
+                            <GitBranchIcon 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">
-                            <GitBranchIcon className="!mx-auto mb-2 h-12 w-12 text-indigo-400" />
-                            <span className="text-xs text-white/60">48px</span>
+                            <GitBranchIcon 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-indigo-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)
 <GitBranchIcon className="h-4 w-4 " />
 
@@ -383,91 +407,91 @@ function BranchButton() {
 
               {/* 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">
                   {/* Semantic Colors */}
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-indigo-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">
-                        <GitBranchIcon className="h-6 w-6 text-indigo-400" />
+                        <GitBranchIcon 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-indigo-400
+                          <div className="text-fm-tertiary text-xs">
+                            text-fm-icon-info
                           </div>
                         </div>
                       </div>
                       <div className="flex items-center gap-4">
-                        <GitBranchIcon className="h-6 w-6 text-cyan-400" />
+                        <GitBranchIcon 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">
                             Active
                           </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">
-                        <GitBranchIcon className="h-6 w-6 text-gray-400" />
+                        <GitBranchIcon 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-gray-400
+                          <div className="text-fm-tertiary text-xs">
+                            text-fm-placeholder
                           </div>
                         </div>
                       </div>
                       <div className="flex items-center gap-4">
-                        <GitBranchIcon className="h-6 w-6 text-blue-400" />
+                        <GitBranchIcon 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">
                             Info
                           </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">
-                        <GitBranchIcon className="h-6 w-6 text-green-400" />
+                        <GitBranchIcon 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">
                             Success
                           </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">
-                        <GitBranchIcon className="h-6 w-6 text-yellow-400" />
+                        <GitBranchIcon className="text-fm-icon-warning h-6 w-6" />
                         <div>
-                          <div className="text-sm font-medium text-white">
+                          <div className="text-fm-icon-active text-sm font-medium">
                             Warning
                           </div>
-                          <div className="text-xs text-white/60">
-                            text-yellow-400
+                          <div className="text-fm-tertiary text-xs">
+                            text-fm-icon-warning
                           </div>
                         </div>
                       </div>
                       <div className="flex items-center gap-4">
-                        <GitBranchIcon className="h-6 w-6 text-red-400" />
+                        <GitBranchIcon className="text-fm-icon-negative h-6 w-6" />
                         <div>
-                          <div className="text-sm font-medium text-white">
+                          <div className="text-fm-icon-active text-sm font-medium">
                             Error
                           </div>
-                          <div className="text-xs text-white/60">
-                            text-red-400
+                          <div className="text-fm-tertiary text-xs">
+                            text-fm-icon-negative
                           </div>
                         </div>
                       </div>
@@ -476,11 +500,11 @@ function BranchButton() {
 
                   {/* Custom Colors */}
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-indigo-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
 <GitBranchIcon className="h-6 w-6 text-indigo-400" />
 <GitBranchIcon className="h-6 w-6 text-cyan-500" />
@@ -505,25 +529,25 @@ function BranchButton() {
 
               {/* 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">
                   {/* Branch Creation Button */}
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-indigo-300">
+                    <h3 className="text-fm-icon-info! text-lg font-semibold">
                       Create New Branch
                     </h3>
                     <div className="!space-y-4">
                       <div>
-                        <button className="flex items-center gap-2 rounded-lg border border-indigo-500/30 bg-indigo-500/10 px-4 py-2 text-indigo-200 transition-colors hover:cursor-pointer hover:bg-indigo-500/20">
+                        <button className="border-fm-icon-info/30 bg-fm-icon-info/10 text-fm-icon-info hover:bg-fm-icon-info/20 flex items-center gap-2 rounded-lg border px-4 py-2 transition-colors hover:cursor-pointer">
                           <GitBranchIcon className="h-4 w-4" />
                           Create Branch
                         </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">
                           {`<button className="flex items-center gap-2 bg-indigo-500/10 border border-indigo-500/30 px-4 py-2 rounded-lg">
   <GitBranch className="h-4 w-4" />
   Create Branch
@@ -535,28 +559,28 @@ function BranchButton() {
 
                   {/* Branch Status Row */}
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-indigo-300">
+                    <h3 className="text-fm-icon-info! text-lg font-semibold">
                       Branch Status Display
                     </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="flex items-center gap-3">
-                          <GitBranchIcon className="h-5 w-5 text-indigo-400" />
+                          <GitBranchIcon className="text-fm-icon-info h-5 w-5" />
                           <div className="flex-1">
-                            <div className="text-sm font-medium text-white">
+                            <div className="text-fm-icon-active text-sm font-medium">
                               Current branch:{" "}
-                              <span className="text-indigo-300">
+                              <span className="text-fm-icon-info">
                                 feature/user-auth
                               </span>
                             </div>
-                            <div className="text-xs text-white/60">
+                            <div className="text-fm-tertiary text-xs">
                               3 commits ahead of main
                             </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">
                           {`<div className="flex items-center gap-3 p-4 border border-white/10 bg-white/5">
   <GitBranch className="h-5 w-5 text-indigo-400" />
   <div className="flex-1">
@@ -573,26 +597,26 @@ function BranchButton() {
 
                   {/* No Branches State */}
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-indigo-300">
+                    <h3 className="text-fm-icon-info! text-lg font-semibold">
                       No Branches Available
                     </h3>
                     <div className="!space-y-4">
-                      <div className="flex flex-col items-center justify-center rounded-lg border border-white/10 bg-white/5 p-8">
-                        <GitBranchIcon className="mb-4 h-12 w-12 text-white/30" />
-                        <h4 className="mb-2 text-lg font-medium !text-white/80">
+                      <div className="border-fm-divider-secondary bg-fm-surface-secondary flex flex-col items-center justify-center rounded-lg border p-8">
+                        <GitBranchIcon className="text-fm-icon-active/30 mb-4 h-12 w-12" />
+                        <h4 className="text-fm-icon-active!/80 mb-2 text-lg font-medium">
                           No feature branches found
                         </h4>
-                        <p className="text-center text-sm !text-white/50">
+                        <p className="text-fm-placeholder! text-center text-sm">
                           Create your first branch to start working on new
                           features or bug fixes.
                         </p>
-                        <button className="mt-4 flex items-center gap-2 rounded-lg border border-indigo-500/30 bg-indigo-500/20 px-4 py-2 text-sm text-indigo-200 transition-colors hover:cursor-pointer hover:bg-indigo-500/30">
+                        <button className="border-fm-icon-info/30 bg-fm-icon-info/20 text-fm-icon-info hover:bg-fm-icon-info/30 mt-4 flex items-center gap-2 rounded-lg border px-4 py-2 text-sm transition-colors hover:cursor-pointer">
                           <GitBranchIcon className="h-4 w-4" />
                           Create First Branch
                         </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">
                           {`<div className="flex flex-col items-center p-8 border border-white/10 bg-white/5">
   <GitBranch className="h-12 w-12 text-white/30 mb-4" />
   <h4 className="text-lg font-medium text-white/80 mb-2">
@@ -613,31 +637,31 @@ function BranchButton() {
 
                   {/* Branch Merge Request */}
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-indigo-300">
+                    <h3 className="text-fm-icon-info! text-lg font-semibold">
                       Merge Request Status
                     </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="flex items-center gap-3">
-                          <GitBranchIcon className="h-5 w-5 text-indigo-400" />
+                          <GitBranchIcon className="text-fm-icon-info h-5 w-5" />
                           <div className="flex-1">
-                            <div className="text-sm font-medium text-white">
+                            <div className="text-fm-icon-active text-sm font-medium">
                               Ready to merge:{" "}
-                              <span className="text-indigo-300">
+                              <span className="text-fm-icon-info">
                                 feature/payment-gateway
                               </span>
                             </div>
-                            <div className="text-xs text-white/60">
+                            <div className="text-fm-tertiary text-xs">
                               All checks passed • 2 approvals
                             </div>
                           </div>
-                          <button className="rounded-lg border border-green-500/30 bg-green-500/10 px-3 py-1 text-xs text-green-200 hover:cursor-pointer hover:bg-green-500/20">
+                          <button className="border-fm-icon-positive/30 bg-fm-icon-positive/10 text-fm-icon-positive hover:bg-fm-icon-positive/20 rounded-lg border px-3 py-1 text-xs hover:cursor-pointer">
                             Merge
                           </button>
                         </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">
                           {`<div className="flex items-center gap-3 p-4 border border-white/10 bg-white/5">
   <GitBranch className="h-5 w-5 text-indigo-400" />
   <div className="flex-1">
@@ -659,55 +683,55 @@ function BranchButton() {
 
               {/* Interactive States */}
               <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">
                   Interactive States & Animations
                 </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-indigo-300">
+                    <h3 className="text-fm-icon-info! text-lg font-semibold">
                       Hover & Animation Effects
                     </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">
-                        <GitBranchIcon className="h-6 w-6 text-white/60 transition-colors hover:text-indigo-400" />
+                        <GitBranchIcon className="text-fm-tertiary hover:text-fm-icon-info h-6 w-6 transition-colors" />
                         <div>
-                          <div className="text-sm font-medium text-white">
+                          <div className="text-fm-icon-active text-sm font-medium">
                             Color Change
                           </div>
-                          <div className="text-xs text-white/60">
+                          <div className="text-fm-tertiary text-xs">
                             Hover to see effect
                           </div>
                         </div>
                       </div>
                       <div className="flex items-center gap-4">
-                        <GitBranchIcon className="h-6 w-6 text-white transition-transform hover:scale-110" />
+                        <GitBranchIcon className="text-fm-icon-active h-6 w-6 transition-transform hover:scale-110" />
                         <div>
-                          <div className="text-sm font-medium text-white">
+                          <div className="text-fm-icon-active text-sm font-medium">
                             Scale Up
                           </div>
-                          <div className="text-xs text-white/60">
+                          <div className="text-fm-tertiary text-xs">
                             Scale on hover
                           </div>
                         </div>
                       </div>
                       <div className="flex items-center gap-4">
-                        <GitBranchIcon className="animate-search-pulse h-6 w-6 text-indigo-400" />
+                        <GitBranchIcon className="animate-search-pulse 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">
                             Search Pulse
                           </div>
-                          <div className="text-xs text-white/60">
+                          <div className="text-fm-tertiary text-xs">
                             Continuous animation
                           </div>
                         </div>
                       </div>
                       <div className="flex items-center gap-4">
-                        <GitBranchIcon className="animate-document-slide h-6 w-6 text-cyan-400" />
+                        <GitBranchIcon className="animate-document-slide 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">
                             Document Slide
                           </div>
-                          <div className="text-xs text-white/60">
+                          <div className="text-fm-tertiary text-xs">
                             Subtle movement
                           </div>
                         </div>
@@ -716,11 +740,11 @@ function BranchButton() {
                   </div>
 
                   <div className="!space-y-4">
-                    <h3 className="text-lg font-semibold !text-indigo-300">
+                    <h3 className="text-fm-icon-info! text-lg font-semibold">
                       State Examples
                     </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">
                         {`// Color change on hover
 <GitBranchIcon className="h-6 w-6 text-white/60 transition-colors hover:text-indigo-400 " />
 
@@ -743,64 +767,64 @@ function BranchButton() {
 
               {/* 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 "Git branch icon"
                       </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-indigo-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 provide descriptive labels for branch-related
                         actions
                       </li>
-                      <li className="!text-white/70">
+                      <li className="text-fm-secondary!">
                         Use consistent placement in version control interfaces
                       </li>
-                      <li className="!text-white/70">
+                      <li className="text-fm-secondary!">
                         Ensure sufficient click/touch target sizes
                       </li>
-                      <li className="!text-white/70">
+                      <li className="text-fm-secondary!">
                         Add focus states for keyboard navigation
                       </li>
-                      <li className="!text-white/70">
+                      <li className="text-fm-secondary!">
                         Consider motion sensitivity for branching animations
                       </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">
                     Custom Accessibility Implementation
                   </h3>
                   <div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
                     {/* Code Example Block */}
-                    <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">
                         {`// Branch toggle button with ARIA
 <button 
   aria-label="Toggle git branch panel"
@@ -835,14 +859,14 @@ function BranchButton() {
 
                     {/* Accessibility Note */}
                     <div className="!space-y-4">
-                      <p className="text-sm !text-white/70">
+                      <p className="text-fm-secondary! text-sm">
                         When using <code>GitBranchIcon</code> for toggling or
                         displaying branch-related panels, ensure ARIA labels
                         clearly explain what will be shown or changed. Group
                         options with semantic roles for screen reader clarity.
                       </p>
-                      <div className="rounded-lg border border-indigo-500/20 bg-indigo-500/10 p-4">
-                        <div className="flex items-center gap-2 text-sm text-indigo-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">
                           <GitBranchIcon className="h-4 w-4" />
                           <span>
                             Use <code>aria-pressed</code> or{" "}
@@ -859,50 +883,60 @@ function BranchButton() {
 
               {/* 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-blue-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-info/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">
                         General search
                       </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">
+                  <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">
+                      <div className="text-fm-icon-active font-medium">
                         TrendingUpIcon
                       </div>
-                      <div className="text-xs text-white/60">
+                      <div className="text-fm-tertiary text-xs">
                         Growth metrics
                       </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-cyan-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-info/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">FolderIcon</div>
-                      <div className="text-xs text-white/60">File browsing</div>
+                      <div className="text-fm-icon-active font-medium">
+                        FolderIcon
+                      </div>
+                      <div className="text-fm-tertiary text-xs">
+                        File browsing
+                      </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">SaveIcon</div>
-                      <div className="text-xs text-white/60">Save changes</div>
+                      <div className="text-fm-icon-active font-medium">
+                        SaveIcon
+                      </div>
+                      <div className="text-fm-tertiary text-xs">
+                        Save changes
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -910,15 +944,15 @@ function BranchButton() {
             </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!">
                     FilterBarRowIcon is part of the Aural UI icon library, built
                     for document search, content discovery, and page navigation
                     functionality.
                   </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 search
                     interfaces.
@@ -973,8 +1007,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)" },
     ],
   },
 }
@@ -983,12 +1017,12 @@ export const Default: Story = {
   args: {
     width: 24,
     height: 24,
-    className: "text-indigo-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">
       <GitBranchIcon {...args} />
     </div>
   ),
@@ -1005,30 +1039,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">
-        <GitBranchIcon className="!mx-auto mb-2 h-3 w-3 text-indigo-400" />
-        <span className="text-xs text-white/60">12px</span>
+        <GitBranchIcon 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">
-        <GitBranchIcon className="!mx-auto mb-2 h-4 w-4 text-indigo-400" />
-        <span className="text-xs text-white/60">16px</span>
+        <GitBranchIcon 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">
-        <GitBranchIcon className="!mx-auto mb-2 h-5 w-5 text-indigo-400" />
-        <span className="text-xs text-white/60">20px</span>
+        <GitBranchIcon 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">
-        <GitBranchIcon className="!mx-auto mb-2 h-6 w-6 text-indigo-400" />
-        <span className="text-xs text-white/60">24px</span>
+        <GitBranchIcon 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">
-        <GitBranchIcon className="!mx-auto mb-2 h-8 w-8 text-indigo-400" />
-        <span className="text-xs text-white/60">32px</span>
+        <GitBranchIcon 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">
-        <GitBranchIcon className="!mx-auto mb-2 h-12 w-12 text-indigo-400" />
-        <span className="text-xs text-white/60">48px</span>
+        <GitBranchIcon className="text-fm-icon-info !mx-auto mb-2 h-12 w-12" />
+        <span className="text-fm-tertiary text-xs">48px</span>
       </div>
     </div>
   ),
@@ -1045,34 +1079,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-indigo-500/30 bg-indigo-500/20">
-          <GitBranchIcon className="h-8 w-8 text-indigo-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">
+          <GitBranchIcon 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-indigo-400">text-indigo-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-cyan-500/30 bg-cyan-500/20">
-          <GitBranchIcon 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">
+          <GitBranchIcon className="text-fm-icon-info h-8 w-8" />
         </div>
-        <div className="text-sm font-medium text-white">Active</div>
-        <div className="text-xs text-cyan-400">text-cyan-400</div>
+        <div className="text-fm-icon-active text-sm font-medium">Active</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">
-          <GitBranchIcon 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">
+          <GitBranchIcon className="text-fm-placeholder h-8 w-8" />
         </div>
-        <div className="text-sm font-medium text-white">Disabled</div>
-        <div className="text-xs text-gray-400">text-gray-400</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 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">
-          <GitBranchIcon 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">
+          <GitBranchIcon className="text-fm-icon-info h-8 w-8" />
         </div>
-        <div className="text-sm font-medium text-white">Info</div>
-        <div className="text-xs text-blue-400">text-blue-400</div>
+        <div className="text-fm-icon-active text-sm font-medium">Info</div>
+        <div className="text-fm-icon-info text-xs">text-fm-icon-info</div>
       </div>
     </div>
   ),
@@ -1089,16 +1123,18 @@ export const UsageExamples: Story = {
     },
   },
   render: () => (
-    <div className="min-h-dvh space-y-8 rounded-lg bg-gradient-to-br from-gray-950 to-gray-900 p-8">
+    <div className="from-fm-surface-primary to-fm-surface-primary min-h-dvh space-y-8 rounded-lg bg-linear-to-br p-8">
       {/* Toolbar */}
       <div className="space-y-2">
-        <h3 className="text-sm font-medium text-white">Branch Controls</h3>
+        <h3 className="text-fm-icon-active text-sm font-medium">
+          Branch Controls
+        </h3>
         <div className="flex gap-4">
-          <button className="flex items-center gap-2 rounded-lg border border-blue-500/30 bg-blue-500/15 px-4 py-2 text-blue-200 transition hover:cursor-pointer hover:bg-blue-500/25">
+          <button className="border-fm-icon-info/30 bg-fm-icon-info/15 text-fm-icon-info hover:bg-fm-icon-info/25 flex items-center gap-2 rounded-lg border px-4 py-2 transition hover:cursor-pointer">
             <GitBranchIcon className="h-4 w-4" />
             Create Branch
           </button>
-          <button className="flex items-center gap-2 rounded-lg border border-indigo-500/30 bg-indigo-500/15 px-4 py-2 text-indigo-200 transition hover:cursor-pointer hover:bg-indigo-500/25">
+          <button className="border-fm-icon-info/30 bg-fm-icon-info/15 text-fm-icon-info hover:bg-fm-icon-info/25 flex items-center gap-2 rounded-lg border px-4 py-2 transition hover:cursor-pointer">
             <GitBranchIcon className="h-4 w-4" />
             Checkout
           </button>
@@ -1107,8 +1143,10 @@ export const UsageExamples: Story = {
 
       {/* Recent Branches */}
       <div className="space-y-2">
-        <h3 className="text-sm font-medium text-white">Recent Branches</h3>
-        <div className="space-y-3 rounded-lg border border-white/10 bg-white/5 p-4">
+        <h3 className="text-fm-icon-active text-sm font-medium">
+          Recent Branches
+        </h3>
+        <div className="border-fm-divider-secondary bg-fm-surface-secondary space-y-3 rounded-lg border p-4">
           {[
             { name: "feature/auth-flow", updated: "Jun 25, 2025" },
             { name: "fix/navbar-overlap", updated: "Jun 23, 2025" },
@@ -1116,14 +1154,14 @@ export const UsageExamples: Story = {
           ].map((branch, index) => (
             <div
               key={index}
-              className="flex items-center gap-3 rounded border border-white/10 bg-white/5 p-3 transition hover:bg-white/10"
+              className="border-fm-divider-secondary bg-fm-surface-secondary hover:bg-fm-surface-secondary flex items-center gap-3 rounded border p-3 transition"
             >
-              <GitBranchIcon className="h-5 w-5 text-green-400" />
+              <GitBranchIcon className="text-fm-icon-positive h-5 w-5" />
               <div className="flex-1">
-                <div className="text-sm font-medium text-white">
+                <div className="text-fm-icon-active text-sm font-medium">
                   {branch.name}
                 </div>
-                <div className="text-xs text-white/60">
+                <div className="text-fm-tertiary text-xs">
                   Updated {branch.updated}
                 </div>
               </div>
@@ -1134,13 +1172,15 @@ export const UsageExamples: Story = {
 
       {/* Management Actions */}
       <div className="space-y-2">
-        <h3 className="text-sm font-medium text-white">Manage Branches</h3>
+        <h3 className="text-fm-icon-active text-sm font-medium">
+          Manage Branches
+        </h3>
         <div className="flex gap-4">
-          <button className="flex items-center gap-2 rounded-lg border border-yellow-500/30 bg-yellow-500/15 px-4 py-2 text-yellow-200 transition hover:cursor-pointer hover:bg-yellow-500/25">
+          <button className="border-fm-icon-warning/30 bg-fm-icon-warning/15 text-fm-icon-warning hover:bg-fm-icon-warning/25 flex items-center gap-2 rounded-lg border px-4 py-2 transition hover:cursor-pointer">
             <GitBranchIcon className="h-4 w-4" />
             Rename
           </button>
-          <button className="flex items-center gap-2 rounded-lg border border-red-500/30 bg-red-500/15 px-4 py-2 text-red-200 transition hover:cursor-pointer hover:bg-red-500/25">
+          <button className="border-fm-icon-negative/30 bg-fm-icon-negative/15 text-fm-icon-negative hover:bg-fm-icon-negative/25 flex items-center gap-2 rounded-lg border px-4 py-2 transition hover:cursor-pointer">
             <GitBranchIcon className="h-4 w-4" />
             Delete
           </button>
@@ -1161,28 +1201,28 @@ export const InteractiveStates: 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">
       <div className="space-y-4">
-        <h3 className="text-sm font-medium text-white/70">
+        <h3 className="text-fm-secondary text-sm font-medium">
           Interactive States & Motion
         </h3>
         <div className="flex gap-8">
           {/* Hover color transition */}
           <div className="flex flex-col items-center gap-2">
-            <GitBranchIcon className="h-8 w-8 text-white/60 transition-colors hover:text-blue-400" />
-            <span className="text-xs text-white/60">Hover to Highlight</span>
+            <GitBranchIcon className="text-fm-tertiary hover:text-fm-icon-info h-8 w-8 transition-colors" />
+            <span className="text-fm-tertiary text-xs">Hover to Highlight</span>
           </div>
 
           {/* Hover scale up */}
           <div className="flex flex-col items-center gap-2">
-            <GitBranchIcon className="h-8 w-8 text-white transition-transform duration-200 hover:scale-110" />
-            <span className="text-xs text-white/60">Scale on Hover</span>
+            <GitBranchIcon className="text-fm-icon-active h-8 w-8 transition-transform duration-200 hover:scale-110" />
+            <span className="text-fm-tertiary text-xs">Scale on Hover</span>
           </div>
 
           {/* Pulse animation to show sync or branch update */}
           <div className="flex flex-col items-center gap-2">
-            <GitBranchIcon className="h-8 w-8 animate-pulse text-green-400" />
-            <span className="text-xs text-white/60">Sync Pulse</span>
+            <GitBranchIcon className="text-fm-icon-positive h-8 w-8 animate-pulse" />
+            <span className="text-fm-tertiary text-xs">Sync Pulse</span>
           </div>
         </div>
       </div>
@@ -1203,12 +1243,12 @@ export const Playground: Story = {
   args: {
     width: 32,
     height: 32,
-    className: "text-indigo-400 ",
+    className: "text-fm-icon-info ",
     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">
         <GitBranchIcon {...args} />
       </div>
     </div>