diff --git a/docs/central-services/COMMAND-BAR.md b/docs/central-services/COMMAND-BAR.md
deleted file mode 100644
index bde1fea5d..000000000
--- a/docs/central-services/COMMAND-BAR.md
+++ /dev/null
@@ -1,383 +0,0 @@
-# Central Command Bar
-
-Die zentrale Command Bar bietet eine einheitliche Schnellsuche und Navigation über alle Mana-Apps hinweg. Sie wird mit `Cmd/Ctrl+K` aktiviert und bietet Suche, Quick Actions und Tastatur-Navigation.
-
-## Architektur
-
-```
-┌─────────────────────────────────────────────────────────────┐
-│                 @mana/shared-ui                         │
-│  ┌─────────────────────────────────────────────────────┐   │
-│  │  CommandBar.svelte                                   │   │
-│  │  - Suche mit Debounce (150ms)                       │   │
-│  │  - Quick Actions                                     │   │
-│  │  - Tastatur-Navigation                               │   │
-│  │  - Ergebnis-Anzeige mit Avataren                    │   │
-│  └─────────────────────────────────────────────────────┘   │
-└─────────────────────────────────────────────────────────────┘
-                             │
-        ┌────────────────────┼────────────────────┐
-        │                    │                    │
-   ┌────▼────┐         ┌─────▼────┐        ┌─────▼────┐
-   │  Todo   │         │ Calendar │        │ Contacts │
-   │         │         │          │        │          │
-   │ Sucht   │         │ Sucht    │        │ Sucht    │
-   │ Tasks   │         │ Events   │        │ Kontakte │
-   └─────────┘         └──────────┘        └──────────┘
-```
-
-## Package
-
-| Package | Beschreibung |
-|---------|--------------|
-| `@mana/shared-ui` | CommandBar Svelte-Komponente + TypeScript-Typen |
-
-## Keyboard Shortcut
-
-| Shortcut | Aktion |
-|----------|--------|
-| `Cmd/Ctrl+K` | Command Bar öffnen |
-| `↑↓` | Navigation durch Ergebnisse |
-| `Enter` | Auswahl bestätigen |
-| `Escape` | Schließen |
-
-## TypeScript Interfaces
-
-### CommandBarItem
-
-Ein Suchergebnis:
-
-```typescript
-interface CommandBarItem {
-  id: string;           // Eindeutige ID
-  title: string;        // Haupttext (z.B. Name, Titel)
-  subtitle?: string;    // Untertitel (z.B. Datum, E-Mail)
-  icon?: string;        // Icon-Name
-  imageUrl?: string;    // Avatar/Bild URL
-  isFavorite?: boolean; // Favorit-Markierung (zeigt Herz-Icon)
-}
-```
-
-### QuickAction
-
-Eine Schnellaktion (ohne Suche):
-
-```typescript
-interface QuickAction {
-  id: string;           // Eindeutige ID
-  label: string;        // Anzeigetext
-  icon: string;         // Icon-Name
-  href?: string;        // Link-Ziel (optional)
-  shortcut?: string;    // Tastenkürzel-Anzeige
-  onclick?: () => void; // Click-Handler (alternativ zu href)
-}
-```
-
-### Unterstützte Icons
-
-Die CommandBar unterstützt folgende eingebaute Icons:
-
-| Icon-Name | Beschreibung |
-|-----------|--------------|
-| `plus` | Plus-Zeichen (Neu erstellen) |
-| `heart` | Herz (Favoriten) |
-| `tag` | Tag/Label |
-| `upload` | Upload (Import) |
-| `calendar` | Kalender |
-| `clock` | Uhr |
-| `check` | Häkchen |
-| `settings` | Zahnrad (Einstellungen) |
-| `list` | Liste |
-
-## Komponenten-Props
-
-```typescript
-interface Props {
-  open: boolean;                               // Sichtbarkeit
-  onClose: () => void;                        // Schließen-Handler
-  onSearch: (query: string) => Promise<CommandBarItem[]>;  // Such-Funktion
-  onSelect: (item: CommandBarItem) => void;   // Auswahl-Handler
-  quickActions?: QuickAction[];               // Schnellaktionen
-  placeholder?: string;                       // Suchfeld-Placeholder
-  emptyText?: string;                         // Text bei leeren Ergebnissen
-  searchingText?: string;                     // Text während Suche
-}
-```
-
-## Nutzung
-
-### Basis-Beispiel
-
-```svelte
-<script lang="ts">
-  import { goto } from '$app/navigation';
-  import { CommandBar } from '@mana/shared-ui';
-  import type { CommandBarItem, QuickAction } from '@mana/shared-ui';
-
-  let commandBarOpen = $state(false);
-
-  // Quick Actions definieren
-  const quickActions: QuickAction[] = [
-    { id: 'new', label: 'Neu erstellen', icon: 'plus', href: '/new', shortcut: 'N' },
-    { id: 'settings', label: 'Einstellungen', icon: 'settings', href: '/settings' },
-  ];
-
-  // Such-Funktion implementieren
-  async function handleSearch(query: string): Promise<CommandBarItem[]> {
-    const results = await api.search(query);
-    return results.map((item) => ({
-      id: item.id,
-      title: item.name,
-      subtitle: item.description,
-    }));
-  }
-
-  // Auswahl verarbeiten
-  function handleSelect(item: CommandBarItem) {
-    goto(`/item/${item.id}`);
-  }
-
-  // Keyboard Shortcut registrieren
-  function handleKeydown(event: KeyboardEvent) {
-    if ((event.ctrlKey || event.metaKey) && event.key === 'k') {
-      event.preventDefault();
-      commandBarOpen = true;
-    }
-  }
-</script>
-
-<svelte:window onkeydown={handleKeydown} />
-
-<CommandBar
-  bind:open={commandBarOpen}
-  onClose={() => (commandBarOpen = false)}
-  onSearch={handleSearch}
-  onSelect={handleSelect}
-  {quickActions}
-  placeholder="Suchen..."
-  emptyText="Keine Ergebnisse"
-  searchingText="Suche..."
-/>
-```
-
-## App-spezifische Implementierungen
-
-### Todo App
-
-```typescript
-// Quick Actions
-const quickActions: QuickAction[] = [
-  { id: 'new', label: 'Neue Aufgabe erstellen', icon: 'plus', href: '/task/new', shortcut: 'N' },
-  { id: 'kanban', label: 'Kanban-Board', icon: 'list', href: '/kanban' },
-  { id: 'stats', label: 'Statistiken', icon: 'chart', href: '/statistics' },
-  { id: 'settings', label: 'Einstellungen', icon: 'settings', href: '/settings' },
-];
-
-// Suche: Tasks durchsuchen
-async function handleSearch(query: string): Promise<CommandBarItem[]> {
-  const tasks = await getTasks({ search: query });
-  return tasks.slice(0, 10).map((task) => ({
-    id: task.id,
-    title: task.title,
-    subtitle: task.isCompleted
-      ? '✓ Erledigt'
-      : task.dueDate
-        ? new Date(task.dueDate).toLocaleDateString('de-DE')
-        : 'Kein Datum',
-  }));
-}
-
-// Auswahl: Zu Task navigieren
-function handleSelect(item: CommandBarItem) {
-  goto(`/task/${item.id}`);
-}
-```
-
-### Calendar App
-
-```typescript
-// Quick Actions
-const quickActions: QuickAction[] = [
-  { id: 'new', label: 'Neuen Termin erstellen', icon: 'plus', href: '/event/new', shortcut: 'N' },
-  { id: 'today', label: 'Zu Heute springen', icon: 'calendar', onclick: () => viewStore.goToToday() },
-  { id: 'agenda', label: 'Agenda anzeigen', icon: 'list', href: '/agenda' },
-  { id: 'settings', label: 'Einstellungen', icon: 'settings', href: '/settings' },
-];
-
-// Suche: Events durchsuchen
-async function handleSearch(query: string): Promise<CommandBarItem[]> {
-  const result = await searchEvents(query);
-  if (result.error || !result.data) return [];
-
-  return result.data.slice(0, 10).map((event) => ({
-    id: event.id,
-    title: event.title,
-    subtitle: format(new Date(event.startTime), 'dd. MMM yyyy, HH:mm', { locale: de }),
-  }));
-}
-
-// Auswahl: Zu Event navigieren
-function handleSelect(item: CommandBarItem) {
-  goto(`/event/${item.id}`);
-}
-```
-
-### Contacts App
-
-```typescript
-// Quick Actions
-const quickActions: QuickAction[] = [
-  { id: 'new', label: 'Neuen Kontakt erstellen', icon: 'plus', href: '/contacts/new', shortcut: 'N' },
-  { id: 'favorites', label: 'Favoriten anzeigen', icon: 'heart', href: '/favorites' },
-  { id: 'tags', label: 'Tags verwalten', icon: 'tag', href: '/tags' },
-  { id: 'import', label: 'Kontakte importieren', icon: 'upload', href: '/data?tab=import' },
-];
-
-// Suche: Kontakte durchsuchen
-async function handleSearch(query: string): Promise<CommandBarItem[]> {
-  const response = await contactsApi.list({ search: query, limit: 10 });
-  return (response.contacts || []).map((contact) => ({
-    id: contact.id,
-    title: contact.displayName ||
-           [contact.firstName, contact.lastName].filter(Boolean).join(' ') ||
-           contact.email || 'Unbekannt',
-    subtitle: contact.company || contact.email,
-    imageUrl: contact.photoUrl,
-    isFavorite: contact.isFavorite,
-  }));
-}
-
-// Auswahl: Kontakt-Modal öffnen
-function handleSelect(item: CommandBarItem) {
-  goto(`/contacts/${item.id}`);
-}
-```
-
-## Funktionen
-
-### Suche
-
-- **Debounce:** 150ms Verzögerung für Performance
-- **Loading-State:** Spinner während der Suche
-- **Empty State:** Konfigurierbare Meldung bei keinen Ergebnissen
-- **Limit:** Ergebnisse werden typischerweise auf 10 begrenzt
-
-### Quick Actions
-
-Wenn kein Suchtext eingegeben ist, werden Quick Actions angezeigt:
-
-- Navigation mit Pfeiltasten
-- Ausführung mit Enter
-- Keyboard-Shortcuts werden rechts angezeigt
-
-### Ergebnis-Anzeige
-
-- **Avatar:** Bild oder Initialen
-- **Titel:** Haupttext
-- **Untertitel:** Zusatzinfo (grau)
-- **Favorit:** Herz-Icon wenn `isFavorite: true`
-- **Hover:** Visuelles Feedback bei Maus-Over
-
-### Keyboard Navigation
-
-| Taste | Aktion |
-|-------|--------|
-| `↑` / `↓` | Durch Ergebnisse navigieren |
-| `Enter` | Ausgewähltes Element öffnen |
-| `Escape` | Command Bar schließen |
-
-## Styling
-
-Die Command Bar verwendet ein dunkles Theme mit CSS-Variablen:
-
-```css
-.command-modal {
-  background: #1a1a1a;
-  border: 1px solid #333;
-  border-radius: 12px;
-  max-width: 560px;
-}
-
-.command-result.selected {
-  background: #2a2a2a;
-}
-
-.result-avatar {
-  background: #3b82f6;  /* Primary Color */
-}
-
-.result-favorite {
-  color: #ef4444;  /* Rot für Herz */
-}
-```
-
-### Animationen
-
-- **Fade In:** Backdrop erscheint mit 0.15s
-- **Slide In:** Modal gleitet von oben mit 0.2s
-- **Loading Spinner:** Rotation Animation
-
-## Integration in Layout
-
-Typischerweise wird die CommandBar im App-Layout integriert:
-
-```svelte
-<!-- src/routes/(app)/+layout.svelte -->
-<script lang="ts">
-  import { CommandBar } from '@mana/shared-ui';
-
-  let commandBarOpen = $state(false);
-
-  function handleKeydown(event: KeyboardEvent) {
-    // Cmd/Ctrl+K funktioniert auch in Input-Feldern
-    if ((event.ctrlKey || event.metaKey) && event.key === 'k') {
-      event.preventDefault();
-      commandBarOpen = true;
-    }
-  }
-</script>
-
-<svelte:window onkeydown={handleKeydown} />
-
-<!-- Haupt-Layout -->
-<PillNavigation ... />
-
-<main>
-  {@render children()}
-</main>
-
-<!-- Command Bar (global) -->
-<CommandBar
-  bind:open={commandBarOpen}
-  onClose={() => (commandBarOpen = false)}
-  onSearch={handleSearch}
-  onSelect={handleSelect}
-  {quickActions}
-/>
-```
-
-## Dateien
-
-### @mana/shared-ui
-
-| Datei | Beschreibung |
-|-------|--------------|
-| `src/command-bar/CommandBar.svelte` | Hauptkomponente |
-| `src/command-bar/index.ts` | Exports |
-| `src/index.ts` | Package-Export |
-
-## Vorteile
-
-- **Einheitliche UX:** Gleiche Interaktion in allen Apps
-- **Schnelle Navigation:** Sofortiger Zugriff auf häufige Aktionen
-- **Tastatur-fokussiert:** Optimiert für Power-User
-- **Flexibel:** App-spezifische Such-Logik und Quick Actions
-- **Responsive:** Funktioniert auf Desktop und Mobile
-
-## Best Practices
-
-1. **Such-Performance:** Limit auf 10 Ergebnisse setzen
-2. **Quick Actions:** Maximal 4-5 Aktionen für Übersichtlichkeit
-3. **Sinnvolle Shortcuts:** Mnemonische Kürzel (N=Neu, S=Settings)
-4. **Gute Subtitles:** Zusätzliche Info für eindeutige Identifikation
-5. **Keyboard First:** Cmd+K sollte immer funktionieren, auch in Input-Feldern
diff --git a/games/arcade/apps/web/src/routes/(app)/+layout.svelte b/games/arcade/apps/web/src/routes/(app)/+layout.svelte
index 715a5c318..c0fb51d06 100644
--- a/games/arcade/apps/web/src/routes/(app)/+layout.svelte
+++ b/games/arcade/apps/web/src/routes/(app)/+layout.svelte
@@ -2,18 +2,17 @@
 	import { goto } from '$app/navigation';
 	import { page } from '$app/stores';
 	import { locale } from 'svelte-i18n';
