diff --git a/tank-frontend/src/App.tsx b/tank-frontend/src/App.tsx
index fadde1b..b805877 100644
--- a/tank-frontend/src/App.tsx
+++ b/tank-frontend/src/App.tsx
@@ -9,39 +9,37 @@ import Row from './components/Row.tsx';
 import Scoreboard from './Scoreboard.tsx';
 import Button from './components/Button.tsx';
 import MapChooser from './MapChooser.tsx';
-import {getRandomTheme, RgbaThemeProvider, ThemeContext, useStoredTheme} from './theme.tsx';
+import {ThemeProvider} from './theme.tsx';
 import './App.css';
+import ThemeChooser from './ThemeChooser.tsx';
 
 export default function App() {
-    const [theme, setTheme] = useStoredTheme();
     const [name, setName] = useState<string | null>(null);
 
-    return <ThemeContext.Provider value={theme}>
-        <RgbaThemeProvider>
-            <Column className="flex-grow">
+    return <ThemeProvider>
+        <Column className="flex-grow">
 
-                <ClientScreen player={name}/>
+            <ClientScreen player={name}/>
 
-                <Row>
-                    <h1 className="flex-grow">CCCB-Tanks!</h1>
-                    <MapChooser/>
-                    <Button text="☼ change colors" onClick={() => setTheme(_ => getRandomTheme())}/>
-                    <Button
-                        onClick={() => window.open('https://github.com/kaesaecracker/cccb-tanks-cs', '_blank')?.focus()}
-                        text="⌂ source"/>
-                    {name !== '' &&
-                        <Button onClick={() => setName(_ => '')} text="∩ logout"/>}
-                </Row>
+            <Row>
+                <h1 className="flex-grow">CCCB-Tanks!</h1>
+                <MapChooser/>
+                <ThemeChooser/>
+                <Button
+                    onClick={() => window.open('https://github.com/kaesaecracker/cccb-tanks-cs', '_blank')?.focus()}
+                    text="⌂ source"/>
+                {name !== '' &&
+                    <Button onClick={() => setName(_ => '')} text="∩ logout"/>}
+            </Row>
 
-                {name || <JoinForm onDone={name => setName(_ => name)}/>}
+            {name || <JoinForm onDone={name => setName(_ => name)}/>}
 
-                <Row className="GadgetRows">
-                    {name && <Controls player={name}/>}
-                    {name && <PlayerInfo player={name}/>}
-                    <Scoreboard/>
-                </Row>
+            <Row className="GadgetRows">
+                {name && <Controls player={name}/>}
+                {name && <PlayerInfo player={name}/>}
+                <Scoreboard/>
+            </Row>
 
-            </Column>
-        </RgbaThemeProvider>
-    </ThemeContext.Provider>;
+        </Column>
+    </ThemeProvider>;
 }
diff --git a/tank-frontend/src/ThemeChooser.tsx b/tank-frontend/src/ThemeChooser.tsx
new file mode 100644
index 0000000..baa5bcb
--- /dev/null
+++ b/tank-frontend/src/ThemeChooser.tsx
@@ -0,0 +1,11 @@
+import Button from './components/Button.tsx';
+import {getRandomTheme, useHslTheme} from './theme.tsx';
+
+export default function ThemeChooser({}: {}) {
+    const {setHslTheme} = useHslTheme();
+    return <>
+        <Button
+            text="☼ change colors"
+            onClick={() => setHslTheme(_ => getRandomTheme())}/>
+    </>;
+}
diff --git a/tank-frontend/src/components/PixelGridCanvas.tsx b/tank-frontend/src/components/PixelGridCanvas.tsx
index 5289adc..cf8eb68 100644
--- a/tank-frontend/src/components/PixelGridCanvas.tsx
+++ b/tank-frontend/src/components/PixelGridCanvas.tsx
@@ -1,6 +1,6 @@
 import {useEffect, useRef} from 'react';
 import './PixelGridCanvas.css';
-import {useRgbaThemeContext} from '../theme.tsx';
+import {useRgbaTheme} from '../theme.tsx';
 
 const pixelsPerRow = 352;
 const pixelsPerCol = 160;
