diff --git a/apps/calendar/apps/web/src/lib/components/event/EventDetailModal.svelte b/apps/calendar/apps/web/src/lib/components/event/EventDetailModal.svelte
index c61e08a4c..42f744c31 100644
--- a/apps/calendar/apps/web/src/lib/components/event/EventDetailModal.svelte
+++ b/apps/calendar/apps/web/src/lib/components/event/EventDetailModal.svelte
@@ -470,9 +470,10 @@
 	}
 
 	.modal-container {
-		background: hsl(var(--color-surface));
+		background: var(--color-surface-elevated-2);
+		border: 1px solid var(--color-border-strong);
 		border-radius: var(--radius-lg);
-		box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
+		box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.5);
 		width: 100%;
 		max-width: 500px;
 		max-height: 90vh;
diff --git a/apps/calendar/apps/web/src/lib/components/voice/VoiceRecordingModal.svelte b/apps/calendar/apps/web/src/lib/components/voice/VoiceRecordingModal.svelte
index 1e3b21d5a..6bdb147e4 100644
--- a/apps/calendar/apps/web/src/lib/components/voice/VoiceRecordingModal.svelte
+++ b/apps/calendar/apps/web/src/lib/components/voice/VoiceRecordingModal.svelte
@@ -146,11 +146,11 @@
 		left: 50%;
 		transform: translate(-50%, -50%);
 		z-index: 201;
-		background: hsl(var(--color-surface));
+		background: var(--color-surface-elevated-2);
 		border-radius: 1.5rem;
 		box-shadow:
-			0 25px 50px -12px rgba(0, 0, 0, 0.25),
-			0 0 0 1px hsl(var(--color-border));
+			0 25px 50px -12px rgba(0, 0, 0, 0.5),
+			0 0 0 1px var(--color-border-strong);
 		padding: 2rem;
 		min-width: 280px;
 		max-width: 90vw;
diff --git a/apps/clock/apps/web/src/lib/components/AuthGateModal.svelte b/apps/clock/apps/web/src/lib/components/AuthGateModal.svelte
index 53f098b47..6f3c17552 100644
--- a/apps/clock/apps/web/src/lib/components/AuthGateModal.svelte
+++ b/apps/clock/apps/web/src/lib/components/AuthGateModal.svelte
@@ -117,9 +117,10 @@
 	}
 
 	.modal-content {
-		background-color: var(--color-background, white);
+		background-color: var(--color-surface-elevated-2);
+		border: 1px solid var(--color-border-strong);
 		border-radius: 0.75rem;
-		box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
+		box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.5);
 		max-width: 28rem;
 		width: 100%;
 		padding: 1.5rem;
diff --git a/apps/contacts/apps/web/src/lib/components/NewContactModal.svelte b/apps/contacts/apps/web/src/lib/components/NewContactModal.svelte
index f5d8675dd..101ae5f1d 100644
--- a/apps/contacts/apps/web/src/lib/components/NewContactModal.svelte
+++ b/apps/contacts/apps/web/src/lib/components/NewContactModal.svelte
@@ -5,7 +5,6 @@
 	import { newContactModalStore } from '$lib/stores/new-contact-modal.svelte';
 	import SocialMediaFields from './forms/SocialMediaFields.svelte';
 	import DateFields from './forms/DateFields.svelte';
-	import { parseContactInput, formatParsedContactPreview } from '$lib/utils/contact-parser';
 	import { findDuplicates, type DuplicateMatch } from '$lib/utils/duplicate-detector';
 	import { contactCollection } from '$lib/data/local-store';
 	import {
@@ -30,7 +29,6 @@
 	let saving = $state(false);
 	let error = $state<string | null>(null);
 	let firstNameInput: HTMLInputElement;
-	let quickInputRef: HTMLInputElement;
 	let fileInput: HTMLInputElement;
 
 	// Photo state
@@ -70,50 +68,6 @@
 	let discord = $state('');
 	let bluesky = $state('');
 
-	// ─── Quick Input (NL Parser) ───────────────────────────
-	let quickInput = $state('');
-	let quickPreview = $state('');
-	let quickApplied = $state(false);
-
-	function handleQuickInput(e: Event) {
-		const text = (e.target as HTMLInputElement).value;
-		quickInput = text;
-		quickApplied = false;
-
-		if (!text.trim()) {
-			quickPreview = '';
-			return;
-		}
-
-		const parsed = parseContactInput(text);
-		quickPreview = formatParsedContactPreview(parsed);
-	}
-
-	function applyQuickInput() {
-		if (!quickInput.trim() || quickApplied) return;
-
-		const parsed = parseContactInput(quickInput);
-
-		if (parsed.firstName) firstName = parsed.firstName;
-		if (parsed.lastName) lastName = parsed.lastName;
-		if (parsed.email) email = parsed.email;
-		if (parsed.phone) phone = parsed.phone;
-		if (parsed.company) company = parsed.company;
-
-		quickApplied = true;
-		quickInput = '';
-		quickPreview = '';
-	}
-
-	function handleQuickKeydown(e: KeyboardEvent) {
-		if (e.key === 'Enter') {
-			e.preventDefault();
-			applyQuickInput();
-			// Move focus to first name field
-			firstNameInput?.focus();
-		}
-	}
-
 	// ─── Live Duplicate Detection ──────────────────────────
 	let duplicates = $state<DuplicateMatch[]>([]);
 	let dupDebounce: ReturnType<typeof setTimeout> | undefined;
@@ -328,22 +282,6 @@
 
 		<!-- Modal Body -->
 		<div class="modal-body">
-			<!-- Quick Input Bar -->
-			<div class="quick-input-section">
-				<input
-					type="text"
-					class="quick-input"
-					bind:this={quickInputRef}
-					value={quickInput}
-					oninput={handleQuickInput}
-					onkeydown={handleQuickKeydown}
-					placeholder="Schnelleingabe: Max Müller @Firma max@mail.de +49... #tag"
-				/>
-				{#if quickPreview}
-					<div class="quick-preview">{quickPreview}</div>
-				{/if}
-			</div>
-
 			<!-- Duplicate Warning -->
 			{#if duplicates.length > 0}
 				<div class="duplicate-warning" role="alert">
@@ -654,14 +592,15 @@
 	}
 
 	.modal-container {
-		background: hsl(var(--color-background));
+		background: var(--color-surface-elevated-2);
+		border: 1px solid var(--color-border-strong);
 		border-radius: 1.5rem;
 		width: 100%;
 		max-width: 560px;
 		max-height: 90vh;
 		display: flex;
 		flex-direction: column;
-		box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
+		box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.5);
 		animation: modalIn 0.2s ease-out;
 	}
 
@@ -691,41 +630,6 @@
 		padding: 0 1.5rem 1.5rem;
 	}
 
-	.quick-input-section {
-		margin-bottom: 1rem;
-	}
-
-	.quick-input {
-		width: 100%;
-		padding: 0.625rem 0.875rem;
-		border: 1px dashed hsl(var(--color-border));
-		border-radius: 0.75rem;
-		background: hsl(var(--color-muted) / 0.3);
-		color: hsl(var(--color-foreground));
-		font-size: 0.8125rem;
-		outline: none;
-		transition: all 0.15s;
-	}
-
-	.quick-input:focus {
-		border-style: solid;
-		border-color: hsl(var(--color-primary) / 0.5);
-		background: hsl(var(--color-background));
-		box-shadow: 0 0 0 3px hsl(var(--color-primary) / 0.1);
-	}
-
-	.quick-input::placeholder {
-		color: hsl(var(--color-muted-foreground));
-		font-size: 0.75rem;
-	}
-
-	.quick-preview {
-		margin-top: 0.25rem;
-		padding: 0 0.5rem;
-		font-size: 0.7rem;
-		color: hsl(var(--color-muted-foreground));
-	}
-
 	.duplicate-warning {
 		display: flex;
 		align-items: flex-start;
diff --git a/apps/todo/apps/web/src/lib/components/QuickAddTask.svelte b/apps/todo/apps/web/src/lib/components/QuickAddTask.svelte
index dceb1185c..8d0d837c3 100644
--- a/apps/todo/apps/web/src/lib/components/QuickAddTask.svelte
+++ b/apps/todo/apps/web/src/lib/components/QuickAddTask.svelte
@@ -526,13 +526,9 @@
 		min-width: 140px;
 		padding: 0.375rem;
 		border-radius: 0.75rem;
-		background: rgba(255, 255, 255, 0.95);
-		backdrop-filter: blur(12px);
-		-webkit-backdrop-filter: blur(12px);
-		border: 1px solid rgba(0, 0, 0, 0.1);
-		box-shadow:
-			0 10px 15px -3px rgba(0, 0, 0, 0.1),
-			0 4px 6px -2px rgba(0, 0, 0, 0.05);
+		background: var(--color-surface-elevated-3);
+		border: 1px solid var(--color-border);
+		box-shadow: var(--shadow-xl);
 		z-index: 50;
 	}
 
@@ -541,17 +537,9 @@
 		.dropdown {
 			top: auto;
 			bottom: calc(100% + 0.5rem);
-			box-shadow:
-				0 -10px 15px -3px rgba(0, 0, 0, 0.1),
-				0 -4px 6px -2px rgba(0, 0, 0, 0.05);
 		}
 	}
 
