diff --git a/app.config.ts b/app.config.ts
index 329c488..d5e271a 100644
--- a/app.config.ts
+++ b/app.config.ts
@@ -23,6 +23,11 @@ export default defineConfig({
                     navigateFallback: 'index.html',
                 },
             }),
-        ]
-    }
+        ],
+    },
+    solid: {
+        babel: {
+            compact: true,
+        },
+    },
 });
diff --git a/src/app.css b/src/app.css
index b232fd7..4ece343 100644
--- a/src/app.css
+++ b/src/app.css
@@ -1,22 +1,22 @@
 @import url("https://fonts.googleapis.com/css2?family=Roboto+Flex:opsz,wght,GRAD@8..144,400,45;8..144,400,50;8..144,1000,0&family=Roboto+Serif:opsz,GRAD@8..144,71&display=swap");
 
 :root {
-  --surface-1: #ddd;
-  --surface-2: #e8e8e8;
-  --surface-3: #eee;
-  --surface-4: #f8f8f8;
-  --surface-5: #fff;
-  --text-1: #222;
-  --text-2: #282828;
-  --primary: #41c6b3;
+  --surface-1: light-dark(#ddd, #222);
+  --surface-2: light-dark(#e8e8e8, #282828);
+  --surface-3: light-dark(#eee, #333);
+  --surface-4: light-dark(#f8f8f8, #383838);
+  --surface-5: light-dark(#fff, #444);
+  --text-1: light-dark(#222, #eee);
+  --text-2: light-dark(#282828, #d8d8d8);
+  --primary: light-dark(#41c6b3, #6be8d6);
 
   color: var(--text-1);
   accent-color: var(--primary);
 
-  --info: oklch(.71 .17 249);
-  --fail: oklch(.64 .21 25.3);
-  --warn: oklch(.82 .18 78.9);
-  --succ: oklch(.86 .28 150);
+  --info: light-dark(oklch(.71 .17 249), oklch(.71 .17 249));
+  --fail: light-dark(oklch(.64 .21 25.3), oklch(.64 .21 25.3));
+  --warn: light-dark(oklch(.82 .18 78.9), oklch(.82 .18 78.9));
+  --succ: light-dark(oklch(.86 .28 150), oklch(.86 .28 150));
 
   --radii-s: .125em;
   --radii-m: .25em;
@@ -33,25 +33,6 @@
   --padding-l: 1em;
 }
 
-@media (prefers-color-scheme: dark) {
-  :root {
-    --surface-1: #222;
-    --surface-2: #282828;
-    --surface-3: #333;
-    --surface-4: #383838;
-    --surface-5: #444;
-    --text-1: #eee;
-    --text-2: #d8d8d8;
-
-    --primary: #6be8d6;
-
-    --info: oklch(.71 .17 249);
-    --fail: oklch(.64 .21 25.3);
-    --warn: oklch(.82 .18 78.9);
-    --succ: oklch(.86 .28 150);
-  }
-}
-
 html {
   inline-size: 100%;
   block-size: 100%;
@@ -80,40 +61,6 @@ body {
       outline: 1px solid var(--info);
     }
   }
-
-  & .menu-root {
-    display: grid;
-    grid-auto-flow: column;
-    justify-content: start;
-    position: relative;
-    z-index: 10;
-
-    gap: .5em;
-    padding-inline-start: 1em;
-    block-size: 2em;
-
-    background-color: var(--surface-3);
-    color: var(--text-1);
-
-    & > .logo {
-      inline-size: 3em;
-      block-size: 3em;
-      padding: .75em;
-      margin-block-end: -1em;
-      background-color: inherit;
-      color: inherit;
-      border-radius: .25em;
-
-      & > svg {
-        inline-size: 100%;
-        block-size: 100%;
-      }
-    }
-
-    & > div {
-      display: contents;
-    }
-  }
 }
 
 a {
diff --git a/src/components/colorschemepicker.module.css b/src/components/colorschemepicker.module.css
new file mode 100644
index 0000000..f9af56f
--- /dev/null
+++ b/src/components/colorschemepicker.module.css
@@ -0,0 +1,4 @@
+.picker {
+    border: none;
+    background-color: var(--surface-3);
+}
\ No newline at end of file
diff --git a/src/components/colorschemepicker.tsx b/src/components/colorschemepicker.tsx
new file mode 100644
index 0000000..66ff9ee
--- /dev/null
+++ b/src/components/colorschemepicker.tsx
@@ -0,0 +1,43 @@
+import { Accessor, Component, createEffect, createSignal, For, Setter } from "solid-js";
+import css from './colorschemepicker.module.css';
+
+export enum ColorScheme {
+    Auto = 'light dark',
+    Light = 'light',
+    Dark = 'dark',
+}
+
+const colorSchemeEntries = [
+    [ColorScheme.Auto, 'Auto'],
+    [ColorScheme.Light, 'Light'],
+    [ColorScheme.Dark, 'Dark'],
+] as const;
+
+interface ColorSchemePickerProps {
+    value?: Setter<ColorScheme> | [Accessor<ColorScheme>, Setter<ColorScheme>];
+}
+
+export const ColorSchemePicker: Component<ColorSchemePickerProps> = (props) => {
+    const [value, setValue] = createSignal<ColorScheme>(ColorScheme.Auto);
+
+    createEffect(() => {
+        const currentValue = value();
+        const setter = props.value instanceof Array ? props.value[1] : props.value;
+
+        if (!setter) {
+            return;
+        }
+
+        setter(currentValue);
+    });
+
+    return <select class={css.picker} name="color-scheme-picker" value={value()} onInput={(e) => {
+        if (e.target.value !== value()) {
+            setValue(e.target.value as any);
+        }
+    }}>
+        <For each={colorSchemeEntries}>{
+            ([value, label]) => <option value={value}>{label}</option>
+        }</For>
+    </select>;
+};
\ No newline at end of file
diff --git a/src/components/tabs.module.css b/src/components/tabs.module.css
index eb97eb3..94ee47a 100644
--- a/src/components/tabs.module.css
+++ b/src/components/tabs.module.css
@@ -19,6 +19,7 @@
             color: var(--text-2);
             padding: var(--padding-m) var(--padding-l);
             border: none;
+            cursor: pointer;
 
             &.active {
                 background-color: var(--surface-3);
diff --git a/src/features/file/grid.module.css b/src/features/file/grid.module.css
index 553c24a..2f3ab9f 100644
--- a/src/features/file/grid.module.css
+++ b/src/features/file/grid.module.css
@@ -24,6 +24,15 @@
         color: var(--text-1);
         border-color: var(--text-2);
         border-radius: var(--radii-s);
+
+        &:has(::spelling-error, ::grammar-error) {
+            border-color: var(--fail);
+        }
+
+        & ::spelling-error {
+            outline: 1px solid var(--fail);
+            text-decoration: yellow underline;
+        }
     }
 
     & .cell {
diff --git a/src/features/file/grid.tsx b/src/features/file/grid.tsx
index 6a3f709..bba478e 100644
--- a/src/features/file/grid.tsx
+++ b/src/features/file/grid.tsx
@@ -218,26 +218,13 @@ const TextArea: Component<{ key: string, value: string, lang: string, oninput?:
         mutate();
     };
 
-    createEffect(() => {
-        props.value;
-
-        resize();
-    });
-
-    const observer = new MutationObserver((e) => {
-        if (element()?.isConnected) {
-            resize();
-        }
-    });
-    observer.observe(document.body, { childList: true, subtree: true });
-
     return <textarea
         ref={setElement}
         value={props.value}
         lang={props.lang}
-        placeholder={props.lang}
+        placeholder={`${props.key} in ${props.lang}`}
         name={`${props.key}:${props.lang}`}
-        spellcheck
+        spellcheck={true}
         wrap="soft"
         onkeyup={onKeyUp}
         on:keydown={e => e.stopPropagation()}
diff --git a/src/features/menu/index.module.css b/src/features/menu/index.module.css
index 864dd54..d1fb4d2 100644
--- a/src/features/menu/index.module.css
+++ b/src/features/menu/index.module.css
@@ -1,3 +1,9 @@
+.root {
+    & > div {
+        display: contents;
+    }
+}
+
 .item {
     padding: var(--padding-m) var(--padding-l);
 
diff --git a/src/features/menu/index.tsx b/src/features/menu/index.tsx
index a6bb2e5..1c0fb47 100644
--- a/src/features/menu/index.tsx
+++ b/src/features/menu/index.tsx
@@ -189,10 +189,9 @@ declare module "solid-js" {
     }
 }
 
-export const asMenuRoot = (element: Element) => {
+const Mount: Component = (props) => {
     const menu = useMenu();
 
-    const c = 'menu-root';
     const listener = (e: KeyboardEvent) => {
         const key = e.key.toLowerCase();
         const modifiers =
@@ -214,20 +213,10 @@ export const asMenuRoot = (element: Element) => {
         return false;
     };
 
-    onMount(() => {
-        element.classList.add(c);
-        document.addEventListener('keydown', listener);
-    });
-
-    onCleanup(() => {
-        element.classList.remove(c);
-        document.removeEventListener('keydown', listener);
-    });
-
-    menu.setRef(element);
+    return <div class={css.root} ref={menu.setRef} onKeyDown={listener}></div>;
 };
 
-export const Menu = { Root, Item, Separator } as const;
+export const Menu = { Mount, Root, Item, Separator } as const;
 
 export interface CommandPaletteApi {
     readonly open: Accessor<boolean>;
diff --git a/src/routes/(editor).tsx b/src/routes/(editor).tsx
index 9fabd87..933965d 100644
--- a/src/routes/(editor).tsx
+++ b/src/routes/(editor).tsx
@@ -1,17 +1,17 @@
-import { Title } from "@solidjs/meta";
-import { createSignal, ParentProps, Show } from "solid-js";
+import { Meta, Title } from "@solidjs/meta";
+import { createSignal, For, ParentProps, Show } from "solid-js";
 import { BsTranslate } from "solid-icons/bs";
 import { FilesProvider } from "~/features/file";
-import { CommandPalette, CommandPaletteApi, MenuProvider, asMenuRoot } from "~/features/menu";
+import { CommandPalette, CommandPaletteApi, Menu, MenuProvider } from "~/features/menu";
 import { isServer } from "solid-js/web";
 import { A } from "@solidjs/router";
 import { createCommand, Modifier } from "~/features/command";
+import { ColorScheme, ColorSchemePicker } from "~/components/colorschemepicker";
 import css from "./editor.module.css";
 
-asMenuRoot // prevents removal of import
-
 export default function Editor(props: ParentProps) {
     const [commandPalette, setCommandPalette] = createSignal<CommandPaletteApi>();
+    const [colorScheme, setColorScheme] = createSignal<ColorScheme>(ColorScheme.Auto);
 
     const supported = isServer || typeof window.showDirectoryPicker === 'function';
     const commands = [
@@ -22,10 +22,17 @@ export default function Editor(props: ParentProps) {
 
     return <MenuProvider commands={commands}>
         <Title>Translation-Tool</Title>
+        <Meta name="color-scheme" content={colorScheme()} />
 
         <main class={css.layout} inert={commandPalette()?.open()}>
-            <nav use:asMenuRoot>
-                <A class="logo" href="/"><BsTranslate /></A>
+            <nav class={css.menu}>
+                <A class={css.logo} href="/"><BsTranslate /></A>
+
+                <Menu.Mount />
+
+                <section class={css.right}>
+                    <ColorSchemePicker value={[colorScheme, setColorScheme]} />
+                </section>
             </nav>
 
             <Show when={supported} fallback={<span>too bad, so sad. Your browser does not support the File Access API</span>}>
diff --git a/src/routes/editor.module.css b/src/routes/editor.module.css
index eb524e0..e3b9f8b 100644
--- a/src/routes/editor.module.css
+++ b/src/routes/editor.module.css
@@ -5,4 +5,40 @@
     block-size: 100%;
     overflow: clip;
     background-color: var(--surface-1);
+
+    .menu {
+        display: grid;
+        grid-template-columns: auto minmax(0, 1fr) auto;
+        grid-auto-flow: column;
+        justify-content: start;
+        position: relative;
+        z-index: 10;
+
+        gap: .5em;
+        padding-inline: 1em;
+        block-size: 2em;
+
+        background-color: var(--surface-3);
+        color: var(--text-1);
+
+        & > .logo {
+            inline-size: 3em;
+            block-size: 3em;
+            padding: .75em;
+            margin-block-end: -1em;
+            background-color: inherit;
+            color: inherit;
+            border-radius: .25em;
+
+            & > svg {
+                inline-size: 100%;
+                block-size: 100%;
+            }
+        }
+
+        & .right {
+            display: grid;
+            align-content: center;
+        }
+    }
 }
\ No newline at end of file