diff --git a/frontend/app/admin/page.tsx b/frontend/app/admin/page.tsx
index df52aeb2..10e753fc 100644
--- a/frontend/app/admin/page.tsx
+++ b/frontend/app/admin/page.tsx
@@ -37,7 +37,7 @@ export default function AdminPage() {
           </div>
           <button
              onClick={admin.handleLogout}
-             className="ml-auto p-3 bg-surface border border-border text-secondary hover:text-rose-500 transition-all active:scale-95 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-offset-background focus-visible:ring-rose-500 focus-visible:outline-none"
+             className="ml-auto p-3 bg-surface border border-border text-secondary hover:text-error transition-all active:scale-95 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-offset-background focus-visible:ring-rose-500 focus-visible:outline-none"
              title="Secure Logout"
              aria-label="Logout from admin panel"
           >
diff --git a/frontend/app/inventory/page.tsx b/frontend/app/inventory/page.tsx
index 09fc9532..43e8927e 100644
--- a/frontend/app/inventory/page.tsx
+++ b/frontend/app/inventory/page.tsx
@@ -318,7 +318,7 @@ export default function InventoryPage() {
                 <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-secondary px-3 py-1 border border-border font-normal">
+                     <span className="text-xs bg-surface-container-lowest text-secondary px-3 py-1 border border-border font-normal">
                        In Stock: {selectedItem.quantity}
                      </span>
                    )}