-	import { PillNavigation, CommandBar, SyncIndicator } from '@mana/shared-ui';
+	import { PillNavigation, SyncIndicator } from '@mana/shared-ui';
 	import type {
 		PillNavItem,
 		PillDropdownItem,
-		CommandBarItem,
-		QuickAction,
 		SpotlightAction,
+		ContentSearcher,
 	} from '@mana/shared-ui';
 	import { theme } from '$lib/stores/theme.svelte';
 	import { authStore } from '$lib/stores/auth.svelte';
 	import { userSettings } from '$lib/stores/user-settings.svelte';
-	import { games, getGameBySlug } from '$lib/data/games';
+	import { games } from '$lib/data/games';
 	import {
 		THEME_DEFINITIONS,
 		DEFAULT_THEME_VARIANTS,
@@ -30,11 +29,7 @@
 	import { gamesOnboarding } from '$lib/stores/app-onboarding.svelte';
 	import { MiniOnboardingModal } from '@mana/shared-ui';
 	import { gamesStore } from '$lib/data/local-store';
-	import {
-		tagLocalStore,
-		tagMutations,
-		useAllTags as useAllSharedTags,
-	} from '@mana/shared-stores';
+	import { tagLocalStore, tagMutations, useAllTags as useAllSharedTags } from '@mana/shared-stores';
 
 	const allTags = useAllSharedTags();
 
@@ -50,56 +45,79 @@
 
 	let { children } = $props();
 
+	// Cmd+K spotlight — nav shortcuts + game search. The PillNavigation
+	// hosts GlobalSpotlight internally, wired via spotlightActions +
+	// contentSearcher below.
 	const spotlightActions: SpotlightAction[] = [
+		{
+			id: 'home',
+			label: 'Alle Spiele',
+			icon: 'gamepad-2',
+			shortcut: '1',
+			category: 'Navigation',
+			onExecute: () => goto('/'),
+		},
 		{
 			id: 'new-game',
-			label: 'Neues Spiel erstellen',
-			icon: 'plus',
-			shortcut: 'N',
+			label: 'Spiel erstellen',
+			icon: 'sparkles',
+			shortcut: '2',
 			category: 'Erstellen',
 			onExecute: () => goto('/create'),
 		},
-		{ id: 'games', label: 'Alle Spiele', category: 'Navigation', onExecute: () => goto('/') },
+		{
+			id: 'community',
+			label: 'Community',
+			icon: 'users',
+			shortcut: '3',
+			category: 'Navigation',
+			onExecute: () => goto('/community'),
+		},
+		{
+			id: 'stats',
+			label: 'Statistiken',
+			icon: 'bar-chart-3',
+			shortcut: '4',
+			category: 'Navigation',
+			onExecute: () => goto('/stats'),
+		},
 		{
 			id: 'settings',
 			label: 'Einstellungen',
+			icon: 'settings',
 			category: 'Navigation',
 			onExecute: () => goto('/settings'),
 		},
 	];
 
-	let commandBarOpen = $state(false);
+	const contentSearcher: ContentSearcher = async (query) => {
+		const q = query.trim().toLowerCase();
+		if (!q) return [];
 
-	const commandBarQuickActions: QuickAction[] = [
-		{ id: 'home', label: 'Alle Spiele', icon: 'gamepad-2', href: '/', shortcut: '1' },
-		{ id: 'create', label: 'Spiel erstellen', icon: 'sparkles', href: '/create', shortcut: '2' },
-		{ id: 'community', label: 'Community', icon: 'users', href: '/community', shortcut: '3' },
-		{ id: 'stats', label: 'Statistiken', icon: 'bar-chart-3', href: '/stats', shortcut: '4' },
-		{ id: 'settings', label: 'Einstellungen', icon: 'settings', href: '/settings' },
-	];
-
-	async function handleCommandBarSearch(query: string): Promise<CommandBarItem[]> {
-		if (!query.trim()) return [];
-		const queryLower = query.toLowerCase();
-
-		return games
+		const hits = games
 			.filter(
-				(g) =>
-					g.title.toLowerCase().includes(queryLower) ||
-					g.tags.some((t) => t.toLowerCase().includes(queryLower))
+				(g) => g.title.toLowerCase().includes(q) || g.tags.some((t) => t.toLowerCase().includes(q))
 			)
-			.slice(0, 10)
-			.map((g) => ({
-				id: `game-${g.slug}`,
-				title: g.title,
-				subtitle: g.tags.join(', '),
-			}));
-	}
+			.slice(0, 10);
 
-	function handleCommandBarSelect(item: CommandBarItem) {
-		const slug = item.id.replace('game-', '');
-		goto(`/play/${slug}`);
-	}
+		if (hits.length === 0) return [];
+
+		return [
+			{
+				appId: 'arcade',
+				appName: 'Spiele',
+				results: hits.map((g, i) => ({
+					id: `game-${g.slug}`,
+					type: 'game',
+					appId: 'arcade',
+					title: g.title,
+					subtitle: g.tags.join(', '),
+					href: `/play/${g.slug}`,
+					score: hits.length - i,
+				})),
+			},
+		];
+	};
 
 	let isCollapsed = $state(false);
 	let isDark = $derived(theme.isDark);
@@ -156,13 +174,6 @@
 		filterHiddenNavItems('arcade', baseNavItems, userSettings.nav?.hiddenNavItems || {})
 	);
 