-	:global(.dark) .dropdown {
-		background: rgba(40, 40, 40, 0.95);
-		border: 1px solid rgba(255, 255, 255, 0.15);
-	}
-
 	.dropdown-item {
 		display: flex;
 		align-items: center;
@@ -560,7 +548,7 @@
 		padding: 0.5rem 0.75rem;
 		border: none;
 		background: transparent;
-		color: #374151;
+		color: var(--color-foreground);
 		cursor: pointer;
 		border-radius: 0.5rem;
 		font-size: 0.8125rem;
@@ -568,25 +556,13 @@
 		transition: background 0.15s;
 	}
 
-	:global(.dark) .dropdown-item {
-		color: #f3f4f6;
-	}
-
 	.dropdown-item:hover {
-		background: rgba(0, 0, 0, 0.05);
-	}
-
-	:global(.dark) .dropdown-item:hover {
-		background: rgba(255, 255, 255, 0.1);
+		background: var(--color-surface-hover);
 	}
 
 	.dropdown-item.selected {
-		background: rgba(139, 92, 246, 0.1);
-		color: #8b5cf6;
-	}
-
-	:global(.dark) .dropdown-item.selected {
-		background: rgba(139, 92, 246, 0.2);
+		background: color-mix(in srgb, var(--color-primary) 12%, transparent);
+		color: var(--color-primary);
 	}
 
 	.priority-dot,
diff --git a/apps/todo/apps/web/src/lib/components/SubtaskList.svelte b/apps/todo/apps/web/src/lib/components/SubtaskList.svelte
index 6de47df9c..14ddbe2eb 100644
--- a/apps/todo/apps/web/src/lib/components/SubtaskList.svelte
+++ b/apps/todo/apps/web/src/lib/components/SubtaskList.svelte
@@ -200,25 +200,17 @@
 		gap: 0.5rem;
 		padding: 0.5rem 0.75rem;
 		border-radius: 0.75rem;
-		background: rgba(0, 0, 0, 0.03);
+		background: var(--color-surface);
 		transition: all 0.15s;
 	}
 
-	:global(.dark) .subtask-item {
-		background: rgba(255, 255, 255, 0.05);
-	}
-
 	.subtask-item:hover {
-		background: rgba(0, 0, 0, 0.06);
-	}
-
-	:global(.dark) .subtask-item:hover {
-		background: rgba(255, 255, 255, 0.1);
+		background: var(--color-surface-hover);
 	}
 
 	.drag-handle {
 		cursor: grab;
-		color: #9ca3af;
+		color: var(--color-muted-foreground);
 		padding: 0.25rem;
 		opacity: 0.5;
 		transition: opacity 0.15s;
@@ -236,7 +228,7 @@
 		width: 1.125rem;
 		height: 1.125rem;
 		border-radius: 0.25rem;
-		border: 2px solid rgba(0, 0, 0, 0.2);
+		border: 2px solid var(--color-border);
 		background: transparent;
 		display: flex;
 		align-items: center;
@@ -247,18 +239,14 @@
 		padding: 0;
 	}
 
-	:global(.dark) .subtask-checkbox {
-		border-color: rgba(255, 255, 255, 0.3);
-	}
-
 	.subtask-checkbox:hover {
-		border-color: #8b5cf6;
-		background: rgba(139, 92, 246, 0.1);
+		border-color: var(--color-primary);
+		background: color-mix(in srgb, var(--color-primary) 10%, transparent);
 	}
 
 	.subtask-checkbox.checked {
-		background: #8b5cf6;
-		border-color: #8b5cf6;
+		background: var(--color-primary);
+		border-color: var(--color-primary);
 	}
 
 	.check-icon {
@@ -274,41 +262,32 @@
 		border: none;
 		padding: 0;
 		font-size: 0.875rem;
-		color: #374151;
+		color: var(--color-foreground);
 		cursor: text;
 	}
 
-	:global(.dark) .subtask-title {
-		color: #e5e7eb;
-	}
-
 	.subtask-title.completed {
 		text-decoration: line-through;
-		color: #9ca3af;
+		color: var(--color-muted-foreground);
 	}
 
 	.subtask-edit-input {
 		flex: 1;
-		background: white;
-		border: 1px solid #8b5cf6;
+		background: var(--color-surface-elevated-3);
+		border: 1px solid var(--color-primary);
 		border-radius: 0.375rem;
 		padding: 0.25rem 0.5rem;
 		font-size: 0.875rem;
-		color: #374151;
+		color: var(--color-foreground);
 		outline: none;
 	}
 
-	:global(.dark) .subtask-edit-input {
-		background: rgba(255, 255, 255, 0.1);
-		color: #e5e7eb;
-	}
-
 	.subtask-delete {
 		opacity: 0;
 		padding: 0.25rem;
 		border: none;
 		background: transparent;
-		color: #9ca3af;
+		color: var(--color-muted-foreground);
 		cursor: pointer;
 		border-radius: 0.375rem;
 		transition: all 0.15s;
@@ -319,8 +298,8 @@
 	}
 
 	.subtask-delete:hover {
-		color: #ef4444;
-		background: rgba(239, 68, 68, 0.1);
+		color: var(--color-error);
+		background: color-mix(in srgb, var(--color-error) 10%, transparent);
 	}
 
 	/* Add subtask */
@@ -330,21 +309,17 @@
 		gap: 0.5rem;
 		padding: 0.5rem 0.75rem;
 		border-radius: 0.75rem;
-		border: 1px dashed rgba(0, 0, 0, 0.15);
+		border: 1px dashed var(--color-border);
 		transition: all 0.15s;
 	}
 
-	:global(.dark) .add-subtask {
-		border-color: rgba(255, 255, 255, 0.15);
-	}
-
 	.add-subtask:focus-within {
-		border-color: #8b5cf6;
-		background: rgba(139, 92, 246, 0.05);
+		border-color: var(--color-primary);
+		background: color-mix(in srgb, var(--color-primary) 5%, transparent);
 	}
 
 	.add-icon {
-		color: #9ca3af;
+		color: var(--color-muted-foreground);
 	}
 
 	.add-input {
@@ -353,15 +328,11 @@
 		border: none;
 		outline: none;
 		font-size: 0.875rem;
-		color: #374151;
+		color: var(--color-foreground);
 	}
 
 	.add-input::placeholder {
-		color: #9ca3af;
-	}
-
-	:global(.dark) .add-input {
-		color: #e5e7eb;
+		color: var(--color-muted-foreground);
 	}
 
 	.add-btn {
@@ -369,7 +340,7 @@
 		font-size: 0.75rem;
 		font-weight: 500;
 		color: white;
-		background: #8b5cf6;
+		background: var(--color-primary);
 		border: none;
 		border-radius: 0.5rem;
 		cursor: pointer;
@@ -377,6 +348,6 @@
 	}
 
 	.add-btn:hover {
-		background: #7c3aed;
+		background: var(--color-primary-hover);
 	}
 </style>
