diff --git a/src/lib/components/Toolbar.svelte b/src/lib/components/Toolbar.svelte
index 98a84a4..c619498 100644
--- a/src/lib/components/Toolbar.svelte
+++ b/src/lib/components/Toolbar.svelte
@@ -1,12 +1,11 @@
 <script lang="ts">
 	import { exportTypst } from '../ts/typst-api';
 	import { text } from '../ts/yjs-setup';
-	import { connectionStatus, connectedUsers, themeStore, darkModeStore, editorViewStore, documentZoomStore, commentsSidebarOpen, versionHistoryOpen, triggerLspReconnect, documentStatsStore, previewOpenStore } from '../ts/store';
+	import { connectionStatus, connectedUsers, editorViewStore, documentZoomStore, commentsSidebarOpen, versionHistoryOpen, triggerLspReconnect, documentStatsStore, previewOpenStore } from '../ts/store';
 	import { themes } from '../ts/themes';
 	import { goto } from '$app/navigation';
 	import ShareModal from './ShareModal.svelte';
 	import PageSettingsModal from './PageSettingsModal.svelte';
-	import ThemePicker from './ThemePicker.svelte';
 	import PresentationMode from "./PresentationMode.svelte";
 	import CommentsSidebar from "./CommentsSidebar.svelte";
 	import VersionHistorySidebar from "./VersionHistorySidebar.svelte";
@@ -494,11 +493,6 @@
 								<button onclick={() => { activeMenu = null; $versionHistoryOpen = true; }} class="w-full text-left px-4 py-1.5 text-sm text-[var(--theme-text)] hover:bg-[var(--theme-border)] flex items-center justify-between">
 									Version History
 								</button>
-								<div class="h-px bg-[var(--theme-border)] my-1"></div>
-								<button onclick={() => { activeMenu = null; $darkModeStore = !$darkModeStore; }} class="w-full text-left px-4 py-1.5 text-sm text-[var(--theme-text)] hover:bg-[var(--theme-border)] flex items-center justify-between">
-									Dark Mode
-									<Icon icon={$darkModeStore ? "mdi:check" : ""} class="text-sm" />
-								</button>
 							</div>
 						{/if}
 					</div>
@@ -704,12 +698,6 @@
 			</button>
 		</div>
 
-		<div class="w-px h-4 bg-[var(--color-line)]"></div>
-
-		<div class="flex items-center gap-2">
-			<ThemePicker />
-		</div>
-
 		<div class="flex-grow"></div>
 
 
diff --git a/src/lib/components/project/ProjectToolbar.svelte b/src/lib/components/project/ProjectToolbar.svelte
index 6295d91..7e1f688 100644
--- a/src/lib/components/project/ProjectToolbar.svelte
+++ b/src/lib/components/project/ProjectToolbar.svelte
@@ -4,13 +4,11 @@
 	import { undo, redo } from '@codemirror/commands';
 	import {
 		connectedUsers,
-		darkModeStore,
 		editorViewStore,
 		documentZoomStore,
 		previewOpenStore
 	} from '../../ts/store';
 	import { exportProject } from '../../ts/typst-api';
-	import ThemePicker from '../ThemePicker.svelte';
 	import PageSettingsModal from '../PageSettingsModal.svelte';
 	import PresentationMode from '../PresentationMode.svelte';
 	import Modal from '../Modal.svelte';
@@ -354,7 +352,6 @@
 						{#if activeMenu === 'view'}
 							<div class="absolute left-0 top-full mt-1 w-48 bg-[var(--theme-bg)] rounded-xl shadow-xl border border-[var(--theme-border)] py-1 z-[100]">
 								<button onclick={() => { activeMenu = null; $previewOpenStore = !$previewOpenStore; }} class="w-full text-left px-4 py-1.5 text-sm hover:bg-[var(--theme-border)] flex items-center justify-between">Preview<Icon icon={$previewOpenStore ? 'mdi:check' : ''} class="text-sm" /></button>
-								<button onclick={() => { activeMenu = null; $darkModeStore = !$darkModeStore; }} class="w-full text-left px-4 py-1.5 text-sm hover:bg-[var(--theme-border)] flex items-center justify-between">Dark Mode<Icon icon={$darkModeStore ? 'mdi:check' : ''} class="text-sm" /></button>
 							</div>
 						{/if}
 					</div>
@@ -460,9 +457,6 @@
 			<button onclick={() => $documentZoomStore = Math.min(500, $documentZoomStore + 10)} class="px-2 py-1 text-[var(--color-ink-muted)] hover:text-[var(--color-ink)] hover:bg-[var(--color-surface-sunken)] transition-colors" title="Zoom In"><Icon icon="mdi:plus" class="text-sm" /></button>
 		</div>
 
-		<div class="w-px h-4 bg-[var(--color-line)]"></div>
-
-		<ThemePicker />
 		<div class="flex-grow"></div>
 	</div>
 </header>