diff --git a/src/RolemasterDb.App/Components/Layout/MainLayout.razor.css b/src/RolemasterDb.App/Components/Layout/MainLayout.razor.css
index eb5d72e..08910bc 100644
--- a/src/RolemasterDb.App/Components/Layout/MainLayout.razor.css
+++ b/src/RolemasterDb.App/Components/Layout/MainLayout.razor.css
@@ -1,9 +1,8 @@
 #blazor-error-ui {
-    color-scheme: light only;
-    background: #682e24;
-    color: #fffaf2;
+    background: color-mix(in srgb, var(--surface-danger-banner) 88%, var(--bg-elevated));
+    color: var(--text-on-danger);
     bottom: 0;
-    box-shadow: 0 -1px 12px rgba(0, 0, 0, 0.22);
+    box-shadow: 0 -1px 12px color-mix(in srgb, var(--shadow-strong) 72%, transparent);
     box-sizing: border-box;
     display: none;
     left: 0;
@@ -14,6 +13,7 @@
 }
 
 #blazor-error-ui .dismiss {
+    color: inherit;
     cursor: pointer;
     position: absolute;
     right: 0.75rem;
diff --git a/src/RolemasterDb.App/Components/Layout/ReconnectModal.razor.css b/src/RolemasterDb.App/Components/Layout/ReconnectModal.razor.css
index 3ad3773..29954fa 100644
--- a/src/RolemasterDb.App/Components/Layout/ReconnectModal.razor.css
+++ b/src/RolemasterDb.App/Components/Layout/ReconnectModal.razor.css
@@ -21,13 +21,14 @@
 
 
 #components-reconnect-modal {
-    background-color: white;
+    background-color: color-mix(in srgb, var(--surface-card-strong) 96%, var(--bg-elevated));
+    color: var(--text-primary);
     width: 20rem;
     margin: 20vh auto;
     padding: 2rem;
-    border: 0;
+    border: 1px solid var(--border-default);
     border-radius: 0.5rem;
-    box-shadow: 0 3px 6px 2px rgba(0, 0, 0, 0.3);
+    box-shadow: var(--shadow-2);
     opacity: 0;
     transition: display 0.5s allow-discrete, overlay 0.5s allow-discrete;
     animation: components-reconnect-modal-fadeOutOpacity 0.5s both;
@@ -41,7 +42,7 @@
 }
 
 #components-reconnect-modal::backdrop {
-    background-color: rgba(0, 0, 0, 0.4);
+    background-color: var(--bg-overlay);
     animation: components-reconnect-modal-fadeInOpacity 0.5s ease-in-out;
     opacity: 1;
 }
@@ -90,18 +91,18 @@
 
 #components-reconnect-modal button {
     border: 0;
-    background-color: #6b9ed2;
-    color: white;
+    background: linear-gradient(135deg, var(--accent-4), var(--accent-5));
+    color: var(--text-on-accent);
     padding: 4px 24px;
     border-radius: 4px;
 }
 
     #components-reconnect-modal button:hover {
-        background-color: #3b6ea2;
+        background: linear-gradient(135deg, color-mix(in srgb, var(--accent-4) 88%, var(--accent-2)), var(--accent-5));
     }
 
     #components-reconnect-modal button:active {