diff --git a/apps/todo/apps/web/src/lib/components/SyncIndicator.svelte b/apps/todo/apps/web/src/lib/components/SyncIndicator.svelte
index 5eff35336..47d4ee993 100644
--- a/apps/todo/apps/web/src/lib/components/SyncIndicator.svelte
+++ b/apps/todo/apps/web/src/lib/components/SyncIndicator.svelte
@@ -117,29 +117,29 @@
 	}
 
 	.dot-synced {
-		background: #22c55e;
-		box-shadow: 0 0 4px rgba(34, 197, 94, 0.5);
+		background: var(--color-success);
+		box-shadow: 0 0 4px color-mix(in srgb, var(--color-success) 50%, transparent);
 	}
 
 	.dot-syncing {
-		background: #3b82f6;
+		background: var(--color-primary);
 		animation: pulse 1s ease-in-out infinite;
 	}
 
 	.dot-pending {
-		background: #f59e0b;
+		background: var(--color-warning);
 	}
 
 	.dot-offline {
-		background: #f97316;
+		background: var(--color-warning);
 	}
 
 	.dot-error {
-		background: #ef4444;
+		background: var(--color-error);
 	}
 
 	.dot-local {
-		background: #8b5cf6;
+		background: var(--color-primary);
 	}
 
 	.dot-idle {
diff --git a/apps/todo/apps/web/src/lib/components/TagStrip.svelte b/apps/todo/apps/web/src/lib/components/TagStrip.svelte
index eef25e66e..9d241bec5 100644
--- a/apps/todo/apps/web/src/lib/components/TagStrip.svelte
+++ b/apps/todo/apps/web/src/lib/components/TagStrip.svelte
@@ -169,29 +169,19 @@
 
 	/* Clear filter pill */
 	.clear-filter-pill {
-		color: #ef4444;
-		background: rgba(239, 68, 68, 0.1) !important;
-		border-color: rgba(239, 68, 68, 0.3) !important;
+		color: var(--color-error);
+		background: color-mix(in srgb, var(--color-error) 10%, transparent) !important;
+		border-color: color-mix(in srgb, var(--color-error) 30%, transparent) !important;
 	}
 
 	.clear-filter-pill .tag-name {
-		color: #ef4444;
+		color: var(--color-error);
 		font-weight: 600;
 	}
 
-	:global(.dark) .clear-filter-pill {
-		color: #f87171;
-		background: rgba(239, 68, 68, 0.15) !important;
-		border-color: rgba(239, 68, 68, 0.3) !important;
-	}
-
-	:global(.dark) .clear-filter-pill .tag-name {
-		color: #f87171;
-	}
-
 	.clear-filter-pill:hover:not(.hidden) {
-		background: rgba(239, 68, 68, 0.2) !important;
-		border-color: rgba(239, 68, 68, 0.5) !important;
+		background: color-mix(in srgb, var(--color-error) 20%, transparent) !important;
+		border-color: color-mix(in srgb, var(--color-error) 50%, transparent) !important;
 	}
 
 	.clear-filter-pill.hidden {
@@ -201,40 +191,24 @@
 
 	/* More pill with neutral style */
 	.more-pill {
-		color: #374151;
+		color: var(--color-foreground);
 	}
 
 	.more-pill .tag-name {
-		color: #374151;
+		color: var(--color-foreground);
 		font-weight: 500;
 	}
 
-	:global(.dark) .more-pill {
-		color: #f3f4f6;
-	}
-
-	:global(.dark) .more-pill .tag-name {
-		color: #f3f4f6;
-	}
-
 	/* Create pill with neutral style */
 	.create-pill {
-		color: #374151;
+		color: var(--color-foreground);
 	}
 
 	.create-pill .tag-name {
-		color: #374151;
+		color: var(--color-foreground);
 		font-weight: 500;
 	}
 
-	:global(.dark) .create-pill {
-		color: #f3f4f6;
-	}
-
-	:global(.dark) .create-pill .tag-name {
-		color: #f3f4f6;
-	}
-
 	/* Glass tag styling */
 	.glass-tag {
 		padding: 0.5rem 1rem;
@@ -282,17 +256,13 @@
 	.tag-name {
 		font-size: 0.9375rem;
 		font-weight: 500;
-		color: #374151;
+		color: var(--color-foreground);
 		white-space: nowrap;
 	}
 
-	:global(.dark) .tag-name {
-		color: #f3f4f6;
-	}
-
 	.loading-state {
 		font-size: 0.875rem;
-		color: hsl(var(--color-muted-foreground));
+		color: var(--color-muted-foreground);
 		padding: 0.5rem;
 	}
 
@@ -301,18 +271,14 @@
 		align-items: center;
 		gap: 0.5rem;
 		cursor: pointer;
-		color: #6b7280;
+		color: var(--color-muted-foreground);
 		font-size: 0.875rem;
 		flex-shrink: 0;
 	}
 
-	:global(.dark) .empty-state {
-		color: #9ca3af;
-	}
-
 	.add-hint {
 		font-size: 0.875rem;
-		color: #8b5cf6;
+		color: var(--color-primary);
 		font-weight: 500;
 	}
 
diff --git a/apps/todo/apps/web/src/lib/components/TagStripModal.svelte b/apps/todo/apps/web/src/lib/components/TagStripModal.svelte
index 11e82021e..e7f8d3bf4 100644
--- a/apps/todo/apps/web/src/lib/components/TagStripModal.svelte
+++ b/apps/todo/apps/web/src/lib/components/TagStripModal.svelte
@@ -328,24 +328,15 @@
 		max-width: 500px;
 		max-height: 70vh;
 		z-index: 100;
-		background: rgba(255, 255, 255, 0.95);
-		backdrop-filter: blur(20px);
-		-webkit-backdrop-filter: blur(20px);
-		border: 1px solid rgba(0, 0, 0, 0.1);
+		background: var(--color-surface-elevated-2);
+		border: 1px solid var(--color-border);
 		border-radius: 1rem;
-		box-shadow:
-			0 25px 50px -12px rgba(0, 0, 0, 0.25),
-			0 0 0 1px rgba(255, 255, 255, 0.1);
+		box-shadow: var(--shadow-xl);
 		display: flex;
 		flex-direction: column;
 		overflow: hidden;
 	}
 
-	:global(.dark) .tag-modal {
-		background: rgba(30, 30, 30, 0.95);
-		border: 1px solid rgba(255, 255, 255, 0.1);
-	}
-
 	.modal-header {
 		display: flex;
 		align-items: center;
@@ -356,11 +347,7 @@
 	.modal-title {
 		font-size: 1.125rem;
 		font-weight: 600;
-		color: #1f2937;
-	}
-
-	:global(.dark) .modal-title {
-		color: #f3f4f6;
+		color: var(--color-foreground);
 	}
 
 	.header-actions {
@@ -379,75 +366,48 @@
 		background: transparent;
 		border: none;
 		cursor: pointer;
-		color: #6b7280;
+		color: var(--color-muted-foreground);
 		transition: all 0.15s ease;
 	}
 
 	.header-btn:hover {
-		background: rgba(0, 0, 0, 0.05);
-		color: #1f2937;
-	}
-
-	:global(.dark) .header-btn {
-		color: #9ca3af;
-	}
-
-	:global(.dark) .header-btn:hover {
-		background: rgba(255, 255, 255, 0.1);
-		color: #f3f4f6;
+		background: var(--color-surface-hover);
+		color: var(--color-foreground);
 	}
 
 	/* Search (sticky bottom) */
 	.search-wrapper {
 		position: relative;
 		padding: 0.75rem 1rem;
-		border-top: 1px solid rgba(0, 0, 0, 0.08);
-		background: rgba(255, 255, 255, 0.9);
-		backdrop-filter: blur(10px);
-		-webkit-backdrop-filter: blur(10px);
+		border-top: 1px solid var(--color-border);
+		background: var(--color-surface-elevated-2);
 		flex-shrink: 0;
 	}
 
-	:global(.dark) .search-wrapper {
-		border-top-color: rgba(255, 255, 255, 0.08);
-		background: rgba(30, 30, 30, 0.9);
-	}
-
 	.search-wrapper :global(.search-icon) {
 		position: absolute;
 		left: 1.75rem;
 		top: 50%;
 		transform: translateY(-50%);
-		color: #9ca3af;
+		color: var(--color-muted-foreground);
 		pointer-events: none;
 	}
 
 	.search-input {
 		width: 100%;
 		padding: 0.5rem 2rem 0.5rem 2.25rem;
-		border: 1px solid rgba(0, 0, 0, 0.1);
+		border: 1px solid var(--color-border);
 		border-radius: 0.5rem;
-		background: rgba(0, 0, 0, 0.03);
-		color: #374151;
+		background: var(--color-surface);
+		color: var(--color-foreground);
 		font-size: 0.8125rem;
 		outline: none;
 		transition: all 0.15s ease;
 	}
 
 	.search-input:focus {
-		border-color: #8b5cf6;
-		background: white;
-	}
-
-	:global(.dark) .search-input {
-		background: rgba(255, 255, 255, 0.05);
-		border-color: rgba(255, 255, 255, 0.1);
-		color: #f3f4f6;
-	}
-
-	:global(.dark) .search-input:focus {
-		border-color: #a78bfa;
-		background: rgba(255, 255, 255, 0.1);
+		border-color: var(--color-primary);
+		background: var(--color-surface-elevated-2);
 	}
 
 	.search-clear {
@@ -461,25 +421,20 @@
 		width: 1.25rem;
 		height: 1.25rem;
 		border-radius: 50%;
-		background: rgba(0, 0, 0, 0.1);
+		background: var(--color-surface-hover);
 		border: none;
 		cursor: pointer;
-		color: #6b7280;
+		color: var(--color-muted-foreground);
 	}
 
 	.search-clear:hover {
-		background: rgba(0, 0, 0, 0.15);
-	}
-
-	:global(.dark) .search-clear {
-		background: rgba(255, 255, 255, 0.1);
-		color: #9ca3af;
+		background: var(--color-border);
 	}
 
 	.search-empty {
 		text-align: center;
 		padding: 1.5rem;
-		color: #9ca3af;
+		color: var(--color-muted-foreground);
 		font-size: 0.875rem;
 	}
 
@@ -496,22 +451,17 @@
 		align-items: center;
 		justify-content: center;
 		padding: 2rem;
-		color: #6b7280;
+		color: var(--color-muted-foreground);
 		font-size: 0.875rem;
 		gap: 1rem;
 	}
 
-	:global(.dark) .loading-state,
-	:global(.dark) .empty-state {
-		color: #9ca3af;
-	}
-
 	.create-btn {
 		display: flex;
 		align-items: center;
 		gap: 0.5rem;
 		padding: 0.5rem 1rem;
-		background: #8b5cf6;
+		background: var(--color-primary);
 		color: white;
 		border: none;
 		border-radius: 9999px;
@@ -522,47 +472,34 @@
 	}
 
 	.create-btn:hover {
-		background: #7c3aed;
+		background: var(--color-primary-hover);
 	}
 
 	/* Edit Form Section */
 	.edit-form-section {
-		background: rgba(139, 92, 246, 0.05);
-		border: 1px solid rgba(139, 92, 246, 0.2);
+		background: color-mix(in srgb, var(--color-primary) 5%, transparent);
+		border: 1px solid color-mix(in srgb, var(--color-primary) 20%, transparent);
 		border-radius: 0.75rem;
 		margin-bottom: 0.75rem;
 		overflow: hidden;
 	}
 
-	:global(.dark) .edit-form-section {
-		background: rgba(167, 139, 250, 0.1);
-		border-color: rgba(167, 139, 250, 0.2);
-	}
-
 	.edit-form-header {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
 		padding: 0.5rem 0.75rem;
-		background: rgba(139, 92, 246, 0.1);
-	}
-
-	:global(.dark) .edit-form-header {
-		background: rgba(167, 139, 250, 0.15);
+		background: color-mix(in srgb, var(--color-primary) 10%, transparent);
 	}
 
 	.edit-form-title {
 		font-size: 0.75rem;
 		font-weight: 600;
-		color: #8b5cf6;
+		color: var(--color-primary);
 		text-transform: uppercase;
 		letter-spacing: 0.025em;
 	}
 
-	:global(.dark) .edit-form-title {
-		color: #a78bfa;
-	}
-
 	.edit-form {
 		padding: 0.75rem;
 		display: flex;
@@ -581,39 +518,24 @@
 		height: 24px;
 		border-radius: 50%;
 		flex-shrink: 0;
-		border: 2px solid rgba(0, 0, 0, 0.1);
-	}
-
-	:global(.dark) .color-preview {
-		border-color: rgba(255, 255, 255, 0.2);
+		border: 2px solid var(--color-border);
 	}
 
 	.name-input {
 		flex: 1;
 		padding: 0.5rem 0.75rem;
-		border: 1px solid rgba(0, 0, 0, 0.15);
+		border: 1px solid var(--color-border);
 		border-radius: 0.5rem;
-		background: white;
-		color: #374151;
+		background: var(--color-surface);
+		color: var(--color-foreground);
 		font-size: 0.875rem;
 		outline: none;
 		transition: all 0.15s ease;
 	}
 
 	.name-input:focus {
-		border-color: #8b5cf6;
-		box-shadow: 0 0 0 2px rgba(139, 92, 246, 0.2);
-	}
-
-	:global(.dark) .name-input {
-		background: rgba(255, 255, 255, 0.1);
-		border-color: rgba(255, 255, 255, 0.2);
-		color: #f3f4f6;
-	}
-
-	:global(.dark) .name-input:focus {
-		border-color: #a78bfa;
-		box-shadow: 0 0 0 2px rgba(167, 139, 250, 0.2);
+		border-color: var(--color-primary);
+		box-shadow: 0 0 0 2px color-mix(in srgb, var(--color-primary) 20%, transparent);
 	}
 
 	.color-picker-row {
@@ -651,12 +573,12 @@
 	}
 
 	.btn-primary {
-		background: #8b5cf6;
+		background: var(--color-primary);
 		color: white;
 	}
 
 	.btn-primary:hover:not(:disabled) {
-		background: #7c3aed;
+		background: var(--color-primary-hover);
 	}
 
 	.btn-primary:disabled {
@@ -665,12 +587,12 @@
 	}
 
 	.btn-danger {
-		background: #ef4444;
+		background: var(--color-error);
 		color: white;
 	}
 
 	.btn-danger:hover {
-		background: #dc2626;
+		background: color-mix(in srgb, var(--color-error) 85%, black);
 	}
 
 	.icon-btn {
@@ -683,22 +605,13 @@
 		background: transparent;
 		border: none;
 		cursor: pointer;
-		color: #6b7280;
+		color: var(--color-muted-foreground);
 		transition: all 0.15s ease;
 	}
 
 	.icon-btn:hover {
-		background: rgba(0, 0, 0, 0.1);
-		color: #374151;
-	}
-
-	:global(.dark) .icon-btn {
-		color: #9ca3af;
-	}
-
-	:global(.dark) .icon-btn:hover {
-		background: rgba(255, 255, 255, 0.1);
-		color: #f3f4f6;
+		background: var(--color-surface-hover);
+		color: var(--color-foreground);
 	}
 
 	/* Tags grid */
@@ -758,14 +671,10 @@
 	.tag-name {
 		font-size: 0.8125rem;
 		font-weight: 500;
-		color: #374151;
+		color: var(--color-foreground);
 		white-space: nowrap;
 	}
 
-	:global(.dark) .tag-name {
-		color: #f3f4f6;
-	}
-
 	.tag-edit-btn {
 		display: flex;
 		align-items: center;
@@ -773,10 +682,10 @@
 		width: 1rem;
 		height: 1rem;
 		border-radius: 50%;
-		background: rgba(0, 0, 0, 0.1);
+		background: var(--color-surface-hover);
 		border: none;
 		cursor: pointer;
-		color: #6b7280;
+		color: var(--color-muted-foreground);
 		opacity: 0;
 		transition: all 0.15s ease;
 		margin-left: 0.125rem;
@@ -787,17 +696,7 @@
 	}
 
 	.tag-edit-btn:hover {
-		background: rgba(0, 0, 0, 0.2);
-		color: #374151;
-	}
-
-	:global(.dark) .tag-edit-btn {
-		background: rgba(255, 255, 255, 0.15);
-		color: #9ca3af;
-	}
-
-	:global(.dark) .tag-edit-btn:hover {
-		background: rgba(255, 255, 255, 0.25);
-		color: #f3f4f6;
+		background: var(--color-border);
+		color: var(--color-foreground);
 	}
 </style>
diff --git a/apps/todo/apps/web/src/lib/components/TaskEditModal.svelte b/apps/todo/apps/web/src/lib/components/TaskEditModal.svelte
index 7b0163112..0ab8a062a 100644
--- a/apps/todo/apps/web/src/lib/components/TaskEditModal.svelte
+++ b/apps/todo/apps/web/src/lib/components/TaskEditModal.svelte
@@ -297,34 +297,23 @@
 		max-height: calc(100vh - 4rem);
 		display: flex;
 		flex-direction: column;
-		background: var(--surface, #ffffff);
-		border: 1px solid rgba(0, 0, 0, 0.08);
+		background: var(--color-surface-elevated-2);
+		border: 1px solid var(--color-border);
 		border-radius: 1.5rem;
-		box-shadow:
-			0 32px 64px -12px rgba(0, 0, 0, 0.2),
-			0 0 0 1px rgba(0, 0, 0, 0.04);
+		box-shadow: 0 32px 64px -12px rgba(0, 0, 0, 0.3);
 		overflow: hidden;
 	}
 
-	:global(.dark) .page {
-		background: #1a1a1f;
-		border-color: rgba(255, 255, 255, 0.1);
-	}
-
 	/* ── Top bar ──────────────────────────────────────────── */
 	.top-bar {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
 		padding: 0.625rem 1.25rem;
-		border-bottom: 1px solid rgba(0, 0, 0, 0.07);
+		border-bottom: 1px solid var(--color-border);
 		flex-shrink: 0;
 	}
 
-	:global(.dark) .top-bar {
-		border-bottom-color: rgba(255, 255, 255, 0.08);
-	}
-
 	.top-left,
 	.top-right {
 		display: flex;
@@ -334,7 +323,7 @@
 
 	.delete-confirm-text {
 		font-size: 0.8125rem;
-		color: #ef4444;
+		color: var(--color-error);
 		font-weight: 500;
 	}
 
@@ -343,14 +332,14 @@
 		border: none;
 		background: transparent;
 		font-size: 0.8125rem;
-		color: #6b7280;
+		color: var(--color-muted-foreground);
 		cursor: pointer;
 		border-radius: 0.5rem;
 		transition: background 0.15s;
 	}
 
 	.btn-ghost:hover {
-		background: rgba(0, 0, 0, 0.06);
+		background: var(--color-surface-hover);
 	}
 
 	.btn-ghost-danger {
@@ -358,7 +347,7 @@
 		border: none;
 		background: transparent;
 		font-size: 0.8125rem;
-		color: #ef4444;
+		color: var(--color-error);
 		cursor: pointer;
 		border-radius: 0.5rem;
 		transition: background 0.15s;
@@ -368,7 +357,7 @@
 	}
 
 	.btn-ghost-danger:hover {
-		background: rgba(239, 68, 68, 0.08);
+		background: color-mix(in srgb, var(--color-error) 8%, transparent);
 	}
 
 	.btn-icon-danger {
@@ -379,15 +368,15 @@
 		height: 1.875rem;
 		border: none;
 		background: transparent;
-		color: #9ca3af;
+		color: var(--color-muted-foreground);
 		cursor: pointer;
 		border-radius: 0.5rem;
 		transition: all 0.15s;
 	}
 
 	.btn-icon-danger:hover {
-		background: rgba(239, 68, 68, 0.08);
-		color: #ef4444;
+		background: color-mix(in srgb, var(--color-error) 8%, transparent);
+		color: var(--color-error);
 	}
 
 	.btn-save {
@@ -395,7 +384,7 @@
 		align-items: center;
 		gap: 0.375rem;
 		padding: 0.375rem 0.875rem;
-		background: #8b5cf6;
+		background: var(--color-primary);
 		color: white;
 		border: none;
 		border-radius: 0.625rem;
@@ -406,7 +395,7 @@
 	}
 
 	.btn-save:hover:not(:disabled) {
-		background: #7c3aed;
+		background: var(--color-primary-hover);
 	}
 
 	.btn-save:disabled {
@@ -422,20 +411,15 @@
 		height: 1.875rem;
 		border: none;
 		background: transparent;
-		color: #9ca3af;
+		color: var(--color-muted-foreground);
 		cursor: pointer;
 		border-radius: 0.5rem;
 		transition: all 0.15s;
 	}
 
 	.btn-close:hover {
-		background: rgba(0, 0, 0, 0.06);
-		color: #374151;
-	}
-
-	:global(.dark) .btn-close:hover {
-		background: rgba(255, 255, 255, 0.08);
-		color: #e5e7eb;
+		background: var(--color-surface-hover);
+		color: var(--color-foreground);
 	}
 
 	/* ── Title ────────────────────────────────────────────── */
@@ -450,7 +434,7 @@
 		background: transparent;
 		font-size: 1.5rem;
 		font-weight: 700;
-		color: #111827;
+		color: var(--color-foreground);
 		line-height: 1.3;
 		resize: none;
 		overflow: hidden;
@@ -459,16 +443,8 @@
 		font-family: inherit;
 	}
 
