diff --git a/src/lib/components/templates/index.ts b/src/lib/components/templates/index.ts
new file mode 100644
index 0000000..c383777
--- /dev/null
+++ b/src/lib/components/templates/index.ts
@@ -0,0 +1,3 @@
+import LanguageSwitch from "./language-switch.svelte";
+
+export { LanguageSwitch };
diff --git a/src/lib/components/templates/language-switch.svelte b/src/lib/components/templates/language-switch.svelte
new file mode 100644
index 0000000..a82e6dd
--- /dev/null
+++ b/src/lib/components/templates/language-switch.svelte
@@ -0,0 +1,23 @@
+<script lang="ts">
+	import { m } from "$i18n/messages.js";
+	import { getLocale, setLocale } from "$i18n/runtime.js";
+	import { ComboBox } from "$lib/components/ui/combobox";
+</script>
+
+<div>
+	<ComboBox
+		options={[
+			{ label: "Deutsch", value: "de", keywords: ["german", "deutsch"] },
+			{ label: "English", value: "en", keywords: ["english"] }
+		]}
+		value={getLocale()}
+		onChange={(value) => {
+			setLocale(value as "de" | "en");
+		}}
+		labels={{
+			placeholder: m["i18n.label"](),
+			search: m["i18n.search"](),
+			notFound: m["i18n.notFound"]()
+		}}
+	/>
+</div>
diff --git a/src/lib/components/ui/combobox/combobox.svelte b/src/lib/components/ui/combobox/combobox.svelte
index 57a91a8..e95177b 100644
--- a/src/lib/components/ui/combobox/combobox.svelte
+++ b/src/lib/components/ui/combobox/combobox.svelte
@@ -20,7 +20,7 @@
 		};
 		value: string;
 		onChange: (value: string) => void;
-		options?: { label: string; value: string }[];
+		options?: { label: string; value: string; keywords?: string[] }[];
 	} = $props();
 
 	let open = $state(false);
@@ -53,13 +53,14 @@
 	</Popover.Trigger>
 	<Popover.Content class="w-[200px] p-0">
 		<Command.Root>
-			<Command.Input placeholder={labels.search} />
+			<Command.Input autofocus placeholder={labels.search} />
 			<Command.List>
 				<Command.Empty>{labels.notFound}</Command.Empty>
 				<Command.Group>
 					{#each options as option (option.value)}
 						<Command.Item
 							value={option.value}
+							keywords={option.keywords}
 							onSelect={() => {
 								onChange(option.value);
 								closeAndFocusTrigger();
diff --git a/src/routes/+layout.svelte b/src/routes/(pages)/+layout.svelte
similarity index 95%
rename from src/routes/+layout.svelte
rename to src/routes/(pages)/+layout.svelte
index 9780038..4b048da 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/(pages)/+layout.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { browser } from "$app/environment";
-	import "../app.css";
+	import "../../app.css";
 	import { ModeWatcher, setMode } from "mode-watcher";
 
 	$effect(() => {
diff --git a/src/routes/(pages)/+layout.ts b/src/routes/(pages)/+layout.ts
new file mode 100644
index 0000000..d43d0cd
--- /dev/null
+++ b/src/routes/(pages)/+layout.ts
@@ -0,0 +1 @@
+export const prerender = false;
diff --git a/src/routes/+page.server.ts b/src/routes/(pages)/+page.server.ts
similarity index 100%
rename from src/routes/+page.server.ts
rename to src/routes/(pages)/+page.server.ts
diff --git a/src/routes/+page.svelte b/src/routes/(pages)/+page.svelte
similarity index 60%
rename from src/routes/+page.svelte
rename to src/routes/(pages)/+page.svelte
index e7a0de3..5cb8e51 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/(pages)/+page.svelte
@@ -1,9 +1,8 @@
 <script lang="ts">
+	import { m } from "$i18n/messages.js";
+	import LanguageSwitch from "$lib/components/templates/language-switch.svelte";
 	import { HorizontalPagePadding, PageWithClaim } from "$lib/components/ui/page";
 	import { Headline, Text } from "$lib/components/ui/typography";
-	import { m } from "$i18n/messages.js";
-	import { ComboBox } from "$lib/components/ui/combobox";
-	import { getLocale, setLocale } from "$i18n/runtime.js";
 
 	export let data;
 </script>
@@ -25,21 +24,7 @@
 				{/await}.
 			</Text>
 
-			<ComboBox
-				options={[
-					{ value: "de", label: "Deutsch" },
-					{ value: "en", label: "English" }
-				]}
-				value={getLocale()}
-				onChange={(value) => {
-					setLocale(value as "de" | "en");
-				}}
-				labels={{
-					placeholder: m["i18n.label"](),
-					search: m["i18n.search"](),
-					notFound: m["i18n.notFound"]()
-				}}
-			/>
+			<LanguageSwitch />
 		</HorizontalPagePadding>
 	</main>
 </PageWithClaim>
diff --git a/src/routes/page.svelte.test.ts b/src/routes/(pages)/page.svelte.test.ts
similarity index 100%
rename from src/routes/page.svelte.test.ts
rename to src/routes/(pages)/page.svelte.test.ts
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
deleted file mode 100644
index 189f71e..0000000
--- a/src/routes/+layout.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const prerender = true;