diff --git a/src/app.css b/src/app.css
index 20bd6e5..0f37ead 100644
--- a/src/app.css
+++ b/src/app.css
@@ -93,6 +93,208 @@
     --shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.4);
 }
 
+/* ── Named Themes ── */
+
+:root[data-theme="solarized-light"] {
+    --bg-primary: #fdf6e3;
+    --bg-secondary: #eee8d5;
+    --bg-tertiary: #e5dfc9;
+    --bg-hover: #d8d0b8;
+    --bg-active: #ccc4aa;
+    --bg-editor: #fdf6e3;
+    --text-primary: #657b83;
+    --text-secondary: #839496;
+    --text-tertiary: #93a1a1;
+    --text-accent: #268bd2;
+    --border-color: #ddd5be;
+    --border-light: #eee8d5;
+    --accent: #268bd2;
+    --accent-hover: #1a7abf;
+    --accent-light: color-mix(in srgb, #268bd2 10%, transparent);
+    --danger: #dc322f;
+    --danger-hover: #c82929;
+    --success: #859900;
+    --warning: #b58900;
+    --shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.05);
+    --shadow-md: 0 4px 12px rgba(0, 0, 0, 0.08);
+    --shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.12);
+}
+
+:root[data-theme="solarized-dark"] {
+    --bg-primary: #002b36;
+    --bg-secondary: #073642;
+    --bg-tertiary: #0a3f4e;
+    --bg-hover: #094350;
+    --bg-active: #0e4d5c;
+    --bg-editor: #002b36;
+    --text-primary: #839496;
+    --text-secondary: #657b83;
+    --text-tertiary: #586e75;
+    --text-accent: #268bd2;
+    --border-color: #073642;
+    --border-light: #0a3f4e;
+    --accent: #268bd2;
+    --accent-hover: #1a7abf;
+    --accent-light: color-mix(in srgb, #268bd2 15%, transparent);
+    --danger: #dc322f;
+    --danger-hover: #c82929;
+    --success: #859900;
+    --warning: #b58900;
+    --shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.3);
+    --shadow-md: 0 4px 12px rgba(0, 0, 0, 0.4);
+    --shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.5);
+}
+
+:root[data-theme="catppuccin"] {
+    --bg-primary: #1e1e2e;
+    --bg-secondary: #181825;
+    --bg-tertiary: #11111b;
+    --bg-hover: #313244;
+    --bg-active: #45475a;
+    --bg-editor: #1e1e2e;
+    --text-primary: #cdd6f4;
+    --text-secondary: #bac2de;
+    --text-tertiary: #a6adc8;
+    --text-accent: #89b4fa;
+    --border-color: #313244;
+    --border-light: #181825;
+    --accent: #89b4fa;
+    --accent-hover: #74a8f7;
+    --accent-light: color-mix(in srgb, #89b4fa 12%, transparent);
+    --danger: #f38ba8;
+    --danger-hover: #eba0ac;
+    --success: #a6e3a1;
+    --warning: #f9e2af;
+    --shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.3);
+    --shadow-md: 0 4px 12px rgba(0, 0, 0, 0.4);
+    --shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.5);
+}
+
+:root[data-theme="nord"] {
+    --bg-primary: #2e3440;
+    --bg-secondary: #3b4252;
+    --bg-tertiary: #434c5e;
+    --bg-hover: #4c566a;
+    --bg-active: #5a6578;
+    --bg-editor: #2e3440;
+    --text-primary: #eceff4;
+    --text-secondary: #e5e9f0;
+    --text-tertiary: #d8dee9;
+    --text-accent: #81a1c1;
+    --border-color: #3b4252;
+    --border-light: #434c5e;
+    --accent: #81a1c1;
+    --accent-hover: #6d8fa9;
+    --accent-light: color-mix(in srgb, #81a1c1 12%, transparent);
+    --danger: #bf616a;
+    --danger-hover: #a85060;
+    --success: #a3be8c;
+    --warning: #ebcb8b;
+    --shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.3);
+    --shadow-md: 0 4px 12px rgba(0, 0, 0, 0.4);
+    --shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.5);
+}
+
+:root[data-theme="tokyo-night"] {
+    --bg-primary: #1a1b26;
+    --bg-secondary: #16161e;
+    --bg-tertiary: #1f2335;
+    --bg-hover: #292e42;
+    --bg-active: #3b4261;
+    --bg-editor: #1a1b26;
+    --text-primary: #c0caf5;
+    --text-secondary: #a9b1d6;
+    --text-tertiary: #565f89;
+    --text-accent: #7aa2f7;
+    --border-color: #292e42;
+    --border-light: #1f2335;
+    --accent: #7aa2f7;
+    --accent-hover: #6492e7;
+    --accent-light: color-mix(in srgb, #7aa2f7 12%, transparent);
+    --danger: #f7768e;
+    --danger-hover: #e56474;
+    --success: #9ece6a;
+    --warning: #e0af68;
+    --shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.3);
+    --shadow-md: 0 4px 12px rgba(0, 0, 0, 0.4);
+    --shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.5);
+}
+
+:root[data-theme="github-light"] {
+    --bg-primary: #ffffff;
+    --bg-secondary: #f6f8fa;
+    --bg-tertiary: #eaeef2;
+    --bg-hover: #d0d7de;
+    --bg-active: #c6cdd5;
+    --bg-editor: #ffffff;
+    --text-primary: #1f2328;
+    --text-secondary: #656d76;
+    --text-tertiary: #8c959f;
+    --text-accent: #0969da;
+    --border-color: #d0d7de;
+    --border-light: #eaeef2;
+    --accent: #0969da;
+    --accent-hover: #0860c9;
+    --accent-light: color-mix(in srgb, #0969da 8%, transparent);
+    --danger: #d1242f;
+    --danger-hover: #c01020;
+    --success: #1a7f37;
+    --warning: #9a6700;
+    --shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.05);
+    --shadow-md: 0 4px 12px rgba(0, 0, 0, 0.08);
+    --shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.12);
+}
+
+:root[data-theme="github-dark"] {
+    --bg-primary: #0d1117;
+    --bg-secondary: #161b22;
+    --bg-tertiary: #21262d;
+    --bg-hover: #30363d;
+    --bg-active: #3c444d;
+    --bg-editor: #0d1117;
+    --text-primary: #e6edf3;
+    --text-secondary: #8d96a0;
+    --text-tertiary: #6e7681;
+    --text-accent: #58a6ff;
+    --border-color: #30363d;
+    --border-light: #21262d;
+    --accent: #58a6ff;
+    --accent-hover: #4493f8;
+    --accent-light: color-mix(in srgb, #58a6ff 10%, transparent);
+    --danger: #f85149;
+    --danger-hover: #e03d3d;
+    --success: #3fb950;
+    --warning: #d29922;
+    --shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.3);
+    --shadow-md: 0 4px 12px rgba(0, 0, 0, 0.4);
+    --shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.5);
+}
+
+:root[data-theme="dracula"] {
+    --bg-primary: #282a36;
+    --bg-secondary: #21222c;
+    --bg-tertiary: #191a21;
+    --bg-hover: #44475a;
+    --bg-active: #6272a4;
+    --bg-editor: #282a36;
+    --text-primary: #f8f8f2;
+    --text-secondary: #6272a4;
+    --text-tertiary: #44475a;
+    --text-accent: #bd93f9;
+    --border-color: #44475a;
+    --border-light: #2d2f3f;
+    --accent: #bd93f9;
+    --accent-hover: #a87ef5;
+    --accent-light: color-mix(in srgb, #bd93f9 12%, transparent);
+    --danger: #ff5555;
+    --danger-hover: #e54545;
+    --success: #50fa7b;
+    --warning: #f1fa8c;
+    --shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.3);
+    --shadow-md: 0 4px 12px rgba(0, 0, 0, 0.4);
+    --shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.5);
+}
+
 *,
 *::before,
 *::after {
diff --git a/src/lib/components/AppLayout.svelte b/src/lib/components/AppLayout.svelte
index 0ba938e..9383470 100644
--- a/src/lib/components/AppLayout.svelte
+++ b/src/lib/components/AppLayout.svelte
@@ -361,9 +361,15 @@
 	}
 
 	function applyTheme(t: string) {
+		const darkThemes = ['dark', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-dark', 'dracula'];
+		const namedThemes = ['solarized-light', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-light', 'github-dark', 'dracula'];
 		const root = document.documentElement;
 		root.classList.remove('dark');
-		if (t === 'dark' || (t === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
+		root.removeAttribute('data-theme');
+		if (namedThemes.includes(t)) {
+			root.setAttribute('data-theme', t);
+			if (darkThemes.includes(t)) root.classList.add('dark');
+		} else if (t === 'dark' || (t === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
 			root.classList.add('dark');
 		}
 	}
diff --git a/src/lib/components/CommandPalette.svelte b/src/lib/components/CommandPalette.svelte
index 512e50b..ea01562 100644
--- a/src/lib/components/CommandPalette.svelte
+++ b/src/lib/components/CommandPalette.svelte
@@ -55,6 +55,46 @@
 				$showCommandPalette = false;
 			}
 		},
+		{
+			id: 'theme-solarized-light',
+			label: 'Switch to Solarized Light Theme',
+			action: () => { $theme = 'solarized-light'; setTheme('solarized-light'); applyTheme('solarized-light'); $showCommandPalette = false; }
+		},
+		{
+			id: 'theme-solarized-dark',
+			label: 'Switch to Solarized Dark Theme',
+			action: () => { $theme = 'solarized-dark'; setTheme('solarized-dark'); applyTheme('solarized-dark'); $showCommandPalette = false; }
+		},
+		{
+			id: 'theme-catppuccin',
+			label: 'Switch to Catppuccin Theme',
+			action: () => { $theme = 'catppuccin'; setTheme('catppuccin'); applyTheme('catppuccin'); $showCommandPalette = false; }
+		},
+		{
+			id: 'theme-nord',
+			label: 'Switch to Nord Theme',
+			action: () => { $theme = 'nord'; setTheme('nord'); applyTheme('nord'); $showCommandPalette = false; }
+		},
+		{
+			id: 'theme-tokyo-night',
+			label: 'Switch to Tokyo Night Theme',
+			action: () => { $theme = 'tokyo-night'; setTheme('tokyo-night'); applyTheme('tokyo-night'); $showCommandPalette = false; }
+		},
+		{
+			id: 'theme-github-light',
+			label: 'Switch to GitHub Light Theme',
+			action: () => { $theme = 'github-light'; setTheme('github-light'); applyTheme('github-light'); $showCommandPalette = false; }
+		},
+		{
+			id: 'theme-github-dark',
+			label: 'Switch to GitHub Dark Theme',
+			action: () => { $theme = 'github-dark'; setTheme('github-dark'); applyTheme('github-dark'); $showCommandPalette = false; }
+		},
+		{
+			id: 'theme-dracula',
+			label: 'Switch to Dracula Theme',
+			action: () => { $theme = 'dracula'; setTheme('dracula'); applyTheme('dracula'); $showCommandPalette = false; }
+		},
 		{
 			id: 'toggle-source',
 			label: 'Toggle Source/WYSIWYG Mode',
@@ -102,9 +142,15 @@
 	}
 
 	function applyTheme(t: string) {
+		const darkThemes = ['dark', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-dark', 'dracula'];
+		const namedThemes = ['solarized-light', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-light', 'github-dark', 'dracula'];
 		const root = document.documentElement;
 		root.classList.remove('dark');
-		if (t === 'dark' || (t === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
+		root.removeAttribute('data-theme');
+		if (namedThemes.includes(t)) {
+			root.setAttribute('data-theme', t);
+			if (darkThemes.includes(t)) root.classList.add('dark');
+		} else if (t === 'dark' || (t === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
 			root.classList.add('dark');
 		}
 	}
diff --git a/src/lib/components/NoteWindow.svelte b/src/lib/components/NoteWindow.svelte
index 3ac0fe9..c3f188b 100644
--- a/src/lib/components/NoteWindow.svelte
+++ b/src/lib/components/NoteWindow.svelte
@@ -34,10 +34,16 @@
 	});
 
 	$effect(() => {
-		const themeValue = $theme || 'system';
+		const t = $theme || 'system';
+		const darkThemes = ['dark', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-dark', 'dracula'];
+		const namedThemes = ['solarized-light', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-light', 'github-dark', 'dracula'];
 		const root = document.documentElement;
 		root.classList.remove('dark');
-		if (themeValue === 'dark' || (themeValue === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
+		root.removeAttribute('data-theme');
+		if (namedThemes.includes(t)) {
+			root.setAttribute('data-theme', t);
+			if (darkThemes.includes(t)) root.classList.add('dark');
+		} else if (t === 'dark' || (t === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
 			root.classList.add('dark');
 		}
 	});
diff --git a/src/lib/components/SettingsPanel.svelte b/src/lib/components/SettingsPanel.svelte
index 5edc184..549525d 100644
--- a/src/lib/components/SettingsPanel.svelte
+++ b/src/lib/components/SettingsPanel.svelte
@@ -300,6 +300,24 @@
 		}
 	}
 
+	const darkThemes = ['dark', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-dark', 'dracula'];
+	let isThemeDark = $derived(
+		darkThemes.includes($theme) || ($theme === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches)
+	);
+
+	const themePresets = [
+		{ id: 'light', label: 'Light', bg: '#ffffff', sidebar: '#f8f9fa', accent: '#5b6abf' },
+		{ id: 'dark', label: 'Dark', bg: '#1a1b26', sidebar: '#1f2029', accent: '#89b4fa' },
+		{ id: 'solarized-light', label: 'Solarized Light', bg: '#fdf6e3', sidebar: '#eee8d5', accent: '#268bd2' },
+		{ id: 'solarized-dark', label: 'Solarized Dark', bg: '#002b36', sidebar: '#073642', accent: '#268bd2' },
+		{ id: 'catppuccin', label: 'Catppuccin', bg: '#1e1e2e', sidebar: '#181825', accent: '#89b4fa' },
+		{ id: 'nord', label: 'Nord', bg: '#2e3440', sidebar: '#3b4252', accent: '#81a1c1' },
+		{ id: 'tokyo-night', label: 'Tokyo Night', bg: '#1a1b26', sidebar: '#16161e', accent: '#7aa2f7' },
+		{ id: 'github-light', label: 'GitHub Light', bg: '#ffffff', sidebar: '#f6f8fa', accent: '#0969da' },
+		{ id: 'github-dark', label: 'GitHub Dark', bg: '#0d1117', sidebar: '#161b22', accent: '#58a6ff' },
+		{ id: 'dracula', label: 'Dracula', bg: '#282a36', sidebar: '#21222c', accent: '#bd93f9' },
+	];
+
 	const accentPresets = [
 		{ name: 'Indigo', light: '#5b6abf', dark: '#7b9bd4' },
 		{ name: 'Rose', light: '#e11d48', dark: '#d4768a' },
@@ -435,7 +453,7 @@
 
 	function applyAccent(preset: typeof accentPresets[0]) {
 		const root = document.documentElement;
-		const isDark = $theme === 'dark' || ($theme === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches);
+		const isDark = darkThemes.includes($theme) || ($theme === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches);
 		const color = isDark ? preset.dark : preset.light;
 
 		root.style.setProperty('--accent', color);
@@ -815,27 +833,23 @@
 						<div class="tab-content">
 							<div class="settings-section">
 								<h3>Theme</h3>
-								<div class="theme-toggle">
-									<button class="theme-btn" class:active={$theme === 'light'} onclick={() => { $theme = 'light'; setTheme('light'); }}>
-										<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-											<circle cx="12" cy="12" r="5" />
-											<line x1="12" y1="1" x2="12" y2="3" />
-											<line x1="12" y1="21" x2="12" y2="23" />
-											<line x1="4.22" y1="4.22" x2="5.64" y2="5.64" />
-											<line x1="18.36" y1="18.36" x2="19.78" y2="19.78" />
-											<line x1="1" y1="12" x2="3" y2="12" />
-											<line x1="21" y1="12" x2="23" y2="12" />
-											<line x1="4.22" y1="19.78" x2="5.64" y2="18.36" />
-											<line x1="18.36" y1="5.64" x2="19.78" y2="4.22" />
-										</svg>
-										Light
-									</button>
-									<button class="theme-btn" class:active={$theme === 'dark'} onclick={() => { $theme = 'dark'; setTheme('dark'); }}>
-										<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-											<path d="M21 12.79A9 9 0 1111.21 3 7 7 0 0021 12.79z" />
-										</svg>
-										Dark
-									</button>
+								<div class="theme-grid">
+									{#each themePresets as preset}
+										<button
+											class="theme-swatch"
+											class:active={$theme === preset.id}
+											onclick={() => { $theme = preset.id; setTheme(preset.id); }}
+											title={preset.label}
+										>
+											<span class="theme-preview" style="--preview-bg: {preset.bg}; --preview-sidebar: {preset.sidebar}; --preview-accent: {preset.accent}">
+												<span class="preview-sidebar"></span>
+												<span class="preview-main">
+													<span class="preview-accent-bar"></span>
+												</span>
+											</span>
+											<span class="theme-label">{preset.label}</span>
+										</button>
+									{/each}
 								</div>
 							</div>
 
@@ -846,7 +860,7 @@
 										<button
 											class="accent-swatch"
 											class:active={activeAccent === preset.name}
-											style="--swatch-color: {$theme === 'dark' ? preset.dark : preset.light}"
+											style="--swatch-color: {isThemeDark ? preset.dark : preset.light}"
 											onclick={() => selectAccent(preset)}
 											title={preset.name}
 										>
@@ -1613,35 +1627,75 @@
 		font-weight: 500;
 	}
 
-	.theme-toggle {
-		display: flex;
+	.theme-grid {
+		display: grid;
+		grid-template-columns: repeat(5, 1fr);
 		gap: 8px;
 	}
 
-	.theme-btn {
-		flex: 1;
+	.theme-swatch {
 		display: flex;
+		flex-direction: column;
 		align-items: center;
-		justify-content: center;
-		gap: 8px;
-		padding: 10px 16px;
+		gap: 5px;
+		padding: 6px;
 		border: 1px solid var(--border-color);
-		border-radius: 10px;
+		border-radius: 8px;
 		background: var(--bg-secondary);
-		color: var(--text-secondary);
-		font-size: 13px;
 		cursor: pointer;
 		transition: all 0.15s;
 	}
 
-	.theme-btn:hover {
-		background: var(--bg-hover);
-		color: var(--text-primary);
+	.theme-swatch:hover {
+		border-color: var(--text-tertiary);
 	}
 
-	.theme-btn.active {
+	.theme-swatch.active {
 		border-color: var(--accent);
-		background: var(--accent-light);
+		box-shadow: 0 0 0 2px var(--accent-light);
+	}
+
+	.theme-preview {
+		display: flex;
+		width: 100%;
+		height: 32px;
+		border-radius: 4px;
+		overflow: hidden;
+		background: var(--preview-bg);
+		border: 1px solid rgba(0,0,0,0.1);
+	}
+
+	.preview-sidebar {
+		width: 30%;
+		background: var(--preview-sidebar);
+		flex-shrink: 0;
+	}
+
+	.preview-main {
+		flex: 1;
+		background: var(--preview-bg);
+		padding: 4px;
+		display: flex;
+		flex-direction: column;
+		gap: 3px;
+	}
+
+	.preview-accent-bar {
+		height: 3px;
+		width: 60%;
+		background: var(--preview-accent);
+		border-radius: 2px;
+	}
+
+	.theme-label {
+		font-size: 10px;
+		color: var(--text-secondary);
+		text-align: center;
+		line-height: 1.2;
+		word-break: break-word;
+	}
+
+	.theme-swatch.active .theme-label {
 		color: var(--accent);
 	}
 
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 42f7a2f..dff436a 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -11,16 +11,22 @@
 
 	// Reactively apply theme class to <html> whenever $theme changes
 	$effect(() => {
-		const t = $theme;
+		applyTheme($theme);
+	});
+
+	function applyTheme(t: string) {
+		const darkThemes = ['dark', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-dark', 'dracula'];
+		const namedThemes = ['solarized-light', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-light', 'github-dark', 'dracula'];
 		const root = document.documentElement;
 		root.classList.remove('dark');
-		if (
-			t === 'dark' ||
-			(t === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches)
-		) {
+		root.removeAttribute('data-theme');
+		if (namedThemes.includes(t)) {
+			root.setAttribute('data-theme', t);
+			if (darkThemes.includes(t)) root.classList.add('dark');
+		} else if (t === 'dark' || (t === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
 			root.classList.add('dark');
 		}
-	});
+	}
 
 	function normalizePath(p: string): string {
 		const parts = p.split('/');
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 02189d6..dc0c7ce 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -26,8 +26,14 @@
 			// Apply theme immediately to prevent flash
 			const themeValue = config.theme || 'system';
 			const root = document.documentElement;
+			const darkThemes = ['dark', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-dark', 'dracula'];
+			const namedThemes = ['solarized-light', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-light', 'github-dark', 'dracula'];
 			root.classList.remove('dark');
-			if (themeValue === 'dark' || (themeValue === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
+			root.removeAttribute('data-theme');
+			if (namedThemes.includes(themeValue)) {
+				root.setAttribute('data-theme', themeValue);
+				if (darkThemes.includes(themeValue)) root.classList.add('dark');
+			} else if (themeValue === 'dark' || (themeValue === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
 				root.classList.add('dark');
 			}
 
@@ -67,7 +73,7 @@
 				const preset = accentPresets[config.accent_color];
 				if (preset) {
 					const themeVal = config.theme || 'light';
-					const isDark = themeVal === 'dark' || (themeVal === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches);
+					const isDark = darkThemes.includes(themeVal) || (themeVal === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches);
 					const color = isDark ? preset.dark : preset.light;
 					const root = document.documentElement;
 					root.style.setProperty('--accent', color);