-	:global(.dark) .title-input {
-		color: #f9fafb;
-	}
-
 	.title-input::placeholder {
-		color: #d1d5db;
-	}
-
-	:global(.dark) .title-input::placeholder {
-		color: #4b5563;
+		color: var(--color-border);
 	}
 
 	/* ── Content grid: Description | Subtasks/Links ───────── */
@@ -477,15 +453,11 @@
 		display: grid;
 		grid-template-columns: 1fr 1fr;
 		gap: 0;
-		border-top: 1px solid rgba(0, 0, 0, 0.07);
+		border-top: 1px solid var(--color-border);
 		overflow: hidden;
 		min-height: 0;
 	}
 
-	:global(.dark) .content-grid {
-		border-top-color: rgba(255, 255, 255, 0.08);
-	}
-
 	/* Single column on narrow */
 	@container (max-width: 600px) {
 		.content-grid {
@@ -503,11 +475,7 @@
 	}
 
 	.col-subtasks {
-		border-left: 1px solid rgba(0, 0, 0, 0.07);
-	}
-
-	:global(.dark) .col-subtasks {
-		border-left-color: rgba(255, 255, 255, 0.08);
+		border-left: 1px solid var(--color-border);
 	}
 
 	.col-label {
@@ -515,21 +483,17 @@
 		font-weight: 700;
 		text-transform: uppercase;
 		letter-spacing: 0.05em;
-		color: #9ca3af;
+		color: var(--color-muted-foreground);
 		flex-shrink: 0;
 	}
 
-	:global(.dark) .col-label {
-		color: #6b7280;
-	}
-
 	.desc-textarea {
 		flex: 1;
 		width: 100%;
 		border: none;
 		background: transparent;
 		font-size: 0.875rem;
-		color: #374151;
+		color: var(--color-foreground);
 		resize: none;
 		font-family: inherit;
 		line-height: 1.6;
@@ -537,16 +501,8 @@
 		min-height: 100px;
 	}
 
-	:global(.dark) .desc-textarea {
-		color: #e5e7eb;
-	}
-
 	.desc-textarea::placeholder {
-		color: #d1d5db;
-	}
-
-	:global(.dark) .desc-textarea::placeholder {
-		color: #4b5563;
+		color: var(--color-border);
 	}
 
 	.links-block {
@@ -566,7 +522,7 @@
 		border: none;
 		background: transparent;
 		font-size: 0.75rem;
-		color: #8b5cf6;
+		color: var(--color-primary);
 		cursor: pointer;
 		padding: 0.125rem 0.25rem;
 		border-radius: 0.375rem;
@@ -574,7 +530,7 @@
 	}
 
 	.link-add:hover {
-		background: rgba(139, 92, 246, 0.08);
+		background: color-mix(in srgb, var(--color-primary) 8%, transparent);
 	}
 
 	/* ── Properties strip ─────────────────────────────────── */
@@ -583,13 +539,8 @@
 		flex-wrap: wrap;
 		align-items: stretch;
 		flex-shrink: 0;
-		border-top: 1px solid rgba(0, 0, 0, 0.07);
-		background: rgba(0, 0, 0, 0.02);
-	}
-
-	:global(.dark) .props-strip {
-		border-top-color: rgba(255, 255, 255, 0.08);
-		background: rgba(255, 255, 255, 0.02);
+		border-top: 1px solid var(--color-border);
+		background: var(--color-surface);
 	}
 
 	.prop {
@@ -597,11 +548,7 @@
 		flex-direction: column;
 		gap: 0.25rem;
 		padding: 0.5rem 0.875rem;
-		border-right: 1px solid rgba(0, 0, 0, 0.06);
-	}
-
-	:global(.dark) .prop {
-		border-right-color: rgba(255, 255, 255, 0.06);
+		border-right: 1px solid var(--color-border);
 	}
 
 	.prop:last-child {
@@ -626,20 +573,16 @@
 		font-weight: 700;
 		text-transform: uppercase;
 		letter-spacing: 0.07em;
-		color: #9ca3af;
+		color: var(--color-muted-foreground);
 		white-space: nowrap;
 	}
 
