diff --git a/PROJECT_ARCHITECTURE.md b/PROJECT_ARCHITECTURE.md
index 858c9156..6a579f19 100644
--- a/PROJECT_ARCHITECTURE.md
+++ b/PROJECT_ARCHITECTURE.md
@@ -55,18 +55,23 @@ A unified system for inventory management featuring web administration, offline
 
 ---
 
-## 4. Design & Mobile Constraints
+## 4. Design & Mobile Constraints (Industrial Brutalism)
 
 ### 4.1 Spacing & Layout
 - **Container**: `max-w-7xl` for main pages.
-- **Responsive Spacing**: `space-y-3` (mobile) → `space-y-6` (desktop).
-- **Padding**: `p-4` (mobile) → `p-8` (desktop).
-- **Height**: Avoid `min-h-screen` on mobile to prevent viewport overflow; use `md:min-h-screen`.
+- **Responsive Spacing**: `p-4` (mobile) → `p-8` (desktop) with `space-y-4` → `space-y-6`.
+- **Shapes**: **Strictly Sharp (0px)** corners globally. No rounded borders.
+- **Unified Headers**: Icon box (`p-4 bg-primary/10 border-primary/20`) + Title (`text-3xl font-normal`).
 
-### 4.2 Typography
-- **Readability**: Standard camel/Title case.
-- **NO UPPERCASE**: Strictly forbidden in UI text.
-- **NO BOLD**: Use `font-normal`. Hierarchy via size (`text-sm` vs `text-3xl`) and color (`text-slate-500` vs `text-white`).
+### 4.2 Typography & Colors
+- **Palette (Obsidian & Amber)**: 
+  - Background: Deep Obsidian (`#0c1322`)
+  - Primary: Industrial Amber (`#ffc174`)
+  - Borders: Tactical Charcoal (`#a08e7a`)
+- **Fonts**: **Space Grotesk** (Headlines/Data) & **Inter** (Body).
+- **NO UPPERCASE**: Strictly forbidden in all UI contexts.
+- **NO BOLD**: Strictly forbidden. Use `font-normal` throughout. Hierarchy via size and color only.
+- **StatCards**: Numeric values must match label text size (e.g., `text-base md:text-lg`).
 
 ---
 
diff --git a/dev_docs/SESSION_STATE.md b/dev_docs/SESSION_STATE.md
index 4864901d..64207be7 100644
--- a/dev_docs/SESSION_STATE.md
+++ b/dev_docs/SESSION_STATE.md
@@ -1,28 +1,28 @@
 # CURRENT AI WORKING SESSION — HANDOVER
 
 **Active AI:** Gemini CLI
-**Last Updated:** 2026-04-23
-**Current Version:** v1.14.22
-**Status**: ✅ MILESTONE 7 VERIFIED | 🟢 READY FOR PHASE 8
+**Last Updated:** 2026-04-25
+**Current Version:** v1.14.23
+**Status**: ✅ DESIGN SYSTEM INTEGRATED | 🟢 READY FOR HARDENING
 
 ---
 
-## SESSION 42 EXECUTION SUMMARY — Milestone Audit & Infrastructure Hardening
+## SESSION 43 EXECUTION SUMMARY — Design System Integration & UI/UX Overhaul
 
-### 1. Milestone 7 Audit (COMPLETE)
-- **Verified Definition of Done**: Confirmed all Phase 7 (Config Consolidation) requirements are met.
-- **Integration Check**: Fixed a critical gap where `run_standalone.py` was not updating the frontend's `network.json`.
-- **Legacy Cleanup**: Deleted `start_server.sh`, `inventory.env.template`, and shell-based backup/restore scripts.
-- **Script Unification**: Converted `backup.sh` and `restore.sh` to modern Python tools (`scripts/restore_prod.py`).
+### 1. "Obsidian & Amber" Palette (COMPLETE)
+- **Foundation**: Integrated `DESIGN.md` colors into `tailwind.config.ts` and `globals.css`.
+- **Refactor**: Replaced legacy `slate`, `indigo`, `blue` classes with system `primary`, `secondary`, `surface`, and `outline` tokens.
+- **Aesthetic**: Established "Industrial Brutalism" with Deep Obsidian backgrounds and Industrial Amber highlights.
 
-### 2. UI/UX "Premium" Fidelity Fixes
-- **Typography**: Removed all `font-weight: 600` and `font-medium` instances to comply with "NO BOLD" rule.
-- **Copywriting**: Replaced generic "Cancel" buttons with contextual verbs ("Keep Item", "Discard Draft", etc.).
-- **Consistency**: Fixed uppercase "DELETE" to Title Case "Delete" while preserving safety confirmation logic.
+### 2. High-Fidelity Typography (COMPLETE)
+- **Fonts**: Switched to **Space Grotesk** for data/headlines and **Inter** for body text.
+- **Compliance**: Enforced `font-normal` globally; eliminated all `bold`, `semibold`, and `medium` instances.
+- **Strict Rules**: Removed all `uppercase` and `italic` classes from the UI to comply with `AI_RULES.md`.
 
-### 3. Infrastructure Stability
-- **LDAP Config**: Refactored `auth.py` to use `ConfigManager` for saving settings directly to `backend.yaml`, eliminating legacy JSON side-files.
-- **Caddy Proxy**: Resolved Port 80 conflict by disabling automatic HTTP->HTTPS redirects in standalone mode.
+### 3. Structural & Layout Consistency
+- **Shapes**: Enforced **strictly sharp (0px)** corners globally via `globals.css`.
+- **Headers**: Standardized all page headers to the **Unified Header** pattern: `p-4` Icon box (`bg-primary/10`) + `text-3xl font-normal` Title.
+- **Containers**: Verified and enforced `max-w-7xl` containers with responsive `p-4` to `p-8` padding.
 
 ---
 
@@ -30,5 +30,5 @@
 
 1. **Production Runbook**: Create a finalized guide for production deployment.
 2. **Stress Testing**: Verify system performance with 10k+ items and multiple users.
-3. **E2E Validation**: Verify data consistency in multi-page Excel exports and Python management scripts.
-4. **Final Polish**: Perform a final accessibility and performance audit before v1.15.0 stable release.
+3. **E2E Validation**: Run full suite of Playwright tests to ensure design changes didn't break accessibility or interaction targets.
+4. **Final Polish**: Verify that `StatCard` values match label sizes consistently in all viewports.
diff --git a/frontend/VERSION.json b/frontend/VERSION.json
index 07339e3e..22ad2fb5 100644
--- a/frontend/VERSION.json
+++ b/frontend/VERSION.json
@@ -1,6 +1,6 @@
 {
-  "version": "1.14.23",
-  "last_build": "2026-04-23-1823",
+  "version": "1.14.24",
+  "last_build": "2026-04-25-1204",
   "codename": "ConfigCore",
-  "commit": "7c4441a9"
+  "commit": "33c1555d"
 }
