@@ -1,4 +1,4 @@
1-import { useEffect, useMemo, useRef, useState } from "react";
1+import { useEffect, useRef, useState } from "react";
22 import { Moon, RotateCcw, Sun } from "lucide-react";
33 import { Room } from "livekit-client";
44 import { Button, Field, Section, Select, Toggle } from "@/ui";
@@ -105,7 +105,7 @@ export default function SettingsView({
105105 options={[
106106 { value: "normal", label: "normal" },
107107 { value: "default", label: "browser default" },
108- { value: "large", label: "large" },
108+ { value: "large", label: "Help I'm old" },
109109 ]}
110110 />
111111 </Field>
@@ -117,6 +117,8 @@ export default function SettingsView({
117117 <ColorField
118118 key={t}
119119 token={t}
120+ mode={prefs.mode}
121+ preset={prefs.preset}
120122 override={prefs.overrides[prefs.mode][t]}
121123 onChange={(color) => setToken(t, color)}
122124 />
@@ -231,15 +233,21 @@ export default function SettingsView({
231233
232234 function ColorField({
233235 token,
236+ mode,
237+ preset,
234238 override,
235239 onChange,
236240 }: {
237241 token: Token;
242+ mode: Mode;
243+ preset: PresetId;
238244 override?: string;
239245 onChange: (color: string) => void;
240246 }) {
241- // Re-read the palette whenever anything that feeds it changes.
242- const value = useMemo(() => effective(token), [token, override]);
247+ // Re-read the palette after the theme has been applied to the DOM, so the
248+ // swatch never shows the previous mode's or preset's colors.
249+ const [value, setValue] = useState(() => effective(token));
250+ useEffect(() => setValue(effective(token)), [token, override, mode, preset]);
243251 return (
244252 <label className="flex items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors hover:bg-raised">
245253 <input