-	:global(.dark) .prop-label {
-		color: #6b7280;
-	}
-
 	.prop-input,
 	.prop-select {
 		border: none;
 		background: transparent;
 		font-size: 0.8125rem;
-		color: #374151;
+		color: var(--color-foreground);
 		font-family: inherit;
 		padding: 0;
 		outline: none;
@@ -647,28 +590,22 @@
 		min-width: 0;
 	}
 
-	:global(.dark) .prop-input,
 	:global(.dark) .prop-select {
-		color: #e5e7eb;
 		color-scheme: dark;
 	}
 
 	.prop-input:focus,
 	.prop-select:focus {
-		color: #8b5cf6;
+		color: var(--color-primary);
 	}
 
 	.prop-divider {
 		width: 1px;
-		background: rgba(0, 0, 0, 0.08);
+		background: var(--color-border);
 		margin: 0.375rem 0;
 		flex-shrink: 0;
 	}
 
-	:global(.dark) .prop-divider {
-		background: rgba(255, 255, 255, 0.08);
-	}
-
 	/* ── Spinner ──────────────────────────────────────────── */
 	.spinner {
 		width: 0.875rem;
@@ -706,11 +643,7 @@
 
 		.col-subtasks {
 			border-left: none;
-			border-top: 1px solid rgba(0, 0, 0, 0.07);
-		}
-
-		:global(.dark) .col-subtasks {
-			border-top-color: rgba(255, 255, 255, 0.08);
+			border-top: 1px solid var(--color-border);
 		}
 	}
 </style>
diff --git a/apps/todo/apps/web/src/lib/components/TodoToolbarContent.svelte b/apps/todo/apps/web/src/lib/components/TodoToolbarContent.svelte
index 8cc6e9e56..0712e1e7a 100644
--- a/apps/todo/apps/web/src/lib/components/TodoToolbarContent.svelte
+++ b/apps/todo/apps/web/src/lib/components/TodoToolbarContent.svelte
@@ -244,12 +244,10 @@
 		transform: translateX(-50%);
 		min-width: 260px;
 		padding: 0.75rem;
-		background: rgba(255, 255, 255, 0.95);
-		backdrop-filter: blur(12px);
-		-webkit-backdrop-filter: blur(12px);
-		border: 1px solid rgba(0, 0, 0, 0.1);
+		background: var(--color-surface-elevated-3);
+		border: 1px solid var(--color-border);
 		border-radius: 0.75rem;
-		box-shadow: 0 10px 25px -5px rgba(0, 0, 0, 0.1);
+		box-shadow: var(--shadow-xl);
 		z-index: 100;
 	}
 
@@ -259,11 +257,6 @@
 		top: calc(100% + 0.5rem);
 	}
 
-	:global(.dark) .filter-dropdown {
-		background: rgba(30, 30, 30, 0.95);
-		border-color: rgba(255, 255, 255, 0.1);
-	}
-
 	.filter-section {
 		margin-bottom: 0.75rem;
 	}
diff --git a/apps/todo/apps/web/src/lib/components/board-views/FokusLayout.svelte b/apps/todo/apps/web/src/lib/components/board-views/FokusLayout.svelte
index 529e855bd..4b065bc23 100644
--- a/apps/todo/apps/web/src/lib/components/board-views/FokusLayout.svelte
+++ b/apps/todo/apps/web/src/lib/components/board-views/FokusLayout.svelte
@@ -299,25 +299,21 @@
 	}
 
 	:global(.fokus-drop-target) {
-		outline: 2px dashed #8b5cf6;
+		outline: 2px dashed var(--color-primary);
 		outline-offset: -2px;
 		border-radius: 0.375rem;
-		background: rgba(139, 92, 246, 0.04);
+		background: color-mix(in srgb, var(--color-primary) 4%, transparent);
 	}
 
 	/* Add sheet */
 	.add-sheet {
-		border: 2px dashed rgba(139, 92, 246, 0.3) !important;
-		background: rgba(139, 92, 246, 0.02) !important;
+		border: 2px dashed color-mix(in srgb, var(--color-primary) 30%, transparent) !important;
+		background: color-mix(in srgb, var(--color-primary) 2%, transparent) !important;
 		box-shadow: none !important;
 	}
 	.add-sheet:hover {
-		border-color: #8b5cf6 !important;
-		background: rgba(139, 92, 246, 0.06) !important;
-	}
-	:global(.dark) .add-sheet {
-		border-color: rgba(139, 92, 246, 0.25) !important;
-		background: rgba(139, 92, 246, 0.04) !important;
+		border-color: var(--color-primary) !important;
+		background: color-mix(in srgb, var(--color-primary) 6%, transparent) !important;
 	}
 
 	.add-sheet-btn {
@@ -336,13 +332,13 @@
 	.add-sheet-icon {
 		font-size: 2rem;
 		font-weight: 300;
-		color: #8b5cf6;
+		color: var(--color-primary);
 		line-height: 1;
 	}
 	.add-sheet-label {
 		font-size: 0.875rem;
 		font-weight: 500;
-		color: #8b5cf6;
+		color: var(--color-primary);
 	}
 
 	/* Heute erledigt section */
@@ -392,17 +388,11 @@
 		width: 6px;
 		height: 6px;
 		border-radius: 50%;
-		background: rgba(0, 0, 0, 0.15);
+		background: var(--color-border);
 		transition: all 0.2s ease;
 	}
 	.page-dot.active {
-		background: hsl(var(--color-primary));
+		background: var(--color-primary);
 		transform: scale(1.3);
 	}
