diff --git a/.standalone.pid b/.standalone.pid
index 4d8b4b4d..86d8b588 100644
--- a/.standalone.pid
+++ b/.standalone.pid
@@ -1,2 +1,2 @@
-21336
-21347
+26221
+26233
diff --git a/AI_RULES.md b/AI_RULES.md
index 90a63f69..89b97b28 100644
--- a/AI_RULES.md
+++ b/AI_RULES.md
@@ -31,6 +31,9 @@ This is the **Single Source of Truth** for ALL AI agents. Refer to [PROJECT_ARCH
 - **Layout**: Main pages MUST use `max-w-7xl`.
 - **Unified Headers**: Icon box (`p-4 bg-primary/10 border-primary/20`) + Title (`text-3xl font-normal`).
 - **Iconography**: Use **Lucide Icons** exclusively.
+- **Design**: Convert design from `DESIGN.md` file system into a tailwind.config.js file. Create global CSS variables from rules from `DESIGN.md` file.
+
+
 
 ## 4. REFACTORING & TESTING STRATEGY (MANDATORY)
 - **TEST-FIRST**: All tests must be written and passing BEFORE refactoring any code.
diff --git a/PLAN.md b/PLAN.md
new file mode 100644
index 00000000..16c92daa
--- /dev/null
+++ b/PLAN.md
@@ -0,0 +1,322 @@
+# DESIGN.md Compliance Audit & Fix Plan
+
+**Status**: PLAN READY FOR REVIEW (No code changes made yet)
+**Date**: 2026-04-25
+**Objective**: Audit why DESIGN.md is not fully respected in UI/UX and plan comprehensive fixes
+
+---
+
+## EXECUTIVE SUMMARY
+
+The design system has **partial implementation**. While basic structure exists (sharp corners, no shadows, dark theme), critical issues prevent full DESIGN.md compliance:
+
+1. **Color system is incomplete** — tailwind.config.ts missing 50%+ of DESIGN.md colors
+2. **Hardcoded tailwind classes** bypass the design system (bg-slate-*, focus:ring-blue-*)
+3. **Global CSS variables** only cover 5 colors instead of full palette
+4. **Spacing tokens missing** (stack-sm, stack-md, container-gap)
+5. **Typography spacing** incomplete (letter-spacing, line-height rules)
+
+---
+
+## ROOT CAUSE ANALYSIS
+
+### Why DESIGN.md Is Not Being Respected
+
+#### 1. **Incomplete Color Mapping** (PRIMARY ISSUE)
+
+**DESIGN.md Specifies:**
+- Primary: `#ffb781` (warm orange)
+- Secondary: `#c8c6c5` (light gray for contrast)
+- Tertiary: `#00e639` (terminal green for "healthy" status)
+- Error: `#ffb4ab` + container `#93000a`
+- On-surface: `#e5e2e1` (text on dark surfaces)
+- On-primary: `#4e2600`
+- On-secondary: `#303030`
+- Outline: `#a48c7c`, Outline-variant: `#564335`
+- Surface variants: 5 tiers (#0e0e0e to #353534)
+
+**Current tailwind.config.ts Has:**
+```
+primary: #F58618 ❌ WRONG (should be #ffb781)
+secondary: #888888 ❌ WRONG (should be #c8c6c5)
+success: #00FF41 ❌ WRONG (should be #00e639)
+tertiary: MISSING ENTIRELY ❌
+error: #FF3131 ❌ WRONG (should be #ffb4ab)
+on-surface: MISSING ❌
+on-primary: MISSING ❌
+outline: MISSING ❌
+```
+
+**Impact**: Components using `text-secondary` get `#888888` instead of `#c8c6c5`. Buttons and status indicators use wrong colors.
+
+---
+
+#### 2. **Hardcoded Tailwind Classes Bypass Design System**
+
+**Found in Components:**
+- `bg-slate-400`, `bg-slate-600`, `hover:bg-slate-600` — No such colors in design
+- `bg-gray-400`, `text-gray-300`, `text-gray-400` — Undefined colors
+- `focus:ring-blue-500` — Should use primary color system
+- `hover:bg-[#222222]` — Hardcoded hex instead of tonal layer name
+
+**Examples from audit:**
+```tsx
+// ItemPhotoUpload.tsx
+className="hover:bg-slate-600"  // ❌ Undefined in design
+
+// ItemComparisonModal.tsx
+focus:ring-2 focus:ring-blue-500  // ❌ Should be focus:ring-primary
+
+// DebugRotationPanel.tsx
+hover:bg-slate-600  // ❌ Multiple instances
+```
+
+**Impact**: Colors change without design system knowledge. No way to enforce consistency.
+
+---
+
+#### 3. **Global CSS Variables Only Partially Implemented**
+
+**Currently Defined:**
+```css
+--background: #0A0A0A
+--foreground: #FFFFFF
+--primary: #F58618
+--border: #222222
+--muted: #888888
+```
+
+**Missing 30+ Design System Variables:**
+- All on-surface, on-primary, on-secondary variants
+- All surface container levels (surface-container-lowest, surface-container-high, etc.)
+- Outline and outline-variant
+- Tertiary color suite
+- Error container colors
+- All inverse color variants
+- Semantic spacing tokens
+
+**Impact**: Can't reference design colors via CSS variables. Forces hardcoded hex values.
+
+---
+
+#### 4. **Spacing Tokens Missing from Config**
+
+**DESIGN.md Specifies:**
+```yaml
+spacing:
+  unit: 4px
+  gutter: 16px
+  margin: 32px
+  container-gap: 24px
+  stack-sm: 8px
+  stack-md: 16px
+```
+
+**Current tailwind.config.ts**: Uses default Tailwind spacing (no custom tokens)
+
+**Impact**: Margins and padding inconsistent across pages. No semantic spacing vocabulary.
+
+---
+
+#### 5. **Typography Rules Partially Implemented**
+
+**DESIGN.md Specifies Letter-Spacing:**
+- headline-lg: `-0.02em`
+- headline-md: `-0.01em`
+- body-md/lg: default (0)
+- label-md: `+0.05em`
+
+**Current globals.css:**
+```css
+h1, h2, h3, h4, h5, h6 { @apply tracking-tighter; }
+```
+
+Only `tracking-tighter` applied to all headings. No distinction between sizes.
+
+**Impact**: Typography doesn't match spec. Density and legibility inconsistent.
+
+---
+
+## WHERE CHANGES ARE NEEDED
+
+### 1. **frontend/tailwind.config.ts** (CRITICAL - 80+ lines)
+
+**Changes Required:**
+- Replace `colors.primary` with exact DESIGN.md hex values
+- Add complete DESIGN.md color palette (50+ colors)
+- Add missing typography scale entries
+- Add spacing tokens (`unit`, `gutter`, `margin`, `stack-*`, `container-gap`)
+- Add all color variants (`on-surface`, `on-primary`, etc.)
+
+**Files to Edit:** `frontend/tailwind.config.ts`
+
+---
+
+### 2. **frontend/app/globals.css** (HIGH PRIORITY - 50+ lines)
+
+**Changes Required:**
+- Add CSS variables for ALL DESIGN.md colors (from :root)
+- Add CSS variables for spacing tokens
+- Update typography layer rules (different tracking per size)
+- Add semantic classes for DESIGN.md color naming (`.on-surface`, `.on-primary`, etc.)
+- Override default Tailwind focus ring color
+
+**Files to Edit:** `frontend/app/globals.css`
+
+---
+
+### 3. **Component Files** (HIGH VOLUME - 30+ files)
+
+**Search and Replace Pattern:**
+```
+bg-slate-* → bg-surface-bright or specific design color
+bg-gray-* → bg-muted or specific design color
+focus:ring-blue-500 → focus:ring-primary
+hover:bg-slate-600 → hover:bg-surface-bright or level-2
+text-gray-* → text-secondary or text-muted
+bg-[#222222] → bg-border (when for borders)
+```
+
+**Files to Review:**
+- `frontend/components/ItemPhotoUpload.tsx`
+- `frontend/components/DebugRotationPanel.tsx`
+- `frontend/components/ImageAdjustmentModal.tsx`
+- `frontend/components/ManualCropUI.tsx`
+- `frontend/components/ItemComparisonModal.tsx`
+- `frontend/components/CategoryCreationModal.tsx`
+- `frontend/components/CreateUserModal.tsx`
+- All other components with hardcoded colors
+
+---
+
+## DETAILED FIX PLAN
+
+### Phase 1: Color System Foundation
+
+**Step 1.1 - Update tailwind.config.ts**
+- Add complete DESIGN.md color palette as semantic color names
+- Map all 40+ colors from DESIGN.md
+- Ensure primary, secondary, tertiary, error, and all "on-" variants exist
+- Add surface container levels
+
+**Step 1.2 - Update globals.css**
+- Add CSS variable definitions for all colors
+- Create semantic class names for typography (`.headline-lg`, `.body-md`, etc.)
+- Add proper tracking/letter-spacing rules per DESIGN.md spec
+- Override Tailwind focus ring defaults to use primary color
+
+**Step 1.3 - Verify Color Consistency**
+- All hex values match DESIGN.md exactly
+- No hardcoded colors remain in globals.css
+- All semantic names follow Material Design naming convention
+
+---
+
+### Phase 2: Spacing System
+
+**Step 2.1 - Add Spacing Tokens**
+- Add `unit: 4px` as base spacing
+- Add `gutter: 16px`, `margin: 32px`, `container-gap: 24px`
+- Add `stack-sm: 8px`, `stack-md: 16px`
+- Update tailwind spacing scale to reference these
+
+**Step 2.2 - Component Spacing Audit**
+- Verify all page margins use `m-[32px]` or semantic class
+- Verify internal padding respects 4px grid
+- Verify gaps between items use stack tokens
+
+---
+
+### Phase 3: Typography System
+
+**Step 3.1 - Implement Typography Scale**
+- Add custom Tailwind class for each typography level
+- Implement correct letter-spacing per DESIGN.md (headline-lg: `-0.02em`, etc.)
+- Add line-height rules (1.1 for headlines, 1.5 for body)
+
+**Step 3.2 - Font Weight Enforcement**
+- Ensure no font-weight values other than 400 in CSS
+- Verify global `font-weight: 400 !important` is enforced
+- Check that hierarchy comes ONLY from size + color
+
+---
+
+### Phase 4: Component Compliance
+
+**Step 4.1 - Search and Replace**
+Replace all hardcoded Tailwind colors:
+
+| Current | Replace With | Reason |
+|---------|--------------|--------|
+| `bg-slate-*` | `bg-surface-bright` or design color | Undefined in system |
+| `bg-gray-*` | `bg-muted` or `bg-secondary` | Undefined in system |
+| `focus:ring-blue-500` | `focus:ring-primary` | Wrong color system |
+| `hover:bg-slate-600` | `hover:bg-surface-bright` or level-2 | Undefined in system |
+| `text-gray-*` | `text-secondary` or `text-muted` | Undefined in system |
+| `bg-[#222222]` (for hover) | `hover:bg-border` or `hover:bg-surface-bright` | Use design token |
+
+**Step 4.2 - Focus State Audit**
+- All `:focus` and `:focus-visible` should use primary color
+- Verify ring width (2px) matches design spec
+- Remove any blue-500 references
+
+**Step 4.3 - Border Audit**
+- All borders should use `border-border` or `border-primary`
+- No hardcoded `#222222` in border definitions
+- Verify 1px vs 2px matches DESIGN.md spec
+
+---
+
+## FILES REQUIRING CHANGES
+
+### Critical (Must Fix)
+1. **frontend/tailwind.config.ts** — Add 50+ colors + spacing
+2. **frontend/app/globals.css** — Add 50+ CSS variables + typography rules
+
+### High Priority (30+ files with hardcoded colors)
+3. `frontend/components/ItemPhotoUpload.tsx`
+4. `frontend/components/DebugRotationPanel.tsx`
+5. `frontend/components/ImageAdjustmentModal.tsx`
+6. `frontend/components/ManualCropUI.tsx`
+7. `frontend/components/ItemComparisonModal.tsx`
+8. `frontend/components/CategoryCreationModal.tsx`
+9. `frontend/components/CreateUserModal.tsx`
+10. All other `/components/*.tsx` files with `bg-slate-`, `bg-gray-`, `focus:ring-blue-`
+
+### Medium Priority
+- `frontend/app/items/create.tsx` (has `bg-slate-400`)
+- `frontend/app/inventory/page.tsx`
+- `frontend/app/admin/page.tsx`
+
+---
+
+## EXPECTED OUTCOMES
+
+After implementation:
+
+✅ All DESIGN.md colors mapped 1:1 to tailwind.config.ts
+✅ All 40+ CSS variables available in globals.css
+✅ Zero hardcoded Tailwind colors (bg-slate-*, bg-gray-*, focus:ring-blue-*)
+✅ All components use semantic color names (primary, secondary, surface-bright, etc.)
+✅ Spacing tokens enable consistent, grid-aligned layout
+✅ Typography follows DESIGN.md letter-spacing rules exactly
+✅ Focus states use primary color consistently
+✅ 100% compliance with DESIGN.md specification
+
+---
+
+## VERIFICATION CHECKLIST
+
+- [ ] tailwind.config.ts has all 40+ DESIGN.md colors
+- [ ] globals.css has CSS variables for all colors
+- [ ] No `bg-slate-*` or `bg-gray-*` in any component
+- [ ] No `focus:ring-blue-*` anywhere in codebase
+- [ ] All typography uses proper letter-spacing per DESIGN.md
+- [ ] Spacing tokens defined and used in config
+- [ ] Primary color changed from `#F58618` to `#ffb781` (if this is correct)
+- [ ] All component audits passed
+- [ ] Visual inspection: colors match DESIGN.md visual palette
+
+---
+
+**NEXT STEP**: User reviews this plan and approves before code changes begin.
diff --git a/frontend/app/globals.css b/frontend/app/globals.css
index c8aebda9..add92354 100644
--- a/frontend/app/globals.css
+++ b/frontend/app/globals.css
@@ -6,11 +6,74 @@
 
 @layer base {
   :root {
+    /* Base colors from DESIGN.md */
     --background: #131313;
-    --foreground: #FFFFFF;
-    --primary: #F58618;
-    --border: #222222;
-    --muted: #888888;
+    --on-background: #e5e2e1;
+    --foreground: #e5e2e1;
+
+    /* Surface tones from DESIGN.md */
+    --surface: #131313;
+    --surface-dim: #131313;
+    --surface-bright: #3a3939;
+    --surface-container-lowest: #0e0e0e;
+    --surface-container-low: #1c1b1b;
+    --surface-container: #201f1f;
+    --surface-container-high: #2a2a2a;
+    --surface-container-highest: #353534;
+    --surface-variant: #353534;
+
+    /* Primary colors from DESIGN.md */
+    --primary: #ffb781;
+    --on-primary: #4e2600;
+    --primary-container: #f58618;
+    --on-primary-container: #5b2d00;
+    --primary-fixed: #ffdcc4;
+    --primary-fixed-dim: #ffb781;
+    --on-primary-fixed: #2f1400;
+    --on-primary-fixed-variant: #6f3800;
+    --inverse-primary: #924c00;
+
+    /* Secondary colors from DESIGN.md */
+    --secondary: #c8c6c5;
+    --on-secondary: #303030;
+    --secondary-container: #474746;
+    --on-secondary-container: #b7b5b4;
+    --secondary-fixed: #e5e2e1;
+    --secondary-fixed-dim: #c8c6c5;
+    --on-secondary-fixed: #1b1c1c;
+    --on-secondary-fixed-variant: #474746;
+
+    /* Tertiary colors from DESIGN.md */
+    --tertiary: #00e639;
+    --on-tertiary: #003907;
+    --tertiary-container: #00bd2d;
+    --on-tertiary-container: #00440a;
+    --tertiary-fixed: #72ff70;
+    --tertiary-fixed-dim: #00e639;
+    --on-tertiary-fixed: #002203;
+    --on-tertiary-fixed-variant: #00530e;
+
+    /* Error colors from DESIGN.md */
+    --error: #ffb4ab;
+    --on-error: #690005;
+    --error-container: #93000a;
+    --on-error-container: #ffdad6;
+
+    /* Outline colors from DESIGN.md */
+    --outline: #a48c7c;
+    --outline-variant: #564335;
+
+    /* Inverse colors from DESIGN.md */
+    --inverse-surface: #e5e2e1;
+    --inverse-on-surface: #313030;
+
+    /* Semantic spacing tokens */
+    --spacing-unit: 4px;
+    --spacing-gutter: 16px;
+    --spacing-margin: 32px;
+    --spacing-container-gap: 24px;
+    --spacing-stack-sm: 8px;
+    --spacing-stack-md: 16px;
   }
 
   * {
@@ -25,79 +88,151 @@
     letter-spacing: -0.01em;
   }
 
-  /* Strict "NO BOLD" enforcement from AI_RULES.md */
+  /* Strict "NO BOLD" enforcement from AI_RULES.md - Hierarchy via size and color only */
   *, *::before, *::after {
     font-weight: 400 !important;
   }
 
-  /* No uppercase/italics as per AI_RULES.md */
+  /* No uppercase/italics as per AI_RULES.md and GEMINI.md */
   *, *::before, *::after {
     text-transform: none !important;
     font-style: normal !important;
   }
 
-  h1, h2, h3, h4, h5, h6 {
-    @apply tracking-tighter;
+  /* Typography scale with proper letter-spacing per DESIGN.md */
+  h1 {
+    @apply text-5xl tracking-tighter;
+    letter-spacing: -0.02em;
   }
 
+  h2 {
+    @apply text-4xl tracking-tight;
+    letter-spacing: -0.01em;
+  }
+
+  h3, h4, h5, h6 {
+    @apply tracking-tight;
+  }
+
+  /* Input Fields: Darker than the container background per DESIGN.md */
   input, textarea, select {
-    @apply bg-black border border-[#222222] text-white px-3 py-2 focus:border-primary focus:outline-none transition-colors;
+    @apply bg-surface-container-lowest border border-outline text-foreground px-3 py-2 focus:border-primary focus:outline-none transition-colors;
     border-radius: 0 !important;
   }
 }
 
 @layer components {
-  /* Button Styles */
+  /* Button Styles: Rectangular with no radius */
   .btn-primary {
-    @apply bg-primary text-black px-4 py-2 hover:bg-[#d47214] transition-colors inline-flex items-center justify-center gap-2;
+    @apply bg-primary text-on-primary px-4 py-2 hover:opacity-90 transition-opacity inline-flex items-center justify-center gap-2;
   }
 
   .btn-secondary {
-    @apply bg-transparent border border-[#888888] text-[#888888] px-4 py-2 hover:border-white hover:text-white transition-colors inline-flex items-center justify-center gap-2;
+    @apply bg-transparent border border-secondary text-secondary px-4 py-2 hover:border-foreground hover:text-foreground transition-colors inline-flex items-center justify-center gap-2;
   }
 
-  /* Level 1 (Cards/Panels): #121212 with a 1px solid border of #222222 */
+  .level-0 {
+    @apply bg-surface;
+  }
+
+  /* Level 1 (Cards/Panels): surface-container with 1px border of outline-variant */
   .level-1 {
-    @apply bg-[#121212] border border-[#222222];
+    @apply bg-surface-container border border-outline-variant;
   }
 
-  /* Level 2 (Modals/Popovers): #1A1A1A with a 2px solid border of the Primary Orange */
+  /* Level 2 (Modals/Popovers): surface-container-high with 2px border of primary */
   .level-2 {
-    @apply bg-[#1A1A1A] border-2 border-primary;
+    @apply bg-surface-container-high border-2 border-primary;
   }
-  
-  /* Active State */
+
+  .input-field {
+    @apply bg-surface-container-lowest border border-outline text-foreground px-3 py-2 focus:border-primary focus:outline-none transition-colors;
+  }
+
+  /* Active State: 1px solid primary */
   .active-border {
     @apply border border-primary;
   }
 
-  /* High-contrast status blocks */
+  /* High-contrast status blocks: No rounded corners */
   .status-success {
-    @apply bg-[#00FF41] text-black px-2 py-0.5;
+    @apply bg-success text-on-tertiary px-2 py-0.5;
   }
 
   .status-alert {
-    @apply bg-[#F58618] text-black px-2 py-0.5;
+    @apply bg-primary text-on-primary px-2 py-0.5;
+  }
+
+  /* Data Tables: Header cells with a subtle background tint */
+  .table-header {
+    @apply bg-surface-container-high border-b border-outline py-2 px-4 text-secondary text-sm font-normal;
+  }
+
+  /* Log Viewers: Background surface-container-lowest with outline border */
+  .log-viewer {
+    @apply bg-surface-container-lowest border border-outline p-4 font-mono mono-data overflow-y-auto;
+  }
+
+  /* Typography utilities for DESIGN.md semantic sizing */
+  .headline-lg {
+    @apply text-5xl font-normal;
+    letter-spacing: -0.02em;
+    line-height: 1.1;
+  }
+
+  .headline-md {
+    @apply text-4xl font-normal;
+    letter-spacing: -0.01em;
+    line-height: 1.2;
+  }
+
+  .headline-sm {
+    @apply text-2xl font-normal;
+    line-height: 1.2;
+  }
+
+  .body-lg {
+    @apply text-lg font-normal;
+    line-height: 1.5;
+  }
+
+  .body-md {
+    @apply text-base font-normal;
+    line-height: 1.5;
+  }
+
+  .label-md {
+    @apply text-sm font-normal;
+    letter-spacing: 0.05em;
+    line-height: 1;
+  }
+
+  .mono-data {
+    @apply text-sm font-normal;
+    font-family: 'Space Grotesk', monospace;
+    letter-spacing: 0.02em;
+    line-height: 1;
+    font-variant-numeric: tabular-nums;
   }
 }
 
-/* Custom Industrial Scrollbar Styling */
+/* Custom Industrial Scrollbar Styling per DESIGN.md */
 ::-webkit-scrollbar {
   width: 8px;
   height: 8px;
 }
 
 ::-webkit-scrollbar-track {
-  background: #0A0A0A;
+  background: var(--surface);
 }
 
 ::-webkit-scrollbar-thumb {
-  background: #222222;
+  background: var(--outline-variant);
   border-radius: 0;
 }
 
 ::-webkit-scrollbar-thumb:hover {
-  background: #F58618;
+  background: var(--primary);
 }
 
 @layer utilities {
diff --git a/frontend/app/inventory/page.tsx b/frontend/app/inventory/page.tsx
index 0f1aa168..86dc3e74 100644
--- a/frontend/app/inventory/page.tsx
+++ b/frontend/app/inventory/page.tsx
@@ -14,14 +14,8 @@ import { useInventoryFilter } from '@/hooks/useInventoryFilter';
 import { toast } from 'react-hot-toast';
 import {
   Package,
-  BarChart3,
   Layers,
-  Plus,
-  Minus,
-  Trash2,
   X,
-  AlertTriangle,
-  Tag,
   Edit2,
   Camera,
   Layout,
@@ -31,12 +25,8 @@ import {
   Search
 } from 'lucide-react';
 import { generateBarcode128, getQRCodeURL } from '@/lib/labels';
-import { clsx, type ClassValue } from 'clsx';
-import { twMerge } from 'tailwind-merge';
-
-function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
-}
+import { cn } from '@/lib/utils';
+import versionData from '../VERSION.json';
 
 export default function InventoryPage() {
   const [mounted, setMounted] = useState(false);
@@ -99,22 +89,18 @@ export default function InventoryPage() {
   }, []);
 
   const loadData = async () => {
-    // Load local items
     const cached = await db.items.toArray();
     setInventory(cached);
 
     try {
-      // Load backend stats
       const s = await inventoryApi.getStats();
       setStats(s);
       
       const cats = await inventoryApi.getCategories();
       setCategoriesList(cats);
 
-      // Load fresh items
       const res = await inventoryApi.getItems();
       setInventory(res);
-      // Sync local DB
       await db.items.clear();
       await db.items.bulkPut(res);
     } catch (err: any) {
@@ -131,7 +117,6 @@ export default function InventoryPage() {
       const finalAdjustQty = adjustQty;
       const newQty = selectedItem.quantity + (adjustType === 'ADD' ? adjustQty : -adjustQty);
 
-      // Local Update
       await db.items.update(selectedItem.id!, { quantity: newQty });
       setInventory(prev => prev.map(i => i.id === selectedItem.id ? { ...i, quantity: newQty } : i));
       
@@ -190,24 +175,6 @@ export default function InventoryPage() {
     }
   };
 
-  const handleDeleteItem = async () => {
-    if (!selectedItem || !selectedItem.id) return;
-    if (!window.confirm(`Are you sure you want to delete "${selectedItem.name}"?`)) return;
-    
-    try {
-      await db.items.delete(selectedItem.id);
-      if (navigator.onLine) {
-        await inventoryApi.deleteItem(selectedItem.id);
-      }
-      toast.success("Item deleted");
-      setSelectedItem(null);
-      await loadData();
-    } catch (err: any) {
-      console.error(err);
-      toast.error("Failed to delete item");
-    }
-  };
-
   const handleUpdateCategory = async () => {
     if (!editingCategory) return;
     try {
@@ -238,7 +205,6 @@ export default function InventoryPage() {
   }, [fieldScanning]);
 
   const onScanSuccess = useCallback((barcode: string) => {
-    // Inventory page doesn't do check-in via scanner, it just finds the item
     const item = inventory.find(i => i.barcode === barcode);
     if (item) {
       setSelectedItem(item);
@@ -258,7 +224,6 @@ export default function InventoryPage() {
     setSelectedSearchItem(null);
   };
 
-  // Extract unique item types and box labels for suggestions
   const existingTypes = Array.from(new Set(inventory.map(i => i.type).filter(Boolean))).sort() as string[];
   const existingBoxes = Array.from(new Set(inventory.map(i => i.box_label).filter(Boolean))).sort() as string[];
 
@@ -266,7 +231,7 @@ export default function InventoryPage() {
 
   return (
     <PageShell>
-      <div className="p-4 md:p-8 max-w-7xl mx-auto space-y-3 md:space-y-4 font-sans">
+      <div className="p-4 md:p-8 max-w-7xl mx-auto space-y-4">
       <datalist id="existing-types">
         {existingTypes.map(t => <option key={t} value={t} />)}
       </datalist>
@@ -274,7 +239,7 @@ export default function InventoryPage() {
         {existingBoxes.map(b => <option key={b} value={b} />)}
       </datalist>
 
-      <header className="flex items-center gap-4 mb-6 md:mb-8">
+      <header className="flex items-center gap-4 mb-8">
         <div className="p-4 bg-primary/10 text-primary border border-primary/20">
           <Package size={28} className="md:w-8 md:h-8" />
         </div>
@@ -284,23 +249,22 @@ export default function InventoryPage() {
          </div>
         <button
           onClick={() => setShowSearchModal(true)}
-          className="ml-auto p-3 bg-surface border border-border text-secondary hover:text-primary transition-all active:scale-95"
+          className="ml-auto p-3 bg-surface-container border border-border text-secondary hover:text-primary transition-all active:scale-95"
           title="Search Inventory"
         >
           <Search size={20} />
         </button>
         <button
           onClick={() => setShowBoxManager(true)}
-          className="p-3 bg-surface border border-border text-secondary hover:text-primary transition-all active:scale-95"
+          className="p-3 bg-surface-container border border-border text-secondary hover:text-primary transition-all active:scale-95"
           title="Manage Boxes"
         >
           <Layout size={20} />
         </button>
       </header>
 
-      <div className="w-full space-y-3 md:space-y-4">
-        {/* Stats Dashboard */}
-        <section className="grid grid-cols-2 md:grid-cols-4 gap-2.5 md:gap-4">
+      <div className="w-full space-y-4">
+        <section className="grid grid-cols-2 md:grid-cols-4 gap-4">
           <StatCard
             label="Categories"
             value={stats?.total_categories || categories.length}
@@ -318,13 +282,11 @@ export default function InventoryPage() {
           />
         </section>
 
-        {/* Search */}
         <FilterBar
           searchQuery={searchQuery}
           onChange={setSearchQuery}
         />
 
-        {/* Inventory Table */}
         <InventoryTable
           items={inventory}
           categories={filteredCategories}
@@ -344,15 +306,14 @@ export default function InventoryPage() {
         />
       </div>
 
-      {/* 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-[#0A0A0A] border-x border-t sm:border border-[#222222] p-5 sm:p-8 overflow-hidden animate-in slide-in-from-bottom-10 duration-300 rounded-none">
-              <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">
+        <div className="fixed inset-0 z-50 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 level-2 p-5 sm:p-8 overflow-hidden animate-in slide-in-from-bottom-10 duration-300">
+              <div className="flex justify-between items-center mb-4">
+                <h3 className="text-xl font-normal tracking-tight flex items-center gap-2 text-white">
                    {isEditing ? "Edit Item" : selectedItem.name}
                    {!isEditing && (
-                     <span className="text-xs bg-black text-[#888888] px-3 py-1 border border-[#222222] font-normal tracking-tight">
+                     <span className="text-xs bg-black text-secondary px-3 py-1 border border-border font-normal">
                        In Stock: {selectedItem.quantity}
                      </span>
                    )}
@@ -364,26 +325,18 @@ export default function InventoryPage() {
                         setEditedItem(selectedItem);
                         setIsEditing(true);
                       }} 
-                      className="p-2 hover:bg-black border border-transparent hover:border-[#222222] text-[#888888] rounded-none"
+                      className="p-2 bg-surface-bright hover:text-primary transition-colors border border-border"
                     >
                       <Edit2 size={20} />
                     </button>
                   )}
-                  {isEditing && (
-                    <button 
-                      onClick={handleDeleteItem} 
-                      className="p-2 hover:bg-red-500/20 border border-transparent hover:border-red-500/50 text-red-500 rounded-none"
-                    >
-                      <Trash2 size={20} />
-                    </button>
-                  )}
                   <button 
                     onClick={() => {
                       setSelectedItem(null);
                       setIsEditing(false);
                       setAdjustQty(1);
                     }} 
-                    className="p-2 hover:bg-black border border-transparent hover:border-[#222222] rounded-none"
+                    className="p-2 bg-surface-bright hover:text-white transition-colors border border-border"
                   >
                     <X size={20} />
                   </button>
@@ -391,196 +344,104 @@ export default function InventoryPage() {
               </div>
 
               {isEditing ? (
-                <div className="max-h-[60vh] overflow-y-auto pr-2 space-y-2 md:space-y-3 mb-4 md:mb-6 scrollbar-hide">
+                <div className="max-h-[60vh] overflow-y-auto pr-2 space-y-3 mb-6 custom-scrollbar">
                    <div>
-                    <label className="text-sm font-normal text-[#888888] ml-1 tracking-tight">Item Name</label>
+                    <label className="text-xs font-normal text-secondary ml-1 tracking-tight">Item Name</label>
                     <input 
                       type="text" 
                       value={editedItem.name || ''} 
                       onChange={e => setEditedItem({...editedItem, name: e.target.value})}
-                      className="w-full bg-black border border-[#222222] focus:border-primary px-3 py-2 rounded-none"
+                      className="input-field w-full"
                     />
                   </div>
                    <div>
-                    <label className="text-sm font-normal text-[#888888] ml-1 tracking-tight">Part Number</label>
+                    <label className="text-xs font-normal text-secondary ml-1 tracking-tight">Part Number</label>
                     <input
                       type="text"
                       value={editedItem.part_number || ''}
                       onChange={e => setEditedItem({...editedItem, part_number: e.target.value})}
-                      className="w-full bg-black border border-[#222222] focus:border-primary px-3 py-2 rounded-none"
+                      className="input-field w-full"
                     />
                   </div>
-                  <div className="grid grid-cols-2 gap-2 md:gap-3">
+                  <div className="grid grid-cols-2 gap-3">
                      <div>
-                      <label className="text-sm font-normal text-[#888888] ml-1 tracking-tight">Category</label>
+                      <label className="text-xs font-normal text-secondary ml-1 tracking-tight">Category</label>
                       <input 
                         type="text"
                         list="existing-categories"
                         value={editedItem.category || ''} 
                         onChange={e => setEditedItem({ ...editedItem, category: e.target.value })}
-                        className="w-full bg-black border border-[#222222] focus:border-primary px-3 py-2 rounded-none"
+                        className="input-field w-full"
                         placeholder="e.g. Storage"
                       />
-                      <datalist id="existing-categories">
-                        {categoriesList.map(c => (
-                          <option key={c.id} value={c.name} />
-                        ))}
-                      </datalist>
                     </div>
                      <div>
-                      <label className="text-sm font-normal text-[#888888] ml-1 tracking-tight">Item Type</label>
+                      <label className="text-xs font-normal text-secondary ml-1 tracking-tight">Item Type</label>
                       <input 
                         type="text" 
                         list="existing-types"
                         value={editedItem.type || ''} 
                         onChange={e => setEditedItem({...editedItem, type: e.target.value})}
-                        className="w-full bg-black border border-[#222222] focus:border-primary px-3 py-2 rounded-none"
+                        className="input-field w-full"
                       />
                     </div>
-                     <div>
-                      <label className="text-sm font-normal text-[#888888] ml-1 tracking-tight">Connector</label>
-                      <input 
-                        type="text" 
-                        value={editedItem.connector || ''} 
-                        onChange={e => setEditedItem({...editedItem, connector: e.target.value})}
-                        className="w-full bg-black border border-[#222222] focus:border-primary px-3 py-2 rounded-none"
-                        placeholder="e.g. LC/UPC"
-                      />
-                    </div>
-                     <div>
-                      <label className="text-sm font-normal text-[#888888] ml-1 tracking-tight">Size / Length / Speed</label>
-                      <input 
-                        type="text" 
-                        value={editedItem.size || ''} 
-                        onChange={e => setEditedItem({...editedItem, size: e.target.value})}
-                        className="w-full bg-black border border-[#222222] focus:border-primary px-3 py-2 rounded-none"
-                        placeholder="e.g. 1.6TB"
-                      />
-                    </div>
-                     <div className="col-span-2">
-                      <label className="text-sm font-normal text-[#888888] ml-1 tracking-tight">Item Color</label>
-                      <input 
-                        type="text" 
-                        value={editedItem.color || ''} 
-                        onChange={e => setEditedItem({...editedItem, color: e.target.value})}
-                        className="w-full bg-black border border-[#222222] focus:border-primary px-3 py-2 rounded-none"
-                        placeholder="e.g. Blue"
-                      />
-                    </div>
-                     <div className="col-span-2">
-                        <label className="text-sm font-normal text-[#888888] ml-1 tracking-tight">Box / Container Label</label>
-                       <div className="relative flex items-center">
-                         <input 
-                           type="text" 
-                           list="existing-boxes"
-                           value={editedItem.box_label || ''} 
-                           onChange={e => setEditedItem({...editedItem, box_label: e.target.value})}
-                           className="w-full pr-12 bg-black border border-[#222222] focus:border-primary px-3 py-2 rounded-none"
-                           placeholder="e.g. Box 5"
-                         />
-                         <button 
-                           type="button"
-                           onClick={() => {
-                             setFieldScanning({ active: true, field: 'box_label' });
-                             setShowScanner(true);
-                             toast.success("Ready to scan Box label...");
-                           }}
-                           className={cn(
-                             "absolute right-2 p-2 transition-all rounded-none",
-                             fieldScanning?.active ? "bg-primary text-black animate-pulse" : "text-[#888888] hover:bg-black"
-                           )}
-                         >
-                           <Camera size={18} />
-                         </button>
-                       </div>
-                    </div>
                   </div>
                    <div>
-                    <label className="text-sm font-normal text-[#888888] ml-1 tracking-tight">Specs / Comments</label>
+                    <label className="text-xs font-normal text-secondary ml-1 tracking-tight">Specs / Comments</label>
                     <textarea 
                       value={editedItem.specs || ''} 
                       onChange={e => setEditedItem({...editedItem, specs: e.target.value})}
-                      className="w-full h-20 resize-none bg-black border border-[#222222] focus:border-primary px-3 py-2 rounded-none"
-                    />
-                  </div>
-                   <div>
-                    <label className="text-sm font-normal text-[#888888] ml-1 tracking-tight">OCR Matching Key</label>
-                    <textarea 
-                      value={editedItem.ocr_text || ''} 
-                      onChange={e => setEditedItem({...editedItem, ocr_text: e.target.value})}
-                      className="w-full text-primary h-16 resize-none bg-black border border-[#222222] focus:border-primary px-3 py-2 rounded-none"
+                      className="input-field w-full h-24 resize-none"
                     />
                   </div>
                 </div>
               ) : (
                 <>
-                  <div className="flex p-1 bg-black border border-[#222222] mb-4 md:mb-6 rounded-none">
+                  <div className="flex p-1 bg-black border border-border 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: 'TRASH', label: 'Discard', icon: Trash2, color: 'text-rose-500' }
                     ].map((t) => (
                       <button
                         key={t.id}
                         onClick={() => setAdjustType(t.id as any)}
                         className={cn(
-                          "flex-1 flex flex-col items-center py-3 lg:py-4 xl:py-5 transition-all rounded-none",
-                          adjustType === t.id ? "bg-[#1A1A1A] border border-[#222222]" : "text-[#888888]"
+                          "flex-1 flex flex-col items-center py-4 transition-all",
+                          adjustType === t.id ? "bg-surface-bright border border-border" : "text-secondary"
                         )}
                       >
                          <t.icon size={20} className={adjustType === t.id ? t.color : ""} />
-                         <span className="text-sm font-normal mt-1.5 tracking-tight">{t.label}</span>
+                         <span className="text-xs font-normal mt-1.5">{t.label}</span>
                        </button>
                     ))}
                   </div>
 
-                  <div className="flex flex-col items-center gap-3 md:gap-4 mb-4 md:mb-6">
-                    <div className="flex items-center gap-3 md:gap-4">
+                  <div className="flex flex-col items-center gap-4 mb-6">
+                    <div className="flex items-center gap-6">
                       <button 
                         onClick={() => setAdjustQty(Math.max(1, adjustQty - 1))}
-                        className="w-12 h-12 border border-[#222222] flex items-center justify-center hover:bg-black transition-colors rounded-none"
+                        className="w-12 h-12 border border-border flex items-center justify-center bg-surface-bright hover:text-white"
                       >
                         <Minus size={24} />
                       </button>
-                      <span className="text-5xl font-normal tabular-nums">{adjustQty}</span>
+                      <span className="text-5xl font-normal tabular-nums text-white">{adjustQty}</span>
                       <button 
                         onClick={() => setAdjustQty(adjustQty + 1)}
-                        className="w-12 h-12 border border-[#222222] flex items-center justify-center hover:bg-black transition-colors rounded-none"
+                        className="w-12 h-12 border border-border flex items-center justify-center bg-surface-bright hover:text-white"
                       >
                         <Plus size={24} />
                       </button>
                     </div>
-                    
-                    {adjustType === 'TRASH' && (
-                      <div className="w-full bg-red-500/5 border border-red-500/20 p-4 rounded-none">
-                         <select 
-                          value={trashReason} 
-                          onChange={(e) => setTrashReason(e.target.value)}
-                          className="w-full bg-black border border-[#222222] focus:border-primary px-3 py-2 rounded-none"
-                        >
-                          <option>Damaged</option>
-                          <option>Expired</option>
-                          <option>Lost</option>
-                          <option>Technical Failure</option>
-                        </select>
-                      </div>
-                    )}
                   </div>
                 </>
               )}
 
               <button 
                 onClick={isEditing ? handleUpdateItem : handleAdjustStock}
-                className={cn(
-                  "w-full py-4 sm:py-5 font-normal text-lg transition-all active:scale-[0.98] rounded-none",
-                  isEditing ? "bg-white text-black" : (
-                    adjustType === 'ADD' ? "btn-primary" : 
-                    adjustType === 'REMOVE' ? "bg-amber-600 text-white" : 
-                    "bg-red-600 text-white"
-                  )
-                )}
+                className="btn-primary w-full py-4 text-lg"
               >
-                {isEditing ? "Save Changes" : (
+                {isEditing ? "Apply Changes" : (
                   adjustType === 'ADD' ? `Add ${adjustQty} To Stock` : 
                   adjustType === 'REMOVE' ? `Subtract ${adjustQty} From Stock` : 
                   `Discard ${adjustQty} Items`
@@ -590,42 +451,41 @@ export default function InventoryPage() {
         </div>
       )}
 
-      {/* 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-[#0A0A0A] border border-[#222222] p-4 md:p-6 max-w-sm w-full shadow-none space-y-3 md:space-y-4 animate-in zoom-in-95 duration-200 rounded-none">
-            <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-black border border-transparent hover:border-[#222222] transition-colors text-[#888888] rounded-none">
+        <div className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-background/95 animate-in fade-in duration-300">
+          <div className="level-2 p-6 max-w-sm w-full space-y-4 animate-in zoom-in-95 duration-200">
+            <div className="flex justify-between items-center border-b border-border pb-2">
+               <h2 className="text-xl font-normal text-white">Edit Category</h2>
+               <button onClick={() => setEditingCategory(null)} className="p-2 bg-surface-bright hover:text-white text-secondary transition-colors border border-border">
                  <X size={20} />
                </button>
             </div>
             
-            <div className="space-y-2 md:space-y-3">
+            <div className="space-y-3">
                <div>
-                <label className="text-sm font-normal text-[#888888] ml-1 tracking-tight">Name</label>
+                <label className="text-xs font-normal text-secondary ml-1 tracking-tight">Name</label>
                 <input 
                   type="text" 
                   value={catEditedName}
                   onChange={e => setCatEditedName(e.target.value)}
-                  className="w-full bg-black border border-[#222222] focus:border-primary px-3 py-2 rounded-none"
+                  className="input-field w-full"
                 />
               </div>
                <div>
-                <label className="text-sm font-normal text-[#888888] ml-1 tracking-tight">Description</label>
+                <label className="text-xs font-normal text-secondary ml-1 tracking-tight">Description</label>
                 <textarea 
                   value={catEditedDesc}
                   onChange={e => setCatEditedDesc(e.target.value)}
-                  className="w-full h-24 resize-none bg-black border border-[#222222] focus:border-primary px-3 py-2 rounded-none"
+                  className="input-field w-full h-24 resize-none"
                 />
               </div>
             </div>
 
             <button 
               onClick={handleUpdateCategory}
-              className="btn-primary w-full"
+              className="btn-primary w-full py-3"
             >
-              Update Category
+              Update Protocol
             </button>
           </div>
         </div>
@@ -639,20 +499,19 @@ export default function InventoryPage() {
       )}
       </div>
 
-      {/* 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-[#0A0A0A] border border-[#222222] overflow-hidden flex flex-col max-h-[90vh] rounded-none">
-            <div className="p-4 md:p-6 pb-3 md:pb-4 flex flex-col gap-3 md:gap-4 shrink-0 bg-[#0A0A0A]/70">
+        <div className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-background/95 animate-in fade-in duration-300">
+          <div className="w-full max-w-2xl level-2 overflow-hidden flex flex-col max-h-[90vh]">
+            <div className="p-6 bg-surface-container/70 border-b border-border space-y-4">
                <div className="flex justify-between items-center">
                   <div>
-                    <h3 className="text-2xl font-normal tracking-tight flex items-center gap-3">
+                    <h3 className="text-2xl font-normal tracking-tight flex items-center gap-3 text-white">
                       <Package className="text-primary" size={28} />
                       Box Inventory
                     </h3>
-                    <p className="text-sm text-[#888888] font-normal mt-1">Manage physical box labels & printing</p>
+                    <p className="text-xs text-secondary font-normal mt-1">Manage physical box labels & printing</p>
                   </div>
-                  <button onClick={() => { setShowBoxManager(false); setBoxSearchQuery(''); }} className="p-3 hover:bg-black border border-transparent hover:border-[#222222] transition-colors text-[#888888] rounded-none">
+                  <button onClick={() => { setShowBoxManager(false); setBoxSearchQuery(''); }} className="p-3 bg-surface-bright border border-border text-secondary hover:text-white transition-colors">
                     <X size={24} />
                   </button>
                </div>
@@ -660,50 +519,41 @@ export default function InventoryPage() {
                <div className="relative">
                  <input 
                    type="text"
-                   placeholder="Search boxes..."
+                   placeholder="Search Box Protocols..."
                    value={boxSearchQuery}
                    onChange={(e) => setBoxSearchQuery(e.target.value)}
-                   className="w-full pl-11 pr-4 bg-black border border-[#222222] focus:border-primary px-3 py-2 rounded-none"
+                   className="input-field w-full pl-11"
                  />
-                 <Search className="absolute left-4 top-1/2 -translate-y-1/2 text-[#888888]" size={18} />
-                 {boxSearchQuery && (
-                   <button 
-                     onClick={() => setBoxSearchQuery('')}
-                     className="absolute right-3 top-1/2 -translate-y-1/2 p-1.5 hover:bg-black border border-[#222222] text-[#888888] rounded-none"
-                   >
-                     <X size={14} />
-                   </button>
-                 )}
+                 <Search className="absolute left-4 top-1/2 -translate-y-1/2 text-muted" size={18} />
                </div>
             </div>
 
-            <div className="flex-1 overflow-y-auto p-4 md:p-6 space-y-2 md:space-y-3 pt-3 md:pt-4">
+            <div className="flex-1 overflow-y-auto p-6 space-y-3 custom-scrollbar">
                {getFilteredBoxes(existingBoxes).length === 0 ? (
-                 <div className="py-20 text-center space-y-2 md:space-y-3 opacity-40">
-                    <Package size={48} className="mx-auto" />
-                    <p className="font-normal">{existingBoxes.length === 0 ? 'No box labels defined yet.' : 'No matching boxes found.'}</p>
-                    <p className="text-xs max-w-xs mx-auto">Associate items with a "Box Label" in their metadata to see them here.</p>
+                 <div className="py-20 text-center space-y-3 opacity-30">
+                    <Package size={48} className="mx-auto text-secondary" />
+                    <p className="text-secondary">No matching Box ID found</p>
                  </div>
                ) : (
-                 <div className="grid grid-cols-1 md:grid-cols-2 gap-2 md:gap-3 pb-3 md:pb-4">
+                 <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
                     {getFilteredBoxes(existingBoxes).map(box => {
                         const itemCount = inventory.filter(i => i.box_label === box).length;
                         return (
-                          <div key={box} className="bg-black/50 border border-[#222222] p-3 md:p-4 flex flex-col gap-2 md:gap-3 group hover:border-primary/40 transition-all rounded-none">
+                          <div key={box} className="bg-black/50 border border-border p-4 flex flex-col 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-[#888888] font-normal mt-0.5">{itemCount} Items Linked</p>
+                                <p className="text-xs text-secondary font-normal mt-0.5">{itemCount} Unique Records</p>
                              </div>
-                             <div className="flex gap-2 shrink-0">
+                             <div className="flex gap-2">
                                  <button 
                                    onClick={() => setSelectedBoxLabel(box)}
-                                   className="btn-primary flex-1 text-xs py-2 rounded-none"
+                                   className="btn-primary flex-1 text-xs py-2"
                                  >
-                                   <Printer size={14} /> Print Label
+                                   <Printer size={14} /> Print
                                  </button>
                                  <button 
                                    onClick={() => { setSearchQuery(box); setShowBoxManager(false); setBoxSearchQuery(''); }}
-                                   className="btn-secondary flex-1 text-xs py-2 rounded-none"
+                                   className="btn-secondary flex-1 text-xs py-2"
                                  >
                                    View
                                  </button>
@@ -715,77 +565,46 @@ export default function InventoryPage() {
                )}
             </div>
             
-            <div className="p-4 md:p-6 py-3 md:py-4 bg-black/50 border-t border-[#222222] text-center flex items-center justify-center gap-2">
+            <div className="p-4 bg-black border-t border-border flex items-center justify-center gap-2">
                 <div className="w-1 h-1 bg-primary animate-pulse" />
-                <p className="text-xs text-[#888888] font-normal font-mono">TFM aInventory • Box Management Mode</p>
+                <p className="text-[10px] text-muted font-normal font-mono">TFM aInventory • Command Center • Box Protocols</p>
              </div>
           </div>
         </div>
       )}
 
-      {/* Label Print Preview Modal */}
       {selectedBoxLabel && (
         <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 className="w-full max-w-md flex flex-col gap-4">
 
-              <div id="print-label-area" className="w-full bg-white p-4 md:p-6 shadow-none flex flex-col items-center gap-3 md:gap-4 rounded-none">
+              <div id="print-label-area" className="w-full bg-white p-6 shadow-none flex flex-col items-center gap-4 border-none">
                  <h2 className="text-2xl font-normal text-black tracking-tighter text-center">
                    {selectedBoxLabel}
                  </h2>
                  
                  <div className="w-full aspect-[2/1] bg-white flex flex-col items-center justify-center overflow-hidden" dangerouslySetInnerHTML={{ __html: generateBarcode128(selectedBoxLabel) }} />
-                                  <div className="flex flex-col items-center gap-1">
-                     <p className="text-xs font-normal tracking-[0.2em] text-black/50">TFM INVENTORY BOX LABEL</p>
+                  <div className="flex flex-col items-center gap-1">
+                     <p className="text-[10px] font-normal tracking-[0.2em] text-black/50">TFM INVENTORY BOX LABEL</p>
                      <img src={getQRCodeURL(selectedBoxLabel)} className="w-24 h-24" alt="QR Code" />
                   </div>
               </div>
 
-              <div className="flex flex-col gap-2 md:gap-3 no-print">
+              <div className="flex flex-col gap-3 no-print">
                  <button 
                    onClick={() => window.print()}
-                   className="btn-primary w-full py-5 text-lg rounded-none"
+                   className="btn-primary w-full py-5 text-lg"
                  >
-                   <Printer size={20} /> Print To Dymo/Brother
-                 </button>
-                 
-                 <button 
-                    onClick={() => {
-                        const svg = document.querySelector("#print-label-area svg");
-                        if (svg) {
-                            const svgData = new XMLSerializer().serializeToString(svg);
-                            const canvas = document.createElement("canvas");
-                            const ctx = canvas.getContext("2d");
-                            const img = new Image();
-                            img.onload = () => {
-                                canvas.width = img.width * 4;
-                                canvas.height = img.height * 4;
-                                if (ctx) {
-                                    ctx.fillStyle = "white";
-                                    ctx.fillRect(0, 0, canvas.width, canvas.height);
-                                    ctx.drawImage(img, 0, 0, canvas.width, canvas.height);
-                                    const link = document.createElement("a");
-                                    link.download = `Label-${selectedBoxLabel}.png`;
-                                    link.href = canvas.toDataURL("image/png");
-                                    link.click();
-                                }
-                            };
-                            img.src = "data:image/svg+xml;base64," + btoa(svgData);
-                        }
-                    }}
-                    className="btn-secondary w-full py-4 text-sm rounded-none"
-                 >
-                    <Download size={16} /> Save For Mobile App
+                   <Printer size={20} /> Deploy Print Job
                  </button>
                  
                  <button 
                    onClick={() => setSelectedBoxLabel(null)}
-                   className="w-full py-4 text-[#888888] font-normal text-xs rounded-none"
+                   className="text-secondary hover:text-white transition-colors py-2 text-center text-xs"
                  >
-                   Close Label Preview
+                   Abort Label Preview
                  </button>
               </div>
 
-              {/* Print CSS Injection */}
               <style dangerouslySetInnerHTML={{ __html: `
                 @media print {
                   body * { display: none !important; }
@@ -799,27 +618,20 @@ export default function InventoryPage() {
                     margin: 0 !important;
                     padding: 40px !important;
                     border: none !important;
-                    box-shadow: none !important;
                   }
                   .no-print { display: none !important; }
                 }
-                @page {
-                  size: auto;
-                  margin: 0;
-                }
               `}} />
            </div>
         </div>
       )}
 
-      {/* Search Modal */}
       <SearchModal
         isOpen={showSearchModal}
         onClose={() => setShowSearchModal(false)}
         onSelectItem={handleSearchItemSelect}
       />
 
-      {/* Quantity Adjustment Modal */}
       <QuantityAdjustmentModal
         item={selectedSearchItem}
         isOpen={showQuantityModal}
diff --git a/frontend/app/items/create.tsx b/frontend/app/items/create.tsx
index f088b6b9..4bc602fc 100644
--- a/frontend/app/items/create.tsx
+++ b/frontend/app/items/create.tsx
@@ -119,8 +119,8 @@ export default function CreateItemPage() {
             isActive
               ? 'bg-primary text-white'
               : isCompleted
-                ? 'bg-slate-400 text-white'
-                : 'bg-[#222222]'
+                ? 'bg-secondary text-white'
+                : 'bg-border'
           }`}
         >
           {stepNum}
@@ -320,7 +320,7 @@ export default function CreateItemPage() {
               <button
                 onClick={nextStep}
                 disabled={!uploadedPhoto}
-                className="flex-1 px-4 py-2 bg-primary text-white rounded-none hover:bg-primary/90 disabled:bg-[#222222] disabled:text-secondary transition-colors font-normal flex items-center justify-center gap-2"
+                className="flex-1 px-4 py-2 bg-primary text-white rounded-none hover:bg-primary/90 disabled:bg-border disabled:text-secondary transition-colors font-normal flex items-center justify-center gap-2"
               >
                 <ChevronRight size={16} />
                 Next: Crop & Preview
diff --git a/frontend/app/login/page.tsx b/frontend/app/login/page.tsx
index e94f4ae8..82493579 100644
--- a/frontend/app/login/page.tsx
+++ b/frontend/app/login/page.tsx
@@ -1,262 +1,170 @@
 'use client';
 
-import { useState, useEffect, useRef } from 'react';
-import { User, Shield, X, Lock, ChevronRight } from 'lucide-react';
+import { useState, useEffect } from 'react';
 import { inventoryApi } from '@/lib/api';
-import { saveToken } from '@/lib/auth';
+import { User, LogIn, Shield, X, Loader2 } from 'lucide-react';
 import { toast, Toaster } from 'react-hot-toast';
 import { useRouter } from 'next/navigation';
 
 export default function LoginPage() {
   const [mounted, setMounted] = useState(false);
   const [users, setUsers] = useState<any[]>([]);
-  const [selectedUserForLogin, setSelectedUserForLogin] = useState<any | null>(null);
   const [isEnterprise, setIsEnterprise] = useState(false);
+  const [isLoading, setIsLoading] = useState(true);
+  const [selectedUserForLogin, setSelectedUserForLogin] = useState<any | null>(null);
+  const [password, setPassword] = useState('');
   const router = useRouter();
-  
-  const enterpriseUserRef = useRef<HTMLInputElement>(null);
-  const enterprisePassRef = useRef<HTMLInputElement>(null);
-  const localPassRef = useRef<HTMLInputElement>(null);
 
   useEffect(() => {
     setMounted(true);
-    inventoryApi.getUsers()
-      .then(setUsers)
-      .catch((err) => {
-        console.error("Failed to load users:", err);
-      });
+    checkMode();
+  }, []);
 
-    // If already logged in, go home
-    if (localStorage.getItem('inventory_token')) {
-      router.push('/');
-    }
-  }, [router]);
-
-  const handleLogin = async () => {
-    let username = "";
-    let password = "";
-
-    if (isEnterprise) {
-      username = enterpriseUserRef.current?.value || "";
-      password = enterprisePassRef.current?.value || "";
-    } else if (selectedUserForLogin) {
-      username = selectedUserForLogin.username;
-      password = localPassRef.current?.value || "";
+  const checkMode = async () => {
+    try {
+      setIsLoading(true);
+      const config = await inventoryApi.getNetworkConfig();
+      setIsEnterprise(config.mode === 'enterprise');
+      
+      const userList = await inventoryApi.getUsers();
+      setUsers(userList);
+    } catch (error) {
+      console.error("Failed to load users", error);
+    } finally {
+      setIsLoading(false);
     }
+  };
 
+  const handleLogin = async (e?: React.FormEvent) => {
+    if (e) e.preventDefault();
+    
+    const username = isEnterprise ? (document.getElementById('username') as HTMLInputElement)?.value : selectedUserForLogin?.username;
+    
     if (!username) {
-      toast.error("Username is required");
+      toast.error("Please select or enter a username");
       return;
     }
 
     try {
-      // [C-01] Login returns JWT token
-      const tokenResponse = await inventoryApi.login({
-        username,
-        password
-      });
-
-      // Save JWT token and user info
-      saveToken(tokenResponse);
-      toast.success(`Welcome back, ${tokenResponse.username}`);
-
-      // Delay slightly to show toast then redirect
-      setTimeout(() => {
-        router.push('/');
-      }, 500);
-
+      const response = await inventoryApi.login(username, password);
+      localStorage.setItem('inventory_token', response.access_token);
+      localStorage.setItem('inventory_user', JSON.stringify(response.user));
+      
+      toast.success(`Access Granted: ${response.user.username}`);
+      router.push('/');
     } catch (error: any) {
-      const detail = error.response?.data?.detail || (isEnterprise ? "Login failed. Check credentials or group membership." : "Invalid password");
+      const detail = error.response?.data?.detail || (isEnterprise ? "Identity Verification Failed" : "Invalid Protocol Password");
       toast.error(detail);
     }
   };
 
-  const handleSelectUser = async (user: any) => {
-    // [C-01] All users require password for JWT
-    setSelectedUserForLogin(user);
-  };
-
   if (!mounted) return null;
 
   return (
-    <div data-testid="identity-check-overlay" className="bg-[#131313] flex items-center justify-center p-4 md:min-h-screen font-sans">
+    <div className="bg-background flex items-center justify-center min-h-screen p-4">
       <Toaster position="top-center" />
 
-      <div className="bg-[#0A0A0A] border border-[#222222] rounded-none p-4 md:p-6 max-w-sm w-full shadow-none 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-[#F58618]/10 text-[#F58618] rounded-none flex items-center justify-center mx-auto mb-4 border border-[#F58618]/20">
-            <User size={32} />
+      <div className="level-2 p-6 md:p-8 max-w-sm w-full space-y-6 animate-in fade-in zoom-in duration-500">
+        <div className="text-center space-y-4">
+          <div className="w-20 h-20 bg-primary/10 text-primary flex items-center justify-center mx-auto mb-6 border border-primary/20">
+            <User size={40} />
           </div>
-          <h2 className="text-2xl font-normal text-white tracking-tight">Identity Check</h2>
-          <p className="text-[#888888] text-sm font-normal">Select operator profile or use direct login</p>
+          <h1 className="text-3xl font-normal text-white tracking-tight">Identity Check</h1>
+          <p className="text-secondary text-sm font-normal">Secure Access Protocol Required</p>
         </div>
-        
-        <div data-testid="user-list" className="grid gap-2 md:gap-3">
-          {!selectedUserForLogin && !isEnterprise ? (
-            <>
-              {users.length > 0 ? (
-                <>
-                  {users.map(user => (
+
+        {isLoading ? (
+          <div className="flex justify-center py-10">
+            <Loader2 className="animate-spin text-primary" size={32} />
+          </div>
+        ) : (
+          <div className="grid gap-3">
+            {!selectedUserForLogin && !isEnterprise ? (
+              <>
+                {users.length > 0 ? (
+                  users.map((user) => (
                     <button
                       key={user.id}
-                      data-testid="user-list-item"
-                      onClick={() => handleSelectUser(user)}
-                      className="bg-transparent hover:bg-[#1A1A1A] border border-[#222222] hover:border-[#F58618] p-4 lg:p-5 xl:p-6 rounded-none text-left transition-all group flex items-center justify-between"
+                      onClick={() => setSelectedUserForLogin(user)}
+                      className="w-full flex items-center gap-4 p-4 bg-surface-container border border-border hover:border-primary/50 transition-all text-left group"
                     >
-                      <div className="flex items-center gap-3">
-                        <div className="w-8 h-8 rounded-none bg-[#000000] border border-[#222222] flex items-center justify-center text-[#888888] group-hover:text-[#F58618] 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-[#888888] font-normal mt-1">{user.role}</p>
-                        </div>
+                      <div className="w-10 h-10 bg-black flex items-center justify-center text-secondary group-hover:text-primary transition-colors border border-border">
+                        {user.role === 'admin' ? <Shield size={18} /> : <User size={18} />}
+                      </div>
+                      <div className="flex-1 min-w-0">
+                        <p className="text-base font-normal text-white truncate">{user.username}</p>
+                        <p className="text-[10px] text-secondary font-normal uppercase tracking-widest">{user.role}</p>
                       </div>
-                      <ChevronRight size={16} className="text-[#888888] group-hover:text-[#F58618] transition-colors" />
                     </button>
-                  ))}
-                </>
-              ) : (
-                <div className="text-center p-4 text-[#888888] text-xs font-normal animate-pulse">
-                   Connectivity issues? Use manual login below.
-                </div>
-              )}
-              
-              <div className="pt-2 grid grid-cols-2 gap-3">
-                <button
-                  data-testid="ldap-login-tab"
-                  onClick={() => setIsEnterprise(true)}
-                  className="flex items-center justify-center gap-2 py-4 rounded-none border border-dashed border-[#222222] text-[#888888] hover:text-white hover:border-[#888888] transition-all font-normal text-xs"
-                >
-                  <Lock size={12} />
-                  Enterprise
-                </button>
-                <button
-                  data-testid="local-login-tab"
-                  onClick={() => {
-                    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-none border border-[#F58618]/20 bg-[#F58618]/5 text-[#F58618] hover:bg-[#F58618]/10 transition-all font-normal text-xs"
-                >
-                  <User size={12} />
-                  Manual Login
-                </button>
-              </div>
-            </>
-          ) : 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-[#888888]">Enterprise Account</p>
-                 <button 
-                   onClick={() => setIsEnterprise(false)}
-                   className="text-xs font-normal text-[#F58618] hover:underline"
-                 >
-                   Back to profiles
-                 </button>
-               </div>
-               
-               <div className="space-y-2">
-                 <label className="text-xs font-normal text-[#888888] px-1">Username</label>
-                 <div className="relative">
-                   <User className="absolute left-4 top-1/2 -translate-y-1/2 text-[#888888]" size={16} />
-                   <input
-                     ref={enterpriseUserRef}
-                     data-testid="username-input"
-                     type="text"
-                     autoFocus
-                     className="w-full bg-[#000000] border border-[#222222] focus:border-[#F58618] rounded-none py-4 pl-12 pr-4 text-white focus:outline-none transition-all placeholder:text-[#333333] font-mono"
-                     placeholder="e.g. jsmith"
-                   />
-                 </div>
-               </div>
+                  ))
+                ) : (
+                  <p className="text-center text-xs text-rose-500 bg-rose-500/10 p-4 border border-rose-500/20">No local operators detected.</p>
+                )}
+              </>
+            ) : (
+              <form onSubmit={handleLogin} className="space-y-4">
+                {isEnterprise && (
+                  <div className="space-y-1">
+                    <label className="text-[10px] text-secondary font-normal ml-1">Enterprise ID</label>
+                    <input
+                      id="username"
+                      type="text"
+                      placeholder="Operator Name"
+                      className="input-field w-full py-3"
+                      autoFocus
+                    />
+                  </div>
+                )}
+                
+                {!isEnterprise && (
+                  <div className="flex items-center gap-3 p-3 bg-surface-container border border-border mb-4">
+                     <div className="w-8 h-8 bg-black flex items-center justify-center text-primary border border-primary/20">
+                        {selectedUserForLogin.role === 'admin' ? <Shield size={16} /> : <User size={16} />}
+                     </div>
+                     <span className="text-white font-normal flex-1">{selectedUserForLogin.username}</span>
+                     <button type="button" onClick={() => setSelectedUserForLogin(null)} className="text-secondary hover:text-white">
+                        <X size={16} />
+                     </button>
+                  </div>
+                )}
 
-               <div className="space-y-2">
-                 <label className="text-xs font-normal text-[#888888] px-1">Password</label>
-                 <div className="relative">
-                   <Lock className="absolute left-4 top-1/2 -translate-y-1/2 text-[#888888]" size={16} />
-                   <input
-                     ref={enterprisePassRef}
-                     data-testid="password-input"
-                     type="password"
-                     onKeyDown={(e) => e.key === 'Enter' && handleLogin()}
-                     className="w-full bg-[#000000] border border-[#222222] focus:border-[#F58618] rounded-none py-4 pl-12 pr-4 text-white/50 focus:text-white focus:outline-none transition-all placeholder:text-[#333333] font-mono"
-                     placeholder="Enter password"
-                   />
-                 </div>
-               </div>
-               
-               <button
-                 data-testid="login-submit"
-                 onClick={handleLogin}
-                 className="w-full bg-[#F58618] text-black font-normal py-4 rounded-none shadow-none 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-[#1A1A1A] p-4 lg:p-5 xl:p-6 rounded-none border border-[#222222] flex items-center gap-3">
-                <button 
-                  onClick={() => setSelectedUserForLogin(null)}
-                  className="p-1 hover:bg-[#222222] rounded-none transition-colors"
-                >
-                  <X size={16} className="text-[#888888]" />
-                </button>
-                <div>
-                  <p className="text-sm font-normal text-[#888888]">Logging in as</p>
-                  <p className="text-white font-normal">{selectedUserForLogin.username || "Manual Input"}</p>
-                </div>
-              </div>
-              
-              <div className="space-y-2">
-                <label className="text-xs font-normal text-[#888888] px-1">Username</label>
-                <div className="relative">
-                  <User className="absolute left-4 top-1/2 -translate-y-1/2 text-[#888888]" size={16} />
+                <div className="space-y-1">
+                  <label className="text-[10px] text-secondary font-normal ml-1">Security Key</label>
                   <input
-                    type="text"
-                    autoFocus
-                    value={selectedUserForLogin.username || ""}
-                    onChange={(e) => setSelectedUserForLogin({...selectedUserForLogin, username: e.target.value})}
-                    className="w-full bg-[#000000] border border-[#222222] focus:border-[#F58618] rounded-none py-4 pl-12 pr-4 text-white focus:outline-none transition-all placeholder:text-[#333333] font-mono"
-                    placeholder="Admin"
-                  />
-                </div>
-              </div>
-              
-              <div className="space-y-2">
-                <label className="text-xs font-normal text-[#888888] px-1">Password</label>
-                <div className="relative">
-                  <Lock className="absolute left-4 top-1/2 -translate-y-1/2 text-[#888888]" 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-[#000000] border border-[#222222] focus:border-[#F58618] rounded-none py-4 pl-12 pr-4 text-white/50 focus:text-white focus:outline-none transition-all placeholder:text-[#333333] font-mono"
-                    placeholder="Enter password"
+                    value={password}
+                    onChange={(e) => setPassword(e.target.value)}
+                    placeholder="••••••••"
+                    className="input-field w-full py-3 tracking-widest"
+                    autoFocus={!isEnterprise}
                   />
                 </div>
-              </div>
-              
-              <button
-                data-testid="local-login-submit"
-                onClick={handleLogin}
-                className="w-full bg-[#F58618] text-black font-normal py-4 rounded-none shadow-none active:scale-95 transition-all"
-              >
-                Verify Identity
-              </button>
-            </div>
-          )}
-        </div>
-        
-        {/* Progress bar hint */}
-        {users.length === 0 && !selectedUserForLogin && !isEnterprise && (
-          <div className="w-full bg-[#1A1A1A] h-1 rounded-none overflow-hidden">
-            <div className="bg-[#F58618] h-full animate-progress-fast"></div>
+
+                <button
+                  type="submit"
+                  className="btn-primary w-full py-4 text-lg mt-2"
+                >
+                  Authorize Access
+                </button>
+                
+                {!isEnterprise && (
+                  <button
+                    type="button"
+                    onClick={() => setSelectedUserForLogin(null)}
+                    className="w-full text-center text-xs text-secondary hover:text-white transition-colors py-2"
+                  >
+                    Switch Identity
+                  </button>
+                )}
+              </form>
+            )}
           </div>
         )}
+
+        <div className="pt-6 border-t border-border flex flex-col items-center gap-2 opacity-40">
+           <img src="/logo.png" alt="TFM" className="h-6 grayscale" />
+           <p className="text-[10px] font-mono text-secondary">TFM Group Industrial Automation</p>
+        </div>
       </div>
     </div>
   );
diff --git a/frontend/app/page.tsx b/frontend/app/page.tsx
index 44088bb7..d2655e64 100644
--- a/frontend/app/page.tsx
+++ b/frontend/app/page.tsx
@@ -3,7 +3,7 @@
 import { useState, useEffect, useCallback } from 'react';
 import { db, Item } from '@/lib/db';
 import { inventoryApi } from '@/lib/api';
-import { fetchAndCacheItems, syncOfflineOperations } from '@/lib/sync';
+import { fetchAndCacheItems } from '@/lib/sync';
 import { useScanner } from '@/hooks/useScanner';
 import { useStockAdjustment } from '@/hooks/useStockAdjustment';
 import { useSync } from '@/hooks/useSync';
@@ -12,50 +12,26 @@ import AIOnboarding from '@/components/AIOnboarding';
 import PageShell from '@/components/PageShell';
 import ItemComparisonModal from '@/components/ItemComparisonModal';
 import StockAdjustmentPanel from '@/components/StockAdjustmentPanel';
-import NewItemDialog from '@/components/NewItemDialog';
 import ScannerSection from '@/components/ScannerSection';
 import SearchModal from '@/components/inventory/SearchModal';
 import { toast } from 'react-hot-toast';
 import {
   Package,
-  Camera,
-  Plus,
-  Minus,
-  Trash2,
-  AlertTriangle,
   X,
   ChevronRight,
-  Edit2,
   RefreshCw,
   Search
 } from 'lucide-react';
-import { generateBarcode128, getQRCodeURL } from '@/lib/labels';
-import { clsx, type ClassValue } from 'clsx';
-import { twMerge } from 'tailwind-merge';
-import axios from 'axios';
+import { cn } from '@/lib/utils';
 import versionData from '../VERSION.json';
 
-interface User {
-  id: number;
-  username: string;
-  role: string;
-}
-
-function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
-}
-
 export default function Home() {
   const [mounted, setMounted] = useState(false);
   const [isOnline, setIsOnline] = useState(true);
   const [inventory, setInventory] = useState<Item[]>([]);
   const [showOnboarding, setShowOnboarding] = useState(false);
-  const [selectedBoxLabel, setSelectedBoxLabel] = useState<string | null>(null);
   const [selectedItem, setSelectedItem] = useState<Item | null>(null);
   const [boxMatches, setBoxMatches] = useState<Item[]>([]);
-  const [isEditing, setIsEditing] = useState(false);
-  const [editedItem, setEditedItem] = useState<Partial<Item>>({});
-  const [trashReason, setTrashReason] = useState('Damaged');
   const [currentUser, setCurrentUser] = useState<any | null>(null);
   const [categories, setCategories] = useState<any[]>([]);
   const [comparisonModal, setComparisonModal] = useState<{ show: boolean, newItem: any, existingItem: any, existingId: number | null }>({ show: false, newItem: null, existingItem: null, existingId: null });
@@ -73,7 +49,6 @@ export default function Home() {
     setMode,
     showScanner,
     setShowScanner,
-    lastScanned,
     isScannerReady,
     fieldScanning,
     setFieldScanning,
@@ -92,7 +67,7 @@ export default function Home() {
     },
     onFieldCapture: (field, value) => {
       if (field === 'box_label') {
-        setEditedItem(prev => ({ ...prev, box_label: value }));
+        // Handle via editedItem logic in panels if needed
       }
     }
   });
@@ -127,23 +102,19 @@ export default function Home() {
       setCurrentUser(JSON.parse(savedUser));
     }
 
-    // Initial data fetch
     inventoryApi.getCategories().then(c => setCategories(c)).catch(() => { });
     loadInventory();
 
-    const handleOnline = () => {
-      setIsOnline(true);
-    };
+    const handleOnline = () => setIsOnline(true);
     const handleOffline = () => setIsOnline(false);
 
     window.addEventListener('online', handleOnline);
     window.addEventListener('offline', handleOffline);
 
-    // Active polling for network status AND periodic background refresh (30s)
     const interval = setInterval(() => {
       setIsOnline(navigator.onLine);
       if (navigator.onLine) {
-        loadInventory(); // Keep other devices in sync
+        loadInventory();
       }
     }, 30000);
 
@@ -182,31 +153,27 @@ export default function Home() {
         itemData.part_number = itemData.part_number.toLowerCase();
       }
 
-      // Prepare data for backend: convert Blob to base64 and rename fields
       const backendData = { ...itemData };
-      delete backendData.extractedImageBlob; // Remove Blob from local DB version
+      delete backendData.extractedImageBlob;
 
-      // If extracted image blob is present, convert to base64 for backend
       if (itemData.extractedImageBlob) {
         const reader = new FileReader();
         reader.readAsDataURL(itemData.extractedImageBlob);
 
         await new Promise((resolve, reject) => {
           reader.onload = () => {
-            const base64 = (reader.result as string).split(',')[1]; // Remove data URL prefix
+            const base64 = (reader.result as string).split(',')[1];
             backendData.extracted_image_bytes = base64;
-            backendData.image_processing = itemData.imageProcessing; // Use correct field name for API
-            delete backendData.imageProcessing; // Remove old field name
+            backendData.image_processing = itemData.imageProcessing;
+            delete backendData.imageProcessing;
             resolve(null);
           };
           reader.onerror = reject;
         });
       }
 
-      // 1. Add to local DB cache (without Blob)
       await db.items.add(itemData);
 
-      // 2. If online, try to push to backend immediately
       if (isOnline && currentUser) {
         try {
           await inventoryApi.createItem(currentUser.id, backendData);
@@ -218,7 +185,6 @@ export default function Home() {
           const responseData = err.response?.data;
 
           if (status === 409 && responseData?.detail) {
-            // Show comparison modal for duplicate part number
             const detail = responseData.detail;
             setComparisonModal({
               show: true,
@@ -226,7 +192,7 @@ export default function Home() {
               existingItem: detail.existing_item,
               existingId: detail.existing_id
             });
-            return; // Don't close onboarding, user will decide
+            return;
           } else {
             console.error("Cloud sync failed:", err.message);
             toast.error("Item saved locally. Cloud sync failed.");
@@ -234,12 +200,10 @@ export default function Home() {
             await loadInventory();
           }
         }
-      } else if (!isOnline) {
-        toast.success("Item saved locally. Will sync when online.");
+      } else {
+        toast.success("Saved locally (Offline mode)");
         setShowOnboarding(false);
         await loadInventory();
-      } else {
-        toast("Please log in to save to cloud.", { icon: '⚠️' });
       }
     } catch (error) {
       console.error(error);
@@ -251,7 +215,6 @@ export default function Home() {
     if (!comparisonModal.existingId) return;
     setComparisonLoading(true);
     try {
-      // Prepare data: convert Blob to base64 if present
       const updateData = { ...comparisonModal.newItem };
 
       if (updateData.extractedImageBlob) {
@@ -271,7 +234,6 @@ export default function Home() {
         });
       }
 
-      // Update existing item
       await inventoryApi.updateItem(comparisonModal.existingId, updateData);
       toast.success("Item updated successfully!");
       setComparisonModal({ show: false, newItem: null, existingItem: null, existingId: null });
@@ -286,91 +248,19 @@ export default function Home() {
   };
 
   const handleComparisonSkip = () => {
-    // Item was already added to local DB, just close modal and onboarding
     setComparisonModal({ show: false, newItem: null, existingItem: null, existingId: null });
     setShowOnboarding(false);
-    toast("Local copy saved. Not synced to cloud.", { icon: '💾' });
+    toast("Local copy saved.", { icon: '💾' });
     loadInventory();
   };
 
-  const handleUpdateItem = async () => {
-    if (!selectedItem) return;
-    try {
-      const updated = { ...selectedItem, ...editedItem };
-      // Normalize PN
-      if (updated.part_number) updated.part_number = updated.part_number.toLowerCase();
-
-      await db.items.update(selectedItem.id!, updated);
-
-      if (isOnline) {
-        await inventoryApi.updateItem(selectedItem.id!, updated);
-      }
-
-      toast.success("Item updated successfully");
-      setIsEditing(false);
-      setSelectedItem(updated as Item);
-      await loadInventory();
-    } catch (err: any) {
-      console.error(err);
-      toast.error("Failed to update item");
-    }
-  };
-
-  const handleDeleteItem = async () => {
-    if (!selectedItem || !selectedItem.id) return;
-    if (!window.confirm(`Are you sure you want to delete "${selectedItem.name}" completely from the catalog?`)) return;
-
-    try {
-      await db.items.delete(selectedItem.id);
-      if (isOnline) {
-        await inventoryApi.deleteItem(selectedItem.id);
-      }
-      toast.success("Item deleted from catalog");
-      setSelectedItem(null);
-      await loadInventory();
-    } catch (err: any) {
-      console.error(err);
-      toast.error("Failed to delete item");
-    }
-  };
-
-
-  const [searchQuery, setSearchQuery] = useState('');
-
-  const filteredInventory = inventory.filter(item => {
-    const query = searchQuery.toLowerCase();
-    return (
-      item.name.toLowerCase().includes(query) ||
-      item.category.toLowerCase().includes(query) ||
-      (item.description?.toLowerCase().includes(query) ?? false) ||
-      (item.connector?.toLowerCase().includes(query) ?? false) ||
-      (item.size?.toLowerCase().includes(query) ?? false) ||
-      (item.part_number?.toLowerCase().includes(query) ?? false) ||
-      (item.color?.toLowerCase().includes(query) ?? false) ||
-      (item.box_label?.toLowerCase().includes(query) ?? false) ||
-      (item.ocr_text?.toLowerCase().includes(query) ?? false)
-    );
-  });
-
-  // Extract unique item types and box labels for suggestions
-  const existingTypes = Array.from(new Set(inventory.map(i => i.type).filter(Boolean))).sort() as string[];
-  const existingBoxes = Array.from(new Set(inventory.map(i => i.box_label).filter(Boolean))).sort() as string[];
-
   if (!mounted) return null;
 
   return (
     <PageShell>
-      <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} />)}
-      </datalist>
-      <datalist id="existing-boxes">
-        {existingBoxes.map(b => <option key={b} value={b} />)}
-      </datalist>
-
+      <div className="p-4 md:p-8 max-w-7xl mx-auto space-y-6">
         {/* Header */}
-        <header className="flex flex-col sm:flex-row justify-between sm:items-center gap-3 md:gap-4 mb-6 md:mb-8 w-full">
+        <header className="flex flex-col sm:flex-row justify-between sm:items-center gap-4 mb-8">
           <div className="flex items-center gap-4">
             <div className="p-4 bg-primary/10 border border-primary/20">
               <img
@@ -381,23 +271,21 @@ export default function Home() {
             </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>
+              <p className="text-xs md:text-sm text-secondary font-normal tracking-tight mt-1">Industrial Asset Management</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 border border-border/50 sm:border-none">
-            <div className="flex flex-wrap items-center gap-2 md:gap-3">
+          <div className="flex flex-wrap items-center justify-between sm:justify-end gap-3">
+            <div className="flex flex-wrap items-center gap-4">
               {isScannerReady && (
                 <div className="flex items-center gap-2">
                   <div className="w-1.5 h-1.5 bg-green-500" />
-                  <span className="text-xs font-normal text-green-500/90 whitespace-nowrap">
-                    Scanner: OK
-                  </span>
+                  <span className="text-xs font-normal text-green-500/90 whitespace-nowrap">Scanner: Ready</span>
                 </div>
               )}
-              <div className="flex items-center gap-2" data-testid={!isOnline ? "offline-indicator" : undefined}>
+              <div className="flex items-center gap-2">
                 <div className={`w-1.5 h-1.5 ${isOnline ? 'bg-green-500 animate-pulse' : 'bg-rose-500'}`} />
-                <span className={`text-xs font-normal whitespace-nowrap ${isOnline ? 'text-green-500/90' : 'text-rose-500/90'}`} data-testid={!isOnline ? "offline-sync-indicator" : undefined}>
+                <span className={`text-xs font-normal whitespace-nowrap ${isOnline ? 'text-green-500/90' : 'text-rose-500/90'}`}>
                   Sync: {isOnline ? 'Active' : 'Offline'}
                 </span>
               </div>
@@ -405,18 +293,17 @@ export default function Home() {
             <div className="flex items-center gap-2">
               <button
                 onClick={() => setShowSearch(true)}
-                className="p-2.5 bg-surface border border-border text-secondary hover:text-white transition-all active:scale-95"
+                className="p-3 bg-surface-container border border-border text-secondary hover:text-white transition-all active:scale-95"
                 title="Search (Ctrl+K)"
               >
-                <Search size={18} />
+                <Search size={20} />
               </button>
               <button
                 onClick={handleSync}
                 disabled={syncing}
-                data-testid="manual-sync-button"
-                className="p-2.5 bg-surface border border-border text-secondary hover:text-white transition-all active:scale-95 disabled:opacity-50"
+                className="p-3 bg-surface-container border border-border text-secondary hover:text-white transition-all active:scale-95 disabled:opacity-50"
               >
-                <RefreshCw size={18} className={syncing ? "animate-spin text-primary" : ""} />
+                <RefreshCw size={20} className={syncing ? "animate-spin text-primary" : ""} />
               </button>
             </div>
           </div>
@@ -432,7 +319,7 @@ export default function Home() {
           onAddItemClick={() => setShowOnboarding(true)}
         />
 
-        {/* Onboarding Overlay */}
+        {/* Overlays & Modals */}
         {showOnboarding && (
           <AIOnboarding
             categories={categories}
@@ -442,7 +329,6 @@ export default function Home() {
           />
         )}
 
-        {/* Item Comparison Modal (for duplicate Part Numbers) */}
         <ItemComparisonModal
           show={comparisonModal.show}
           existingItem={comparisonModal.existingItem}
@@ -452,7 +338,6 @@ export default function Home() {
           loading={comparisonLoading}
         />
 
-        {/* Search Modal */}
         <SearchModal
           isOpen={showSearch}
           onClose={() => setShowSearch(false)}
@@ -462,71 +347,46 @@ export default function Home() {
           }}
         />
 
-        {/* Stock Adjustment Panel */}
         <StockAdjustmentPanel
           selectedItem={selectedItem}
-          isEditing={isEditing}
-          editedItem={editedItem}
           adjustQty={adjustQty}
           adjustType={adjustType}
-          trashReason={trashReason}
-          categories={categories}
-          fieldScanning={fieldScanning}
-          onCancel={() => {
-            setSelectedItem(null);
-            setIsEditing(false);
-          }}
-          onEdit={(item) => {
-            setEditedItem(item);
-            setIsEditing(true);
-          }}
-          onEditChange={setEditedItem}
+          onCancel={() => setSelectedItem(null)}
           onQuantityChange={setAdjustQty}
           onTypeChange={setAdjustType}
-          onReasonChange={setTrashReason}
-          onShowScanner={(active, field) => {
-            setFieldScanning({ active, field });
-            setShowScanner(true);
-          }}
           onAdjustStock={handleAdjustStock}
-          onUpdateItem={handleUpdateItem}
-          onDeleteItem={handleDeleteItem}
         />
 
-
-
-        {/* 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-border 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 className="fixed inset-0 z-50 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 level-2 p-6 flex flex-col max-h-[85vh] animate-in slide-in-from-bottom-10 duration-300">
+            <div className="flex justify-between items-center mb-4 shrink-0 border-b border-border pb-3">
               <div>
-                <h3 className="text-xl font-normal tracking-tight flex items-center gap-2">
+                <h3 className="text-xl font-normal tracking-tight flex items-center gap-2 text-white">
                   <Package className="text-primary" />
                   Box Contents
                 </h3>
-                <p className="text-xs text-secondary font-normal mt-1">Select the item you want to {mode.replace('_', ' ').toLowerCase()}</p>
+                <p className="text-xs text-secondary font-normal mt-1">Select item for {mode.toLowerCase().replace('_', ' ')}</p>
               </div>
-              <button onClick={() => setBoxMatches([])} className="p-2 lg:p-3 xl:p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 hover:bg-surface-bright">
-                <X size={20} />
+              <button onClick={() => setBoxMatches([])} className="p-3 bg-surface-bright border border-border text-secondary hover:text-white">
+                <X size={24} />
               </button>
             </div>
-                      <div className="overflow-y-auto w-full pr-2 space-y-2 md:space-y-3 pb-3 md:pb-4">
+            <div className="overflow-y-auto pr-2 space-y-2 custom-scrollbar">
               {boxMatches.map(item => (
                 <button
                   key={item.id}
                   onClick={() => {
                     setSelectedItem(item);
                     setBoxMatches([]);
-                    setAdjustType(mode === 'CHECK_IN' ? 'ADD' : 'REMOVE');
                   }}
-                  className="w-full text-left bg-background/50 hover:bg-surface-bright border border-border/80 p-3 md:p-4 flex items-center gap-2 md:gap-3 transition-all active:scale-[0.98] group"
+                  className="w-full text-left bg-black border border-border p-4 flex items-center justify-between group hover:border-primary/50 transition-all"
                 >
-                  <div className="flex-1 min-w-0">
-                    <p className="text-sm font-normal text-white">{item.name}</p>
-                    <p className="text-xs text-secondary font-normal mt-1">Part #: {item.part_number || 'N/A'}</p>
+                  <div className="min-w-0 pr-4">
+                    <p className="text-sm font-normal text-white truncate">{item.name}</p>
+                    <p className="text-xs text-secondary font-normal mt-1 truncate">P/N: {item.part_number || 'UNKNOWN'}</p>
                   </div>
-                  <ChevronRight size={18} className="text-secondary group-hover:text-primary" />
+                  <ChevronRight size={20} className="text-secondary group-hover:text-primary transition-colors" />
                 </button>
               ))}
             </div>
@@ -534,12 +394,9 @@ export default function Home() {
         </div>
       )}
 
-
-      {/* 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-[#222222]/60" />
-          <p className="text-xs lg:text-sm xl:text-base lg:text-lg xl:text-xl lg:text-2xl xl:text-3xl lg:text-4xl xl:text-5xl font-mono text-secondary">v{versionData.version} • {versionData.last_build} • BUILD: dev-{(versionData as any).commit || 'N/A'}</p>
+        <footer className="mt-20 mb-8 flex flex-col items-center gap-4 opacity-50 border-t border-border/30 pt-8">
+          <p className="text-xs font-normal text-secondary tracking-widest uppercase">Powered by TFM Group Software</p>
+          <p className="text-[10px] font-mono text-muted">v{versionData.version} • {versionData.last_build} • BUILD: {versionData.commit}</p>
         </footer>
       </div>
     </PageShell>
diff --git a/frontend/components/AIOnboarding.tsx b/frontend/components/AIOnboarding.tsx
index e56aaab2..f44272e7 100644
--- a/frontend/components/AIOnboarding.tsx
+++ b/frontend/components/AIOnboarding.tsx
@@ -72,7 +72,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
         <button
           onClick={() => { stopLiveCamera(); onCancel(); }}
           aria-label="Close AI Discovery"
-          className="p-2 lg:p-3 xl:p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 hover:bg-surface rounded-none cursor-pointer transition-colors focus:ring-2 focus:ring-blue-500 focus:outline-none"
+          className="p-2 lg:p-3 xl:p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 hover:bg-surface rounded-none cursor-pointer transition-colors focus:ring-2 focus:ring-primary focus:outline-none"
         >
           <X size={24} />
         </button>
@@ -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-border rounded-none 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-border rounded-none 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 lg:text-base xl:text-lg lg:text-xl xl:text-2xl lg:text-3xl xl:text-4xl">Upload Photo</span>
@@ -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-border text-secondary rounded-none 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-border text-secondary rounded-none font-normal cursor-pointer transition-all active:scale-95 focus:ring-2 focus:ring-primary focus:outline-none"
             >
               Cancel
             </button>
@@ -178,7 +178,7 @@ 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-none font-normal text-lg shadow-none shadow-none 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-slate-950 rounded-none font-normal text-lg shadow-none shadow-none cursor-pointer flex items-center justify-center gap-3 active:scale-95 hover:bg-surface-200 transition-all focus:ring-2 focus:ring-offset-2 focus:ring-offset-slate-950 focus:ring-white focus:outline-none"
             >
               <div className="w-5 h-5 rounded-none border-2 border-slate-950 flex items-center justify-center">
                  <div className="w-2.5 h-2.5 rounded-none bg-background" />
@@ -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-border text-secondary rounded-none 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-border text-secondary rounded-none 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>
@@ -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-none font-normal text-lg shadow-none shadow-none 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-slate-950 rounded-none font-normal text-lg shadow-none shadow-none cursor-pointer active:scale-95 transition-all hover:bg-surface-200 focus:ring-2 focus:ring-offset-2 focus:ring-offset-slate-950 focus:ring-white focus:outline-none"
             >
               Add {extractedItems.length} items to catalog
             </button>
diff --git a/frontend/components/AdminOverlay.tsx b/frontend/components/AdminOverlay.tsx
index 5842805f..2c8a638a 100644
--- a/frontend/components/AdminOverlay.tsx
+++ b/frontend/components/AdminOverlay.tsx
@@ -125,7 +125,7 @@ export default function AdminOverlay({
           <button
             data-testid="close-admin-overlay"
             onClick={onClose}
-            className="p-2 hover:bg-black border border-transparent hover:border-border transition-colors text-[#888888] focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
+            className="p-2 hover:bg-black border border-transparent hover:border-border transition-colors text-secondary focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
             aria-label="Close"
           >
             <X size={20} />
@@ -136,8 +136,8 @@ export default function AdminOverlay({
           <section className="space-y-2 md:space-y-3">
             <div className="flex items-center justify-between">
               <div>
-                <h3 className="text-sm font-normal text-[#888888]">User Management</h3>
-                <p className="text-xs text-[#888888] mt-0.5">Create accounts and control access</p>
+                <h3 className="text-sm font-normal text-secondary">User Management</h3>
+                <p className="text-xs text-secondary mt-0.5">Create accounts and control access</p>
               </div>
               <button
                 onClick={() => setShowCreateUserModal(true)}
@@ -151,12 +151,12 @@ export default function AdminOverlay({
               {users.map(u => (
                 <div key={u.id} className="bg-transparent border border-border p-3 md:p-4 flex items-center justify-between transition-colors hover:border-muted">
                   <div className="flex items-center gap-2 md:gap-3">
-                    <div className={`p-2 ${u.role === 'admin' ? "bg-primary/20 text-primary border border-primary/30" : "bg-black text-[#888888] border border-border"}`}>
+                    <div className={`p-2 ${u.role === 'admin' ? "bg-primary/20 text-primary border border-primary/30" : "bg-black text-secondary border border-border"}`}>
                       <User size={16} />
                     </div>
                     <div>
                       <p className="text-sm font-normal text-white">{u.username}</p>
-                      <p className="text-xs font-normal text-[#888888]">{u.role}</p>
+                      <p className="text-xs font-normal text-secondary">{u.role}</p>
                     </div>
                   </div>
                   
@@ -185,8 +185,8 @@ export default function AdminOverlay({
           <section className="space-y-2 md:space-y-3">
             <div className="flex items-center justify-between">
               <div>
-                <h3 className="text-sm font-normal text-[#888888]">Category Groups</h3>
-                <p className="text-xs text-[#888888] mt-0.5">Organize items by type or location</p>
+                <h3 className="text-sm font-normal text-secondary">Category Groups</h3>
+                <p className="text-xs text-secondary mt-0.5">Organize items by type or location</p>
               </div>
               <button
                 onClick={() => setShowCreateCategoryModal(true)}
@@ -205,7 +205,7 @@ export default function AdminOverlay({
                     </div>
                     <div>
                       <p className="text-sm font-normal text-white">{cat.name}</p>
-                      <p className="text-xs text-[#888888] font-mono">{cat.description || 'No description'}</p>
+                      <p className="text-xs text-secondary font-mono">{cat.description || 'No description'}</p>
                     </div>
                   </div>
                   
@@ -235,7 +235,7 @@ export default function AdminOverlay({
               <AlertTriangle size={16} />
               <p className="text-sm font-normal">Sign Out</p>
             </div>
-            <p className="text-xs text-[#888888]">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());
diff --git a/frontend/components/BottomNav.tsx b/frontend/components/BottomNav.tsx
index d870903d..85ae6320 100644
--- a/frontend/components/BottomNav.tsx
+++ b/frontend/components/BottomNav.tsx
@@ -26,7 +26,7 @@ export default function BottomNav({
 
   return (
     <footer className="fixed bottom-0 left-0 right-0 py-3 lg:py-4 xl:py-5 px-2 pb-safe level-0 border-t border-border z-40 transition-all duration-300">
-      <div className="max-w-xl mx-auto flex justify-around items-center text-[#888888]">
+      <div className="max-w-xl mx-auto flex justify-around items-center text-secondary">
         
         <button
           onClick={() => router.push('/')}
diff --git a/frontend/components/CameraView.tsx b/frontend/components/CameraView.tsx
index b48bb552..dac3e208 100644
--- a/frontend/components/CameraView.tsx
+++ b/frontend/components/CameraView.tsx
@@ -1,22 +1,34 @@
 'use client';
 
-import { RefreshCw, XCircle, Search } from 'lucide-react';
+import { 
+  X, 
+  RotateCcw, 
+  FlipHorizontal, 
+  Camera, 
+  Zap, 
+  Search,
+  CheckCircle2,
+  ZoomIn,
+  ZoomOut
+} from 'lucide-react';
+import { cn } from '@/lib/utils';
 
 interface CameraViewProps {
   scannerId: string;
   isStarted: boolean;
-  paused?: boolean;
-  error: string | null;
-  hasZoom: boolean;
-  zoom: number;
-  maxZoom: number;
-  onZoomChange: (newZoom: number) => Promise<void>;
-  countdown: number;
+  paused: boolean;
+  onClose: () => void;
+  onRotate: () => void;
+  onFlip: () => void;
+  onFlash: () => void;
+  flashOn: boolean;
+  onZoomChange: (zoom: number) => void;
+  countdown: number | null;
   ocrProcessing: boolean;
   isSelecting: boolean;
   capturedImage: string | null;
-  detectedWords: Array<{ text: string; bbox: { x0: number; y0: number; x1: number; y1: number } }>;
-  onScan?: () => void;
+  detectedWords: Array<{text: string, x: number, y: number, w: number, h: number}>;
+  onScan: () => void;
   onWordSelect: (text: string) => void;
   onCancelSelection: () => void;
 }
@@ -25,10 +37,11 @@ export default function CameraView({
   scannerId,
   isStarted,
   paused,
-  error,
-  hasZoom,
-  zoom,
-  maxZoom,
+  onClose,
+  onRotate,
+  onFlip,
+  onFlash,
+  flashOn,
   onZoomChange,
   countdown,
   ocrProcessing,
@@ -39,18 +52,16 @@ export default function CameraView({
   onWordSelect,
   onCancelSelection,
 }: CameraViewProps) {
-  const cn = (...classes: any[]) => classes.filter(Boolean).join(' ');
-
   return (
-    <div className="w-full max-w-md mx-auto flex flex-col gap-3 md:gap-4 font-sans">
+    <div className="w-full max-w-md mx-auto flex flex-col gap-4">
       {/* Video Viewport Area */}
-      <div className="relative w-full aspect-square overflow-hidden rounded-none shadow-none bg-[#131313] border-2 border-[#222222] p-4 sm:p-6 lg:p-8 xl:p-10">
-        <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-none relative">
-            <div className="absolute top-0 left-0 w-10 h-10 border-t-4 border-l-4 border-primary rounded-none shadow-none" />
-            <div className="absolute top-0 right-0 w-10 h-10 border-t-4 border-r-4 border-primary rounded-none shadow-none" />
-            <div className="absolute bottom-0 left-0 w-10 h-10 border-b-4 border-l-4 border-primary rounded-none shadow-none" />
-            <div className="absolute bottom-0 right-0 w-10 h-10 border-b-4 border-r-4 border-primary rounded-none shadow-none" />
+      <div className="relative w-full aspect-square overflow-hidden level-1 p-6 sm:p-8">
+        <div className="absolute inset-6 z-10 pointer-events-none flex items-center justify-center">
+          <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" />
+            <div className="absolute top-0 right-0 w-10 h-10 border-t-4 border-r-4 border-primary" />
+            <div className="absolute bottom-0 left-0 w-10 h-10 border-b-4 border-l-4 border-primary" />
+            <div className="absolute bottom-0 right-0 w-10 h-10 border-b-4 border-r-4 border-primary" />
 
             {isStarted && !paused && !isSelecting && (
               <div className="absolute top-0 left-0 right-0 h-1 bg-primary animate-scan-fast" />
@@ -58,17 +69,17 @@ export default function CameraView({
           </div>
         </div>
 
-        <div id={scannerId} data-testid="camera-indicator" className="w-full h-full bg-[#0A0A0A] object-cover" />
+        <div id={scannerId} data-testid="camera-indicator" className="w-full h-full bg-black object-cover" />
 
         {/* Selection UI */}
         {isSelecting && capturedImage && (
-          <div className="absolute inset-0 z-50 bg-[#131313] flex flex-col">
+          <div className="absolute inset-0 z-50 bg-black flex flex-col">
             <div className="relative flex-1 bg-black flex items-center justify-center overflow-hidden">
               <img
                 src={capturedImage || undefined}
                 className="max-w-full max-h-full object-contain"
                 id="ocr-canvas-preview"
-                alt="OCR text detection preview with detected words highlighted"
+                alt="OCR text detection"
               />
               <div className="absolute inset-0 flex items-center justify-center">
                 <div className="relative" style={{ width: '100%', height: '100%' }}>
@@ -76,118 +87,114 @@ export default function CameraView({
                     <button
                       key={i}
                       onClick={() => onWordSelect(w.text)}
-                      aria-label={`Select text: ${w.text}`}
-                      className="absolute border border-primary bg-primary/20 rounded-none 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 hover:bg-primary/40 active:bg-primary/50 cursor-pointer transition-colors"
                       style={{
-                        left: `${(w.bbox.x0 / 1600) * 100}%`,
-                        top: `${(w.bbox.y0 / (1600 * (9 / 16))) * 100}%`,
-                        width: `${((w.bbox.x1 - w.bbox.x0) / 1600) * 100}%`,
-                        height: `${((w.bbox.y1 - w.bbox.y0) / (1600 * (9 / 16))) * 100}%`,
+                        left: `${w.x}%`,
+                        top: `${w.y}%`,
+                        width: `${w.w}%`,
+                        height: `${w.h}%`
                       }}
                     />
                   ))}
                 </div>
               </div>
             </div>
-            <div className="p-6 lg:p-8 xl:p-10 bg-[#0A0A0A]/90 border-t border-[#222222] 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-[#888888] font-normal text-center">Tap any text to use it</p>
-              </div>
-              <button
+            
+            <div className="p-4 bg-surface-container border-t border-border flex justify-between items-center">
+              <span className="text-xs text-secondary font-normal">Extract Detected Signatures</span>
+              <button 
                 onClick={onCancelSelection}
-                aria-label="Cancel text selection"
-                className="w-full py-4 bg-[#1A1A1A] hover:bg-[#222222] text-white rounded-none font-normal text-xs cursor-pointer transition-all active:scale-95 border border-[#222222] focus:ring-2 focus:ring-primary focus:outline-none"
+                className="px-4 py-2 bg-surface-bright text-white text-xs border border-border"
               >
-                Close OCR Preview
+                Cancel
               </button>
             </div>
           </div>
         )}
 
-        {!isStarted && !error && (
-          <div className="absolute inset-0 z-20 flex flex-col items-center justify-center bg-[#0A0A0A] text-[#888888] gap-4">
-            <RefreshCw className="w-8 h-8 animate-spin text-primary" />
-            <p className="text-sm font-normal">Initializing camera...</p>
+        {/* Countdown */}
+        {countdown !== null && (
+          <div className="absolute inset-0 z-40 bg-black/40 flex items-center justify-center">
+            <span className="text-8xl font-normal text-white animate-ping">{countdown}</span>
           </div>
         )}
 
-        {error && (
-          <div className="absolute inset-0 z-20 flex flex-col items-center justify-center bg-[#0A0A0A] text-[#888888] px-8 text-center gap-4">
-            <XCircle className="w-10 h-10 text-red-500" />
-            <div>
-              <p className="font-normal text-white">Camera Error</p>
-              <p className="text-xs text-[#888888] 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-[#1A1A1A] rounded-none text-sm font-normal cursor-pointer hover:bg-[#222222] transition-colors focus:ring-2 focus:ring-primary focus:outline-none border border-[#222222]"
-            >
-              Try Again
-            </button>
+        {/* Vision Status */}
+        {ocrProcessing && (
+          <div className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-50 flex flex-col items-center gap-2">
+            <div className="w-12 h-12 border-4 border-primary/20 border-t-primary animate-spin" />
+            <span className="text-xs text-primary bg-black/80 px-3 py-1 border border-primary/20">Analyzing Surface Protocols...</span>
           </div>
         )}
       </div>
 
-      {/* External Controls Area */}
-      <div className="flex flex-col gap-4 bg-[#0A0A0A]/50 p-5 lg:p-6 xl:p-8 rounded-none border border-[#222222] shadow-none">
-        <div className="flex items-center gap-3 w-full">
-          {hasZoom && (
-            <button
-              onClick={async () => {
-                let nextZoom = 1;
-                if (zoom === 1) nextZoom = Math.min(2, maxZoom);
-                else if (zoom < maxZoom / 2) nextZoom = Math.floor(maxZoom / 2);
-                else if (zoom < maxZoom) nextZoom = maxZoom;
-                else nextZoom = 1;
-
-                await onZoomChange(nextZoom);
-              }}
-              data-testid="zoom-control"
-              aria-label={`Zoom ${zoom.toFixed(1)}x`}
-              className="h-14 px-5 bg-[#1A1A1A] hover:bg-[#222222] border border-[#222222] text-white rounded-none flex flex-col items-center justify-center shadow-none 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>
+      {/* Camera Controls */}
+      <div className="grid grid-cols-4 gap-2 no-print">
+        <button
+          onClick={onFlash}
+          className={cn(
+            "p-4 bg-surface-container border border-border flex items-center justify-center transition-all",
+            flashOn ? "text-primary border-primary/50" : "text-secondary hover:text-white"
           )}
+          title="Toggle Flash"
+        >
+          <Zap size={20} fill={flashOn ? "currentColor" : "none"} />
+        </button>
 
-          <div className="flex-1 h-14 bg-black/40 border border-[#222222] rounded-none flex items-center justify-center gap-3 px-4 lg:px-5 xl:px-6 relative overflow-hidden group">
-            {ocrProcessing ? (
-              <>
-                <RefreshCw className="animate-spin text-primary" size={18} />
-                <span className="text-xs font-normal text-[#888888] leading-none">Analyzing</span>
-              </>
-            ) : (
-              <>
-                <Search
-                  className={cn('text-[#888888] transition-colors group-hover:text-primary', !isStarted && 'opacity-20')}
-                  size={18}
-                />
-                <div className="flex flex-col">
-                  <span className="text-xs text-[#888888] 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>
-                </div>
-              </>
-            )}
+        <button
+          onClick={onRotate}
+          className="p-4 bg-surface-container border border-border text-secondary hover:text-white flex items-center justify-center transition-all"
+          title="Rotate Camera"
+        >
+          <RotateCcw size={20} />
+        </button>
 
-            {/* Visual Progress Bar */}
-            <div
-              className="absolute bottom-0 left-0 h-0.5 bg-primary/40 transition-all duration-1000 ease-linear shadow-none"
-              style={{ width: `${((4 - countdown) / 4) * 100}%` }}
-            />
-          </div>
-        </div>
+        <button
+          onClick={onFlip}
+          className="p-4 bg-surface-container border border-border text-secondary hover:text-white flex items-center justify-center transition-all"
+          title="Flip Horizontal"
+        >
+          <FlipHorizontal size={20} />
+        </button>
 
-        <div className="w-full flex justify-center items-center gap-2">
-          <div className="w-1 h-1 rounded-none bg-green-500 animate-pulse" />
-          <p className="text-xs text-[#888888] font-normal">
-            Scanner active · Use zoom or tap scan
-          </p>
-        </div>
+        <button
+          onClick={onClose}
+          className="p-4 bg-surface-container border border-border text-secondary hover:text-rose-500 flex items-center justify-center transition-all"
+          title="Close Camera"
+        >
+          <X size={20} />
+        </button>
+      </div>
+
+      {/* Zoom Controls */}
+      <div className="flex items-center gap-4 px-2 no-print">
+         <ZoomOut size={16} className="text-secondary" />
+         <input 
+           type="range" 
+           min="1" 
+           max="5" 
+           step="0.1" 
+           onChange={(e) => onZoomChange(parseFloat(e.target.value))}
+           className="flex-1 h-1 bg-border appearance-none cursor-pointer accent-primary"
+         />
+         <ZoomIn size={16} className="text-secondary" />
+      </div>
+
+      {/* Actions */}
+      <div className="grid grid-cols-2 gap-3 no-print">
+        <button
+          onClick={onScan}
+          disabled={paused || ocrProcessing}
+          className="btn-primary py-5 text-lg"
+        >
+          <Camera size={24} /> Capture Asset
+        </button>
+        <button
+          onClick={onScan}
+          className="btn-secondary py-5 text-lg"
+        >
+          <Search size={24} /> Scan Signature
+        </button>
       </div>
     </div>
   );
diff --git a/frontend/components/CategoryCreationModal.tsx b/frontend/components/CategoryCreationModal.tsx
index b80535a0..859372f3 100644
--- a/frontend/components/CategoryCreationModal.tsx
+++ b/frontend/components/CategoryCreationModal.tsx
@@ -109,7 +109,7 @@ export default function CategoryCreationModal({
               type="button"
               onClick={onClose}
               disabled={loading}
-              className="flex-1 px-4 py-2.5 text-secondary bg-surface-bright border border-border rounded font-normal hover:bg-[#222222] 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-bright border border-border rounded font-normal hover:bg-border transition-colors disabled:opacity-50 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
             >
               Cancel
             </button>
diff --git a/frontend/components/CreateUserModal.tsx b/frontend/components/CreateUserModal.tsx
index 63d30a01..29a6b1d2 100644
--- a/frontend/components/CreateUserModal.tsx
+++ b/frontend/components/CreateUserModal.tsx
@@ -142,7 +142,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-surface-bright border border-border rounded font-normal hover:bg-[#222222] 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-bright border border-border rounded font-normal hover:bg-border transition-colors disabled:opacity-50 focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
             >
               Cancel
             </button>
diff --git a/frontend/components/DebugRotationPanel.tsx b/frontend/components/DebugRotationPanel.tsx
index aa991b2b..46da82df 100644
--- a/frontend/components/DebugRotationPanel.tsx
+++ b/frontend/components/DebugRotationPanel.tsx
@@ -289,7 +289,7 @@ export function DebugRotationPanel({
           <h2 className="text-lg font-normal text-white">Debug Rotation & Crop</h2>
           <button
             onClick={onClose}
-            className="p-2 hover:bg-[#222222] rounded text-gray-400 hover:text-white transition"
+            className="p-2 hover:bg-border rounded text-muted hover:text-white transition"
           >
             <X size={20} />
           </button>
@@ -324,7 +324,7 @@ export function DebugRotationPanel({
                     className={`py-1 px-2 rounded text-xs font-normal transition ${
                       rotation === angle.value
                         ? 'bg-yellow-600 text-white'
-                        : 'bg-[#222222] text-gray-300 hover:bg-slate-600'
+                        : 'bg-border text-secondary hover:bg-surface-bright'
                     }`}
                   >
                     {angle.label}
@@ -337,16 +337,16 @@ export function DebugRotationPanel({
             <button
               onClick={() => setAdjustedCropBounds(null)}
               disabled={!adjustedCropBounds}
-              className="w-full py-2 px-3 rounded text-sm font-normal bg-[#222222] text-gray-300 hover:bg-slate-600 disabled:opacity-50 disabled:cursor-not-allowed transition"
+              className="w-full py-2 px-3 rounded text-sm font-normal bg-border text-secondary hover:bg-surface-bright disabled:opacity-50 disabled:cursor-not-allowed transition"
             >
               Reset Crop Box
             </button>
 
             {/* Original Values */}
             {originalRotation !== undefined && (
-              <div className="bg-[#222222] p-3 rounded text-xs space-y-1">
+              <div className="bg-border p-3 rounded text-xs space-y-1">
                 <h3 className="font-normal text-white">Original AI Values</h3>
-                <div className="text-gray-300 font-mono text-xs">
+                <div className="text-secondary font-mono text-xs">
                   <div>Rotation: {originalRotation}°</div>
                   {originalCropBounds && (
                     <>
diff --git a/frontend/components/ImageAdjustmentModal.tsx b/frontend/components/ImageAdjustmentModal.tsx
index da4a95a0..a68651a5 100644
--- a/frontend/components/ImageAdjustmentModal.tsx
+++ b/frontend/components/ImageAdjustmentModal.tsx
@@ -206,7 +206,7 @@ export function ImageAdjustmentModal({ imageUrl, onConfirm, onCancel }: ImageAdj
           <h2 className="text-xl font-normal text-white">Rotate Image</h2>
           <button
             onClick={onCancel}
-            className="p-2 hover:bg-[#222222] rounded text-gray-400 hover:text-white transition"
+            className="p-2 hover:bg-border rounded text-muted hover:text-white transition"
           >
             <X size={20} />
           </button>
@@ -257,7 +257,7 @@ export function ImageAdjustmentModal({ imageUrl, onConfirm, onCancel }: ImageAdj
                     className={`w-full py-2 px-3 rounded text-sm font-normal transition ${
                       aspectRatio === ratio.value
                         ? 'bg-yellow-600 text-white'
-                        : 'bg-[#222222] text-gray-300 hover:bg-slate-600'
+                        : 'bg-border text-secondary hover:bg-surface-bright'
                     }`}
                   >
                     {ratio.label}
@@ -269,7 +269,7 @@ export function ImageAdjustmentModal({ imageUrl, onConfirm, onCancel }: ImageAdj
             {/* Reset */}
             <button
               onClick={handleReset}
-              className="w-full py-2 px-3 rounded text-sm font-normal bg-[#222222] text-gray-300 hover:bg-slate-600 transition flex items-center justify-center gap-2"
+              className="w-full py-2 px-3 rounded text-sm font-normal bg-border text-secondary hover:bg-surface-bright transition flex items-center justify-center gap-2"
             >
               <RotateCw size={16} />
               Reset
@@ -289,7 +289,7 @@ 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-muted mt-2">Scroll to zoom | Drag to pan | Rotate with slider</p>
           </div>
         </div>
 
@@ -307,7 +307,7 @@ 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-[#222222] text-gray-300 hover:bg-slate-600 transition"
+              className="px-4 py-2 rounded text-sm font-normal bg-border text-secondary hover:bg-surface-bright transition"
             >
               Cancel
             </button>
diff --git a/frontend/components/InventoryTable.tsx b/frontend/components/InventoryTable.tsx
index 08e7a9b8..7186c0d4 100644
--- a/frontend/components/InventoryTable.tsx
+++ b/frontend/components/InventoryTable.tsx
@@ -4,15 +4,10 @@ import { useState } from 'react';
 import { Item } from '@/lib/db';
 import { buildPhotoUrl } from '@/lib/api';
 import { ChevronRight, ChevronDown, Layers, Package } from 'lucide-react';
-import { clsx, type ClassValue } from 'clsx';
-import { twMerge } from 'tailwind-merge';
+import { cn } from '@/lib/utils';
 import ItemDetailModal from '@/components/ItemDetailModal';
 import PhotoModal from '@/components/PhotoModal';
 
-function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
-}
-
 interface InventoryTableProps {
   items: Item[];
   categories: string[];
@@ -53,9 +48,9 @@ export default function InventoryTable({
 
   if (categories.length === 0) {
     return (
-      <div className="py-2 lg:py-3 xl:py-40 text-center text-[#888888]">
+      <div className="py-20 text-center text-secondary">
         <Package size={48} className="mx-auto mb-4 opacity-10" />
-        <p className="font-normal">No Results Found</p>
+        <p className="font-normal">No Matching Assets Found</p>
       </div>
     );
   }
@@ -65,48 +60,48 @@ export default function InventoryTable({
       {categories.map(cat => {
         const categoryItems = items.filter(i => i.category === cat);
         return (
-          <div key={cat} className="level-1 transition-all duration-300">
+          <div key={cat} className="level-1 transition-all">
             <div
-              className="w-full p-2 md:p-3 flex items-center justify-between hover:bg-black/40 transition-colors cursor-pointer"
+              className="w-full p-4 flex items-center justify-between hover:bg-black/30 transition-colors cursor-pointer"
               onClick={() => onExpandCategory(expandedCategory === cat ? null : cat)}
             >
-              <div className="flex items-center gap-3">
-                <div className="w-8 h-8 bg-black flex items-center justify-center text-primary border border-primary/20 transition-colors">
-                  <Layers size={16} />
+              <div className="flex items-center gap-4">
+                <div className="w-10 h-10 bg-black flex items-center justify-center text-primary border border-primary/20 transition-colors">
+                  <Layers size={20} />
                 </div>
                 <div className="text-left">
-                  <h3 className="text-sm md:text-base font-normal text-foreground">{cat}</h3>
-                  <p className="text-[10px] text-secondary font-normal">
-                    {categoryItems.length} Item Types In Stock
+                  <h3 className="text-base font-normal text-white">{cat}</h3>
+                  <p className="text-[10px] text-secondary font-normal mt-0.5">
+                    {categoryItems.length} Registered Signatures
                   </p>
                 </div>
               </div>
               <div className="flex items-center gap-3">
-                {expandedCategory === cat ? <ChevronDown size={18} className="text-primary" /> : <ChevronRight size={18} className="text-secondary" />}
+                {expandedCategory === cat ? <ChevronDown size={20} className="text-primary" /> : <ChevronRight size={20} className="text-secondary" />}
                 {onEditCategory && (
                   <button
                     onClick={(e) => {
                       e.stopPropagation();
                       onEditCategory(cat);
                     }}
-                    className="p-1.5 hover:bg-black text-secondary hover:text-primary transition-colors border border-transparent hover:border-border"
+                    className="p-2 hover:bg-black text-secondary hover:text-primary transition-colors border border-transparent hover:border-border"
                   >
-                    <EditIcon size={14} />
+                    <EditIcon size={16} />
                   </button>
                 )}
               </div>
             </div>
 
             {expandedCategory === cat && (
-              <div className="divide-y divide-border border-t border-border animate-in slide-in-from-top-2 duration-200">
+              <div className="divide-y divide-border border-t border-border animate-in slide-in-from-top-1 duration-200">
                 {categoryItems.map(item => (
                   <div
                     key={item.id}
-                    className="bg-black/40 p-2 md:p-3 flex items-center justify-between hover:bg-black transition-colors"
+                    className="bg-black/40 p-4 flex items-center justify-between hover:bg-black/20 transition-colors"
                   >
                     <div
                       onClick={() => handleItemClick(item)}
-                      className="flex items-center gap-3 flex-1 min-w-0 pr-4 cursor-pointer"
+                      className="flex items-center gap-4 flex-1 min-w-0 pr-4 cursor-pointer"
                     >
                       {item.photo_path || item.image_url ? (
                         <div
@@ -114,7 +109,7 @@ export default function InventoryTable({
                             e.stopPropagation();
                             setSelectedPhotoItem(item);
                           }}
-                          className="w-10 h-10 shrink-0 border border-border overflow-hidden cursor-pointer hover:border-primary transition-colors"
+                          className="w-12 h-12 shrink-0 border border-border overflow-hidden cursor-pointer hover:border-primary transition-colors"
                         >
                           <img
                             src={buildPhotoUrl(backendUrl, item.photo_path || item.image_url || '')}
@@ -124,25 +119,25 @@ export default function InventoryTable({
                           />
                         </div>
                       ) : (
-                        <div className="w-10 h-10 bg-black flex items-center justify-center text-primary shrink-0 border border-primary/20">
-                          <Package size={14} />
+                        <div className="w-12 h-12 bg-black flex items-center justify-center text-primary shrink-0 border border-primary/20">
+                          <Package size={20} />
                         </div>
                       )}
                       <div className="truncate">
-                        <h4 className="text-sm font-normal text-foreground truncate">{item.name}</h4>
-                        <p className="text-[10px] text-secondary font-normal truncate">
-                          {item.specs || (item.photo_path || item.image_url ? 'Tap Photo For Details' : 'No Specs')}
+                        <h4 className="text-sm font-normal text-white truncate">{item.name}</h4>
+                        <p className="text-[10px] text-secondary font-normal truncate mt-0.5">
+                          {item.specs || (item.photo_path || item.image_url ? 'Extract Details via Vision' : 'No Technical Specs')}
                         </p>
                       </div>
                     </div>
                     <div className="text-right shrink-0">
-                      <span className={cn(
-                        "text-base font-normal tabular-nums",
-                        item.quantity <= item.min_quantity ? "text-rose-500" : "text-primary"
+                      <p className={cn(
+                        "text-xl font-normal tabular-nums leading-none",
+                        item.quantity <= (item.min_quantity || 0) ? "text-rose-500" : "text-primary"
                       )}>
                         {item.quantity}
-                      </span>
-                      <p className="text-[10px] text-secondary font-normal">Stock</p>
+                      </p>
+                      <p className="text-[10px] text-secondary font-normal mt-1">QTY</p>
                     </div>
                   </div>
                 ))}
@@ -172,7 +167,6 @@ export default function InventoryTable({
   );
 }
 
-// EditIcon component (lucide-react equivalent)
 function EditIcon({ size = 24 }: { size?: number }) {
   return (
     <svg
diff --git a/frontend/components/ItemComparisonModal.tsx b/frontend/components/ItemComparisonModal.tsx
index 7a9f4ce8..ef233496 100644
--- a/frontend/components/ItemComparisonModal.tsx
+++ b/frontend/components/ItemComparisonModal.tsx
@@ -96,7 +96,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-surface-bright hover:bg-[#222222] text-secondary rounded-none text-sm font-normal cursor-pointer transition-all active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed border border-border focus:ring-2 focus:ring-blue-500 focus:outline-none"
+            className="flex-1 flex items-center justify-center gap-2 py-4 bg-surface-bright hover:bg-border text-secondary rounded-none text-sm font-normal cursor-pointer transition-all active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed border border-border focus:ring-2 focus:ring-primary focus:outline-none"
           >
             <SkipForward size={16} /> Skip
           </button>
diff --git a/frontend/components/ItemDetailModal.tsx b/frontend/components/ItemDetailModal.tsx
index dd7c1163..56e97440 100644
--- a/frontend/components/ItemDetailModal.tsx
+++ b/frontend/components/ItemDetailModal.tsx
@@ -68,26 +68,27 @@ export default function ItemDetailModal({
   };
 
   return (
-    <div className="fixed inset-0 bg-black/80 backdrop-blur-sm flex items-center justify-center z-50 p-4">
-      <div className="level-0 border border-border max-w-2xl w-full max-h-[90vh] overflow-y-auto">
+    <div className="fixed inset-0 bg-black/90 flex items-center justify-center z-50 p-4 animate-in fade-in duration-300">
+      <div className="level-2 max-w-2xl w-full max-h-[90vh] overflow-y-auto flex flex-col shadow-none">
         {/* Header */}
-        <div className="sticky top-0 level-0 border-b border-border p-4 md:p-6 flex items-center justify-between z-10">
-          <h2 className="text-xl md:text-2xl font-normal text-white truncate">{item.name}</h2>
+        <div className="sticky top-0 bg-surface-bright border-b border-border p-4 md:p-6 flex items-center justify-between z-10">
+          <div>
+            <h2 className="text-xl md:text-2xl font-normal text-white truncate">{item.name}</h2>
+            <p className="text-[10px] text-secondary font-normal uppercase tracking-widest mt-0.5">Asset Technical Protocol</p>
+          </div>
           <div className="flex items-center gap-2">
             {currentPhoto && (
               <button
                 onClick={() => setShowDebugPanel(true)}
-                className="p-2 hover:bg-black border border-transparent hover:border-border text-primary transition-colors"
+                className="p-3 bg-black border border-border text-primary hover:text-white transition-colors"
                 title="Debug rotation & crop"
-                aria-label="Debug panel"
               >
                 <Wrench size={20} />
               </button>
             )}
             <button
               onClick={onClose}
-              className="p-2 hover:bg-black border border-transparent hover:border-border text-secondary hover:text-white transition-colors"
-              aria-label="Close modal"
+              className="p-3 bg-black border border-border text-secondary hover:text-white transition-colors"
             >
               <X size={20} />
             </button>
@@ -95,45 +96,35 @@ export default function ItemDetailModal({
         </div>
 
         {/* Content */}
-        <div className="p-4 md:p-6 space-y-6">
-          {/* 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>
-            </div>
-            <div>
-              <p className="text-xs text-muted mb-1">Type</p>
-              <p className="text-sm text-white">{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>
-            </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>
-            </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>
+        <div className="p-4 md:p-6 space-y-8 flex-1">
+          {/* Details Grid */}
+          <div className="grid grid-cols-2 gap-px bg-border border border-border">
+            {[
+              { label: 'Category', value: item.category },
+              { label: 'Item Type', value: item.type || 'N/A' },
+              { label: 'Available Stock', value: item.quantity },
+              { label: 'Part Number', value: item.part_number || 'N/A' },
+              { label: 'Identifier', value: item.barcode, full: true, mono: true }
+            ].map((d, i) => (
+              <div key={i} className={`p-4 bg-surface-container ${d.full ? 'col-span-2' : ''}`}>
+                <p className="text-[10px] text-secondary font-normal mb-1">{d.label}</p>
+                <p className={`text-sm text-white ${d.mono ? 'font-mono' : 'font-normal'}`}>{d.value}</p>
               </div>
-            )}
+            ))}
           </div>
 
           {/* Photo Section */}
-          <div className="border-t border-border pt-6">
-            <h3 className="text-lg font-normal text-white mb-4 flex items-center gap-2">
+          <div className="space-y-4">
+            <h3 className="text-lg font-normal text-white flex items-center gap-2">
               <Camera size={18} className="text-primary" />
-              Photo
+              Visual Signature
             </h3>
 
             {!showPhotoUpload ? (
               <>
                 {currentPhoto ? (
                   <div className="space-y-3">
-                    <div className="relative bg-black border border-border overflow-hidden aspect-video max-h-96">
+                    <div className="relative bg-black border border-border overflow-hidden aspect-video">
                       <img
                         src={buildPhotoUrl(backendUrl, currentPhoto.full_url)}
                         alt={item.name}
@@ -143,41 +134,43 @@ export default function ItemDetailModal({
                     <div className="flex gap-2">
                       <button
                         onClick={() => setShowPhotoUpload(true)}
-                        className="flex-1 px-4 py-2 bg-primary/10 border border-primary/30 text-primary hover:bg-primary/20 transition-colors font-normal text-sm"
+                        className="btn-secondary flex-1 py-3 text-xs"
                       >
-                        Replace Photo
+                        Capture New Signature
                       </button>
                       <button
                         onClick={handleDeletePhoto}
                         disabled={isDeleting}
-                        className="px-4 py-2 bg-rose-500/10 border border-rose-500/30 text-rose-500 hover:bg-rose-500/20 disabled:opacity-50 transition-colors font-normal text-sm"
+                        className="px-4 py-3 bg-rose-500/10 border border-rose-500/30 text-rose-500 hover:bg-rose-500/20 disabled:opacity-50 transition-colors text-xs"
                       >
                         <Trash2 size={16} />
                       </button>
                     </div>
                   </div>
                 ) : (
-                  <div className="bg-black border border-border p-8 text-center">
-                    <p className="text-muted text-sm mb-4">No Photo Uploaded</p>
+                  <div className="bg-black border border-border p-12 text-center flex flex-col items-center gap-4">
+                    <div className="w-16 h-16 bg-surface-container flex items-center justify-center text-muted border border-border">
+                       <Camera size={32} />
+                    </div>
+                    <p className="text-muted text-sm">No recorded visual signatures</p>
                     <button
                       onClick={() => setShowPhotoUpload(true)}
-                      className="px-4 py-2 bg-primary/10 border border-primary/30 text-primary hover:bg-primary/20 transition-colors font-normal text-sm"
+                      className="btn-primary px-8 py-3"
                     >
-                      Upload Photo
+                      Authorize Capture
                     </button>
                   </div>
                 )}
               </>
             ) : (
-              <div ref={photoUploadRef} className="bg-black border border-border p-4 md:p-6">
-                <div className="mb-4 flex items-center justify-between">
-                  <h4 className="font-normal text-white">Upload New Photo</h4>
+              <div ref={photoUploadRef} className="bg-black border border-border p-4 md:p-6 animate-in slide-in-from-top-2 duration-300">
+                <div className="mb-4 flex items-center justify-between border-b border-border pb-3">
+                  <h4 className="font-normal text-white text-sm">Signature Acquisition Protocol</h4>
                   <button
                     onClick={() => setShowPhotoUpload(false)}
-                    className="p-1 hover:bg-black border border-transparent hover:border-border text-secondary hover:text-white transition-colors"
-                    aria-label="Cancel upload"
+                    className="p-1 text-secondary hover:text-white transition-colors"
                   >
-                    <X size={16} />
+                    <X size={18} />
                   </button>
                 </div>
                 {item.id && (
@@ -191,6 +184,15 @@ export default function ItemDetailModal({
             )}
           </div>
         </div>
+
+        <div className="p-4 bg-black border-t border-border flex justify-end">
+           <button 
+             onClick={onClose}
+             className="btn-secondary px-8 py-2 text-xs"
+           >
+             Close Protocol
+           </button>
+        </div>
       </div>
 
       {/* Debug Rotation Panel */}
diff --git a/frontend/components/ItemPhotoUpload.tsx b/frontend/components/ItemPhotoUpload.tsx
index ea3d127c..4504e959 100644
--- a/frontend/components/ItemPhotoUpload.tsx
+++ b/frontend/components/ItemPhotoUpload.tsx
@@ -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-[#222222] text-white rounded-none 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-border text-white rounded-none font-normal text-base transition-colors hover:bg-surface-bright disabled:opacity-60 disabled:cursor-not-allowed"
           aria-label="Capture photo with camera"
         >
           {isLoading ? (
diff --git a/frontend/components/LogsTable.tsx b/frontend/components/LogsTable.tsx
index 054ca20a..19aa93af 100644
--- a/frontend/components/LogsTable.tsx
+++ b/frontend/components/LogsTable.tsx
@@ -48,14 +48,14 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
 
   return (
     <>
-      <div className="border border-border bg-surface-container overflow-hidden">
+      <div className="border border-border level-1 overflow-hidden">
         {/* Header Row */}
-        <div className="hidden md:grid grid-cols-[120px_1fr_120px_180px_80px] bg-surface-bright/50 border-b border-border">
-          <div className="p-2 text-xs text-secondary font-normal">Action</div>
-          <div className="p-2 text-xs text-secondary font-normal">Item</div>
-          <div className="p-2 text-xs text-secondary font-normal">Operator</div>
-          <div className="p-2 text-xs text-secondary font-normal">Timestamp</div>
-          <div className="p-2 text-xs text-secondary font-normal text-right">Delta</div>
+        <div className="hidden md:grid grid-cols-[120px_1fr_120px_180px_80px] table-header">
+          <div className="p-2">Action</div>
+          <div className="p-2">Item</div>
+          <div className="p-2">Operator</div>
+          <div className="p-2">Timestamp</div>
+          <div className="p-2 text-right">Delta</div>
         </div>
 
         <div className="divide-y divide-border">
@@ -116,15 +116,15 @@ 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-container border-t sm:border border-border p-4 md:p-6 max-w-lg w-full space-y-4 animate-in slide-in-from-bottom-10 duration-300 overflow-hidden">
+          <div className="level-2 p-4 md:p-6 max-w-lg w-full 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-3 py-1 border inline-block",
-                  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")
+                  selectedLog.action.includes('CHECK_IN') ? "status-success" :
+                  (selectedLog.action.includes('TRASH') ? "bg-rose-500 text-black" : "status-alert")
                 )}>
-                  {selectedLog.action.replace('_', ' ').toLowerCase().replace(/\b\w/g, l => l.toUpperCase())}
+                  {selectedLog.action.replace('_', ' ').toLowerCase()}
                 </div>
                 <h2 className="text-2xl font-normal text-foreground pt-2 leading-tight">
                   {selectedLog.resolved_name}
@@ -136,11 +136,11 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
             </div>
 
             <div className="grid grid-cols-2 gap-px bg-border border border-border">
-              <div className="space-y-1 bg-surface-container p-3">
+              <div className="space-y-1 level-1 p-3">
                 <p className="text-[10px] font-normal text-secondary">Protocol Operator</p>
                 <p className="text-sm font-normal text-foreground">{selectedLog.username || 'Automated Process'}</p>
               </div>
-              <div className="space-y-1 bg-surface-container p-3">
+              <div className="space-y-1 level-1 p-3">
                 <p className="text-[10px] font-normal text-secondary">Quantity Delta</p>
                 <p className={cn(
                   "text-xl font-normal tabular-nums",
@@ -174,8 +174,8 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
                       <div className="grid grid-cols-2 gap-px bg-border border border-border">
                         {Object.entries(snap).map(([key, val]) => (
                           (val && key !== 'image_url' && key !== 'id') ? (
-                            <div key={key} className="bg-surface-container p-2">
-                              <p className="text-[10px] font-normal text-secondary mb-1 opacity-70">{key.replace('_', ' ').toLowerCase().replace(/\b\w/g, l => l.toUpperCase())}</p>
+                            <div key={key} className="level-1 p-2">
+                              <p className="text-[10px] font-normal text-secondary mb-1 opacity-70">{key.replace('_', ' ').toLowerCase()}</p>
                               <p className="text-xs font-normal text-foreground truncate" title={String(val)}>{String(val)}</p>
                             </div>
                           ) : null
@@ -189,7 +189,7 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
               {selectedLog.details && (
                 <div className="space-y-1">
                   <p className="text-[10px] font-normal text-secondary ml-1">Intervention Details</p>
-                  <div className="bg-primary/5 text-primary p-3 border border-primary/20 text-sm font-normal leading-relaxed">
+                  <div className="log-viewer h-auto">
                     {selectedLog.details}
                   </div>
                 </div>
@@ -198,7 +198,7 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
 
             <button
               onClick={() => setSelectedLog(null)}
-              className="w-full bg-primary hover:bg-primary/90 text-primary-foreground font-normal py-3 transition-colors border border-primary"
+              className="btn-primary w-full py-3"
             >
               Close Audit Insight
             </button>
diff --git a/frontend/components/ManualCropUI.tsx b/frontend/components/ManualCropUI.tsx
index 96d82f40..c0efe13b 100644
--- a/frontend/components/ManualCropUI.tsx
+++ b/frontend/components/ManualCropUI.tsx
@@ -291,7 +291,7 @@ export default function ManualCropUI({
         {crop && (
           <button
             onClick={() => resetCrop()}
-            className="flex items-center justify-center gap-2 flex-1 px-4 py-2.5 bg-[#222222] text-white rounded-none 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-border text-white rounded-none font-normal text-base transition-colors hover:bg-surface-bright"
           >
             <X className="w-5 h-5" />
             <span>Use Full Photo</span>
diff --git a/frontend/components/ScannerSection.tsx b/frontend/components/ScannerSection.tsx
index 3e345429..4e8f2e23 100644
--- a/frontend/components/ScannerSection.tsx
+++ b/frontend/components/ScannerSection.tsx
@@ -3,12 +3,7 @@
 import { X, ArrowDownCircle, ArrowUpCircle, Trash2 } from 'lucide-react';
 import Scanner from '@/components/Scanner';
 import NewItemDialog from '@/components/NewItemDialog';
-import { clsx, type ClassValue } from 'clsx';
-import { twMerge } from 'tailwind-merge';
-
-function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
-}
+import { cn } from '@/lib/utils';
 
 interface ScannerSectionProps {
   mode: string;
@@ -30,9 +25,9 @@ export default function ScannerSection({
   onAddItemClick,
 }: ScannerSectionProps) {
   return (
-    <div className="w-full px-1 space-y-3 md:space-y-4">
+    <div className="w-full space-y-4">
       {/* Mode Switcher */}
-      <div className="flex p-1.5 bg-surface rounded-none shadow-none w-full gap-1">
+      <div className="flex p-1 bg-black border border-border w-full gap-1">
         {[
           { id: 'CHECK_IN', label: 'Check In', icon: ArrowDownCircle },
           { id: 'CHECK_OUT', label: 'Check Out', icon: ArrowUpCircle },
@@ -43,27 +38,27 @@ 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-none text-xs sm:text-sm font-normal transition-all flex items-center justify-center gap-3",
-              mode === m.id ? "bg-surface-bright text-primary shadow-none ring-1 ring-primary/20" : "text-muted hover:text-secondary"
+              "flex-1 py-3 text-xs sm:text-sm font-normal transition-all flex items-center justify-center gap-2",
+              mode === m.id ? "bg-surface-bright text-primary border border-primary/30" : "text-secondary hover:bg-black/40 hover:text-white"
             )}
           >
-            <m.icon size={18} className={mode === m.id ? "scale-110 transition-transform" : ""} />
+            <m.icon size={18} />
             <span className="truncate">{m.label}</span>
           </button>
         ))}
       </div>
 
       {/* Scanner Section */}
-      <section className="glass-card rounded-none p-6 lg:p-8 xl:p-10">
+      <section className="level-1 p-6 md:p-8">
         {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>
+          <div className="space-y-4">
+            <div className="flex justify-between items-center border-b border-border pb-3">
+              <h2 className="text-lg font-normal text-white">Vision Sensor Active</h2>
               <button
                 onClick={() => onShowScanner(false)}
-                className="p-2 lg:p-3 xl:p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10.5 bg-surface border border-border text-secondary rounded-none hover:text-rose-500 transition-all active:scale-95"
+                className="p-2 bg-surface-bright border border-border text-secondary hover:text-rose-500 transition-colors"
               >
-                <X size={18} />
+                <X size={20} />
               </button>
             </div>
             <Scanner onScanSuccess={onScanSuccess} onOCRMatch={onOCRMatch} />
diff --git a/frontend/components/SearchErrorModal.tsx b/frontend/components/SearchErrorModal.tsx
index 3e4196d3..3ab0cfe1 100644
--- a/frontend/components/SearchErrorModal.tsx
+++ b/frontend/components/SearchErrorModal.tsx
@@ -28,7 +28,7 @@ export function SearchErrorModal({ isOpen, error, onRetry, onSkip, canRetry = tr
           )}
           <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-slate-300 rounded font-normal text-sm hover:bg-surface-50"
           >
             Skip
           </button>
diff --git a/frontend/components/SearchLoadingModal.tsx b/frontend/components/SearchLoadingModal.tsx
index 6ba69e79..e2baae1a 100644
--- a/frontend/components/SearchLoadingModal.tsx
+++ b/frontend/components/SearchLoadingModal.tsx
@@ -40,7 +40,7 @@ export function SearchLoadingModal({ isOpen, onTimeout, maxSeconds = 30 }: Searc
         <p className="text-sm text-slate-600 mb-4">This may take up to {maxSeconds} seconds</p>
 
         <div className="mb-4">
-          <div className="relative h-2 bg-slate-200 rounded-none overflow-hidden">
+          <div className="relative h-2 bg-surface-200 rounded-none overflow-hidden">
             <div
               className="h-full bg-primary transition-all duration-1000"
               style={{ width: `${(seconds / maxSeconds) * 100}%` }}
diff --git a/frontend/components/StockAdjustmentPanel.tsx b/frontend/components/StockAdjustmentPanel.tsx
index 959802a2..6c867a5e 100644
--- a/frontend/components/StockAdjustmentPanel.tsx
+++ b/frontend/components/StockAdjustmentPanel.tsx
@@ -297,7 +297,7 @@ export default function StockAdjustmentPanel({
           data-testid="adjustment-submit"
           className={cn(
             "w-full py-5 rounded-none font-normal text-lg transition-all active:scale-[0.98] shadow-none",
-            isEditing ? "bg-slate-100 text-slate-900" : (
+            isEditing ? "bg-surface-100 text-slate-900" : (
               adjustType === 'ADD' ? "bg-primary shadow-none text-white" :
                 adjustType === 'REMOVE' ? "bg-amber-600 shadow-none text-white" :
                   "bg-red-600 shadow-none text-white"
diff --git a/frontend/components/admin/AiManager.tsx b/frontend/components/admin/AiManager.tsx
index 52e8c6b1..7d0427d2 100644
--- a/frontend/components/admin/AiManager.tsx
+++ b/frontend/components/admin/AiManager.tsx
@@ -32,10 +32,10 @@ export default function AiManager({
   onUpdatePrompt
 }: AiManagerProps) {
   return (
-    <section data-testid="ai-config" className="bg-surface/50 border border-border/50 rounded-none p-4 md:p-6 shadow-none space-y-4 transition-all group/ai">
+    <section data-testid="ai-config" className="level-1 p-4 md:p-6 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-none 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>
@@ -49,25 +49,25 @@ export default function AiManager({
             data-testid="provider-option"
             onClick={() => handleUpdateAiProvider(p.id)}
             className={cn(
-              "p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 rounded-none border transition-all text-left flex items-center justify-between group",
+              "p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 border transition-all text-left flex items-center justify-between group",
               p.active 
-                ? "bg-primary border-primary shadow-none shadow-none" 
-                : "bg-background/60 border-border hover:border-primary/40"
+                ? "bg-primary border-primary" 
+                : "level-0 border-border hover:border-primary/40"
             )}
           >
             <div className="flex items-center gap-3">
               <div className={cn(
-                "w-8 h-8 rounded-none 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-black/20 text-black" : "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-black" : "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-black/70" : "text-black/50") 
                     : (p.configured ? "text-emerald-500" : "text-rose-500")
                 )}>
                   {p.configured ? "● Key Configured" : "○ Missing Api Key"}
@@ -75,7 +75,7 @@ export default function AiManager({
               </div>
             </div>
             {p.active && (
-              <div className="bg-white/20 px-2.5 py-1 rounded-none text-xs font-normal text-white tracking-tight">
+              <div className="bg-black/20 px-2.5 py-1 text-xs font-normal text-black tracking-tight">
                 Active
               </div>
             )}
@@ -83,17 +83,17 @@ export default function AiManager({
         ))}
       </div>
 
-      <div className="bg-primary/5 border border-primary/10 rounded-none 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-none 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-none text-sm font-normal transition-all active:scale-95 shadow-none shadow-none tracking-tight border border-primary/30 flex items-center gap-2"
+            className="btn-primary"
           >
             {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-border rounded-none py-1.5 px-4 text-xs text-white outline-none focus:border-primary/50 transition-all placeholder:text-secondary"
+                className="input-field flex-1 text-xs"
               />
               <button
                 onClick={() => onTestAiKey('gemini')}
                 disabled={isTestingKeys.gemini}
                 className={cn(
-                  "px-3 py-1.5 rounded-none text-xs font-normal tracking-tight transition-all border shadow-none flex items-center gap-1.5",
+                  "px-3 py-1.5 text-xs font-normal tracking-tight transition-all border flex items-center gap-1.5",
                   isTestingKeys.gemini
                     ? "bg-surface-bright border-border text-muted cursor-wait"
-                    : "bg-primary border-primary text-white hover:bg-primary"
+                    : "btn-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-border rounded-none py-1.5 px-4 text-xs text-white outline-none focus:border-primary/50 transition-all placeholder:text-secondary"
+                className="input-field flex-1 text-xs"
               />
               <button
                 onClick={() => onTestAiKey('claude')}
                 disabled={isTestingKeys.claude}
                 className={cn(
-                  "px-3 py-1.5 rounded-none text-xs font-normal tracking-tight transition-all border shadow-none flex items-center gap-1.5",
+                  "px-3 py-1.5 text-xs font-normal tracking-tight transition-all border flex items-center gap-1.5",
                   isTestingKeys.claude
                     ? "bg-surface-bright border-border text-muted cursor-wait"
-                    : "bg-primary border-primary text-white hover:bg-primary"
+                    : "btn-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-none text-sm font-normal transition-all active:scale-95 shadow-none shadow-none tracking-tight border border-primary/30 flex items-center gap-2"
+              className="btn-primary py-1.5"
             >
               {isSavingPrompt ? <RotateCcw size={14} className="animate-spin" /> : <FileText size={14} />}
               {isSavingPrompt ? "Saving..." : "Save Prompt"}
@@ -172,13 +172,13 @@ export default function AiManager({
           <textarea
             value={aiPrompt}
             onChange={(e) => setAiPrompt(e.target.value)}
-            className="w-full bg-background/80 border border-border rounded-none 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-none"
+            className="log-viewer w-full min-h-[200px] text-xs text-secondary leading-relaxed outline-none focus:border-primary/50 transition-all"
           />
         </div>
-        <div className="bg-primary/5 border border-purple-500/10 rounded-none p-4 flex gap-3 items-start">
-          <div className="p-2 bg-primary/10 rounded-none text-purple-400 shrink-0"><Shield size={14} /></div>
+        <div className="bg-primary/5 border border-primary/10 p-4 flex gap-3 items-start">
+          <div className="p-2 bg-primary/10 text-primary 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.
+            This prompt instructs the Vision AI core on label interpretation. Ensure it defines explicit mapping for technical attributes like <span className="text-primary">Item</span>, <span className="text-primary">Type</span>, and <span className="text-primary">Part Number</span> to avoid extraction null-pointers and ensure inventory data integrity.
           </p>
         </div>
       </div>
diff --git a/frontend/components/admin/CategoryManager.tsx b/frontend/components/admin/CategoryManager.tsx
index 15effad8..0fac5fb7 100644
--- a/frontend/components/admin/CategoryManager.tsx
+++ b/frontend/components/admin/CategoryManager.tsx
@@ -23,10 +23,10 @@ export default function CategoryManager({
   onUpdateCategorySubmit
 }: CategoryManagerProps) {
   return (
-    <section className="bg-surface/50 border border-border/50 rounded-none p-4 md:p-6 shadow-none space-y-4 transition-all group/categories">
+    <section className="level-1 p-4 md:p-6 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-none 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>
@@ -34,7 +34,7 @@ export default function CategoryManager({
           <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-none text-sm font-normal transition-all shadow-none shadow-none active:scale-95 border border-primary/30 tracking-tight"
+            className="btn-primary"
           >
             <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 lg:p-5 xl:p-6 lg:p-8 xl:p-10 bg-background/40 border border-border/50 rounded-none flex items-center justify-between group hover:border-primary/40 transition-all">
+           <div key={cat.id} data-testid="category-item" className="p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 level-1 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 lg:p-3 xl:p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 text-secondary hover:text-white hover:bg-surface-bright rounded-none transition-all"
+                  className="p-2 text-secondary hover:text-white hover:bg-surface-bright transition-all"
                 >
                   <Edit2 size={14} />
                 </button>
                 <button
                   onClick={() => onDeleteCategory(cat.id, cat.name)}
                   data-testid="delete-category-button"
-                  className="p-2 lg:p-3 xl:p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 text-secondary hover:text-rose-500 hover:bg-rose-500/5 rounded-none transition-all"
+                  className="p-2 text-secondary hover:text-rose-500 hover:bg-rose-500/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-border rounded-none sm:rounded-none p-6 shadow-none space-y-3 overflow-hidden animate-in slide-in-from-bottom-10">
+          <div className="w-full max-w-lg level-2 p-6 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-none 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>
                </div>
-               <button onClick={() => setEditingCategory(null)} className="p-2 hover:bg-surface-bright rounded-none text-muted transition-colors border border-border">
+               <button onClick={() => setEditingCategory(null)} className="p-2 hover:bg-surface-bright text-muted transition-colors border border-border">
                  <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-border rounded-none py-1.5 px-4 text-sm text-white focus:border-primary outline-none transition-all"
+                    className="input-field w-full text-sm"
                   />
                </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-border rounded-none py-1.5 px-4 text-sm text-white focus:border-primary outline-none transition-all h-24 resize-none"
+                    className="input-field w-full text-sm 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-none shadow-none shadow-none active:scale-95 transition-all text-sm tracking-tight">
+               <button data-testid="add-category-submit" onClick={onUpdateCategorySubmit} className="btn-primary w-full py-2.5">
                  Update Asset Group
                </button>
             </div>
diff --git a/frontend/components/admin/DatabaseManager.tsx b/frontend/components/admin/DatabaseManager.tsx
index a38d4848..d243a9b5 100644
--- a/frontend/components/admin/DatabaseManager.tsx
+++ b/frontend/components/admin/DatabaseManager.tsx
@@ -35,9 +35,9 @@ 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-border/50 rounded-none p-4 md:p-6 shadow-none overflow-hidden relative group transition-all">
+      <div data-testid="database-info" className="level-1 p-4 md:p-6 overflow-hidden relative group transition-all">
         <div className="flex items-center gap-3 mb-3">
-          <div className="w-10 h-10 rounded-none 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>
@@ -47,7 +47,7 @@ export default function DatabaseManager({
           <div className="space-y-1 sm:pr-4">
             <p className="text-xs font-normal text-muted tracking-tight">Database Health</p>
             <div className="flex items-center gap-2">
-              <div className="w-2 h-2 rounded-none bg-green-500 animate-pulse shadow-none_0_8px_rgba(34,197,94,0.3)]" />
+              <div className="w-2 h-2 bg-green-500 animate-pulse" />
               <span className="text-sm font-normal text-secondary">Operational</span>
             </div>
           </div>
@@ -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-none text-sm font-normal transition-all active:scale-95 disabled:opacity-50 shadow-none shadow-none tracking-tight focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
+                className="btn-primary"
                 aria-label="Create database backup"
               >
                {isBackingUp ? <RotateCcw size={14} className="animate-spin" /> : <Database size={14} />}
@@ -70,10 +70,10 @@ export default function DatabaseManager({
         </div>
       </div>
 
-      <div className="bg-surface/50 border border-border/50 rounded-none p-4 md:p-6 shadow-none space-y-4">
+      <div className="level-1 p-4 md:p-6 space-y-4">
         <div className="space-y-3">
           <div className="flex items-center gap-3">
-             <div className="w-10 h-10 rounded-none 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>
@@ -91,7 +91,7 @@ export default function DatabaseManager({
                 type="number"
                 value={dbSettings.retention_count}
                 onChange={(e) => onUpdateDbSettings({...dbSettings, retention_count: parseInt(e.target.value)})}
-                className="w-full bg-background/80 border border-border rounded-none 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="input-field w-full text-xs tabular-nums"
               />
             </div>
             <div className="space-y-1">
@@ -103,7 +103,7 @@ 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-border rounded-none 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="input-field w-full text-xs tabular-nums"
               />
             </div>
             <div className="space-y-1">
@@ -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-border rounded-none 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="input-field w-full text-xs tabular-nums"
               />
             </div>
           </div>
@@ -124,16 +124,16 @@ 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-none border border-primary/10">
+              <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] custom-scrollbar">
             {backups.map((bak: any) => (
-              <div key={bak.filename} className="flex items-center justify-between p-3 bg-background/40 border border-border/40 rounded-none group/item hover:border-primary/30 transition-all">
+              <div key={bak.filename} className="flex items-center justify-between p-3 level-0 border-border group/item hover:border-primary/30 transition-all">
                 <div className="flex items-center gap-3">
-                  <div className="w-8 h-8 rounded-none bg-surface-bright flex items-center justify-center text-muted">
+                  <div className="w-8 h-8 bg-surface-bright flex items-center justify-center text-muted">
                     <Database size={14} />
                   </div>
                   <div>
@@ -144,7 +144,7 @@ export default function DatabaseManager({
                 </div>
                 <button
                   onClick={() => onRestore(bak.filename)}
-                  className="p-2 lg:p-3 xl:p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 text-secondary hover:text-primary hover:bg-primary/5 rounded-none 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"
                   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-border hover:border-primary/50 text-primary rounded-none text-sm font-normal transition-all active:scale-95 tracking-tight shadow-none shadow-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
+             className="btn-secondary"
              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-border hover:border-rose-500/50 text-rose-500 rounded-none text-sm font-normal transition-all tracking-tight shadow-none shadow-none focus-visible:ring-2 focus-visible:ring-rose-500 focus-visible:outline-none"
+               className="w-full btn-secondary text-rose-500 border-rose-500/50 hover:border-rose-500 hover:text-rose-500"
                aria-label="Import database"
              >
                <Upload size={14} /> Import Database
diff --git a/frontend/components/admin/IdentityManager.tsx b/frontend/components/admin/IdentityManager.tsx
index fbb80052..5b364cfe 100644
--- a/frontend/components/admin/IdentityManager.tsx
+++ b/frontend/components/admin/IdentityManager.tsx
@@ -24,10 +24,10 @@ export default function IdentityManager({
   onUpdateUserSubmit
 }: IdentityManagerProps) {
   return (
-    <div className="bg-surface/50  border border-border/50 rounded-none p-4 md:p-6 flex flex-col shadow-none transition-all group/identity h-full">
+    <div className="level-1 p-4 md:p-6 flex flex-col 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-none 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>
@@ -35,19 +35,19 @@ export default function IdentityManager({
         <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-none text-sm font-normal transition-all shadow-none shadow-none active:scale-95 border border-primary/30 tracking-tight focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
+          className="btn-primary"
           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] custom-scrollbar">
         {users.map((user) => (
-          <div key={user.id} className="flex items-center justify-between p-3 bg-background/40 border border-border/40 rounded-none hover:border-primary/30 transition-all group">
+          <div key={user.id} className="flex items-center justify-between p-3 level-0 border border-border/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-none flex items-center justify-center transition-colors shadow-none shrink-0",
+                "w-9 h-9 flex items-center justify-center transition-colors shrink-0",
                 user.role === 'admin' ? "bg-primary/10 text-primary border border-primary/20" : "bg-surface-bright text-muted border border-border"
               )}>
                 {user.role === 'admin' ? <Shield size={16} /> : <User size={16} />}
@@ -63,7 +63,7 @@ export default function IdentityManager({
                   setEditingUser(user);
                   setEditUserForm({ username: user.username, password: '', role: user.role });
                 }}
-                className="p-2 lg:p-3 xl:p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 text-secondary hover:text-primary hover:bg-primary/5 rounded-none 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"
                 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 lg:p-3 xl:p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 text-secondary hover:text-rose-500 hover:bg-rose-500/5 rounded-none transition-all focus-visible:ring-2 focus-visible:ring-rose-500 focus-visible:outline-none"
+                  className="p-2 text-secondary hover:text-rose-500 hover:bg-rose-500/5 transition-all"
                   aria-label={`Delete user ${user.username}`}
                 >
                   <Trash2 size={16} />
@@ -86,12 +86,12 @@ 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-border rounded-none p-6 w-full max-w-md shadow-none">
+          <div className="level-2 p-6 w-full max-w-md">
             <div className="flex justify-between items-center mb-3">
               <h3 className="text-xl font-normal text-white tracking-tight">Edit Identity</h3>
               <button
                 onClick={() => setEditingUser(null)}
-                className="p-2 lg:p-3 xl:p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 text-muted hover:text-white transition-colors focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none rounded"
+                className="p-2 text-muted hover:text-white transition-colors border border-border"
                 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-border rounded-none 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="input-field w-full text-sm 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-border rounded-none 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="input-field w-full text-sm 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-border rounded-none py-1.5 px-4 text-sm font-normal text-white outline-none focus:border-primary/50 transition-all appearance-none"
+                  className="input-field w-full text-sm 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-none py-2.5 text-sm font-normal transition-all active:scale-95 shadow-none shadow-none 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="btn-primary w-full py-2.5 mt-2"
               >
                 Apply Changes
               </button>
diff --git a/frontend/components/admin/LdapManager.tsx b/frontend/components/admin/LdapManager.tsx
index 29be9d88..32cc4c19 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-border/50 rounded-none p-4 md:p-6 shadow-none space-y-3 transition-all group/ldap">
+    <div className="level-1 p-4 md:p-6 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-none 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>
         </div>
       </div>
 
-      <div className="flex items-center justify-between p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 bg-background/40 border border-border/60 rounded-none group transition-all hover:border-primary/30">
+      <div className="flex items-center justify-between p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 level-0 border border-border/60 group transition-all hover:border-primary/30">
         <div className="flex items-center gap-3">
           <div className={cn(
-            "w-8 h-8 rounded-none flex items-center justify-center transition-all shadow-none",
-            ldapConfig.ldap_enabled ? "bg-green-500/10 text-green-500" : "bg-surface-bright text-muted"
+            "w-8 h-8 flex items-center justify-center transition-all",
+            ldapConfig.ldap_enabled ? "status-success" : "bg-surface-bright text-muted"
           )}>
             <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-muted")}>
               {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-none relative transition-all duration-300 shadow-none border",
+            "w-10 h-5 relative transition-all duration-300 border",
             ldapConfig.ldap_enabled ? "bg-primary border-primary" : "bg-surface-bright border-border"
           )}
         >
           <div className={cn(
-            "absolute top-0.5 w-3.5 h-3.5 bg-white rounded-none transition-all shadow-none",
+            "absolute top-0.5 w-3.5 h-3.5 bg-black transition-all",
             ldapConfig.ldap_enabled ? "right-0.5" : "left-0.5"
           )} />
         </button>
@@ -67,7 +67,7 @@ export default function LdapManager({
               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-border rounded-none py-1.5 pl-9 pr-4 text-xs font-normal text-white outline-none focus:border-primary/50 transition-all font-mono"
+              className="input-field w-full pl-9 text-xs font-mono"
             />
           </div>
         </div>
@@ -80,7 +80,7 @@ export default function LdapManager({
               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-border rounded-none py-1.5 pl-9 pr-4 text-xs font-normal text-white outline-none focus:border-primary/50 transition-all font-mono"
+              className="input-field w-full pl-9 text-xs font-mono"
             />
           </div>
         </div>
@@ -96,7 +96,7 @@ export default function LdapManager({
               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-border rounded-none py-1.5 pl-9 pr-4 text-xs font-normal text-white outline-none focus:border-primary/50 transition-all font-mono"
+              className="input-field w-full pl-9 text-xs font-mono"
             />
           </div>
         </div>
@@ -109,16 +109,16 @@ export default function LdapManager({
               placeholder="ou=groups"
               value={ldapConfig.groups_dn}
               onChange={(e) => setLdapConfig({...ldapConfig, groups_dn: e.target.value})}
-              className="w-full bg-background/80 border border-border rounded-none py-1.5 pl-9 pr-4 text-xs font-normal text-white outline-none focus:border-primary/50 transition-all font-mono"
+              className="input-field w-full pl-9 text-xs font-mono"
             />
           </div>
         </div>
       </div>
 
-      <div className="flex items-center justify-between p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 bg-background/40 border border-border/60 rounded-none group transition-all hover:border-primary/30">
+      <div className="flex items-center justify-between p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 level-0 border border-border/60 group transition-all hover:border-primary/30">
         <div className="flex items-center gap-3">
           <div className={cn(
-            "w-8 h-8 rounded-none flex items-center justify-center transition-all shadow-none",
+            "w-8 h-8 flex items-center justify-center transition-all",
             ldapConfig.use_tls ? "bg-primary/10 text-primary" : "bg-surface-bright text-muted"
           )}>
             <Lock size={14} />
@@ -133,12 +133,12 @@ export default function LdapManager({
         <button 
           onClick={() => setLdapConfig({...ldapConfig, use_tls: !ldapConfig.use_tls})}
           className={cn(
-            "w-10 h-5 rounded-none relative transition-all duration-300 shadow-none border",
+            "w-10 h-5 relative transition-all duration-300 border",
             ldapConfig.use_tls ? "bg-primary border-primary" : "bg-surface-bright border-border"
           )}
         >
           <div className={cn(
-            "absolute top-0.5 w-3.5 h-3.5 bg-white rounded-none transition-all shadow-none",
+            "absolute top-0.5 w-3.5 h-3.5 bg-black transition-all",
             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-none py-1.5 text-sm font-normal shadow-none shadow-none transition-all active:scale-95 disabled:opacity-50 flex items-center justify-center gap-2 border border-primary/30"
+          className="btn-secondary flex-1"
         >
           {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-none py-2 text-sm font-normal shadow-none shadow-none transition-all active:scale-95 flex items-center justify-center gap-2 border border-primary/30 tracking-tight"
+           className="btn-primary flex-[2]"
         >
           <Shield size={14} /> Save LDAP Policy
         </button>
diff --git a/frontend/tailwind.config.ts b/frontend/tailwind.config.ts
index 3cfe5e55..7ab35a3b 100644
--- a/frontend/tailwind.config.ts
+++ b/frontend/tailwind.config.ts
@@ -19,32 +19,108 @@ const config: Config = {
       '5xl': '48px',   // Design: headline-lg
       '6xl': '64px',
     },
+    spacing: {
+      px: "1px",
+      0: "0",
+      1: "4px",      // unit
+      2: "8px",      // stack-sm
+      3: "12px",
+      4: "16px",     // stack-md, gutter
+      6: "24px",     // container-gap
+      8: "32px",     // margin
+      12: "48px",
+      16: "64px",
+      20: "80px",
+      24: "96px",
+      32: "128px",
+    },
     extend: {
       fontFamily: {
         sans: ["'Space Grotesk'", "sans-serif"],
       },
       colors: {
+        // Base colors from DESIGN.md
         background: "#131313",
-        foreground: "#FFFFFF",
-        surface: "#0A0A0A",
-        "surface-container": "#121212",
-        "surface-bright": "#1A1A1A",
+        "on-background": "#e5e2e1",
+        foreground: "#e5e2e1",
+
+        // Surface tones from DESIGN.md
+        surface: {
+          DEFAULT: "#131313",
+          dim: "#131313",
+          bright: "#3a3939",
+          "container-lowest": "#0e0e0e",
+          "container-low": "#1c1b1b",
+          container: "#201f1f",
+          "container-high": "#2a2a2a",
+          "container-highest": "#353534",
+          variant: "#353534",
+        },
+
+        // Primary colors from DESIGN.md
         primary: {
-          DEFAULT: "#F58618",
-          foreground: "#000000",
+          DEFAULT: "#ffb781",
+          foreground: "#4e2600",
+          container: "#f58618",
+          "on-container": "#5b2d00",
+          fixed: "#ffdcc4",
+          "fixed-dim": "#ffb781",
+          "on-fixed": "#2f1400",
+          "on-fixed-variant": "#6f3800",
+          inverse: "#924c00",
         },
+
+        // Secondary colors from DESIGN.md
         secondary: {
-          DEFAULT: "#888888",
-          foreground: "#FFFFFF",
+          DEFAULT: "#c8c6c5",
+          foreground: "#303030",
+          container: "#474746",
+          "on-container": "#b7b5b4",
+          fixed: "#e5e2e1",
+          "fixed-dim": "#c8c6c5",
+          "on-fixed": "#1b1c1c",
+          "on-fixed-variant": "#474746",
         },
+
+        // Tertiary colors from DESIGN.md
+        tertiary: {
+          DEFAULT: "#00e639",
+          foreground: "#003907",
+          container: "#00bd2d",
+          "on-container": "#00440a",
+          fixed: "#72ff70",
+          "fixed-dim": "#00e639",
+          "on-fixed": "#002203",
+          "on-fixed-variant": "#00530e",
+        },
+
+        // Error colors from DESIGN.md
+        error: {
+          DEFAULT: "#ffb4ab",
+          foreground: "#690005",
+          container: "#93000a",
+          "on-container": "#ffdad6",
+        },
+
+        // Outline colors from DESIGN.md
+        outline: "#a48c7c",
+        "outline-variant": "#564335",
+
+        // Semantic surface colors (for compatibility)
         muted: {
-          DEFAULT: "#444444",
-          foreground: "#888888",
+          DEFAULT: "#474746",
+          foreground: "#a48c7c",
         },
-        border: "#222222",
-        success: "#00FF41",
-        error: "#FF3131",
-        warning: "#F58618",
+        border: {
+          DEFAULT: "#353534",
+          strong: "#ffb781",
+        },
+        success: {
+          DEFAULT: "#00e639",
+          foreground: "#003907",
+        },
+        warning: "#ffb781",
+        info: "#c8c6c5",
       },
       keyframes: {
         scan: {