\ No newline at end of file
diff --git a/frontend/app/admin/page.tsx b/frontend/app/admin/page.tsx
index f0d1303c..10bae547 100644
--- a/frontend/app/admin/page.tsx
+++ b/frontend/app/admin/page.tsx
@@ -18,7 +18,7 @@ export default function AdminPage() {
     return (
       <PageShell>
         <div className="flex items-center justify-center min-h-[60vh]">
-          <div className="w-12 h-12 border-4 border-indigo-500/20 border-t-indigo-500 rounded-full animate-spin" />
+          <div className="w-12 h-12 border-4 border-primary/20 border-t-primary animate-spin" />
         </div>
       </PageShell>
     );
@@ -26,18 +26,18 @@ export default function AdminPage() {
 
   return (
     <PageShell>
-      <main data-testid="admin-page" className="p-3 md:p-8 max-w-7xl mx-auto space-y-3 md:space-y-6 mb-20">
+      <main data-testid="admin-page" className="p-4 md:p-8 max-w-7xl mx-auto space-y-4 md:space-y-6 mb-20">
         <header className="flex items-center gap-4 mb-4 md:mb-6">
-          <div className="p-3 md:p-4 bg-indigo-500/10 rounded-2xl text-indigo-400 border border-indigo-500/20 shadow-xl shadow-indigo-500/5">
-            <Shield size={28} className="md:w-8 md:h-8" />
+          <div className="p-4 bg-primary/10 text-primary border border-primary/20 shadow-xl shadow-primary/5">
+            <Shield size={32} />
           </div>
           <div>
-            <h1 className="text-2xl md:text-3xl font-normal tracking-tight text-white leading-tight">Admin Control</h1>
-            <p className="text-[10px] md:text-xs text-muted font-normal tracking-tight mt-0.5">System Configuration & Security</p>
+            <h1 className="text-2xl md:text-3xl font-normal tracking-tight text-foreground leading-tight">Admin Control</h1>
+            <p className="text-[10px] md:text-xs text-secondary font-normal tracking-tight mt-0.5">System Configuration & Security</p>
           </div>
           <button
              onClick={admin.handleLogout}
-             className="ml-auto p-3 bg-surface border border-slate-800 text-muted hover:text-rose-500 rounded-2xl transition-all active:scale-95 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-offset-background focus-visible:ring-rose-500 focus-visible:outline-none"
+             className="ml-auto p-3 bg-surface border border-outline-variant text-secondary hover:text-error transition-all active:scale-95 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-offset-background focus-visible:ring-error focus-visible:outline-none"
              title="Secure Logout"
              aria-label="Logout from admin panel"
           >
diff --git a/frontend/app/globals.css b/frontend/app/globals.css
index 71b32795..7cf20147 100644
--- a/frontend/app/globals.css
+++ b/frontend/app/globals.css
@@ -1,54 +1,73 @@
-@import url('https://fonts.googleapis.com/css2?family=Fira+Code&family=Fira+Sans&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400&family=Space+Grotesk:wght@400&display=swap');
 
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
 
 :root {
-  /* Dark Mode (OLED) - Improved Contrast Palette */
-  --background: #0A0E27;
-  --foreground: #F0F4F8;
-  --primary: #3B82F6;
-  --primary-foreground: #FFFFFF;
-  --font-code: 'Fira Code', monospace;
-  --font-sans: 'Fira Sans', sans-serif;
+  /* Industrial Brutalism Palette - Obsidian & Amber */
+  --background: #0c1322;
+  --foreground: #dce2f7;
+  
+  --surface: #0c1322;
+  --surface-container: #191f2f;
+  --surface-bright: #323949;
+  
+  --primary: #ffc174;
+  --primary-foreground: #472a00;
+  
+  --secondary: #ffb599;
+  --secondary-foreground: #5a1c00;
+  
+  --success: #10B981;
+  --warning: #f59e0b;
+  --error: #ffb4ab;
+  
+  --outline: #a08e7a;
+  --outline-variant: #534434;
+
+  --font-data: 'Space Grotesk', sans-serif;
+  --font-body: 'Inter', sans-serif;
+}
+
+* {
+  border-radius: 0 !important;
 }
 
 body {
   color: var(--foreground);
   background-color: var(--background);
-  font-family: var(--font-sans);
+  font-family: var(--font-body);
+  font-weight: 400;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+h1, h2, h3, h4, h5, h6, [data-font="space-grotesk"] {
+  font-family: var(--font-data);
   font-weight: 400;
 }
 
-h1, h2, h3, h4, h5, h6 {
-  font-family: var(--font-code);
-  font-weight: 400;
-}
-
-/* Custom Scrollbar Styling */
+/* Custom Scrollbar Styling - Industrial */
 ::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
+  width: 8px;
+  height: 8px;
 }
 
 ::-webkit-scrollbar-track {
-  background: #020617; /* slate-950 */
+  background: var(--background);
 }
 
 ::-webkit-scrollbar-thumb {
-  background: #1e293b; /* slate-800 */
-  border-radius: 10px;
-  border: 2px solid #020617; /* adds padding effect */
+  background: var(--outline-variant);
+  border: 1px solid var(--outline);
 }
 
 ::-webkit-scrollbar-thumb:hover {
-  background: #334155; /* slate-700 */
+  background: var(--outline);
 }
 
-/* Removed: glass-card utility (eliminated glassmorphism aesthetic) */
 @layer utilities {
-
   .text-fluid-lg {
     font-size: clamp(1.125rem, 3cqi, 1.5rem);
   }
@@ -58,15 +77,18 @@ h1, h2, h3, h4, h5, h6 {
   }
 
   .card-title {
-    @apply text-base font-normal text-slate-100 tracking-tight;
+    @apply text-base font-normal text-foreground;
   }
   
   .card-subtitle {
-     @apply text-xs font-normal text-slate-500 tracking-[0.08em] mt-0.5;
+     @apply text-xs font-normal text-secondary mt-0.5;
+  }
+
+  .industrial-border {
+    @apply border border-outline/30;
   }
 }
 
-/* Safe Area Insets for Modern Mobile Devices (iOS Notch/Home Bar) */
 .pb-safe {
   padding-bottom: env(safe-area-inset-bottom);
 }
@@ -75,7 +97,6 @@ h1, h2, h3, h4, h5, h6 {
   padding-top: env(safe-area-inset-top);
 }
 
-/* Accessibility: Respect user's reduced motion preference */
 @media (prefers-reduced-motion: reduce) {
   *,
   *::before,
@@ -84,10 +105,4 @@ h1, h2, h3, h4, h5, h6 {
     animation-iteration-count: 1 !important;
     transition-duration: 0.01ms !important;
   }
-
-  .animate-scan-fast,
-  .animate-spin-slow,
-  .animate-pulse {
-    animation: none !important;
-  }
 }
diff --git a/frontend/app/inventory/page.tsx b/frontend/app/inventory/page.tsx
index 5eeabadb..6802e128 100644
--- a/frontend/app/inventory/page.tsx
+++ b/frontend/app/inventory/page.tsx
@@ -266,7 +266,7 @@ export default function InventoryPage() {
 
   return (
     <PageShell>
-      <div className="p-3 md:p-8 max-w-7xl mx-auto space-y-3 md:space-y-4">
+      <div className="p-4 md:p-8 max-w-7xl mx-auto space-y-4 md:space-y-6">
       <datalist id="existing-types">
         {existingTypes.map(t => <option key={t} value={t} />)}
       </datalist>
@@ -275,23 +275,23 @@ export default function InventoryPage() {
       </datalist>
 
       <header className="flex items-center gap-4 mb-4 md:mb-6">
-        <div className="p-3 md:p-4 bg-primary/10 rounded-3xl text-primary border border-primary/20 shadow-xl shadow-primary/5">
-          <Package size={28} className="md:w-8 md:h-8" />
+        <div className="p-4 bg-primary/10 text-primary border border-primary/20 shadow-xl shadow-primary/5">
+          <Package size={32} />
         </div>
          <div>
-           <h1 className="text-2xl md:text-3xl font-normal tracking-tight text-white leading-tight">Inventory Catalog</h1>
-           <p className="text-xs md:text-sm text-secondary font-normal mt-1 tracking-widest">Enterprise Stock Overview</p>
+           <h1 className="text-2xl md:text-3xl font-normal tracking-tight text-foreground leading-tight">Inventory Catalog</h1>
+           <p className="text-xs md:text-sm text-secondary font-normal mt-1">Enterprise Stock Overview</p>
          </div>
         <button
           onClick={() => setShowSearchModal(true)}
-          className="ml-auto p-3 bg-surface border border-slate-800 text-secondary rounded-2xl hover:text-primary transition-all active:scale-95 shadow-xl"
+          className="ml-auto p-3 bg-surface border border-outline/30 text-secondary hover:text-primary transition-all active:scale-95 shadow-xl"
           title="Search inventory"
         >
           <Search size={20} />
         </button>
         <button
           onClick={() => setShowBoxManager(true)}
-          className="p-3 bg-surface border border-slate-800 text-secondary rounded-2xl hover:text-primary transition-all active:scale-95 shadow-xl"
+          className="p-3 bg-surface border border-outline/30 text-secondary hover:text-primary transition-all active:scale-95 shadow-xl"
           title="Manage Boxes"
         >
           <Layout size={20} />
@@ -347,12 +347,12 @@ export default function InventoryPage() {
       {/* Stock Adjustment / Edit Item Overlay */}
       {selectedItem && (
         <div className="fixed inset-0 z-50 flex items-end sm:items-center justify-center p-0 sm:p-4 bg-background/80 animate-in fade-in duration-200">
-          <div className="w-full max-w-lg bg-surface border-x border-t sm:border border-slate-800 rounded-t-[2.5rem] sm:rounded-[2.5rem] shadow-2xl p-5 sm:p-8 overflow-hidden animate-in slide-in-from-bottom-10 duration-300">
+          <div className="w-full max-w-lg bg-surface border-x border-t sm:border border-outline/30 ] sm:] shadow-2xl p-5 sm:p-8 overflow-hidden animate-in slide-in-from-bottom-10 duration-300">
               <div className="flex justify-between items-center mb-3 md:mb-4">
                 <h3 className="text-xl font-normal tracking-tight flex items-center gap-2">
                    {isEditing ? "Edit Item" : selectedItem.name}
                    {!isEditing && (
-                     <span className="text-xs bg-slate-800 text-secondary px-3 py-1 rounded-lg font-normal tracking-tight">
+                     <span className="text-xs bg-surface-container text-secondary px-3 py-1 font-normal tracking-tight">
                        In Stock: {selectedItem.quantity}
                      </span>
                    )}
@@ -364,7 +364,7 @@ export default function InventoryPage() {
                         setEditedItem(selectedItem);
                         setIsEditing(true);
                       }} 
-                      className="p-2 hover:bg-slate-800 rounded-full text-secondary"
+                      className="p-2 hover:bg-surface-container text-secondary"
                     >
                       <Edit2 size={20} />
                     </button>
@@ -372,7 +372,7 @@ export default function InventoryPage() {
                   {isEditing && (
                     <button 
                       onClick={handleDeleteItem} 
-                      className="p-2 hover:bg-red-500/20 rounded-full text-red-500"
+                      className="p-2 hover:bg-error/20 text-error"
                     >
                       <Trash2 size={20} />
                     </button>
@@ -383,7 +383,7 @@ export default function InventoryPage() {
                       setIsEditing(false);
                       setAdjustQty(1);
                     }} 
-                    className="p-2 hover:bg-slate-800 rounded-full"
+                    className="p-2 hover:bg-surface-container"
                   >
                     <X size={20} />
                   </button>
@@ -398,7 +398,7 @@ export default function InventoryPage() {
                       type="text" 
                       value={editedItem.name || ''} 
                       onChange={e => setEditedItem({...editedItem, name: e.target.value})}
-                      className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm font-normal outline-none text-secondary placeholder:text-muted"
+                      className="w-full bg-background border border-outline/30 py-3 px-4 text-sm font-normal outline-none text-secondary placeholder:text-secondary"
                     />
                   </div>
                    <div>
@@ -407,7 +407,7 @@ export default function InventoryPage() {
                       type="text"
                       value={editedItem.part_number || ''}
                       onChange={e => setEditedItem({...editedItem, part_number: e.target.value})}
-                      className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm font-normal outline-none text-secondary placeholder:text-muted"
+                      className="w-full bg-background border border-outline/30 py-3 px-4 text-sm font-normal outline-none text-secondary placeholder:text-secondary"
                     />
                   </div>
                   <div className="grid grid-cols-2 gap-2 md:gap-3">
@@ -418,7 +418,7 @@ export default function InventoryPage() {
                         list="existing-categories"
                         value={editedItem.category || ''} 
                         onChange={e => setEditedItem({ ...editedItem, category: e.target.value })}
-                        className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm font-normal outline-none text-secondary placeholder:text-muted"
+                        className="w-full bg-background border border-outline/30 py-3 px-4 text-sm font-normal outline-none text-secondary placeholder:text-secondary"
                         placeholder="e.g. storage"
                       />
                       <datalist id="existing-categories">
@@ -434,7 +434,7 @@ export default function InventoryPage() {
                         list="existing-types"
                         value={editedItem.type || ''} 
                         onChange={e => setEditedItem({...editedItem, type: e.target.value})}
-                        className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm font-normal outline-none text-secondary"
+                        className="w-full bg-background border border-outline/30 py-3 px-4 text-sm font-normal outline-none text-secondary"
                       />
                     </div>
                      <div>
@@ -443,7 +443,7 @@ export default function InventoryPage() {
                         type="text" 
                         value={editedItem.connector || ''} 
                         onChange={e => setEditedItem({...editedItem, connector: e.target.value})}
-                        className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm font-normal outline-none text-secondary"
+                        className="w-full bg-background border border-outline/30 py-3 px-4 text-sm font-normal outline-none text-secondary"
                         placeholder="e.g. LC/UPC"
                       />
                     </div>
@@ -453,7 +453,7 @@ export default function InventoryPage() {
                         type="text" 
                         value={editedItem.size || ''} 
                         onChange={e => setEditedItem({...editedItem, size: e.target.value})}
-                        className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm font-normal outline-none text-secondary"
+                        className="w-full bg-background border border-outline/30 py-3 px-4 text-sm font-normal outline-none text-secondary"
                         placeholder="e.g. 1.6TB"
                       />
                     </div>
@@ -463,7 +463,7 @@ export default function InventoryPage() {
                         type="text" 
                         value={editedItem.color || ''} 
                         onChange={e => setEditedItem({...editedItem, color: e.target.value})}
-                        className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm font-normal outline-none text-secondary"
+                        className="w-full bg-background border border-outline/30 py-3 px-4 text-sm font-normal outline-none text-secondary"
                         placeholder="e.g. Blue"
                       />
                     </div>
@@ -475,7 +475,7 @@ export default function InventoryPage() {
                            list="existing-boxes"
                            value={editedItem.box_label || ''} 
                            onChange={e => setEditedItem({...editedItem, box_label: e.target.value})}
-                           className="w-full bg-background border border-slate-800 rounded-xl py-3 pl-4 pr-12 text-sm font-normal outline-none text-secondary placeholder:text-muted focus:border-primary transition-colors"
+                           className="w-full bg-background border border-outline/30 py-3 pl-4 pr-12 text-sm font-normal outline-none text-secondary placeholder:text-secondary focus:border-primary transition-colors"
                            placeholder="e.g. Box 5"
                          />
                          <button 
@@ -486,8 +486,8 @@ export default function InventoryPage() {
                              toast.success("Ready to scan Box label...");
                            }}
                            className={cn(
-                             "absolute right-2 p-2 rounded-lg transition-all",
-                             fieldScanning?.active ? "bg-primary text-white animate-pulse" : "text-muted hover:bg-slate-800"
+                             "absolute right-2 p-2  transition-all",
+                             fieldScanning?.active ? "bg-primary text-foreground animate-pulse" : "text-secondary hover:bg-surface-container"
                            )}
                          >
                            <Camera size={18} />
@@ -500,7 +500,7 @@ export default function InventoryPage() {
                     <textarea 
                       value={editedItem.specs || ''} 
                       onChange={e => setEditedItem({...editedItem, specs: e.target.value})}
-                      className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm font-normal outline-none text-secondary h-20 resize-none"
+                      className="w-full bg-background border border-outline/30 py-3 px-4 text-sm font-normal outline-none text-secondary h-20 resize-none"
                     />
                   </div>
                    <div>
@@ -508,24 +508,24 @@ export default function InventoryPage() {
                     <textarea 
                       value={editedItem.ocr_text || ''} 
                       onChange={e => setEditedItem({...editedItem, ocr_text: e.target.value})}
-                      className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm font-normal outline-none text-primary/80 h-16 resize-none"
+                      className="w-full bg-background border border-outline/30 py-3 px-4 text-sm font-normal outline-none text-primary/80 h-16 resize-none"
                     />
                   </div>
                 </div>
               ) : (
                 <>
-                  <div className="flex p-1 bg-background rounded-2xl mb-4 md:mb-6">
+                  <div className="flex p-1 bg-background mb-4 md:mb-6">
                     {[
                       { id: 'ADD', label: 'Buy More', icon: Plus, color: 'text-primary' },
-                      { id: 'REMOVE', label: 'Subtract', icon: Minus, color: 'text-amber-500' },
-                      { id: 'TRASH', label: 'Discard', icon: Trash2, color: 'text-red-500' }
+                      { id: 'REMOVE', label: 'Subtract', icon: Minus, color: 'text-warning' },
+                      { id: 'TRASH', label: 'Discard', icon: Trash2, color: 'text-error' }
                     ].map((t) => (
                       <button
                         key={t.id}
                         onClick={() => setAdjustType(t.id as any)}
                         className={cn(
-                          "flex-1 flex flex-col items-center py-3 rounded-xl transition-all",
-                          adjustType === t.id ? "bg-slate-800 shadow-lg" : "text-muted"
+                          "flex-1 flex flex-col items-center py-3  transition-all",
+                          adjustType === t.id ? "bg-surface-container shadow-lg" : "text-secondary"
                         )}
                       >
                          <t.icon size={20} className={adjustType === t.id ? t.color : ""} />
@@ -538,25 +538,25 @@ export default function InventoryPage() {
                     <div className="flex items-center gap-3 md:gap-4">
                       <button 
                         onClick={() => setAdjustQty(Math.max(1, adjustQty - 1))}
-                        className="w-12 h-12 rounded-full border border-slate-800 flex items-center justify-center hover:bg-slate-800 transition-colors"
+                        className="w-12 h-12 border border-outline/30 flex items-center justify-center hover:bg-surface-container transition-colors"
                       >
                         <Minus size={24} />
                       </button>
                       <span className="text-5xl font-normal tabular-nums">{adjustQty}</span>
                       <button 
                         onClick={() => setAdjustQty(adjustQty + 1)}
-                        className="w-12 h-12 rounded-full border border-slate-800 flex items-center justify-center hover:bg-slate-800 transition-colors"
+                        className="w-12 h-12 border border-outline/30 flex items-center justify-center hover:bg-surface-container transition-colors"
                       >
                         <Plus size={24} />
                       </button>
                     </div>
                     
                     {adjustType === 'TRASH' && (
-                      <div className="w-full bg-red-500/5 border border-red-500/20 p-4 rounded-2xl">
+                      <div className="w-full bg-error/5 border border-error/20 p-4">
                          <select 
                           value={trashReason} 
                           onChange={(e) => setTrashReason(e.target.value)}
-                          className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm outline-none text-foreground"
+                          className="w-full bg-background border border-outline/30 py-3 px-4 text-sm outline-none text-foreground"
                         >
                           <option>Damaged</option>
                           <option>Expired</option>
@@ -572,11 +572,11 @@ export default function InventoryPage() {
               <button 
                 onClick={isEditing ? handleUpdateItem : handleAdjustStock}
                 className={cn(
-                  "w-full py-4 sm:py-5 rounded-[1.8rem] font-normal text-lg transition-all active:scale-[0.98] shadow-xl",
-                  isEditing ? "bg-white text-slate-950 shadow-white/10" : (
-                    adjustType === 'ADD' ? "bg-primary text-white shadow-primary/20" : 
-                    adjustType === 'REMOVE' ? "bg-amber-600 text-white shadow-amber-600/20" : 
-                    "bg-red-600 text-white shadow-red-600/20"
+                  "w-full py-4 sm:py-5 ] font-normal text-lg transition-all active:scale-[0.98] shadow-xl",
+                  isEditing ? "bg-white text-background shadow-white/10" : (
+                    adjustType === 'ADD' ? "bg-primary text-foreground shadow-primary/20" : 
+                    adjustType === 'REMOVE' ? "bg-warning text-foreground shadow-warning/20" : 
+                    "bg-error text-foreground shadow-error/20"
                   )
                 )}
               >
@@ -593,10 +593,10 @@ export default function InventoryPage() {
       {/* Category Edit Overlay */}
       {editingCategory && (
         <div className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-background/90 animate-in fade-in duration-300">
-          <div className="bg-surface border border-slate-800 rounded-3xl p-4 md:p-6 max-w-sm w-full shadow-2xl space-y-3 md:space-y-4 animate-in zoom-in-95 duration-200">
+          <div className="bg-surface border border-outline/30 p-4 md:p-6 max-w-sm w-full shadow-2xl space-y-3 md:space-y-4 animate-in zoom-in-95 duration-200">
             <div className="flex justify-between items-center">
                <h2 className="text-xl font-normal">Edit Category</h2>
-               <button onClick={() => setEditingCategory(null)} className="p-2 hover:bg-slate-800 rounded-full transition-colors text-secondary">
+               <button onClick={() => setEditingCategory(null)} className="p-2 hover:bg-surface-container transition-colors text-secondary">
                  <X size={20} />
                </button>
             </div>
@@ -608,7 +608,7 @@ export default function InventoryPage() {
                   type="text" 
                   value={catEditedName}
                   onChange={e => setCatEditedName(e.target.value)}
-                  className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm outline-none text-secondary"
+                  className="w-full bg-background border border-outline/30 py-3 px-4 text-sm outline-none text-secondary"
                 />
               </div>
                <div>
@@ -616,14 +616,14 @@ export default function InventoryPage() {
                 <textarea 
                   value={catEditedDesc}
                   onChange={e => setCatEditedDesc(e.target.value)}
-                  className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm outline-none text-secondary h-24 resize-none"
+                  className="w-full bg-background border border-outline/30 py-3 px-4 text-sm outline-none text-secondary h-24 resize-none"
                 />
               </div>
             </div>
 
             <button 
               onClick={handleUpdateCategory}
-              className="w-full bg-primary text-white font-normal py-4 rounded-2xl shadow-xl shadow-primary/20 hover:scale-[1.02] active:scale-95 transition-all"
+              className="w-full bg-primary text-primary-foreground font-normal py-4 shadow-xl shadow-primary/20 hover:scale-[1.02] active:scale-95 transition-all"
             >
               Update Category
             </button>
@@ -642,7 +642,7 @@ export default function InventoryPage() {
       {/* Box Manager Modal */}
       {showBoxManager && (
         <div className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-background/90 animate-in fade-in duration-300">
-          <div className="w-full max-w-2xl bg-surface border border-slate-800 rounded-[2.5rem] shadow-2xl overflow-hidden flex flex-col max-h-[90vh]">
+          <div className="w-full max-w-2xl bg-surface border border-outline/30 ] shadow-2xl overflow-hidden flex flex-col max-h-[90vh]">
             <div className="p-4 md:p-6 pb-3 md:pb-4 flex flex-col gap-3 md:gap-4 shrink-0 bg-surface/70">
                <div className="flex justify-between items-center">
                   <div>
@@ -650,9 +650,9 @@ export default function InventoryPage() {
                       <Package className="text-primary" size={28} />
                       Box Inventory
                     </h3>
-                    <p className="text-sm text-muted font-normal mt-1">Manage physical box labels & printing</p>
+                    <p className="text-sm text-secondary font-normal mt-1">Manage physical box labels & printing</p>
                   </div>
-                  <button onClick={() => { setShowBoxManager(false); setBoxSearchQuery(''); }} className="p-3 hover:bg-slate-800 rounded-full transition-colors text-secondary">
+                  <button onClick={() => { setShowBoxManager(false); setBoxSearchQuery(''); }} className="p-3 hover:bg-surface-container transition-colors text-secondary">
                     <X size={24} />
                   </button>
                </div>
@@ -663,13 +663,13 @@ export default function InventoryPage() {
                    placeholder="Search boxes..."
                    value={boxSearchQuery}
                    onChange={(e) => setBoxSearchQuery(e.target.value)}
-                   className="w-full bg-background border border-slate-800 rounded-2xl py-3.5 pl-11 pr-4 text-sm focus:border-primary outline-none transition-all placeholder:text-secondary"
+                   className="w-full bg-background border border-outline/30 py-3.5 pl-11 pr-4 text-sm focus:border-primary outline-none transition-all placeholder:text-secondary"
                  />
                  <Search className="absolute left-4 top-1/2 -translate-y-1/2 text-secondary" size={18} />
                  {boxSearchQuery && (
                    <button 
                      onClick={() => setBoxSearchQuery('')}
-                     className="absolute right-3 top-1/2 -translate-y-1/2 p-1.5 hover:bg-slate-800 rounded-lg text-muted"
+                     className="absolute right-3 top-1/2 -translate-y-1/2 p-1.5 hover:bg-surface-container text-secondary"
                    >
                      <X size={14} />
                    </button>
@@ -689,21 +689,21 @@ export default function InventoryPage() {
                     {getFilteredBoxes(existingBoxes).map(box => {
                         const itemCount = inventory.filter(i => i.box_label === box).length;
                         return (
-                          <div key={box} className="bg-background/50 border border-slate-800/60 p-3 md:p-4 rounded-3xl flex flex-col gap-2 md:gap-3 group hover:border-primary/40 transition-all">
+                          <div key={box} className="bg-background/50 border border-outline/30 p-3 md:p-4 flex flex-col gap-2 md:gap-3 group hover:border-primary/40 transition-all">
                              <div className="flex-1 min-w-0">
-                                <h4 className="text-lg font-normal text-white truncate">{box}</h4>
-                                <p className="text-xs text-muted font-normal mt-0.5">{itemCount} items linked</p>
+                                <h4 className="text-lg font-normal text-foreground truncate">{box}</h4>
+                                <p className="text-xs text-secondary font-normal mt-0.5">{itemCount} items linked</p>
                              </div>
                              <div className="flex gap-2 shrink-0">
                                  <button 
                                    onClick={() => setSelectedBoxLabel(box)}
-                                   className="flex-1 py-3 bg-primary text-white text-xs font-normal rounded-xl flex items-center justify-center gap-2 hover:bg-blue-500 transition-colors shadow-lg shadow-primary/10 active:scale-95"
+                                   className="flex-1 py-3 bg-primary text-primary-foreground text-xs font-normal flex items-center justify-center gap-2 hover:bg-primary/90 transition-colors shadow-lg shadow-primary/10 active:scale-95"
                                  >
                                    <Printer size={14} /> Print Label
                                  </button>
                                  <button 
                                    onClick={() => { setSearchQuery(box); setShowBoxManager(false); setBoxSearchQuery(''); }}
-                                   className="px-4 py-3 bg-surface border border-slate-800 text-secondary text-xs font-normal rounded-xl hover:bg-slate-800 active:scale-95"
+                                   className="px-4 py-3 bg-surface border border-outline/30 text-secondary text-xs font-normal hover:bg-surface-container active:scale-95"
                                  >
                                    View
                                  </button>
@@ -715,8 +715,8 @@ export default function InventoryPage() {
                )}
             </div>
             
-            <div className="p-4 md:p-6 py-3 md:py-4 bg-background/50 border-t border-slate-800 text-center flex items-center justify-center gap-2">
-                <div className="w-1 h-1 rounded-full bg-primary animate-pulse" />
+            <div className="p-4 md:p-6 py-3 md:py-4 bg-background/50 border-t border-outline/30 text-center flex items-center justify-center gap-2">
+                <div className="w-1 h-1 bg-primary animate-pulse" />
                 <p className="text-xs text-secondary font-normal font-mono">TFM aInventory • Box management mode</p>
              </div>
           </div>
@@ -728,7 +728,7 @@ export default function InventoryPage() {
         <div className="fixed inset-0 z-[60] flex items-center justify-center p-4 bg-black/95 animate-in zoom-in-95 duration-200">
            <div className="w-full max-w-md flex flex-col gap-3 md:gap-4">
 
-              <div id="print-label-area" className="w-full bg-white p-4 md:p-6 rounded-lg shadow-2xl flex flex-col items-center gap-3 md:gap-4">
+              <div id="print-label-area" className="w-full bg-white p-4 md:p-6 shadow-2xl flex flex-col items-center gap-3 md:gap-4">
                  <h2 className="text-2xl font-normal text-black tracking-tighter text-center">
                    {selectedBoxLabel}
                  </h2>
@@ -743,7 +743,7 @@ export default function InventoryPage() {
               <div className="flex flex-col gap-2 md:gap-3 no-print">
                  <button 
                    onClick={() => window.print()}
-                   className="w-full py-5 bg-primary text-white rounded-[2rem] font-normal text-lg flex items-center justify-center gap-3 shadow-2xl shadow-primary/40 active:scale-95 transition-all"
+                   className="w-full py-5 bg-primary text-primary-foreground ] font-normal text-lg flex items-center justify-center gap-3 shadow-2xl shadow-primary/40 active:scale-95 transition-all"
                  >
                    <Printer size={20} /> Print to Dymo/Brother
                  </button>
@@ -772,14 +772,14 @@ export default function InventoryPage() {
                             img.src = "data:image/svg+xml;base64," + btoa(svgData);
                         }
                     }}
-                    className="w-full py-4 bg-surface border border-slate-800 text-white rounded-[2rem] font-normal text-sm flex items-center justify-center gap-2 active:scale-95 transition-all"
+                    className="w-full py-4 bg-surface border border-outline/30 text-foreground ] font-normal text-sm flex items-center justify-center gap-2 active:scale-95 transition-all"
                  >
                     <Download size={16} /> Save for Mobile App
                  </button>
                  
                  <button 
                    onClick={() => setSelectedBoxLabel(null)}
-                   className="w-full py-4 text-muted font-normal text-xs"
+                   className="w-full py-4 text-secondary font-normal text-xs"
                  >
                    Close Label Preview
                  </button>
@@ -828,3 +828,8 @@ export default function InventoryPage() {
     </PageShell>
   );
 }
+lose}
+      />
+    </PageShell>
+  );
+}
diff --git a/frontend/app/items/create.tsx b/frontend/app/items/create.tsx
index 7942371a..0ae0efa2 100644
--- a/frontend/app/items/create.tsx
+++ b/frontend/app/items/create.tsx
@@ -110,18 +110,10 @@ export default function CreateItemPage() {
 
     return (
       <div
-        className={`flex items-center gap-2 text-xs font-normal ${
-          isActive ? 'text-primary' : isCompleted ? 'text-slate-400' : 'text-slate-500'
-        }`}
+        className={`flex items-center gap-2 text-xs font-normal ${ isActive ? 'text-primary' : isCompleted ? 'text-secondary' : 'text-secondary' }`}
       >
         <div
-          className={`w-6 h-6 rounded-full flex items-center justify-center ${
-            isActive
-              ? 'bg-primary text-white'
-              : isCompleted
-                ? 'bg-slate-400 text-white'
-                : 'bg-slate-700'
-          }`}
+          className={`w-6 h-6 flex items-center justify-center ${ isActive ? 'bg-primary text-foreground' : isCompleted ? 'bg-surface-bright text-foreground' : 'bg-surface-bright' }`}
         >
           {stepNum}
         </div>
@@ -131,24 +123,24 @@ export default function CreateItemPage() {
   };
 
   return (
-    <div className="min-h-screen bg-slate-950 text-white p-4">
+    <div className="min-h-screen bg-background text-foreground p-4">
       {/* Header */}
       <div className="max-w-2xl mx-auto mb-6">
         <button
           onClick={() => router.back()}
-          className="flex items-center gap-2 text-sm text-slate-400 hover:text-white transition-colors mb-6"
+          className="flex items-center gap-2 text-sm text-secondary hover:text-foreground transition-colors mb-6"
         >
           <ArrowLeft size={16} />
           Back
         </button>
 
         <div className="flex items-center gap-4 mb-8">
-          <div className="p-3 bg-primary/10 rounded-lg border border-primary/20">
+          <div className="p-3 bg-primary/10 border border-primary/20">
             <Upload size={24} className="text-primary" />
           </div>
           <div>
             <h1 className="text-2xl font-normal">Create New Item</h1>
-            <p className="text-xs text-slate-500 mt-1">
+            <p className="text-xs text-secondary mt-1">
               Step {step === 'details' ? 1 : step === 'photo' ? 2 : step === 'preview' ? 3 : 4} of 4
             </p>
           </div>
@@ -167,7 +159,7 @@ export default function CreateItemPage() {
       <div className="max-w-2xl mx-auto">
         {/* Details Step */}
         {step === 'details' && (
-          <div className="bg-slate-900 rounded-lg border border-slate-800 p-6">
+          <div className="bg-surface-container border border-outline/30 p-6">
             <h2 className="text-lg font-normal mb-6">Item Details</h2>
 
             <div className="space-y-4">
@@ -179,7 +171,7 @@ export default function CreateItemPage() {
                   value={formData.name}
                   onChange={(e) => setFormData({ name: e.target.value })}
                   placeholder="Enter item name"
-                  className="w-full px-3 py-2 bg-slate-800 border border-slate-700 rounded-lg text-white placeholder-slate-500 focus:border-primary focus:outline-none"
+                  className="w-full px-3 py-2 bg-surface-container border border-outline-variant text-foreground placeholder-secondary focus:border-primary focus:outline-none"
                   disabled={isLoading}
                 />
               </div>
@@ -190,7 +182,7 @@ export default function CreateItemPage() {
                 <select
                   value={formData.category}
                   onChange={(e) => setFormData({ category: e.target.value })}
-                  className="w-full px-3 py-2 bg-slate-800 border border-slate-700 rounded-lg text-white focus:border-primary focus:outline-none"
+                  className="w-full px-3 py-2 bg-surface-container border border-outline-variant text-foreground focus:border-primary focus:outline-none"
                   disabled={isLoading}
                 >
                   <option value="">Select a category</option>
@@ -210,7 +202,7 @@ export default function CreateItemPage() {
                   value={formData.item_type}
                   onChange={(e) => setFormData({ item_type: e.target.value })}
                   placeholder="e.g., Component, Part, Equipment"
-                  className="w-full px-3 py-2 bg-slate-800 border border-slate-700 rounded-lg text-white placeholder-slate-500 focus:border-primary focus:outline-none"
+                  className="w-full px-3 py-2 bg-surface-container border border-outline-variant text-foreground placeholder-secondary focus:border-primary focus:outline-none"
                   disabled={isLoading}
                 />
               </div>
@@ -223,7 +215,7 @@ export default function CreateItemPage() {
                   min="1"
                   value={formData.quantity}
                   onChange={(e) => setFormData({ quantity: parseInt(e.target.value) || 1 })}
-                  className="w-full px-3 py-2 bg-slate-800 border border-slate-700 rounded-lg text-white focus:border-primary focus:outline-none"
+                  className="w-full px-3 py-2 bg-surface-container border border-outline-variant text-foreground focus:border-primary focus:outline-none"
                   disabled={isLoading}
                 />
               </div>
@@ -236,7 +228,7 @@ export default function CreateItemPage() {
                   value={formData.part_number || ''}
                   onChange={(e) => setFormData({ part_number: e.target.value })}
                   placeholder="e.g., PN-12345"
-                  className="w-full px-3 py-2 bg-slate-800 border border-slate-700 rounded-lg text-white placeholder-slate-500 focus:border-primary focus:outline-none"
+                  className="w-full px-3 py-2 bg-surface-container border border-outline-variant text-foreground placeholder-secondary focus:border-primary focus:outline-none"
                   disabled={isLoading}
                 />
               </div>
@@ -249,14 +241,14 @@ export default function CreateItemPage() {
                   value={formData.barcode || ''}
                   onChange={(e) => setFormData({ barcode: e.target.value })}
                   placeholder="e.g., 1234567890"
-                  className="w-full px-3 py-2 bg-slate-800 border border-slate-700 rounded-lg text-white placeholder-slate-500 focus:border-primary focus:outline-none"
+                  className="w-full px-3 py-2 bg-surface-container border border-outline-variant text-foreground placeholder-secondary focus:border-primary focus:outline-none"
                   disabled={isLoading}
                 />
               </div>
 
               {/* Error Message */}
               {error && (
-                <div className="p-3 bg-red-500/10 border border-red-500/30 rounded-lg text-red-400 text-sm">
+                <div className="p-3 bg-error/10 border border-error/30 text-error text-sm">
                   {error}
                 </div>
               )}
@@ -265,7 +257,7 @@ export default function CreateItemPage() {
               <div className="flex gap-3 pt-4">
                 <button
                   onClick={() => router.back()}
-                  className="flex-1 px-4 py-2 border border-slate-700 text-slate-300 rounded-lg hover:border-slate-600 transition-colors font-normal"
+                  className="flex-1 px-4 py-2 border border-outline-variant text-foreground hover:border-outline-variant transition-colors font-normal"
                   disabled={isLoading}
                 >
                   Discard Draft
@@ -273,7 +265,7 @@ export default function CreateItemPage() {
                 <button
                   onClick={handleDetailsSubmit}
                   disabled={isLoading}
-                  className="flex-1 px-4 py-2 bg-primary text-white rounded-lg hover:bg-primary/90 transition-colors font-normal flex items-center justify-center gap-2"
+                  className="flex-1 px-4 py-2 bg-primary text-foreground hover:bg-primary/90 transition-colors font-normal flex items-center justify-center gap-2"
                 >
                   {isLoading ? <Loader2 size={16} className="animate-spin" /> : <ChevronRight size={16} />}
                   {isLoading ? 'Creating...' : 'Next: Upload Photo'}
@@ -285,9 +277,9 @@ export default function CreateItemPage() {
 
         {/* Photo Upload Step */}
         {step === 'photo' && (
-          <div className="bg-slate-900 rounded-lg border border-slate-800 p-6">
+          <div className="bg-surface-container border border-outline/30 p-6">
             <h2 className="text-lg font-normal mb-4">Upload Item Photo</h2>
-            <p className="text-sm text-slate-400 mb-6">
+            <p className="text-sm text-secondary mb-6">
               Take a photo or upload an image. You can crop it manually on the next step.
             </p>
 
@@ -304,7 +296,7 @@ export default function CreateItemPage() {
             </div>
 
             {photoError && (
-              <div className="p-3 bg-red-500/10 border border-red-500/30 rounded-lg text-red-400 text-sm mb-6">
+              <div className="p-3 bg-error/10 border border-error/30 text-error text-sm mb-6">
                 {photoError}
               </div>
             )}
@@ -313,14 +305,14 @@ export default function CreateItemPage() {
             <div className="flex gap-3">
               <button
                 onClick={prevStep}
-                className="flex-1 px-4 py-2 border border-slate-700 text-slate-300 rounded-lg hover:border-slate-600 transition-colors font-normal"
+                className="flex-1 px-4 py-2 border border-outline-variant text-foreground hover:border-outline transition-colors font-normal"
               >
                 Back
               </button>
               <button
                 onClick={nextStep}
                 disabled={!uploadedPhoto}
-                className="flex-1 px-4 py-2 bg-primary text-white rounded-lg hover:bg-primary/90 disabled:bg-slate-700 disabled:text-slate-500 transition-colors font-normal flex items-center justify-center gap-2"
+                className="flex-1 px-4 py-2 bg-primary text-primary-foreground hover:bg-primary/90 disabled:bg-surface-bright disabled:text-secondary transition-colors font-normal flex items-center justify-center gap-2"
               >
                 <ChevronRight size={16} />
                 Next: Crop & Preview
@@ -331,13 +323,13 @@ export default function CreateItemPage() {
 
         {/* Preview Step (Crop) */}
         {step === 'preview' && uploadedPhoto && (
-          <div className="bg-slate-900 rounded-lg border border-slate-800 p-6">
+          <div className="bg-surface-container border border-outline/30 p-6">
             <h2 className="text-lg font-normal mb-4">Crop & Preview</h2>
-            <p className="text-sm text-slate-400 mb-6">
+            <p className="text-sm text-secondary mb-6">
               Adjust the crop area or use the full photo. Manual crop handles are visible.
             </p>
 
-            <div className="mb-6 bg-slate-800 rounded-lg p-4">
+            <div className="mb-6 bg-background p-4 border border-outline/20">
               <ManualCropUI
                 imageUrl={uploadedPhoto.full_url}
                 onCropChange={setCropBounds}
@@ -346,7 +338,7 @@ export default function CreateItemPage() {
             </div>
 
             {/* Use Full Photo Toggle */}
-            <div className="flex items-center gap-3 mb-6 p-3 bg-slate-800 rounded-lg">
+            <div className="flex items-center gap-3 mb-6 p-3 bg-surface-bright border border-outline/20">
               <input
                 type="checkbox"
                 id="use-full-photo"
@@ -357,9 +349,9 @@ export default function CreateItemPage() {
                     setCropBounds(null);
                   }
                 }}
-                className="w-4 h-4 rounded border-slate-600 accent-primary"
+                className="w-4 h-4 border-outline-variant accent-primary"
               />
-              <label htmlFor="use-full-photo" className="text-sm font-normal text-slate-300">
+              <label htmlFor="use-full-photo" className="text-sm font-normal text-foreground">
                 Use full photo (skip cropping)
               </label>
             </div>
@@ -368,13 +360,13 @@ export default function CreateItemPage() {
             <div className="flex gap-3">
               <button
                 onClick={prevStep}
-                className="flex-1 px-4 py-2 border border-slate-700 text-slate-300 rounded-lg hover:border-slate-600 transition-colors font-normal"
+                className="flex-1 px-4 py-2 border border-outline-variant text-foreground hover:border-outline transition-colors font-normal"
               >
                 Back
               </button>
               <button
                 onClick={nextStep}
-                className="flex-1 px-4 py-2 bg-primary text-white rounded-lg hover:bg-primary/90 transition-colors font-normal flex items-center justify-center gap-2"
+                className="flex-1 px-4 py-2 bg-primary text-primary-foreground hover:bg-primary/90 transition-colors font-normal flex items-center justify-center gap-2"
               >
                 <ChevronRight size={16} />
                 Next: Confirm
@@ -385,31 +377,31 @@ export default function CreateItemPage() {
 
         {/* Confirm Step */}
         {step === 'confirm' && (
-          <div className="bg-slate-900 rounded-lg border border-slate-800 p-6">
+          <div className="bg-surface-container border border-outline/30 p-6">
             <h2 className="text-lg font-normal mb-6">Confirm & Save</h2>
 
             {/* Item Summary */}
-            <div className="bg-slate-800 rounded-lg p-4 mb-6 space-y-2">
+            <div className="bg-surface-bright p-4 mb-6 space-y-2 border border-outline/20">
               <div className="flex justify-between text-sm">
-                <span className="text-slate-400">Name:</span>
-                <span className="font-normal">{formData.name}</span>
+                <span className="text-secondary">Name:</span>
+                <span className="font-normal text-foreground">{formData.name}</span>
               </div>
               <div className="flex justify-between text-sm">
-                <span className="text-slate-400">Category:</span>
-                <span className="font-normal">{formData.category}</span>
+                <span className="text-secondary">Category:</span>
+                <span className="font-normal text-foreground">{formData.category}</span>
               </div>
               <div className="flex justify-between text-sm">
-                <span className="text-slate-400">Type:</span>
-                <span className="font-normal">{formData.item_type}</span>
+                <span className="text-secondary">Type:</span>
+                <span className="font-normal text-foreground">{formData.item_type}</span>
               </div>
               <div className="flex justify-between text-sm">
-                <span className="text-slate-400">Quantity:</span>
-                <span className="font-normal">{formData.quantity}</span>
+                <span className="text-secondary">Quantity:</span>
+                <span className="font-normal text-foreground">{formData.quantity}</span>
               </div>
               {uploadedPhoto && (
                 <div className="flex justify-between text-sm">
-                  <span className="text-slate-400">Photo:</span>
-                  <span className="font-normal text-green-400">Uploaded</span>
+                  <span className="text-secondary">Photo:</span>
+                  <span className="font-normal text-success">Uploaded</span>
                 </div>
               )}
             </div>
@@ -417,12 +409,14 @@ export default function CreateItemPage() {
             {/* Photo Thumbnail */}
             {uploadedPhoto && (
               <div className="mb-6">
-                <p className="text-sm text-slate-400 mb-2">Photo Preview</p>
-                <img
-                  src={uploadedPhoto.thumbnail_url}
-                  alt="Item"
-                  className="w-full h-48 object-cover rounded-lg"
-                />
+                <p className="text-sm text-secondary mb-2">Photo Preview</p>
+                <div className="border border-outline/30 overflow-hidden">
+                  <img
+                    src={uploadedPhoto.thumbnail_url}
+                    alt="Item"
+                    className="w-full h-48 object-cover"
+                  />
+                </div>
               </div>
             )}
 
@@ -430,13 +424,13 @@ export default function CreateItemPage() {
             <div className="flex gap-3">
               <button
                 onClick={prevStep}
-                className="flex-1 px-4 py-2 border border-slate-700 text-slate-300 rounded-lg hover:border-slate-600 transition-colors font-normal"
+                className="flex-1 px-4 py-2 border border-outline-variant text-foreground hover:border-outline transition-colors font-normal"
               >
                 Back
               </button>
               <button
                 onClick={handleConfirm}
-                className="flex-1 px-4 py-2 bg-green-600 text-white rounded-lg hover:bg-green-700 transition-colors font-normal flex items-center justify-center gap-2"
+                className="flex-1 px-4 py-2 bg-success text-foreground hover:bg-success/80 transition-colors font-normal flex items-center justify-center gap-2 shadow-lg shadow-success/20"
               >
                 Save & Close
               </button>
diff --git a/frontend/app/login/page.tsx b/frontend/app/login/page.tsx
index 8b9810c0..bddfb86e 100644
--- a/frontend/app/login/page.tsx
+++ b/frontend/app/login/page.tsx
@@ -82,13 +82,13 @@ export default function LoginPage() {
     <div data-testid="identity-check-overlay" className="bg-background flex items-center justify-center p-4 md:min-h-screen">
       <Toaster position="top-center" />
 
-      <div className="bg-surface border border-slate-800 rounded-3xl p-4 md:p-6 max-w-sm w-full shadow-2xl space-y-3 md:space-y-4 animate-in fade-in zoom-in duration-500">
+      <div className="bg-surface border border-outline/30 p-4 md:p-6 max-w-sm w-full shadow-2xl space-y-3 md:space-y-4 animate-in fade-in zoom-in duration-500">
         <div className="text-center space-y-2">
-          <div className="w-16 h-16 bg-primary/10 text-primary rounded-2xl flex items-center justify-center mx-auto mb-4 border border-primary/20">
+          <div className="w-16 h-16 bg-primary/10 text-primary flex items-center justify-center mx-auto mb-4 border border-primary/20">
             <User size={32} />
           </div>
-          <h2 className="text-2xl font-normal text-white tracking-tight">Identity Check</h2>
-          <p className="text-muted text-sm">Select operator profile or use direct login</p>
+          <h2 className="text-2xl font-normal text-foreground tracking-tight">Identity Check</h2>
+          <p className="text-secondary text-sm">Select operator profile or use direct login</p>
         </div>
         
         <div data-testid="user-list" className="grid gap-2 md:gap-3">
@@ -101,15 +101,15 @@ export default function LoginPage() {
                       key={user.id}
                       data-testid="user-list-item"
                       onClick={() => handleSelectUser(user)}
-                      className="bg-slate-800/50 hover:bg-slate-800 border border-slate-800 hover:border-primary/40 p-4 rounded-2xl text-left transition-all group flex items-center justify-between"
+                      className="bg-surface-container/50 hover:bg-surface-container border border-outline/30 hover:border-primary/40 p-4 text-left transition-all group flex items-center justify-between"
                     >
                       <div className="flex items-center gap-3">
-                        <div className="w-8 h-8 rounded-full bg-surface border border-slate-700 flex items-center justify-center text-muted group-hover:text-primary transition-colors">
+                        <div className="w-8 h-8 bg-surface border border-outline-variant flex items-center justify-center text-secondary group-hover:text-primary transition-colors">
                           {user.role === 'admin' ? <Shield size={14} /> : <User size={14} />}
                         </div>
                         <div>
-                          <p className="text-white font-normal text-sm">{user.username}</p>
-                          <p className="text-xs text-muted font-normal mt-1">{user.role}</p>
+                          <p className="text-foreground font-normal text-sm">{user.username}</p>
+                          <p className="text-xs text-secondary font-normal mt-1">{user.role}</p>
                         </div>
                       </div>
                       <ChevronRight size={16} className="text-secondary group-hover:text-primary transition-colors" />
@@ -117,7 +117,7 @@ export default function LoginPage() {
                   ))}
                 </>
               ) : (
-                <div className="text-center p-4 text-muted text-xs font-normal animate-pulse">
+                <div className="text-center p-4 text-secondary text-xs font-normal animate-pulse">
                    Connectivity issues? Use manual login below.
                 </div>
               )}
@@ -126,7 +126,7 @@ export default function LoginPage() {
                 <button
                   data-testid="ldap-login-tab"
                   onClick={() => setIsEnterprise(true)}
-                  className="flex items-center justify-center gap-2 py-4 rounded-2xl border border-dashed border-slate-700 text-muted hover:text-white hover:border-slate-500 transition-all font-normal text-xs"
+                  className="flex items-center justify-center gap-2 py-4 border border-dashed border-outline-variant text-secondary hover:text-foreground hover:border-outline/30 transition-all font-normal text-xs"
                 >
                   <Lock size={12} />
                   Enterprise
@@ -137,7 +137,7 @@ export default function LoginPage() {
                     setSelectedUserForLogin({ username: '' });
                     // We use an empty username object to trigger the manual input view
                   }}
-                  className="flex items-center justify-center gap-2 py-4 rounded-2xl border border-primary/20 bg-primary/5 text-primary hover:bg-primary/10 transition-all font-normal text-xs"
+                  className="flex items-center justify-center gap-2 py-4 border border-primary/20 bg-primary/5 text-primary hover:bg-primary/10 transition-all font-normal text-xs"
                 >
                   <User size={12} />
                   Manual Login
@@ -147,7 +147,7 @@ export default function LoginPage() {
           ) : isEnterprise ? (
             <div className="space-y-4 animate-in slide-in-from-right-4 duration-300">
                <div className="flex justify-between items-center px-1">
-                 <p className="text-xs font-normal text-muted">Enterprise Account</p>
+                 <p className="text-xs font-normal text-secondary">Enterprise Account</p>
                  <button 
                    onClick={() => setIsEnterprise(false)}
                    className="text-xs font-normal text-primary hover:underline"
@@ -157,30 +157,30 @@ export default function LoginPage() {
                </div>
                
                <div className="space-y-2">
-                 <label className="text-xs font-normal text-muted px-1">Username</label>
+                 <label className="text-xs font-normal text-secondary px-1">Username</label>
                  <div className="relative">
-                   <User className="absolute left-4 top-1/2 -translate-y-1/2 text-muted" size={16} />
+                   <User className="absolute left-4 top-1/2 -translate-y-1/2 text-secondary" size={16} />
                    <input
                      ref={enterpriseUserRef}
                      data-testid="username-input"
                      type="text"
                      autoFocus
-                     className="w-full bg-slate-800/50 border border-slate-800 focus:border-primary rounded-2xl py-4 pl-12 pr-4 text-white focus:outline-none transition-all placeholder:text-slate-700 font-mono"
+                     className="w-full bg-surface-container/50 border border-outline/30 focus:border-primary py-4 pl-12 pr-4 text-foreground focus:outline-none transition-all placeholder:text-surface-bright font-mono"
                      placeholder="e.g. jsmith"
                    />
                  </div>
                </div>
 
                <div className="space-y-2">
-                 <label className="text-xs font-normal text-muted px-1">Password</label>
+                 <label className="text-xs font-normal text-secondary px-1">Password</label>
                  <div className="relative">
-                   <Lock className="absolute left-4 top-1/2 -translate-y-1/2 text-muted" size={16} />
+                   <Lock className="absolute left-4 top-1/2 -translate-y-1/2 text-secondary" size={16} />
                    <input
                      ref={enterprisePassRef}
                      data-testid="password-input"
                      type="password"
                      onKeyDown={(e) => e.key === 'Enter' && handleLogin()}
-                     className="w-full bg-slate-800/50 border border-slate-800 focus:border-primary rounded-2xl py-4 pl-12 pr-4 text-white/50 focus:text-white focus:outline-none transition-all placeholder:text-slate-700 font-mono"
+                     className="w-full bg-surface-container/50 border border-outline/30 focus:border-primary py-4 pl-12 pr-4 text-foreground/50 focus:text-foreground focus:outline-none transition-all placeholder:text-surface-bright font-mono"
                      placeholder="Enter password"
                    />
                  </div>
@@ -189,52 +189,52 @@ export default function LoginPage() {
                <button
                  data-testid="login-submit"
                  onClick={handleLogin}
-                 className="w-full bg-primary text-white font-normal py-4 rounded-2xl shadow-xl shadow-primary/20 active:scale-95 transition-all"
+                 className="w-full bg-primary text-foreground font-normal py-4 shadow-xl shadow-primary/20 active:scale-95 transition-all"
                >
                  Sign In
                </button>
             </div>
           ) : (
             <div className="space-y-4 animate-in slide-in-from-right-4 duration-300">
-               <div className="bg-slate-800/30 p-4 rounded-2xl border border-slate-800 flex items-center gap-3">
+               <div className="bg-surface-container/30 p-4 border border-outline/30 flex items-center gap-3">
                 <button 
                   onClick={() => setSelectedUserForLogin(null)}
-                  className="p-1 hover:bg-slate-700 rounded-lg transition-colors"
+                  className="p-1 hover:bg-surface-bright transition-colors"
                 >
                   <X size={16} className="text-secondary" />
                 </button>
                 <div>
-                  <p className="text-sm font-normal text-muted">Logging in as</p>
-                  <p className="text-white font-normal">{selectedUserForLogin.username || "Manual Input"}</p>
+                  <p className="text-sm font-normal text-secondary">Logging in as</p>
+                  <p className="text-foreground font-normal">{selectedUserForLogin.username || "Manual Input"}</p>
                 </div>
               </div>
               
               <div className="space-y-2">
-                <label className="text-xs font-normal text-muted px-1">Username</label>
+                <label className="text-xs font-normal text-secondary px-1">Username</label>
                 <div className="relative">
-                  <User className="absolute left-4 top-1/2 -translate-y-1/2 text-muted" size={16} />
+                  <User className="absolute left-4 top-1/2 -translate-y-1/2 text-secondary" size={16} />
                   <input
                     type="text"
                     autoFocus
                     value={selectedUserForLogin.username || ""}
                     onChange={(e) => setSelectedUserForLogin({...selectedUserForLogin, username: e.target.value})}
-                    className="w-full bg-slate-800/50 border border-slate-800 focus:border-primary rounded-2xl py-4 pl-12 pr-4 text-white focus:outline-none transition-all placeholder:text-slate-700 font-mono"
+                    className="w-full bg-surface-container/50 border border-outline/30 focus:border-primary py-4 pl-12 pr-4 text-foreground focus:outline-none transition-all placeholder:text-surface-bright font-mono"
                     placeholder="Admin"
                   />
                 </div>
               </div>
               
               <div className="space-y-2">
-                <label className="text-xs font-normal text-muted px-1">Password</label>
+                <label className="text-xs font-normal text-secondary px-1">Password</label>
                 <div className="relative">
-                  <Lock className="absolute left-4 top-1/2 -translate-y-1/2 text-muted" size={16} />
+                  <Lock className="absolute left-4 top-1/2 -translate-y-1/2 text-secondary" size={16} />
                    <input
                     ref={localPassRef}
                     data-testid="local-password-input"
                     type="password"
                     autoFocus={!!selectedUserForLogin.username}
                     onKeyDown={(e) => e.key === 'Enter' && handleLogin()}
-                    className="w-full bg-slate-800/50 border border-slate-800 focus:border-primary rounded-2xl py-4 pl-12 pr-4 text-white/50 focus:text-white focus:outline-none transition-all placeholder:text-slate-700 font-mono"
+                    className="w-full bg-surface-container/50 border border-outline/30 focus:border-primary py-4 pl-12 pr-4 text-foreground/50 focus:text-foreground focus:outline-none transition-all placeholder:text-surface-bright font-mono"
                     placeholder="Enter password"
                   />
                 </div>
@@ -243,7 +243,7 @@ export default function LoginPage() {
               <button
                 data-testid="local-login-submit"
                 onClick={handleLogin}
-                className="w-full bg-primary text-white font-normal py-4 rounded-2xl shadow-xl shadow-primary/20 active:scale-95 transition-all"
+                className="w-full bg-primary text-foreground font-normal py-4 shadow-xl shadow-primary/20 active:scale-95 transition-all"
               >
                 Verify Identity
               </button>
@@ -253,7 +253,7 @@ export default function LoginPage() {
         
         {/* Progress bar hint */}
         {users.length === 0 && !selectedUserForLogin && !isEnterprise && (
-          <div className="w-full bg-slate-800 h-1 rounded-full overflow-hidden">
+          <div className="w-full bg-surface-container h-1 overflow-hidden">
             <div className="bg-primary h-full animate-progress-fast shadow-[0_0_8px_rgba(var(--primary-rgb),0.5)]"></div>
           </div>
         )}
diff --git a/frontend/app/logs/page.tsx b/frontend/app/logs/page.tsx
index d29e5397..5bddc3c1 100644
--- a/frontend/app/logs/page.tsx
+++ b/frontend/app/logs/page.tsx
@@ -87,15 +87,15 @@ export default function LogsPage() {
 
   return (
     <PageShell>
-      <main className="p-3 md:p-8 max-w-7xl mx-auto space-y-3 md:space-y-6 mb-20">
+      <main className="p-4 md:p-8 max-w-7xl mx-auto space-y-4 md:space-y-6 mb-20">
         <header className="flex flex-col sm:flex-row sm:items-end justify-between gap-3 md:gap-4">
           <div className="flex items-center gap-4">
-            <div className="p-3 md:p-4 bg-primary/10 rounded-2xl text-primary border border-primary/20 shadow-xl shadow-primary/5">
-              <History size={28} className="md:w-8 md:h-8" />
+            <div className="p-4 bg-primary/10 text-primary border border-primary/20 shadow-xl shadow-primary/5">
+              <History size={32} />
             </div>
             <div>
-              <h1 className="text-2xl md:text-3xl font-normal tracking-tight text-white leading-tight">Operations Audit</h1>
-              <p className="text-xs md:text-sm text-secondary font-normal tracking-widest mt-0.5">Real-time Intervention Tracking</p>
+              <h1 className="text-2xl md:text-3xl font-normal tracking-tight text-foreground leading-tight">Operations Audit</h1>
+              <p className="text-xs md:text-sm text-secondary font-normal mt-0.5">Real-time Intervention Tracking</p>
             </div>
           </div>
           
@@ -103,7 +103,7 @@ export default function LogsPage() {
              <button 
                onClick={loadData}
                disabled={loading}
-               className="flex items-center gap-2 px-5 py-2.5 bg-surface border border-slate-800 text-secondary hover:text-white rounded-2xl text-xs font-normal transition-all active:scale-95 disabled:opacity-50 shadow-xl"
+               className="flex items-center gap-2 px-5 py-2.5 bg-surface border border-outline/30 text-secondary hover:text-foreground text-xs font-normal transition-all active:scale-95 disabled:opacity-50 shadow-xl"
              >
                <RefreshCw size={14} className={cn(loading && "animate-spin")} />
                Sync Logs
@@ -142,7 +142,7 @@ export default function LogsPage() {
               placeholder="Filter by user, action or asset..."
               value={searchQuery}
               onChange={(e) => setSearchQuery(e.target.value)}
-              className="w-full bg-surface/50 border border-slate-800 rounded-2xl py-3.5 pr-4 pl-12 text-sm focus:border-primary outline-none transition-all placeholder:text-secondary shadow-2xl"
+              className="w-full bg-surface/50 border border-outline/30 py-3.5 pr-4 pl-12 text-sm focus:border-primary outline-none transition-all placeholder:text-secondary shadow-2xl"
             />
             <div className="absolute left-4 top-1/2 -translate-y-1/2 text-secondary transition-colors group-focus-within:text-primary">
               <Search size={18} />
@@ -153,10 +153,10 @@ export default function LogsPage() {
             <button
               onClick={() => setFilterAction('ALL')}
               className={cn(
-                "px-5 py-2 rounded-full text-xs font-normal transition-all whitespace-nowrap border tracking-widest",
+                "px-5 py-2  text-xs font-normal transition-all whitespace-nowrap border ",
                 filterAction === 'ALL' 
-                  ? "bg-white text-slate-950 border-white shadow-xl shadow-white/10" 
-                  : "bg-surface/70 text-secondary border-slate-800 hover:border-slate-700"
+                  ? "bg-white text-background border-white shadow-xl shadow-white/10" 
+                  : "bg-surface/70 text-secondary border-outline/30 hover:border-outline-variant"
               )}
             >
               All Streams
@@ -166,10 +166,10 @@ export default function LogsPage() {
                 key={f}
                 onClick={() => setFilterAction(f)}
                 className={cn(
-                  "px-5 py-2 rounded-full text-xs font-normal transition-all whitespace-nowrap border tracking-widest",
+                  "px-5 py-2  text-xs font-normal transition-all whitespace-nowrap border ",
                   filterAction === f 
-                    ? "bg-primary text-white border-primary shadow-xl shadow-primary/10" 
-                    : "bg-surface/70 text-secondary border-slate-800 hover:border-slate-700"
+                    ? "bg-primary text-foreground border-primary shadow-xl shadow-primary/10" 
+                    : "bg-surface/70 text-secondary border-outline/30 hover:border-outline-variant"
                 )}
               >
                 {f}
diff --git a/frontend/app/page.tsx b/frontend/app/page.tsx
index 66c09959..f41f0192 100644
--- a/frontend/app/page.tsx
+++ b/frontend/app/page.tsx
@@ -360,7 +360,7 @@ export default function Home() {
 
   return (
     <PageShell>
-      <div className="p-3 md:p-8 overflow-x-hidden w-full max-w-7xl mx-auto">
+      <div className="p-4 md:p-8 overflow-x-hidden w-full max-w-7xl mx-auto">
         {/* Search datalists for autocomplete */}
       <datalist id="existing-types">
         {existingTypes.map(t => <option key={t} value={t} />)}
@@ -370,34 +370,30 @@ export default function Home() {
       </datalist>
 
         {/* Header */}
-        <header className="flex flex-col sm:flex-row justify-between sm:items-center gap-3 md:gap-4 mb-3 md:mb-4 w-full px-1">
-          <div className="flex items-center gap-2 md:gap-3">
-            <div className="p-1">
-              <img
-                src="/logo.png"
-                alt="TFM aInventory"
-                className="h-8 md:h-10 object-contain drop-shadow-xl rounded-lg"
-              />
+        <header className="flex flex-col sm:flex-row justify-between sm:items-center gap-4 mb-4 md:mb-6 w-full">
+          <div className="flex items-center gap-4">
+            <div className="p-4 bg-primary/10 border border-primary/20 shadow-xl shadow-primary/5">
+              <Package size={32} className="text-primary" />
             </div>
             <div>
-              <h1 className="text-2xl md:text-3xl font-normal tracking-tight text-white leading-tight">TFM aInventory</h1>
-            <p className="text-xs md:text-sm text-secondary font-normal tracking-tight mt-1 leading-relaxed">Check-in, Check-out & Trash Operations</p>
+              <h1 className="text-2xl md:text-3xl font-normal tracking-tight text-foreground leading-tight">TFM aInventory</h1>
+              <p className="text-xs md:text-sm text-secondary font-normal tracking-tight mt-1 leading-relaxed">Check-in, Check-out & Trash Operations</p>
             </div>
           </div>
 
-          <div className="flex flex-wrap items-center justify-between sm:justify-end gap-2 md:gap-3 bg-surface/50 sm:bg-transparent px-3 py-2 sm:p-0 rounded-2xl border border-slate-800/50 sm:border-none">
+          <div className="flex flex-wrap items-center justify-between sm:justify-end gap-2 md:gap-3 bg-surface/50 sm:bg-transparent px-3 py-2 sm:p-0 border border-outline/30/50 sm:border-none">
             <div className="flex flex-wrap items-center gap-2 md:gap-3">
               {isScannerReady && (
                 <div className="flex items-center gap-2">
-                  <div className="w-1.5 h-1.5 rounded-full bg-green-500 shadow-[0_0_8px_rgba(34,197,94,0.6)]" />
-                  <span className="text-xs font-normal text-green-500/90 whitespace-nowrap">
+                  <div className="w-1.5 h-1.5 bg-success shadow-[0_0_8px_rgba(34,197,94,0.6)]" />
+                  <span className="text-xs font-normal text-success/90 whitespace-nowrap">
                     Scanner: OK
                   </span>
                 </div>
               )}
               <div className="flex items-center gap-2" data-testid={!isOnline ? "offline-indicator" : undefined}>
-                <div className={`w-1.5 h-1.5 rounded-full ${isOnline ? 'bg-green-500 animate-pulse shadow-[0_0_8px_rgba(34,197,94,0.6)]' : 'bg-rose-500 shadow-[0_0_8px_rgba(244,63,94,0.6)]'}`} />
-                <span className={`text-xs font-normal whitespace-nowrap ${isOnline ? 'text-green-500/90' : 'text-rose-500/90'}`} data-testid={!isOnline ? "offline-sync-indicator" : undefined}>
+                <div className={`w-1.5 h-1.5 ${isOnline ? 'bg-success animate-pulse shadow-[0_0_8px_rgba(34,197,94,0.6)]' : 'bg-error shadow-[0_0_8px_rgba(244,63,94,0.6)]'}`} />
+                <span className={`text-xs font-normal whitespace-nowrap ${isOnline ? 'text-success/90' : 'text-error/90'}`} data-testid={!isOnline ? "offline-sync-indicator" : undefined}>
                   Sync: {isOnline ? 'Active' : 'Offline'}
                 </span>
               </div>
@@ -405,7 +401,7 @@ export default function Home() {
             <div className="flex items-center gap-2">
               <button
                 onClick={() => setShowSearch(true)}
-                className="p-2.5 bg-surface border border-slate-800 text-secondary rounded-xl hover:text-white transition-all active:scale-95"
+                className="p-2.5 bg-surface border border-outline/30 text-secondary hover:text-foreground transition-all active:scale-95"
                 title="Search (Ctrl+K)"
               >
                 <Search size={18} />
@@ -414,7 +410,7 @@ export default function Home() {
                 onClick={handleSync}
                 disabled={syncing}
                 data-testid="manual-sync-button"
-                className="p-2.5 bg-surface border border-slate-800 text-secondary rounded-xl hover:text-white transition-all active:scale-95 disabled:opacity-50"
+                className="p-2.5 bg-surface border border-outline/30 text-secondary hover:text-foreground transition-all active:scale-95 disabled:opacity-50"
               >
                 <RefreshCw size={18} className={syncing ? "animate-spin text-primary" : ""} />
               </button>
@@ -498,7 +494,7 @@ export default function Home() {
         {/* Box Contents Selection Modal */}
       {boxMatches.length > 0 && !selectedItem && (
         <div className="fixed inset-0 z-50 flex items-end sm:items-center justify-center p-4 bg-background/80 animate-in fade-in duration-200">
-          <div className="w-full max-w-lg bg-surface border border-slate-800 rounded-[2.5rem] shadow-2xl p-4 md:p-6 overflow-hidden animate-in slide-in-from-bottom-10 duration-300 flex flex-col max-h-[85vh]">
+          <div className="w-full max-w-lg bg-surface border border-outline/30 ] shadow-2xl p-4 md:p-6 overflow-hidden animate-in slide-in-from-bottom-10 duration-300 flex flex-col max-h-[85vh]">
             <div className="flex justify-between items-center mb-3 md:mb-4 shrink-0">
               <div>
                 <h3 className="text-xl font-normal tracking-tight flex items-center gap-2">
@@ -507,7 +503,7 @@ export default function Home() {
                 </h3>
                 <p className="text-xs text-secondary font-normal mt-1">Select the item you want to {mode.replace('_', ' ').toLowerCase()}</p>
               </div>
-              <button onClick={() => setBoxMatches([])} className="p-2 hover:bg-slate-800 rounded-full">
+              <button onClick={() => setBoxMatches([])} className="p-2 hover:bg-surface-container">
                 <X size={20} />
               </button>
             </div>
@@ -520,10 +516,10 @@ export default function Home() {
                     setBoxMatches([]);
                     setAdjustType(mode === 'CHECK_IN' ? 'ADD' : 'REMOVE');
                   }}
-                  className="w-full text-left bg-background/50 hover:bg-slate-800 border border-slate-800/80 p-3 md:p-4 rounded-2xl flex items-center gap-2 md:gap-3 transition-all active:scale-[0.98] group"
+                  className="w-full text-left bg-background/50 hover:bg-surface-container border border-outline/50 p-3 md:p-4 flex items-center gap-2 md:gap-3 transition-all active:scale-[0.98] group"
                 >
                   <div className="flex-1 min-w-0">
-                    <p className="text-sm font-normal text-white">{item.name}</p>
+                    <p className="text-sm font-normal text-foreground">{item.name}</p>
                     <p className="text-xs text-secondary font-normal mt-1">Part #: {item.part_number || 'N/A'}</p>
                   </div>
                   <ChevronRight size={18} className="text-secondary group-hover:text-primary" />
@@ -538,7 +534,7 @@ export default function Home() {
       {/* Footer Branding */}
         <footer className="mt-12 md:mt-20 mb-4 md:mb-8 flex flex-col items-center gap-2 opacity-70">
           <p className="text-sm font-normal text-secondary">Powered by TFM Group Software</p>
-          <div className="h-px w-16 bg-slate-700/60" />
+          <div className="h-px w-16 bg-outline/30" />
           <p className="text-xs font-mono text-secondary">v{versionData.version} • {versionData.last_build} • BUILD: dev-{(versionData as any).commit || 'N/A'}</p>
         </footer>
       </div>
diff --git a/frontend/components/AIOnboarding.tsx b/frontend/components/AIOnboarding.tsx
index 186d1308..888af6b8 100644
--- a/frontend/components/AIOnboarding.tsx
+++ b/frontend/components/AIOnboarding.tsx
@@ -61,18 +61,18 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
     <div data-testid="ai-extraction-overlay" className="fixed inset-0 z-50 bg-background flex flex-col p-6 animate-in fade-in slide-in-from-bottom-5 duration-300">
       <div className="flex justify-between items-center mb-6 shrink-0">
         <div className="flex items-center gap-3">
-            <div className="p-2 bg-primary/20 rounded-xl">
+            <div className="p-2 bg-primary/20">
                <Sparkles className="text-primary w-5 h-5" />
             </div>
             <div>
               <h2 className="text-lg font-normal">AI Discovery</h2>
-              <p className="text-xs text-muted font-normal">Powered by Gemini 2.0 Flash</p>
+              <p className="text-xs text-secondary font-normal">Powered by Gemini 2.0 Flash</p>
             </div>
         </div>
         <button
           onClick={() => { stopLiveCamera(); onCancel(); }}
           aria-label="Close AI Discovery"
-          className="p-2 hover:bg-surface rounded-full cursor-pointer transition-colors focus:ring-2 focus:ring-blue-500 focus:outline-none"
+          className="p-2 hover:bg-surface cursor-pointer transition-colors focus:ring-2 focus:ring-primary focus:outline-none"
         >
           <X size={24} />
         </button>
@@ -80,11 +80,11 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
 
       {!image && !isLive ? (
         <div className="flex-1 flex flex-col gap-3 md:gap-4 min-h-0">
-          <div data-testid="multi-item-toggle" className="flex bg-surface/70 p-1.5 rounded-2xl border border-slate-800/50 shrink-0">
+          <div data-testid="multi-item-toggle" className="flex bg-surface/70 p-1.5 border border-outline/30/50 shrink-0">
             <button
               onClick={() => setMode('item')}
               aria-label="Select Discovery Mode"
-              className={`flex-1 flex items-center justify-center gap-2 py-3 rounded-xl font-normal cursor-pointer transition-all focus:ring-2 focus:ring-primary focus:outline-none ${mode === 'item' ? 'bg-primary text-white shadow-lg' : 'text-muted hover:text-secondary'}`}
+              className={`flex-1 flex items-center justify-center gap-2 py-3 font-normal cursor-pointer transition-all focus:ring-2 focus:ring-primary focus:outline-none ${mode === 'item' ? 'bg-primary text-foreground shadow-lg' : 'text-secondary hover:text-secondary'}`}
             >
               <Package size={18} />
               <span className="text-xs">Discovery Mode</span>
@@ -92,21 +92,21 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
             <button
               onClick={() => setMode('box')}
               aria-label="Select Box Lookup mode"
-              className={`flex-1 flex items-center justify-center gap-2 py-3 rounded-xl font-normal cursor-pointer transition-all focus:ring-2 focus:ring-primary focus:outline-none ${mode === 'box' ? 'bg-primary text-white shadow-lg' : 'text-muted hover:text-secondary'}`}
+              className={`flex-1 flex items-center justify-center gap-2 py-3 font-normal cursor-pointer transition-all focus:ring-2 focus:ring-primary focus:outline-none ${mode === 'box' ? 'bg-primary text-foreground shadow-lg' : 'text-secondary hover:text-secondary'}`}
             >
               <Layers size={18} />
               <span className="text-xs">Box Lookup</span>
             </button>
           </div>
 
-          <div className="flex-1 flex flex-col items-center justify-center border-2 border-dashed border-slate-800 rounded-[2.5rem] bg-surface/30 overflow-hidden px-4">
-            <div className="w-20 h-20 bg-surface rounded-3xl flex items-center justify-center mb-6 shadow-inner text-primary">
+          <div className="flex-1 flex flex-col items-center justify-center border-2 border-dashed border-outline/30 ] bg-surface/30 overflow-hidden px-4">
+            <div className="w-20 h-20 bg-surface flex items-center justify-center mb-6 shadow-inner text-primary">
                <Camera size={32} />
             </div>
             <p className="text-secondary mb-2 text-center font-normal">
                {mode === 'box' ? 'Deep Box Analysis' : 'Multi-Item Extraction'}
             </p>
-            <p className="text-xs text-muted px-8 text-center leading-relaxed font-normal">
+            <p className="text-xs text-secondary px-8 text-center leading-relaxed font-normal">
               {mode === 'box' 
                 ? 'Scan container labels to identify storage locations'
                 : 'Identify multiple technical items from a single photo or label'}
@@ -117,7 +117,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
             <button
               onClick={startLiveCamera}
               aria-label="Start camera scan"
-              className="flex flex-col items-center justify-center gap-2 bg-primary text-white rounded-3xl font-normal shadow-2xl shadow-primary/20 cursor-pointer active:scale-95 transition-all focus:ring-2 focus:ring-blue-400 focus:outline-none"
+              className="flex flex-col items-center justify-center gap-2 bg-primary text-foreground font-normal shadow-2xl shadow-primary/20 cursor-pointer active:scale-95 transition-all focus:ring-2 focus:ring-primary focus:outline-none"
             >
               <Camera size={24} />
               <span className="text-sm">Scan Camera</span>
@@ -126,7 +126,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
               onClick={() => fileInputRef.current?.click()}
               data-testid="manual-entry-tab"
               aria-label="Upload photo from device"
-              className="flex flex-col items-center justify-center gap-2 bg-surface text-secondary border border-slate-800 rounded-3xl font-normal cursor-pointer active:scale-95 transition-all focus:ring-2 focus:ring-blue-500 focus:outline-none"
+              className="flex flex-col items-center justify-center gap-2 bg-surface text-secondary border border-outline/30 font-normal cursor-pointer active:scale-95 transition-all focus:ring-2 focus:ring-primary focus:outline-none"
             >
               <ImageIcon size={24} />
               <span className="text-sm">Upload Photo</span>
@@ -138,7 +138,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
       ) : isLive ? (
         // LIVE VIEWFINDER MODE
         <div data-testid="wizard-step wizard-step-capture" className="flex-1 flex flex-col gap-3 md:gap-4 min-h-0 overflow-hidden">
-          <div data-testid="capture-camera" className="relative flex-1 min-h-0 rounded-[2.5rem] overflow-hidden border-4 border-slate-900 shadow-2xl bg-black">
+          <div data-testid="capture-camera" className="relative flex-1 min-h-0 ] overflow-hidden border-4 border-outline/30 shadow-2xl bg-black">
             <video
               ref={videoRef}
               autoPlay
@@ -149,18 +149,18 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
             <canvas ref={canvasRef} className="hidden" />
             
             <div className="absolute inset-0 border-[20px] border-black/20 pointer-events-none">
-               <div className="w-full h-full border border-primary/30 rounded-2xl relative">
+               <div className="w-full h-full border border-primary/30 relative">
                   {/* Corner Markers */}
-                  <div className="absolute top-0 left-0 w-8 h-8 border-t-2 border-l-2 border-primary rounded-tl-xl" />
-                  <div className="absolute top-0 right-0 w-8 h-8 border-t-2 border-r-2 border-primary rounded-tr-xl" />
-                  <div className="absolute bottom-0 left-0 w-8 h-8 border-b-2 border-l-2 border-primary rounded-bl-xl" />
-                  <div className="absolute bottom-0 right-0 w-8 h-8 border-b-2 border-r-2 border-primary rounded-br-xl" />
+                  <div className="absolute top-0 left-0 w-8 h-8 border-t-2 border-l-2 border-primary" />
+                  <div className="absolute top-0 right-0 w-8 h-8 border-t-2 border-r-2 border-primary" />
+                  <div className="absolute bottom-0 left-0 w-8 h-8 border-b-2 border-l-2 border-primary" />
+                  <div className="absolute bottom-0 right-0 w-8 h-8 border-b-2 border-r-2 border-primary" />
                </div>
             </div>
             
-            <div className="absolute top-6 left-1/2 -translate-x-1/2 bg-black/60 px-4 py-1.5 rounded-full border border-white/10">
-               <span className="text-xs font-normal text-white flex items-center gap-2">
-                 <div className="w-1.5 h-1.5 rounded-full bg-red-500 animate-pulse" />
+            <div className="absolute top-6 left-1/2 -translate-x-1/2 bg-black/60 px-4 py-1.5 border border-white/10">
+               <span className="text-xs font-normal text-foreground flex items-center gap-2">
+                 <div className="w-1.5 h-1.5 bg-error animate-pulse" />
                  Live Viewfinder
                </span>
             </div>
@@ -170,7 +170,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
             <button
               onClick={stopLiveCamera}
               aria-label="Cancel camera scan"
-              className="px-6 py-4 bg-surface border border-slate-800 text-secondary rounded-2xl font-normal cursor-pointer transition-all active:scale-95 focus:ring-2 focus:ring-blue-500 focus:outline-none"
+              className="px-6 py-4 bg-surface border border-outline/30 text-secondary font-normal cursor-pointer transition-all active:scale-95 focus:ring-2 focus:ring-primary focus:outline-none"
             >
               Cancel
             </button>
@@ -178,10 +178,10 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
               onClick={captureSnapshot}
               data-testid="capture-button"
               aria-label="Capture image from camera"
-              className="flex-1 py-4 bg-white text-slate-950 rounded-2xl font-normal text-lg shadow-xl shadow-white/10 cursor-pointer flex items-center justify-center gap-3 active:scale-95 hover:bg-slate-200 transition-all focus:ring-2 focus:ring-offset-2 focus:ring-offset-slate-950 focus:ring-white focus:outline-none"
+              className="flex-1 py-4 bg-white text-background font-normal text-lg shadow-xl shadow-white/10 cursor-pointer flex items-center justify-center gap-3 active:scale-95 hover:bg-foreground transition-all focus:ring-2 focus:ring-offset-2 focus:ring-offset-background focus:ring-white focus:outline-none"
             >
-              <div className="w-5 h-5 rounded-full border-2 border-slate-950 flex items-center justify-center">
-                 <div className="w-2.5 h-2.5 rounded-full bg-background" />
+              <div className="w-5 h-5 border-2 border-background flex items-center justify-center">
+                 <div className="w-2.5 h-2.5 bg-background" />
               </div>
               Capture Image
             </button>
@@ -189,7 +189,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
         </div>
       ) : extractedItems.length === 0 ? (
         <div data-testid="wizard-step" className="flex-1 flex flex-col gap-3 md:gap-4 min-h-0 overflow-hidden">
-          <div className="relative flex-1 min-h-0 rounded-[2.5rem] overflow-hidden border-4 border-slate-900 shadow-2xl bg-surface">
+          <div className="relative flex-1 min-h-0 ] overflow-hidden border-4 border-outline/30 shadow-2xl bg-surface">
             <img src={image || undefined} className="w-full h-full object-contain" alt="Captured label" />
             <div className="absolute inset-0 bg-black/30 pointer-events-none" />
             
@@ -199,7 +199,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
                   <RefreshCw className="w-12 h-12 text-primary animate-spin" />
                   <Sparkles className="absolute -top-2 -right-2 text-amber-400 w-6 h-6 animate-pulse" />
                 </div>
-                <p className="text-white font-normal tracking-tight text-sm">Gemini is processing...</p>
+                <p className="text-foreground font-normal tracking-tight text-sm">Gemini is processing...</p>
               </div>
             )}
           </div>
@@ -210,7 +210,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
               disabled={uploading}
               data-testid="retake-button"
               aria-label="Retake photo"
-              className="px-6 py-4 bg-surface border border-slate-800 text-secondary rounded-2xl font-normal cursor-pointer transition-all active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed focus:ring-2 focus:ring-blue-500 focus:outline-none"
+              className="px-6 py-4 bg-surface border border-outline/30 text-secondary font-normal cursor-pointer transition-all active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed focus:ring-2 focus:ring-primary focus:outline-none"
             >
               Retake
             </button>
@@ -218,7 +218,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
               onClick={processImage}
               disabled={uploading}
               aria-label="Extract data from image"
-              className="flex-1 py-4 bg-primary text-white rounded-2xl font-normal text-lg shadow-xl shadow-primary/30 cursor-pointer flex items-center justify-center gap-3 active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed hover:bg-blue-500 transition-all focus:ring-2 focus:ring-blue-400 focus:outline-none"
+              className="flex-1 py-4 bg-primary text-foreground font-normal text-lg shadow-xl shadow-primary/30 cursor-pointer flex items-center justify-center gap-3 active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed hover:bg-primary transition-all focus:ring-2 focus:ring-primary focus:outline-none"
             >
               {uploading ? "Analyzing..." : "Extract Data"}
               {!uploading && <Check size={20} />}
@@ -228,11 +228,11 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
       ) : editingIndex !== null ? (
         <div data-testid="extraction-results-form" className="flex-1 flex flex-col gap-3 md:gap-4 overflow-hidden">
           <div data-testid="ai-onboarding-wizard" className="flex items-center justify-between">
-              <span className="text-xs text-muted font-normal">Item Details (<span data-testid="current-step">{editingIndex + 1}</span>/<span data-testid="total-steps">{extractedItems.length}</span>)</span>
+              <span className="text-xs text-secondary font-normal">Item Details (<span data-testid="current-step">{editingIndex + 1}</span>/<span data-testid="total-steps">{extractedItems.length}</span>)</span>
               <button
                 onClick={() => setEditingIndex(null)}
                 aria-label="Back to item list"
-                className="text-xs text-primary font-normal px-3 py-1 bg-primary/10 rounded-full cursor-pointer transition-colors focus:ring-2 focus:ring-primary focus:outline-none"
+                className="text-xs text-primary font-normal px-3 py-1 bg-primary/10 cursor-pointer transition-colors focus:ring-2 focus:ring-primary focus:outline-none"
               >
                 Back to List
               </button>
@@ -240,7 +240,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
 
           {/* Image Preview Section */}
           {image && (
-            <div className="bg-surface/70 border border-slate-800/50 rounded-2xl overflow-hidden">
+            <div className="bg-surface/70 border border-outline/30/50 overflow-hidden">
               <div className="relative h-40 md:h-48 bg-black/20 flex items-center justify-center">
                 <img
                   src={image}
@@ -249,16 +249,16 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
                 />
               </div>
               <div className="p-3 space-y-2">
-                <p className="text-xs text-muted font-normal">Extracted Photo</p>
+                <p className="text-xs text-secondary font-normal">Extracted Photo</p>
                 <div className="flex items-center gap-2">
                   <input
                     type="checkbox"
                     id="save-photo-check"
                     checked={!extractedItems[editingIndex]._skipPhoto}
                     onChange={(e) => updateEditingItem({ _skipPhoto: !e.target.checked })}
-                    className="w-4 h-4 rounded border-slate-600 accent-primary cursor-pointer"
+                    className="w-4 h-4 border-outline-variant accent-primary cursor-pointer"
                   />
-                  <label htmlFor="save-photo-check" className="text-xs text-slate-300 font-normal cursor-pointer">
+                  <label htmlFor="save-photo-check" className="text-xs text-foreground font-normal cursor-pointer">
                     Save this photo with the item
                   </label>
                 </div>
@@ -267,19 +267,19 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
           )}
 
           <div className="flex-1 overflow-y-auto space-y-2 pr-1 scrollbar-hide">
-            <div data-testid="extracted-name" className="bg-surface py-2.5 px-4 rounded-[1.2rem] border border-slate-800 focus-within:border-primary/50 transition-colors group">
-              <label className="text-xs text-muted font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Item Name</label>
+            <div data-testid="extracted-name" className="bg-surface py-2.5 px-4 ] border border-outline/30 focus-within:border-primary/50 transition-colors group">
+              <label className="text-xs text-secondary font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Item Name</label>
               <textarea
                 value={extractedItems[editingIndex].Item || extractedItems[editingIndex].name || ''}
                 onChange={(e) => updateEditingItem({ Item: e.target.value })}
-                className="bg-transparent w-full text-lg font-normal outline-none text-white placeholder:text-muted resize-none h-8 leading-tight selection:bg-primary/30 py-0"
+                className="bg-transparent w-full text-lg font-normal outline-none text-foreground placeholder:text-secondary resize-none h-8 leading-tight selection:bg-primary/30 py-0"
                 placeholder="SSD, SFP, Cable..."
               />
             </div>
 
             <div className="grid grid-cols-2 gap-4">
-               <div data-testid="extracted-category" className="bg-surface py-3 px-4 rounded-[1.2rem] border border-slate-800 focus-within:border-primary/50 transition-colors group">
-                 <label className="text-xs text-muted font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Category</label>
+               <div data-testid="extracted-category" className="bg-surface py-3 px-4 ] border border-outline/30 focus-within:border-primary/50 transition-colors group">
+                 <label className="text-xs text-secondary font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Category</label>
                 <input 
                   type="text"
                   list="onboarding-categories"
@@ -294,8 +294,8 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
                   ))}
                 </datalist>
               </div>
-              <div className="bg-surface py-2.5 px-4 rounded-[1.2rem] border border-slate-800 focus-within:border-primary/50 transition-colors group">
-                <label className="text-xs text-muted font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Item Type</label>
+              <div className="bg-surface py-2.5 px-4 ] border border-outline/30 focus-within:border-primary/50 transition-colors group">
+                <label className="text-xs text-secondary font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Item Type</label>
                 <input 
                   value={extractedItems[editingIndex].Type || extractedItems[editingIndex].type || ''} 
                   list="onboarding-types"
@@ -310,8 +310,8 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
             </div>
 
             <div className="grid grid-cols-2 gap-3">
-              <div className="bg-surface py-3 px-4 rounded-[1.2rem] border border-slate-800 focus-within:border-primary/50 transition-colors group">
-                <label className="text-xs text-muted font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Item Color</label>
+              <div className="bg-surface py-3 px-4 ] border border-outline/30 focus-within:border-primary/50 transition-colors group">
+                <label className="text-xs text-secondary font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Item Color</label>
                 <input 
                   value={extractedItems[editingIndex].Color || extractedItems[editingIndex].color || ''} 
                   onChange={(e) => updateEditingItem({ Color: e.target.value })}
@@ -319,8 +319,8 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
                   placeholder="e.g. Aqua"
                 />
               </div>
-              <div className="bg-surface py-2.5 px-4 rounded-[1.2rem] border border-slate-800 focus-within:border-primary/50 transition-colors group">
-                <label className="text-xs text-muted font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Box / Container</label>
+              <div className="bg-surface py-2.5 px-4 ] border border-outline/30 focus-within:border-primary/50 transition-colors group">
+                <label className="text-xs text-secondary font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Box / Container</label>
                 <input 
                   value={extractedItems[editingIndex].box_label || ''} 
                   list="onboarding-boxes"
@@ -334,8 +334,8 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
               </div>
             </div>
 
-            <div className="bg-surface py-2.5 px-4 rounded-[1.2rem] border border-slate-800 focus-within:border-primary/50 transition-colors group">
-              <label className="text-xs text-muted font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Description</label>
+            <div className="bg-surface py-2.5 px-4 ] border border-outline/30 focus-within:border-primary/50 transition-colors group">
+              <label className="text-xs text-secondary font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Description</label>
               <textarea 
                 value={extractedItems[editingIndex].Description || extractedItems[editingIndex].description || ''} 
                 onChange={(e) => updateEditingItem({ Description: e.target.value })}
@@ -345,8 +345,8 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
             </div>
 
             <div className="grid grid-cols-2 gap-3">
-               <div className="bg-surface py-3 px-4 rounded-[1.2rem] border border-slate-800 focus-within:border-primary/50 transition-colors group">
-                <label className="text-xs text-muted font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Connector</label>
+               <div className="bg-surface py-3 px-4 ] border border-outline/30 focus-within:border-primary/50 transition-colors group">
+                <label className="text-xs text-secondary font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Connector</label>
                 <input 
                   value={extractedItems[editingIndex].Connector || extractedItems[editingIndex].connector || ''} 
                   onChange={(e) => updateEditingItem({ Connector: e.target.value })}
@@ -354,8 +354,8 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
                   placeholder="e.g. LC/UPC"
                 />
               </div>
-              <div className="bg-surface px-4 rounded-[1.2rem] border border-slate-800 focus-within:border-primary/50 transition-colors group">
-                <label className="text-xs text-muted font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Size / Length</label>
+              <div className="bg-surface px-4 ] border border-outline/30 focus-within:border-primary/50 transition-colors group">
+                <label className="text-xs text-secondary font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Size / Length</label>
                 <input 
                   value={extractedItems[editingIndex].Size || extractedItems[editingIndex].size || ''} 
                   onChange={(e) => updateEditingItem({ Size: e.target.value })}
@@ -365,8 +365,8 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
               </div>
             </div>
 
-            <div className="bg-surface py-2.5 px-4 rounded-[1.2rem] border border-slate-800 focus-within:border-primary/50 transition-colors group">
-              <label className="text-xs text-muted font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">OCR Matching Key</label>
+            <div className="bg-surface py-2.5 px-4 ] border border-outline/30 focus-within:border-primary/50 transition-colors group">
+              <label className="text-xs text-secondary font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">OCR Matching Key</label>
               <textarea 
                 value={extractedItems[editingIndex].OCR || extractedItems[editingIndex].ocr_text || ''} 
                 onChange={(e) => updateEditingItem({ OCR: e.target.value })}
@@ -376,8 +376,8 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
             </div>
 
             <div className="grid grid-cols-2 gap-2">
-              <div className="bg-surface py-2.5 px-4 rounded-[1.2rem] border border-slate-800 focus-within:border-primary/50 transition-colors group">
-                <label className="text-xs text-muted font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Part Number</label>
+              <div className="bg-surface py-2.5 px-4 ] border border-outline/30 focus-within:border-primary/50 transition-colors group">
+                <label className="text-xs text-secondary font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Part Number</label>
                 <input 
                   value={extractedItems[editingIndex].PartNr || extractedItems[editingIndex].part_number || ''} 
                   onChange={(e) => updateEditingItem({ PartNr: e.target.value })}
@@ -385,8 +385,8 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
                   placeholder="ID code..."
                 />
               </div>
-              <div className="bg-surface py-2.5 px-4 rounded-[1.2rem] border border-slate-800 focus-within:border-primary/50 transition-colors group">
-                <label className="text-xs text-muted font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tighter">Initial Qty</label>
+              <div className="bg-surface py-2.5 px-4 ] border border-outline/30 focus-within:border-primary/50 transition-colors group">
+                <label className="text-xs text-secondary font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tighter">Initial Qty</label>
                 <input 
                   type="number"
                   value={extractedItems[editingIndex].quantity || 1} 
@@ -402,7 +402,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
               onClick={() => confirmSingleItem(editingIndex)}
               data-testid="confirm-extraction"
               aria-label="Add item to catalog"
-              className="py-5 bg-primary text-white rounded-[1.8rem] font-normal text-lg shadow-2xl shadow-primary/20 cursor-pointer active:scale-95 transition-all hover:bg-blue-500 focus:ring-2 focus:ring-blue-400 focus:outline-none"
+              className="py-5 bg-primary text-foreground ] font-normal text-lg shadow-2xl shadow-primary/20 cursor-pointer active:scale-95 transition-all hover:bg-primary focus:ring-2 focus:ring-primary focus:outline-none"
             >
               Add to Catalog
             </button>
@@ -412,7 +412,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
         <div data-testid="manual-entry-form" className="flex-1 flex flex-col gap-6 overflow-hidden">
           <div className="flex items-center justify-between">
               <h3 className="text-sm font-normal text-secondary">Discovery Dashboard</h3>
-              <span data-testid="wizard-progress" className="text-xs bg-primary/20 text-primary px-3 py-1 rounded-full font-normal">
+              <span data-testid="wizard-progress" className="text-xs bg-primary/20 text-primary px-3 py-1 font-normal">
                 {extractedItems.length} items found
               </span>
           </div>
@@ -422,7 +422,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
               <div
                 key={idx}
                 data-testid="extraction-item-row"
-                className="bg-surface/70 border border-slate-800 rounded-3xl p-5 flex items-center justify-between group hover:border-primary/40 transition-all active:scale-[0.98] focus-within:border-primary/60 focus-within:ring-2 focus-within:ring-primary/20"
+                className="bg-surface/70 border border-outline/30 p-5 flex items-center justify-between group hover:border-primary/40 transition-all active:scale-[0.98] focus-within:border-primary/60 focus-within:ring-2 focus-within:ring-primary/20"
               >
                 <div
                   className="flex-1 min-w-0 cursor-pointer"
@@ -438,16 +438,16 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
                   aria-label={`Edit item: ${item.Item || item.name}`}
                 >
                   <div className="flex items-center gap-3 mb-2">
-                    <div className="w-8 h-8 rounded-xl bg-primary/10 flex items-center justify-center text-primary">
+                    <div className="w-8 h-8 bg-primary/10 flex items-center justify-center text-primary">
                       <Package size={16} />
                     </div>
                     <h4 className="font-normal text-secondary truncate">{item.Item || item.name || "Unknown Item"}</h4>
                   </div>
                   <div className="flex gap-2">
-                    <span className="text-xs font-normal px-2 py-0.5 bg-slate-800 text-secondary rounded-md">
+                    <span className="text-xs font-normal px-2 py-0.5 bg-surface-container text-secondary">
                       {item.Type || item.type || "Generic"}
                     </span>
-                    <span className="text-xs font-normal px-2 py-0.5 bg-slate-800 text-muted rounded-md">
+                    <span className="text-xs font-normal px-2 py-0.5 bg-surface-container text-secondary">
                       {item.PartNr || item.part_number || "No P/N"}
                     </span>
                   </div>
@@ -461,14 +461,14 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
                         setExtractedItems(newItems);
                     }}
                     aria-label={`Delete item: ${item.Item || item.name}`}
-                    className="p-3 text-secondary hover:text-red-500 cursor-pointer transition-colors focus:ring-2 focus:ring-red-500 focus:outline-none rounded-lg"
+                    className="p-3 text-secondary hover:text-error cursor-pointer transition-colors focus:ring-2 focus:ring-error focus:outline-none"
                    >
                      <X size={20} />
                    </button>
                    <button
                     onClick={() => setEditingIndex(idx)}
                     aria-label={`Edit item: ${item.Item || item.name}`}
-                    className="p-3 bg-primary/10 text-primary rounded-2xl cursor-pointer hover:bg-primary/20 transition-all focus:ring-2 focus:ring-primary focus:outline-none"
+                    className="p-3 bg-primary/10 text-primary cursor-pointer hover:bg-primary/20 transition-all focus:ring-2 focus:ring-primary focus:outline-none"
                    >
                      <ChevronDown size={20} className="-rotate-90" />
                    </button>
@@ -481,7 +481,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
              <button
               onClick={confirmAllItems}
               aria-label={`Add ${extractedItems.length} items to catalog`}
-              className="py-5 bg-white text-slate-950 rounded-[1.8rem] font-normal text-lg shadow-2xl shadow-white/10 cursor-pointer active:scale-95 transition-all hover:bg-slate-200 focus:ring-2 focus:ring-offset-2 focus:ring-offset-slate-950 focus:ring-white focus:outline-none"
+              className="py-5 bg-white text-background ] font-normal text-lg shadow-2xl shadow-white/10 cursor-pointer active:scale-95 transition-all hover:bg-foreground focus:ring-2 focus:ring-offset-2 focus:ring-offset-background focus:ring-white focus:outline-none"
             >
               Add {extractedItems.length} items to catalog
             </button>
@@ -492,7 +492,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
               }}
               data-testid="reject-extraction"
               aria-label="Discard discovery session"
-              className="py-3 text-xs text-secondary font-normal cursor-pointer hover:text-secondary transition-colors focus:ring-2 focus:ring-slate-500 focus:outline-none rounded px-2"
+              className="py-3 text-xs text-secondary font-normal cursor-pointer hover:text-secondary transition-colors focus:ring-2 focus:ring-secondary focus:outline-none px-2"
             >
               Discard Discovery
             </button>
diff --git a/frontend/components/AdminOverlay.tsx b/frontend/components/AdminOverlay.tsx
index 49418f99..b8e35a3f 100644
--- a/frontend/components/AdminOverlay.tsx
+++ b/frontend/components/AdminOverlay.tsx
@@ -114,18 +114,18 @@ export default function AdminOverlay({
         dangerLevel={confirmState.affectedCount && confirmState.affectedCount > 10 ? 'high' : 'medium'}
       />
       <div data-testid="admin-overlay" className="fixed inset-0 z-50 bg-background/60 animate-in fade-in duration-300">
-      <div className="absolute inset-y-0 right-0 w-full max-w-md sm:max-w-lg md:max-w-md bg-surface border-l border-slate-800 shadow-2xl flex flex-col animate-in slide-in-from-right duration-500">
-        <div className="p-3 md:p-6 border-b border-slate-800 flex items-center justify-between">
+      <div className="absolute inset-y-0 right-0 w-full max-w-md sm:max-w-lg md:max-w-md bg-surface border-l border-outline/30 shadow-2xl flex flex-col animate-in slide-in-from-right duration-500">
+        <div className="p-3 md:p-6 border-b border-outline/30 flex items-center justify-between">
           <div className="flex items-center gap-3">
-            <div className="p-2 bg-slate-800 rounded-xl text-primary">
+            <div className="p-2 bg-surface-container text-primary">
               <Shield size={20} />
             </div>
-            <h2 className="text-xl font-normal text-white">System Admin</h2>
+            <h2 className="text-xl font-normal text-foreground">System Admin</h2>
           </div>
           <button
             data-testid="close-admin-overlay"
             onClick={onClose}
-            className="p-2 hover:bg-slate-800 rounded-full transition-colors text-muted focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
+            className="p-2 hover:bg-surface-container transition-colors text-secondary focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
             aria-label="Close"
           >
             <X size={20} />
@@ -137,11 +137,11 @@ export default function AdminOverlay({
             <div className="flex items-center justify-between">
               <div>
                 <h3 className="text-sm font-normal text-secondary">User Management</h3>
-                <p className="text-xs text-muted mt-0.5">Create accounts and control access</p>
+                <p className="text-xs text-secondary mt-0.5">Create accounts and control access</p>
               </div>
               <button
                 onClick={() => setShowCreateUserModal(true)}
-                className="flex items-center gap-1 text-xs font-normal text-primary hover:text-blue-400 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none rounded px-1"
+                className="flex items-center gap-1 text-xs font-normal text-primary hover:text-primary focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none px-1"
               >
                 <UserPlus size={12} /> Add User
               </button>
@@ -149,14 +149,14 @@ export default function AdminOverlay({
             
             <div className="grid gap-1.5 md:gap-2">
               {users.map(u => (
-                <div key={u.id} className="bg-slate-800/40 border border-slate-800 p-3 md:p-4 rounded-2xl flex items-center justify-between">
+                <div key={u.id} className="bg-surface-container/40 border border-outline/30 p-3 md:p-4 flex items-center justify-between">
                   <div className="flex items-center gap-2 md:gap-3">
-                    <div className={`p-2 rounded-lg ${u.role === 'admin' ? "bg-primary/20 text-primary" : "bg-slate-700 text-secondary"}`}>
+                    <div className={`p-2 ${u.role === 'admin' ? "bg-primary/20 text-primary" : "bg-surface-bright text-secondary"}`}>
                       <User size={16} />
                     </div>
                     <div>
-                      <p className="text-sm font-normal text-white">{u.username}</p>
-                      <p className="text-xs font-normal text-muted">{u.role}</p>
+                      <p className="text-sm font-normal text-foreground">{u.username}</p>
+                      <p className="text-xs font-normal text-secondary">{u.role}</p>
                     </div>
                   </div>
                   
@@ -171,7 +171,7 @@ export default function AdminOverlay({
                           loading: false,
                         });
                       }}
-                      className="p-2 text-rose-500 hover:bg-rose-500/10 rounded-lg transition-all focus-visible:ring-2 focus-visible:ring-rose-500 focus-visible:outline-none"
+                      className="p-2 text-error hover:bg-error/10 transition-all focus-visible:ring-2 focus-visible:ring-error focus-visible:outline-none"
                       aria-label={`Delete user ${u.username}`}
                     >
                       <Trash2 size={16} />
@@ -186,11 +186,11 @@ export default function AdminOverlay({
             <div className="flex items-center justify-between">
               <div>
                 <h3 className="text-sm font-normal text-secondary">Category Groups</h3>
-                <p className="text-xs text-muted mt-0.5">Organize items by type or location</p>
+                <p className="text-xs text-secondary mt-0.5">Organize items by type or location</p>
               </div>
               <button
                 onClick={() => setShowCreateCategoryModal(true)}
-                className="flex items-center gap-1 text-xs font-normal text-primary hover:text-blue-400 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none rounded px-1"
+                className="flex items-center gap-1 text-xs font-normal text-primary hover:text-primary focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none px-1"
               >
                 <Plus size={12} /> Add Category
               </button>
@@ -198,14 +198,14 @@ export default function AdminOverlay({
 
             <div className="grid gap-1.5 md:gap-2">
               {categories.map(cat => (
-                <div key={cat.id} className="bg-slate-800/40 border border-slate-800 p-3 md:p-4 rounded-2xl flex items-center justify-between">
+                <div key={cat.id} className="bg-surface-container/40 border border-outline/30 p-3 md:p-4 flex items-center justify-between">
                   <div className="flex items-center gap-2 md:gap-3">
-                    <div className="p-2 bg-primary/10 rounded-lg text-primary">
+                    <div className="p-2 bg-primary/10 text-primary">
                       <Layers size={16} />
                     </div>
                     <div>
-                      <p className="text-sm font-normal text-white">{cat.name}</p>
-                      <p className="text-xs text-muted font-mono">{cat.description || 'No description'}</p>
+                      <p className="text-sm font-normal text-foreground">{cat.name}</p>
+                      <p className="text-xs text-secondary font-mono">{cat.description || 'No description'}</p>
                     </div>
                   </div>
                   
@@ -220,7 +220,7 @@ export default function AdminOverlay({
                          loading: false,
                        });
                      }}
-                     className="p-2 text-rose-500 hover:bg-rose-500/10 rounded-lg transition-all focus-visible:ring-2 focus-visible:ring-rose-500 focus-visible:outline-none"
+                     className="p-2 text-error hover:bg-error/10 transition-all focus-visible:ring-2 focus-visible:ring-error focus-visible:outline-none"
                      aria-label={`Delete category ${cat.name}`}
                   >
                      <Trash2 size={16} />
@@ -230,18 +230,18 @@ export default function AdminOverlay({
             </div>
           </section>
 
-          <section className="p-4 md:p-6 bg-slate-800/30 rounded-3xl border border-slate-800 space-y-2 md:space-y-3">
-            <div className="flex items-center gap-2 text-rose-500">
+          <section className="p-4 md:p-6 bg-surface-container/30 border border-outline/30 space-y-2 md:space-y-3">
+            <div className="flex items-center gap-2 text-error">
               <AlertTriangle size={16} />
               <p className="text-sm font-normal">Sign Out</p>
             </div>
-            <p className="text-xs text-muted">End your session and return to the login screen.</p>
+            <p className="text-xs text-secondary">End your session and return to the login screen.</p>
             <button
               onClick={() => {
                 import('@/lib/auth').then(m => m.clearAuth());
                 window.location.href = '/login';
               }}
-              className="w-full bg-rose-500/10 hover:bg-rose-500/20 text-rose-500 border border-rose-500/20 font-normal py-3 rounded-xl transition-all flex items-center justify-center gap-2 focus-visible:ring-2 focus-visible:ring-rose-500 focus-visible:outline-none"
+              className="w-full bg-error/10 hover:bg-error/20 text-error border border-error/20 font-normal py-3 transition-all flex items-center justify-center gap-2 focus-visible:ring-2 focus-visible:ring-error focus-visible:outline-none"
             >
               <LogOut size={16} /> Sign Out
             </button>
diff --git a/frontend/components/BottomNav.tsx b/frontend/components/BottomNav.tsx
index 10a9e770..7832d5c5 100644
--- a/frontend/components/BottomNav.tsx
+++ b/frontend/components/BottomNav.tsx
@@ -25,13 +25,13 @@ export default function BottomNav({
   const isAdmin = pathname === '/admin';
 
   return (
-    <footer className="fixed bottom-0 left-0 right-0 py-3 px-2 pb-safe bg-background border-t border-slate-900 z-40 transition-all duration-300">
+    <footer className="fixed bottom-0 left-0 right-0 py-3 px-2 pb-safe bg-background border-t border-outline/30 z-40 transition-all duration-300">
       <div className="max-w-xl mx-auto flex justify-around items-center text-secondary">
         
         <button
           onClick={() => router.push('/')}
           aria-label="Go to Home"
-          className={cn("flex flex-col items-center gap-1 rounded px-2 py-1 cursor-pointer transition-colors focus:ring-2 focus:ring-primary focus:outline-none", isHome && "text-primary")}
+          className={cn("flex flex-col items-center gap-1  px-2 py-1 cursor-pointer transition-colors focus:ring-2 focus:ring-primary focus:outline-none", isHome && "text-primary")}
         >
           <Smartphone size={20} />
           <span className="text-xs font-normal transition-all">Home</span>
@@ -41,7 +41,7 @@ export default function BottomNav({
         <button
           onClick={() => router.push('/inventory')}
           aria-label="Go to Inventory"
-          className={cn("flex flex-col items-center gap-1 rounded px-2 py-1 cursor-pointer transition-colors focus:ring-2 focus:ring-primary focus:outline-none", isInventory && "text-primary")}
+          className={cn("flex flex-col items-center gap-1  px-2 py-1 cursor-pointer transition-colors focus:ring-2 focus:ring-primary focus:outline-none", isInventory && "text-primary")}
         >
           <Package size={20} />
           <span className="text-xs font-normal transition-all">Inventory</span>
@@ -51,7 +51,7 @@ export default function BottomNav({
         <button
           onClick={() => router.push('/logs')}
           aria-label="Go to Logs"
-          className={cn("flex flex-col items-center gap-1 rounded px-2 py-1 cursor-pointer transition-colors focus:ring-2 focus:ring-primary focus:outline-none", isLogs && "text-primary")}
+          className={cn("flex flex-col items-center gap-1  px-2 py-1 cursor-pointer transition-colors focus:ring-2 focus:ring-primary focus:outline-none", isLogs && "text-primary")}
         >
           <History size={20} />
           <span className="text-xs font-normal transition-all">Logs</span>
@@ -63,7 +63,7 @@ export default function BottomNav({
             data-testid="admin-button"
             onClick={() => router.push('/admin')}
             aria-label="Go to Admin"
-            className={cn("flex flex-col items-center gap-1 rounded px-2 py-1 cursor-pointer transition-colors focus:ring-2 focus:ring-primary focus:outline-none", isAdmin && "text-primary")}
+            className={cn("flex flex-col items-center gap-1  px-2 py-1 cursor-pointer transition-colors focus:ring-2 focus:ring-primary focus:outline-none", isAdmin && "text-primary")}
           >
             <Settings size={20} />
             <span className="text-xs font-normal transition-all">Admin</span>
@@ -79,7 +79,7 @@ export default function BottomNav({
             }
           }}
           aria-label="Logout"
-          className="flex flex-col items-center gap-1 text-rose-500 hover:text-rose-400 cursor-pointer transition-colors rounded px-2 py-1 focus:ring-2 focus:ring-rose-500 focus:outline-none"
+          className="flex flex-col items-center gap-1 text-error hover:text-error/80 cursor-pointer transition-colors px-2 py-1 focus:ring-2 focus:ring-error focus:outline-none"
         >
           <LogOut size={20} />
           <span className="text-xs font-normal transition-all">Logout</span>
diff --git a/frontend/components/CameraView.tsx b/frontend/components/CameraView.tsx
index c4b93a4e..3c6b557b 100644
--- a/frontend/components/CameraView.tsx
+++ b/frontend/components/CameraView.tsx
@@ -44,13 +44,13 @@ export default function CameraView({
   return (
     <div className="w-full max-w-md mx-auto flex flex-col gap-3 md:gap-4">
       {/* Video Viewport Area */}
-      <div className="relative w-full aspect-square overflow-hidden rounded-[2.5rem] shadow-[0_20px_50px_rgba(0,0,0,0.5)] bg-background border-2 border-slate-800/50 p-4 sm:p-6">
+      <div className="relative w-full aspect-square overflow-hidden ] shadow-[0_20px_50px_rgba(0,0,0,0.5)] bg-background border-2 border-outline/20 p-4 sm:p-6">
         <div className="absolute inset-4 sm:inset-6 z-10 pointer-events-none flex items-center justify-center">
-          <div className="w-full h-full border border-primary/30 rounded-[2rem] relative">
-            <div className="absolute top-0 left-0 w-10 h-10 border-t-4 border-l-4 border-primary rounded-tl-2xl shadow-[0_0_15px_rgba(59,130,246,0.5)]" />
-            <div className="absolute top-0 right-0 w-10 h-10 border-t-4 border-r-4 border-primary rounded-tr-2xl shadow-[0_0_15px_rgba(59,130,246,0.5)]" />
-            <div className="absolute bottom-0 left-0 w-10 h-10 border-b-4 border-l-4 border-primary rounded-bl-2xl shadow-[0_0_15px_rgba(59,130,246,0.5)]" />
-            <div className="absolute bottom-0 right-0 w-10 h-10 border-b-4 border-r-4 border-primary rounded-br-2xl shadow-[0_0_15px_rgba(59,130,246,0.5)]" />
+          <div className="w-full h-full border border-primary/30 ] relative">
+            <div className="absolute top-0 left-0 w-10 h-10 border-t-4 border-l-4 border-primary shadow-[0_0_15px_rgba(59,130,246,0.5)]" />
+            <div className="absolute top-0 right-0 w-10 h-10 border-t-4 border-r-4 border-primary shadow-[0_0_15px_rgba(59,130,246,0.5)]" />
+            <div className="absolute bottom-0 left-0 w-10 h-10 border-b-4 border-l-4 border-primary shadow-[0_0_15px_rgba(59,130,246,0.5)]" />
+            <div className="absolute bottom-0 right-0 w-10 h-10 border-b-4 border-r-4 border-primary shadow-[0_0_15px_rgba(59,130,246,0.5)]" />
 
             {isStarted && !paused && !isSelecting && (
               <div className="absolute top-0 left-0 right-0 h-1 bg-primary animate-scan-fast" />
@@ -77,7 +77,7 @@ export default function CameraView({
                       key={i}
                       onClick={() => onWordSelect(w.text)}
                       aria-label={`Select text: ${w.text}`}
-                      className="absolute border border-primary bg-primary/20 rounded-sm active:bg-primary/50 cursor-pointer transition-colors pointer-events-auto focus:ring-2 focus:ring-primary focus:outline-none"
+                      className="absolute border border-primary bg-primary/20 active:bg-primary/50 cursor-pointer transition-colors pointer-events-auto focus:ring-2 focus:ring-primary focus:outline-none"
                       style={{
                         left: `${(w.bbox.x0 / 1600) * 100}%`,
                         top: `${(w.bbox.y0 / (1600 * (9 / 16))) * 100}%`,
@@ -89,15 +89,15 @@ export default function CameraView({
                 </div>
               </div>
             </div>
-            <div className="p-6 bg-surface/90 border-t border-slate-800 flex flex-col gap-4">
+            <div className="p-6 bg-surface/90 border-t border-outline/30 flex flex-col gap-4">
               <div className="flex flex-col items-center gap-1">
-                <p className="text-sm font-normal text-white italic text-center">Text Found</p>
-                <p className="text-xs text-muted font-normal text-center">Tap any text to use it</p>
+                <p className="text-sm font-normal text-foreground text-center">Text Found</p>
+                <p className="text-xs text-secondary font-normal text-center">Tap any text to use it</p>
               </div>
               <button
                 onClick={onCancelSelection}
                 aria-label="Cancel text selection"
-                className="w-full py-4 bg-slate-800 hover:bg-slate-700 text-white rounded-2xl font-normal text-xs cursor-pointer transition-all active:scale-95 border border-slate-700 focus:ring-2 focus:ring-blue-500 focus:outline-none"
+                className="w-full py-4 bg-surface-container hover:bg-surface-bright text-foreground font-normal text-xs cursor-pointer transition-all active:scale-95 border border-outline-variant focus:ring-2 focus:ring-primary focus:outline-none"
               >
                 Cancel
               </button>
@@ -114,15 +114,15 @@ export default function CameraView({
 
         {error && (
           <div className="absolute inset-0 z-20 flex flex-col items-center justify-center bg-surface text-secondary px-8 text-center gap-4">
-            <XCircle className="w-10 h-10 text-red-500" />
+            <XCircle className="w-10 h-10 text-error" />
             <div>
-              <p className="font-normal text-white">Camera Error</p>
+              <p className="font-normal text-foreground">Camera Error</p>
               <p className="text-xs text-secondary mt-1">{error}</p>
             </div>
             <button
               onClick={() => window.location.reload()}
               aria-label="Reload page and try again"
-              className="mt-4 px-6 py-2 bg-slate-800 rounded-full text-sm font-normal cursor-pointer hover:bg-slate-700 transition-colors focus:ring-2 focus:ring-blue-500 focus:outline-none"
+              className="mt-4 px-6 py-2 bg-surface-container text-sm font-normal cursor-pointer hover:bg-surface-bright transition-colors focus:ring-2 focus:ring-primary focus:outline-none"
             >
               Try Again
             </button>
@@ -131,7 +131,7 @@ export default function CameraView({
       </div>
 
       {/* External Controls Area */}
-      <div className="flex flex-col gap-4 bg-surface/50 p-5 rounded-[2.5rem] border border-slate-800/50 shadow-2xl">
+      <div className="flex flex-col gap-4 bg-surface/50 p-5 ] border border-outline/20 shadow-2xl">
         <div className="flex items-center gap-3 w-full">
           {hasZoom && (
             <button
@@ -146,14 +146,14 @@ export default function CameraView({
               }}
               data-testid="zoom-control"
               aria-label={`Zoom ${zoom.toFixed(1)}x`}
-              className="h-14 px-5 bg-slate-800/80 hover:bg-slate-700 border border-slate-700 text-white rounded-2xl flex flex-col items-center justify-center shadow-lg cursor-pointer transition-all active:scale-95 shrink-0 focus:ring-2 focus:ring-blue-500 focus:outline-none"
+              className="h-14 px-5 bg-surface-container/80 hover:bg-surface-bright border border-outline-variant text-foreground flex flex-col items-center justify-center shadow-lg cursor-pointer transition-all active:scale-95 shrink-0 focus:ring-2 focus:ring-primary focus:outline-none"
             >
               <span className="text-xs font-normal tabular-nums">{zoom.toFixed(1)}x</span>
               <span className="text-xs text-primary font-normal tracking-tighter">Zoom</span>
             </button>
           )}
 
-          <div className="flex-1 h-14 bg-background/40 border border-slate-800/50 rounded-2xl flex items-center justify-center gap-3 px-4 relative overflow-hidden group">
+          <div className="flex-1 h-14 bg-background/40 border border-outline/20 flex items-center justify-center gap-3 px-4 relative overflow-hidden group">
             {ocrProcessing ? (
               <>
                 <RefreshCw className="animate-spin text-primary" size={18} />
@@ -166,7 +166,7 @@ export default function CameraView({
                   size={18}
                 />
                 <div className="flex flex-col">
-                  <span className="text-xs text-muted font-normal leading-none">Smart Scan</span>
+                  <span className="text-xs text-secondary font-normal leading-none">Smart Scan</span>
                   <span className="text-xs font-normal text-primary leading-tight tabular-nums">
                     {countdown === 0 ? 'Scanning' : `${countdown}s`}
                   </span>
@@ -183,7 +183,7 @@ export default function CameraView({
         </div>
 
         <div className="w-full flex justify-center items-center gap-2">
-          <div className="w-1 h-1 rounded-full bg-green-500 animate-pulse" />
+          <div className="w-1 h-1 bg-success animate-pulse" />
           <p className="text-xs text-secondary font-normal">
             Scanner active · Use zoom or tap scan
           </p>
diff --git a/frontend/components/CategoryCreationModal.tsx b/frontend/components/CategoryCreationModal.tsx
index 45c3e885..788eaab7 100644
--- a/frontend/components/CategoryCreationModal.tsx
+++ b/frontend/components/CategoryCreationModal.tsx
@@ -51,18 +51,18 @@ export default function CategoryCreationModal({
 
   return (
     <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/40">
-      <div className="bg-surface border border-slate-800 rounded-lg shadow-xl max-w-sm w-full mx-4">
-        <div className="flex items-center justify-between p-6 border-b border-slate-800">
+      <div className="bg-surface border border-outline/30 shadow-xl max-w-sm w-full mx-4">
+        <div className="flex items-center justify-between p-6 border-b border-outline/30">
           <div className="flex items-center gap-3">
-            <div className="p-2 bg-primary/10 rounded-lg text-primary">
+            <div className="p-2 bg-primary/10 text-primary">
               <Tag size={20} />
             </div>
-            <h2 className="text-lg font-normal text-white">New Category</h2>
+            <h2 className="text-lg font-normal text-foreground">New Category</h2>
           </div>
           <button
             onClick={onClose}
             disabled={loading}
-            className="p-1 text-muted hover:text-secondary rounded focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none disabled:opacity-50"
+            className="p-1 text-secondary hover:text-secondary focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none disabled:opacity-50"
             aria-label="Close"
           >
             <X size={20} />
@@ -80,7 +80,7 @@ export default function CategoryCreationModal({
                 setError(null);
               }}
               placeholder="e.g., Electronics"
-              className="w-full mt-2 px-3 py-2.5 bg-slate-800 border border-slate-700 rounded text-white placeholder:text-muted focus:outline-none focus-visible:ring-2 focus-visible:ring-primary"
+              className="w-full mt-2 px-3 py-2.5 bg-surface-container border border-outline-variant text-foreground placeholder:text-secondary focus:outline-none focus-visible:ring-2 focus-visible:ring-primary"
               disabled={loading}
               autoFocus
             />
@@ -93,13 +93,13 @@ export default function CategoryCreationModal({
               value={description}
               onChange={(e) => setDescription(e.target.value)}
               placeholder="Brief category description"
-              className="w-full mt-2 px-3 py-2.5 bg-slate-800 border border-slate-700 rounded text-white placeholder:text-muted focus:outline-none focus-visible:ring-2 focus-visible:ring-primary"
+              className="w-full mt-2 px-3 py-2.5 bg-surface-container border border-outline-variant text-foreground placeholder:text-secondary focus:outline-none focus-visible:ring-2 focus-visible:ring-primary"
               disabled={loading}
             />
           </div>
 
           {error && (
-            <div className="p-3 bg-rose-500/10 border border-rose-500/20 rounded">
+            <div className="p-3 bg-error/10 border border-error/20">
               <p className="text-sm text-rose-400">{error}</p>
             </div>
           )}
@@ -109,14 +109,14 @@ export default function CategoryCreationModal({
               type="button"
               onClick={onClose}
               disabled={loading}
-              className="flex-1 px-4 py-2.5 text-secondary bg-slate-800 border border-slate-700 rounded font-normal hover:bg-slate-700 transition-colors disabled:opacity-50 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
+              className="flex-1 px-4 py-2.5 text-secondary bg-surface-container border border-outline-variant font-normal hover:bg-surface-bright transition-colors disabled:opacity-50 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
             >
               Cancel
             </button>
             <button
               type="submit"
               disabled={loading || !name.trim()}
-              className="flex-1 px-4 py-2.5 bg-primary text-white rounded font-normal hover:bg-blue-600 transition-colors disabled:opacity-50 flex items-center justify-center gap-2 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-offset-slate-900 focus-visible:ring-primary focus-visible:outline-none"
+              className="flex-1 px-4 py-2.5 bg-primary text-foreground font-normal hover:bg-primary transition-colors disabled:opacity-50 flex items-center justify-center gap-2 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-offset-surface-container focus-visible:ring-primary focus-visible:outline-none"
             >
               {loading ? (
                 <>
diff --git a/frontend/components/ConfirmationModal.tsx b/frontend/components/ConfirmationModal.tsx
index cf2958f4..82892631 100644
--- a/frontend/components/ConfirmationModal.tsx
+++ b/frontend/components/ConfirmationModal.tsx
@@ -55,19 +55,19 @@ export default function ConfirmationModal({
 
   return (
     <div data-testid="confirmation-modal" className="fixed inset-0 z-50 flex items-center justify-center bg-black/40">
-      <div className="bg-surface border border-slate-800 rounded-lg shadow-xl max-w-sm w-full mx-4">
+      <div className="bg-surface border border-outline/30 shadow-xl max-w-sm w-full mx-4">
         {/* Header */}
-        <div className="flex items-center justify-between p-6 border-b border-slate-800">
+        <div className="flex items-center justify-between p-6 border-b border-outline/30">
           <div className="flex items-center gap-3">
-            <div className="p-2 bg-rose-500/10 rounded-lg text-rose-500">
+            <div className="p-2 bg-error/10 text-error">
               <AlertTriangle size={20} />
             </div>
-            <h2 className="text-lg font-normal text-white">{title}</h2>
+            <h2 className="text-lg font-normal text-foreground">{title}</h2>
           </div>
           <button
             onClick={onCancel}
             disabled={loading}
-            className="p-1 text-muted hover:text-secondary rounded cursor-pointer focus:ring-2 focus:ring-primary focus:outline-none disabled:opacity-50 disabled:cursor-not-allowed"
+            className="p-1 text-secondary hover:text-secondary cursor-pointer focus:ring-2 focus:ring-primary focus:outline-none disabled:opacity-50 disabled:cursor-not-allowed"
             aria-label="Close modal"
           >
             <X size={20} />
@@ -81,16 +81,16 @@ export default function ConfirmationModal({
 
           {/* Item Name (if provided) */}
           {itemName && (
-            <div className="bg-slate-800/40 border border-slate-800 rounded p-3">
-              <p className="text-xs text-muted font-normal">Item</p>
-              <p className="text-sm font-mono text-white mt-1">{itemName}</p>
+            <div className="bg-surface-container/40 border border-outline/30 p-3">
+              <p className="text-xs text-secondary font-normal">Item</p>
+              <p className="text-sm font-mono text-foreground mt-1">{itemName}</p>
             </div>
           )}
 
           {/* Consequence Warning */}
           {consequence && (
-            <div className="flex gap-2 p-3 bg-rose-500/5 border border-rose-500/20 rounded">
-              <span className="text-rose-500 flex-shrink-0">⚠</span>
+            <div className="flex gap-2 p-3 bg-error/5 border border-error/20">
+              <span className="text-error flex-shrink-0">⚠</span>
               <p className="text-sm text-rose-400">{consequence}</p>
             </div>
           )}
@@ -106,7 +106,7 @@ export default function ConfirmationModal({
 
           {/* High-Risk Warning & Confirmation Input */}
           {requiresTextConfirm && (
-            <div className="space-y-3 pt-2 border-t border-slate-800">
+            <div className="space-y-3 pt-2 border-t border-outline/30">
               <p className="text-sm font-normal text-rose-400">
                 Type "Delete" to confirm this high-risk action
               </p>
@@ -118,7 +118,7 @@ export default function ConfirmationModal({
                   setError(null);
                 }}
                 placeholder="Type Delete"
-                className="w-full px-3 py-2.5 bg-slate-800 border border-slate-700 rounded text-white placeholder:text-muted focus:outline-none focus:ring-2 focus:ring-primary disabled:opacity-50"
+                className="w-full px-3 py-2.5 bg-surface-container border border-outline-variant text-foreground placeholder:text-secondary focus:outline-none focus:ring-2 focus:ring-primary disabled:opacity-50"
                 disabled={loading}
                 onKeyDown={(e) => {
                   if (e.key === 'Enter' && canConfirm && !loading) {
@@ -127,18 +127,18 @@ export default function ConfirmationModal({
                 }}
               />
               {error && (
-                <p className="text-xs text-rose-500">{error}</p>
+                <p className="text-xs text-error">{error}</p>
               )}
             </div>
           )}
         </div>
 
         {/* Actions */}
-        <div className="flex gap-2 p-6 border-t border-slate-800">
+        <div className="flex gap-2 p-6 border-t border-outline/30">
           <button
             onClick={onCancel}
             disabled={loading}
-            className="flex-1 px-4 py-2.5 text-secondary bg-slate-800 border border-slate-700 rounded font-normal hover:bg-slate-700 cursor-pointer transition-colors disabled:opacity-50 disabled:cursor-not-allowed focus:ring-2 focus:ring-primary focus:outline-none"
+            className="flex-1 px-4 py-2.5 text-secondary bg-surface-container border border-outline-variant font-normal hover:bg-surface-bright cursor-pointer transition-colors disabled:opacity-50 disabled:cursor-not-allowed focus:ring-2 focus:ring-primary focus:outline-none"
           >
             Keep Item
           </button>
@@ -146,7 +146,7 @@ export default function ConfirmationModal({
             onClick={handleConfirm}
             data-testid="confirm-action"
             disabled={loading || !canConfirm}
-            className="flex-1 px-4 py-2.5 bg-rose-600 text-white rounded font-normal hover:bg-rose-700 cursor-pointer transition-colors disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center gap-2 focus:ring-2 focus:ring-offset-2 focus:ring-offset-slate-900 focus:ring-rose-600 focus:outline-none"
+            className="flex-1 px-4 py-2.5 bg-rose-600 text-foreground font-normal hover:bg-rose-700 cursor-pointer transition-colors disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center gap-2 focus:ring-2 focus:ring-offset-2 focus:ring-offset-surface-container focus:ring-rose-600 focus:outline-none"
           >
             {loading ? (
               <>
diff --git a/frontend/components/CreateUserModal.tsx b/frontend/components/CreateUserModal.tsx
index 7918131b..37f17ba3 100644
--- a/frontend/components/CreateUserModal.tsx
+++ b/frontend/components/CreateUserModal.tsx
@@ -71,13 +71,13 @@ export default function CreateUserModal({ show, onClose, onUserCreated }: Create
 
   return (
     <div data-testid="create-user-modal" className="fixed inset-0 z-50 flex items-center justify-center bg-black/40">
-      <div className="bg-surface border border-slate-800 rounded-lg shadow-xl max-w-sm w-full mx-4">
+      <div className="bg-surface border border-outline/30 shadow-xl max-w-sm w-full mx-4">
         {/* Header */}
-        <div className="flex items-center justify-between p-6 border-b border-slate-800">
-          <h2 className="text-lg font-normal text-white">Create User</h2>
+        <div className="flex items-center justify-between p-6 border-b border-outline/30">
+          <h2 className="text-lg font-normal text-foreground">Create User</h2>
           <button
             onClick={onClose}
-            className="p-1 text-muted hover:text-secondary rounded focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
+            className="p-1 text-secondary hover:text-secondary focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
             aria-label="Close"
           >
             <X size={20} />
@@ -101,13 +101,11 @@ export default function CreateUserModal({ show, onClose, onUserCreated }: Create
                 if (errors.username) setErrors({ ...errors, username: undefined });
               }}
               placeholder="Enter username"
-              className={`w-full px-3 py-2.5 bg-slate-800 border rounded text-white placeholder:text-muted focus:outline-none focus-visible:ring-2 focus-visible:ring-primary ${
-                errors.username ? 'border-red-500' : 'border-slate-700'
-              }`}
+              className={`w-full px-3 py-2.5 bg-surface-container border text-foreground placeholder:text-secondary focus:outline-none focus-visible:ring-2 focus-visible:ring-primary ${ errors.username ? 'border-error' : 'border-outline-variant' }`}
               disabled={loading}
             />
             {errors.username && (
-              <p className="mt-1.5 text-sm text-red-500">{errors.username}</p>
+              <p className="mt-1.5 text-sm text-error">{errors.username}</p>
             )}
           </div>
 
@@ -126,13 +124,11 @@ export default function CreateUserModal({ show, onClose, onUserCreated }: Create
                 if (errors.password) setErrors({ ...errors, password: undefined });
               }}
               placeholder="Enter password"
-              className={`w-full px-3 py-2.5 bg-slate-800 border rounded text-white placeholder:text-muted focus:outline-none focus-visible:ring-2 focus-visible:ring-primary ${
-                errors.password ? 'border-red-500' : 'border-slate-700'
-              }`}
+              className={`w-full px-3 py-2.5 bg-surface-container border text-foreground placeholder:text-secondary focus:outline-none focus-visible:ring-2 focus-visible:ring-primary ${ errors.password ? 'border-error' : 'border-outline-variant' }`}
               disabled={loading}
             />
             {errors.password && (
-              <p className="mt-1.5 text-sm text-red-500">{errors.password}</p>
+              <p className="mt-1.5 text-sm text-error">{errors.password}</p>
             )}
           </div>
 
@@ -142,7 +138,7 @@ export default function CreateUserModal({ show, onClose, onUserCreated }: Create
               type="button"
               onClick={onClose}
               disabled={loading}
-              className="flex-1 px-4 py-2.5 text-secondary bg-slate-800 border border-slate-700 rounded font-normal hover:bg-slate-700 transition-colors disabled:opacity-50 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
+              className="flex-1 px-4 py-2.5 text-secondary bg-surface-container border border-outline-variant font-normal hover:bg-surface-bright transition-colors disabled:opacity-50 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
             >
               Cancel
             </button>
@@ -150,7 +146,7 @@ export default function CreateUserModal({ show, onClose, onUserCreated }: Create
               type="submit"
               data-testid="create-user-submit"
               disabled={!isFormValid || loading}
-              className="flex-1 px-4 py-2.5 bg-primary text-primary-foreground rounded font-normal hover:bg-blue-600 transition-colors disabled:opacity-50 flex items-center justify-center gap-2 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-offset-slate-900 focus-visible:ring-primary focus-visible:outline-none"
+              className="flex-1 px-4 py-2.5 bg-primary text-primary-foreground font-normal hover:bg-primary transition-colors disabled:opacity-50 flex items-center justify-center gap-2 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-offset-surface-container focus-visible:ring-primary focus-visible:outline-none"
             >
               {loading ? (
                 <>
diff --git a/frontend/components/DebugRotationPanel.tsx b/frontend/components/DebugRotationPanel.tsx
index 8ce3a22c..064719c1 100644
--- a/frontend/components/DebugRotationPanel.tsx
+++ b/frontend/components/DebugRotationPanel.tsx
@@ -283,13 +283,13 @@ export function DebugRotationPanel({
 
   return (
     <div className="fixed inset-0 bg-black/80 flex items-center justify-center z-50 p-4">
-      <div className="bg-slate-900 border border-slate-700 rounded-lg shadow-2xl max-w-6xl w-full max-h-[95vh] overflow-hidden flex flex-col">
+      <div className="bg-surface-container border border-outline-variant shadow-2xl max-w-6xl w-full max-h-[95vh] overflow-hidden flex flex-col">
         {/* Header */}
-        <div className="p-3 border-b border-slate-700 flex items-center justify-between bg-slate-800 flex-shrink-0">
-          <h2 className="text-lg font-normal text-white">Debug Rotation & Crop</h2>
+        <div className="p-3 border-b border-outline-variant flex items-center justify-between bg-surface-container flex-shrink-0">
+          <h2 className="text-lg font-normal text-foreground">Debug Rotation & Crop</h2>
           <button
             onClick={onClose}
-            className="p-2 hover:bg-slate-700 rounded text-gray-400 hover:text-white transition"
+            className="p-2 hover:bg-surface-bright text-gray-400 hover:text-foreground transition"
           >
             <X size={20} />
           </button>
@@ -297,11 +297,11 @@ export function DebugRotationPanel({
 
         <div className="flex gap-4 p-4 flex-1 overflow-hidden">
           {/* Left: Controls */}
-          <div className="w-48 bg-slate-800 p-3 rounded space-y-4 flex-shrink-0 overflow-y-auto">
+          <div className="w-48 bg-surface-container p-3 space-y-4 flex-shrink-0 overflow-y-auto">
             {/* Rotation Slider */}
             <div>
-              <label className="block text-sm font-normal text-white mb-2">
-                Rotation: <span className="text-yellow-400">{rotation}°</span>
+              <label className="block text-sm font-normal text-foreground mb-2">
+                Rotation: <span className="text-warning">{rotation}°</span>
               </label>
               <input
                 type="range"
@@ -315,17 +315,13 @@ export function DebugRotationPanel({
 
             {/* Quick Presets */}
             <div>
-              <label className="block text-sm font-normal text-white mb-2">Quick Angles</label>
+              <label className="block text-sm font-normal text-foreground mb-2">Quick Angles</label>
               <div className="grid grid-cols-2 gap-1">
                 {commonAngles.map((angle) => (
                   <button
                     key={angle.value}
                     onClick={() => setRotation(angle.value)}
-                    className={`py-1 px-2 rounded text-xs font-normal transition ${
-                      rotation === angle.value
-                        ? 'bg-yellow-600 text-white'
-                        : 'bg-slate-700 text-gray-300 hover:bg-slate-600'
-                    }`}
+                    className={`py-1 px-2 text-xs font-normal transition ${ rotation === angle.value ? 'bg-warning text-foreground' : 'bg-surface-bright text-gray-300 hover:bg-outline-variant' }`}
                   >
                     {angle.label}
                   </button>
@@ -337,15 +333,15 @@ export function DebugRotationPanel({
             <button
               onClick={() => setAdjustedCropBounds(null)}
               disabled={!adjustedCropBounds}
-              className="w-full py-2 px-3 rounded text-sm font-normal bg-slate-700 text-gray-300 hover:bg-slate-600 disabled:opacity-50 disabled:cursor-not-allowed transition"
+              className="w-full py-2 px-3 text-sm font-normal bg-surface-bright text-gray-300 hover:bg-outline-variant disabled:opacity-50 disabled:cursor-not-allowed transition"
             >
               Reset Crop Box
             </button>
 
             {/* Original Values */}
             {originalRotation !== undefined && (
-              <div className="bg-slate-700 p-3 rounded text-xs space-y-1">
-                <h3 className="font-normal text-white">Original AI Values</h3>
+              <div className="bg-surface-bright p-3 text-xs space-y-1">
+                <h3 className="font-normal text-foreground">Original AI Values</h3>
                 <div className="text-gray-300 font-mono text-xs">
                   <div>Rotation: {originalRotation}°</div>
                   {originalCropBounds && (
@@ -365,12 +361,12 @@ export function DebugRotationPanel({
           {/* Right: Canvas + Log */}
           <div className="flex-1 flex flex-col gap-3 min-w-0 overflow-hidden">
             {/* Canvas - takes most space */}
-            <div className="flex-1 flex flex-col bg-slate-800 p-3 rounded border border-slate-700 overflow-hidden">
-              <h3 className="text-xs font-normal text-white mb-2">Preview (Green = Crop, Orange = Rotation)</h3>
-              <div className="flex-1 flex items-center justify-center bg-black/70 rounded border border-slate-600 overflow-auto">
+            <div className="flex-1 flex flex-col bg-surface-container p-3 border border-outline-variant overflow-hidden">
+              <h3 className="text-xs font-normal text-foreground mb-2">Preview (Green = Crop, Orange = Rotation)</h3>
+              <div className="flex-1 flex items-center justify-center bg-black/70 border border-outline-variant overflow-auto">
                 <canvas
                   ref={canvasRef}
-                  className="rounded cursor-move"
+                  className="cursor-move"
                   onMouseDown={handleCanvasMouseDown}
                   onMouseMove={handleCanvasMouseMove}
                   onMouseUp={handleCanvasMouseUp}
@@ -380,8 +376,8 @@ export function DebugRotationPanel({
             </div>
 
             {/* Log - single line */}
-            <div className="bg-slate-800 p-2 rounded border border-slate-700 flex-shrink-0">
-              <div className="bg-black text-green-400 p-2 rounded font-mono text-xs">
+            <div className="bg-surface-container p-2 border border-outline-variant flex-shrink-0">
+              <div className="bg-black text-success p-2 font-mono text-xs">
                 {log}
               </div>
             </div>
diff --git a/frontend/components/FilterBar.tsx b/frontend/components/FilterBar.tsx
index 29c1080a..36b0bc3f 100644
--- a/frontend/components/FilterBar.tsx
+++ b/frontend/components/FilterBar.tsx
@@ -15,7 +15,7 @@ export default function FilterBar({ searchQuery, onChange }: FilterBarProps) {
         placeholder="Search catalog..."
         value={searchQuery}
         onChange={(e) => onChange(e.target.value)}
-        className="w-full bg-surface border border-slate-800 rounded-2xl py-3.5 pr-4 pl-11 text-sm focus:border-primary outline-none transition-all placeholder:text-secondary"
+        className="w-full bg-surface border border-outline/30 py-3.5 pr-4 pl-11 text-sm focus:border-primary outline-none transition-all placeholder:text-secondary"
       />
       <div className="absolute left-4 top-1/2 -translate-y-1/2 text-secondary">
         <Search size={18} />
diff --git a/frontend/components/IdentityCheckOverlay.tsx b/frontend/components/IdentityCheckOverlay.tsx
index cc7a5907..32d3fbfc 100644
--- a/frontend/components/IdentityCheckOverlay.tsx
+++ b/frontend/components/IdentityCheckOverlay.tsx
@@ -61,14 +61,14 @@ const IdentityCheckOverlay = memo(({ show, users, onAuthenticated }: IdentityChe
 
   return (
     <div data-testid="identity-check-overlay" className="fixed inset-0 z-[100] flex items-center justify-center p-4 bg-background/90 animate-in fade-in duration-500">
-      <div className="bg-surface border border-slate-800 rounded-[2.5rem] p-4 md:p-6 max-w-sm w-full shadow-2xl space-y-3 md:space-y-4 animate-in zoom-in-95 duration-300 relative overflow-hidden">
+      <div className="bg-surface border border-outline/30 ] p-4 md:p-6 max-w-sm w-full shadow-2xl space-y-3 md:space-y-4 animate-in zoom-in-95 duration-300 relative overflow-hidden">
         
         <div className="text-center space-y-3">
-          <div className="w-20 h-20 bg-primary/10 text-primary rounded-[2rem] flex items-center justify-center mx-auto mb-6 border border-primary/20 shadow-xl shadow-primary/5">
-            <Shield size={40} className="italic" />
+          <div className="w-20 h-20 bg-primary/10 text-primary ] flex items-center justify-center mx-auto mb-6 border border-primary/20 shadow-xl shadow-primary/5">
+            <Shield size={40} />
           </div>
-          <h2 className="text-3xl font-normal text-white tracking-tight">Protocol Access</h2>
-          <p className="text-muted text-xs font-normal">Select operator profile to initialize</p>
+          <h2 className="text-3xl font-normal text-foreground tracking-tight">Protocol Access</h2>
+          <p className="text-secondary text-xs font-normal">Select operator profile to initialize</p>
         </div>
         
         <div data-testid="user-list" className="grid gap-3.5">
@@ -79,10 +79,10 @@ const IdentityCheckOverlay = memo(({ show, users, onAuthenticated }: IdentityChe
                   key={user.id}
                   data-testid="user-list-item"
                   onClick={() => handleSelectUser(user)}
-                  className="bg-slate-800/40 hover:bg-slate-800 border border-slate-800/50 hover:border-primary/40 p-5 rounded-[1.5rem] text-left transition-all group flex items-center justify-between shadow-sm active:scale-[0.98]"
+                  className="bg-surface-container/40 hover:bg-surface-container border border-outline/30/50 hover:border-primary/40 p-5 ] text-left transition-all group flex items-center justify-between shadow-sm active:scale-[0.98]"
                 >
                   <div className="flex items-center gap-4">
-                    <div className="w-10 h-10 rounded-2xl bg-surface border border-slate-800 flex items-center justify-center text-muted group-hover:text-primary transition-all group-hover:scale-110">
+                    <div className="w-10 h-10 bg-surface border border-outline/30 flex items-center justify-center text-secondary group-hover:text-primary transition-all group-hover:scale-110">
                       {user.role === 'admin' ? <Shield size={18} /> : <User size={18} />}
                     </div>
                     <div>
@@ -90,7 +90,7 @@ const IdentityCheckOverlay = memo(({ show, users, onAuthenticated }: IdentityChe
                       <p className="text-xs text-secondary font-normal mt-0.5">{user.role}</p>
                     </div>
                   </div>
-                  <div className="p-1.5 rounded-full bg-surface/70 text-muted group-hover:text-primary group-hover:bg-primary/10 transition-all">
+                  <div className="p-1.5 bg-surface/70 text-secondary group-hover:text-primary group-hover:bg-primary/10 transition-all">
                     <ChevronRight size={14} />
                   </div>
                 </button>
@@ -98,7 +98,7 @@ const IdentityCheckOverlay = memo(({ show, users, onAuthenticated }: IdentityChe
               <div className="pt-4">
                 <button
                   onClick={() => setIsEnterprise(true)}
-                  className="w-full flex items-center justify-center gap-3 py-5 rounded-[1.5rem] border border-dashed border-slate-800 text-secondary hover:text-primary hover:border-primary/40 hover:bg-primary/5 transition-all font-normal text-xs"
+                  className="w-full flex items-center justify-center gap-3 py-5 ] border border-dashed border-outline/30 text-secondary hover:text-primary hover:border-primary/40 hover:bg-primary/5 transition-all font-normal text-xs"
                 >
                   <Lock size={14} />
                   Enterprise Directory
@@ -108,7 +108,8 @@ const IdentityCheckOverlay = memo(({ show, users, onAuthenticated }: IdentityChe
           ) : isEnterprise ? (
             <div className="space-y-5 animate-in slide-in-from-bottom-5 duration-300">
                <div className="flex justify-between items-center px-1">
-                 <p className="text-xs font-normal text-secondary italic">LDAP Authentication</p>
+                 <p className="text-xs font-normal text-secondary">LDAP Authentication</p>
+
                  <button
                    data-testid="local-login-tab"
                    onClick={() => setIsEnterprise(false)}
@@ -126,7 +127,7 @@ const IdentityCheckOverlay = memo(({ show, users, onAuthenticated }: IdentityChe
                      data-testid="username-input"
                      type="text"
                      autoFocus
-                     className="w-full bg-background/50 border border-slate-800/80 focus:border-primary/50 focus:bg-background rounded-[1.25rem] py-4.5 pl-14 pr-5 text-sm text-secondary focus:outline-none transition-all placeholder:text-muted font-mono"
+                     className="w-full bg-background/50 border border-outline/30/80 focus:border-primary/50 focus:bg-background ] py-4.5 pl-14 pr-5 text-sm text-secondary focus:outline-none transition-all placeholder:text-secondary font-mono"
                      placeholder="DIRECTORY ID"
                    />
                  </div>
@@ -140,7 +141,7 @@ const IdentityCheckOverlay = memo(({ show, users, onAuthenticated }: IdentityChe
                      data-testid="password-input"
                      type="password"
                      onKeyDown={(e) => e.key === 'Enter' && handleLogin()}
-                     className="w-full bg-background/50 border border-slate-800/80 focus:border-primary/50 focus:bg-background rounded-[1.25rem] py-4.5 pl-14 pr-5 text-sm text-secondary focus:outline-none transition-all placeholder:text-muted font-mono"
+                     className="w-full bg-background/50 border border-outline/30/80 focus:border-primary/50 focus:bg-background ] py-4.5 pl-14 pr-5 text-sm text-secondary focus:outline-none transition-all placeholder:text-secondary font-mono"
                      placeholder="••••••••"
                    />
                  </div>
@@ -149,26 +150,26 @@ const IdentityCheckOverlay = memo(({ show, users, onAuthenticated }: IdentityChe
                <button
                  data-testid="login-submit"
                  onClick={handleLogin}
-                 className="w-full bg-primary text-white font-normal py-5 rounded-[1.5rem] shadow-2xl shadow-primary/20 hover:shadow-primary/30 active:scale-95 transition-all text-xs border border-primary/20"
+                 className="w-full bg-primary text-foreground font-normal py-5 ] shadow-2xl shadow-primary/20 hover:shadow-primary/30 active:scale-95 transition-all text-xs border border-primary/20"
                >
                  Initialize Session
                </button>
             </div>
           ) : (
             <div className="space-y-5 animate-in slide-in-from-bottom-5 duration-300">
-               <div data-testid="user-display" className="bg-background/50 p-5 rounded-[1.5rem] border border-slate-800 flex items-center justify-between group">
+               <div data-testid="user-display" className="bg-background/50 p-5 ] border border-outline/30 flex items-center justify-between group">
                 <div className="flex items-center gap-4">
-                  <div className="w-10 h-10 rounded-2xl bg-primary/10 border border-primary/20 flex items-center justify-center text-primary shadow-lg">
+                  <div className="w-10 h-10 bg-primary/10 border border-primary/20 flex items-center justify-center text-primary shadow-lg">
                     <Shield size={20} />
                   </div>
                   <div>
                     <p className="text-xs font-normal text-secondary">Active Profile</p>
-                    <p className="text-white font-normal tracking-tight">{selectedUserForLogin.username}</p>
+                    <p className="text-foreground font-normal tracking-tight">{selectedUserForLogin.username}</p>
                   </div>
                 </div>
                 <button 
                   onClick={() => setSelectedUserForLogin(null)}
-                  className="p-2 hover:bg-slate-800 rounded-xl transition-all text-secondary hover:text-rose-500"
+                  className="p-2 hover:bg-surface-container transition-all text-secondary hover:text-error"
                   title="Change User"
                 >
                   <X size={18} />
@@ -184,7 +185,7 @@ const IdentityCheckOverlay = memo(({ show, users, onAuthenticated }: IdentityChe
                     type="password"
                     autoFocus
                     onKeyDown={(e) => e.key === 'Enter' && handleLogin()}
-                    className="w-full bg-background/50 border border-slate-800/80 focus:border-primary/50 focus:bg-background rounded-[1.25rem] py-4.5 pl-14 pr-5 text-sm text-secondary focus:outline-none transition-all placeholder:text-muted font-mono"
+                    className="w-full bg-background/50 border border-outline/30/80 focus:border-primary/50 focus:bg-background ] py-4.5 pl-14 pr-5 text-sm text-secondary focus:outline-none transition-all placeholder:text-secondary font-mono"
                     placeholder="KEY-PHRASE"
                   />
                 </div>
@@ -193,7 +194,7 @@ const IdentityCheckOverlay = memo(({ show, users, onAuthenticated }: IdentityChe
               <button
                 data-testid="local-login-submit"
                 onClick={handleLogin}
-                className="w-full bg-primary text-white font-normal py-5 rounded-[1.5rem] shadow-2xl shadow-primary/20 hover:shadow-primary/30 active:scale-95 transition-all text-xs border border-primary/20"
+                className="w-full bg-primary text-foreground font-normal py-5 ] shadow-2xl shadow-primary/20 hover:shadow-primary/30 active:scale-95 transition-all text-xs border border-primary/20"
               >
                 Unlock Account
               </button>
@@ -202,7 +203,7 @@ const IdentityCheckOverlay = memo(({ show, users, onAuthenticated }: IdentityChe
         </div>
         
         {users.length === 0 && (
-          <div className="text-center p-8 text-muted animate-pulse font-normal text-xs">
+          <div className="text-center p-8 text-secondary animate-pulse font-normal text-xs">
             Synchronizing User Tokens...
           </div>
         )}
diff --git a/frontend/components/ImageAdjustmentModal.tsx b/frontend/components/ImageAdjustmentModal.tsx
index 6bed29d4..5528b479 100644
--- a/frontend/components/ImageAdjustmentModal.tsx
+++ b/frontend/components/ImageAdjustmentModal.tsx
@@ -200,13 +200,13 @@ export function ImageAdjustmentModal({ imageUrl, onConfirm, onCancel }: ImageAdj
 
   return (
     <div className="fixed inset-0 bg-black/80 flex items-center justify-center z-50 p-4">
-      <div className="bg-slate-900 border border-slate-700 rounded-lg shadow-2xl max-w-6xl w-full max-h-[95vh] overflow-hidden flex flex-col">
+      <div className="bg-background border border-outline/30 shadow-2xl max-w-6xl w-full max-h-[95vh] overflow-hidden flex flex-col">
         {/* Header */}
-        <div className="p-4 border-b border-slate-700 flex items-center justify-between bg-slate-800">
-          <h2 className="text-xl font-normal text-white">Rotate Image</h2>
+        <div className="p-4 border-b border-outline/30 flex items-center justify-between bg-surface-container">
+          <h2 className="text-xl font-normal text-foreground">Rotate Image</h2>
           <button
             onClick={onCancel}
-            className="p-2 hover:bg-slate-700 rounded text-gray-400 hover:text-white transition"
+            className="p-2 hover:bg-surface-bright text-secondary hover:text-foreground transition"
           >
             <X size={20} />
           </button>
@@ -214,11 +214,11 @@ export function ImageAdjustmentModal({ imageUrl, onConfirm, onCancel }: ImageAdj
 
         <div className="flex gap-4 p-4 flex-1 overflow-hidden">
           {/* Left: Controls */}
-          <div className="w-56 bg-slate-800 p-4 rounded space-y-4 flex-shrink-0 overflow-y-auto">
+          <div className="w-56 bg-surface-container p-4 space-y-4 flex-shrink-0 overflow-y-auto">
             {/* Rotation */}
             <div>
-              <label className="block text-sm font-normal text-white mb-2">
-                Rotation: <span className="text-yellow-400">{rotation}°</span>
+              <label className="block text-sm font-normal text-foreground mb-2">
+                Rotation: <span className="text-warning">{rotation}°</span>
               </label>
               <input
                 type="range"
@@ -232,8 +232,8 @@ export function ImageAdjustmentModal({ imageUrl, onConfirm, onCancel }: ImageAdj
 
             {/* Zoom */}
             <div>
-              <label className="block text-sm font-normal text-white mb-2">
-                Zoom: <span className="text-yellow-400">{zoom.toFixed(2)}x</span>
+              <label className="block text-sm font-normal text-foreground mb-2">
+                Zoom: <span className="text-warning">{zoom.toFixed(2)}x</span>
               </label>
               <input
                 type="range"
@@ -246,30 +246,10 @@ export function ImageAdjustmentModal({ imageUrl, onConfirm, onCancel }: ImageAdj
               />
             </div>
 
-            {/* Aspect Ratio - DISABLED (cropping not implemented) */}
-            {/* <div>
-              <label className="block text-sm font-normal text-white mb-2">Aspect Ratio</label>
-              <div className="space-y-2">
-                {aspectRatios.map((ratio) => (
-                  <button
-                    key={ratio.label}
-                    onClick={() => setAspectRatio(ratio.value)}
-                    className={`w-full py-2 px-3 rounded text-sm font-normal transition ${
-                      aspectRatio === ratio.value
-                        ? 'bg-yellow-600 text-white'
-                        : 'bg-slate-700 text-gray-300 hover:bg-slate-600'
-                    }`}
-                  >
-                    {ratio.label}
-                  </button>
-                ))}
-              </div>
-            </div> */}
-
             {/* Reset */}
             <button
               onClick={handleReset}
-              className="w-full py-2 px-3 rounded text-sm font-normal bg-slate-700 text-gray-300 hover:bg-slate-600 transition flex items-center justify-center gap-2"
+              className="w-full py-2 px-3 text-sm font-normal bg-surface-bright text-foreground hover:bg-surface-container transition flex items-center justify-center gap-2"
             >
               <RotateCw size={16} />
               Reset
@@ -277,9 +257,9 @@ export function ImageAdjustmentModal({ imageUrl, onConfirm, onCancel }: ImageAdj
           </div>
 
           {/* Center: Canvas */}
-          <div className="flex-1 flex flex-col bg-slate-800 p-4 rounded border border-slate-700 overflow-hidden">
-            <h3 className="text-sm font-normal text-white mb-2">Image Preview</h3>
-            <div className="flex-1 flex items-center justify-center bg-black/50 rounded border border-slate-600 overflow-hidden">
+          <div className="flex-1 flex flex-col bg-surface-container p-4 border border-outline/30 overflow-hidden">
+            <h3 className="text-sm font-normal text-foreground mb-2">Image Preview</h3>
+            <div className="flex-1 flex items-center justify-center bg-black/50 border border-outline/50 overflow-hidden">
               <canvas
                 ref={canvasRef}
                 onWheel={handleWheel}
@@ -289,13 +269,13 @@ export function ImageAdjustmentModal({ imageUrl, onConfirm, onCancel }: ImageAdj
                 className="max-w-full max-h-full cursor-grab active:cursor-grabbing touch-none"
               />
             </div>
-            <p className="text-xs text-gray-400 mt-2">Scroll to zoom | Drag to pan | Rotate with slider</p>
+            <p className="text-xs text-secondary mt-2">Scroll to zoom | Drag to pan | Rotate with slider</p>
           </div>
         </div>
 
         {/* Footer */}
-        <div className="p-4 border-t border-slate-700 bg-slate-800 flex items-center justify-between">
-          <label className="flex items-center gap-2 text-sm font-normal text-white">
+        <div className="p-4 border-t border-outline/30 bg-surface-container flex items-center justify-between">
+          <label className="flex items-center gap-2 text-sm font-normal text-foreground">
             <input
               type="checkbox"
               checked={useImage}
@@ -307,13 +287,13 @@ export function ImageAdjustmentModal({ imageUrl, onConfirm, onCancel }: ImageAdj
           <div className="flex gap-2">
             <button
               onClick={onCancel}
-              className="px-4 py-2 rounded text-sm font-normal bg-slate-700 text-gray-300 hover:bg-slate-600 transition"
+              className="px-4 py-2 text-sm font-normal bg-surface-bright text-foreground hover:bg-surface-container transition"
             >
               Cancel
             </button>
             <button
               onClick={handleConfirm}
-              className="px-4 py-2 rounded text-sm font-normal bg-yellow-600 text-white hover:bg-yellow-700 transition"
+              className="px-4 py-2 text-sm font-normal bg-warning text-primary-foreground hover:bg-warning/80 transition"
             >
               Confirm
             </button>
diff --git a/frontend/components/InventoryTable.tsx b/frontend/components/InventoryTable.tsx
index c6e0df85..dbb650c9 100644
--- a/frontend/components/InventoryTable.tsx
+++ b/frontend/components/InventoryTable.tsx
@@ -65,13 +65,13 @@ export default function InventoryTable({
       {categories.map(cat => {
         const categoryItems = items.filter(i => i.category === cat);
         return (
-          <div key={cat} className="bg-surface/50 border border-slate-800/50 rounded-3xl overflow-hidden transition-all duration-300">
+          <div key={cat} className="bg-surface/50 border border-outline/20 overflow-hidden transition-all duration-300">
             <div
               className="w-full p-4 md:p-5 flex items-center justify-between hover:bg-surface/60 transition-colors cursor-pointer"
               onClick={() => onExpandCategory(expandedCategory === cat ? null : cat)}
             >
               <div className="flex items-center gap-3">
-                <div className="w-10 h-10 rounded-2xl bg-primary/10 flex items-center justify-center text-primary transition-colors">
+                <div className="w-10 h-10 bg-primary/10 flex items-center justify-center text-primary transition-colors">
                   <Layers size={20} />
                 </div>
                 <div className="text-left">
@@ -89,7 +89,7 @@ export default function InventoryTable({
                       e.stopPropagation();
                       onEditCategory(cat);
                     }}
-                    className="p-2 hover:bg-slate-800 rounded-full text-muted hover:text-primary transition-colors relative z-10"
+                    className="p-2 hover:bg-surface-container text-secondary hover:text-primary transition-colors relative z-10"
                   >
                     <EditIcon size={16} />
                   </button>
@@ -99,11 +99,11 @@ export default function InventoryTable({
 
             {expandedCategory === cat && (
               <div className="p-4 pt-0 space-y-2 animate-in slide-in-from-top-4 duration-300">
-                <div className="h-px bg-slate-800/50 mb-4 mx-2" />
+                <div className="h-px bg-outline/20 mb-4 mx-2" />
                 {categoryItems.map(item => (
                   <div
                     key={item.id}
-                    className="bg-background/40 border border-slate-800/50 p-4 rounded-2xl flex items-center justify-between hover:border-primary/40 transition-all active:scale-[0.98]"
+                    className="bg-background/40 border border-outline/20 p-4 flex items-center justify-between hover:border-primary/40 transition-all active:scale-[0.98]"
                   >
                     <div
                       onClick={() => handleItemClick(item)}
@@ -115,7 +115,7 @@ export default function InventoryTable({
                             e.stopPropagation();
                             setSelectedPhotoItem(item);
                           }}
-                          className="w-12 h-12 rounded-xl shrink-0 border-2 border-slate-300 overflow-hidden cursor-pointer hover:border-primary transition-colors active:scale-95"
+                          className="w-12 h-12 shrink-0 border border-outline/30 overflow-hidden cursor-pointer hover:border-primary transition-colors active:scale-95"
                         >
                           <img
                             src={buildPhotoUrl(backendUrl, item.photo_path || item.image_url || '')}
@@ -125,17 +125,17 @@ export default function InventoryTable({
                           />
                         </div>
                       ) : (
-                        <div className="w-12 h-12 rounded-xl bg-green-500/10 flex items-center justify-center text-green-500 shrink-0">
+                        <div className="w-12 h-12 bg-success/10 flex items-center justify-center text-success shrink-0">
                           <Package size={14} />
                         </div>
                       )}
                       <div className="truncate">
                         <h4 className="card-title truncate">{item.name}</h4>
                         {item.photo_path || item.image_url ? (
-                          <p className="card-subtitle mt-0 lowercase opacity-80 text-xs">Tap photo for details</p>
+                          <p className="card-subtitle mt-0 opacity-80 text-xs">Tap photo for details</p>
                         ) : (
                           <>
-                            <p className="card-subtitle mt-0 lowercase opacity-80 truncate">{item.specs}</p>
+                            <p className="card-subtitle mt-0 opacity-80 truncate">{item.specs}</p>
                             <p className="card-subtitle mt-0 text-xs">No photo</p>
                           </>
                         )}
@@ -144,11 +144,11 @@ export default function InventoryTable({
                     <div className="text-right shrink-0">
                       <span className={cn(
                         "text-lg font-normal",
-                        item.quantity <= item.min_quantity ? "text-amber-500" : "text-primary"
+                        item.quantity <= item.min_quantity ? "text-warning" : "text-primary"
                       )}>
                         {item.quantity}
                       </span>
-                      <p className="text-sm text-muted font-normal tracking-tight">Stock</p>
+                      <p className="text-sm text-secondary font-normal tracking-tight">Stock</p>
                     </div>
                   </div>
                 ))}
diff --git a/frontend/components/ItemComparisonModal.tsx b/frontend/components/ItemComparisonModal.tsx
index 4ac45c91..da795be9 100644
--- a/frontend/components/ItemComparisonModal.tsx
+++ b/frontend/components/ItemComparisonModal.tsx
@@ -43,19 +43,19 @@ export default function ItemComparisonModal({
 
   return (
     <div className="fixed inset-0 z-[200] flex items-center justify-center p-4 bg-background/80">
-      <div className="bg-surface border border-slate-800 rounded-[2.5rem] p-8 w-full max-w-2xl shadow-2xl max-h-[90vh] overflow-y-auto">
+      <div className="bg-surface border border-outline/30 ] p-8 w-full max-w-2xl shadow-2xl max-h-[90vh] overflow-y-auto">
         <div className="flex items-center gap-3 mb-6">
-          <AlertTriangle size={24} className="text-amber-500" />
+          <AlertTriangle size={24} className="text-warning" />
           <div>
-            <h3 className="text-xl font-normal text-white">Part Number Already Exists</h3>
+            <h3 className="text-xl font-normal text-foreground">Part Number Already Exists</h3>
             <p className="text-xs text-secondary mt-1">Compare the versions below</p>
           </div>
         </div>
 
         {/* Comparison Table */}
         <div className="space-y-3 mb-8">
-          <div className="grid grid-cols-3 gap-4 mb-4 pb-4 border-b border-slate-800">
-            <div className="text-xs font-normal text-muted">Field</div>
+          <div className="grid grid-cols-3 gap-4 mb-4 pb-4 border-b border-outline/30">
+            <div className="text-xs font-normal text-secondary">Field</div>
             <div className="text-xs font-normal text-secondary">Current (ID: {existingItem?.id})</div>
             <div className="text-xs font-normal text-primary">New (Import)</div>
           </div>
@@ -68,9 +68,7 @@ export default function ItemComparisonModal({
             return (
               <div
                 key={field.key}
-                className={`grid grid-cols-3 gap-4 p-3 rounded-lg ${
-                  different ? 'bg-amber-500/10 border border-amber-500/20' : 'bg-slate-800/30'
-                }`}
+                className={`grid grid-cols-3 gap-4 p-3 ${ different ? 'bg-warning/10 border border-warning/20' : 'bg-surface-container/30' }`}
               >
                 <div className="text-sm font-normal text-secondary">{field.label}</div>
                 <div className={`text-sm font-mono ${different ? 'text-amber-200' : 'text-secondary'}`}>
@@ -85,7 +83,7 @@ export default function ItemComparisonModal({
         </div>
 
         {!hasChanges && (
-          <div className="p-4 bg-slate-800/50 rounded-xl mb-6 border border-slate-700">
+          <div className="p-4 bg-surface-container/50 mb-6 border border-outline-variant">
             <p className="text-sm text-secondary">✓ Items are identical. No update needed.</p>
           </div>
         )}
@@ -96,7 +94,7 @@ export default function ItemComparisonModal({
             onClick={onSkip}
             disabled={loading}
             aria-label="Skip this item comparison"
-            className="flex-1 flex items-center justify-center gap-2 py-4 bg-slate-800 hover:bg-slate-700 text-secondary rounded-2xl text-sm font-normal cursor-pointer transition-all active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed border border-slate-700 focus:ring-2 focus:ring-blue-500 focus:outline-none"
+            className="flex-1 flex items-center justify-center gap-2 py-4 bg-surface-container hover:bg-surface-bright text-secondary text-sm font-normal cursor-pointer transition-all active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed border border-outline-variant focus:ring-2 focus:ring-primary focus:outline-none"
           >
             <SkipForward size={16} /> Skip
           </button>
@@ -105,7 +103,7 @@ export default function ItemComparisonModal({
               onClick={onUpdate}
               disabled={loading}
               aria-label="Update item with new data"
-              className="flex-1 flex items-center justify-center gap-2 py-4 bg-primary hover:bg-blue-600 text-white rounded-2xl text-sm font-normal cursor-pointer transition-all active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed shadow-xl shadow-primary/20 focus:ring-2 focus:ring-blue-400 focus:outline-none"
+              className="flex-1 flex items-center justify-center gap-2 py-4 bg-primary hover:bg-primary text-foreground text-sm font-normal cursor-pointer transition-all active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed shadow-xl shadow-primary/20 focus:ring-2 focus:ring-primary focus:outline-none"
             >
               {loading ? (
                 <>
diff --git a/frontend/components/ItemDetailModal.tsx b/frontend/components/ItemDetailModal.tsx
index 7b456f49..7d8a7565 100644
--- a/frontend/components/ItemDetailModal.tsx
+++ b/frontend/components/ItemDetailModal.tsx
@@ -69,15 +69,15 @@ export default function ItemDetailModal({
 
   return (
     <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50 p-4">
-      <div className="bg-surface border border-slate-800 rounded-3xl max-w-2xl w-full max-h-[90vh] overflow-y-auto">
+      <div className="bg-surface border border-outline/30 max-w-2xl w-full max-h-[90vh] overflow-y-auto">
         {/* Header */}
-        <div className="sticky top-0 bg-surface border-b border-slate-800/50 p-4 md:p-6 flex items-center justify-between">
-          <h2 className="text-xl md:text-2xl font-normal text-white truncate">{item.name}</h2>
+        <div className="sticky top-0 bg-surface border-b border-outline/30/50 p-4 md:p-6 flex items-center justify-between">
+          <h2 className="text-xl md:text-2xl font-normal text-foreground truncate">{item.name}</h2>
           <div className="flex items-center gap-2">
             {currentPhoto && (
               <button
                 onClick={() => setShowDebugPanel(true)}
-                className="p-2 hover:bg-yellow-900/50 rounded-full text-yellow-400 hover:text-yellow-300 transition-colors"
+                className="p-2 hover:bg-yellow-900/50 text-warning hover:text-yellow-300 transition-colors"
                 title="Debug rotation & crop"
                 aria-label="Debug panel"
               >
@@ -86,7 +86,7 @@ export default function ItemDetailModal({
             )}
             <button
               onClick={onClose}
-              className="p-2 hover:bg-slate-800 rounded-full text-muted hover:text-white transition-colors"
+              className="p-2 hover:bg-surface-container text-secondary hover:text-foreground transition-colors"
               aria-label="Close modal"
             >
               <X size={20} />
@@ -99,32 +99,32 @@ export default function ItemDetailModal({
           {/* Item Details */}
           <div className="grid grid-cols-2 gap-4">
             <div>
-              <p className="text-xs text-muted mb-1">Category</p>
-              <p className="text-sm text-white">{item.category}</p>
+              <p className="text-xs text-secondary mb-1">Category</p>
+              <p className="text-sm text-foreground">{item.category}</p>
             </div>
             <div>
-              <p className="text-xs text-muted mb-1">Type</p>
-              <p className="text-sm text-white">{item.type || 'N/A'}</p>
+              <p className="text-xs text-secondary mb-1">Type</p>
+              <p className="text-sm text-foreground">{item.type || 'N/A'}</p>
             </div>
             <div>
-              <p className="text-xs text-muted mb-1">Quantity</p>
-              <p className="text-sm text-white">{item.quantity}</p>
+              <p className="text-xs text-secondary mb-1">Quantity</p>
+              <p className="text-sm text-foreground">{item.quantity}</p>
             </div>
             <div>
-              <p className="text-xs text-muted mb-1">Part Number</p>
-              <p className="text-sm text-white">{item.part_number || 'N/A'}</p>
+              <p className="text-xs text-secondary mb-1">Part Number</p>
+              <p className="text-sm text-foreground">{item.part_number || 'N/A'}</p>
             </div>
             {item.barcode && (
               <div className="col-span-2">
-                <p className="text-xs text-muted mb-1">Barcode</p>
-                <p className="text-sm text-white font-mono">{item.barcode}</p>
+                <p className="text-xs text-secondary mb-1">Barcode</p>
+                <p className="text-sm text-foreground font-mono">{item.barcode}</p>
               </div>
             )}
           </div>
 
           {/* Photo Section */}
-          <div className="border-t border-slate-800/50 pt-6">
-            <h3 className="text-lg font-normal text-white mb-4 flex items-center gap-2">
+          <div className="border-t border-outline/30/50 pt-6">
+            <h3 className="text-lg font-normal text-foreground mb-4 flex items-center gap-2">
               <Camera size={18} className="text-primary" />
               Photo
             </h3>
@@ -133,7 +133,7 @@ export default function ItemDetailModal({
               <>
                 {currentPhoto ? (
                   <div className="space-y-3">
-                    <div className="relative bg-slate-900/50 rounded-2xl overflow-hidden border border-slate-800/50 aspect-video max-h-96">
+                    <div className="relative bg-surface-container/50 overflow-hidden border border-outline/30/50 aspect-video max-h-96">
                       <img
                         src={buildPhotoUrl(backendUrl, currentPhoto.full_url)}
                         alt={item.name}
@@ -143,25 +143,25 @@ export default function ItemDetailModal({
                     <div className="flex gap-2">
                       <button
                         onClick={() => setShowPhotoUpload(true)}
-                        className="flex-1 px-4 py-2 bg-primary/20 border border-primary/50 text-primary rounded-xl hover:bg-primary/30 transition-colors font-normal text-sm"
+                        className="flex-1 px-4 py-2 bg-primary/20 border border-primary/50 text-primary hover:bg-primary/30 transition-colors font-normal text-sm"
                       >
                         Replace Photo
                       </button>
                       <button
                         onClick={handleDeletePhoto}
                         disabled={isDeleting}
-                        className="px-4 py-2 bg-rose-500/20 border border-rose-500/50 text-rose-400 rounded-xl hover:bg-rose-500/30 disabled:opacity-50 transition-colors font-normal text-sm"
+                        className="px-4 py-2 bg-error/20 border border-error/50 text-rose-400 hover:bg-error/30 disabled:opacity-50 transition-colors font-normal text-sm"
                       >
                         <Trash2 size={16} />
                       </button>
                     </div>
                   </div>
                 ) : (
-                  <div className="bg-slate-900/30 border border-slate-800/50 rounded-2xl p-8 text-center">
-                    <p className="text-muted text-sm mb-4">No photo uploaded</p>
+                  <div className="bg-surface-container/30 border border-outline/30/50 p-8 text-center">
+                    <p className="text-secondary text-sm mb-4">No photo uploaded</p>
                     <button
                       onClick={() => setShowPhotoUpload(true)}
-                      className="px-4 py-2 bg-primary/20 border border-primary/50 text-primary rounded-xl hover:bg-primary/30 transition-colors font-normal text-sm"
+                      className="px-4 py-2 bg-primary/20 border border-primary/50 text-primary hover:bg-primary/30 transition-colors font-normal text-sm"
                     >
                       Upload Photo
                     </button>
@@ -169,12 +169,12 @@ export default function ItemDetailModal({
                 )}
               </>
             ) : (
-              <div ref={photoUploadRef} className="bg-slate-900/30 border border-slate-800/50 rounded-2xl p-4 md:p-6">
+              <div ref={photoUploadRef} className="bg-surface-container/30 border border-outline/30/50 p-4 md:p-6">
                 <div className="mb-4 flex items-center justify-between">
-                  <h4 className="font-normal text-white">Upload New Photo</h4>
+                  <h4 className="font-normal text-foreground">Upload New Photo</h4>
                   <button
                     onClick={() => setShowPhotoUpload(false)}
-                    className="p-1 hover:bg-slate-800 rounded-lg text-muted hover:text-white transition-colors"
+                    className="p-1 hover:bg-surface-container text-secondary hover:text-foreground transition-colors"
                     aria-label="Cancel upload"
                   >
                     <X size={16} />
diff --git a/frontend/components/ItemPhotoUpload.tsx b/frontend/components/ItemPhotoUpload.tsx
index 03cf6d22..ad510e91 100644
--- a/frontend/components/ItemPhotoUpload.tsx
+++ b/frontend/components/ItemPhotoUpload.tsx
@@ -115,7 +115,7 @@ export default function ItemPhotoUpload({
         <button
           onClick={triggerFileInput}
           disabled={isLoading}
-          className="flex items-center justify-center gap-2 flex-1 px-4 py-2.5 bg-primary text-white rounded-lg font-normal text-base transition-colors hover:bg-primary/90 disabled:opacity-60 disabled:cursor-not-allowed"
+          className="flex items-center justify-center gap-2 flex-1 px-4 py-2.5 bg-primary text-foreground font-normal text-base transition-colors hover:bg-primary/90 disabled:opacity-60 disabled:cursor-not-allowed"
           aria-label="Upload photo"
         >
           {isLoading ? (
@@ -130,7 +130,7 @@ export default function ItemPhotoUpload({
         <button
           onClick={triggerCameraInput}
           disabled={isLoading}
-          className="flex items-center justify-center gap-2 flex-1 px-4 py-2.5 bg-slate-700 text-white rounded-lg font-normal text-base transition-colors hover:bg-slate-600 disabled:opacity-60 disabled:cursor-not-allowed"
+          className="flex items-center justify-center gap-2 flex-1 px-4 py-2.5 bg-surface-bright text-foreground font-normal text-base transition-colors hover:bg-outline-variant disabled:opacity-60 disabled:cursor-not-allowed"
           aria-label="Capture photo with camera"
         >
           {isLoading ? (
@@ -144,11 +144,11 @@ export default function ItemPhotoUpload({
 
       {/* Status messages */}
       {isLoading && (
-        <div className="text-sm text-slate-400">Uploading...</div>
+        <div className="text-sm text-secondary">Uploading...</div>
       )}
 
       {localError && (
-        <div className="text-sm text-rose-500">{localError}</div>
+        <div className="text-sm text-error">{localError}</div>
       )}
     </div>
   );
diff --git a/frontend/components/LogsOverlay.tsx b/frontend/components/LogsOverlay.tsx
index 8a8d049e..b7c83e23 100644
--- a/frontend/components/LogsOverlay.tsx
+++ b/frontend/components/LogsOverlay.tsx
@@ -18,11 +18,11 @@ export default function LogsOverlay({ show, onClose, logs, inventory }: LogsOver
       <div className="flex justify-between items-center mb-8">
         <div>
           <h2 className="text-2xl font-normal tracking-tight">Audit History</h2>
-          <p className="text-xs text-muted">Live transaction log from cloud</p>
+          <p className="text-xs text-secondary">Live transaction log from cloud</p>
         </div>
         <button 
           onClick={onClose}
-          className="p-3 bg-surface rounded-full text-secondary"
+          className="p-3 bg-surface text-secondary"
         >
           <X size={24} />
         </button>
@@ -36,15 +36,13 @@ export default function LogsOverlay({ show, onClose, logs, inventory }: LogsOver
           </div>
         ) : (
           logs.map((log) => (
-            <div key={log.id} className="bg-surface/70 border border-slate-800 p-4 rounded-2xl flex items-center justify-between gap-4">
+            <div key={log.id} className="bg-surface/70 border border-outline/30 p-4 flex items-center justify-between gap-4">
               <div className="flex-1 min-w-0">
                 <div className="flex items-center gap-2 mb-1">
-                  <p className={`text-xs font-normal ${
-                    log.action.includes('CHECK_IN') ? "text-green-500" : (log.action.includes('TRASH') ? "text-rose-500" : "text-amber-500")
-                  }`}>
+                  <p className={`text-xs font-normal ${ log.action.includes('CHECK_IN') ? "text-success" : (log.action.includes('TRASH') ? "text-error" : "text-warning") }`}>
                     {log.action}
                   </p>
-                  <span className="text-xs font-normal text-muted">by</span>
+                  <span className="text-xs font-normal text-secondary">by</span>
                   <span className="text-xs font-normal text-secondary">{log.username || 'System'}</span>
                 </div>
                 <div className="flex items-center gap-2">
@@ -58,7 +56,7 @@ export default function LogsOverlay({ show, onClose, logs, inventory }: LogsOver
                       {new Date(log.timestamp).toLocaleString()}
                     </p>
                     {log.details && (
-                      <span className="text-xs bg-slate-800 text-muted px-2 py-0.5 rounded border border-slate-700 font-mono">
+                      <span className="text-xs bg-surface-container text-secondary px-2 py-0.5 border border-outline-variant font-mono">
                         {log.details}
                       </span>
                     )}
@@ -66,9 +64,7 @@ export default function LogsOverlay({ show, onClose, logs, inventory }: LogsOver
                 )}
               </div>
               <div className="text-right">
-                <p className={`text-lg font-normal ${
-                  log.quantity_change > 0 ? "text-green-400" : "text-rose-400"
-                }`}>
+                <p className={`text-lg font-normal ${ log.quantity_change > 0 ? "text-success" : "text-rose-400" }`}>
                   {log.quantity_change > 0 ? '+' : ''}{log.quantity_change}
                 </p>
               </div>
diff --git a/frontend/components/LogsTable.tsx b/frontend/components/LogsTable.tsx
index a7ea841c..3d980c94 100644
--- a/frontend/components/LogsTable.tsx
+++ b/frontend/components/LogsTable.tsx
@@ -26,16 +26,16 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
   if (loading) {
     return (
       <div className="flex flex-col items-center justify-center py-32 text-secondary gap-4 animate-pulse">
-        <div className="w-10 h-10 border-4 border-primary/20 border-t-primary rounded-full animate-spin" />
-        <p className="text-xs font-normal tracking-widest italic">Securing Audit Stream...</p>
+        <div className="w-10 h-10 border-4 border-primary/20 border-t-primary animate-spin" />
+        <p className="text-xs font-normal">Securing Audit Stream...</p>
       </div>
     );
   }
 
   if (logs.length === 0) {
     return (
-      <div className="bg-surface/20 border border-slate-800/50 border-dashed rounded-[2.5rem] py-20 flex flex-col items-center justify-center text-center gap-3 md:gap-4">
-        <div className="w-16 h-16 bg-surface rounded-2xl flex items-center justify-center text-slate-700 border border-slate-800">
+      <div className="bg-surface/20 border border-outline/20 border-dashed ] py-20 flex flex-col items-center justify-center text-center gap-3 md:gap-4">
+        <div className="w-16 h-16 bg-surface flex items-center justify-center text-secondary border border-outline/30">
           <ArrowDownCircle size={32} />
         </div>
         <div>
@@ -53,17 +53,17 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
           <button
             key={log.id}
             onClick={() => setSelectedLog(log)}
-            className="w-full text-left bg-surface/50 border border-slate-800/30 p-3 px-4 rounded-2xl flex items-center justify-between gap-4 hover:bg-slate-800/40 hover:border-primary/30 transition-all group active:scale-[0.99] relative overflow-hidden shadow-sm"
+            className="w-full text-left bg-surface/50 border border-outline/30 p-3 px-4 flex items-center justify-between gap-4 hover:bg-surface-container/40 hover:border-primary/30 transition-all group active:scale-[0.99] relative overflow-hidden shadow-sm"
           >
             <div className="flex-1 min-w-0 z-10 flex items-center gap-4">
               {/* Compact Action Badge */}
               <div className={cn(
-                "text-[10px] font-normal px-3 py-1.5 rounded-lg border min-w-[85px] text-center tracking-tight",
-                log.action.includes('CHECK_IN') ? "bg-green-500/10 text-green-500 border-green-500/20" :
-                (log.action.includes('TRASH') ? "bg-rose-500/10 text-rose-500 border-rose-500/20" :
-                 (log.action.includes('DB') ? "bg-sky-500/10 text-sky-400 border-sky-500/20" :
-                  (log.action.includes('DELETE') ? "bg-red-500/10 text-red-500 border-red-500/30" :
-                   (log.action.includes('CREATE') ? "bg-indigo-500/10 text-indigo-400 border-indigo-500/20" : "bg-primary/10 text-primary border-primary/20"))))
+                "text-[10px] font-normal px-3 py-1.5  border min-w-[85px] text-center tracking-tight",
+                log.action.includes('CHECK_IN') ? "bg-success/10 text-success border-success/20" :
+                (log.action.includes('TRASH') ? "bg-error/10 text-error border-error/20" :
+                 (log.action.includes('DB') ? "bg-primary/10 text-primary border-primary/20" :
+                  (log.action.includes('DELETE') ? "bg-error/10 text-error border-error/30" :
+                   (log.action.includes('CREATE') ? "bg-primary/10 text-primary border-primary/20" : "bg-primary/10 text-primary border-primary/20"))))
               )}>
                 {log.action.replace('_', ' ')}
               </div>
@@ -74,7 +74,7 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
                 </h3>
                 <div className="flex items-center gap-2">
                   <span className="card-subtitle mt-0 shrink-0">{log.username || 'System'}</span>
-                  <span className="w-1 h-1 rounded-full bg-slate-800 shrink-0 mt-1" />
+                  <span className="w-1 h-1 bg-outline/30 shrink-0 mt-1" />
                   <span className="card-subtitle mt-0 lowercase opacity-80 truncate">
                     {new Date(log.timestamp).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })} · {new Date(log.timestamp).toLocaleDateString()}
                   </span>
@@ -85,7 +85,7 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
             <div className="shrink-0 flex items-center gap-3 z-10">
               <div className={cn(
                 "text-lg font-normal tabular-nums min-w-[35px] text-right",
-                (log.quantity_change || 0) > 0 ? "text-green-500" : ((log.quantity_change || 0) < 0 ? "text-rose-500" : "text-primary/50")
+                (log.quantity_change || 0) > 0 ? "text-success" : ((log.quantity_change || 0) < 0 ? "text-error" : "text-primary/50")
               )}>
                 {log.quantity_change ? (log.quantity_change > 0 ? `+${log.quantity_change}` : log.quantity_change) : (log.action.includes('DB') ? 'SYS' : '±')}
               </div>
@@ -97,35 +97,35 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
       {/* Selected Log Modal */}
       {selectedLog && (
         <div className="fixed inset-0 z-[100] flex items-end sm:items-center justify-center p-0 sm:p-4 bg-background/90 animate-in fade-in duration-300">
-          <div className="bg-surface border-t sm:border border-slate-800 rounded-t-[2.5rem] sm:rounded-[3rem] p-4 md:p-6 max-w-lg w-full shadow-2xl space-y-3 md:space-y-4 animate-in slide-in-from-bottom-10 duration-300 overflow-hidden">
+          <div className="bg-surface border-t sm:border border-outline/30 ] sm:] p-4 md:p-6 max-w-lg w-full shadow-2xl space-y-3 md:space-y-4 animate-in slide-in-from-bottom-10 duration-300 overflow-hidden">
             <div className="flex justify-between items-start">
               <div className="space-y-1 pr-4">
                 <div className={cn(
-                  "text-xs font-normal px-4 py-1.5 rounded-full border inline-block tracking-widest",
-                  selectedLog.action.includes('CHECK_IN') ? "bg-green-500/10 text-green-500 border-green-500/30" :
-                  (selectedLog.action.includes('TRASH') ? "bg-rose-500/10 text-rose-500 border-rose-500/30" : "bg-primary/10 text-primary border-primary/30")
+                  "text-xs font-normal px-4 py-1.5  border inline-block ",
+                  selectedLog.action.includes('CHECK_IN') ? "bg-success/10 text-success border-success/30" :
+                  (selectedLog.action.includes('TRASH') ? "bg-error/10 text-error border-error/30" : "bg-primary/10 text-primary border-primary/30")
                 )}>
                   {selectedLog.action}
                 </div>
-                <h2 className="text-2xl font-normal text-white tracking-tight pt-2 leading-tight">
+                <h2 className="text-2xl font-normal text-foreground tracking-tight pt-2 leading-tight">
                   {selectedLog.resolved_name}
                 </h2>
               </div>
-              <button onClick={() => setSelectedLog(null)} className="p-3 bg-slate-800/50 hover:bg-slate-800 rounded-2xl text-muted transition-colors border border-slate-800 shrink-0 shadow-lg">
+              <button onClick={() => setSelectedLog(null)} className="p-3 bg-surface-container hover:bg-surface-bright text-secondary transition-colors border border-outline/30 shrink-0 shadow-lg">
                 <X size={20} />
               </button>
             </div>
 
             <div className="grid grid-cols-2 gap-4">
-              <div className="space-y-1 bg-background/50 p-4 rounded-2xl border border-slate-800/50">
-                <p className="text-[11px] font-normal text-muted tracking-widest">Protocol Operator</p>
+              <div className="space-y-1 bg-background/50 p-4 border border-outline/20">
+                <p className="text-[11px] font-normal text-secondary">Protocol Operator</p>
                 <p className="text-sm font-normal text-secondary">{selectedLog.username || 'Automated Process'}</p>
               </div>
-              <div className="space-y-1 bg-background/50 p-4 rounded-2xl border border-slate-800/50">
-                <p className="text-[11px] font-normal text-muted tracking-widest">Quantity Delta</p>
+              <div className="space-y-1 bg-background/50 p-4 border border-outline/20">
+                <p className="text-[11px] font-normal text-secondary">Quantity Delta</p>
                 <p className={cn(
                   "text-xl font-normal tabular-nums",
-                  (selectedLog.quantity_change || 0) > 0 ? "text-green-500" : "text-rose-500"
+                  (selectedLog.quantity_change || 0) > 0 ? "text-success" : "text-error"
                 )}>
                   {selectedLog.quantity_change
                     ? `${selectedLog.quantity_change > 0 ? '+' : ''}${selectedLog.quantity_change}`
@@ -136,8 +136,8 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
 
             <div className="space-y-5">
               <div className="space-y-1">
-                <p className="text-[11px] font-normal text-muted tracking-widest ml-1">Universal Timestamp</p>
-                <p className="text-xs font-normal text-secondary bg-background/30 p-4 rounded-2xl border border-slate-800/30 tabular-nums">
+                <p className="text-[11px] font-normal text-secondary ml-1">Universal Timestamp</p>
+                <p className="text-xs font-normal text-secondary bg-background/30 p-4 border border-outline/20 tabular-nums">
                   {new Date(selectedLog.timestamp).toLocaleString(undefined, { dateStyle: 'full', timeStyle: 'medium' })}
                 </p>
               </div>
@@ -148,15 +148,15 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
                   return (
                     <div className="space-y-4 pt-2">
                       <div className="flex items-center gap-3">
-                        <div className="h-px flex-1 bg-slate-800/50" />
-                        <p className="text-[8px] font-normal text-slate-700 tracking-[0.2em]">Snapshot Record</p>
-                        <div className="h-px flex-1 bg-slate-800/50" />
+                        <div className="h-px flex-1 bg-outline/20" />
+                        <p className="text-[8px] font-normal text-secondary tracking-[0.2em]">Snapshot Record</p>
+                        <div className="h-px flex-1 bg-outline/20" />
                       </div>
                       <div className="grid grid-cols-2 gap-2.5">
                         {Object.entries(snap).map(([key, val]) => (
                           (val && key !== 'image_url' && key !== 'id') ? (
-                            <div key={key} className="bg-background/20 p-3 rounded-xl border border-slate-800/20">
-                              <p className="text-[10px] font-normal text-muted mb-1 tracking-tight opacity-70">{key.replace('_', ' ')}</p>
+                            <div key={key} className="bg-background/20 p-3 border border-outline/20">
+                              <p className="text-[10px] font-normal text-secondary mb-1 tracking-tight opacity-70">{key.replace('_', ' ')}</p>
                               <p className="text-xs font-normal text-secondary truncate" title={String(val)}>{String(val)}</p>
                             </div>
                           ) : null
@@ -169,8 +169,8 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
 
               {selectedLog.details && (
                 <div className="space-y-1.5">
-                  <p className="text-[11px] font-normal text-muted tracking-widest ml-1">Intervention Details</p>
-                  <div className="bg-primary/5 text-primary/80 p-5 rounded-3xl border border-primary/10 text-sm font-normal leading-relaxed italic shadow-inner">
+                  <p className="text-[11px] font-normal text-secondary ml-1">Intervention Details</p>
+                  <div className="bg-primary/5 text-primary/80 p-5 border border-primary/10 text-sm font-normal leading-relaxed shadow-inner">
                     "{selectedLog.details}"
                   </div>
                 </div>
@@ -179,7 +179,7 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
 
             <button
               onClick={() => setSelectedLog(null)}
-              className="w-full bg-slate-800 hover:bg-slate-700 text-white font-normal py-4.5 rounded-2xl transition-all active:scale-95 border border-slate-700 shadow-xl"
+              className="w-full bg-surface-container hover:bg-surface-bright text-foreground font-normal py-4.5 transition-all active:scale-95 border border-outline/30 shadow-xl"
             >
               Close Audit Insight
             </button>
diff --git a/frontend/components/ManualCropUI.tsx b/frontend/components/ManualCropUI.tsx
index 80b2193b..e1ad6da9 100644
--- a/frontend/components/ManualCropUI.tsx
+++ b/frontend/components/ManualCropUI.tsx
@@ -67,9 +67,9 @@ export default function ManualCropUI({
 
   if (error) {
     return (
-      <div className="flex items-center justify-center p-8 bg-slate-900 rounded-lg">
+      <div className="flex items-center justify-center p-8 bg-surface-container">
         <div className="text-center">
-          <p className="text-rose-500">{error}</p>
+          <p className="text-error">{error}</p>
         </div>
       </div>
     );
@@ -79,7 +79,7 @@ export default function ManualCropUI({
   if (!actualDimensions) {
     return (
       <div className="flex flex-col gap-4">
-        <div className="relative bg-slate-900 rounded-lg overflow-hidden border border-slate-800">
+        <div className="relative bg-surface-container overflow-hidden border border-outline/30">
           <img
             ref={imageRef}
             src={imageUrl}
@@ -90,7 +90,7 @@ export default function ManualCropUI({
             style={{ visibility: 'hidden' }}
           />
         </div>
-        <div className="text-sm text-slate-400 text-center">Loading image...</div>
+        <div className="text-sm text-secondary text-center">Loading image...</div>
       </div>
     );
   }
@@ -198,7 +198,7 @@ export default function ManualCropUI({
       {/* Image container with crop preview */}
       <div
         ref={containerRef}
-        className="relative bg-slate-900 rounded-lg overflow-hidden border border-slate-800"
+        className="relative bg-background overflow-hidden border border-outline/30"
         style={{
           aspectRatio: `${actualDimensions.width} / ${actualDimensions.height}`,
           maxWidth: '100%',
@@ -256,7 +256,7 @@ export default function ManualCropUI({
 
             {/* Crop bounding box */}
             <div
-              className="absolute border-2 border-cyan-400"
+              className="absolute border-2 border-primary"
               style={{
                 left: `${crop.x * scale}px`,
                 top: `${crop.y * scale}px`,
@@ -271,9 +271,7 @@ export default function ManualCropUI({
                 key={handleType}
                 onMouseDown={handleMouseDown(handleType)}
                 onTouchStart={handleTouchStart(handleType)}
-                className={`absolute w-${HANDLE_SIZE} h-${HANDLE_SIZE} bg-cyan-400 rounded-full border-2 border-white shadow-lg hover:scale-125 transition-transform cursor-grab active:cursor-grabbing ${
-                  isDragging ? 'scale-125' : ''
-                }`}
+                className={`absolute w-${HANDLE_SIZE} h-${HANDLE_SIZE} bg-primary border-2 border-white shadow-lg hover:scale-125 transition-transform cursor-grab active:cursor-grabbing ${ isDragging ? 'scale-125' : '' }`}
                 style={{
                   ...getHandlePosition(handleType),
                   width: `${HANDLE_SIZE}px`,
@@ -291,14 +289,14 @@ export default function ManualCropUI({
         {crop && (
           <button
             onClick={() => resetCrop()}
-            className="flex items-center justify-center gap-2 flex-1 px-4 py-2.5 bg-slate-700 text-white rounded-lg font-normal text-base transition-colors hover:bg-slate-600"
+            className="flex items-center justify-center gap-2 flex-1 px-4 py-2.5 bg-surface-bright text-foreground font-normal text-base transition-colors hover:bg-surface-container"
           >
             <X className="w-5 h-5" />
             <span>Use Full Photo</span>
           </button>
         )}
         {!crop && (
-          <div className="text-sm text-slate-400 text-center flex-1 py-2.5">
+          <div className="text-sm text-secondary text-center flex-1 py-2.5">
             Drag handles to adjust crop area
           </div>
         )}
@@ -306,7 +304,7 @@ export default function ManualCropUI({
 
       {/* Crop bounds display (debug) */}
       {crop && (
-        <div className="text-xs text-slate-500 text-center">
+        <div className="text-xs text-secondary text-center">
           Crop: {Math.round(crop.x)}, {Math.round(crop.y)} | Size: {Math.round(crop.width)} x{' '}
           {Math.round(crop.height)}
         </div>
diff --git a/frontend/components/NewItemDialog.tsx b/frontend/components/NewItemDialog.tsx
index c610cf7d..35d085f6 100644
--- a/frontend/components/NewItemDialog.tsx
+++ b/frontend/components/NewItemDialog.tsx
@@ -18,7 +18,7 @@ export default function NewItemDialog({ onScannerClick, onAddItemClick }: NewIte
     <div className="flex flex-col items-center py-3 md:py-4 text-center gap-3 md:gap-4">
       <button
         onClick={onScannerClick}
-        className="w-24 h-24 rounded-full bg-primary/20 hover:bg-primary/30 border-2 border-primary border-dashed flex items-center justify-center group transition-all"
+        className="w-24 h-24 bg-primary/20 hover:bg-primary/30 border-2 border-primary border-dashed flex items-center justify-center group transition-all"
       >
         <Smartphone className="w-10 h-10 text-primary group-hover:scale-110 transition-transform" />
       </button>
@@ -26,9 +26,9 @@ export default function NewItemDialog({ onScannerClick, onAddItemClick }: NewIte
       <div className="w-full flex justify-center">
         <button
           onClick={onAddItemClick}
-          className="w-full flex flex-col items-center justify-center p-4 md:p-6 rounded-[2rem] bg-indigo-500/5 border border-indigo-500/20 group hover:border-indigo-500/50 transition-all font-normal text-indigo-400 gap-2 md:gap-3"
+          className="w-full flex flex-col items-center justify-center p-4 md:p-6 ] bg-primary/5 border border-primary/20 group hover:border-primary/50 transition-all font-normal text-primary gap-2 md:gap-3"
         >
-          <div className="p-4 bg-indigo-500/10 rounded-2xl group-hover:scale-110 transition-transform shadow-lg shadow-indigo-500/10">
+          <div className="p-4 bg-primary/10 group-hover:scale-110 transition-transform shadow-lg shadow-primary/10">
             <Sparkles size={32} />
           </div>
           <div className="text-center">
diff --git a/frontend/components/PhotoModal.tsx b/frontend/components/PhotoModal.tsx
index 32efea29..cf241352 100644
--- a/frontend/components/PhotoModal.tsx
+++ b/frontend/components/PhotoModal.tsx
@@ -34,18 +34,18 @@ export default function PhotoModal({
       aria-label={`Photo viewer for ${title}`}
     >
       <div
-        className="bg-surface border border-slate-800 rounded-3xl max-w-2xl w-full max-h-[90vh] overflow-auto flex flex-col"
+        className="bg-surface border border-outline/30 max-w-2xl w-full max-h-[90vh] overflow-auto flex flex-col"
         onClick={(e) => e.stopPropagation()}
       >
         {/* Header */}
-        <div className="sticky top-0 bg-surface border-b border-slate-800/50 p-4 md:p-6 flex items-center justify-between">
-          <h2 className="text-xl md:text-2xl font-normal text-white truncate">{title}</h2>
+        <div className="sticky top-0 bg-surface border-b border-outline/30/50 p-4 md:p-6 flex items-center justify-between">
+          <h2 className="text-xl md:text-2xl font-normal text-foreground truncate">{title}</h2>
           <button
             onClick={onClose}
-            className="p-2 hover:bg-slate-800 rounded-full text-muted hover:text-white transition-colors"
+            className="p-2 hover:bg-surface-container text-secondary hover:text-foreground transition-colors"
             aria-label="Close modal"
           >
-            <X size={20} className="text-rose-500" />
+            <X size={20} className="text-error" />
           </button>
         </div>
 
@@ -54,7 +54,7 @@ export default function PhotoModal({
           <img
             src={photoUrl}
             alt={title}
-            className="max-w-full max-h-[calc(90vh-120px)] object-contain rounded-2xl"
+            className="max-w-full max-h-[calc(90vh-120px)] object-contain"
             loading="lazy"
           />
         </div>
diff --git a/frontend/components/ScannerSection.tsx b/frontend/components/ScannerSection.tsx
index bac290c7..3634f144 100644
--- a/frontend/components/ScannerSection.tsx
+++ b/frontend/components/ScannerSection.tsx
@@ -32,7 +32,7 @@ export default function ScannerSection({
   return (
     <div className="w-full px-1 space-y-3 md:space-y-4">
       {/* Mode Switcher */}
-      <div className="flex p-1.5 bg-surface rounded-2xl shadow-inner w-full gap-1">
+      <div className="flex p-1.5 bg-surface shadow-inner w-full gap-1">
         {[
           { id: 'CHECK_IN', label: 'Check In', icon: ArrowDownCircle },
           { id: 'CHECK_OUT', label: 'Check Out', icon: ArrowUpCircle },
@@ -43,8 +43,8 @@ export default function ScannerSection({
             data-testid={m.id === 'CHECK_IN' ? 'operation-checkin' : m.id === 'CHECK_OUT' ? 'operation-checkout' : undefined}
             onClick={() => onModeChange(m.id)}
             className={cn(
-              "flex-1 py-3.5 rounded-xl text-xs sm:text-sm font-normal transition-all flex items-center justify-center gap-3",
-              mode === m.id ? "bg-slate-800 text-primary shadow-lg ring-1 ring-primary/20" : "text-muted hover:text-secondary"
+              "flex-1 py-3.5  text-xs sm:text-sm font-normal transition-all flex items-center justify-center gap-3",
+              mode === m.id ? "bg-surface-container text-primary shadow-lg ring-1 ring-primary/20" : "text-secondary hover:text-foreground"
             )}
           >
             <m.icon size={18} className={mode === m.id ? "scale-110 transition-transform" : ""} />
@@ -54,14 +54,14 @@ export default function ScannerSection({
       </div>
 
       {/* Scanner Section */}
-      <section className="glass-card rounded-3xl p-6">
+      <section className="glass-card p-6">
         {showScanner ? (
           <div className="space-y-2 md:space-y-3">
             <div className="flex justify-between items-center">
               <h2 className="text-lg font-normal">scanning...</h2>
               <button
                 onClick={() => onShowScanner(false)}
-                className="p-2.5 bg-surface border border-slate-800 text-secondary rounded-xl hover:text-rose-500 transition-all active:scale-95"
+                className="p-2.5 bg-surface border border-outline/30 text-secondary hover:text-error transition-all active:scale-95"
               >
                 <X size={18} />
               </button>
diff --git a/frontend/components/SearchErrorModal.tsx b/frontend/components/SearchErrorModal.tsx
index 43a74629..c50f8634 100644
--- a/frontend/components/SearchErrorModal.tsx
+++ b/frontend/components/SearchErrorModal.tsx
@@ -13,22 +13,22 @@ export function SearchErrorModal({ isOpen, error, onRetry, onSkip, canRetry = tr
 
   return (
     <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
-      <div className="bg-white rounded-lg p-6 max-w-md shadow-xl">
-        <h2 className="text-xl font-normal mb-2 text-rose-500">Search failed</h2>
-        <p className="text-sm text-slate-600 mb-4">{error || 'Unable to retrieve specs from the web'}</p>
+      <div className="bg-background p-6 max-w-md shadow-xl border border-outline/30">
+        <h2 className="text-xl font-normal mb-2 text-error">Search failed</h2>
+        <p className="text-sm text-secondary mb-4">{error || 'Unable to retrieve specs from the web'}</p>
 
         <div className="flex gap-3">
           {canRetry && (
             <button
               onClick={onRetry}
-              className="flex-1 px-4 py-2 bg-primary text-white rounded font-normal text-sm hover:bg-primary/90"
+              className="flex-1 px-4 py-2 bg-primary text-primary-foreground font-normal text-sm hover:bg-primary/90"
             >
               Retry
             </button>
           )}
           <button
             onClick={onSkip}
-            className="flex-1 px-4 py-2 border border-slate-300 rounded font-normal text-sm hover:bg-slate-50"
+            className="flex-1 px-4 py-2 border border-outline/30 font-normal text-sm hover:bg-surface-container text-foreground"
           >
             Skip
           </button>
diff --git a/frontend/components/SearchLoadingModal.tsx b/frontend/components/SearchLoadingModal.tsx
index 693d1bb0..d0aaefdf 100644
--- a/frontend/components/SearchLoadingModal.tsx
+++ b/frontend/components/SearchLoadingModal.tsx
@@ -35,12 +35,12 @@ export function SearchLoadingModal({ isOpen, onTimeout, maxSeconds = 30 }: Searc
 
   return (
     <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
-      <div className="bg-white rounded-lg p-6 max-w-md shadow-xl">
+      <div className="bg-white p-6 max-w-md shadow-xl">
         <h2 className="text-xl font-normal mb-4">Searching for specs...</h2>
-        <p className="text-sm text-slate-600 mb-4">This may take up to {maxSeconds} seconds</p>
+        <p className="text-sm text-outline-variant mb-4">This may take up to {maxSeconds} seconds</p>
 
         <div className="mb-4">
-          <div className="relative h-2 bg-slate-200 rounded-full overflow-hidden">
+          <div className="relative h-2 bg-foreground overflow-hidden">
             <div
               className="h-full bg-primary transition-all duration-1000"
               style={{ width: `${(seconds / maxSeconds) * 100}%` }}
diff --git a/frontend/components/StatCard.tsx b/frontend/components/StatCard.tsx
index 98105d79..b1dae47a 100644
--- a/frontend/components/StatCard.tsx
+++ b/frontend/components/StatCard.tsx
@@ -9,7 +9,7 @@ interface StatCardProps {
 
 export default function StatCard({ label, value, icon: Icon }: StatCardProps) {
   return (
-    <div className="flex justify-between items-center gap-2 p-3.5 bg-surface/70 border border-slate-800/50 rounded-2xl shadow-sm transition-all hover:bg-surface" role="status">
+    <div className="flex justify-between items-center gap-2 p-3.5 bg-surface/70 border border-outline/30 shadow-sm transition-all hover:bg-surface" role="status">
       <div className="flex items-center gap-2.5 min-w-0">
         {Icon && <Icon className="w-5 h-5 text-primary flex-shrink-0" aria-hidden="true" />}
         <span className="text-base md:text-lg text-secondary font-normal truncate">
@@ -17,7 +17,7 @@ export default function StatCard({ label, value, icon: Icon }: StatCardProps) {
         </span>
       </div>
 
-      <span className="text-base md:text-lg font-normal text-white whitespace-nowrap tabular-nums">
+      <span className="text-base md:text-lg font-normal text-foreground whitespace-nowrap tabular-nums">
         {value}
       </span>
     </div>
diff --git a/frontend/components/StockAdjustmentPanel.tsx b/frontend/components/StockAdjustmentPanel.tsx
index e25f33f4..cacb746b 100644
--- a/frontend/components/StockAdjustmentPanel.tsx
+++ b/frontend/components/StockAdjustmentPanel.tsx
@@ -63,12 +63,12 @@ export default function StockAdjustmentPanel({
 
   return (
     <div data-testid="stock-adjustment-form" className="fixed inset-0 z-50 flex items-end sm:items-center justify-center p-4 bg-background/80 animate-in fade-in duration-200">
-      <div className="w-full max-w-lg bg-surface border border-slate-800 rounded-[2.5rem] shadow-2xl p-4 md:p-6 overflow-hidden animate-in slide-in-from-bottom-10 duration-300">
+      <div className="w-full max-w-lg bg-surface border border-outline/30 ] shadow-2xl p-4 md:p-6 overflow-hidden animate-in slide-in-from-bottom-10 duration-300">
         <div className="flex justify-between items-center mb-3 md:mb-4">
           <h3 className="text-xl font-normal tracking-tight flex items-center gap-2">
             <span data-testid="adjustment-item-name">{isEditing ? "Edit Metadata" : selectedItem.name}</span>
             {!isEditing && (
-              <span data-testid="current-quantity" className="text-[11px] bg-slate-800 text-secondary px-2 py-0.5 rounded-md font-normal tracking-tight shadow-sm border border-slate-700/50">
+              <span data-testid="current-quantity" className="text-[11px] bg-surface-container text-secondary px-2 py-0.5 font-normal tracking-tight shadow-sm border border-outline-variant/50">
                 In Stock: {selectedItem.quantity}
               </span>
             )}
@@ -77,7 +77,7 @@ export default function StockAdjustmentPanel({
             {!isEditing && (
               <button
                 onClick={() => onEdit(selectedItem)}
-                className="p-2 hover:bg-slate-800 rounded-full text-secondary"
+                className="p-2 hover:bg-surface-container text-secondary"
               >
                 <Edit2 size={20} />
               </button>
@@ -85,7 +85,7 @@ export default function StockAdjustmentPanel({
             {isEditing && (
               <button
                 onClick={onDeleteItem}
-                className="p-2 hover:bg-red-500/20 rounded-full text-red-500"
+                className="p-2 hover:bg-error/20 text-error"
               >
                 <Trash2 size={20} />
               </button>
@@ -93,7 +93,7 @@ export default function StockAdjustmentPanel({
             <button
               onClick={onCancel}
               data-testid="adjustment-cancel"
-              className="p-2 hover:bg-slate-800 rounded-full"
+              className="p-2 hover:bg-surface-container"
             >
               <X size={20} />
             </button>
@@ -103,12 +103,12 @@ export default function StockAdjustmentPanel({
         {isEditing ? (
           <div className="space-y-2 md:space-y-3 mb-4 md:mb-6">
             <div>
-              <div className="bg-surface py-2.5 px-4 rounded-[1.2rem] border border-slate-800 focus-within:border-primary/50 transition-colors group">
+              <div className="bg-surface py-2.5 px-4 ] border border-outline/30 focus-within:border-primary/50 transition-colors group">
                 <label className="text-xs text-secondary font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Item Name</label>
                 <textarea
                   value={editedItem.name || ''}
                   onChange={(e) => onEditChange({ ...editedItem, name: e.target.value })}
-                  className="bg-transparent w-full text-lg font-normal outline-none text-white placeholder:text-muted resize-none h-8 leading-tight selection:bg-primary/30 py-0"
+                  className="bg-transparent w-full text-lg font-normal outline-none text-foreground placeholder:text-secondary resize-none h-8 leading-tight selection:bg-primary/30 py-0"
                   placeholder="SSD, SFP, Cable..."
                 />
               </div>
@@ -119,7 +119,7 @@ export default function StockAdjustmentPanel({
                 type="text"
                 value={editedItem.part_number || ''}
                 onChange={e => onEditChange({ ...editedItem, part_number: e.target.value })}
-                className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm font-mono outline-none text-secondary"
+                className="w-full bg-background border border-outline/30 py-3 px-4 text-sm font-mono outline-none text-secondary"
                 placeholder="e.g. PN-12345"
               />
             </div>
@@ -131,7 +131,7 @@ export default function StockAdjustmentPanel({
                   list="existing-categories"
                   value={editedItem.category || ''}
                   onChange={e => onEditChange({ ...editedItem, category: e.target.value })}
-                  className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm outline-none text-secondary placeholder:text-muted"
+                  className="w-full bg-background border border-outline/30 py-3 px-4 text-sm outline-none text-secondary placeholder:text-secondary"
                   placeholder="e.g. storage"
                 />
                 <datalist id="existing-categories">
@@ -147,7 +147,7 @@ export default function StockAdjustmentPanel({
                   list="existing-types"
                   value={editedItem.type || ''}
                   onChange={e => onEditChange({...editedItem, type: e.target.value})}
-                  className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm outline-none text-secondary"
+                  className="w-full bg-background border border-outline/30 py-3 px-4 text-sm outline-none text-secondary"
                   placeholder="e.g. spare parts"
                 />
               </div>
@@ -159,7 +159,7 @@ export default function StockAdjustmentPanel({
                     list="existing-boxes"
                     value={editedItem.box_label || ''}
                     onChange={e => onEditChange({...editedItem, box_label: e.target.value})}
-                    className="w-full bg-background border border-slate-800 rounded-xl py-3 pl-4 pr-12 text-sm outline-none text-secondary placeholder:text-muted focus:border-primary transition-colors"
+                    className="w-full bg-background border border-outline/30 py-3 pl-4 pr-12 text-sm outline-none text-secondary placeholder:text-secondary focus:border-primary transition-colors"
                     placeholder="e.g. SFPs 40G Cisco"
                   />
                   <button
@@ -169,8 +169,8 @@ export default function StockAdjustmentPanel({
                       toast.success("Scanning for BOX label...");
                     }}
                     className={cn(
-                      "absolute right-2 p-2 rounded-lg transition-all",
-                      fieldScanning?.active ? "bg-primary text-white animate-pulse" : "text-muted hover:bg-slate-800"
+                      "absolute right-2 p-2  transition-all",
+                      fieldScanning?.active ? "bg-primary text-foreground animate-pulse" : "text-secondary hover:bg-surface-container"
                     )}
                   >
                     <Camera size={18} />
@@ -183,7 +183,7 @@ export default function StockAdjustmentPanel({
                   type="text"
                   value={editedItem.connector || ''}
                   onChange={e => onEditChange({...editedItem, connector: e.target.value})}
-                  className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm outline-none text-secondary"
+                  className="w-full bg-background border border-outline/30 py-3 px-4 text-sm outline-none text-secondary"
                   placeholder="e.g. LC/UPC"
                 />
               </div>
@@ -193,7 +193,7 @@ export default function StockAdjustmentPanel({
                   type="text"
                   value={editedItem.size || ''}
                   onChange={e => onEditChange({...editedItem, size: e.target.value})}
-                  className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm outline-none text-secondary"
+                  className="w-full bg-background border border-outline/30 py-3 px-4 text-sm outline-none text-secondary"
                   placeholder="e.g. 5m / 1600GB"
                 />
               </div>
@@ -203,7 +203,7 @@ export default function StockAdjustmentPanel({
                   type="text"
                   value={editedItem.color || ''}
                   onChange={e => onEditChange({...editedItem, color: e.target.value})}
-                  className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm outline-none text-secondary"
+                  className="w-full bg-background border border-outline/30 py-3 px-4 text-sm outline-none text-secondary"
                   placeholder="e.g. Black"
                 />
               </div>
@@ -212,16 +212,16 @@ export default function StockAdjustmentPanel({
                 <textarea
                   value={editedItem.description || ''}
                   onChange={e => onEditChange({ ...editedItem, description: e.target.value })}
-                  className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm outline-none text-secondary resize-none h-20"
+                  className="w-full bg-background border border-outline/30 py-3 px-4 text-sm outline-none text-secondary resize-none h-20"
                   placeholder="Item description..."
                 />
               </div>
-              <div className="bg-surface py-2.5 px-4 rounded-[1.2rem] border border-slate-800 focus-within:border-primary/50 transition-colors group">
+              <div className="bg-surface py-2.5 px-4 ] border border-outline/30 focus-within:border-primary/50 transition-colors group">
                 <label className="text-xs text-secondary font-normal mb-0.5 block group-focus-within:text-primary transition-colors tracking-tight">Item ID or Code</label>
                 <textarea
                   value={editedItem.ocr_text || ''}
                   onChange={e => onEditChange({ ...editedItem, ocr_text: e.target.value })}
-                  className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm font-normal outline-none text-secondary resize-none h-12"
+                  className="w-full bg-background border border-outline/30 py-3 px-4 text-sm font-normal outline-none text-secondary resize-none h-12"
                   placeholder="e.g., SKU-12345 or barcode text..."
                 />
               </div>
@@ -229,18 +229,18 @@ export default function StockAdjustmentPanel({
           </div>
         ) : (
           <>
-            <div className="flex p-1 bg-background rounded-2xl mb-4 md:mb-6">
+            <div className="flex p-1 bg-background mb-4 md:mb-6">
               {[
                 { id: 'ADD', label: 'Buy More', icon: Plus, color: 'text-primary' },
-                { id: 'REMOVE', label: 'Subtract', icon: Minus, color: 'text-amber-500' },
-                { id: 'TRASH', label: 'Discard', icon: Trash2, color: 'text-red-500' }
+                { id: 'REMOVE', label: 'Subtract', icon: Minus, color: 'text-warning' },
+                { id: 'TRASH', label: 'Discard', icon: Trash2, color: 'text-error' }
               ].map((t) => (
                 <button
                   key={t.id}
                   onClick={() => onTypeChange(t.id as 'ADD' | 'REMOVE' | 'TRASH')}
                   className={cn(
-                    "flex-1 flex flex-col items-center py-3 rounded-xl transition-all",
-                    adjustType === t.id ? "bg-slate-800 shadow-lg" : "text-muted"
+                    "flex-1 flex flex-col items-center py-3  transition-all",
+                    adjustType === t.id ? "bg-surface-container shadow-lg" : "text-secondary"
                   )}
                 >
                   <t.icon size={20} className={adjustType === t.id ? t.color : ""} />
@@ -253,7 +253,7 @@ export default function StockAdjustmentPanel({
               <div className="flex items-center gap-2 md:gap-4">
                 <button
                   onClick={() => onQuantityChange(Math.max(1, adjustQty - 1))}
-                  className="w-12 h-12 rounded-full border border-slate-800 flex items-center justify-center text-secondary active:bg-slate-800"
+                  className="w-12 h-12 border border-outline/30 flex items-center justify-center text-secondary active:bg-surface-container"
                 >
                   <Minus size={24} />
                 </button>
@@ -263,22 +263,22 @@ export default function StockAdjustmentPanel({
                 </div>
                 <button
                   onClick={() => onQuantityChange(adjustQty + 1)}
-                  className="w-12 h-12 rounded-full border border-slate-800 flex items-center justify-center text-secondary active:bg-slate-800"
+                  className="w-12 h-12 border border-outline/30 flex items-center justify-center text-secondary active:bg-surface-container"
                 >
                   <Plus size={24} />
                 </button>
               </div>
 
               {adjustType === 'TRASH' && (
-                <div className="w-full bg-red-500/5 border border-red-500/20 p-4 rounded-2xl animate-in shake duration-500">
+                <div className="w-full bg-error/5 border border-error/20 p-4 animate-in shake duration-500">
                   <div className="flex items-center gap-2 mb-3">
-                    <AlertTriangle size={16} className="text-red-500" />
-                    <span className="text-sm font-normal text-red-400">Waste Declaration</span>
+                    <AlertTriangle size={16} className="text-error" />
+                    <span className="text-sm font-normal text-error">Waste Declaration</span>
                   </div>
                   <select
                     value={trashReason}
                     onChange={(e) => onReasonChange(e.target.value)}
-                    className="w-full bg-background border border-slate-800 rounded-xl py-3 px-4 text-sm outline-none text-secondary"
+                    className="w-full bg-background border border-outline/30 py-3 px-4 text-sm outline-none text-secondary"
                   >
                     <option>Damaged</option>
                     <option>Expired</option>
@@ -296,11 +296,11 @@ export default function StockAdjustmentPanel({
           onClick={isEditing ? onUpdateItem : onAdjustStock}
           data-testid="adjustment-submit"
           className={cn(
-            "w-full py-5 rounded-[1.8rem] font-normal text-lg transition-all active:scale-[0.98] shadow-2xl",
-            isEditing ? "bg-slate-100 text-slate-900" : (
-              adjustType === 'ADD' ? "bg-primary shadow-primary/20 text-white" :
-                adjustType === 'REMOVE' ? "bg-amber-600 shadow-amber-500/20 text-white" :
-                  "bg-red-600 shadow-red-500/20 text-white"
+            "w-full py-5 ] font-normal text-lg transition-all active:scale-[0.98] shadow-2xl",
+            isEditing ? "bg-foreground text-surface-container" : (
+              adjustType === 'ADD' ? "bg-primary shadow-primary/20 text-foreground" :
+                adjustType === 'REMOVE' ? "bg-warning shadow-warning/20 text-foreground" :
+                  "bg-error shadow-error/20 text-foreground"
             )
           )}
         >
diff --git a/frontend/components/Toast.tsx b/frontend/components/Toast.tsx
index 808ec8fe..66d4a219 100644
--- a/frontend/components/Toast.tsx
+++ b/frontend/components/Toast.tsx
@@ -16,15 +16,15 @@ export function Toast({ type, message, onClose, duration = 3000 }: ToastProps) {
   }, [onClose, duration]);
 
   const bgColor = {
-    success: 'bg-green-500',
-    error: 'bg-red-500',
-    warning: 'bg-yellow-500',
-    info: 'bg-blue-500',
+    success: 'bg-success',
+    error: 'bg-error',
+    warning: 'bg-warning',
+    info: 'bg-primary',
   }[type];
 
   return (
     <div
-      className={`fixed bottom-4 right-4 ${bgColor} text-white px-4 py-2 rounded shadow-lg z-50 animate-fade-in`}
+      className={`fixed bottom-4 right-4 ${bgColor} text-foreground px-4 py-2 shadow-lg z-50 animate-fade-in`}
       role="alert"
       aria-live="polite"
     >
diff --git a/frontend/components/admin/AiManager.tsx b/frontend/components/admin/AiManager.tsx
index 6ff1ff0f..e3d99d68 100644
--- a/frontend/components/admin/AiManager.tsx
+++ b/frontend/components/admin/AiManager.tsx
@@ -32,13 +32,13 @@ export default function AiManager({
   onUpdatePrompt
 }: AiManagerProps) {
   return (
-    <section data-testid="ai-config" className="bg-surface/50 border border-slate-800/50 rounded-[2.5rem] p-4 md:p-6 shadow-2xl space-y-4 transition-all group/ai">
+    <section data-testid="ai-config" className="bg-surface/50 border border-outline/30/50 ] p-4 md:p-6 shadow-2xl space-y-4 transition-all group/ai">
       <div className="flex items-center justify-between">
         <div className="flex items-center gap-3">
-          <div className="w-10 h-10 rounded-xl bg-primary/10 flex items-center justify-center text-primary border border-primary/20">
+          <div className="w-10 h-10 bg-primary/10 flex items-center justify-center text-primary border border-primary/20">
             <Brain size={20} />
           </div>
-          <h2 className="text-xl font-normal text-white tracking-tight">AI Intelligence</h2>
+          <h2 className="text-xl font-normal text-foreground tracking-tight">AI Intelligence</h2>
         </div>
       </div>
       
@@ -49,33 +49,33 @@ export default function AiManager({
             data-testid="provider-option"
             onClick={() => handleUpdateAiProvider(p.id)}
             className={cn(
-              "p-4 rounded-2xl border transition-all text-left flex items-center justify-between group",
+              "p-4  border transition-all text-left flex items-center justify-between group",
               p.active 
                 ? "bg-primary border-primary shadow-xl shadow-primary/10" 
-                : "bg-background/60 border-slate-800 hover:border-primary/40"
+                : "bg-background/60 border-outline/30 hover:border-primary/40"
             )}
           >
             <div className="flex items-center gap-3">
               <div className={cn(
-                "w-8 h-8 rounded-lg flex items-center justify-center transition-colors",
-                p.active ? "bg-white/20 text-white" : "bg-primary/10 text-primary group-hover:bg-primary/20"
+                "w-8 h-8  flex items-center justify-center transition-colors",
+                p.active ? "bg-white/20 text-foreground" : "bg-primary/10 text-primary group-hover:bg-primary/20"
               )}>
                 {p.id === 'gemini' ? <Cpu size={16} /> : <Zap size={16} />}
               </div>
               <div>
-                <p className={cn("text-xs font-normal tracking-tight", p.active ? "text-white" : "text-secondary")}>{p.name}</p>
+                <p className={cn("text-xs font-normal tracking-tight", p.active ? "text-foreground" : "text-secondary")}>{p.name}</p>
                 <p className={cn(
-                  "text-xs font-normal mt-1 px-0.5 rounded",
+                  "text-xs font-normal mt-1 px-0.5 ",
                   p.active 
                     ? (p.configured ? "text-emerald-200" : "text-rose-100") 
-                    : (p.configured ? "text-emerald-500" : "text-rose-500")
+                    : (p.configured ? "text-emerald-500" : "text-error")
                 )}>
                   {p.configured ? "● Key Configured" : "○ Missing Api Key"}
                 </p>
               </div>
             </div>
             {p.active && (
-              <div className="bg-white/20 px-2.5 py-1 rounded-full text-xs font-normal text-white tracking-tight">
+              <div className="bg-white/20 px-2.5 py-1 text-xs font-normal text-foreground tracking-tight">
                 Active
               </div>
             )}
@@ -83,17 +83,17 @@ export default function AiManager({
         ))}
       </div>
 
-      <div className="bg-primary/5 border border-primary/10 rounded-[2rem] p-5 space-y-3">
+      <div className="bg-primary/5 border border-primary/10 ] p-5 space-y-3">
         <div className="flex items-center justify-between">
           <div className="flex items-center gap-3">
-            <div className="p-2 bg-primary/10 rounded-lg text-primary"><Lock size={14} /></div>
+            <div className="p-2 bg-primary/10 text-primary"><Lock size={14} /></div>
             <h3 className="text-sm font-normal text-secondary tracking-tight">Provider Access Keys</h3>
           </div>
           <button
             onClick={onSaveAiKeys}
             disabled={isSavingKeys}
             data-testid="save-settings-button"
-            className="px-5 py-2 bg-primary hover:bg-primary text-white rounded-xl text-sm font-normal transition-all active:scale-95 shadow-xl shadow-primary/10 tracking-tight border border-primary/30 flex items-center gap-2"
+            className="px-5 py-2 bg-primary hover:bg-primary text-foreground text-sm font-normal transition-all active:scale-95 shadow-xl shadow-primary/10 tracking-tight border border-primary/30 flex items-center gap-2"
           >
             {isSavingKeys ? <RotateCcw size={14} className="animate-spin" /> : <Lock size={14} />}
             {isSavingKeys ? "Storing..." : "Store API Keys"}
@@ -110,16 +110,16 @@ export default function AiManager({
                 value={aiKeys.gemini}
                 onChange={(e) => setAiKeys({...aiKeys, gemini: e.target.value})}
                 placeholder={aiConfig?.providers?.find((p: any) => p.id === 'gemini')?.masked_key || "Enter Gemini Key..."}
-                className="flex-1 bg-background/80 border border-slate-800 rounded-xl py-1.5 px-4 text-xs text-white outline-none focus:border-primary/50 transition-all placeholder:text-secondary"
+                className="flex-1 bg-background/80 border border-outline/30 py-1.5 px-4 text-xs text-foreground outline-none focus:border-primary/50 transition-all placeholder:text-secondary"
               />
               <button
                 onClick={() => onTestAiKey('gemini')}
                 disabled={isTestingKeys.gemini}
                 className={cn(
-                  "px-3 py-1.5 rounded-xl text-xs font-normal tracking-tight transition-all border shadow-lg flex items-center gap-1.5",
+                  "px-3 py-1.5  text-xs font-normal tracking-tight transition-all border shadow-lg flex items-center gap-1.5",
                   isTestingKeys.gemini
-                    ? "bg-slate-800 border-slate-700 text-muted cursor-wait"
-                    : "bg-primary border-primary text-white hover:bg-primary"
+                    ? "bg-surface-container border-outline-variant text-secondary cursor-wait"
+                    : "bg-primary border-primary text-foreground hover:bg-primary"
                 )}
               >
                 {isTestingKeys.gemini ? <RotateCcw size={12} className="animate-spin" /> : <Wifi size={12} />}
@@ -136,16 +136,16 @@ export default function AiManager({
                 value={aiKeys.claude}
                 onChange={(e) => setAiKeys({...aiKeys, claude: e.target.value})}
                 placeholder={aiConfig?.providers?.find((p: any) => p.id === 'claude')?.masked_key || "Enter Claude Key..."}
-                className="flex-1 bg-background/80 border border-slate-800 rounded-xl py-1.5 px-4 text-xs text-white outline-none focus:border-primary/50 transition-all placeholder:text-secondary"
+                className="flex-1 bg-background/80 border border-outline/30 py-1.5 px-4 text-xs text-foreground outline-none focus:border-primary/50 transition-all placeholder:text-secondary"
               />
               <button
                 onClick={() => onTestAiKey('claude')}
                 disabled={isTestingKeys.claude}
                 className={cn(
-                  "px-3 py-1.5 rounded-xl text-xs font-normal tracking-tight transition-all border shadow-lg flex items-center gap-1.5",
+                  "px-3 py-1.5  text-xs font-normal tracking-tight transition-all border shadow-lg flex items-center gap-1.5",
                   isTestingKeys.claude
-                    ? "bg-slate-800 border-slate-700 text-muted cursor-wait"
-                    : "bg-primary border-primary text-white hover:bg-primary"
+                    ? "bg-surface-container border-outline-variant text-secondary cursor-wait"
+                    : "bg-primary border-primary text-foreground hover:bg-primary"
                 )}
               >
                 {isTestingKeys.claude ? <RotateCcw size={12} className="animate-spin" /> : <Wifi size={12} />}
@@ -163,7 +163,7 @@ export default function AiManager({
             <button
               onClick={onUpdatePrompt}
               disabled={isSavingPrompt}
-              className="px-5 py-1.5 bg-primary hover:bg-primary text-white rounded-xl text-sm font-normal transition-all active:scale-95 shadow-xl shadow-primary/10 tracking-tight border border-primary/30 flex items-center gap-2"
+              className="px-5 py-1.5 bg-primary hover:bg-primary text-foreground text-sm font-normal transition-all active:scale-95 shadow-xl shadow-primary/10 tracking-tight border border-primary/30 flex items-center gap-2"
             >
               {isSavingPrompt ? <RotateCcw size={14} className="animate-spin" /> : <FileText size={14} />}
               {isSavingPrompt ? "Saving..." : "Save Prompt"}
@@ -172,11 +172,11 @@ export default function AiManager({
           <textarea
             value={aiPrompt}
             onChange={(e) => setAiPrompt(e.target.value)}
-            className="w-full bg-background/80 border border-slate-800 rounded-2xl p-4 text-xs font-mono font-normal text-secondary leading-relaxed outline-none focus:border-purple-500/50 transition-all min-h-[200px] custom-scrollbar shadow-inner"
+            className="w-full bg-background/80 border border-outline/30 p-4 text-xs font-mono font-normal text-secondary leading-relaxed outline-none focus:border-purple-500/50 transition-all min-h-[200px] custom-scrollbar shadow-inner"
           />
         </div>
-        <div className="bg-primary/5 border border-purple-500/10 rounded-2xl p-4 flex gap-3 items-start">
-          <div className="p-2 bg-primary/10 rounded-lg text-purple-400 shrink-0"><Shield size={14} /></div>
+        <div className="bg-primary/5 border border-purple-500/10 p-4 flex gap-3 items-start">
+          <div className="p-2 bg-primary/10 text-purple-400 shrink-0"><Shield size={14} /></div>
           <p className="text-xs font-normal text-secondary leading-relaxed">
             This prompt instructs the Vision AI core on label interpretation. Ensure it defines explicit mapping for technical attributes like <span className="text-purple-400">Item</span>, <span className="text-purple-400">Type</span>, and <span className="text-purple-400">Part Number</span> to avoid extraction null-pointers and ensure inventory data integrity.
           </p>
diff --git a/frontend/components/admin/CategoryManager.tsx b/frontend/components/admin/CategoryManager.tsx
index 9adab933..d43e2895 100644
--- a/frontend/components/admin/CategoryManager.tsx
+++ b/frontend/components/admin/CategoryManager.tsx
@@ -23,18 +23,18 @@ export default function CategoryManager({
   onUpdateCategorySubmit
 }: CategoryManagerProps) {
   return (
-    <section className="bg-surface/50 border border-slate-800/50 rounded-[2.5rem] p-4 md:p-6 shadow-2xl space-y-4 transition-all group/categories">
+    <section className="bg-surface/50 border border-outline/30/50 ] p-4 md:p-6 shadow-2xl space-y-4 transition-all group/categories">
       <div className="flex items-center justify-between">
          <div className="flex items-center gap-3">
-           <div className="w-10 h-10 rounded-xl bg-primary/10 flex items-center justify-center text-primary border border-primary/20">
+           <div className="w-10 h-10 bg-primary/10 flex items-center justify-center text-primary border border-primary/20">
              <Layers size={20} />
            </div>
-           <h2 className="text-xl font-normal text-white tracking-tight">Category Groups</h2>
+           <h2 className="text-xl font-normal text-foreground tracking-tight">Category Groups</h2>
          </div>
           <button
             onClick={onAddCategory}
             data-testid="add-category-button"
-            className="flex items-center gap-2 bg-primary hover:bg-primary text-white px-5 py-2 rounded-xl text-sm font-normal transition-all shadow-xl shadow-primary/10 active:scale-95 border border-primary/30 tracking-tight"
+            className="flex items-center gap-2 bg-primary hover:bg-primary text-foreground px-5 py-2 text-sm font-normal transition-all shadow-xl shadow-primary/10 active:scale-95 border border-primary/30 tracking-tight"
           >
             <Plus size={14} /> New Group
           </button>
@@ -42,7 +42,7 @@ export default function CategoryManager({
 
       <div data-testid="category-list" className="grid sm:grid-cols-2 lg:grid-cols-4 gap-2.5">
          {categories.map(cat => (
-           <div key={cat.id} data-testid="category-item" className="p-4 bg-background/40 border border-slate-800/50 rounded-2xl flex items-center justify-between group hover:border-primary/40 transition-all">
+           <div key={cat.id} data-testid="category-item" className="p-4 bg-background/40 border border-outline/30/50 flex items-center justify-between group hover:border-primary/40 transition-all">
              <div className="min-w-0 pr-4">
                <p className="card-title group-hover:text-primary transition-colors">{cat.name}</p>
                <p className="card-subtitle">{cat.description || 'General storage'}</p>
@@ -53,14 +53,14 @@ export default function CategoryManager({
                     setEditingCategory(cat);
                     setEditCatForm({ name: cat.name, description: cat.description || '' });
                   }}
-                  className="p-2 text-secondary hover:text-white hover:bg-slate-800 rounded-lg transition-all"
+                  className="p-2 text-secondary hover:text-foreground hover:bg-surface-container transition-all"
                 >
                   <Edit2 size={14} />
                 </button>
                 <button
                   onClick={() => onDeleteCategory(cat.id, cat.name)}
                   data-testid="delete-category-button"
-                  className="p-2 text-secondary hover:text-rose-500 hover:bg-rose-500/5 rounded-lg transition-all"
+                  className="p-2 text-secondary hover:text-error hover:bg-error/5 transition-all"
                 >
                   <Trash2 size={14} />
                 </button>
@@ -72,15 +72,15 @@ export default function CategoryManager({
       {/* Edit Category Modal */}
       {editingCategory && (
         <div className="fixed inset-0 z-[100] flex items-end sm:items-center justify-center p-0 sm:p-4 bg-background/90 animate-in fade-in duration-300">
-          <div className="w-full max-w-lg bg-surface border-x border-t sm:border border-slate-800 rounded-t-[2.5rem] sm:rounded-3xl p-6 shadow-2xl space-y-3 overflow-hidden animate-in slide-in-from-bottom-10">
+          <div className="w-full max-w-lg bg-surface border-x border-t sm:border border-outline/30 ] sm: p-6 shadow-2xl space-y-3 overflow-hidden animate-in slide-in-from-bottom-10">
             <div className="flex justify-between items-center mb-2">
                <div className="flex items-center gap-3">
-                 <div className="w-10 h-10 rounded-xl bg-primary/10 flex items-center justify-center text-primary border border-primary/20">
+                 <div className="w-10 h-10 bg-primary/10 flex items-center justify-center text-primary border border-primary/20">
                    <Edit2 size={20} />
                  </div>
-                 <h3 className="text-xl font-normal text-white tracking-tight">Modify Group</h3>
+                 <h3 className="text-xl font-normal text-foreground tracking-tight">Modify Group</h3>
                </div>
-               <button onClick={() => setEditingCategory(null)} className="p-2 hover:bg-slate-800 rounded-2xl text-muted transition-colors border border-slate-800">
+               <button onClick={() => setEditingCategory(null)} className="p-2 hover:bg-surface-container text-secondary transition-colors border border-outline/30">
                  <X size={20} />
                </button>
             </div>
@@ -92,7 +92,7 @@ export default function CategoryManager({
                     type="text"
                     value={editCatForm.name}
                     onChange={(e) => setEditCatForm({...editCatForm, name: e.target.value})}
-                    className="w-full bg-background border border-slate-800 rounded-2xl py-1.5 px-4 text-sm text-white focus:border-primary outline-none transition-all"
+                    className="w-full bg-background border border-outline/30 py-1.5 px-4 text-sm text-foreground focus:border-primary outline-none transition-all"
                   />
                </div>
                <div className="space-y-1">
@@ -100,10 +100,10 @@ export default function CategoryManager({
                   <textarea
                     value={editCatForm.description}
                     onChange={(e) => setEditCatForm({...editCatForm, description: e.target.value})}
-                    className="w-full bg-background border border-slate-800 rounded-2xl py-1.5 px-4 text-sm text-white focus:border-primary outline-none transition-all h-24 resize-none"
+                    className="w-full bg-background border border-outline/30 py-1.5 px-4 text-sm text-foreground focus:border-primary outline-none transition-all h-24 resize-none"
                   />
                </div>
-               <button data-testid="add-category-submit" onClick={onUpdateCategorySubmit} className="w-full bg-primary hover:bg-primary text-white font-normal py-2.5 rounded-2xl shadow-xl shadow-primary/20 active:scale-95 transition-all text-sm tracking-tight">
+               <button data-testid="add-category-submit" onClick={onUpdateCategorySubmit} className="w-full bg-primary hover:bg-primary text-foreground font-normal py-2.5 shadow-xl shadow-primary/20 active:scale-95 transition-all text-sm tracking-tight">
                  Update Asset Group
                </button>
             </div>
diff --git a/frontend/components/admin/DatabaseManager.tsx b/frontend/components/admin/DatabaseManager.tsx
index bc281a88..a745e46e 100644
--- a/frontend/components/admin/DatabaseManager.tsx
+++ b/frontend/components/admin/DatabaseManager.tsx
@@ -35,24 +35,24 @@ export default function DatabaseManager({
 
   return (
     <div className="space-y-3 md:space-y-4 h-full">
-      <div data-testid="database-info" className="bg-surface/50 border border-slate-800/50 rounded-[2.5rem] p-4 md:p-6 shadow-2xl overflow-hidden relative group transition-all">
+      <div data-testid="database-info" className="bg-surface/50 border border-outline/30/50 ] p-4 md:p-6 shadow-2xl overflow-hidden relative group transition-all">
         <div className="flex items-center gap-3 mb-3">
-          <div className="w-10 h-10 rounded-xl bg-primary/10 flex items-center justify-center text-primary border border-primary/20">
+          <div className="w-10 h-10 bg-primary/10 flex items-center justify-center text-primary border border-primary/20">
             <Database size={20} />
           </div>
-          <h2 className="text-xl font-normal text-white tracking-tight">System Integrity</h2>
+          <h2 className="text-xl font-normal text-foreground tracking-tight">System Integrity</h2>
         </div>
         
         <div className="flex flex-col sm:flex-row sm:items-center justify-between gap-4">
           <div className="space-y-1 sm:pr-4">
-            <p className="text-xs font-normal text-muted tracking-tight">Database Health</p>
+            <p className="text-xs font-normal text-secondary tracking-tight">Database Health</p>
             <div className="flex items-center gap-2">
-              <div className="w-2 h-2 rounded-full bg-green-500 animate-pulse shadow-[0_0_8px_rgba(34,197,94,0.3)]" />
+              <div className="w-2 h-2 bg-success animate-pulse shadow-[0_0_8px_rgba(34,197,94,0.3)]" />
               <span className="text-sm font-normal text-secondary">Operational</span>
             </div>
           </div>
-          <div className="sm:pl-4 sm:border-l border-slate-800">
-            <p className="text-xs font-normal text-muted tracking-tight">Last Backup</p>
+          <div className="sm:pl-4 sm:border-l border-outline/30">
+            <p className="text-xs font-normal text-secondary tracking-tight">Last Backup</p>
             <p className="text-sm font-normal text-secondary tabular-nums">{dbStats.backup_count > 0 ? 'Verified' : 'Pending...'}</p>
           </div>
           <div className="ml-auto">
@@ -60,7 +60,7 @@ export default function DatabaseManager({
                 onClick={onCreateBackup}
                 disabled={isBackingUp}
                 data-testid="backup-button"
-                className="flex items-center gap-2 px-5 py-2.5 bg-primary hover:bg-blue-600 text-white rounded-xl text-sm font-normal transition-all active:scale-95 disabled:opacity-50 shadow-xl shadow-primary/10 tracking-tight focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
+                className="flex items-center gap-2 px-5 py-2.5 bg-primary hover:bg-primary text-foreground text-sm font-normal transition-all active:scale-95 disabled:opacity-50 shadow-xl shadow-primary/10 tracking-tight focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
                 aria-label="Create database backup"
               >
                {isBackingUp ? <RotateCcw size={14} className="animate-spin" /> : <Database size={14} />}
@@ -70,32 +70,32 @@ export default function DatabaseManager({
         </div>
       </div>
 
-      <div className="bg-surface/50 border border-slate-800/50 rounded-[2.5rem] p-4 md:p-6 shadow-2xl space-y-4">
+      <div className="bg-surface/50 border border-outline/30/50 ] p-4 md:p-6 shadow-2xl space-y-4">
         <div className="space-y-3">
           <div className="flex items-center gap-3">
-             <div className="w-10 h-10 rounded-xl bg-primary/10 flex items-center justify-center text-primary border border-primary/20">
+             <div className="w-10 h-10 bg-primary/10 flex items-center justify-center text-primary border border-primary/20">
                <History size={20} />
              </div>
              <div>
-                <h3 className="text-lg font-normal text-white tracking-tight">Storage Policy</h3>
+                <h3 className="text-lg font-normal text-foreground tracking-tight">Storage Policy</h3>
                 <p className="text-sm text-secondary font-normal tracking-tight">Retention & Maintenance</p>
               </div>
           </div>
 
           <div className="grid sm:grid-cols-3 gap-3">
             <div className="space-y-1">
-              <label className="text-sm font-normal text-muted tracking-tight ml-1 flex items-center gap-2">
+              <label className="text-sm font-normal text-secondary tracking-tight ml-1 flex items-center gap-2">
                 <History size={10} /> Max Backups
               </label>
               <input
                 type="number"
                 value={dbSettings.retention_count}
                 onChange={(e) => onUpdateDbSettings({...dbSettings, retention_count: parseInt(e.target.value)})}
-                className="w-full bg-background/80 border border-slate-800 rounded-xl py-1.5 px-4 text-xs font-normal text-white outline-none focus:border-primary/50 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none transition-all tabular-nums"
+                className="w-full bg-background/80 border border-outline/30 py-1.5 px-4 text-xs font-normal text-foreground outline-none focus:border-primary/50 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none transition-all tabular-nums"
               />
             </div>
             <div className="space-y-1">
-              <label className="text-sm font-normal text-muted tracking-tight ml-1 flex items-center gap-2">
+              <label className="text-sm font-normal text-secondary tracking-tight ml-1 flex items-center gap-2">
                 <Clock size={10} /> Schedule (Hour)
               </label>
               <input
@@ -103,11 +103,11 @@ export default function DatabaseManager({
                 min="0" max="23"
                 value={dbSettings.schedule_hour}
                 onChange={(e) => onUpdateDbSettings({...dbSettings, schedule_hour: parseInt(e.target.value)})}
-                className="w-full bg-background/80 border border-slate-800 rounded-xl py-1.5 px-4 text-xs font-normal text-white outline-none focus:border-primary/50 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none transition-all tabular-nums"
+                className="w-full bg-background/80 border border-outline/30 py-1.5 px-4 text-xs font-normal text-foreground outline-none focus:border-primary/50 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none transition-all tabular-nums"
               />
             </div>
             <div className="space-y-1">
-              <label className="text-sm font-normal text-muted tracking-tight ml-1 flex items-center gap-2">
+              <label className="text-sm font-normal text-secondary tracking-tight ml-1 flex items-center gap-2">
                 <Zap size={10} /> Frequency (Days)
               </label>
               <input
@@ -115,7 +115,7 @@ export default function DatabaseManager({
                 min="1"
                 value={dbSettings.schedule_freq_days}
                 onChange={(e) => onUpdateDbSettings({...dbSettings, schedule_freq_days: parseInt(e.target.value)})}
-                className="w-full bg-background/80 border border-slate-800 rounded-xl py-1.5 px-4 text-xs font-normal text-white outline-none focus:border-primary/50 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none transition-all tabular-nums"
+                className="w-full bg-background/80 border border-outline/30 py-1.5 px-4 text-xs font-normal text-foreground outline-none focus:border-primary/50 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none transition-all tabular-nums"
               />
             </div>
           </div>
@@ -123,17 +123,17 @@ export default function DatabaseManager({
 
         <div className="space-y-2">
           <div className="flex items-center justify-between px-1">
-              <label className="text-sm font-normal text-muted tracking-tight">Recovery Points</label>
-              <div className="text-xs font-normal text-primary tracking-tight bg-primary/5 px-3 py-1 rounded-full border border-primary/10">
+              <label className="text-sm font-normal text-secondary tracking-tight">Recovery Points</label>
+              <div className="text-xs font-normal text-primary tracking-tight bg-primary/5 px-3 py-1 border border-primary/10">
                 {formatSize(dbStats.total_size_bytes)} Used
               </div>
           </div>
           
-          <div className="space-y-1 pr-2 overflow-y-auto max-h-[300px] scrollbar-thin scrollbar-thumb-slate-800 scrollbar-track-transparent">
+          <div className="space-y-1 pr-2 overflow-y-auto max-h-[300px] scrollbar-thin scrollbar-thumb-surface-container scrollbar-track-transparent">
             {backups.map((bak: any) => (
-              <div key={bak.filename} className="flex items-center justify-between p-3 bg-background/40 border border-slate-800/40 rounded-2xl group/item hover:border-primary/30 transition-all">
+              <div key={bak.filename} className="flex items-center justify-between p-3 bg-background/40 border border-outline/30/40 group/item hover:border-primary/30 transition-all">
                 <div className="flex items-center gap-3">
-                  <div className="w-8 h-8 rounded-lg bg-slate-800 flex items-center justify-center text-muted">
+                  <div className="w-8 h-8 bg-surface-container flex items-center justify-center text-secondary">
                     <Database size={14} />
                   </div>
                   <div>
@@ -144,7 +144,7 @@ export default function DatabaseManager({
                 </div>
                 <button
                   onClick={() => onRestore(bak.filename)}
-                  className="p-2 text-secondary hover:text-primary hover:bg-primary/5 rounded-xl transition-all opacity-0 group-hover/item:opacity-100 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
+                  className="p-2 text-secondary hover:text-primary hover:bg-primary/5 transition-all opacity-0 group-hover/item:opacity-100 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
                   aria-label={`Restore backup ${bak.filename}`}
                 >
                   <RotateCcw size={16} />
@@ -157,7 +157,7 @@ export default function DatabaseManager({
         <div className="grid grid-cols-2 gap-3 pt-1">
            <button
              onClick={onExport}
-             className="flex items-center justify-center gap-2 py-2.5 bg-background border border-slate-800 hover:border-primary/50 text-primary rounded-2xl text-sm font-normal transition-all active:scale-95 tracking-tight shadow-xl shadow-black/20 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
+             className="flex items-center justify-center gap-2 py-2.5 bg-background border border-outline/30 hover:border-primary/50 text-primary text-sm font-normal transition-all active:scale-95 tracking-tight shadow-xl shadow-black/20 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
              aria-label="Export database"
            >
              <Download size={14} /> Export Database
@@ -170,7 +170,7 @@ export default function DatabaseManager({
               className="absolute inset-0 opacity-0 cursor-pointer z-10"
             />
              <button
-               className="w-full flex items-center justify-center gap-2 py-2.5 bg-background border border-slate-800 hover:border-rose-500/50 text-rose-500 rounded-2xl text-sm font-normal transition-all tracking-tight shadow-xl shadow-black/20 focus-visible:ring-2 focus-visible:ring-rose-500 focus-visible:outline-none"
+               className="w-full flex items-center justify-center gap-2 py-2.5 bg-background border border-outline/30 hover:border-error/50 text-error text-sm font-normal transition-all tracking-tight shadow-xl shadow-black/20 focus-visible:ring-2 focus-visible:ring-error focus-visible:outline-none"
                aria-label="Import database"
              >
                <Upload size={14} /> Import Database
diff --git a/frontend/components/admin/ExportPanel.tsx b/frontend/components/admin/ExportPanel.tsx
index b4142d3a..7fd28eae 100644
--- a/frontend/components/admin/ExportPanel.tsx
+++ b/frontend/components/admin/ExportPanel.tsx
@@ -29,26 +29,26 @@ export function ExportPanel() {
   };
 
   return (
-    <div data-testid="admin-tab-exports" className="bg-surface/50 border border-slate-800/50 rounded-[2.5rem] p-4 md:p-6 flex flex-col shadow-2xl transition-all h-full">
+    <div data-testid="admin-tab-exports" className="bg-surface/50 border border-outline/30/50 ] p-4 md:p-6 flex flex-col shadow-2xl transition-all h-full">
       <div className="flex items-center gap-3 mb-4 md:mb-6">
-        <div className="w-10 h-10 rounded-xl bg-indigo-500/10 flex items-center justify-center text-indigo-400 border border-indigo-500/20">
+        <div className="w-10 h-10 bg-primary/10 flex items-center justify-center text-primary border border-primary/20">
           <FileDown size={20} />
         </div>
         <div>
-          <h2 className="text-xl font-normal text-white tracking-tight">Export & Reports</h2>
-          <p className="text-[10px] md:text-xs text-muted font-normal tracking-tight">Download system snapshots and action logs</p>
+          <h2 className="text-xl font-normal text-foreground tracking-tight">Export & Reports</h2>
+          <p className="text-[10px] md:text-xs text-secondary font-normal tracking-tight">Download system snapshots and action logs</p>
         </div>
       </div>
 
       <div className="grid md:grid-cols-2 gap-4">
         {/* Inventory Snapshot Section */}
-        <div className="p-4 bg-background/40 border border-slate-800/40 rounded-2xl hover:border-primary/20 transition-all group flex flex-col justify-between">
+        <div className="p-4 bg-background/40 border border-outline/30/40 hover:border-primary/20 transition-all group flex flex-col justify-between">
           <div className="mb-4">
             <h3 className="text-sm font-normal text-secondary flex items-center gap-2">
               <FileSpreadsheet size={14} className="text-primary" />
               Inventory Snapshot
             </h3>
-            <p className="text-xs text-muted mt-1 leading-relaxed">
+            <p className="text-xs text-secondary mt-1 leading-relaxed">
               Export current inventory state with all item details and locations.
             </p>
           </div>
@@ -57,7 +57,7 @@ export function ExportPanel() {
             <button
               onClick={() => handleExportSnapshot("csv")}
               disabled={isLoading}
-              className="px-5 py-1.5 bg-primary hover:bg-primary/90 text-white rounded-xl text-sm font-normal transition-all active:scale-95 shadow-xl shadow-primary/10 tracking-tight border border-primary/30 flex items-center justify-center gap-2 disabled:opacity-50"
+              className="px-5 py-1.5 bg-primary hover:bg-primary/90 text-foreground text-sm font-normal transition-all active:scale-95 shadow-xl shadow-primary/10 tracking-tight border border-primary/30 flex items-center justify-center gap-2 disabled:opacity-50"
               aria-label="Export inventory snapshot as CSV"
             >
               {isLoading ? <Loader2 size={14} className="animate-spin" /> : <FileText size={14} />}
@@ -66,7 +66,7 @@ export function ExportPanel() {
             <button
               onClick={() => handleExportSnapshot("xlsx")}
               disabled={isLoading}
-              className="px-5 py-1.5 bg-primary hover:bg-primary/90 text-white rounded-xl text-sm font-normal transition-all active:scale-95 shadow-xl shadow-primary/10 tracking-tight border border-primary/30 flex items-center justify-center gap-2 disabled:opacity-50"
+              className="px-5 py-1.5 bg-primary hover:bg-primary/90 text-foreground text-sm font-normal transition-all active:scale-95 shadow-xl shadow-primary/10 tracking-tight border border-primary/30 flex items-center justify-center gap-2 disabled:opacity-50"
               aria-label="Export inventory snapshot as Excel"
             >
               {isLoading ? <Loader2 size={14} className="animate-spin" /> : <FileSpreadsheet size={14} />}
@@ -76,13 +76,13 @@ export function ExportPanel() {
         </div>
 
         {/* Audit Trail Section */}
-        <div className="p-4 bg-background/40 border border-slate-800/40 rounded-2xl hover:border-primary/20 transition-all group flex flex-col justify-between">
+        <div className="p-4 bg-background/40 border border-outline/30/40 hover:border-primary/20 transition-all group flex flex-col justify-between">
           <div className="mb-4">
             <h3 className="text-sm font-normal text-secondary flex items-center gap-2">
-              <FileText size={14} className="text-indigo-400" />
+              <FileText size={14} className="text-primary" />
               Audit Trail
             </h3>
-            <p className="text-xs text-muted mt-1 leading-relaxed">
+            <p className="text-xs text-secondary mt-1 leading-relaxed">
               Complete history of system actions, changes, and user operations.
             </p>
           </div>
@@ -90,7 +90,7 @@ export function ExportPanel() {
             <button
               onClick={() => handleExportAuditTrail("csv")}
               disabled={isLoading}
-              className="px-5 py-1.5 bg-primary hover:bg-primary/90 text-white rounded-xl text-sm font-normal transition-all active:scale-95 shadow-xl shadow-primary/10 tracking-tight border border-primary/30 flex items-center justify-center gap-2 disabled:opacity-50"
+              className="px-5 py-1.5 bg-primary hover:bg-primary/90 text-foreground text-sm font-normal transition-all active:scale-95 shadow-xl shadow-primary/10 tracking-tight border border-primary/30 flex items-center justify-center gap-2 disabled:opacity-50"
               aria-label="Export audit trail as CSV"
             >
               {isLoading ? <Loader2 size={14} className="animate-spin" /> : <FileText size={14} />}
@@ -99,7 +99,7 @@ export function ExportPanel() {
             <button
               onClick={() => handleExportAuditTrail("xlsx")}
               disabled={isLoading}
-              className="px-5 py-1.5 bg-primary hover:bg-primary/90 text-white rounded-xl text-sm font-normal transition-all active:scale-95 shadow-xl shadow-primary/10 tracking-tight border border-primary/30 flex items-center justify-center gap-2 disabled:opacity-50"
+              className="px-5 py-1.5 bg-primary hover:bg-primary/90 text-foreground text-sm font-normal transition-all active:scale-95 shadow-xl shadow-primary/10 tracking-tight border border-primary/30 flex items-center justify-center gap-2 disabled:opacity-50"
               aria-label="Export audit trail as Excel"
             >
               {isLoading ? <Loader2 size={14} className="animate-spin" /> : <FileSpreadsheet size={14} />}
@@ -110,8 +110,8 @@ export function ExportPanel() {
       </div>
 
       {error && (
-        <div className="mt-4 p-3 bg-rose-500/10 border border-rose-500/20 rounded-xl text-rose-500 text-[10px] flex items-center gap-2 animate-in slide-in-from-top-2 duration-300">
-          <div className="w-1.5 h-1.5 bg-rose-500 rounded-full animate-pulse" />
+        <div className="mt-4 p-3 bg-error/10 border border-error/20 text-error text-[10px] flex items-center gap-2 animate-in slide-in-from-top-2 duration-300">
+          <div className="w-1.5 h-1.5 bg-error animate-pulse" />
           <span className="font-normal truncate">Error: {error}</span>
         </div>
       )}
diff --git a/frontend/components/admin/IdentityManager.tsx b/frontend/components/admin/IdentityManager.tsx
index 0cc5ef92..f4748e71 100644
--- a/frontend/components/admin/IdentityManager.tsx
+++ b/frontend/components/admin/IdentityManager.tsx
@@ -24,31 +24,31 @@ export default function IdentityManager({
   onUpdateUserSubmit
 }: IdentityManagerProps) {
   return (
-    <div className="bg-surface/50  border border-slate-800/50 rounded-[2.5rem] p-4 md:p-6 flex flex-col shadow-2xl transition-all group/identity h-full">
+    <div className="bg-surface/50 border border-outline/30/50 ] p-4 md:p-6 flex flex-col shadow-2xl transition-all group/identity h-full">
       <div className="flex items-center justify-between mb-3">
         <div className="flex items-center gap-3">
-          <div className="w-10 h-10 rounded-xl bg-primary/10 flex items-center justify-center text-primary border border-primary/20">
+          <div className="w-10 h-10 bg-primary/10 flex items-center justify-center text-primary border border-primary/20">
             <User size={20} />
           </div>
-          <h2 className="text-xl font-normal text-white tracking-tight">Identity Management</h2>
+          <h2 className="text-xl font-normal text-foreground tracking-tight">Identity Management</h2>
         </div>
         <button
           onClick={onAddUser}
           data-testid="add-user-button"
-          className="flex items-center gap-2 px-5 py-2.5 bg-primary hover:bg-blue-600 text-white rounded-xl text-sm font-normal transition-all shadow-xl shadow-primary/10 active:scale-95 border border-primary/30 tracking-tight focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
+          className="flex items-center gap-2 px-5 py-2.5 bg-primary hover:bg-primary text-foreground text-sm font-normal transition-all shadow-xl shadow-primary/10 active:scale-95 border border-primary/30 tracking-tight focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
           aria-label="Add new user"
         >
           <UserPlus size={16} /> Add User
         </button>
       </div>
 
-      <div className="flex-1 space-y-1 pr-2 -mr-2 overflow-y-auto max-h-[400px] scrollbar-thin scrollbar-thumb-slate-800 scrollbar-track-transparent">
+      <div className="flex-1 space-y-1 pr-2 -mr-2 overflow-y-auto max-h-[400px] scrollbar-thin scrollbar-thumb-surface-container scrollbar-track-transparent">
         {users.map((user) => (
-          <div key={user.id} className="flex items-center justify-between p-3 bg-background/40 border border-slate-800/40 rounded-2xl hover:border-primary/30 transition-all group">
+          <div key={user.id} className="flex items-center justify-between p-3 bg-background/40 border border-outline/30/40 hover:border-primary/30 transition-all group">
             <div className="flex items-center gap-3 min-w-0">
               <div className={cn(
-                "w-9 h-9 rounded-xl flex items-center justify-center transition-colors shadow-inner shrink-0",
-                user.role === 'admin' ? "bg-primary/10 text-primary border border-primary/20" : "bg-slate-800 text-muted border border-slate-700"
+                "w-9 h-9  flex items-center justify-center transition-colors shadow-inner shrink-0",
+                user.role === 'admin' ? "bg-primary/10 text-primary border border-primary/20" : "bg-surface-container text-secondary border border-outline-variant"
               )}>
                 {user.role === 'admin' ? <Shield size={16} /> : <User size={16} />}
               </div>
@@ -63,7 +63,7 @@ export default function IdentityManager({
                   setEditingUser(user);
                   setEditUserForm({ username: user.username, password: '', role: user.role });
                 }}
-                className="p-2 text-secondary hover:text-primary hover:bg-primary/5 rounded-xl transition-all focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
+                className="p-2 text-secondary hover:text-primary hover:bg-primary/5 transition-all focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
                 aria-label={`Edit user ${user.username}`}
               >
                 <Edit2 size={16} />
@@ -72,7 +72,7 @@ export default function IdentityManager({
                 <button
                   onClick={() => onDeleteUser(user.id, user.username)}
                   data-testid="delete-user-button"
-                  className="p-2 text-secondary hover:text-rose-500 hover:bg-rose-500/5 rounded-xl transition-all focus-visible:ring-2 focus-visible:ring-rose-500 focus-visible:outline-none"
+                  className="p-2 text-secondary hover:text-error hover:bg-error/5 transition-all focus-visible:ring-2 focus-visible:ring-error focus-visible:outline-none"
                   aria-label={`Delete user ${user.username}`}
                 >
                   <Trash2 size={16} />
@@ -85,13 +85,13 @@ export default function IdentityManager({
 
       {/* Edit User Modal */}
       {editingUser && (
-        <div className="fixed inset-0 z-[100] flex items-center justify-center p-4 bg-background/80  animate-in fade-in duration-200">
-          <div className="bg-surface border border-slate-800 rounded-[2.5rem] p-6 w-full max-w-md shadow-2xl">
+        <div className="fixed inset-0 z-[100] flex items-center justify-center p-4 bg-background/80 animate-in fade-in duration-200">
+          <div className="bg-surface border border-outline/30 ] p-6 w-full max-w-md shadow-2xl">
             <div className="flex justify-between items-center mb-3">
-              <h3 className="text-xl font-normal text-white tracking-tight">Edit Identity</h3>
+              <h3 className="text-xl font-normal text-foreground tracking-tight">Edit Identity</h3>
               <button
                 onClick={() => setEditingUser(null)}
-                className="p-2 text-muted hover:text-white transition-colors focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none rounded"
+                className="p-2 text-secondary hover:text-foreground transition-colors focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
                 aria-label="Close edit dialog"
               >
                 <X size={20} />
@@ -105,7 +105,7 @@ export default function IdentityManager({
                   type="text"
                   value={editUserForm.username}
                   onChange={(e) => setEditUserForm({ ...editUserForm, username: e.target.value })}
-                  className="w-full bg-background/80 border border-slate-800 rounded-2xl py-1.5 px-4 text-sm font-normal text-white outline-none focus:border-primary/50 focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-0 transition-all font-mono"
+                  className="w-full bg-background/80 border border-outline/30 py-1.5 px-4 text-sm font-normal text-foreground outline-none focus:border-primary/50 focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-0 transition-all font-mono"
                 />
               </div>
               <div className="space-y-1">
@@ -115,7 +115,7 @@ export default function IdentityManager({
                   value={editUserForm.password}
                   onChange={(e) => setEditUserForm({ ...editUserForm, password: e.target.value })}
                   placeholder="********"
-                  className="w-full bg-background/80 border border-slate-800 rounded-2xl py-1.5 px-4 text-sm font-normal text-white outline-none focus:border-primary/50 focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-0 transition-all font-mono"
+                  className="w-full bg-background/80 border border-outline/30 py-1.5 px-4 text-sm font-normal text-foreground outline-none focus:border-primary/50 focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-0 transition-all font-mono"
                 />
               </div>
               <div className="space-y-1">
@@ -123,7 +123,7 @@ export default function IdentityManager({
                 <select
                   value={editUserForm.role}
                   onChange={(e) => setEditUserForm({ ...editUserForm, role: e.target.value })}
-                  className="w-full bg-background/80 border border-slate-800 rounded-2xl py-1.5 px-4 text-sm font-normal text-white outline-none focus:border-primary/50 transition-all appearance-none"
+                  className="w-full bg-background/80 border border-outline/30 py-1.5 px-4 text-sm font-normal text-foreground outline-none focus:border-primary/50 transition-all appearance-none"
                 >
                   <option value="user">Standard User</option>
                   <option value="admin">Administrator</option>
@@ -132,7 +132,7 @@ export default function IdentityManager({
 
               <button
                 onClick={onUpdateUserSubmit}
-                className="w-full bg-primary hover:bg-primary/80 text-white rounded-2xl py-2.5 text-sm font-normal transition-all active:scale-95 shadow-xl shadow-primary/20 tracking-tight mt-2 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-offset-slate-900 focus-visible:ring-primary focus-visible:outline-none"
+                className="w-full bg-primary hover:bg-primary/80 text-foreground py-2.5 text-sm font-normal transition-all active:scale-95 shadow-xl shadow-primary/20 tracking-tight mt-2 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-offset-surface-container focus-visible:ring-primary focus-visible:outline-none"
               >
                 Apply Changes
               </button>
diff --git a/frontend/components/admin/LdapManager.tsx b/frontend/components/admin/LdapManager.tsx
index 84afa236..3e294cdf 100644
--- a/frontend/components/admin/LdapManager.tsx
+++ b/frontend/components/admin/LdapManager.tsx
@@ -18,27 +18,27 @@ export default function LdapManager({
   onUpdateLdap
 }: LdapManagerProps) {
   return (
-    <div className="bg-surface/50 border border-slate-800/50 rounded-[2.5rem] p-4 md:p-6 shadow-2xl space-y-3 transition-all group/ldap">
+    <div className="bg-surface/50 border border-outline/30/50 ] p-4 md:p-6 shadow-2xl space-y-3 transition-all group/ldap">
       <div className="flex items-center justify-between">
         <div className="flex items-center gap-3">
-          <div className="w-10 h-10 rounded-xl bg-primary/10 flex items-center justify-center text-primary border border-primary/20">
+          <div className="w-10 h-10 bg-primary/10 flex items-center justify-center text-primary border border-primary/20">
             <Globe size={20} />
           </div>
-          <h2 className="text-xl font-normal text-white tracking-tight">Enterprise LDAP</h2>
+          <h2 className="text-xl font-normal text-foreground tracking-tight">Enterprise LDAP</h2>
         </div>
       </div>
 
-      <div className="flex items-center justify-between p-4 bg-background/40 border border-slate-800/60 rounded-2xl group transition-all hover:border-primary/30">
+      <div className="flex items-center justify-between p-4 bg-background/40 border border-outline/30/60 group transition-all hover:border-primary/30">
         <div className="flex items-center gap-3">
           <div className={cn(
-            "w-8 h-8 rounded-xl flex items-center justify-center transition-all shadow-inner",
-            ldapConfig.ldap_enabled ? "bg-green-500/10 text-green-500" : "bg-slate-800 text-muted"
+            "w-8 h-8  flex items-center justify-center transition-all shadow-inner",
+            ldapConfig.ldap_enabled ? "bg-success/10 text-success" : "bg-surface-container text-secondary"
           )}>
             <Power size={14} />
           </div>
           <div>
             <p className="card-title leading-none">LDAP Authorization</p>
-            <p className={cn("card-subtitle mt-1", ldapConfig.ldap_enabled ? "text-green-500/80" : "text-muted")}>
+            <p className={cn("card-subtitle mt-1", ldapConfig.ldap_enabled ? "text-success/80" : "text-secondary")}>
               {ldapConfig.ldap_enabled ? "External Directory Active" : "Internal Authentication Only"}
             </p>
           </div>
@@ -46,12 +46,12 @@ export default function LdapManager({
         <button 
           onClick={() => setLdapConfig({...ldapConfig, ldap_enabled: !ldapConfig.ldap_enabled})}
           className={cn(
-            "w-10 h-5 rounded-full relative transition-all duration-300 shadow-inner border",
-            ldapConfig.ldap_enabled ? "bg-primary border-primary" : "bg-slate-800 border-slate-700"
+            "w-10 h-5  relative transition-all duration-300 shadow-inner border",
+            ldapConfig.ldap_enabled ? "bg-primary border-primary" : "bg-surface-container border-outline-variant"
           )}
         >
           <div className={cn(
-            "absolute top-0.5 w-3.5 h-3.5 bg-white rounded-full transition-all shadow-sm",
+            "absolute top-0.5 w-3.5 h-3.5 bg-white  transition-all shadow-sm",
             ldapConfig.ldap_enabled ? "right-0.5" : "left-0.5"
           )} />
         </button>
@@ -61,26 +61,26 @@ export default function LdapManager({
         <div className="space-y-1">
           <label className="text-sm font-normal text-secondary tracking-tight ml-1">LDAP URI</label>
           <div className="relative">
-            <Server className="absolute left-3 top-1/2 -translate-y-1/2 text-muted" size={14} />
+            <Server className="absolute left-3 top-1/2 -translate-y-1/2 text-secondary" size={14} />
             <input
               type="text"
               placeholder="ldap://host:389"
               value={ldapConfig.server_uri}
               onChange={(e) => setLdapConfig({...ldapConfig, server_uri: e.target.value})}
-              className="w-full bg-background/80 border border-slate-800 rounded-2xl py-1.5 pl-9 pr-4 text-xs font-normal text-white outline-none focus:border-primary/50 transition-all font-mono"
+              className="w-full bg-background/80 border border-outline/30 py-1.5 pl-9 pr-4 text-xs font-normal text-foreground outline-none focus:border-primary/50 transition-all font-mono"
             />
           </div>
         </div>
         <div className="space-y-1">
           <label className="text-sm font-normal text-secondary tracking-tight ml-1">Context DN</label>
           <div className="relative">
-            <Shield className="absolute left-3 top-1/2 -translate-y-1/2 text-muted" size={14} />
+            <Shield className="absolute left-3 top-1/2 -translate-y-1/2 text-secondary" size={14} />
             <input
               type="text"
               placeholder="dc=example,dc=com"
               value={ldapConfig.base_dn}
               onChange={(e) => setLdapConfig({...ldapConfig, base_dn: e.target.value})}
-              className="w-full bg-background/80 border border-slate-800 rounded-2xl py-1.5 pl-9 pr-4 text-xs font-normal text-white outline-none focus:border-primary/50 transition-all font-mono"
+              className="w-full bg-background/80 border border-outline/30 py-1.5 pl-9 pr-4 text-xs font-normal text-foreground outline-none focus:border-primary/50 transition-all font-mono"
             />
           </div>
         </div>
@@ -90,42 +90,42 @@ export default function LdapManager({
         <div className="space-y-1">
           <label className="text-sm font-normal text-secondary tracking-tight ml-1">User DN Template</label>
           <div className="relative">
-            <User className="absolute left-3 top-1/2 -translate-y-1/2 text-muted" size={14} />
+            <User className="absolute left-3 top-1/2 -translate-y-1/2 text-secondary" size={14} />
             <input
               type="text"
               placeholder="uid={username},ou=people..."
               value={ldapConfig.user_template}
               onChange={(e) => setLdapConfig({...ldapConfig, user_template: e.target.value})}
-              className="w-full bg-background/80 border border-slate-800 rounded-2xl py-1.5 pl-9 pr-4 text-xs font-normal text-white outline-none focus:border-primary/50 transition-all font-mono"
+              className="w-full bg-background/80 border border-outline/30 py-1.5 pl-9 pr-4 text-xs font-normal text-foreground outline-none focus:border-primary/50 transition-all font-mono"
             />
           </div>
         </div>
         <div className="space-y-1">
           <label className="text-sm font-normal text-secondary tracking-tight ml-1">Groups Base DN</label>
           <div className="relative">
-            <Layers className="absolute left-3 top-1/2 -translate-y-1/2 text-muted" size={14} />
+            <Layers className="absolute left-3 top-1/2 -translate-y-1/2 text-secondary" size={14} />
             <input
               type="text"
               placeholder="ou=groups"
               value={ldapConfig.groups_dn}
               onChange={(e) => setLdapConfig({...ldapConfig, groups_dn: e.target.value})}
-              className="w-full bg-background/80 border border-slate-800 rounded-2xl py-1.5 pl-9 pr-4 text-xs font-normal text-white outline-none focus:border-primary/50 transition-all font-mono"
+              className="w-full bg-background/80 border border-outline/30 py-1.5 pl-9 pr-4 text-xs font-normal text-foreground outline-none focus:border-primary/50 transition-all font-mono"
             />
           </div>
         </div>
       </div>
 
-      <div className="flex items-center justify-between p-4 bg-background/40 border border-slate-800/60 rounded-2xl group transition-all hover:border-primary/30">
+      <div className="flex items-center justify-between p-4 bg-background/40 border border-outline/30/60 group transition-all hover:border-primary/30">
         <div className="flex items-center gap-3">
           <div className={cn(
-            "w-8 h-8 rounded-xl flex items-center justify-center transition-all shadow-inner",
-            ldapConfig.use_tls ? "bg-primary/10 text-primary" : "bg-slate-800 text-muted"
+            "w-8 h-8  flex items-center justify-center transition-all shadow-inner",
+            ldapConfig.use_tls ? "bg-primary/10 text-primary" : "bg-surface-container text-secondary"
           )}>
             <Lock size={14} />
           </div>
           <div>
             <p className="card-title leading-none">Use TLS</p>
-            <p className={cn("card-subtitle mt-1", ldapConfig.use_tls ? "text-primary/80" : "text-muted")}>
+            <p className={cn("card-subtitle mt-1", ldapConfig.use_tls ? "text-primary/80" : "text-secondary")}>
               {ldapConfig.use_tls ? "Encrypted Channel" : "Standard Link"}
             </p>
           </div>
@@ -133,12 +133,12 @@ export default function LdapManager({
         <button 
           onClick={() => setLdapConfig({...ldapConfig, use_tls: !ldapConfig.use_tls})}
           className={cn(
-            "w-10 h-5 rounded-full relative transition-all duration-300 shadow-inner border",
-            ldapConfig.use_tls ? "bg-primary border-primary" : "bg-slate-800 border-slate-700"
+            "w-10 h-5  relative transition-all duration-300 shadow-inner border",
+            ldapConfig.use_tls ? "bg-primary border-primary" : "bg-surface-container border-outline-variant"
           )}
         >
           <div className={cn(
-            "absolute top-0.5 w-3.5 h-3.5 bg-white rounded-full transition-all shadow-sm",
+            "absolute top-0.5 w-3.5 h-3.5 bg-white  transition-all shadow-sm",
             ldapConfig.use_tls ? "right-0.5" : "left-0.5"
           )} />
         </button>
@@ -148,14 +148,14 @@ export default function LdapManager({
         <button
           onClick={onTestLdap}
           disabled={testingLdap}
-          className="flex-1 bg-primary hover:bg-primary text-white rounded-xl py-1.5 text-sm font-normal shadow-xl shadow-primary/10 transition-all active:scale-95 disabled:opacity-50 flex items-center justify-center gap-2 border border-primary/30"
+          className="flex-1 bg-primary hover:bg-primary text-foreground py-1.5 text-sm font-normal shadow-xl shadow-primary/10 transition-all active:scale-95 disabled:opacity-50 flex items-center justify-center gap-2 border border-primary/30"
         >
           {testingLdap ? <RotateCcw size={14} className="animate-spin" /> : <Wifi size={14} />}
           Test Connection
         </button>
         <button
            onClick={onUpdateLdap}
-           className="flex-[2] bg-primary hover:bg-primary text-white rounded-xl py-2 text-sm font-normal shadow-xl shadow-primary/10 transition-all active:scale-95 flex items-center justify-center gap-2 border border-primary/30 tracking-tight"
+           className="flex-[2] bg-primary hover:bg-primary text-foreground py-2 text-sm font-normal shadow-xl shadow-primary/10 transition-all active:scale-95 flex items-center justify-center gap-2 border border-primary/30 tracking-tight"
         >
           <Shield size={14} /> Save LDAP Policy
         </button>
diff --git a/frontend/components/inventory/QuantityAdjustmentModal.tsx b/frontend/components/inventory/QuantityAdjustmentModal.tsx
index a924429b..69874513 100644
--- a/frontend/components/inventory/QuantityAdjustmentModal.tsx
+++ b/frontend/components/inventory/QuantityAdjustmentModal.tsx
@@ -56,16 +56,16 @@ export default function QuantityAdjustmentModal({
 
   return (
     <div className={`fixed inset-0 z-50 bg-black/50 flex items-center justify-center transition-opacity ${isClosing ? 'opacity-0' : 'opacity-100'}`}>
-      <div className={`bg-slate-950 rounded-lg shadow-lg w-full max-w-md mx-4 transition-transform ${isClosing ? 'scale-95' : 'scale-100'}`}>
+      <div className={`bg-background shadow-lg w-full max-w-md mx-4 transition-transform ${isClosing ? 'scale-95' : 'scale-100'}`}>
         {/* Header */}
-        <div className="flex items-center justify-between p-4 border-b border-slate-800">
+        <div className="flex items-center justify-between p-4 border-b border-outline/30">
           <h2 className="text-lg font-normal">Adjust quantity</h2>
           <button
             onClick={handleClose}
             aria-label="Close quantity adjustment modal"
-            className="p-2 hover:bg-slate-800 rounded-lg transition-colors"
+            className="p-2 hover:bg-surface-container transition-colors"
           >
-            <X size={20} className="text-slate-400" />
+            <X size={20} className="text-secondary" />
           </button>
         </div>
 
@@ -73,10 +73,10 @@ export default function QuantityAdjustmentModal({
         <div className="p-6 space-y-6">
           {/* Item Details */}
           <div>
-            <h3 className="text-2xl font-normal text-slate-100 mb-2">
+            <h3 className="text-2xl font-normal text-foreground mb-2">
               {item.name}
             </h3>
-            <div className="text-sm text-slate-500 space-y-1">
+            <div className="text-sm text-secondary space-y-1">
               {item.part_number && (
                 <div>Part Number: {item.part_number}</div>
               )}
@@ -91,14 +91,14 @@ export default function QuantityAdjustmentModal({
 
           {/* Success Message */}
           {successMessage && (
-            <div className="p-3 bg-green-500/10 border border-green-500/20 rounded-lg text-green-500 text-sm">
+            <div className="p-3 bg-success/10 border border-success/20 text-success text-sm">
               {successMessage}
             </div>
           )}
 
           {/* Quantity Adjustment */}
           <div>
-            <label className="text-sm font-normal text-slate-400 mb-3 block">
+            <label className="text-sm font-normal text-secondary mb-3 block">
               Current quantity
             </label>
             <QuantityDisplay
@@ -112,7 +112,7 @@ export default function QuantityAdjustmentModal({
           <div className="flex gap-2 pt-2">
             <button
               onClick={handleClose}
-              className="flex-1 px-4 py-2 bg-slate-800 hover:bg-slate-700 text-slate-100 rounded-lg font-normal transition-colors"
+              className="flex-1 px-4 py-2 bg-surface-container hover:bg-surface-bright text-foreground font-normal transition-colors"
             >
               Keep Current Quantity
             </button>
diff --git a/frontend/components/inventory/QuantityDisplay.tsx b/frontend/components/inventory/QuantityDisplay.tsx
index 2c622589..d7371d6e 100644
--- a/frontend/components/inventory/QuantityDisplay.tsx
+++ b/frontend/components/inventory/QuantityDisplay.tsx
@@ -83,12 +83,12 @@ export default function QuantityDisplay({
 
   if (isEditing) {
     return (
-      <div className="flex items-center gap-2 bg-slate-900/50 rounded-lg px-3 py-2">
+      <div className="flex items-center gap-2 bg-background/50 px-3 py-2">
         <button
           onClick={handleDecrement}
           disabled={isLoading}
           aria-label="Decrease quantity"
-          className="p-1 hover:bg-slate-800 rounded text-secondary hover:text-primary transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+          className="p-1 hover:bg-surface-container text-secondary hover:text-primary transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
         >
           <Minus size={16} />
         </button>
@@ -110,7 +110,7 @@ export default function QuantityDisplay({
           onClick={handleIncrement}
           disabled={isLoading}
           aria-label="Increase quantity"
-          className="p-1 hover:bg-slate-800 rounded text-secondary hover:text-primary transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+          className="p-1 hover:bg-surface-container text-secondary hover:text-primary transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
         >
           <Plus size={16} />
         </button>
@@ -123,7 +123,7 @@ export default function QuantityDisplay({
       onClick={handleTapToEdit}
       disabled={isLoading}
       aria-label={`Quantity: ${currentQuantity}. Tap to edit`}
-      className="text-lg font-normal text-primary hover:bg-slate-900/30 px-3 py-2 rounded-lg transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+      className="text-lg font-normal text-primary hover:bg-background/30 px-3 py-2 transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
     >
       {currentQuantity}
     </button>
diff --git a/frontend/components/inventory/SearchModal.tsx b/frontend/components/inventory/SearchModal.tsx
index 7f107d53..fde46a30 100644
--- a/frontend/components/inventory/SearchModal.tsx
+++ b/frontend/components/inventory/SearchModal.tsx
@@ -109,23 +109,23 @@ export default function SearchModal({
 
   return (
     <div className="fixed inset-0 z-50 bg-black/50 flex items-start justify-center pt-20">
-      <div className="bg-slate-950 rounded-lg shadow-lg w-full max-w-2xl mx-4 max-h-[80vh] flex flex-col">
+      <div className="bg-background shadow-lg w-full max-w-2xl mx-4 max-h-[80vh] flex flex-col border border-outline/30">
         {/* Header */}
-        <div className="flex items-center justify-between p-4 border-b border-slate-800">
+        <div className="flex items-center justify-between p-4 border-b border-outline/30">
           <h2 className="text-xl font-normal">Search inventory</h2>
           <button
             onClick={onClose}
             aria-label="Close search modal"
-            className="p-2 hover:bg-slate-800 rounded-lg transition-colors"
+            className="p-2 hover:bg-surface-container transition-colors"
           >
-            <X size={20} className="text-slate-400" />
+            <X size={20} className="text-secondary" />
           </button>
         </div>
 
         {/* Search Input */}
-        <div className="p-4 border-b border-slate-800">
+        <div className="p-4 border-b border-outline/30">
           <div className="relative">
-            <Search size={18} className="absolute left-3 top-3 text-slate-500 pointer-events-none" />
+            <Search size={18} className="absolute left-3 top-3 text-secondary pointer-events-none" />
             <input
               ref={inputRef}
               type="text"
@@ -133,7 +133,7 @@ export default function SearchModal({
               value={query}
               onChange={handleInputChange}
               aria-label="Search items"
-              className="w-full bg-slate-900 border border-slate-800 rounded-lg pl-10 pr-4 py-2 text-slate-100 placeholder-slate-600 focus:outline-none focus:border-primary focus:ring-1 focus:ring-primary/50"
+              className="w-full bg-surface-container border border-outline/30 pl-10 pr-4 py-2 text-foreground placeholder-secondary/50 focus:outline-none focus:border-primary focus:ring-1 focus:ring-primary/50"
             />
           </div>
         </div>
@@ -141,48 +141,48 @@ export default function SearchModal({
         {/* Results */}
         <div className="flex-1 overflow-y-auto">
           {error && (
-            <div className="p-4 text-rose-500 bg-rose-500/10 border border-rose-500/20 m-4 rounded-lg">
+            <div className="p-4 text-error bg-error/10 border border-error/20 m-4">
               {error}
             </div>
           )}
 
           {isLoading && (
             <div className="flex items-center justify-center py-8">
-              <div className="text-slate-400">
-                <div className="inline-block animate-spin rounded-full h-6 w-6 border border-slate-600 border-t-primary"></div>
+              <div className="text-secondary">
+                <div className="inline-block animate-spin h-6 w-6 border border-outline/30 border-t-primary"></div>
               </div>
             </div>
           )}
 
           {!isLoading && !error && results.length === 0 && query.length > 0 && (
-            <div className="p-4 text-slate-500 text-center">
+            <div className="p-4 text-secondary text-center">
               No items found matching "{query}"
             </div>
           )}
 
           {!isLoading && !error && results.length === 0 && query.length === 0 && (
-            <div className="p-4 text-slate-500 text-center">
+            <div className="p-4 text-secondary text-center">
               Start typing to search
             </div>
           )}
 
           {!isLoading && results.length > 0 && (
-            <div className="divide-y divide-slate-800">
+            <div className="divide-y divide-outline/30">
               {results.map((item) => (
                 <button
                   key={item.id}
                   onClick={() => handleSelectItem(item)}
-                  className="w-full p-4 text-left hover:bg-slate-900 transition-colors focus:outline-none focus:bg-slate-900 focus:ring-2 focus:ring-primary/50"
+                  className="w-full p-4 text-left hover:bg-surface-container transition-colors focus:outline-none focus:bg-surface-container focus:ring-2 focus:ring-primary/50"
                 >
                   <div className="flex justify-between items-start gap-2 mb-1">
-                    <h3 className="font-normal text-slate-100 flex-1">
+                    <h3 className="font-normal text-foreground flex-1">
                       {item.name}
                     </h3>
                     <span className="text-primary font-normal text-sm whitespace-nowrap">
                       Qty: {item.quantity}
                     </span>
                   </div>
-                  <div className="text-xs text-slate-500 space-y-1">
+                  <div className="text-xs text-secondary space-y-1">
                     {item.part_number && (
                       <div>PN: {item.part_number}</div>
                     )}
diff --git a/frontend/tailwind.config.ts b/frontend/tailwind.config.ts
index 86f11fd4..7e665873 100644
--- a/frontend/tailwind.config.ts
+++ b/frontend/tailwind.config.ts
@@ -7,37 +7,49 @@ const config: Config = {
   ],
   theme: {
     fontSize: {
-      'xs': '13px',    // increased from 12px
-      'sm': '15px',    // increased from 14px
-      'base': '18px',  // increased from 16px
-      'lg': '20px',    // increased from 18px
-      'xl': '22px',    // increased from 20px
-      '2xl': '26px',   // increased from 24px
-      '3xl': '32px',   // increased from 30px
+      'xs': '13px',
+      'sm': '15px',
+      'base': '18px',
+      'lg': '20px',
+      'xl': '22px',
+      '2xl': '26px',
+      '3xl': '32px',
       '4xl': '36px',
       '5xl': '48px',
     },
     extend: {
+      fontFamily: {
+        sans: ["var(--font-body)", "Inter", "sans-serif"],
+        data: ["var(--font-data)", "Space Grotesk", "sans-serif"],
+      },
       colors: {
-        background: "#0A0E27",
-        foreground: "#F0F4F8",
-        surface: "#1A1F3A",
+        background: "#0c1322",
+        foreground: "#dce2f7",
+        surface: {
+          DEFAULT: "#0c1322",
+          container: "#191f2f",
+          bright: "#323949",
+        },
         primary: {
-          DEFAULT: "#3B82F6",
-          foreground: "#FFFFFF",
+          DEFAULT: "#ffc174",
+          foreground: "#472a00",
         },
         secondary: {
-          DEFAULT: "#C7D2E0",
-          foreground: "#0A0E27",
+          DEFAULT: "#ffb599",
+          foreground: "#5a1c00",
         },
         muted: {
           DEFAULT: "#8B95AD",
-          foreground: "#F0F4F8",
+          foreground: "#dce2f7",
         },
-        border: "#2D3561",
+        outline: {
+          DEFAULT: "#a08e7a",
+          variant: "#534434",
+        },
+        border: "#a08e7a",
         success: "#10B981",
-        error: "#EF4444",
-        warning: "#F59E0B",
+        error: "#ffb4ab",
+        warning: "#f59e0b",
       },
       keyframes: {
         scan: {
diff --git a/frontend/tests/components/InventoryTable.photo.test.tsx b/frontend/tests/components/InventoryTable.photo.test.tsx
index 53473245..19b42782 100644
--- a/frontend/tests/components/InventoryTable.photo.test.tsx
+++ b/frontend/tests/components/InventoryTable.photo.test.tsx
@@ -110,7 +110,7 @@ describe('InventoryTable - Photo Display', () => {
       const thumbnail = screen.getByAltText('Test Item');
       expect(thumbnail.parentElement).toHaveClass(
         'border-2',
-        'border-slate-300'
+        'border-foreground'
       );
     });
 
diff --git a/frontend/tests/components/ItemDetailModal.test.tsx b/frontend/tests/components/ItemDetailModal.test.tsx
index acea81a5..d9a7c60b 100644
--- a/frontend/tests/components/ItemDetailModal.test.tsx
+++ b/frontend/tests/components/ItemDetailModal.test.tsx
@@ -230,7 +230,7 @@ describe('ItemDetailModal', () => {
         />
       );
       const buttons = screen.getAllByRole('button');
-      const hasDeleteButton = buttons.some(b => b.className?.includes('rose-500'));
+      const hasDeleteButton = buttons.some(b => b.className?.includes('error'));
       expect(hasDeleteButton).toBe(true);
     });
 
@@ -246,7 +246,7 @@ describe('ItemDetailModal', () => {
       );
 
       const buttons = screen.getAllByRole('button');
-      const deleteButton = buttons.find(b => b.className?.includes('rose-500'));
+      const deleteButton = buttons.find(b => b.className?.includes('error'));
 
       if (deleteButton) {
         fireEvent.click(deleteButton);
@@ -269,7 +269,7 @@ describe('ItemDetailModal', () => {
       );
 
       const buttons = screen.getAllByRole('button');
-      const deleteButton = buttons.find(b => b.className?.includes('rose-500'));
+      const deleteButton = buttons.find(b => b.className?.includes('error'));
 
       if (deleteButton) {
         fireEvent.click(deleteButton);
@@ -291,7 +291,7 @@ describe('ItemDetailModal', () => {
       );
 
       const buttons = screen.getAllByRole('button');
-      const deleteButton = buttons.find(b => b.className?.includes('rose-500'));
+      const deleteButton = buttons.find(b => b.className?.includes('error'));
 
       if (deleteButton) {
         fireEvent.click(deleteButton);
@@ -313,7 +313,7 @@ describe('ItemDetailModal', () => {
       );
 
       const buttons = screen.getAllByRole('button');
-      const deleteButton = buttons.find(b => b.className?.includes('rose-500'));
+      const deleteButton = buttons.find(b => b.className?.includes('error'));
 
       if (deleteButton) {
         fireEvent.click(deleteButton);
@@ -338,7 +338,7 @@ describe('ItemDetailModal', () => {
       );
 
       const buttons = screen.getAllByRole('button');
-      const deleteButton = buttons.find(b => b.className?.includes('rose-500'));
+      const deleteButton = buttons.find(b => b.className?.includes('error'));
 
       if (deleteButton) {
         fireEvent.click(deleteButton);
diff --git a/frontend/tests/components/ItemPhotoUpload.test.tsx b/frontend/tests/components/ItemPhotoUpload.test.tsx
index 59314ffa..cdcc030d 100644
--- a/frontend/tests/components/ItemPhotoUpload.test.tsx
+++ b/frontend/tests/components/ItemPhotoUpload.test.tsx
@@ -116,8 +116,8 @@ describe('ItemPhotoUpload Component', () => {
     const cameraButton = screen.getByRole('button', { name: /camera/i })
 
     // Check for Tailwind classes (basic check)
-    expect(uploadButton.className).toContain('rounded')
-    expect(cameraButton.className).toContain('rounded')
+    expect(uploadButton.className).toContain('')
+    expect(cameraButton.className).toContain('')
   })
 
   it('should render responsive layout with gap', () => {
diff --git a/frontend/tests/components/PhotoModal.test.tsx b/frontend/tests/components/PhotoModal.test.tsx
index c6a6161c..41c1ba7a 100644
--- a/frontend/tests/components/PhotoModal.test.tsx
+++ b/frontend/tests/components/PhotoModal.test.tsx
@@ -63,7 +63,7 @@ describe('PhotoModal', () => {
 
       // Check for rose-colored X icon
       const xIcon = closeButton.querySelector('svg');
-      expect(xIcon).toHaveClass('text-rose-500');
+      expect(xIcon).toHaveClass('text-error');
     });
   });
 
@@ -229,7 +229,7 @@ describe('PhotoModal', () => {
 
       const backdrop = screen.getByRole('dialog');
       // The modal content div is the second child of backdrop
-      const modalContent = backdrop.querySelector('div[class*="rounded-3xl"]');
+      const modalContent = backdrop.querySelector('div[class*=""]');
       expect(modalContent).toHaveClass('max-w-2xl', 'w-full', 'max-h-[90vh]');
     });