-	:global(.dark) .page-dot {
-		background: rgba(255, 255, 255, 0.2);
-	}
-	:global(.dark) .page-dot.active {
-		background: hsl(var(--color-primary));
-	}
 </style>
diff --git a/apps/todo/apps/web/src/lib/components/board-views/GridLayout.svelte b/apps/todo/apps/web/src/lib/components/board-views/GridLayout.svelte
index c2d12a05c..217fb6d18 100644
--- a/apps/todo/apps/web/src/lib/components/board-views/GridLayout.svelte
+++ b/apps/todo/apps/web/src/lib/components/board-views/GridLayout.svelte
@@ -110,30 +110,24 @@
 		width: 100%;
 		height: 100%;
 		min-height: 200px;
-		border: 2px dashed rgba(139, 92, 246, 0.3);
+		border: 2px dashed color-mix(in srgb, var(--color-primary) 30%, transparent);
 		border-radius: 0.375rem;
-		background: rgba(139, 92, 246, 0.03);
+		background: color-mix(in srgb, var(--color-primary) 3%, transparent);
 		cursor: pointer;
 		transition: all 0.15s;
 	}
 	.add-column-card:hover {
-		border-color: #8b5cf6;
-		background: rgba(139, 92, 246, 0.08);
-	}
-	:global(.dark) .add-column-card {
-		background: rgba(139, 92, 246, 0.05);
-	}
-	:global(.dark) .add-column-card:hover {
-		background: rgba(139, 92, 246, 0.12);
+		border-color: var(--color-primary);
+		background: color-mix(in srgb, var(--color-primary) 8%, transparent);
 	}
 	.add-icon {
 		font-size: 1.5rem;
 		font-weight: 300;
-		color: #8b5cf6;
+		color: var(--color-primary);
 	}
 	.add-label {
 		font-size: 0.8125rem;
 		font-weight: 500;
-		color: #8b5cf6;
+		color: var(--color-primary);
 	}
 </style>
diff --git a/apps/todo/apps/web/src/lib/components/board-views/KanbanLayout.svelte b/apps/todo/apps/web/src/lib/components/board-views/KanbanLayout.svelte
index 9e353c52d..e4ed83db4 100644
--- a/apps/todo/apps/web/src/lib/components/board-views/KanbanLayout.svelte
+++ b/apps/todo/apps/web/src/lib/components/board-views/KanbanLayout.svelte
@@ -92,14 +92,10 @@
 	}
 
 	.kanban-layout::-webkit-scrollbar-thumb {
-		background: rgba(0, 0, 0, 0.1);
+		background: var(--color-border);
 		border-radius: 3px;
 	}
 
-	:global(.dark) .kanban-layout::-webkit-scrollbar-thumb {
-		background: rgba(255, 255, 255, 0.15);
-	}
-
 	.kanban-column-wrapper {
 		min-width: 300px;
 		max-width: 340px;
@@ -114,33 +110,25 @@
 		gap: 0.5rem;
 		width: 100%;
 		min-height: 250px;
-		border: 2px dashed rgba(139, 92, 246, 0.3);
+		border: 2px dashed color-mix(in srgb, var(--color-primary) 30%, transparent);
 		border-radius: 0.375rem;
-		background: rgba(139, 92, 246, 0.03);
+		background: color-mix(in srgb, var(--color-primary) 3%, transparent);
 		cursor: pointer;
 		transition: all 0.15s;
 	}
 	.add-column-card:hover {
-		border-color: #8b5cf6;
-		background: rgba(139, 92, 246, 0.08);
-	}
-	:global(.dark) .add-column-card {
-		background: rgba(139, 92, 246, 0.05);
-		border-color: rgba(139, 92, 246, 0.25);
-	}
-	:global(.dark) .add-column-card:hover {
-		border-color: #8b5cf6;
-		background: rgba(139, 92, 246, 0.12);
+		border-color: var(--color-primary);
+		background: color-mix(in srgb, var(--color-primary) 8%, transparent);
 	}
 	.add-column-icon {
 		font-size: 1.5rem;
 		font-weight: 300;
-		color: #8b5cf6;
+		color: var(--color-primary);
 		line-height: 1;
 	}
 	.add-column-label {
 		font-size: 0.8125rem;
 		font-weight: 500;
-		color: #8b5cf6;
+		color: var(--color-primary);
 	}
 </style>
diff --git a/apps/todo/apps/web/src/lib/components/board-views/ViewColumn.svelte b/apps/todo/apps/web/src/lib/components/board-views/ViewColumn.svelte
index cd45d7376..325f55df1 100644
--- a/apps/todo/apps/web/src/lib/components/board-views/ViewColumn.svelte
+++ b/apps/todo/apps/web/src/lib/components/board-views/ViewColumn.svelte
@@ -190,26 +190,18 @@
 	}
 
 	.tasks-container::-webkit-scrollbar-thumb {
-		background: rgba(0, 0, 0, 0.1);
+		background: var(--color-border);
 		border-radius: 3px;
 	}
 
-	:global(.dark) .tasks-container::-webkit-scrollbar-thumb {
-		background: rgba(255, 255, 255, 0.15);
-	}
-
 	.tasks-container::-webkit-scrollbar-thumb:hover {
-		background: rgba(0, 0, 0, 0.2);
-	}
-
-	:global(.dark) .tasks-container::-webkit-scrollbar-thumb:hover {
-		background: rgba(255, 255, 255, 0.25);
+		background: var(--color-muted-foreground);
 	}
 
 	:global(.drop-target) {
-		outline: 2px dashed #8b5cf6;
+		outline: 2px dashed var(--color-primary);
 		outline-offset: -2px;
 		border-radius: 0.375rem;
-		background: rgba(139, 92, 246, 0.04);
+		background: color-mix(in srgb, var(--color-primary) 4%, transparent);
 	}
 </style>
diff --git a/apps/todo/apps/web/src/lib/components/board-views/ViewColumnHeader.svelte b/apps/todo/apps/web/src/lib/components/board-views/ViewColumnHeader.svelte
index c26faad7c..6a25c9b77 100644
--- a/apps/todo/apps/web/src/lib/components/board-views/ViewColumnHeader.svelte
+++ b/apps/todo/apps/web/src/lib/components/board-views/ViewColumnHeader.svelte
@@ -279,19 +279,13 @@
 		top: calc(100% + 0.5rem);
 		left: 0;
 		z-index: 51;
-		background: rgba(255, 255, 255, 0.97);
-		backdrop-filter: blur(12px);
-		-webkit-backdrop-filter: blur(12px);
-		border: 1px solid rgba(0, 0, 0, 0.1);
+		background: var(--color-surface-elevated-3);
+		border: 1px solid var(--color-border);
 		border-radius: 0.75rem;
-		box-shadow: 0 10px 25px -5px rgba(0, 0, 0, 0.15);
+		box-shadow: var(--shadow-xl);
 		padding: 0.625rem;
 		min-width: 170px;
 	}
-	:global(.dark) .color-picker {
-		background: rgba(30, 30, 30, 0.97);
-		border-color: rgba(255, 255, 255, 0.12);
-	}
 
 	.picker-grid {
 		display: grid;
@@ -313,7 +307,7 @@
 		transform: scale(1.15);
 	}
 	.picker-swatch.active {
-		border-color: white;
+		border-color: var(--color-surface-elevated-3);
 		box-shadow: 0 0 0 2px currentColor;
 	}
 
@@ -322,19 +316,13 @@
 		align-items: center;
 		gap: 0.5rem;
 		padding-top: 0.375rem;
-		border-top: 1px solid rgba(0, 0, 0, 0.06);
-	}
-	:global(.dark) .custom-color-row {
-		border-top-color: rgba(255, 255, 255, 0.08);
+		border-top: 1px solid var(--color-border);
 	}
 
 	.custom-label {
 		font-size: 0.6875rem;
 		font-weight: 500;
-		color: #6b7280;
-	}
-	:global(.dark) .custom-label {
-		color: #9ca3af;
+		color: var(--color-muted-foreground);
 	}
 
 	.custom-color-input {
@@ -350,7 +338,7 @@
 		padding: 0;
 	}
 	.custom-color-input::-webkit-color-swatch {
-		border: 2px solid rgba(0, 0, 0, 0.1);
+		border: 2px solid var(--color-border);
 		border-radius: 50%;
 	}
 </style>
diff --git a/apps/todo/apps/web/src/lib/components/board-views/ViewEditorModal.svelte b/apps/todo/apps/web/src/lib/components/board-views/ViewEditorModal.svelte
index e47b3a62d..2c29a3312 100644
--- a/apps/todo/apps/web/src/lib/components/board-views/ViewEditorModal.svelte
+++ b/apps/todo/apps/web/src/lib/components/board-views/ViewEditorModal.svelte
@@ -949,16 +949,10 @@
 		gap: 0.25rem;
 		padding: 0.5rem;
 		margin-top: 0.25rem;