-        background-color: #6b9ed2;
+        background: linear-gradient(135deg, var(--accent-4), var(--accent-5));
     }
 
 .components-rejoining-animation {
@@ -112,7 +113,7 @@
 
     .components-rejoining-animation div {
         position: absolute;
-        border: 3px solid #0087ff;
+        border: 3px solid var(--info-5);
         opacity: 1;
         border-radius: 50%;
         animation: components-rejoining-animation 1.5s cubic-bezier(0, 0.2, 0.8, 1) infinite;
diff --git a/src/RolemasterDb.App/Components/Shell/AppShell.razor.css b/src/RolemasterDb.App/Components/Shell/AppShell.razor.css
index d9a331d..ddba6aa 100644
--- a/src/RolemasterDb.App/Components/Shell/AppShell.razor.css
+++ b/src/RolemasterDb.App/Components/Shell/AppShell.razor.css
@@ -74,7 +74,7 @@
     font-size: 0.85rem;
     letter-spacing: 0.12em;
     text-transform: uppercase;
-    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.22);
+    box-shadow: inset 0 1px 0 color-mix(in srgb, var(--text-on-accent) 22%, transparent);
 }
 
 .app-shell-brand-copy {
diff --git a/src/RolemasterDb.App/Components/Shell/ShellPrimaryNav.razor.css b/src/RolemasterDb.App/Components/Shell/ShellPrimaryNav.razor.css
index 0dd0a7e..ea53130 100644
--- a/src/RolemasterDb.App/Components/Shell/ShellPrimaryNav.razor.css
+++ b/src/RolemasterDb.App/Components/Shell/ShellPrimaryNav.razor.css
@@ -33,7 +33,7 @@
     color: var(--text-primary);
     background: color-mix(in srgb, var(--accent-1) 84%, var(--surface-2));
     border-color: color-mix(in srgb, var(--accent-3) 45%, var(--border-default));
-    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.16);
+    box-shadow: inset 0 1px 0 color-mix(in srgb, var(--text-on-accent) 16%, transparent);
 }
 
 .shell-primary-nav-link.is-tools-link {
diff --git a/src/RolemasterDb.App/wwwroot/app.css b/src/RolemasterDb.App/wwwroot/app.css
index b9ef42f..ba7afdc 100644
--- a/src/RolemasterDb.App/wwwroot/app.css
+++ b/src/RolemasterDb.App/wwwroot/app.css
@@ -45,12 +45,41 @@
     --surface-subtle-accent: rgba(255, 250, 242, 0.84);
     --surface-chip: rgba(238, 223, 193, 0.65);
     --surface-callout: rgba(255, 247, 230, 0.76);
+    --surface-raised: var(--surface-2);
+    --surface-elevated: var(--surface-card-strong);
+    --surface-card-subtle: color-mix(in srgb, var(--surface-card) 82%, var(--surface-1));
+    --surface-table-header: color-mix(in srgb, var(--surface-card-strong) 94%, var(--accent-1));
+    --surface-table-cell: color-mix(in srgb, var(--surface-card-strong) 90%, var(--bg-elevated));
+    --surface-table-cell-strong: color-mix(in srgb, var(--surface-card-strong) 96%, var(--surface-2));
+    --surface-code: #2a1d17;
+    --text-code: #f9ecd2;
+    --surface-danger-strong: #7e2c22;
+    --surface-danger-banner: #682e24;
+    --text-on-danger: #fff7ee;
     --field-label-color: #75562f;
     --link-hover: #6e4320;
     --button-secondary-bg: rgba(255, 248, 236, 0.9);
     --button-secondary-bg-hover: rgba(250, 236, 210, 0.95);
     --button-secondary-text: #6a4b28;
     --button-secondary-border: rgba(127, 96, 55, 0.18);
+    --text-strong: var(--text-primary);
+    --text-muted: var(--text-secondary);
+    --text-soft: var(--text-tertiary);
+    --success-4: color-mix(in srgb, var(--success-3) 72%, var(--text-primary));
+    --success-5: color-mix(in srgb, var(--success-3) 88%, var(--text-primary));
+    --warning-4: color-mix(in srgb, var(--warning-3) 72%, var(--text-primary));
+    --warning-5: color-mix(in srgb, var(--warning-3) 88%, var(--text-primary));
+    --danger-4: color-mix(in srgb, var(--danger-3) 72%, var(--text-primary));
+    --danger-5: color-mix(in srgb, var(--danger-3) 88%, var(--text-primary));
+    --info-4: color-mix(in srgb, var(--info-3) 72%, var(--text-primary));
+    --info-5: color-mix(in srgb, var(--info-3) 88%, var(--text-primary));
+    --shadow-strong: rgba(41, 22, 11, 0.34);
+    --selection-1: rgba(13, 148, 136, 0.04);
+    --selection-2: rgba(13, 148, 136, 0.06);
+    --selection-3: rgba(13, 148, 136, 0.12);
+    --selection-4: rgba(13, 148, 136, 0.16);
+    --selection-5: rgba(13, 148, 136, 0.35);
+    --selection-6: rgba(13, 148, 136, 0.62);
     --control-height: 3rem;
     --font-display: "Macondo", Georgia, serif;
     --font-body: "IBM Plex Sans", "Segoe UI", sans-serif;
@@ -61,7 +90,9 @@
     --paper: var(--bg-canvas);
     --paper-strong: var(--bg-elevated);
     --ink: var(--text-primary);
+    --ink-strong: var(--text-primary);
     --ink-soft: var(--text-secondary);
+    --ink-faint: var(--text-tertiary);
     --accent: var(--accent-5);
     --accent-strong: var(--accent-4);
     --panel: var(--surface-1);
@@ -122,12 +153,24 @@
     --surface-subtle-accent: rgba(48, 39, 32, 0.84);
     --surface-chip: rgba(78, 62, 46, 0.76);
     --surface-callout: rgba(56, 42, 28, 0.8);
+    --surface-code: #120d0a;
+    --text-code: #f5dcc2;
+    --surface-danger-strong: #9b4133;
+    --surface-danger-banner: #7c362b;
+    --text-on-danger: #fff7ee;
     --field-label-color: #d2b28b;
     --link-hover: #f5c487;
     --button-secondary-bg: rgba(40, 34, 30, 0.94);
     --button-secondary-bg-hover: rgba(52, 44, 38, 0.98);
     --button-secondary-text: #f0ddc8;
     --button-secondary-border: rgba(209, 188, 163, 0.2);
+    --shadow-strong: rgba(0, 0, 0, 0.62);
+    --selection-1: rgba(86, 207, 195, 0.08);
+    --selection-2: rgba(86, 207, 195, 0.12);
+    --selection-3: rgba(86, 207, 195, 0.18);
+    --selection-4: rgba(86, 207, 195, 0.24);
+    --selection-5: rgba(111, 225, 214, 0.46);
+    --selection-6: rgba(111, 225, 214, 0.78);
 }
 
 @media (prefers-color-scheme: dark) {
@@ -180,12 +223,24 @@
         --surface-subtle-accent: rgba(48, 39, 32, 0.84);
         --surface-chip: rgba(78, 62, 46, 0.76);
         --surface-callout: rgba(56, 42, 28, 0.8);
+        --surface-code: #120d0a;
+        --text-code: #f5dcc2;
+        --surface-danger-strong: #9b4133;
+        --surface-danger-banner: #7c362b;
+        --text-on-danger: #fff7ee;
         --field-label-color: #d2b28b;
         --link-hover: #f5c487;
         --button-secondary-bg: rgba(40, 34, 30, 0.94);
         --button-secondary-bg-hover: rgba(52, 44, 38, 0.98);
         --button-secondary-text: #f0ddc8;
         --button-secondary-border: rgba(209, 188, 163, 0.2);
+        --shadow-strong: rgba(0, 0, 0, 0.62);
+        --selection-1: rgba(86, 207, 195, 0.08);
+        --selection-2: rgba(86, 207, 195, 0.12);
+        --selection-3: rgba(86, 207, 195, 0.18);
+        --selection-4: rgba(86, 207, 195, 0.24);
+        --selection-5: rgba(111, 225, 214, 0.46);
+        --selection-6: rgba(111, 225, 214, 0.78);
     }
 }
 