@@ -101,7 +101,7 @@ function drawPixelsToCanvas(
 export default function PixelGridCanvas({pixels}: {
     readonly pixels: Uint8ClampedArray;
 }) {
-    const theme = useRgbaThemeContext();
+    const theme = useRgbaTheme();
     const canvasRef = useRef<HTMLCanvasElement>(null);
 
     useEffect(() => {
diff --git a/tank-frontend/src/theme.tsx b/tank-frontend/src/theme.tsx
index 619da47..0f3f8df 100644
--- a/tank-frontend/src/theme.tsx
+++ b/tank-frontend/src/theme.tsx
@@ -1,13 +1,13 @@
 import {useStoredObjectState} from './useStoredState.ts';
 import {createContext, ReactNode, useContext, useEffect, useRef, useState} from 'react';
 
-export type HSL = {
+type HSL = {
     h: number;
     s: number;
     l: number;
 }
 
-export type Theme = {
+export type HslTheme = {
     primary: HSL;
     secondary: HSL;
     background: HSL;
@@ -44,7 +44,7 @@ function getRandomHsl(params: {
     return {h, s, l};
 }
 
-export function hslToString({h, s, l}: HSL) {
+function hslToString({h, s, l}: HSL) {
     return `hsl(${h},${s}%,${l}%)`;
 }
 
@@ -52,7 +52,7 @@ function angle(a: number) {
     return ((a % 360.0) + 360) % 360;
 }
 
-export function getRandomTheme(): Theme {
+export function getRandomTheme(): HslTheme {
     const goldenAngle = 180 * (3 - Math.sqrt(5));
 
     const background = getRandomHsl({maxSaturation: 50, minLightness: 10, maxLightness: 30});
@@ -76,22 +76,13 @@ export function getRandomTheme(): Theme {
     return {background, primary, secondary, tertiary};
 }
 
-function applyTheme(theme: Theme) {
+function applyTheme(theme: HslTheme) {
     console.log('apply theme', theme);
     rootStyle.setProperty('--color-primary', hslToString(theme.primary));
     rootStyle.setProperty('--color-secondary', hslToString(theme.secondary));
     rootStyle.setProperty('--color-background', hslToString(theme.background));
 }
 
-export function useStoredTheme() {
-    return useStoredObjectState<Theme>('theme', getRandomTheme, {
-        load: applyTheme,
-        save: applyTheme
-    });
-}
-
-export const ThemeContext = createContext<Theme>(getRandomTheme());
-
 type Rgba = Uint8ClampedArray;
 
 export type RgbaTheme = {
@@ -108,20 +99,40 @@ const dummyRgbaTheme: RgbaTheme = {
     tertiary: new Uint8ClampedArray([0, 0, 0, 0])
 };
 
-const RgbaThemeContext = createContext<RgbaTheme>(dummyRgbaTheme);
-
-function normalizeColor(context: CanvasRenderingContext2D, color: HSL) {
+function hslToRgba(context: CanvasRenderingContext2D, color: HSL) {
     context.fillStyle = hslToString(color);
     context.fillRect(0, 0, 1, 1);
     return context.getImageData(0, 0, 1, 1).data;
 }
 
-export function useRgbaThemeContext() {
+
+const HslThemeContext = createContext<null | {
+    hslTheme: HslTheme,
+    setHslTheme: (mutator: (oldState: HslTheme) => HslTheme) => void
+}>(null);
+const RgbaThemeContext = createContext<RgbaTheme>(dummyRgbaTheme);
+
+export function useRgbaTheme() {
     return useContext(RgbaThemeContext);
 }
 
-export function RgbaThemeProvider({children}: { children: ReactNode }) {
-    const hslTheme = useContext(ThemeContext);
+export function useHslTheme() {
+    const context = useContext(HslThemeContext);
+    if (context === null) {
+        throw new Error();
+    }
+
+    return context;
+}
+
+export function ThemeProvider({children}: {
+    children?: ReactNode;
+}) {
+    const [hslTheme, setHslTheme] = useStoredObjectState<HslTheme>('theme', getRandomTheme, {
+        load: applyTheme,
+        save: applyTheme
+    });
+
     const [rgbaTheme, setRgbaTheme] = useState<RgbaTheme | null>(null);
     const canvasRef = useRef<HTMLCanvasElement>(null);
 
@@ -139,15 +150,17 @@ export function RgbaThemeProvider({children}: { children: ReactNode }) {
             throw new Error('could not get draw context');
 
         setRgbaTheme({
-            background: normalizeColor(drawContext, hslTheme.background),
-            primary: normalizeColor(drawContext, hslTheme.primary),
-            secondary: normalizeColor(drawContext, hslTheme.secondary),
-            tertiary: normalizeColor(drawContext, hslTheme.tertiary),
+            background: hslToRgba(drawContext, hslTheme.background),
+            primary: hslToRgba(drawContext, hslTheme.primary),
+            secondary: hslToRgba(drawContext, hslTheme.secondary),
+            tertiary: hslToRgba(drawContext, hslTheme.tertiary),
         });
     }, [hslTheme, canvasRef.current]);
 
-    return <RgbaThemeContext.Provider value={rgbaTheme || dummyRgbaTheme}>
-        <canvas hidden={true} ref={canvasRef}/>
-        {children}
-    </RgbaThemeContext.Provider>;
+    return <HslThemeContext.Provider value={{hslTheme, setHslTheme}}>
+        <RgbaThemeContext.Provider value={rgbaTheme || dummyRgbaTheme}>
+            <canvas hidden={true} ref={canvasRef}/>
+            {children}
+        </RgbaThemeContext.Provider>;
+    </HslThemeContext.Provider>;
 }