-		background: rgba(255, 255, 255, 0.95);
-		backdrop-filter: blur(12px);
-		border: 1px solid rgba(0, 0, 0, 0.1);
+		background: var(--color-surface-elevated-3);
+		border: 1px solid var(--color-border);
 		border-radius: 0.75rem;
-		box-shadow: 0 10px 25px -5px rgba(0, 0, 0, 0.15);
-	}
-
-	:global(.dark) .color-picker-dropdown {
-		background: rgba(30, 30, 40, 0.95);
-		border-color: rgba(255, 255, 255, 0.15);
+		box-shadow: var(--shadow-xl);
 	}
 
 	.color-swatch {
diff --git a/apps/todo/apps/web/src/lib/components/board-views/ViewSelector.svelte b/apps/todo/apps/web/src/lib/components/board-views/ViewSelector.svelte
index 1f26e24ca..ffa29ef9d 100644
--- a/apps/todo/apps/web/src/lib/components/board-views/ViewSelector.svelte
+++ b/apps/todo/apps/web/src/lib/components/board-views/ViewSelector.svelte
@@ -323,19 +323,10 @@
 		z-index: 200;
 		min-width: 160px;
 		padding: 0.375rem;
-		background: rgba(255, 255, 255, 0.95);
-		backdrop-filter: blur(16px);
-		-webkit-backdrop-filter: blur(16px);
-		border: 1px solid rgba(0, 0, 0, 0.1);
+		background: var(--color-surface-elevated-3);
+		border: 1px solid var(--color-border);
 		border-radius: 0.75rem;
-		box-shadow:
-			0 10px 25px -5px rgba(0, 0, 0, 0.15),
-			0 4px 6px -2px rgba(0, 0, 0, 0.1);
-	}
-
-	:global(.dark) .context-menu {
-		background: rgba(30, 30, 40, 0.95);
-		border-color: rgba(255, 255, 255, 0.12);
+		box-shadow: var(--shadow-xl);
 	}
 
 	.context-item {
@@ -346,7 +337,7 @@
 		padding: 0.5rem 0.75rem;
 		font-size: 0.8125rem;
 		font-weight: 500;
-		color: #374151;
+		color: var(--color-foreground);
 		background: transparent;
 		border: none;
 		border-radius: 0.5rem;
@@ -355,14 +346,6 @@
 	}
 
 	.context-item:hover {
-		background: rgba(0, 0, 0, 0.06);
-	}
-
-	:global(.dark) .context-item {
-		color: #e5e7eb;
-	}
-
-	:global(.dark) .context-item:hover {
-		background: rgba(255, 255, 255, 0.1);
+		background: var(--color-surface-hover);
 	}
 </style>
diff --git a/apps/todo/apps/web/src/lib/components/form/DurationPicker.svelte b/apps/todo/apps/web/src/lib/components/form/DurationPicker.svelte
index 8c71116d2..ff2f39200 100644
--- a/apps/todo/apps/web/src/lib/components/form/DurationPicker.svelte
+++ b/apps/todo/apps/web/src/lib/components/form/DurationPicker.svelte
@@ -137,29 +137,23 @@
 
 	.duration-btn {
 		padding: 0.5rem 0.75rem;
-		border: 1px solid rgba(0, 0, 0, 0.1);
+		border: 1px solid var(--color-border);
 		border-radius: 9999px;
-		background: rgba(255, 255, 255, 0.8);
+		background: var(--color-surface);
 		font-size: 0.8125rem;
-		color: #374151;
+		color: var(--color-foreground);
 		cursor: pointer;
 		transition: all 0.15s;
 	}
 
-	:global(.dark) .duration-btn {
-		background: rgba(255, 255, 255, 0.1);
-		border-color: rgba(255, 255, 255, 0.15);
-		color: #e5e7eb;
-	}
-
 	.duration-btn:hover {
-		border-color: #8b5cf6;
+		border-color: var(--color-primary);
 	}
 
 	.duration-btn.selected {
-		background: rgba(139, 92, 246, 0.15);
-		border-color: #8b5cf6;
-		color: #8b5cf6;
+		background: color-mix(in srgb, var(--color-primary) 15%, transparent);
+		border-color: var(--color-primary);
+		color: var(--color-primary);
 	}
 
 	.duration-clear {
@@ -171,14 +165,14 @@
 		padding: 0;
 		border: none;
 		border-radius: 9999px;
-		background: rgba(239, 68, 68, 0.1);
-		color: #ef4444;
+		background: color-mix(in srgb, var(--color-error) 10%, transparent);
+		color: var(--color-error);
 		cursor: pointer;
 		transition: all 0.15s;
 	}
 
 	.duration-clear:hover {
-		background: rgba(239, 68, 68, 0.2);
+		background: color-mix(in srgb, var(--color-error) 20%, transparent);
 	}
 
 	.duration-custom {
@@ -189,44 +183,32 @@
 	.duration-input {
 		width: 80px;
 		padding: 0.5rem 0.75rem;
-		border: 1px solid rgba(0, 0, 0, 0.15);
+		border: 1px solid var(--color-border);
 		border-radius: 0.75rem;
-		background: rgba(255, 255, 255, 0.8);
+		background: var(--color-surface);
 		font-size: 0.875rem;
-		color: #374151;
-	}
-
-	:global(.dark) .duration-input {
-		background: rgba(255, 255, 255, 0.1);
-		border-color: rgba(255, 255, 255, 0.15);
-		color: #f3f4f6;
+		color: var(--color-foreground);
 	}
 
 	.duration-input:focus {
 		outline: none;
-		border-color: #8b5cf6;
-		box-shadow: 0 0 0 3px rgba(139, 92, 246, 0.1);
+		border-color: var(--color-primary);
+		box-shadow: 0 0 0 3px color-mix(in srgb, var(--color-primary) 10%, transparent);
 	}
 
 	.duration-unit {
 		width: 120px;
 		padding: 0.5rem 0.75rem;
-		border: 1px solid rgba(0, 0, 0, 0.15);
+		border: 1px solid var(--color-border);
 		border-radius: 0.75rem;
-		background: rgba(255, 255, 255, 0.8);
+		background: var(--color-surface);
 		font-size: 0.875rem;
-		color: #374151;
-	}
-
-	:global(.dark) .duration-unit {
-		background: rgba(255, 255, 255, 0.1);
-		border-color: rgba(255, 255, 255, 0.15);
-		color: #f3f4f6;
+		color: var(--color-foreground);
 	}
 
 	.duration-unit:focus {
 		outline: none;
-		border-color: #8b5cf6;
-		box-shadow: 0 0 0 3px rgba(139, 92, 246, 0.1);
+		border-color: var(--color-primary);
+		box-shadow: 0 0 0 3px color-mix(in srgb, var(--color-primary) 10%, transparent);
 	}
 </style>
diff --git a/apps/todo/apps/web/src/lib/components/form/FunRatingPicker.svelte b/apps/todo/apps/web/src/lib/components/form/FunRatingPicker.svelte
index 97d1d3be9..763c61d59 100644
--- a/apps/todo/apps/web/src/lib/components/form/FunRatingPicker.svelte
+++ b/apps/todo/apps/web/src/lib/components/form/FunRatingPicker.svelte
@@ -81,14 +81,10 @@
 		width: 1.25rem;
 		height: 1.25rem;
 		border-radius: 9999px;
-		background: rgba(0, 0, 0, 0.1);
+		background: var(--color-border);
 		transition: all 0.15s;
 	}
 
-	:global(.dark) .fun-rating-dot .dot {
-		background: rgba(255, 255, 255, 0.15);
-	}
-
 	.fun-rating-dot.filled .dot {
 		background: var(--dot-color);
 	}
@@ -98,7 +94,7 @@
 		justify-content: space-between;
 		padding: 0 0.25rem;
 		font-size: 0.6875rem;
-		color: #9ca3af;
+		color: var(--color-muted-foreground);
 	}
 
 	.fun-rating-clear {
@@ -110,13 +106,13 @@
 		padding: 0;
 		border: none;
 		border-radius: 9999px;
-		background: rgba(239, 68, 68, 0.1);
-		color: #ef4444;
+		background: color-mix(in srgb, var(--color-error) 10%, transparent);
+		color: var(--color-error);
 		cursor: pointer;
 		transition: all 0.15s;
 	}
 
 	.fun-rating-clear:hover {
-		background: rgba(239, 68, 68, 0.2);
+		background: color-mix(in srgb, var(--color-error) 20%, transparent);
 	}
 </style>
diff --git a/apps/todo/apps/web/src/lib/components/form/PrioritySelector.svelte b/apps/todo/apps/web/src/lib/components/form/PrioritySelector.svelte
index b0bea04b0..3849c48dd 100644
--- a/apps/todo/apps/web/src/lib/components/form/PrioritySelector.svelte
+++ b/apps/todo/apps/web/src/lib/components/form/PrioritySelector.svelte
@@ -37,21 +37,15 @@
 		align-items: center;
 		gap: 0.375rem;
 		padding: 0.5rem 0.875rem;
-		border: 1px solid rgba(0, 0, 0, 0.1);
+		border: 1px solid var(--color-border);
 		border-radius: 9999px;
-		background: rgba(255, 255, 255, 0.8);
+		background: var(--color-surface);
 		font-size: 0.8125rem;