@@ -610,11 +665,11 @@ select.input-shell {
     background: linear-gradient(135deg, var(--accent-4), var(--accent-5));
     color: var(--text-on-accent);
     letter-spacing: 0.04em;
-    box-shadow: 0 10px 18px rgba(143, 90, 47, 0.2);
+    box-shadow: 0 10px 18px color-mix(in srgb, var(--accent-5) 24%, transparent);
 }
 
 .btn-ritual:hover {
-    background: linear-gradient(135deg, #c38a4d, #8f5a2f);
+    background: linear-gradient(135deg, color-mix(in srgb, var(--accent-4) 88%, var(--accent-2)), var(--accent-5));
 }
 
 .btn-ritual:focus-visible,
@@ -646,7 +701,7 @@ select.input-shell {
 }
 
 .lookup-roll-note.is-warning {
-    color: #8d2b1e;
+    color: var(--danger-5);
 }
 
 .tag-row {
@@ -658,7 +713,7 @@ select.input-shell {
 
 .tag {
     border-radius: 999px;
-    border: 1px solid rgba(143, 90, 47, 0.18);
+    border: 1px solid color-mix(in srgb, var(--accent-4) 24%, var(--border-subtle));
     padding: 0.4rem 0.7rem;
     background: var(--surface-subtle-accent);
     color: var(--text-primary);
@@ -675,7 +730,7 @@ select.input-shell {
     border-radius: 20px;
     padding: 1rem;
     background: var(--surface-card);
-    border: 1px solid rgba(127, 96, 55, 0.14);
+    border: 1px solid var(--border-subtle);
     min-width: 0;
 }
 
@@ -698,7 +753,7 @@ select.input-shell {
     padding: 0.65rem 0.75rem;
     border-radius: 14px;
     background: var(--surface-inline);
-    border: 1px solid rgba(127, 96, 55, 0.12);
+    border: 1px solid var(--border-subtle);
 }
 
 .detail-label {
@@ -728,7 +783,7 @@ select.input-shell {
     padding: 0.85rem 0.95rem;
     border-radius: 16px;
     background: var(--surface-callout);
-    border: 1px solid rgba(184, 121, 59, 0.18);
+    border: 1px solid color-mix(in srgb, var(--warning-4) 26%, var(--border-subtle));
     color: var(--text-primary);
 }
 
@@ -740,15 +795,15 @@ select.input-shell {
 .branch-card {
     padding: 0.8rem 0.85rem;
     border-radius: 14px;
-    background: rgba(255, 252, 244, 0.75);
-    border: 1px solid rgba(127, 96, 55, 0.14);
+    background: color-mix(in srgb, var(--surface-inline) 92%, var(--surface-card));
+    border: 1px solid var(--border-subtle);
 }
 
 .branch-condition {
     font-size: 0.82rem;
     letter-spacing: 0.06em;
     text-transform: uppercase;
-    color: #75562f;
+    color: var(--field-label-color);
 }
 
 .branch-copy,
@@ -805,16 +860,16 @@ select.input-shell {
 
 .critical-cell-status-chip.is-curated,
 .critical-editor-curation-badge.is-curated {
-    background: rgba(102, 138, 83, 0.16);
-    border-color: rgba(102, 138, 83, 0.34);
-    color: #45613a;
+    background: color-mix(in srgb, var(--success-2) 26%, transparent);
+    border-color: color-mix(in srgb, var(--success-4) 40%, var(--border-subtle));
+    color: var(--success-5);
 }
 
 .critical-cell-status-chip.needs-curation,
 .critical-editor-curation-badge.needs-curation {
-    background: rgba(184, 121, 59, 0.16);
-    border-color: rgba(184, 121, 59, 0.34);
-    color: #8a5b21;
+    background: color-mix(in srgb, var(--warning-2) 24%, transparent);
+    border-color: color-mix(in srgb, var(--warning-4) 40%, var(--border-subtle));
+    color: var(--warning-5);
 }
 
 .critical-cell-footer {
@@ -827,7 +882,7 @@ select.input-shell {
 
 .critical-cell-description {
     margin: 0;
-    color: #2c1a10;
+    color: var(--text-primary);
     font-size: 1.2rem;
     line-height: 1.4;
     overflow-wrap: anywhere;
@@ -847,8 +902,8 @@ select.input-shell {
 .critical-branch-card {
     padding: 0.55rem 0.75rem;
     border-radius: 12px;
-    border: 1px solid rgba(127, 96, 55, 0.12);
-    background: rgba(255, 255, 255, 0.85);
+    border: 1px solid var(--border-subtle);
+    background: color-mix(in srgb, var(--surface-card-strong) 90%, var(--surface-inline));
     min-width: 0;
 }
 
@@ -866,7 +921,7 @@ select.input-shell {
     font-size: 0.75rem;
     letter-spacing: 0.05em;
     text-transform: uppercase;
-    color: #6b4c29;
+    color: color-mix(in srgb, var(--accent-5) 72%, var(--text-secondary));
     overflow-wrap: anywhere;
 }
 
@@ -874,7 +929,7 @@ select.input-shell {
     margin: 0.3rem 0 0;
     font-size: 0.85rem;
     line-height: 1.35;
-    color: #3b2a21;
+    color: var(--text-primary);
     overflow-wrap: anywhere;
 }
 
@@ -896,7 +951,7 @@ select.input-shell {
     font-size: 0.9rem;
     text-transform: uppercase;
     letter-spacing: 0.08em;
-    color: #75562f;
+    color: var(--field-label-color);
 }
 
 .effect-list {
@@ -914,15 +969,15 @@ select.input-shell {
     flex-wrap: wrap;
     padding: 0.55rem 0.7rem;
     border-radius: 12px;
-    background: rgba(255, 252, 244, 0.72);
-    border: 1px solid rgba(127, 96, 55, 0.12);
+    background: var(--surface-inline);
+    border: 1px solid var(--border-subtle);
 }
 
 .effect-token {
     padding: 0.12rem 0.38rem;
     border-radius: 999px;
-    background: rgba(238, 223, 193, 0.72);
-    color: #5b4327;
+    background: color-mix(in srgb, var(--surface-chip) 92%, var(--surface-subtle-accent));
+    color: var(--button-secondary-text);
     font-size: 0.82rem;
 }
 
@@ -943,11 +998,11 @@ select.input-shell {
     display: inline-flex;
     align-items: center;
     padding: 0.1rem;
-    border: 1px solid rgba(127, 96, 55, 0.18);
-    background: rgba(255, 250, 242, 0.9);
+    border: 1px solid var(--button-secondary-border);
+    background: color-mix(in srgb, var(--surface-subtle-accent) 94%, var(--surface-input));
     font-size: 1.2rem;
     text-transform: uppercase;
-    color: #5b4327;
+    color: var(--button-secondary-text);
 }
 
 .affix-badge-symbol {
@@ -980,7 +1035,7 @@ select.input-shell {
 }
 
 .error-text {
-    color: #8d2b1e;
+    color: var(--danger-5);
 }
 
 .table-list {
@@ -991,8 +1046,8 @@ select.input-shell {
 .table-list-item {
     border-radius: 16px;
     padding: 0.9rem 1rem;
-    background: rgba(255, 255, 255, 0.54);
-    border: 1px solid rgba(127, 96, 55, 0.12);
+    background: color-mix(in srgb, var(--surface-card) 82%, transparent);
+    border: 1px solid var(--border-subtle);
 }
 
 .table-list-title {
@@ -1011,9 +1066,9 @@ select.input-shell {
 .chip {
     border-radius: 999px;
     padding: 0.38rem 0.68rem;
-    background: rgba(238, 223, 193, 0.5);
-    border: 1px solid rgba(127, 96, 55, 0.14);
-    color: #5b4327;
+    background: color-mix(in srgb, var(--surface-chip) 86%, transparent);
+    border: 1px solid var(--border-subtle);
+    color: var(--button-secondary-text);
     font-size: 0.82rem;
 }
 
@@ -1208,7 +1263,7 @@ select.input-shell {
     inset: 0;
     z-index: 90;
     border: none;
-    background: rgba(15, 17, 23, 0.48);
+    background: color-mix(in srgb, var(--bg-overlay) 88%, transparent);
 }
 
 .surface-drawer {
@@ -1399,10 +1454,10 @@ select.input-shell {
     margin: 0;
     padding: 1rem;
     border-radius: 16px;
-    background: #2a1d17;
-    color: #f9ecd2;
+    background: var(--surface-code);
+    color: var(--text-code);
     overflow-x: auto;
-    font-family: Consolas, "Courier New", monospace;
+    font-family: var(--font-mono);
     line-height: 1.55;
 }
 
@@ -1413,8 +1468,8 @@ select.input-shell {
 }
 
 .blazor-error-boundary {
-    background: #7e2c22;
-    color: #fff7ee;
+    background: var(--surface-danger-strong);
+    color: var(--text-on-danger);
 }
 
 .tables-page {
@@ -1476,8 +1531,8 @@ select.input-shell {
     padding: 1rem;
     border-radius: 18px;
     background: var(--surface-card-subtle);
-    border: 1px solid rgba(127, 96, 55, 0.16);
-    box-shadow: 0 16px 26px rgba(41, 22, 11, 0.06);
+    border: 1px solid var(--border-default);
+    box-shadow: 0 16px 26px color-mix(in srgb, var(--shadow-strong) 26%, transparent);
     min-height: 0;
     overflow-y: auto;
     overscroll-behavior: contain;
@@ -1526,9 +1581,9 @@ select.input-shell {
     align-items: center;
     justify-content: center;
     min-height: 2.75rem;
-    border: 1px solid rgba(127, 96, 55, 0.2);
+    border: 1px solid var(--button-secondary-border);
     border-radius: 999px;
-    background: rgba(255, 250, 242, 0.86);
+    background: color-mix(in srgb, var(--surface-subtle-accent) 92%, var(--surface-input));
     color: var(--ink-soft);
     font-size: 0.8rem;
     padding: 0.35rem 0.8rem;
@@ -1537,16 +1592,16 @@ select.input-shell {
 
 .tables-family-filter:hover,
 .tables-family-filter:focus-visible {
-    border-color: rgba(184, 121, 59, 0.3);
-    background: rgba(255, 244, 228, 0.94);
+    border-color: color-mix(in srgb, var(--accent-4) 42%, var(--border-default));
+    background: var(--surface-input-hover);
     color: var(--ink);
     outline: 2px solid var(--focus-ring);
     outline-offset: 2px;
 }
 
 .tables-family-filter.is-selected {
-    background: rgba(188, 117, 43, 0.16);
-    border-color: rgba(188, 117, 43, 0.3);
+    background: color-mix(in srgb, var(--accent-3) 18%, var(--surface-subtle-accent));
+    border-color: color-mix(in srgb, var(--accent-4) 44%, var(--border-default));
     color: var(--ink-strong);
 }
 
@@ -1600,7 +1655,7 @@ select.input-shell {
     padding: 0.7rem 0.8rem;
     border: 1px solid transparent;
     border-radius: 12px;
-    background: rgba(255, 250, 242, 0.72);
+    background: color-mix(in srgb, var(--surface-subtle-accent) 86%, transparent);
     color: inherit;
     text-align: left;
     transition: background-color 0.16s ease, border-color 0.16s ease, transform 0.16s ease;
@@ -1608,37 +1663,37 @@ select.input-shell {
 
 .table-index-option:hover,
 .table-index-option:focus-visible {
-    border-color: rgba(184, 121, 59, 0.28);
-    background: rgba(255, 247, 235, 0.94);
+    border-color: color-mix(in srgb, var(--accent-4) 40%, var(--border-default));
+    background: color-mix(in srgb, var(--surface-input-hover) 92%, var(--surface-inline));
     outline: 2px solid var(--focus-ring);
     outline-offset: 2px;
 }
 
 .table-index-option.is-selected {
-    border-color: rgba(41, 22, 11, 0.18);
-    background: rgba(248, 238, 221, 0.98);
+    border-color: var(--border-strong);
+    background: color-mix(in srgb, var(--surface-card-strong) 90%, var(--accent-1));
 }
 
 .table-index-option.is-active {
-    box-shadow: inset 0 0 0 1px rgba(15, 148, 136, 0.3);
+    box-shadow: inset 0 0 0 1px var(--selection-5);
 }
 
 .table-index-option.is-curated {
-    background: rgba(102, 138, 83, 0.12);
+    background: color-mix(in srgb, var(--success-2) 18%, var(--surface-subtle-accent));
 }
 
 .table-index-option.is-curated:hover,
 .table-index-option.is-curated:focus-visible {
-    background: rgba(102, 138, 83, 0.18);
+    background: color-mix(in srgb, var(--success-2) 26%, var(--surface-subtle-accent));
 }
 
 .table-index-option.needs-curation {
-    background: rgba(184, 121, 59, 0.12);
+    background: color-mix(in srgb, var(--warning-2) 18%, var(--surface-subtle-accent));
 }
 
 .table-index-option.needs-curation:hover,
 .table-index-option.needs-curation:focus-visible {
-    background: rgba(184, 121, 59, 0.18);
+    background: color-mix(in srgb, var(--warning-2) 26%, var(--surface-subtle-accent));
 }
 
 .table-index-option-copy {
@@ -1700,8 +1755,8 @@ select.input-shell {
     border-radius: 20px;
     padding: 1.2rem;
     background: var(--surface-card-strong);
-    border: 1px solid rgba(127, 96, 55, 0.2);
-    box-shadow: 0 18px 30px rgba(41, 22, 11, 0.08);
+    border: 1px solid var(--border-default);
+    box-shadow: var(--shadow-1);
 }
 
 .table-browser-header {
@@ -1716,13 +1771,9 @@ select.input-shell {
     position: sticky;
     z-index: 8;
     padding-bottom: 0.75rem;
-    background: linear-gradient(180deg, rgba(255, 251, 245, 0.96), rgba(255, 251, 245, 0.92));
+    background: linear-gradient(180deg, color-mix(in srgb, var(--bg-elevated) 96%, transparent), color-mix(in srgb, var(--surface-card-subtle) 94%, transparent));
     backdrop-filter: blur(10px);
-    border-bottom: 1px solid rgba(127, 96, 55, 0.14);
-}
-
-.theme-dark .tables-context-bar {
-    background: linear-gradient(180deg, rgba(28, 31, 33, 0.96), rgba(28, 31, 33, 0.92));
+    border-bottom: 1px solid var(--border-subtle);
 }
 
 .tables-context-primary,
@@ -1782,9 +1833,9 @@ select.input-shell {
     align-items: center;
     justify-content: center;
     min-height: 2.75rem;
-    border: 1px solid rgba(127, 96, 55, 0.2);
+    border: 1px solid var(--button-secondary-border);
     border-radius: 999px;
-    background: rgba(255, 246, 233, 0.88);
+    background: color-mix(in srgb, var(--surface-callout) 92%, var(--surface-input));
     color: var(--ink);
     padding: 0.35rem 0.75rem;
     font-size: 0.82rem;
@@ -1793,8 +1844,8 @@ select.input-shell {
 
 .tables-context-filter-chip:hover,
 .tables-context-filter-chip:focus-visible {
-    border-color: rgba(184, 121, 59, 0.34);
-    background: rgba(255, 239, 214, 0.96);
+    border-color: color-mix(in srgb, var(--accent-4) 46%, var(--border-default));
+    background: color-mix(in srgb, var(--surface-input-hover) 92%, var(--surface-callout));
     outline: 2px solid var(--focus-ring);
     outline-offset: 2px;
 }
@@ -1844,8 +1895,8 @@ select.input-shell {
     align-items: stretch;
     min-width: 100%;
     font-size: 1.5rem;
-    border-top: 1px solid rgba(127, 96, 55, 0.2);
-    border-left: 1px solid rgba(127, 96, 55, 0.2);
+    border-top: 1px solid var(--border-default);
+    border-left: 1px solid var(--border-default);
     isolation: isolate;
     --tables-header-row-height: 3.2rem;
     --tables-group-header-top: 0;
@@ -1863,9 +1914,9 @@ select.input-shell {
     min-width: 0;
     min-height: var(--tables-header-row-height);
     padding: 0.35rem;
-    border-right: 1px solid rgba(127, 96, 55, 0.2);
-    border-bottom: 1px solid rgba(127, 96, 55, 0.2);
-    background: color-mix(in srgb, var(--surface-card-strong) 94%, var(--accent-1));
+    border-right: 1px solid var(--border-default);
+    border-bottom: 1px solid var(--border-default);
+    background: var(--surface-table-header);
     text-transform: uppercase;
     text-align: center;
     letter-spacing: 0.08em;
@@ -1904,7 +1955,7 @@ select.input-shell {
 
 .critical-table-grid-corner,
 .critical-table-grid-roll-band-header {
-    background: color-mix(in srgb, var(--surface-card-strong) 94%, var(--accent-1));
+    background: var(--surface-table-header);
 }
 
 .critical-table-grid-corner {
@@ -1922,7 +1973,7 @@ select.input-shell {
 }
 
 .critical-table-grid-roll-band {
-    background: color-mix(in srgb, var(--surface-card-strong) 94%, var(--accent-1));
+    background: var(--surface-table-header);
     font-size: 1.5rem;
     position: sticky;
     left: 0;
@@ -1935,8 +1986,9 @@ select.input-shell {
     z-index: 1;
     min-width: 0;
     padding: 0.55rem;
-    border-right: 1px solid rgba(127, 96, 55, 0.2);
-    border-bottom: 1px solid rgba(127, 96, 55, 0.2);
+    border-right: 1px solid var(--border-default);
+    border-bottom: 1px solid var(--border-default);
+    background: var(--surface-table-cell);
     box-sizing: border-box;
     cursor: pointer;
     transition: box-shadow 0.16s ease, background-color 0.16s ease, transform 0.16s ease;
@@ -1949,39 +2001,39 @@ select.input-shell {
 
 .critical-table-cell.is-curated {
     background:
-        linear-gradient(135deg, rgba(102, 138, 83, 0.16), transparent 34%),
-        rgba(255, 255, 255, 0.85);
+        linear-gradient(135deg, color-mix(in srgb, var(--success-2) 32%, transparent), transparent 34%),
+        var(--surface-table-cell);
 }
 
 .critical-table-cell.needs-curation {
     background:
-        linear-gradient(135deg, rgba(184, 121, 59, 0.18), transparent 34%),
-        rgba(255, 255, 255, 0.85);
+        linear-gradient(135deg, color-mix(in srgb, var(--warning-2) 34%, transparent), transparent 34%),
+        var(--surface-table-cell);
 }
 
 .critical-table-cell.is-active-row,
 .critical-table-grid-roll-band.is-active-row {
     background:
-        linear-gradient(180deg, rgba(13, 148, 136, 0.12), rgba(13, 148, 136, 0.04)),
-        rgba(255, 255, 255, 0.9);
+        linear-gradient(180deg, var(--selection-3), var(--selection-1)),
+        var(--surface-table-cell-strong);
 }
 
 .critical-table-grid-column-header.is-active-column,
 .critical-table-cell.is-active-column {
-    box-shadow: inset 0 0 0 999px rgba(13, 148, 136, 0.06);
+    box-shadow: inset 0 0 0 999px var(--selection-2);
 }
 
 .critical-table-grid-group-header.is-active-group,
 .critical-table-grid-column-header.is-active-group,
 .critical-table-cell.is-active-group {
-    box-shadow: inset 0 0 0 999px rgba(188, 117, 43, 0.05);
+    box-shadow: inset 0 0 0 999px color-mix(in srgb, var(--accent-4) 8%, transparent);
 }
 
 .critical-table-cell.is-selected-cell {
-    box-shadow: inset 0 0 0 2px rgba(13, 148, 136, 0.62);
+    box-shadow: inset 0 0 0 2px var(--selection-6);
     background:
-        linear-gradient(135deg, rgba(13, 148, 136, 0.16), transparent 38%),
-        rgba(255, 255, 255, 0.96);
+        linear-gradient(135deg, var(--selection-4), transparent 38%),
+        var(--surface-table-cell-strong);
 }
 
 .critical-table-cell.is-roll-target::after,
@@ -1989,7 +2041,7 @@ select.input-shell {
     content: "";
     position: absolute;
     inset: 0;
-    border: 2px dashed rgba(13, 148, 136, 0.35);
+    border: 2px dashed var(--selection-5);
     pointer-events: none;
 }
 
@@ -2038,7 +2090,7 @@ select.input-shell {
 }
 
 .empty-cell {
-    color: #a08464;
+    color: var(--ink-faint);
     font-style: italic;
     display: block;
     padding: 1rem 0.75rem;
@@ -2049,8 +2101,8 @@ select.input-shell {
     margin-top: 0;
     padding: 0.9rem 1rem;
     border-radius: 16px;
-    background: rgba(235, 226, 209, 0.6);
-    border: 1px solid rgba(127, 96, 55, 0.2);
+    background: color-mix(in srgb, var(--surface-callout) 88%, transparent);
+    border: 1px solid var(--border-default);
     max-height: min(16rem, 34%);
     overflow: auto;
 }
@@ -2095,7 +2147,7 @@ select.input-shell {
     justify-content: center;
     align-items: stretch;
     padding: 1.25rem;
-    background: rgba(38, 26, 20, 0.44);
+    background: var(--bg-overlay);
     backdrop-filter: blur(4px);
 }
 
@@ -2111,9 +2163,9 @@ select.input-shell {
     min-height: 0;
     overflow: hidden;
     border-radius: 24px;
-    background: rgba(255, 250, 242, 0.98);
-    border: 1px solid rgba(127, 96, 55, 0.18);
-    box-shadow: 0 28px 60px rgba(41, 22, 11, 0.24);
+    background: color-mix(in srgb, var(--bg-elevated) 96%, var(--surface-2));
+    border: 1px solid var(--border-default);
+    box-shadow: var(--shadow-2);
 }
 
 .critical-editor-form {
@@ -2131,11 +2183,11 @@ select.input-shell {
     justify-content: space-between;
     gap: 1rem;
     padding: 1rem 1.25rem;
-    border-bottom: 1px solid rgba(127, 96, 55, 0.12);
+    border-bottom: 1px solid var(--border-subtle);
 }
 
 .critical-editor-footer {
-    border-top: 1px solid rgba(127, 96, 55, 0.12);
+    border-top: 1px solid var(--border-subtle);
     border-bottom: none;
     align-items: center;
 }
@@ -2175,8 +2227,8 @@ select.input-shell {
     max-height: 340px;
     object-fit: contain;
     border-radius: 14px;
-    border: 1px solid rgba(127, 96, 55, 0.14);
-    background: rgba(255, 255, 255, 0.96);
+    border: 1px solid var(--border-subtle);
+    background: color-mix(in srgb, var(--surface-card-strong) 96%, var(--surface-2));
 }
 
 .critical-editor-source-image.is-inline {
@@ -2208,12 +2260,12 @@ select.input-shell {
     gap: 0.85rem;
     padding: 0.9rem;
     border-radius: 16px;
-    background: rgba(255, 255, 255, 0.88);
-    border: 1px solid rgba(127, 96, 55, 0.15);
+    background: color-mix(in srgb, var(--surface-card) 92%, var(--surface-card-strong));
+    border: 1px solid var(--border-default);
 }
 
 .critical-editor-card.nested {
-    background: rgba(252, 248, 238, 0.96);
+    background: color-mix(in srgb, var(--surface-inline) 94%, var(--surface-card));
 }
 
 .critical-editor-textarea {
@@ -2247,8 +2299,8 @@ select.input-shell {
     margin: 0;
     padding: 0.85rem 0.95rem;
     border-radius: 14px;
-    background: rgba(141, 43, 30, 0.08);
-    border: 1px solid rgba(141, 43, 30, 0.18);
+    background: color-mix(in srgb, var(--danger-2) 18%, transparent);
+    border: 1px solid color-mix(in srgb, var(--danger-4) 36%, var(--border-subtle));
 }
 
 .critical-editor-quick-parse-grid {
@@ -2281,8 +2333,8 @@ select.input-shell {
     justify-content: center;
     padding: 0.55rem;
     border-radius: 14px;
-    border: 1px solid rgba(127, 96, 55, 0.14);
-    background: rgba(255, 255, 255, 0.96);
+    border: 1px solid var(--border-subtle);
+    background: color-mix(in srgb, var(--surface-card-strong) 96%, var(--surface-2));
     box-sizing: border-box;
     overflow: hidden;
 }
@@ -2309,11 +2361,11 @@ select.input-shell {
 
 .critical-editor-quick-legend-item code {
     font-size: 0.9rem;
-    color: #5b4327;
+    color: var(--button-secondary-text);
 }
 
 .critical-editor-quick-legend-equals {
-    color: #8d5e1a;
+    color: var(--warning-5);
     font-weight: 700;
     margin-left: 0.2rem;
     margin-right: 0.2rem;
@@ -2330,8 +2382,8 @@ select.input-shell {
     gap: 0.75rem;
     padding: 0.9rem;
     border-radius: 16px;
-    background: rgba(255, 255, 255, 0.72);
-    border: 1px solid rgba(127, 96, 55, 0.12);
+    background: color-mix(in srgb, var(--surface-card) 86%, transparent);
+    border: 1px solid var(--border-subtle);
 }
 
 .critical-editor-compare-card .critical-cell {
@@ -2354,8 +2406,8 @@ select.input-shell {
     gap: 0.75rem;
     padding: 0.65rem 0.75rem;
     border-radius: 14px;
-    background: rgba(255, 255, 255, 0.7);
-    border: 1px solid rgba(127, 96, 55, 0.12);
+    background: color-mix(in srgb, var(--surface-card) 84%, transparent);
+    border: 1px solid var(--border-subtle);
 }
 
 .critical-editor-effect-row-main {
@@ -2413,8 +2465,8 @@ select.input-shell {
     margin: 0;
     padding: 0.65rem 0.8rem;
     border-radius: 12px;
-    background: rgba(184, 121, 59, 0.12);
-    color: #6b4c29;
+    background: color-mix(in srgb, var(--warning-2) 20%, transparent);
+    color: var(--warning-5);
 }
 
 .critical-editor-advanced-hint {
@@ -2423,8 +2475,8 @@ select.input-shell {
 
 .critical-editor-advanced {
     border-radius: 18px;
-    border: 1px solid rgba(127, 96, 55, 0.14);
-    background: rgba(247, 239, 225, 0.3);
+    border: 1px solid var(--border-subtle);
+    background: color-mix(in srgb, var(--surface-callout) 56%, transparent);
     overflow: hidden;
 }
 
@@ -2437,7 +2489,7 @@ select.input-shell {
     cursor: pointer;
     list-style: none;
     font-family: var(--font-ui);
-    color: #5b4327;
+    color: var(--button-secondary-text);
 }
 
 .critical-editor-advanced-summary::-webkit-details-marker {
@@ -2447,7 +2499,7 @@ select.input-shell {
 .critical-editor-advanced-meta {
     font-family: var(--font-body);
     font-size: 0.92rem;
-    color: #7b6243;
+    color: var(--text-tertiary);
 }
 
 .critical-editor-advanced-body {
@@ -2467,21 +2519,21 @@ select.input-shell {
     font-size: 0.8rem;
     text-transform: uppercase;
     letter-spacing: 0.06em;
-    color: #8a7355;
+    color: var(--text-tertiary);
 }
 
 .critical-editor-diagnostic-grid dd {
     margin: 0.2rem 0 0;
-    color: #4f3c25;
+    color: var(--text-primary);
 }
 
 .critical-editor-diagnostic-block {
     margin: 0;
     padding: 0.85rem 0.95rem;
     border-radius: 14px;
-    background: rgba(92, 68, 41, 0.08);
-    border: 1px solid rgba(92, 68, 41, 0.12);
-    color: #3f311f;
+    background: color-mix(in srgb, var(--surface-inline) 72%, var(--accent-1));
+    border: 1px solid color-mix(in srgb, var(--accent-4) 18%, var(--border-subtle));
+    color: var(--text-primary);
     white-space: pre-wrap;
     word-break: break-word;
     font-size: 0.9rem;
@@ -2500,15 +2552,15 @@ select.input-shell {
     gap: 0.85rem;
     padding: 0.75rem 0.85rem;
     border-radius: 14px;
-    background: rgba(255, 255, 255, 0.65);
-    border: 1px solid rgba(127, 96, 55, 0.1);
+    background: color-mix(in srgb, var(--surface-card) 82%, transparent);
+    border: 1px solid var(--border-subtle);
 }
 
 .critical-editor-diagnostic-values {
     display: grid;
     gap: 0.25rem;
     justify-items: end;
-    color: #5d4429;
+    color: var(--text-secondary);
     text-align: right;
 }
 
@@ -2589,9 +2641,9 @@ select.input-shell {
     gap: 0.45rem;
     padding: 0.85rem 1rem;
     border-radius: 16px;
-    background: rgba(247, 239, 225, 0.65);
-    border: 1px solid rgba(127, 96, 55, 0.12);
-    color: #5d4429;
+    background: color-mix(in srgb, var(--surface-callout) 82%, transparent);
+    border: 1px solid var(--border-subtle);
+    color: var(--text-secondary);
 }
 
 .critical-diagnostics-body {
@@ -2612,7 +2664,7 @@ select.input-shell {
 }
 
 .critical-editor-inline-button:hover {
-    color: #6e4320;
+    color: var(--link-hover);
 }
 
 .critical-editor-compact-button {
@@ -2650,8 +2702,8 @@ select.input-shell {
     gap: 0.45rem 0.65rem;
     padding: 0.55rem 0.7rem;
     border-radius: 14px;
-    background: rgba(247, 239, 225, 0.5);
-    border: 1px solid rgba(127, 96, 55, 0.12);
+    background: color-mix(in srgb, var(--surface-callout) 76%, transparent);
+    border: 1px solid var(--border-subtle);
 }
 
 .critical-curation-grid .critical-cell {
@@ -2697,8 +2749,8 @@ select.input-shell {
 
 .critical-curation-preview-button:hover:not(:disabled),
 .critical-curation-preview-button:focus-visible {
-    background: rgba(247, 239, 225, 0.65);
-    box-shadow: 0 0 0 1px rgba(127, 96, 55, 0.16);
+    background: color-mix(in srgb, var(--surface-callout) 82%, transparent);
+    box-shadow: 0 0 0 1px var(--border-default);
     transform: translateY(-1px);
     outline: none;
 }