@@ -402,11 +402,11 @@ export default function InventoryPage() {
                 </div>
               ) : (
                 <>
-                  <div className="flex p-1 bg-black border border-border mb-6">
+                  <div className="flex p-1 bg-surface-container-lowest 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-rose-500' }
+                      { id: 'REMOVE', label: 'Subtract', icon: Minus, color: 'text-primary' },
+                      { id: 'TRASH', label: 'Discard', icon: Trash2, color: 'text-error' }
                     ].map((t) => (
                       <button
                         key={t.id}
@@ -544,7 +544,7 @@ export default function InventoryPage() {
                     {getFilteredBoxes(existingBoxes).map(box => {
                         const itemCount = inventory.filter(i => i.box_label === box).length;
                         return (
-                          <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 key={box} className="bg-surface-container-lowest/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-secondary font-normal mt-0.5">{itemCount} Unique Records</p>
@@ -570,7 +570,7 @@ export default function InventoryPage() {
                )}
             </div>
             
-            <div className="p-4 bg-black border-t border-border flex items-center justify-center gap-2">
+            <div className="p-4 bg-surface-container-lowest border-t border-border flex items-center justify-center gap-2">
                 <div className="w-1 h-1 bg-primary animate-pulse" />
                 <p className="text-[10px] text-muted font-normal font-mono">TFM aInventory • Command Center • Box Protocols</p>
              </div>
@@ -579,15 +579,15 @@ export default function InventoryPage() {
       )}
 
       {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="fixed inset-0 z-[60] flex items-center justify-center p-4 bg-surface-container-lowest/95 animate-in zoom-in-95 duration-200">
            <div className="w-full max-w-md flex flex-col gap-4">
 
-              <div id="print-label-area" className="w-full bg-white p-6 shadow-none flex flex-col items-center gap-4 border-none">
+              <div id="print-label-area" className="w-full bg-primary/10 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="w-full aspect-[2/1] bg-primary/10 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-[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" />
diff --git a/frontend/app/items/create.tsx b/frontend/app/items/create.tsx
index 4bc602fc..561cb51f 100644
--- a/frontend/app/items/create.tsx
+++ b/frontend/app/items/create.tsx
@@ -256,7 +256,7 @@ export default function CreateItemPage() {
 
               {/* Error Message */}
               {error && (
-                <div className="p-3 bg-red-500/10 border border-red-500/30 rounded-none text-red-400 text-sm">
+                <div className="p-3 bg-error/10 border border-error/30 rounded-none text-error text-sm">
                   {error}
                 </div>
               )}
@@ -265,7 +265,7 @@ export default function CreateItemPage() {
               <div className="flex gap-3 pt-4">
                 <button
                   onClick={() => router.back()}
-                  className="flex-1 px-4 py-2 border border-border text-[#CCCCCC] rounded-none hover:border-slate-600 transition-colors font-normal"
+                  className="flex-1 px-4 py-2 border border-border text-[#CCCCCC] rounded-none hover:border-outline transition-colors font-normal"
                   disabled={isLoading}
                 >
                   Discard Draft
@@ -304,7 +304,7 @@ export default function CreateItemPage() {
             </div>
 
             {photoError && (
-              <div className="p-3 bg-red-500/10 border border-red-500/30 rounded-none text-red-400 text-sm mb-6">
+              <div className="p-3 bg-error/10 border border-error/30 rounded-none text-error text-sm mb-6">
                 {photoError}
               </div>
             )}
@@ -313,7 +313,7 @@ export default function CreateItemPage() {
             <div className="flex gap-3">
               <button
                 onClick={prevStep}
-                className="flex-1 px-4 py-2 border border-border text-[#CCCCCC] rounded-none hover:border-slate-600 transition-colors font-normal"
+                className="flex-1 px-4 py-2 border border-border text-[#CCCCCC] rounded-none hover:border-outline transition-colors font-normal"
               >
                 Back
               </button>
@@ -357,7 +357,7 @@ export default function CreateItemPage() {
                     setCropBounds(null);
                   }
                 }}
-                className="w-4 h-4 rounded border-slate-600 accent-primary"
+                className="w-4 h-4 rounded border-outline accent-primary"
               />
               <label htmlFor="use-full-photo" className="text-sm font-normal text-[#CCCCCC]">
                 Use full photo (skip cropping)
@@ -368,7 +368,7 @@ export default function CreateItemPage() {
             <div className="flex gap-3">
               <button
                 onClick={prevStep}
-                className="flex-1 px-4 py-2 border border-border text-[#CCCCCC] rounded-none hover:border-slate-600 transition-colors font-normal"
+                className="flex-1 px-4 py-2 border border-border text-[#CCCCCC] rounded-none hover:border-outline transition-colors font-normal"
               >
                 Back
               </button>
@@ -409,7 +409,7 @@ export default function CreateItemPage() {
               {uploadedPhoto && (
                 <div className="flex justify-between text-sm">
                   <span className="text-secondary">Photo:</span>
-                  <span className="font-normal text-green-400">Uploaded</span>
+                  <span className="font-normal text-tertiary">Uploaded</span>
                 </div>
               )}
             </div>
@@ -430,13 +430,13 @@ export default function CreateItemPage() {
             <div className="flex gap-3">
               <button
                 onClick={prevStep}
-                className="flex-1 px-4 py-2 border border-border text-[#CCCCCC] rounded-none hover:border-slate-600 transition-colors font-normal"
+                className="flex-1 px-4 py-2 border border-border text-[#CCCCCC] rounded-none hover:border-outline transition-colors font-normal"
               >
                 Back
               </button>
               <button
                 onClick={handleConfirm}
-                className="flex-1 px-4 py-2 bg-green-600 text-white rounded-none hover:bg-green-700 transition-colors font-normal flex items-center justify-center gap-2"
+                className="flex-1 px-4 py-2 bg-tertiary text-white rounded-none hover:hover:opacity-80 transition-colors font-normal flex items-center justify-center gap-2"
               >
                 Save & Close
               </button>
diff --git a/frontend/app/login/page.tsx b/frontend/app/login/page.tsx
index de16c017..b58ad87a 100644
--- a/frontend/app/login/page.tsx
+++ b/frontend/app/login/page.tsx
@@ -90,7 +90,7 @@ export default function LoginPage() {
                       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="w-10 h-10 bg-black flex items-center justify-center text-secondary group-hover:text-primary transition-colors border border-border">
+                      <div className="w-10 h-10 bg-surface-container-lowest 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">
@@ -100,7 +100,7 @@ export default function LoginPage() {
                     </button>
                   ))
                 ) : (
-                  <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>
+                  <p className="text-center text-xs text-error bg-error/10 p-4 border border-error/20">No local operators detected.</p>
                 )}
               </>
             ) : (
@@ -120,7 +120,7 @@ export default function LoginPage() {
                 
                 {!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">
+                     <div className="w-8 h-8 bg-surface-container-lowest 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>
diff --git a/frontend/app/logs/page.tsx b/frontend/app/logs/page.tsx
index 0b1a5e99..dde396fa 100644
--- a/frontend/app/logs/page.tsx
+++ b/frontend/app/logs/page.tsx
@@ -155,7 +155,7 @@ export default function LogsPage() {
               className={cn(
                 "px-5 py-2 text-xs font-normal transition-all whitespace-nowrap border",
                 filterAction === 'ALL' 
-                  ? "bg-white text-slate-950 border-white" 
+                  ? "bg-primary/10 text-on-background border-white" 
                   : "bg-surface/70 text-secondary border-border hover:border-border"
               )}
             >
diff --git a/frontend/app/page.tsx b/frontend/app/page.tsx
index 807e2c8a..a3cfd001 100644
--- a/frontend/app/page.tsx
+++ b/frontend/app/page.tsx
@@ -279,13 +279,13 @@ export default function Home() {
             <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: Ready</span>
+                  <div className="w-1.5 h-1.5 bg-tertiary" />
+                  <span className="text-xs font-normal text-tertiary/90 whitespace-nowrap">Scanner: Ready</span>
                 </div>
               )}
               <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'}`}>
+                <div className={`w-1.5 h-1.5 ${isOnline ? 'bg-tertiary animate-pulse' : 'bg-rose-500'}`} />
+                <span className={`text-xs font-normal whitespace-nowrap ${isOnline ? 'text-tertiary/90' : 'text-error/90'}`}>
                   Sync: {isOnline ? 'Active' : 'Offline'}
                 </span>
               </div>
diff --git a/frontend/components/AIOnboarding.tsx b/frontend/components/AIOnboarding.tsx
index e795781b..ff123212 100644
--- a/frontend/components/AIOnboarding.tsx
+++ b/frontend/components/AIOnboarding.tsx
@@ -138,7 +138,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
       ) : isLive ? (
         // LIVE VIEWFINDER MODE
         <div data-testid="wizard-step wizard-step-capture" className="flex-1 flex flex-col gap-3 md:gap-4 min-h-0 overflow-hidden">
-          <div data-testid="capture-camera" className="relative flex-1 min-h-0 rounded-none overflow-hidden border-4 border-slate-900 shadow-none bg-black">
+          <div data-testid="capture-camera" className="relative flex-1 min-h-0 rounded-none overflow-hidden border-4 border-outline shadow-none bg-surface-container-lowest">
             <video
               ref={videoRef}
               autoPlay
@@ -158,7 +158,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
                </div>
             </div>
             
-            <div className="absolute top-6 left-1/2 -translate-x-1/2 bg-black/60 px-4 py-1.5 rounded-none border border-white/10">
+            <div className="absolute top-6 left-1/2 -translate-x-1/2 bg-surface-container-lowest/60 px-4 py-1.5 rounded-none border border-white/10">
                <span className="text-xs font-normal text-white flex items-center gap-2">
                  <div className="w-1.5 h-1.5 rounded-none bg-red-500 animate-pulse" />
                  Live Viewfinder
@@ -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-on-background rounded-none font-normal text-lg shadow-none shadow-none cursor-pointer flex items-center justify-center gap-3 active:scale-95 hover:opacity-80 transition-all focus:ring-2 focus:ring-offset-2 focus:ring-offset-surface-container-high focus:ring-white focus:outline-none"
+              className="flex-1 py-4 bg-primary/10 text-on-background rounded-none font-normal text-lg shadow-none shadow-none cursor-pointer flex items-center justify-center gap-3 active:scale-95 hover:opacity-80 transition-all focus:ring-2 focus:ring-offset-2 focus:ring-offset-surface-container-high 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" />
@@ -189,15 +189,15 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
         </div>
       ) : extractedItems.length === 0 ? (
         <div data-testid="wizard-step" className="flex-1 flex flex-col gap-3 md:gap-4 min-h-0 overflow-hidden">
-          <div className="relative flex-1 min-h-0 rounded-none overflow-hidden border-4 border-slate-900 shadow-none bg-surface">
+          <div className="relative flex-1 min-h-0 rounded-none overflow-hidden border-4 border-outline shadow-none bg-surface">
             <img src={image || undefined} className="w-full h-full object-contain" alt="Captured label" />
-            <div className="absolute inset-0 bg-black/30 pointer-events-none" />
+            <div className="absolute inset-0 bg-surface-container-lowest/30 pointer-events-none" />
             
             {uploading && (
               <div className="absolute inset-0 bg-background/60 flex flex-col items-center justify-center gap-4 z-10 transition-all">
                 <div className="relative">
                   <RefreshCw className="w-12 h-12 text-primary animate-spin" />
-                  <Sparkles className="absolute -top-2 -right-2 text-amber-400 w-6 h-6 animate-pulse" />
+                  <Sparkles className="absolute -top-2 -right-2 text-primary/80 w-6 h-6 animate-pulse" />
                 </div>
                 <p className="text-white font-normal tracking-tight text-sm">Gemini is processing...</p>
               </div>
@@ -241,7 +241,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
           {/* Image Preview Section */}
           {image && (
             <div className="bg-surface/70 border border-border/50 rounded-none overflow-hidden">
-              <div className="relative h-40 md:h-48 bg-black/20 flex items-center justify-center">
+              <div className="relative h-40 md:h-48 bg-surface-container-lowest/20 flex items-center justify-center">
                 <img
                   src={image}
                   alt="Extracted label"
@@ -256,7 +256,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
                     id="save-photo-check"
                     checked={!extractedItems[editingIndex]._skipPhoto}
                     onChange={(e) => updateEditingItem({ _skipPhoto: !e.target.checked })}
-                    className="w-4 h-4 rounded border-slate-600 accent-primary cursor-pointer"
+                    className="w-4 h-4 rounded border-outline accent-primary cursor-pointer"
                   />
                   <label htmlFor="save-photo-check" className="text-xs text-[#CCCCCC] font-normal cursor-pointer">
                     Save this photo with the item
@@ -461,7 +461,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
                         setExtractedItems(newItems);
                     }}
                     aria-label={`Delete item: ${item.Item || item.name}`}
-                    className="p-3 lg:p-4 xl:p-5 lg:p-6 xl:p-8 text-secondary hover:text-red-500 cursor-pointer transition-colors focus:ring-2 focus:ring-red-500 focus:outline-none rounded-none"
+                    className="p-3 lg:p-4 xl:p-5 lg:p-6 xl:p-8 text-secondary hover:text-error cursor-pointer transition-colors focus:ring-2 focus:ring-red-500 focus:outline-none rounded-none"
                    >
                      <X size={20} />
                    </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-surface-200 focus:ring-2 focus:ring-offset-2 focus:ring-offset-slate-950 focus:ring-white focus:outline-none"
+              className="py-5 bg-primary/10 text-on-background 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-surface-container-high focus:ring-white focus:outline-none"
             >
               Add {extractedItems.length} items to catalog
             </button>
@@ -492,7 +492,7 @@ export default function AIOnboarding({ onCancel, onComplete, categories, invento
               }}
               data-testid="reject-extraction"
               aria-label="Discard discovery session"
-              className="py-3 text-xs text-secondary font-normal cursor-pointer hover:text-secondary transition-colors focus:ring-2 focus:ring-slate-500 focus:outline-none rounded px-2"
+              className="py-3 text-xs text-secondary font-normal cursor-pointer hover:text-secondary transition-colors focus:ring-2 focus:ring-primary focus:outline-none rounded px-2"
             >
               Discard Discovery
             </button>
diff --git a/frontend/components/AdminOverlay.tsx b/frontend/components/AdminOverlay.tsx
index 2c8a638a..31524894 100644
--- a/frontend/components/AdminOverlay.tsx
+++ b/frontend/components/AdminOverlay.tsx
@@ -113,11 +113,11 @@ export default function AdminOverlay({
         loading={confirmState.loading}
         dangerLevel={confirmState.affectedCount && confirmState.affectedCount > 10 ? 'high' : 'medium'}
       />
-      <div data-testid="admin-overlay" className="fixed inset-0 z-50 bg-black/80 animate-in fade-in duration-300">
+      <div data-testid="admin-overlay" className="fixed inset-0 z-50 bg-surface-container-lowest/80 animate-in fade-in duration-300">
       <div className="absolute inset-y-0 right-0 w-full max-w-md sm:max-w-lg md:max-w-md level-0 border-l border-border shadow-none flex flex-col animate-in slide-in-from-right duration-500">
         <div className="p-3 md:p-6 border-b border-border flex items-center justify-between">
           <div className="flex items-center gap-3">
-            <div className="p-2 bg-black text-primary border border-border">
+            <div className="p-2 bg-surface-container-lowest text-primary border border-border">
               <Shield size={20} />
             </div>
             <h2 className="text-xl font-normal text-white">System Admin</h2>
@@ -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-secondary focus-visible:ring-2 focus-visible:ring-primary focus-visible:outline-none"
+            className="p-2 hover:bg-surface-container-lowest 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} />
@@ -151,7 +151,7 @@ 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-secondary border border-border"}`}>
+                    <div className={`p-2 ${u.role === 'admin' ? "bg-primary/20 text-primary border border-primary/30" : "bg-surface-container-lowest text-secondary border border-border"}`}>
                       <User size={16} />
                     </div>
                     <div>
@@ -171,7 +171,7 @@ export default function AdminOverlay({
                           loading: false,
                         });
                       }}
-                      className="p-2 text-rose-500 hover:bg-rose-500/10 transition-all focus-visible:ring-2 focus-visible:ring-rose-500 focus-visible:outline-none"
+                      className="p-2 text-error hover:bg-error/10 transition-all focus-visible:ring-2 focus-visible:ring-rose-500 focus-visible:outline-none"
                       aria-label={`Delete user ${u.username}`}
                     >
                       <Trash2 size={16} />
@@ -220,7 +220,7 @@ export default function AdminOverlay({
                          loading: false,
                        });
                      }}
-                     className="p-2 text-rose-500 hover:bg-rose-500/10 transition-all focus-visible:ring-2 focus-visible:ring-rose-500 focus-visible:outline-none"
+                     className="p-2 text-error hover:bg-error/10 transition-all focus-visible:ring-2 focus-visible:ring-rose-500 focus-visible:outline-none"
                      aria-label={`Delete category ${cat.name}`}
                   >
                      <Trash2 size={16} />
@@ -231,7 +231,7 @@ export default function AdminOverlay({
           </section>
 
           <section className="p-4 md:p-6 level-1 space-y-2 md:space-y-3">
-            <div className="flex items-center gap-2 text-rose-500">
+            <div className="flex items-center gap-2 text-error">
               <AlertTriangle size={16} />
               <p className="text-sm font-normal">Sign Out</p>
             </div>
@@ -241,7 +241,7 @@ export default function AdminOverlay({
                 import('@/lib/auth').then(m => m.clearAuth());
                 window.location.href = '/login';
               }}
-              className="w-full bg-rose-500/10 hover:bg-rose-500/20 text-rose-500 border border-rose-500/20 font-normal py-3 transition-all flex items-center justify-center gap-2 focus-visible:ring-2 focus-visible:ring-rose-500 focus-visible:outline-none"
+              className="w-full bg-error/10 hover:bg-error/20 text-error border border-error/20 font-normal py-3 transition-all flex items-center justify-center gap-2 focus-visible:ring-2 focus-visible:ring-rose-500 focus-visible:outline-none"
             >
               <LogOut size={16} /> Sign Out
             </button>
diff --git a/frontend/components/BottomNav.tsx b/frontend/components/BottomNav.tsx
index 85ae6320..807f8deb 100644
--- a/frontend/components/BottomNav.tsx
+++ b/frontend/components/BottomNav.tsx
@@ -79,7 +79,7 @@ export default function BottomNav({
             }
           }}
           aria-label="Logout"
-          className="flex flex-col items-center gap-1 text-rose-500 hover:text-rose-400 cursor-pointer transition-colors rounded-none px-2 py-1 focus:ring-2 focus:ring-rose-500 focus:outline-none"
+          className="flex flex-col items-center gap-1 text-error hover:text-error cursor-pointer transition-colors rounded-none px-2 py-1 focus:ring-2 focus:ring-rose-500 focus:outline-none"
         >
           <LogOut size={20} />
           <span className="text-xs font-normal transition-all">Logout</span>
diff --git a/frontend/components/CameraView.tsx b/frontend/components/CameraView.tsx
index dac3e208..c0aae459 100644
--- a/frontend/components/CameraView.tsx
+++ b/frontend/components/CameraView.tsx
@@ -69,12 +69,12 @@ export default function CameraView({
           </div>
         </div>
 
-        <div id={scannerId} data-testid="camera-indicator" className="w-full h-full bg-black object-cover" />
+        <div id={scannerId} data-testid="camera-indicator" className="w-full h-full bg-surface-container-lowest object-cover" />
 
         {/* Selection UI */}
         {isSelecting && capturedImage && (
-          <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">
+          <div className="absolute inset-0 z-50 bg-surface-container-lowest flex flex-col">
+            <div className="relative flex-1 bg-surface-container-lowest flex items-center justify-center overflow-hidden">
               <img
                 src={capturedImage || undefined}
                 className="max-w-full max-h-full object-contain"
@@ -114,7 +114,7 @@ export default function CameraView({
 
         {/* Countdown */}
         {countdown !== null && (
-          <div className="absolute inset-0 z-40 bg-black/40 flex items-center justify-center">
+          <div className="absolute inset-0 z-40 bg-surface-container-lowest/40 flex items-center justify-center">
             <span className="text-8xl font-normal text-white animate-ping">{countdown}</span>
           </div>
         )}
@@ -123,7 +123,7 @@ export default function CameraView({
         {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>
+            <span className="text-xs text-primary bg-surface-container-lowest/80 px-3 py-1 border border-primary/20">Analyzing Surface Protocols...</span>
           </div>
         )}
       </div>
@@ -159,7 +159,7 @@ export default function CameraView({
 
         <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"
+          className="p-4 bg-surface-container border border-border text-secondary hover:text-error flex items-center justify-center transition-all"
           title="Close Camera"
         >
           <X size={20} />
diff --git a/frontend/components/CategoryCreationModal.tsx b/frontend/components/CategoryCreationModal.tsx
index 6d739acf..c42371da 100644
--- a/frontend/components/CategoryCreationModal.tsx
+++ b/frontend/components/CategoryCreationModal.tsx
@@ -50,7 +50,7 @@ export default function CategoryCreationModal({
   };
 
   return (
-    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/40">
+    <div className="fixed inset-0 z-50 flex items-center justify-center bg-surface-container-lowest/40">
       <div className="bg-surface border border-border rounded-none shadow-none max-w-sm w-full mx-4">
         <div className="flex items-center justify-between p-6 lg:p-8 xl:p-10 border-b border-border">
           <div className="flex items-center gap-3">
@@ -99,8 +99,8 @@ export default function CategoryCreationModal({
           </div>
 
           {error && (
-            <div className="p-3 lg:p-4 xl:p-5 lg:p-6 xl:p-8 bg-rose-500/10 border border-rose-500/20 rounded">
-              <p className="text-sm lg:text-base xl:text-lg lg:text-xl xl:text-2xl lg:text-3xl xl:text-4xl text-rose-400">{error}</p>
+            <div className="p-3 lg:p-4 xl:p-5 lg:p-6 xl:p-8 bg-error/10 border border-error/20 rounded">
+              <p className="text-sm lg:text-base xl:text-lg lg:text-xl xl:text-2xl lg:text-3xl xl:text-4xl text-error">{error}</p>
             </div>
           )}
 
diff --git a/frontend/components/ConfirmationModal.tsx b/frontend/components/ConfirmationModal.tsx
index 9c24589b..2e95a854 100644
--- a/frontend/components/ConfirmationModal.tsx
+++ b/frontend/components/ConfirmationModal.tsx
@@ -54,12 +54,12 @@ export default function ConfirmationModal({
   };
 
   return (
-    <div data-testid="confirmation-modal" className="fixed inset-0 z-50 flex items-center justify-center bg-black/40">
+    <div data-testid="confirmation-modal" className="fixed inset-0 z-50 flex items-center justify-center bg-surface-container-lowest/40">
       <div className="bg-surface border border-border shadow-none max-w-sm w-full mx-4">
         {/* Header */}
         <div className="flex items-center justify-between p-6 border-b border-border">
           <div className="flex items-center gap-3">
-            <div className="p-2 bg-rose-500/10 text-rose-500">
+            <div className="p-2 bg-error/10 text-error">
               <AlertTriangle size={20} />
             </div>
             <h2 className="text-lg font-normal text-white">{title}</h2>
@@ -81,7 +81,7 @@ export default function ConfirmationModal({
 
           {/* Item Name (if provided) */}
           {itemName && (
-            <div className="bg-black/40 border border-border p-3">
+            <div className="bg-surface-container-lowest/40 border border-border p-3">
               <p className="text-xs text-muted font-normal">Item</p>
               <p className="text-sm font-mono text-white mt-1">{itemName}</p>
             </div>
@@ -89,9 +89,9 @@ export default function ConfirmationModal({
 
           {/* Consequence Warning */}
           {consequence && (
-            <div className="flex gap-2 p-3 bg-rose-500/5 border border-rose-500/20">
-              <span className="text-rose-500 flex-shrink-0">⚠</span>
-              <p className="text-sm text-rose-400">{consequence}</p>
+            <div className="flex gap-2 p-3 bg-error/5 border border-error/20">
+              <span className="text-error flex-shrink-0">⚠</span>
+              <p className="text-sm text-error">{consequence}</p>
             </div>
           )}
 
@@ -107,7 +107,7 @@ export default function ConfirmationModal({
           {/* High-Risk Warning & Confirmation Input */}
           {requiresTextConfirm && (
             <div className="space-y-3 pt-2 border-t border-border">
-              <p className="text-sm font-normal text-rose-400">
+              <p className="text-sm font-normal text-error">
                 Type "Delete" to confirm this high-risk action
               </p>
               <input
@@ -127,7 +127,7 @@ export default function ConfirmationModal({
                 }}
               />
               {error && (
-                <p className="text-xs text-rose-500">{error}</p>
+                <p className="text-xs text-error">{error}</p>
               )}
             </div>
           )}
@@ -146,7 +146,7 @@ export default function ConfirmationModal({
             onClick={handleConfirm}
             data-testid="confirm-action"
             disabled={loading || !canConfirm}
-            className="flex-1 px-4 py-2.5 bg-red-600 text-white font-normal hover:bg-red-700 cursor-pointer transition-colors disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center gap-2 focus:outline-none"
+            className="flex-1 px-4 py-2.5 bg-error text-white font-normal hover:hover:opacity-80 cursor-pointer transition-colors disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center gap-2 focus:outline-none"
           >
             {loading ? (
               <>
diff --git a/frontend/components/CreateUserModal.tsx b/frontend/components/CreateUserModal.tsx
index c7522d9a..a5f09d03 100644
--- a/frontend/components/CreateUserModal.tsx
+++ b/frontend/components/CreateUserModal.tsx
@@ -70,7 +70,7 @@ export default function CreateUserModal({ show, onClose, onUserCreated }: Create
   const isFormValid = username.trim() && password.length >= 6 && !Object.keys(errors).length;
 
   return (
-    <div data-testid="create-user-modal" className="fixed inset-0 z-50 flex items-center justify-center bg-black/40">
+    <div data-testid="create-user-modal" className="fixed inset-0 z-50 flex items-center justify-center bg-surface-container-lowest/40">
       <div className="bg-surface border border-border rounded-none shadow-none max-w-sm w-full mx-4">
         {/* Header */}
         <div className="flex items-center justify-between p-6 border-b border-border">
@@ -107,7 +107,7 @@ export default function CreateUserModal({ show, onClose, onUserCreated }: Create
               disabled={loading}
             />
             {errors.username && (
-              <p className="mt-1.5 text-sm lg:text-base xl:text-lg lg:text-xl xl:text-2xl lg:text-3xl xl:text-4xl text-red-500">{errors.username}</p>
+              <p className="mt-1.5 text-sm lg:text-base xl:text-lg lg:text-xl xl:text-2xl lg:text-3xl xl:text-4xl text-error">{errors.username}</p>
             )}
           </div>
 
@@ -132,7 +132,7 @@ export default function CreateUserModal({ show, onClose, onUserCreated }: Create
               disabled={loading}
             />
             {errors.password && (
-              <p className="mt-1.5 text-sm lg:text-base xl:text-lg lg:text-xl xl:text-2xl lg:text-3xl xl:text-4xl text-red-500">{errors.password}</p>
+              <p className="mt-1.5 text-sm lg:text-base xl:text-lg lg:text-xl xl:text-2xl lg:text-3xl xl:text-4xl text-error">{errors.password}</p>
             )}
           </div>
 
diff --git a/frontend/components/DebugRotationPanel.tsx b/frontend/components/DebugRotationPanel.tsx
index 46da82df..48d0dbcf 100644
--- a/frontend/components/DebugRotationPanel.tsx
+++ b/frontend/components/DebugRotationPanel.tsx
@@ -282,7 +282,7 @@ export function DebugRotationPanel({
   }, [imageLoaded, rotation, displayCropBounds, scaledDimensions, adjustedCropBounds]);
 
   return (
-    <div className="fixed inset-0 bg-black/80 flex items-center justify-center z-50 p-4">
+    <div className="fixed inset-0 bg-surface-container-lowest/80 flex items-center justify-center z-50 p-4">
       <div className="bg-surface-container border border-border rounded-none shadow-none max-w-6xl w-full max-h-[95vh] overflow-hidden flex flex-col">
         {/* Header */}
         <div className="p-3 border-b border-border flex items-center justify-between bg-surface-bright flex-shrink-0">
@@ -367,7 +367,7 @@ export function DebugRotationPanel({
             {/* Canvas - takes most space */}
             <div className="flex-1 flex flex-col bg-surface-bright p-3 rounded border border-border overflow-hidden">
               <h3 className="text-xs font-normal text-white mb-2">Preview (Green = Crop, Orange = Rotation)</h3>
-              <div className="flex-1 flex items-center justify-center bg-black/70 rounded border border-slate-600 overflow-auto">
+              <div className="flex-1 flex items-center justify-center bg-surface-container-lowest/70 rounded border border-outline overflow-auto">
                 <canvas
                   ref={canvasRef}
                   className="rounded cursor-move"
@@ -381,7 +381,7 @@ export function DebugRotationPanel({
 
             {/* Log - single line */}
             <div className="bg-surface-bright p-2 rounded border border-border flex-shrink-0">
-              <div className="bg-black text-green-400 p-2 rounded font-mono text-xs">
+              <div className="bg-surface-container-lowest text-tertiary p-2 rounded-none font-mono text-xs">
                 {log}
               </div>
             </div>
diff --git a/frontend/components/IdentityCheckOverlay.tsx b/frontend/components/IdentityCheckOverlay.tsx
index c9827992..5928e7bf 100644
--- a/frontend/components/IdentityCheckOverlay.tsx
+++ b/frontend/components/IdentityCheckOverlay.tsx
@@ -168,7 +168,7 @@ const IdentityCheckOverlay = memo(({ show, users, onAuthenticated }: IdentityChe
                 </div>
                 <button 
                   onClick={() => setSelectedUserForLogin(null)}
-                  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 rounded-none transition-all text-secondary hover:text-rose-500"
+                  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 rounded-none transition-all text-secondary hover:text-error"
                   title="Change User"
                 >
                   <X size={18} />
diff --git a/frontend/components/ImageAdjustmentModal.tsx b/frontend/components/ImageAdjustmentModal.tsx
index a68651a5..43e2e7e6 100644
--- a/frontend/components/ImageAdjustmentModal.tsx
+++ b/frontend/components/ImageAdjustmentModal.tsx
@@ -199,7 +199,7 @@ export function ImageAdjustmentModal({ imageUrl, onConfirm, onCancel }: ImageAdj
   };
 
   return (
-    <div className="fixed inset-0 bg-black/80 flex items-center justify-center z-50 p-4">
+    <div className="fixed inset-0 bg-surface-container-lowest/80 flex items-center justify-center z-50 p-4">
       <div className="bg-surface-container border border-border rounded-none shadow-none max-w-6xl w-full max-h-[95vh] overflow-hidden flex flex-col">
         {/* Header */}
         <div className="p-4 border-b border-border flex items-center justify-between bg-surface-bright">
@@ -279,7 +279,7 @@ export function ImageAdjustmentModal({ imageUrl, onConfirm, onCancel }: ImageAdj
           {/* Center: Canvas */}
           <div className="flex-1 flex flex-col bg-surface-bright p-4 rounded border border-border overflow-hidden">
             <h3 className="text-sm font-normal text-white mb-2">Image Preview</h3>
-            <div className="flex-1 flex items-center justify-center bg-black/50 rounded border border-slate-600 overflow-hidden">
+            <div className="flex-1 flex items-center justify-center bg-surface-container-lowest/50 rounded border border-outline overflow-hidden">
               <canvas
                 ref={canvasRef}
                 onWheel={handleWheel}
diff --git a/frontend/components/InventoryTable.tsx b/frontend/components/InventoryTable.tsx
index 7186c0d4..ffb878d1 100644
--- a/frontend/components/InventoryTable.tsx
+++ b/frontend/components/InventoryTable.tsx
@@ -62,11 +62,11 @@ export default function InventoryTable({
         return (
           <div key={cat} className="level-1 transition-all">
             <div
-              className="w-full p-4 flex items-center justify-between hover:bg-black/30 transition-colors cursor-pointer"
+              className="w-full p-4 flex items-center justify-between hover:bg-surface-container-lowest/30 transition-colors cursor-pointer"
               onClick={() => onExpandCategory(expandedCategory === cat ? null : cat)}
             >
               <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">
+                <div className="w-10 h-10 bg-surface-container-lowest flex items-center justify-center text-primary border border-primary/20 transition-colors">
                   <Layers size={20} />
                 </div>
                 <div className="text-left">
@@ -84,7 +84,7 @@ export default function InventoryTable({
                       e.stopPropagation();
                       onEditCategory(cat);
                     }}
-                    className="p-2 hover:bg-black text-secondary hover:text-primary transition-colors border border-transparent hover:border-border"
+                    className="p-2 hover:bg-surface-container-lowest text-secondary hover:text-primary transition-colors border border-transparent hover:border-border"
                   >
                     <EditIcon size={16} />
                   </button>
@@ -97,7 +97,7 @@ export default function InventoryTable({
                 {categoryItems.map(item => (
                   <div
                     key={item.id}
-                    className="bg-black/40 p-4 flex items-center justify-between hover:bg-black/20 transition-colors"
+                    className="bg-surface-container-lowest/40 p-4 flex items-center justify-between hover:bg-surface-container-lowest/20 transition-colors"
                   >
                     <div
                       onClick={() => handleItemClick(item)}
@@ -119,7 +119,7 @@ export default function InventoryTable({
                           />
                         </div>
                       ) : (
-                        <div className="w-12 h-12 bg-black flex items-center justify-center text-primary shrink-0 border border-primary/20">
+                        <div className="w-12 h-12 bg-surface-container-lowest flex items-center justify-center text-primary shrink-0 border border-primary/20">
                           <Package size={20} />
                         </div>
                       )}
@@ -133,7 +133,7 @@ export default function InventoryTable({
                     <div className="text-right shrink-0">
                       <p className={cn(
                         "text-xl font-normal tabular-nums leading-none",
-                        item.quantity <= (item.min_quantity || 0) ? "text-rose-500" : "text-primary"
+                        item.quantity <= (item.min_quantity || 0) ? "text-error" : "text-primary"
                       )}>
                         {item.quantity}
                       </p>
diff --git a/frontend/components/ItemComparisonModal.tsx b/frontend/components/ItemComparisonModal.tsx
index 9ca1fa89..e6111797 100644
--- a/frontend/components/ItemComparisonModal.tsx
+++ b/frontend/components/ItemComparisonModal.tsx
@@ -45,7 +45,7 @@ export default function ItemComparisonModal({
     <div className="fixed inset-0 z-[200] flex items-center justify-center p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 bg-background/80">
       <div className="bg-surface border border-border rounded-none p-8 w-full max-w-2xl shadow-none max-h-[90vh] overflow-y-auto">
         <div className="flex items-center gap-3 mb-6">
-          <AlertTriangle size={24} className="text-amber-500" />
+          <AlertTriangle size={24} className="text-primary" />
           <div>
             <h3 className="text-xl font-normal text-white">Part Number Already Exists</h3>
             <p className="text-xs text-secondary mt-1">Compare the versions below</p>
@@ -69,11 +69,11 @@ export default function ItemComparisonModal({
               <div
                 key={field.key}
                 className={`grid grid-cols-3 gap-4 p-3 lg:p-4 xl:p-5 lg:p-6 xl:p-8 rounded-none ${
-                  different ? 'bg-amber-500/10 border border-amber-500/20' : 'bg-surface-bright/30'
+                  different ? 'bg-primary/10 border border-amber-500/20' : 'bg-surface-bright/30'
                 }`}
               >
                 <div className="text-sm font-normal text-secondary">{field.label}</div>
-                <div className={`text-sm font-mono ${different ? 'text-amber-200' : 'text-secondary'}`}>
+                <div className={`text-sm font-mono ${different ? 'text-outline-variant' : 'text-secondary'}`}>
                   {existing}
                 </div>
                 <div className={`text-sm font-mono ${different ? 'text-primary font-normal' : 'text-secondary'}`}>
diff --git a/frontend/components/ItemDetailModal.tsx b/frontend/components/ItemDetailModal.tsx
index 56e97440..649de974 100644
--- a/frontend/components/ItemDetailModal.tsx
+++ b/frontend/components/ItemDetailModal.tsx
@@ -68,7 +68,7 @@ export default function ItemDetailModal({
   };
 
   return (
-    <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="fixed inset-0 bg-surface-container-lowest/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 bg-surface-bright border-b border-border p-4 md:p-6 flex items-center justify-between z-10">
@@ -80,7 +80,7 @@ export default function ItemDetailModal({
             {currentPhoto && (
               <button
                 onClick={() => setShowDebugPanel(true)}
-                className="p-3 bg-black border border-border text-primary hover:text-white transition-colors"
+                className="p-3 bg-surface-container-lowest border border-border text-primary hover:text-white transition-colors"
                 title="Debug rotation & crop"
               >
                 <Wrench size={20} />
@@ -88,7 +88,7 @@ export default function ItemDetailModal({
             )}
             <button
               onClick={onClose}
-              className="p-3 bg-black border border-border text-secondary hover:text-white transition-colors"
+              className="p-3 bg-surface-container-lowest border border-border text-secondary hover:text-white transition-colors"
             >
               <X size={20} />
             </button>
@@ -124,7 +124,7 @@ export default function ItemDetailModal({
               <>
                 {currentPhoto ? (
                   <div className="space-y-3">
-                    <div className="relative bg-black border border-border overflow-hidden aspect-video">
+                    <div className="relative bg-surface-container-lowest border border-border overflow-hidden aspect-video">
                       <img
                         src={buildPhotoUrl(backendUrl, currentPhoto.full_url)}
                         alt={item.name}
@@ -141,14 +141,14 @@ export default function ItemDetailModal({
                       <button
                         onClick={handleDeletePhoto}
                         disabled={isDeleting}
-                        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"
+                        className="px-4 py-3 bg-error/10 border border-error/30 text-error hover:bg-error/20 disabled:opacity-50 transition-colors text-xs"
                       >
                         <Trash2 size={16} />
                       </button>
                     </div>
                   </div>
                 ) : (
-                  <div className="bg-black border border-border p-12 text-center flex flex-col items-center gap-4">
+                  <div className="bg-surface-container-lowest 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>
@@ -163,7 +163,7 @@ export default function ItemDetailModal({
                 )}
               </>
             ) : (
-              <div ref={photoUploadRef} className="bg-black border border-border p-4 md:p-6 animate-in slide-in-from-top-2 duration-300">
+              <div ref={photoUploadRef} className="bg-surface-container-lowest 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
@@ -185,7 +185,7 @@ export default function ItemDetailModal({
           </div>
         </div>
 
-        <div className="p-4 bg-black border-t border-border flex justify-end">
+        <div className="p-4 bg-surface-container-lowest border-t border-border flex justify-end">
            <button 
              onClick={onClose}
              className="btn-secondary px-8 py-2 text-xs"
diff --git a/frontend/components/ItemPhotoUpload.tsx b/frontend/components/ItemPhotoUpload.tsx
index 4504e959..928b7285 100644
--- a/frontend/components/ItemPhotoUpload.tsx
+++ b/frontend/components/ItemPhotoUpload.tsx
@@ -148,7 +148,7 @@ export default function ItemPhotoUpload({
       )}
 
       {localError && (
-        <div className="text-sm text-rose-500">{localError}</div>
+        <div className="text-sm text-error">{localError}</div>
       )}
     </div>
   );
diff --git a/frontend/components/LogsOverlay.tsx b/frontend/components/LogsOverlay.tsx
index 76fb41f6..98b8cc43 100644
--- a/frontend/components/LogsOverlay.tsx
+++ b/frontend/components/LogsOverlay.tsx
@@ -22,7 +22,7 @@ export default function LogsOverlay({ show, onClose, logs, inventory }: LogsOver
         </div>
         <button 
           onClick={onClose}
-          className="p-3 bg-black border border-border text-secondary hover:text-white transition-colors"
+          className="p-3 bg-surface-container-lowest border border-border text-secondary hover:text-white transition-colors"
         >
           <X size={24} />
         </button>
@@ -40,7 +40,7 @@ export default function LogsOverlay({ show, onClose, logs, inventory }: LogsOver
               <div className="flex-1 min-w-0">
                 <div className="flex items-center gap-2 mb-1">
                   <p className={`text-xs font-normal ${
-                    log.action.includes('CHECK_IN') ? "text-green-500" : (log.action.includes('TRASH') ? "text-rose-500" : "text-amber-500")
+                    log.action.includes('CHECK_IN') ? "text-tertiary" : (log.action.includes('TRASH') ? "text-error" : "text-primary")
                   }`}>
                     {log.action}
                   </p>
@@ -58,7 +58,7 @@ export default function LogsOverlay({ show, onClose, logs, inventory }: LogsOver
                       {new Date(log.timestamp).toLocaleString()}
                     </p>
                     {log.details && (
-                      <span className="text-xs bg-black text-muted px-2 py-0.5 border border-border font-mono">
+                      <span className="text-xs bg-surface-container-lowest text-muted px-2 py-0.5 border border-border font-mono">
                         {log.details}
                       </span>
                     )}
@@ -67,7 +67,7 @@ export default function LogsOverlay({ show, onClose, logs, inventory }: LogsOver
               </div>
               <div className="text-right">
                 <p className={`text-lg font-normal ${
-                  log.quantity_change > 0 ? "text-green-400" : "text-rose-400"
+                  log.quantity_change > 0 ? "text-tertiary" : "text-error"
                 }`}>
                   {log.quantity_change > 0 ? '+' : ''}{log.quantity_change}
                 </p>
diff --git a/frontend/components/LogsTable.tsx b/frontend/components/LogsTable.tsx
index 19aa93af..8cdbd425 100644
--- a/frontend/components/LogsTable.tsx
+++ b/frontend/components/LogsTable.tsx
@@ -70,11 +70,11 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
                 <div className="mb-2 md:mb-0">
                   <div className={cn(
                     "text-[10px] font-normal px-2 py-0.5 border text-center inline-block min-w-[100px]",
-                    log.action.includes('CHECK_IN') ? "bg-green-500/10 text-green-500 border-green-500/20" :
-                    (log.action.includes('TRASH') ? "bg-rose-500/10 text-rose-500 border-rose-500/20" :
-                     (log.action.includes('DB') ? "bg-sky-500/10 text-sky-400 border-sky-500/20" :
-                      (log.action.includes('DELETE') ? "bg-red-500/10 text-red-500 border-red-500/30" :
-                       (log.action.includes('CREATE') ? "bg-indigo-500/10 text-indigo-400 border-indigo-500/20" : "bg-primary/10 text-primary border-primary/20"))))
+                    log.action.includes('CHECK_IN') ? "bg-tertiary/10 text-tertiary border-tertiary/20" :
+                    (log.action.includes('TRASH') ? "bg-error/10 text-error border-error/20" :
+                     (log.action.includes('DB') ? "bg-secondary/10 text-secondary border-secondary/20" :
+                      (log.action.includes('DELETE') ? "bg-error/10 text-error border-error/30" :
+                       (log.action.includes('CREATE') ? "bg-primary/10 text-primary border-primary/20" : "bg-primary/10 text-primary border-primary/20"))))
                   )}>
                     {log.action.replace('_', ' ').toLowerCase().replace(/\b\w/g, l => l.toUpperCase())}
                   </div>
@@ -96,7 +96,7 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
 
                 <div className={cn(
                   "text-base md:text-sm font-normal tabular-nums text-right",
-                  (log.quantity_change || 0) > 0 ? "text-green-500" : ((log.quantity_change || 0) < 0 ? "text-rose-500" : "text-primary/50")
+                  (log.quantity_change || 0) > 0 ? "text-tertiary" : ((log.quantity_change || 0) < 0 ? "text-error" : "text-primary/50")
                 )}>
                   {log.quantity_change ? (log.quantity_change > 0 ? `+${log.quantity_change}` : log.quantity_change) : (log.action.includes('DB') ? 'SYS' : '±')}
                 </div>
@@ -122,7 +122,7 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
                 <div className={cn(
                   "text-xs font-normal px-3 py-1 border inline-block",
                   selectedLog.action.includes('CHECK_IN') ? "status-success" :
-                  (selectedLog.action.includes('TRASH') ? "bg-rose-500 text-black" : "status-alert")
+                  (selectedLog.action.includes('TRASH') ? "bg-error text-on-error" : "status-alert")
                 )}>
                   {selectedLog.action.replace('_', ' ').toLowerCase()}
                 </div>
@@ -144,7 +144,7 @@ export default function LogsTable({ logs, loading }: LogsTableProps) {
                 <p className="text-[10px] font-normal text-secondary">Quantity Delta</p>
                 <p className={cn(
                   "text-xl font-normal tabular-nums",
-                  (selectedLog.quantity_change || 0) > 0 ? "text-green-500" : "text-rose-500"
+                  (selectedLog.quantity_change || 0) > 0 ? "text-tertiary" : "text-error"
                 )}>
                   {selectedLog.quantity_change
                     ? `${selectedLog.quantity_change > 0 ? '+' : ''}${selectedLog.quantity_change}`
diff --git a/frontend/components/ManualCropUI.tsx b/frontend/components/ManualCropUI.tsx
index c0efe13b..e6f14bf1 100644
--- a/frontend/components/ManualCropUI.tsx
+++ b/frontend/components/ManualCropUI.tsx
@@ -69,7 +69,7 @@ export default function ManualCropUI({
     return (
       <div className="flex items-center justify-center p-8 bg-surface-container rounded-none">
         <div className="text-center">
-          <p className="text-rose-500">{error}</p>
+          <p className="text-error">{error}</p>
         </div>
       </div>
     );
@@ -219,7 +219,7 @@ export default function ManualCropUI({
           <div className="absolute inset-0 pointer-events-none">
             {/* Top overlay */}
             <div
-              className="absolute left-0 right-0 bg-black/40"
+              className="absolute left-0 right-0 bg-surface-container-lowest/40"
               style={{
                 top: 0,
                 height: `${crop.y * scale}px`,
@@ -227,7 +227,7 @@ export default function ManualCropUI({
             />
             {/* Bottom overlay */}
             <div
-              className="absolute left-0 right-0 bg-black/40"
+              className="absolute left-0 right-0 bg-surface-container-lowest/40"
               style={{
                 top: `${(crop.y + crop.height) * scale}px`,
                 bottom: 0,
@@ -235,7 +235,7 @@ export default function ManualCropUI({
             />
             {/* Left overlay */}
             <div
-              className="absolute top-0 bottom-0 bg-black/40"
+              className="absolute top-0 bottom-0 bg-surface-container-lowest/40"
               style={{
                 left: 0,
                 width: `${crop.x * scale}px`,
@@ -245,7 +245,7 @@ export default function ManualCropUI({
             />
             {/* Right overlay */}
             <div
-              className="absolute top-0 bottom-0 bg-black/40"
+              className="absolute top-0 bottom-0 bg-surface-container-lowest/40"
               style={{
                 left: `${(crop.x + crop.width) * scale}px`,
                 right: 0,
diff --git a/frontend/components/NewItemDialog.tsx b/frontend/components/NewItemDialog.tsx
index 62d0e42d..0ea2775a 100644
--- a/frontend/components/NewItemDialog.tsx
+++ b/frontend/components/NewItemDialog.tsx
@@ -26,9 +26,9 @@ export default function NewItemDialog({ onScannerClick, onAddItemClick }: NewIte
       <div className="w-full flex justify-center">
         <button
           onClick={onAddItemClick}
-          className="w-full flex flex-col items-center justify-center p-4 md:p-6 rounded-none bg-indigo-500/5 border border-indigo-500/20 group hover:border-indigo-500/50 transition-all font-normal text-indigo-400 gap-2 md:gap-3"
+          className="w-full flex flex-col items-center justify-center p-4 md:p-6 rounded-none bg-secondary/5 border border-primary/20 group hover:border-primary/50 transition-all font-normal text-primary gap-2 md:gap-3"
         >
-          <div className="p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 bg-indigo-500/10 rounded-none group-hover:scale-110 transition-transform shadow-none shadow-none">
+          <div className="p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 bg-primary/10 rounded-none group-hover:scale-110 transition-transform shadow-none shadow-none">
             <Sparkles size={32} />
           </div>
           <div className="text-center">
diff --git a/frontend/components/PhotoModal.tsx b/frontend/components/PhotoModal.tsx
index db332af0..5e5fed95 100644
--- a/frontend/components/PhotoModal.tsx
+++ b/frontend/components/PhotoModal.tsx
@@ -27,7 +27,7 @@ export default function PhotoModal({
 
   return (
     <div
-      className="fixed inset-0 bg-black/50 flex items-center justify-center z-50 p-4"
+      className="fixed inset-0 bg-surface-container-lowest/50 flex items-center justify-center z-50 p-4"
       onClick={onClose}
       role="dialog"
       aria-modal="true"
@@ -45,7 +45,7 @@ export default function PhotoModal({
             className="p-2 hover:bg-surface-bright rounded-none text-muted hover:text-white transition-colors"
             aria-label="Close modal"
           >
-            <X size={20} className="text-rose-500" />
+            <X size={20} className="text-error" />
           </button>
         </div>
 
diff --git a/frontend/components/ScannerSection.tsx b/frontend/components/ScannerSection.tsx
index 4e8f2e23..1dcb268f 100644
--- a/frontend/components/ScannerSection.tsx
+++ b/frontend/components/ScannerSection.tsx
@@ -27,7 +27,7 @@ export default function ScannerSection({
   return (
     <div className="w-full space-y-4">
       {/* Mode Switcher */}
-      <div className="flex p-1 bg-black border border-border w-full gap-1">
+      <div className="flex p-1 bg-surface-container-lowest border border-border w-full gap-1">
         {[
           { id: 'CHECK_IN', label: 'Check In', icon: ArrowDownCircle },
           { id: 'CHECK_OUT', label: 'Check Out', icon: ArrowUpCircle },
@@ -39,7 +39,7 @@ export default function ScannerSection({
             onClick={() => onModeChange(m.id)}
             className={cn(
               "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"
+              mode === m.id ? "bg-surface-bright text-primary border border-primary/30" : "text-secondary hover:bg-surface-container-lowest/40 hover:text-white"
             )}
           >
             <m.icon size={18} />
@@ -56,7 +56,7 @@ export default function ScannerSection({
               <h2 className="text-lg font-normal text-white">Vision Sensor Active</h2>
               <button
                 onClick={() => onShowScanner(false)}
-                className="p-2 bg-surface-bright border border-border text-secondary hover:text-rose-500 transition-colors"
+                className="p-2 bg-surface-bright border border-border text-secondary hover:text-error transition-colors"
               >
                 <X size={20} />
               </button>
diff --git a/frontend/components/SearchErrorModal.tsx b/frontend/components/SearchErrorModal.tsx
index 3ab0cfe1..7d4e00d9 100644
--- a/frontend/components/SearchErrorModal.tsx
+++ b/frontend/components/SearchErrorModal.tsx
@@ -12,9 +12,9 @@ export function SearchErrorModal({ isOpen, error, onRetry, onSkip, canRetry = tr
   if (!isOpen) return null;
 
   return (
-    <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
-      <div className="bg-white rounded-none p-6 max-w-md shadow-none">
-        <h2 className="text-xl font-normal mb-2 text-rose-500">Search failed</h2>
+    <div className="fixed inset-0 bg-surface-container-lowest/50 flex items-center justify-center z-50">
+      <div className="bg-primary/10 rounded-none p-6 max-w-md shadow-none">
+        <h2 className="text-xl font-normal mb-2 text-error">Search failed</h2>
         <p className="text-sm text-slate-600 mb-4">{error || 'Unable to retrieve specs from the web'}</p>
 
         <div className="flex gap-3">
diff --git a/frontend/components/SearchLoadingModal.tsx b/frontend/components/SearchLoadingModal.tsx
index e2baae1a..75310ebb 100644
--- a/frontend/components/SearchLoadingModal.tsx
+++ b/frontend/components/SearchLoadingModal.tsx
@@ -34,8 +34,8 @@ export function SearchLoadingModal({ isOpen, onTimeout, maxSeconds = 30 }: Searc
   if (!isOpen) return null;
 
   return (
-    <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
-      <div className="bg-white rounded-none p-6 max-w-md shadow-none">
+    <div className="fixed inset-0 bg-surface-container-lowest/50 flex items-center justify-center z-50">
+      <div className="bg-primary/10 rounded-none p-6 max-w-md shadow-none">
         <h2 className="text-xl font-normal mb-4">Searching for specs...</h2>
         <p className="text-sm text-slate-600 mb-4">This may take up to {maxSeconds} seconds</p>
 
diff --git a/frontend/components/StatCard.tsx b/frontend/components/StatCard.tsx
index ecea10e6..cbe8381f 100644
--- a/frontend/components/StatCard.tsx
+++ b/frontend/components/StatCard.tsx
@@ -9,7 +9,7 @@ interface StatCardProps {
 
 export default function StatCard({ label, value, icon: Icon }: StatCardProps) {
   return (
-    <div className="flex justify-between items-center gap-2 p-2 md:p-3 level-1 transition-all hover:bg-black/40" role="status">
+    <div className="flex justify-between items-center gap-2 p-2 md:p-3 level-1 transition-all hover:bg-surface-container-lowest/40" role="status">
       <div className="flex items-center gap-2.5 min-w-0">
         {Icon && <Icon className="w-5 h-5 text-primary flex-shrink-0" aria-hidden="true" />}
         <span className="text-base md:text-lg text-secondary font-normal truncate">
diff --git a/frontend/components/StockAdjustmentPanel.tsx b/frontend/components/StockAdjustmentPanel.tsx
index 6c867a5e..6e9d8559 100644
--- a/frontend/components/StockAdjustmentPanel.tsx
+++ b/frontend/components/StockAdjustmentPanel.tsx
@@ -85,7 +85,7 @@ export default function StockAdjustmentPanel({
             {isEditing && (
               <button
                 onClick={onDeleteItem}
-                className="p-2 lg:p-3 xl:p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 hover:bg-red-500/20 rounded-none text-red-500"
+                className="p-2 lg:p-3 xl:p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 hover:bg-error/20 rounded-none text-error"
               >
                 <Trash2 size={20} />
               </button>
@@ -232,8 +232,8 @@ export default function StockAdjustmentPanel({
             <div className="flex p-1 bg-background rounded-none mb-4 md:mb-6">
               {[
                 { id: 'ADD', label: 'Buy More', icon: Plus, color: 'text-primary' },
-                { id: 'REMOVE', label: 'Subtract', icon: Minus, color: 'text-amber-500' },
-                { id: 'TRASH', label: 'Discard', icon: Trash2, color: 'text-red-500' }
+                { id: 'REMOVE', label: 'Subtract', icon: Minus, color: 'text-primary' },
+                { id: 'TRASH', label: 'Discard', icon: Trash2, color: 'text-error' }
               ].map((t) => (
                 <button
                   key={t.id}
@@ -270,10 +270,10 @@ export default function StockAdjustmentPanel({
               </div>
 
               {adjustType === 'TRASH' && (
-                <div className="w-full bg-red-500/5 border border-red-500/20 p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 rounded-none animate-in shake duration-500">
+                <div className="w-full bg-error/5 border border-error/20 p-4 lg:p-5 xl:p-6 lg:p-8 xl:p-10 rounded-none animate-in shake duration-500">
                   <div className="flex items-center gap-2 mb-3">
-                    <AlertTriangle size={16} className="text-red-500" />
-                    <span className="text-sm font-normal text-red-400">Waste Declaration</span>
+                    <AlertTriangle size={16} className="text-error" />
+                    <span className="text-sm font-normal text-error">Waste Declaration</span>
                   </div>
                   <select
                     value={trashReason}
@@ -299,8 +299,8 @@ export default function StockAdjustmentPanel({
             "w-full py-5 rounded-none font-normal text-lg transition-all active:scale-[0.98] shadow-none",
             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"
+                adjustType === 'REMOVE' ? "bg-primary shadow-none text-white" :
+                  "bg-error shadow-none text-white"
             )
           )}
         >
diff --git a/frontend/components/admin/AiManager.tsx b/frontend/components/admin/AiManager.tsx
index 7d0427d2..8677dfe5 100644
--- a/frontend/components/admin/AiManager.tsx
+++ b/frontend/components/admin/AiManager.tsx
@@ -58,7 +58,7 @@ export default function AiManager({
             <div className="flex items-center gap-3">
               <div className={cn(
                 "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.active ? "bg-surface-container-lowest/20 text-black" : "bg-primary/10 text-primary group-hover:bg-primary/20"
               )}>
                 {p.id === 'gemini' ? <Cpu size={16} /> : <Zap size={16} />}
               </div>
@@ -68,14 +68,14 @@ export default function AiManager({
                   "text-xs font-normal mt-1 px-0.5",
                   p.active 
                     ? (p.configured ? "text-black/70" : "text-black/50") 
-                    : (p.configured ? "text-emerald-500" : "text-rose-500")
+                    : (p.configured ? "text-emerald-500" : "text-error")
                 )}>
                   {p.configured ? "● Key Configured" : "○ Missing Api Key"}
                 </p>
               </div>
             </div>
             {p.active && (
-              <div className="bg-black/20 px-2.5 py-1 text-xs font-normal text-black tracking-tight">
+              <div className="bg-surface-container-lowest/20 px-2.5 py-1 text-xs font-normal text-black tracking-tight">
                 Active
               </div>
             )}
diff --git a/frontend/components/admin/CategoryManager.tsx b/frontend/components/admin/CategoryManager.tsx
index 0fac5fb7..fc2081b1 100644
--- a/frontend/components/admin/CategoryManager.tsx
+++ b/frontend/components/admin/CategoryManager.tsx
@@ -60,7 +60,7 @@ export default function CategoryManager({
                 <button
                   onClick={() => onDeleteCategory(cat.id, cat.name)}
                   data-testid="delete-category-button"
-                  className="p-2 text-secondary hover:text-rose-500 hover:bg-rose-500/5 transition-all"
+                  className="p-2 text-secondary hover:text-error hover:bg-error/5 transition-all"
                 >
                   <Trash2 size={14} />
                 </button>
diff --git a/frontend/components/admin/DatabaseManager.tsx b/frontend/components/admin/DatabaseManager.tsx
index d243a9b5..42d58681 100644
--- a/frontend/components/admin/DatabaseManager.tsx
+++ b/frontend/components/admin/DatabaseManager.tsx
@@ -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 bg-green-500 animate-pulse" />
+              <div className="w-2 h-2 bg-tertiary animate-pulse" />
               <span className="text-sm font-normal text-secondary">Operational</span>
             </div>
           </div>
@@ -170,7 +170,7 @@ export default function DatabaseManager({
               className="absolute inset-0 opacity-0 cursor-pointer z-10"
             />
              <button
-               className="w-full btn-secondary text-rose-500 border-rose-500/50 hover:border-rose-500 hover:text-rose-500"
+               className="w-full btn-secondary text-error border-rose-500/50 hover:border-rose-500 hover:text-error"
                aria-label="Import database"
              >
                <Upload size={14} /> Import Database
diff --git a/frontend/components/admin/ExportPanel.tsx b/frontend/components/admin/ExportPanel.tsx
index 97091904..ff410bfe 100644
--- a/frontend/components/admin/ExportPanel.tsx
+++ b/frontend/components/admin/ExportPanel.tsx
@@ -31,7 +31,7 @@ export function ExportPanel() {
   return (
     <div data-testid="admin-tab-exports" className="level-1 p-4 md:p-6 flex flex-col h-full">
       <div className="flex items-center gap-3 mb-4 md:mb-6">
-        <div className="w-10 h-10 bg-black flex items-center justify-center text-primary border border-border">
+        <div className="w-10 h-10 bg-surface-container-lowest flex items-center justify-center text-primary border border-border">
           <FileDown size={20} />
         </div>
         <div>
@@ -110,7 +110,7 @@ export function ExportPanel() {
       </div>
 
       {error && (
-        <div className="mt-4 p-3 bg-rose-500/10 border border-rose-500/20 text-rose-500 text-[10px] flex items-center gap-2 animate-in slide-in-from-top-2 duration-300">
+        <div className="mt-4 p-3 bg-error/10 border border-error/20 text-error text-[10px] flex items-center gap-2 animate-in slide-in-from-top-2 duration-300">
           <div className="w-1.5 h-1.5 bg-rose-500 animate-pulse" />
           <span className="font-normal truncate">Error: {error}</span>
         </div>
diff --git a/frontend/components/admin/IdentityManager.tsx b/frontend/components/admin/IdentityManager.tsx
index 5b364cfe..4aa3e215 100644
--- a/frontend/components/admin/IdentityManager.tsx
+++ b/frontend/components/admin/IdentityManager.tsx
@@ -72,7 +72,7 @@ export default function IdentityManager({
                 <button
                   onClick={() => onDeleteUser(user.id, user.username)}
                   data-testid="delete-user-button"
-                  className="p-2 text-secondary hover:text-rose-500 hover:bg-rose-500/5 transition-all"
+                  className="p-2 text-secondary hover:text-error hover:bg-error/5 transition-all"
                   aria-label={`Delete user ${user.username}`}
                 >
                   <Trash2 size={16} />
diff --git a/frontend/components/admin/LdapManager.tsx b/frontend/components/admin/LdapManager.tsx
index 32cc4c19..7c6c0e27 100644
--- a/frontend/components/admin/LdapManager.tsx
+++ b/frontend/components/admin/LdapManager.tsx
@@ -51,7 +51,7 @@ export default function LdapManager({
           )}
         >
           <div className={cn(
-            "absolute top-0.5 w-3.5 h-3.5 bg-black transition-all",
+            "absolute top-0.5 w-3.5 h-3.5 bg-surface-container-lowest transition-all",
             ldapConfig.ldap_enabled ? "right-0.5" : "left-0.5"
           )} />
         </button>
@@ -138,7 +138,7 @@ export default function LdapManager({
           )}
         >
           <div className={cn(
-            "absolute top-0.5 w-3.5 h-3.5 bg-black transition-all",
+            "absolute top-0.5 w-3.5 h-3.5 bg-surface-container-lowest transition-all",
             ldapConfig.use_tls ? "right-0.5" : "left-0.5"
           )} />
         </button>
diff --git a/frontend/components/inventory/QuantityAdjustmentModal.tsx b/frontend/components/inventory/QuantityAdjustmentModal.tsx
index 260b115b..1755c838 100644
--- a/frontend/components/inventory/QuantityAdjustmentModal.tsx
+++ b/frontend/components/inventory/QuantityAdjustmentModal.tsx
@@ -55,7 +55,7 @@ export default function QuantityAdjustmentModal({
   if (!isOpen || !item) return null;
 
   return (
-    <div className={`fixed inset-0 z-50 bg-black/50 flex items-center justify-center transition-opacity ${isClosing ? 'opacity-0' : 'opacity-100'}`}>
+    <div className={`fixed inset-0 z-50 bg-surface-container-lowest/50 flex items-center justify-center transition-opacity ${isClosing ? 'opacity-0' : 'opacity-100'}`}>
       <div className={`bg-surface border border-border w-full max-w-md mx-4 transition-transform ${isClosing ? 'scale-95' : 'scale-100'}`}>
         {/* Header */}
         <div className="flex items-center justify-between p-4 border-b border-border">
@@ -63,7 +63,7 @@ export default function QuantityAdjustmentModal({
           <button
             onClick={handleClose}
             aria-label="Close quantity adjustment modal"
-            className="p-2 hover:bg-black border border-transparent hover:border-border transition-colors"
+            className="p-2 hover:bg-surface-container-lowest border border-transparent hover:border-border transition-colors"
           >
             <X size={20} className="text-secondary" />
           </button>
diff --git a/frontend/components/inventory/QuantityDisplay.tsx b/frontend/components/inventory/QuantityDisplay.tsx
index 595b4ee6..c6db2ec8 100644
--- a/frontend/components/inventory/QuantityDisplay.tsx
+++ b/frontend/components/inventory/QuantityDisplay.tsx
@@ -83,12 +83,12 @@ export default function QuantityDisplay({
 
   if (isEditing) {
     return (
-      <div className="flex items-center gap-2 bg-black border border-border px-3 py-2">
+      <div className="flex items-center gap-2 bg-surface-container-lowest border border-border px-3 py-2">
         <button
           onClick={handleDecrement}
           disabled={isLoading}
           aria-label="Decrease quantity"
-          className="p-1 hover:bg-black border border-transparent hover:border-border text-secondary hover:text-primary transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+          className="p-1 hover:bg-surface-container-lowest border border-transparent hover:border-border text-secondary hover:text-primary transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
         >
           <Minus size={16} />
         </button>
@@ -110,7 +110,7 @@ export default function QuantityDisplay({
           onClick={handleIncrement}
           disabled={isLoading}
           aria-label="Increase quantity"
-          className="p-1 hover:bg-black border border-transparent hover:border-border text-secondary hover:text-primary transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+          className="p-1 hover:bg-surface-container-lowest border border-transparent hover:border-border text-secondary hover:text-primary transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
         >
           <Plus size={16} />
         </button>
@@ -123,7 +123,7 @@ export default function QuantityDisplay({
       onClick={handleTapToEdit}
       disabled={isLoading}
       aria-label={`Quantity: ${currentQuantity}. Tap to edit`}
-      className="text-lg font-normal text-primary hover:bg-black border border-transparent hover:border-border px-3 py-2 transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+      className="text-lg font-normal text-primary hover:bg-surface-container-lowest border border-transparent hover:border-border px-3 py-2 transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
     >
       {currentQuantity}
     </button>
diff --git a/frontend/components/inventory/SearchModal.tsx b/frontend/components/inventory/SearchModal.tsx
index 4f222028..e1cd7c01 100644
--- a/frontend/components/inventory/SearchModal.tsx
+++ b/frontend/components/inventory/SearchModal.tsx
@@ -108,7 +108,7 @@ export default function SearchModal({
   if (!isOpen) return null;
 
   return (
-    <div className="fixed inset-0 z-50 bg-black/50 flex items-start justify-center pt-20">
+    <div className="fixed inset-0 z-50 bg-surface-container-lowest/50 flex items-start justify-center pt-20">
       <div className="bg-surface border border-border w-full max-w-2xl mx-4 max-h-[80vh] flex flex-col">
         {/* Header */}
         <div className="flex items-center justify-between p-4 border-b border-border">
@@ -116,7 +116,7 @@ export default function SearchModal({
           <button
             onClick={onClose}
             aria-label="Close search modal"
-            className="p-2 hover:bg-black border border-transparent hover:border-border transition-colors"
+            className="p-2 hover:bg-surface-container-lowest border border-transparent hover:border-border transition-colors"
           >
             <X size={20} className="text-secondary" />
           </button>
@@ -141,7 +141,7 @@ export default function SearchModal({
         {/* Results */}
         <div className="flex-1 overflow-y-auto">
           {error && (
-            <div className="p-4 text-rose-500 bg-rose-500/10 border border-rose-500/20 m-4">
+            <div className="p-4 text-error bg-error/10 border border-error/20 m-4">
               {error}
             </div>
           )}
@@ -149,7 +149,7 @@ export default function SearchModal({
           {isLoading && (
             <div className="flex items-center justify-center py-8">
               <div className="text-secondary">
-                <div className="inline-block animate-spin h-6 w-6 border border-slate-600 border-t-primary"></div>
+                <div className="inline-block animate-spin h-6 w-6 border border-outline border-t-primary"></div>
               </div>
             </div>
           )}
@@ -172,7 +172,7 @@ export default function SearchModal({
                 <button
                   key={item.id}
                   onClick={() => handleSelectItem(item)}
-                  className="w-full p-4 text-left hover:bg-black transition-colors focus:outline-none focus:bg-black"
+                  className="w-full p-4 text-left hover:bg-surface-container-lowest transition-colors focus:outline-none focus:bg-surface-container-lowest"
                 >
                   <div className="flex justify-between items-start gap-2 mb-1">
                     <h3 className="font-normal text-slate-100 flex-1">
diff --git a/frontend/tests/components/ManualCropUI.test.tsx b/frontend/tests/components/ManualCropUI.test.tsx
index a974f958..8e33e245 100644
--- a/frontend/tests/components/ManualCropUI.test.tsx
+++ b/frontend/tests/components/ManualCropUI.test.tsx
@@ -165,7 +165,7 @@ describe('ManualCropUI Component', () => {
         />
       );
 
-      const overlays = container.querySelectorAll('div[class*="bg-black"]');
+      const overlays = container.querySelectorAll('div[class*="bg-surface-container-lowest"]');
       expect(overlays.length).toBeGreaterThan(0);
     });
 
@@ -195,7 +195,7 @@ describe('ManualCropUI Component', () => {
         />
       );
 
-      const overlays = container.querySelectorAll('div[class*="bg-black/40"]');
+      const overlays = container.querySelectorAll('div[class*="bg-surface-container-lowest/40"]');
       expect(overlays.length).toBe(0);
     });
   });
diff --git a/frontend/tests/components/PhotoModal.test.tsx b/frontend/tests/components/PhotoModal.test.tsx
index d786c53a..221535dc 100644
--- a/frontend/tests/components/PhotoModal.test.tsx
+++ b/frontend/tests/components/PhotoModal.test.tsx
@@ -63,7 +63,7 @@ describe('PhotoModal', () => {
 
       // Check for rose-colored X icon
       const xIcon = closeButton.querySelector('svg');
-      expect(xIcon).toHaveClass('text-rose-500');
+      expect(xIcon).toHaveClass('text-error');
     });
   });