-		color: #374151;
+		color: var(--color-foreground);
 		cursor: pointer;
 		transition: all 0.15s;
 	}
 
-	:global(.dark) .priority-btn {
-		background: rgba(255, 255, 255, 0.1);
-		border-color: rgba(255, 255, 255, 0.15);
-		color: #e5e7eb;
-	}
-
 	.priority-btn:hover {
 		border-color: var(--priority-color);
 	}
diff --git a/apps/todo/apps/web/src/lib/components/form/StorypointsSelector.svelte b/apps/todo/apps/web/src/lib/components/form/StorypointsSelector.svelte
index 6234d6bbe..47c5da185 100644
--- a/apps/todo/apps/web/src/lib/components/form/StorypointsSelector.svelte
+++ b/apps/todo/apps/web/src/lib/components/form/StorypointsSelector.svelte
@@ -53,30 +53,24 @@
 		align-items: center;
 		justify-content: center;
 		padding: 0 0.5rem;
-		border: 1px solid rgba(0, 0, 0, 0.1);
+		border: 1px solid var(--color-border);
 		border-radius: 9999px;
-		background: rgba(255, 255, 255, 0.8);
+		background: var(--color-surface);
 		font-size: 0.8125rem;
 		font-weight: 500;
-		color: #374151;
+		color: var(--color-foreground);
 		cursor: pointer;
 		transition: all 0.15s;
 	}
 
-	:global(.dark) .storypoint-btn {
-		background: rgba(255, 255, 255, 0.1);
-		border-color: rgba(255, 255, 255, 0.15);
-		color: #e5e7eb;
-	}
-
 	.storypoint-btn:hover {
-		border-color: #8b5cf6;
+		border-color: var(--color-primary);
 	}
 
 	.storypoint-btn.selected {
-		background: rgba(139, 92, 246, 0.15);
-		border-color: #8b5cf6;
-		color: #8b5cf6;
+		background: color-mix(in srgb, var(--color-primary) 15%, transparent);
+		border-color: var(--color-primary);
+		color: var(--color-primary);
 	}
 
 	.storypoint-clear {
@@ -88,13 +82,13 @@
 		padding: 0;
 		border: none;
 		border-radius: 9999px;
-		background: rgba(239, 68, 68, 0.1);
-		color: #ef4444;
+		background: color-mix(in srgb, var(--color-error) 10%, transparent);
+		color: var(--color-error);
 		cursor: pointer;
 		transition: all 0.15s;
 	}
 
 	.storypoint-clear:hover {
-		background: rgba(239, 68, 68, 0.2);
+		background: color-mix(in srgb, var(--color-error) 20%, transparent);
 	}
 </style>
diff --git a/apps/todo/apps/web/src/lib/components/form/TagSelector.svelte b/apps/todo/apps/web/src/lib/components/form/TagSelector.svelte
index 8c260ff0e..36fb18dae 100644
--- a/apps/todo/apps/web/src/lib/components/form/TagSelector.svelte
+++ b/apps/todo/apps/web/src/lib/components/form/TagSelector.svelte
@@ -148,18 +148,12 @@
 		overflow-y: auto;
 		padding: 0.375rem;
 		border-radius: 0.75rem;
-		background: rgba(255, 255, 255, 0.95);
-		backdrop-filter: blur(12px);
-		border: 1px solid rgba(0, 0, 0, 0.1);
-		box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1);
+		background: var(--color-surface-elevated-3);
+		border: 1px solid var(--color-border);
+		box-shadow: var(--shadow-xl);
 		z-index: 10;
 	}
 
-	:global(.dark) .tag-dropdown {
-		background: rgba(40, 40, 40, 0.95);
-		border-color: rgba(255, 255, 255, 0.15);
-	}
-
 	.tag-option {
 		display: flex;
 		align-items: center;
@@ -175,15 +169,11 @@
 	}
 
 	.tag-option:hover {
-		background: rgba(0, 0, 0, 0.05);
-	}
-
-	:global(.dark) .tag-option:hover {
-		background: rgba(255, 255, 255, 0.1);
+		background: var(--color-surface-hover);
 	}
 
 	.tag-option.selected {
-		background: rgba(139, 92, 246, 0.1);
+		background: color-mix(in srgb, var(--color-primary) 12%, transparent);
 	}
 
 	.tag-dot {
@@ -196,23 +186,19 @@
 	.tag-name {
 		flex: 1;
 		font-size: 0.875rem;
-		color: #374151;
-	}
-
-	:global(.dark) .tag-name {
-		color: #e5e7eb;
+		color: var(--color-foreground);
 	}
 
 	.check-icon {
 		width: 1rem;
 		height: 1rem;
-		color: #8b5cf6;
+		color: var(--color-primary);
 	}
 
 	.no-tags {
 		padding: 0.75rem;
 		text-align: center;
 		font-size: 0.875rem;
-		color: #9ca3af;
+		color: var(--color-muted-foreground);
 	}
 </style>
diff --git a/apps/todo/apps/web/src/lib/components/kanban/KanbanTaskCard.svelte b/apps/todo/apps/web/src/lib/components/kanban/KanbanTaskCard.svelte
index 512d4b605..65a08125f 100644
--- a/apps/todo/apps/web/src/lib/components/kanban/KanbanTaskCard.svelte
+++ b/apps/todo/apps/web/src/lib/components/kanban/KanbanTaskCard.svelte
@@ -597,17 +597,10 @@
 		z-index: 100;
 		min-width: 160px;
 		padding: 0.375rem;
-		background: rgba(255, 255, 255, 0.95);
-		backdrop-filter: blur(12px);
-		-webkit-backdrop-filter: blur(12px);
-		border: 1px solid rgba(0, 0, 0, 0.1);
+		background: var(--color-surface-elevated-3);
+		border: 1px solid var(--color-border);
 		border-radius: 0.75rem;
-		box-shadow: 0 10px 25px -5px rgba(0, 0, 0, 0.15);
-	}
-
-	:global(.dark) .context-menu {
-		background: rgba(40, 40, 40, 0.95);
-		border-color: rgba(255, 255, 255, 0.15);
+		box-shadow: var(--shadow-xl);
 	}
 
 	.context-item {
@@ -619,31 +612,23 @@
 		border: none;
 		background: transparent;
 		font-size: 0.875rem;
-		color: #374151;
+		color: var(--color-foreground);
 		cursor: pointer;
 		border-radius: 0.5rem;
 		transition: background 0.15s;
 		text-align: left;
 	}
 
-	:global(.dark) .context-item {
-		color: #e5e7eb;
-	}
-
 	.context-item:hover {
-		background: rgba(0, 0, 0, 0.05);
-	}
-
-	:global(.dark) .context-item:hover {
-		background: rgba(255, 255, 255, 0.1);
+		background: var(--color-surface-hover);
 	}
 
 	.context-item.danger {
-		color: #ef4444;
+		color: var(--color-error);
 	}
 
 	.context-item.danger:hover {
-		background: rgba(239, 68, 68, 0.1);
+		background: color-mix(in srgb, var(--color-error) 10%, transparent);
 	}
 
 	.context-icon {
@@ -654,14 +639,10 @@
 
 	.context-divider {
 		height: 1px;
-		background: rgba(0, 0, 0, 0.1);
+		background: var(--color-border);
 		margin: 0.25rem 0.5rem;
 	}
 
-	:global(.dark) .context-divider {
-		background: rgba(255, 255, 255, 0.1);
-	}
-
 	/* Inline subtasks — same size as title, just indented */
 	.subtasks-inline {
 		display: flex;
diff --git a/apps/todo/apps/web/src/routes/(app)/+layout.svelte b/apps/todo/apps/web/src/routes/(app)/+layout.svelte
index f2af67eae..a1f9e5df8 100644
--- a/apps/todo/apps/web/src/routes/(app)/+layout.svelte
+++ b/apps/todo/apps/web/src/routes/(app)/+layout.svelte
@@ -601,13 +601,9 @@
 		width: 54px;
 		height: 54px;
 		border-radius: 50%;
-		background: rgba(255, 255, 255, 0.9);
-		backdrop-filter: blur(12px);
-		-webkit-backdrop-filter: blur(12px);
-		border: 1px solid rgba(0, 0, 0, 0.1);
-		box-shadow:
-			0 4px 12px rgba(0, 0, 0, 0.15),
-			0 2px 4px rgba(0, 0, 0, 0.1);
+		background: var(--color-surface-elevated-2);
+		border: 1px solid var(--color-border);
+		box-shadow: var(--shadow-xl);
 		cursor: pointer;
 		display: flex;
 		align-items: center;
@@ -616,16 +612,8 @@
 		transition: all 0.2s ease;
 	}
 
-	:global(.dark) .pillnav-fab {
-		background: rgba(30, 30, 30, 0.9);
-		border-color: rgba(255, 255, 255, 0.15);
-	}
-
 	.pillnav-fab:hover {
 		transform: scale(1.05);
-		box-shadow:
-			0 6px 16px rgba(0, 0, 0, 0.2),
-			0 3px 6px rgba(0, 0, 0, 0.15);
 	}
 
 	.pillnav-fab:active {
@@ -635,10 +623,6 @@
 	.fab-icon {
 		width: 24px;
 		height: 24px;
-		color: #374151;
-	}
-
-	:global(.dark) .fab-icon {
-		color: #f3f4f6;
+		color: var(--color-foreground);
 	}
 </style>