-	function handleKeydown(event: KeyboardEvent) {
-		if ((event.ctrlKey || event.metaKey) && event.key === 'k') {
-			event.preventDefault();
-			commandBarOpen = true;
-		}
-	}
-
 	function handleCollapsedChange(collapsed: boolean) {
 		isCollapsed = collapsed;
 		collapsedStore.set(collapsed);
@@ -207,8 +218,6 @@
 	}
 </script>
 
-<svelte:window onkeydown={handleKeydown} />
-
 <AuthGate {authStore} {goto} allowGuest={true} onReady={handleAuthReady}>
 	<div class="layout-container">
 		<PillNavigation
@@ -243,6 +252,8 @@
 			helpHref="/help"
 			allAppsHref="/apps"
 			{spotlightActions}
+			{contentSearcher}
+			spotlightPlaceholder="Spiele oder Aktionen suchen..."
 		/>
 
 		<main class="main-content bg-background">
@@ -250,17 +261,6 @@
 				{@render children()}
 			</div>
 		</main>
-
-		<CommandBar
-			bind:open={commandBarOpen}
-			onClose={() => (commandBarOpen = false)}
-			onSearch={handleCommandBarSearch}
-			onSelect={handleCommandBarSelect}
-			quickActions={commandBarQuickActions}
-			placeholder="Spiel suchen..."
-			emptyText="Keine Ergebnisse"
-			searchingText="Suche..."
-		/>
 	</div>
 
 	{#if gamesOnboarding.shouldShow}
diff --git a/packages/shared-ui/src/command-bar/CommandBar.svelte b/packages/shared-ui/src/command-bar/CommandBar.svelte
deleted file mode 100644
index c0162f40c..000000000
--- a/packages/shared-ui/src/command-bar/CommandBar.svelte
+++ /dev/null
@@ -1,697 +0,0 @@
-<script lang="ts">
-	import { goto } from '$app/navigation';
-	import type { CommandBarItem, QuickAction, CreatePreview } from './CommandBar.types';
-	import { Heart, MagnifyingGlass, Plus } from '@mana/shared-icons';
-	import { getHighlightPatterns, highlightText, SEARCH_DEBOUNCE_MS } from '../search-core';
-
-	const HIGHLIGHT_PATTERNS = getHighlightPatterns('de');
-
-	interface Props {
-		open: boolean;
-		onClose: () => void;
-		onSearch: (query: string) => Promise<CommandBarItem[]>;
-		onSelect: (item: CommandBarItem) => void;
-		quickActions?: QuickAction[];
-		placeholder?: string;
-		emptyText?: string;
-		searchingText?: string;
-		// New: Task creation support
-		onCreate?: (query: string) => Promise<void>;
-		onParseCreate?: (query: string) => CreatePreview | null;
-		createText?: string;
-		createShortcut?: string;
-	}
-
-	let {
-		open = $bindable(),
-		onClose,
-		onSearch,
-		onSelect,
-		quickActions = [],
-		placeholder = 'Suchen...',
-		emptyText = 'Keine Ergebnisse gefunden',
-		searchingText = 'Suche...',
-		onCreate,
-		onParseCreate,
-		createText = 'Als Eintrag erstellen',
-		createShortcut = '⌘↵',
-	}: Props = $props();
-
-	let searchQuery = $state('');
-	let results = $state<CommandBarItem[]>([]);
-	let loading = $state(false);
-	let creating = $state(false);
-	let selectedIndex = $state(0);
-	let searchTimeout: ReturnType<typeof setTimeout>;
-	let inputElement = $state<HTMLInputElement | null>(null);
-
-	// Computed create preview
-	let createPreview = $derived(
-		searchQuery.trim() && onParseCreate ? onParseCreate(searchQuery) : null
-	);
-
-	// Highlighted text for overlay
-	let highlightedQuery = $derived(highlightText(searchQuery, HIGHLIGHT_PATTERNS));
-
-	// Check if create option is selected (it's always first when available)
-	let isCreateSelected = $derived(selectedIndex === 0 && createPreview !== null);
-
-	// Reset state when modal opens
-	$effect(() => {
-		if (open) {
-			searchQuery = '';
-			results = [];
-			selectedIndex = 0;
-			creating = false;
-			setTimeout(() => inputElement?.focus(), 50);
-		}
-	});
-
-	async function handleSearch() {
-		clearTimeout(searchTimeout);
-
-		if (!searchQuery.trim()) {
-			results = [];
-			loading = false;
-			return;
-		}
-
-		loading = true;
-
-		searchTimeout = setTimeout(async () => {
-			try {
-				results = await onSearch(searchQuery);
-				selectedIndex = 0;
-			} catch (e) {
-				console.error('Search error:', e);
-				results = [];
-			} finally {
-				loading = false;
-			}
-		}, SEARCH_DEBOUNCE_MS);
-	}
-
-	async function handleCreate() {
-		if (!onCreate || !searchQuery.trim() || creating) return;
-
-		creating = true;
-		try {
-			await onCreate(searchQuery);
-			onClose();
-		} catch (error) {
-			console.error('Create error:', error);
-		} finally {
-			creating = false;
-		}
-	}
-
-	function handleKeydown(event: KeyboardEvent) {
-		if (event.key === 'Escape') {
-			event.preventDefault();
-			onClose();
-			return;
-		}
-
-		// Cmd/Ctrl+Enter to create directly
-		if (event.key === 'Enter' && (event.metaKey || event.ctrlKey)) {
-			event.preventDefault();
-			if (onCreate && searchQuery.trim()) {
-				handleCreate();
-			}
-			return;
-		}
-
-		if (event.key === 'ArrowDown') {
-			event.preventDefault();
-			// Calculate max index including create option
-			const hasCreate = createPreview !== null;
-			const maxIndex = searchQuery.trim()
-				? (hasCreate ? 1 : 0) + results.length - 1
-				: quickActions.length - 1;
-			selectedIndex = Math.min(selectedIndex + 1, Math.max(0, maxIndex));
-			return;
-		}
-
-		if (event.key === 'ArrowUp') {
-			event.preventDefault();
-			selectedIndex = Math.max(selectedIndex - 1, 0);
-			return;
-		}
-
-		if (event.key === 'Enter') {
-			event.preventDefault();
-			if (searchQuery.trim()) {
-				// If create option is selected
-				if (isCreateSelected && onCreate) {
-					handleCreate();
-				} else if (results.length > 0) {
-					// Adjust index for results (subtract 1 if create option exists)
-					const resultIndex = createPreview !== null ? selectedIndex - 1 : selectedIndex;
-					if (resultIndex >= 0 && resultIndex < results.length) {
-						selectItem(results[resultIndex]);
-					}
-				}
-			} else if (!searchQuery.trim() && quickActions.length > 0) {
-				const action = quickActions[selectedIndex];
-				if (action.href) {
-					goto(action.href);
-					onClose();
-				} else if (action.onclick) {
-					action.onclick();
-					onClose();
-				}
-			}
-			return;
-		}
-	}
-
-	function selectItem(item: CommandBarItem) {
-		onSelect(item);
-		onClose();
-	}
-
-	function getInitials(item: CommandBarItem): string {
-		const parts = item.title.split(' ');
-		if (parts.length >= 2) {
-			return (parts[0][0] + parts[1][0]).toUpperCase();
-		}
-		return item.title.substring(0, 2).toUpperCase();
-	}
-
-	function handleBackdropClick(e: MouseEvent) {
-		if (e.target === e.currentTarget) {
-			onClose();
-		}
-	}
-
-	function handleQuickAction(action: QuickAction) {
-		if (action.href) {
-			goto(action.href);
-		} else if (action.onclick) {
-			action.onclick();
-		}
-		onClose();
-	}
-</script>
-
-{#if open}
-	<!-- svelte-ignore a11y_no_noninteractive_element_interactions -->
-	<div
-		class="command-backdrop"
-		role="dialog"
-		aria-modal="true"
-		aria-label="Suchen"
-		tabindex="-1"
-		onclick={handleBackdropClick}
-		onkeydown={handleKeydown}
-	>
-		<div class="command-modal">
-			<!-- Search Input with Syntax Highlighting -->
-			<div class="command-input-wrapper">
-				<MagnifyingGlass size={20} class="command-icon" />
-				<div class="input-highlight-container">
-					<!-- Highlight backdrop (shows colored keywords) -->
-					<div class="input-highlight-backdrop" aria-hidden="true">
-						{@html highlightedQuery}&nbsp;
-					</div>
-					<!-- Actual input (transparent text, visible caret) -->
-					<input
-						bind:this={inputElement}
-						type="text"
-						{placeholder}
-						bind:value={searchQuery}
-						oninput={handleSearch}
-						class="command-input"
-					/>
-				</div>
-				<kbd class="command-shortcut">ESC</kbd>
-			</div>
-
-			<!-- Results -->
-			{#if searchQuery.trim()}
-				<div class="command-results">
-					<!-- Create option (always first when available) -->
-					{#if createPreview && onCreate}
-						<button
-							type="button"
-							class="command-result create-option"
-							class:selected={selectedIndex === 0}
-							onclick={handleCreate}
-							onmouseenter={() => (selectedIndex = 0)}
-							disabled={creating}
-						>
-							<div class="result-avatar create-avatar">
-								{#if creating}
-									<div class="loading-spinner-small"></div>
-								{:else}
-									<Plus size={20} />
-								{/if}
-							</div>
-							<div class="result-info">
-								<div class="result-name">{createPreview.title}</div>
-								{#if createPreview.subtitle}
-									<div class="result-details">
-										<span>{createPreview.subtitle}</span>
-									</div>
-								{/if}
-							</div>
-							<kbd class="create-shortcut">{createShortcut}</kbd>
-						</button>
-					{/if}
-
-					{#if loading}
-						<div class="command-loading">
-							<div class="loading-spinner"></div>
-							<span>{searchingText}</span>
-						</div>
-					{:else if results.length === 0 && !createPreview}
-						<div class="command-empty">
-							<span>{emptyText}</span>
-						</div>
-					{:else if results.length > 0}
-						<div class="results-divider">
-							<span>Suchergebnisse</span>
-						</div>
-						{#each results as item, index (item.id)}
-							{@const adjustedIndex = createPreview ? index + 1 : index}
-							<button
-								type="button"
-								class="command-result"
-								class:selected={adjustedIndex === selectedIndex}
-								onclick={() => selectItem(item)}
-								onmouseenter={() => (selectedIndex = adjustedIndex)}
-							>
-								<div class="result-avatar">
-									{#if item.imageUrl}
-										<img
-											src={item.imageUrl}
-											alt={item.title}
-											class="w-full h-full rounded-full object-cover"
-										/>
-									{:else}
-										{getInitials(item)}
-									{/if}
-								</div>
-								<div class="result-info">
-									<div class="result-name">{item.title}</div>
-									{#if item.subtitle}
-										<div class="result-details">
-											<span>{item.subtitle}</span>
-										</div>
-									{/if}
-								</div>
-								{#if item.isFavorite}
-									<Heart size={20} weight="fill" class="result-favorite" />
-								{/if}
-							</button>
-						{/each}
-					{/if}
-				</div>
-			{:else if quickActions.length > 0}
-				<!-- Quick Actions when no search -->
-				<div class="quick-actions-list">
-					{#each quickActions as action, index (action.id)}
-						<button
-							type="button"
-							class="quick-action"
-							class:selected={index === selectedIndex}
-							onclick={() => handleQuickAction(action)}
-							onmouseenter={() => (selectedIndex = index)}
-						>
-							<Plus size={20} class="quick-action-icon" />
-							<span>{action.label}</span>
-							{#if action.shortcut}
-								<kbd>{action.shortcut}</kbd>
-							{/if}
-						</button>
-					{/each}
-				</div>
-			{/if}
-
-			<!-- Footer -->
-			<div class="command-footer">
-				<div class="footer-hints">
-					<span><kbd>↑↓</kbd> Navigation</span>
-					<span><kbd>↵</kbd> Öffnen</span>
-					{#if onCreate}
-						<span><kbd>{createShortcut}</kbd> Erstellen</span>
-					{/if}
-					<span><kbd>ESC</kbd> Schließen</span>
-				</div>
-			</div>
-		</div>
-	</div>
-{/if}
-
-<style>
-	.command-backdrop {
-		position: fixed;
-		inset: 0;
-		z-index: 100;
-		display: flex;
-		align-items: flex-start;
-		justify-content: center;
-		padding-top: 15vh;
-		background: hsl(var(--color-background) / 0.8);
-		backdrop-filter: blur(8px);
-		-webkit-backdrop-filter: blur(8px);
-		animation: fadeIn 0.15s ease;
-	}
-
-	@keyframes fadeIn {
-		from {
-			opacity: 0;
-		}
-		to {
-			opacity: 1;
-		}
-	}
-
-	.command-modal {
-		width: 100%;
-		max-width: 560px;
-		margin: 0 1rem;
-		background: hsl(var(--color-surface-elevated));
-		border: 1px solid hsl(var(--color-border));
-		border-radius: 12px;
-		box-shadow:
-			0 25px 50px -12px hsl(var(--color-background) / 0.5),
-			0 0 0 1px hsl(var(--color-border) / 0.5);
-		overflow: hidden;
-		animation: slideIn 0.2s ease;
-		color: hsl(var(--color-foreground));
-	}
-
-	@keyframes slideIn {
-		from {
-			opacity: 0;
-			transform: translateY(-10px) scale(0.98);
-		}
-		to {
-			opacity: 1;
-			transform: translateY(0) scale(1);
-		}
-	}
-
-	.command-input-wrapper {
-		display: flex;
-		align-items: center;
-		gap: 0.75rem;
-		padding: 1rem 1.25rem;
-		border-bottom: 1px solid hsl(var(--color-border));
-	}
-
-	/* Input with syntax highlighting overlay */
-	.input-highlight-container {
-		position: relative;
-		flex: 1;
-		min-width: 0;
-	}
-
-	.input-highlight-backdrop {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		font-size: 1rem;
-		font-family: inherit;
-		white-space: pre;
-		pointer-events: none;
-		color: hsl(var(--color-foreground));
-		overflow: hidden;
-	}
-
-	.command-input {
-		position: relative;
-		width: 100%;
-		border: none;
-		background: transparent;
-		font-size: 1rem;
-		font-family: inherit;
-		color: transparent;
-		caret-color: hsl(var(--color-foreground));
-		outline: none;
-		z-index: 1;
-	}
-
-	.command-input::placeholder {
-		color: hsl(var(--color-muted-foreground));
-	}
-
-	/* Syntax highlighting colors - Priority levels with matching UI colors */
-	.input-highlight-backdrop :global(.hl-priority-urgent) {
-		color: #ef4444; /* red - Dringend */
-		font-weight: 600;
-	}
-
-	.input-highlight-backdrop :global(.hl-priority-high) {
-		color: #f97316; /* orange - Wichtig */
-		font-weight: 600;
-	}
-
-	.input-highlight-backdrop :global(.hl-priority-medium) {
-		color: #eab308; /* yellow - Normal */
-		font-weight: 600;
-	}
-
-	.input-highlight-backdrop :global(.hl-priority-low) {
-		color: #22c55e; /* green - Später */
-		font-weight: 600;
-	}
-
-	.input-highlight-backdrop :global(.hl-tag) {
-		color: hsl(var(--color-primary));
-		font-weight: 500;
-	}
-
-	.input-highlight-backdrop :global(.hl-reference) {
-		color: hsl(var(--color-success));
-		font-weight: 500;
-	}
-
-	.input-highlight-backdrop :global(.hl-date) {
-		color: hsl(262 83% 58%);
-		font-weight: 500;
-	}
-
-	.input-highlight-backdrop :global(.hl-time) {
-		color: hsl(262 83% 58%);
-		font-weight: 500;
-	}
-
-	.command-shortcut {
-		padding: 0.25rem 0.5rem;
-		font-size: 0.75rem;
-		font-family: inherit;
-		background: hsl(var(--color-surface));
-		border: 1px solid hsl(var(--color-border));
-		border-radius: 4px;
-		color: hsl(var(--color-muted-foreground));
-	}
-
-	.command-results {
-		max-height: 320px;
-		overflow-y: auto;
-	}
-
-	.command-loading,
-	.command-empty {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		gap: 0.75rem;
-		padding: 2rem;
-		color: hsl(var(--color-muted-foreground));
-		font-size: 0.875rem;
-	}
-
-	.loading-spinner {
-		width: 1.25rem;
-		height: 1.25rem;
-		border: 2px solid hsl(var(--color-border));
-		border-top-color: hsl(var(--color-primary));
-		border-radius: 50%;
-		animation: spin 0.8s linear infinite;
-	}
-
-	.loading-spinner-small {
-		width: 1rem;
-		height: 1rem;
-		border: 2px solid hsl(var(--color-border));
-		border-top-color: hsl(var(--color-success));
-		border-radius: 50%;
-		animation: spin 0.8s linear infinite;
-	}
-
-	@keyframes spin {
-		to {
-			transform: rotate(360deg);
-		}
-	}
-
-	/* Create option styles */
-	.create-option {
-		border-bottom: 1px solid hsl(var(--color-border));
-	}
-
-	.create-option.selected,
-	.create-option:hover {
-		background: hsl(var(--color-success) / 0.1);
-	}
-
-	.create-avatar {
-		background: hsl(var(--color-success));
-	}
-
-	.create-shortcut {
-		padding: 0.25rem 0.5rem;
-		font-size: 0.6875rem;
-		font-family: inherit;
-		background: hsl(var(--color-surface));
-		border: 1px solid hsl(var(--color-border));
-		border-radius: 4px;
-		color: hsl(var(--color-muted-foreground));
-		flex-shrink: 0;
-	}
-
-	.results-divider {
-		padding: 0.5rem 1.25rem 0.25rem;
-		font-size: 0.6875rem;
-		font-weight: 500;
-		text-transform: uppercase;
-		letter-spacing: 0.05em;
-		color: hsl(var(--color-muted-foreground));
-	}
-
-	.command-result {
-		display: flex;
-		align-items: center;
-		gap: 0.75rem;
-		width: 100%;
-		padding: 0.75rem 1.25rem;
-		background: transparent;
-		border: none;
-		cursor: pointer;
-		text-align: left;
-		transition: background 0.1s ease;
-		color: hsl(var(--color-foreground));
-	}
-
-	.command-result:hover,
-	.command-result.selected {
-		background: hsl(var(--color-surface-hover));
-	}
-
-	.result-avatar {
-		width: 40px;
-		height: 40px;
-		min-width: 40px;
-		border-radius: 9999px;
-		background: hsl(var(--color-primary));
-		color: hsl(var(--color-primary-foreground));
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-weight: 600;
-		font-size: 0.875rem;
-	}
-
-	.result-info {
-		flex: 1;
-		min-width: 0;
-	}
-
-	.result-name {
-		font-weight: 500;
-		color: hsl(var(--color-foreground));
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.result-details {
-		display: flex;
-		gap: 0.5rem;
-		font-size: 0.8125rem;
-		color: hsl(var(--color-muted-foreground));
-	}
-
-	.result-details span {
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.quick-actions-list {
-		padding: 0.5rem;
-	}
-
-	.quick-action {
-		display: flex;
-		align-items: center;
-		gap: 0.75rem;
-		width: 100%;
-		padding: 0.75rem 1rem;
-		border-radius: 8px;
-		color: hsl(var(--color-foreground));
-		background: transparent;
-		border: none;
-		cursor: pointer;
-		text-align: left;
-		transition: background 0.1s ease;
-	}
-
-	.quick-action:hover,
-	.quick-action.selected {
-		background: hsl(var(--color-surface-hover));
-	}
-
-	.quick-action span {
-		flex: 1;
-		font-size: 0.9375rem;
-	}
-
-	.quick-action kbd {
-		padding: 0.125rem 0.375rem;
-		font-size: 0.6875rem;
-		font-family: inherit;
-		background: hsl(var(--color-surface));
-		border: 1px solid hsl(var(--color-border));
-		border-radius: 4px;
-		color: hsl(var(--color-muted-foreground));
-	}
-
-	.command-footer {
-		padding: 0.75rem 1.25rem;
-		border-top: 1px solid hsl(var(--color-border));
-		background: hsl(var(--color-surface));
-	}
-
-	.footer-hints {
-		display: flex;
-		gap: 1rem;
-		font-size: 0.75rem;
-		color: hsl(var(--color-muted-foreground));
-	}
-
-	.footer-hints kbd {
-		padding: 0.125rem 0.25rem;
-		font-family: inherit;
-		background: hsl(var(--color-surface-elevated));
-		border: 1px solid hsl(var(--color-border));
-		border-radius: 3px;
-		margin-right: 0.25rem;
-	}
-
-	@media (max-width: 640px) {
-		.command-backdrop {
-			padding-top: 5vh;
-		}
-
-		.footer-hints {
-			flex-wrap: wrap;
-			gap: 0.5rem;
-		}
-	}
-</style>
diff --git a/packages/shared-ui/src/command-bar/CommandBar.types.ts b/packages/shared-ui/src/command-bar/CommandBar.types.ts
deleted file mode 100644
index d24d9bb5d..000000000
--- a/packages/shared-ui/src/command-bar/CommandBar.types.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export interface CommandBarItem {
-	id: string;
-	title: string;
-	subtitle?: string;
-	icon?: string;
-	imageUrl?: string;
-	isFavorite?: boolean;
-}
-
-export interface QuickAction {
-	id: string;
-	label: string;
-	href?: string;
-	icon: string;
-	shortcut?: string;
-	onclick?: () => void;
-}
-
-export interface CreatePreview {
-	title: string;
-	subtitle: string;
-}
diff --git a/packages/shared-ui/src/command-bar/index.ts b/packages/shared-ui/src/command-bar/index.ts
deleted file mode 100644
index 257f9feb5..000000000
--- a/packages/shared-ui/src/command-bar/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as CommandBar } from './CommandBar.svelte';
-export type { CommandBarItem, QuickAction, CreatePreview } from './CommandBar.types';
diff --git a/packages/shared-ui/src/index.ts b/packages/shared-ui/src/index.ts
index 7abfb218b..38a03b227 100644
--- a/packages/shared-ui/src/index.ts
+++ b/packages/shared-ui/src/index.ts
@@ -159,10 +159,6 @@ export {
 	GlobalSettingsSection,
 } from './settings';
 
-// Command Bar (deprecated - use QuickInputBar)
-export { CommandBar } from './command-bar';
-export type { CommandBarItem } from './command-bar';
-
 // Input Bar
 export {
 	InputBar,
diff --git a/packages/shared-ui/src/search-core/highlight.ts b/packages/shared-ui/src/search-core/highlight.ts
index e7f3142d2..ac0ed693d 100644
--- a/packages/shared-ui/src/search-core/highlight.ts
+++ b/packages/shared-ui/src/search-core/highlight.ts
@@ -1,6 +1,6 @@
 /**
  * Syntax-highlight patterns for search/command input surfaces
- * (QuickInputBar, CommandBar). Patterns are locale-aware for date/priority
+ * (QuickInputBar, GlobalSpotlight). Patterns are locale-aware for date/priority
  * keywords; universal patterns (tags, @references, times) apply to every locale.
  */