diff --git a/scripts/port-community-themes.ts b/scripts/port-community-themes.ts
index d33a3489..ce6a2f02 100644
--- a/scripts/port-community-themes.ts
+++ b/scripts/port-community-themes.ts
@@ -38,10 +38,16 @@ type ManifestEntry = {
   id: string;
   name: string;
   repo: string;
+  /** Omitted means GitHub, which is where all but a couple of these live. */
+  host?: 'gitlab';
   kind: string;
   dark: boolean;
 };
 
+type Repo = { host: 'github' | 'gitlab'; path: string };
+
+const repoUrl = (r: Repo): string => `https://${r.host === 'gitlab' ? 'gitlab.com' : 'github.com'}/${r.path}`;
+
 // Same pairs `generate-themes.ts` checks, kept in sync by hand since this is the only other place that
 // needs them and duplicating a 20-line array beats a shared module for one caller each.
 const PAIRS: [string, string, number][] = [
@@ -90,6 +96,16 @@ function ghApiDefaultBranch(repo: string): string {
   }
 }
 
+async function gitlabDefaultBranch(path: string): Promise<string> {
+  const json = await fetchText(`https://gitlab.com/api/v4/projects/${encodeURIComponent(path)}`);
+  if (!json) return 'main';
+  try {
+    return (JSON.parse(json).default_branch as string) || 'main';
+  } catch {
+    return 'main';
+  }
+}
+
 async function fetchText(url: string): Promise<string | undefined> {
   try {
     const res = await fetch(url);
@@ -100,62 +116,79 @@ async function fetchText(url: string): Promise<string | undefined> {
   }
 }
 
-async function discoverRepo(slug: string): Promise<string | undefined> {
+async function discoverRepo(slug: string): Promise<Repo | undefined> {
   const html = await fetchText(`${SITE}/themes/${slug}`);
   if (!html) return undefined;
-  const m = html.match(/https:\/\/github\.com\/([\w.-]+)\/([\w.-]+)/);
-  return m ? `${m[1]}/${m[2]}` : undefined;
+  const gh = html.match(/https:\/\/github\.com\/([\w.-]+)\/([\w.-]+)/);
+  if (gh) return { host: 'github', path: `${gh[1]}/${gh[2]}` };
+  // A couple of authors host on GitLab instead. Its group paths can nest, hence the greedier match.
+  const gl = html.match(/https:\/\/gitlab\.com\/([\w.-]+(?:\/[\w.-]+)+?)(?=["'\s<]|$)/);
+  if (gl) return { host: 'gitlab', path: gl[1]!.replace(/\.git$/, '') };
+  return undefined;
 }
 
-async function sourceFor(repo: string): Promise<{ palette: Palette; kind: string; derived: boolean } | undefined> {
-  const branch = ghApiDefaultBranch(repo);
-  const raw = (p: string) => `https://raw.githubusercontent.com/${repo}/${branch}/${p}`;
+async function sourceFor(
+  repo: Repo,
+  slug: string,
+): Promise<{ palette: Palette; kind: string; derived: boolean } | undefined> {
+  const branch = repo.host === 'gitlab' ? await gitlabDefaultBranch(repo.path) : ghApiDefaultBranch(repo.path);
+  const raw = (p: string) =>
+    repo.host === 'gitlab'
+      ? `https://gitlab.com/${repo.path}/-/raw/${branch}/${p}`
+      : `https://raw.githubusercontent.com/${repo.path}/${branch}/${p}`;
 
-  // `colors.toml` is ambiguous across community repos: it might genuinely be Omarchy 4's own semantic
-  // schema (in which case no derivation is needed at all — same quality as the official 22), or it might
-  // reuse the filename for an unrelated flat `color0..color15` ANSI scheme. Try the real schema first;
-  // only fall through to the ANSI reading if the required keys aren't there.
-  const tomlText = await fetchText(raw('colors.toml'));
-  if (tomlText) {
-    const kv = parseTomlText(tomlText);
-    try {
-      return {
-        palette: paletteFromRecord(kv, `${repo}/colors.toml`),
-        kind: 'colors.toml (Omarchy schema)',
-        derived: false,
-      };
-    } catch {
-      const ansi = parseColor16Toml(kv);
-      if (ansi) return { palette: deriveOmarchyPalette(ansi), kind: 'colors.toml (16-colour ANSI)', derived: true };
+  // Most repos hold one theme at the root. A few are packs that nest one directory per theme, so also
+  // look under the directory named after THIS slug — an exact match is the only safe pick, since a pack
+  // with variant names of its own (`abyss-dark`, `lagoon-light`, …) has no one theme that is "the" one.
+  const prefixes = ['', `themes/${slug}/`, `omarchy/themes/${slug}/`, `${slug}/`];
+
+  for (const prefix of prefixes) {
+    // `colors.toml` is ambiguous across community repos: it might genuinely be Omarchy 4's own semantic
+    // schema (in which case no derivation is needed at all — same quality as the official 22), or it might
+    // reuse the filename for an unrelated flat `color0..color15` ANSI scheme. Try the real schema first;
+    // only fall through to the ANSI reading if the required keys aren't there.
+    const tomlText = await fetchText(raw(`${prefix}colors.toml`));
+    if (tomlText) {
+      const kv = parseTomlText(tomlText);
+      try {
+        return {
+          palette: paletteFromRecord(kv, `${repo.path}/${prefix}colors.toml`),
+          kind: 'colors.toml (Omarchy schema)',
+          derived: false,
+        };
+      } catch {
+        const ansi = parseColor16Toml(kv);
+        if (ansi) return { palette: deriveOmarchyPalette(ansi), kind: 'colors.toml (16-colour ANSI)', derived: true };
+      }
     }
-  }
 
-  for (const path of [
-    'alacritty.toml',
-    '.config/alacritty.toml',
-    'alacritty/alacritty.toml',
-    'config/alacritty.toml',
-  ]) {
-    const text = await fetchText(raw(path));
-    if (!text) continue;
-    const ansi = parseAlacrittyToml(text);
-    if (ansi) return { palette: deriveOmarchyPalette(ansi), kind: 'alacritty.toml', derived: true };
-  }
-  for (const path of ['ghostty.conf', 'ghostty-theme', '.config/ghostty/config']) {
-    const text = await fetchText(raw(path));
-    if (!text) continue;
-    const ansi = parseGhosttyConf(text);
-    if (ansi) return { palette: deriveOmarchyPalette(ansi), kind: 'ghostty.conf', derived: true };
+    for (const path of [
+      'alacritty.toml',
+      '.config/alacritty.toml',
+      'alacritty/alacritty.toml',
+      'config/alacritty.toml',
+    ]) {
+      const text = await fetchText(raw(`${prefix}${path}`));
+      if (!text) continue;
+      const ansi = parseAlacrittyToml(text);
+      if (ansi) return { palette: deriveOmarchyPalette(ansi), kind: 'alacritty.toml', derived: true };
+    }
+    for (const path of ['ghostty.conf', 'ghostty-theme', '.config/ghostty/config']) {
+      const text = await fetchText(raw(`${prefix}${path}`));
+      if (!text) continue;
+      const ansi = parseGhosttyConf(text);
+      if (ansi) return { palette: deriveOmarchyPalette(ansi), kind: 'ghostty.conf', derived: true };
+    }
   }
   return undefined;
 }
 
 async function portOne(slug: string): Promise<{ entry: ManifestEntry; css: string } | { skip: string }> {
   const repo = await discoverRepo(slug);
-  if (!repo) return { skip: 'no github repo link found on its omarchythemes.com page' };
+  if (!repo) return { skip: 'no github/gitlab repo link found on its omarchythemes.com page' };
 
-  const source = await sourceFor(repo);
-  if (!source) return { skip: `no parseable colors.toml/alacritty.toml/ghostty.conf in ${repo}` };
+  const source = await sourceFor(repo, slug);
+  if (!source) return { skip: `no parseable colors.toml/alacritty.toml/ghostty.conf in ${repo.path}` };
 
   const palette = source.palette;
   const tokens = mapPalette(palette);
@@ -191,7 +224,7 @@ async function portOne(slug: string): Promise<{ entry: ManifestEntry; css: strin
 
   ${modeLine}
 
-  Source: https://github.com/${repo} (${source.kind}), read by scripts/port-community-themes.ts. Values
+  Source: ${repoUrl(repo)} (${source.kind}), read by scripts/port-community-themes.ts. Values
   ${provenanceLine} Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
@@ -201,7 +234,17 @@ ${body}
 }
 `;
 
-  return { entry: { id: slug, name, repo, kind: source.kind, dark: palette.mode === 'dark' }, css };
+  return {
+    entry: {
+      id: slug,
+      name,
+      repo: repo.path,
+      ...(repo.host === 'gitlab' ? { host: 'gitlab' as const } : {}),
+      kind: source.kind,
+      dark: palette.mode === 'dark',
+    },
+    css,
+  };
 }
 
 function rewriteIndexCss(entries: ManifestEntry[]): void {
diff --git a/scripts/themes/community-manifest.json b/scripts/themes/community-manifest.json
index 91fccb17..219a49ec 100644
--- a/scripts/themes/community-manifest.json
+++ b/scripts/themes/community-manifest.json
@@ -3,7 +3,7 @@
     "id": "aamis",
     "name": "Aamis",
     "repo": "vyrx-dev/omarchy-aamis-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -24,14 +24,14 @@
     "id": "aetheria",
     "name": "Aetheria",
     "repo": "JJDizz1L/aetheria",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
     "id": "akaito",
     "name": "Akaito",
     "repo": "stannorbvb-cmd/akaito",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": false
   },
   {
@@ -52,7 +52,7 @@
     "id": "amekoji",
     "name": "Amekoji",
     "repo": "atif-1402/omarchy-amekoji-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -129,7 +129,7 @@
     "id": "atelier",
     "name": "Atelier",
     "repo": "atif-1402/omarchy-atelier-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -178,21 +178,21 @@
     "id": "bad-hand",
     "name": "Bad Hand",
     "repo": "bjornramberg/omarchy-bad-hand-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
     "id": "batman",
     "name": "Batman",
     "repo": "OldJobobo/omarchy-batman-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
     "id": "batou",
     "name": "Batou",
     "repo": "HANCORE-linux/omarchy-batou-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -213,7 +213,7 @@
     "id": "beta",
     "name": "Beta",
     "repo": "jjdizz1l/beta",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -227,7 +227,7 @@
     "id": "black-arch",
     "name": "Black Arch",
     "repo": "ankur311sudo/black_arch",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -251,6 +251,13 @@
     "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
+  {
+    "id": "blackwall",
+    "name": "Blackwall",
+    "repo": "rlind3r/omarchy-blackwall-theme",
+    "kind": "alacritty.toml",
+    "dark": true
+  },
   {
     "id": "blueridge",
     "name": "Blueridge",
@@ -262,14 +269,14 @@
     "id": "brutalism",
     "name": "Brutalism",
     "repo": "bjornramberg/omarchy-brutalism-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
     "id": "caroline-skyline",
     "name": "Caroline Skyline",
     "repo": "OldJobobo/omarchy-caroline-skyline-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -290,14 +297,14 @@
     "id": "city-783",
     "name": "City 783",
     "repo": "OldJobobo/omarchy-city-783-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
     "id": "copper-night",
     "name": "Copper Night",
     "repo": "hembramnishant50-glitch/omarchy-coppernight-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -311,7 +318,7 @@
     "id": "cpunk",
     "name": "Cpunk",
     "repo": "stannorbvb-cmd/cpunk",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -360,14 +367,14 @@
     "id": "deckard",
     "name": "Deckard",
     "repo": "OldJobobo/omarchy-deckard-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
     "id": "delete",
     "name": "Delete",
     "repo": "signaldirective/delete-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -381,7 +388,7 @@
     "id": "demon",
     "name": "Demon",
     "repo": "HANCORE-linux/omarchy-demon-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -402,7 +409,7 @@
     "id": "dotrb",
     "name": "Dotrb",
     "repo": "dotsilva/omarchy-dotrb-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -451,14 +458,14 @@
     "id": "eva-unit-01",
     "name": "Eva Unit 01",
     "repo": "OldJobobo/omarchy-01-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
     "id": "event-horizon",
     "name": "Event Horizon",
     "repo": "OldJobobo/omarchy-event-horizon-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -486,7 +493,7 @@
     "id": "felix",
     "name": "Felix",
     "repo": "TyRichards/omarchy-felix-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -514,7 +521,7 @@
     "id": "flat-dracula",
     "name": "Flat Dracula",
     "repo": "OldJobobo/omarchy-flat-dracula-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -528,7 +535,7 @@
     "id": "florida-man",
     "name": "Florida Man",
     "repo": "OldJobobo/omarchy-florida-man-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -577,9 +584,17 @@
     "id": "gold-rush",
     "name": "Gold Rush",
     "repo": "tahayvr/omarchy-gold-rush-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
+  {
+    "id": "gornergrat-station",
+    "name": "Gornergrat Station",
+    "repo": "bhavabhuthi/omarchy-gornergrat-station-theme",
+    "host": "gitlab",
+    "kind": "alacritty.toml",
+    "dark": false
+  },
   {
     "id": "gotham-city",
     "name": "Gotham City",
@@ -591,7 +606,7 @@
     "id": "greek-noir",
     "name": "Greek Noir",
     "repo": "HANCORE-linux/omarchy-greek-noir-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -626,7 +641,7 @@
     "id": "harbor",
     "name": "Harbor",
     "repo": "HANCORE-linux/omarchy-harbor-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": false
   },
   {
@@ -640,7 +655,7 @@
     "id": "hex",
     "name": "Hex",
     "repo": "OldJobobo/omarchy-hex-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -654,7 +669,7 @@
     "id": "hinterlands",
     "name": "Hinterlands",
     "repo": "OldJobobo/omarchy-hinterlands-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -696,7 +711,7 @@
     "id": "killer-klowns",
     "name": "Killer Klowns",
     "repo": "Deoxizn/omarchy-killer-klowns-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -717,7 +732,7 @@
     "id": "kurayami",
     "name": "Kurayami",
     "repo": "bjornramberg/omarchy-kurayami-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -745,14 +760,21 @@
     "id": "latch-dark",
     "name": "Latch Dark",
     "repo": "atif-1402/omarchy-latchdark-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
+    "dark": true
+  },
+  {
+    "id": "lilly",
+    "name": "Lilly",
+    "repo": "JJDizz1L/lilly",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
     "id": "lowlight",
     "name": "Lowlight",
     "repo": "atif-1402/omarchy-lowlight-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -787,7 +809,7 @@
     "id": "mecha-no-onna",
     "name": "Mecha NO Onna",
     "repo": "HANCORE-linux/omarchy-mechanoonna-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -801,7 +823,7 @@
     "id": "midnight",
     "name": "Midnight",
     "repo": "JaxonWright/omarchy-midnight-theme",
-    "kind": "ghostty.conf",
+    "kind": "colors.toml (Omarchy schema)",
     "dark": true
   },
   {
@@ -811,11 +833,18 @@
     "kind": "alacritty.toml",
     "dark": true
   },
+  {
+    "id": "milkmatcha-light",
+    "name": "Milkmatcha Light",
+    "repo": "hipsterusername/omarchy-milkmatcha-light-theme",
+    "kind": "alacritty.toml",
+    "dark": false
+  },
   {
     "id": "mocha",
     "name": "Mocha",
     "repo": "gitcoder89431/omarchy-mocha-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -843,7 +872,7 @@
     "id": "monolith",
     "name": "Monolith",
     "repo": "OldJobobo/omarchy-monolith-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (Omarchy schema)",
     "dark": true
   },
   {
@@ -860,6 +889,13 @@
     "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
+  {
+    "id": "moon-orbit",
+    "name": "Moon Orbit",
+    "repo": "JJDizz1L/moon-orbit",
+    "kind": "colors.toml (16-colour ANSI)",
+    "dark": true
+  },
   {
     "id": "nagai-poolside",
     "name": "Nagai Poolside",
@@ -909,6 +945,13 @@
     "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
+  {
+    "id": "night-owl",
+    "name": "Night Owl",
+    "repo": "maxberggren/omarchy-night-owl-theme",
+    "kind": "alacritty.toml",
+    "dark": true
+  },
   {
     "id": "nyc",
     "name": "Nyc",
@@ -927,14 +970,14 @@
     "id": "oxford",
     "name": "Oxford",
     "repo": "HANCORE-linux/omarchy-oxford-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
     "id": "oxocarbon-dark",
     "name": "Oxocarbon Dark",
     "repo": "HANCORE-linux/omarchy-oxocarbon-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -944,6 +987,13 @@
     "kind": "alacritty.toml",
     "dark": true
   },
+  {
+    "id": "phosphor-os",
+    "name": "Phosphor OS",
+    "repo": "OldJobobo/omarchy-phosphor-os-theme",
+    "kind": "colors.toml (16-colour ANSI)",
+    "dark": true
+  },
   {
     "id": "pina",
     "name": "Pina",
@@ -983,28 +1033,28 @@
     "id": "purplewave",
     "name": "Purplewave",
     "repo": "dotsilva/omarchy-purplewave-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
     "id": "rainy-night",
     "name": "Rainy Night",
     "repo": "atif-1402/omarchy-rainynight-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
     "id": "rdddcs",
     "name": "Rdddcs",
     "repo": "mohamedredachakir/LINUX-OMARCHY-REDDCS",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
     "id": "red-monarch",
     "name": "Red Monarch",
     "repo": "kamatealip/omarchy-red-monarch-theme",
-    "kind": "ghostty.conf",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -1025,14 +1075,14 @@
     "id": "robco",
     "name": "Robco",
     "repo": "signaldirective/robco-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
     "id": "robco-mojave",
     "name": "Robco Mojave",
     "repo": "signaldirective/robco-mojave",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -1046,7 +1096,7 @@
     "id": "roseofdune",
     "name": "Roseofdune",
     "repo": "HANCORE-linux/omarchy-roseofdune-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": false
   },
   {
@@ -1084,6 +1134,13 @@
     "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
+  {
+    "id": "seashells",
+    "name": "Seashells",
+    "repo": "odysseyalive/omarchy-seashells-theme",
+    "kind": "colors.toml (16-colour ANSI)",
+    "dark": true
+  },
   {
     "id": "serenity",
     "name": "Serenity",
@@ -1109,6 +1166,27 @@
     "id": "snow-black",
     "name": "Snow Black",
     "repo": "ankur311sudo/snow_black",
+    "kind": "colors.toml (16-colour ANSI)",
+    "dark": true
+  },
+  {
+    "id": "solarized",
+    "name": "Solarized",
+    "repo": "Gazler/omarchy-solarized-theme",
+    "kind": "alacritty.toml",
+    "dark": true
+  },
+  {
+    "id": "solarized-light",
+    "name": "Solarized Light",
+    "repo": "dfrico/omarchy-solarized-light-theme",
+    "kind": "alacritty.toml",
+    "dark": false
+  },
+  {
+    "id": "solarized-osaka",
+    "name": "Solarized Osaka",
+    "repo": "motorsss/omarchy-solarizedosaka-theme",
     "kind": "alacritty.toml",
     "dark": true
   },
@@ -1116,21 +1194,21 @@
     "id": "space-bound",
     "name": "Space Bound",
     "repo": "Deoxizn/omarchy-space-bound-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
     "id": "space-monkey",
     "name": "Space Monkey",
     "repo": "TyRichards/omarchy-space-monkey-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
     "id": "spark",
     "name": "Spark",
     "repo": "stefanomainardi/omarchy-sf-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -1172,7 +1250,7 @@
     "id": "synthetica",
     "name": "Synthetica",
     "repo": "stannorbvb-cmd/synthetica",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -1193,7 +1271,7 @@
     "id": "tarot",
     "name": "Tarot",
     "repo": "jjdizz1l/base16-tarot",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -1207,21 +1285,21 @@
     "id": "terramour",
     "name": "Terramour",
     "repo": "atif-1402/omarchy-terramour-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
     "id": "thegreek",
     "name": "Thegreek",
     "repo": "HANCORE-linux/omarchy-thegreek-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": false
   },
   {
     "id": "turbonite",
     "name": "Turbonite",
     "repo": "HANCORE-linux/omarchy-turbonite-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -1242,14 +1320,14 @@
     "id": "unicorn-dream",
     "name": "Unicorn Dream",
     "repo": "Deoxizn/omarchy-unicorn-dream-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": false
   },
   {
     "id": "van-gogh",
     "name": "Van Gogh",
     "repo": "Nirmal314/omarchy-van-gogh-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -1263,7 +1341,7 @@
     "id": "velvet-night",
     "name": "Velvet Night",
     "repo": "HANCORE-linux/omarchy-velvetnight-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -1277,7 +1355,7 @@
     "id": "vhs80",
     "name": "Vhs80",
     "repo": "tahayvr/omarchy-vhs80-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -1291,7 +1369,7 @@
     "id": "void",
     "name": "Void",
     "repo": "vyrx-dev/omarchy-void-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": true
   },
   {
@@ -1319,7 +1397,7 @@
     "id": "white-gold",
     "name": "White Gold",
     "repo": "HANCORE-linux/omarchy-whitegold-theme",
-    "kind": "alacritty.toml",
+    "kind": "colors.toml (16-colour ANSI)",
     "dark": false
   },
   {
diff --git a/scripts/themes/map.ts b/scripts/themes/map.ts
index c8d0854f..a35ce56a 100644
--- a/scripts/themes/map.ts
+++ b/scripts/themes/map.ts
@@ -49,6 +49,13 @@ export function mapPalette(p: Palette): Tokens {
   // miasma at 4.00 — close enough to look fine and still fail, which is the kind of near-miss that a
   // person eyeballing a screenshot would have shipped.
   const fgMuted = ensureContrast(p.lightForeground, s.high);
+  // Same reasoning as `fgMuted`, for the same surface: `--accent` and `--secondary` are BOTH `s.high`,
+  // so their text has to be checked against `s.high` too. It was deriving from `fgRaised` — the weight
+  // for `s.raised` — which is the identical near-miss the comment above describes, just one token over.
+  // A no-op for all 22 official palettes (each already clears 4.5:1 on `s.high` by 1.4x or more, and
+  // `ensureContrast` returns its input untouched when it passes); what it fixes is the ported palettes
+  // whose foreground sits between the two surfaces' thresholds.
+  const fgHigh = ensureContrast(p.foreground, s.high);
   const fgFaint = ensureContrast(p.darkForeground, s.raised, UI);
 
   /**
@@ -88,13 +95,13 @@ export function mapPalette(p: Palette): Tokens {
     '--muted': s.high,
     '--muted-foreground': fgMuted,
     '--accent': s.high,
-    '--accent-foreground': fgRaised,
+    '--accent-foreground': fgHigh,
 
     // ── Actions ──
     '--primary': accent,
     '--primary-foreground': on(accent),
     '--secondary': s.high,
-    '--secondary-foreground': fgRaised,
+    '--secondary-foreground': fgHigh,
     '--cta': accent,
     '--cta-foreground': on(accent),
     '--ctahover': mix(accent, s.dark ? '#ffffff' : '#000000', 0.12),
diff --git a/src/workspaces/theme/css/index.css b/src/workspaces/theme/css/index.css
index b0b2a0e0..3b6c72b4 100644
--- a/src/workspaces/theme/css/index.css
+++ b/src/workspaces/theme/css/index.css
@@ -78,6 +78,7 @@
 @import './themes/black-gold.css';
 @import './themes/black-money.css';
 @import './themes/blackturq.css';
+@import './themes/blackwall.css';
 @import './themes/blueridge.css';
 @import './themes/brutalism.css';
 @import './themes/caroline-skyline.css';
@@ -125,6 +126,7 @@
 @import './themes/ghost-pastel.css';
 @import './themes/glory-antic.css';
 @import './themes/gold-rush.css';
+@import './themes/gornergrat-station.css';
 @import './themes/gotham-city.css';
 @import './themes/greek-noir.css';
 @import './themes/green-city.css';
@@ -149,6 +151,7 @@
 @import './themes/lairetam.css';
 @import './themes/latch.css';
 @import './themes/latch-dark.css';
+@import './themes/lilly.css';
 @import './themes/lowlight.css';
 @import './themes/lunar.css';
 @import './themes/manga.css';
@@ -158,6 +161,7 @@
 @import './themes/memento-mori.css';
 @import './themes/midnight.css';
 @import './themes/miles-morales.css';
+@import './themes/milkmatcha-light.css';
 @import './themes/mocha.css';
 @import './themes/monochrome.css';
 @import './themes/monokai.css';
@@ -165,6 +169,7 @@
 @import './themes/monolith.css';
 @import './themes/monolith-2.css';
 @import './themes/moodpeak.css';
+@import './themes/moon-orbit.css';
 @import './themes/nagai-poolside.css';
 @import './themes/nagai-twilight.css';
 @import './themes/nebulite.css';
@@ -172,11 +177,13 @@
 @import './themes/neon-street.css';
 @import './themes/neovoid.css';
 @import './themes/nes.css';
+@import './themes/night-owl.css';
 @import './themes/nyc.css';
 @import './themes/one-dark-pro.css';
 @import './themes/oxford.css';
 @import './themes/oxocarbon-dark.css';
 @import './themes/pandora.css';
+@import './themes/phosphor-os.css';
 @import './themes/pina.css';
 @import './themes/pink-blood.css';
 @import './themes/pmndrs.css';
@@ -197,10 +204,14 @@
 @import './themes/saga.css';
 @import './themes/sakura.css';
 @import './themes/sapphire.css';
+@import './themes/seashells.css';
 @import './themes/serenity.css';
 @import './themes/shadesofjade.css';
 @import './themes/snow.css';
 @import './themes/snow-black.css';
+@import './themes/solarized.css';
+@import './themes/solarized-light.css';
+@import './themes/solarized-osaka.css';
 @import './themes/space-bound.css';
 @import './themes/space-monkey.css';
 @import './themes/spark.css';
diff --git a/src/workspaces/theme/css/themes/aamis.css b/src/workspaces/theme/css/themes/aamis.css
index 5b254a25..01fa5622 100644
--- a/src/workspaces/theme/css/themes/aamis.css
+++ b/src/workspaces/theme/css/themes/aamis.css
@@ -1,13 +1,11 @@
 /*
   Aamis — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/vyrx-dev/omarchy-aamis-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/vyrx-dev/omarchy-aamis-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a89f93;
   --accent: #202020;
   --accent-foreground: #eadccc;
-  --primary: #e2be8a;
+  --primary: #eacea7;
   --primary-foreground: #080808;
   --secondary: #202020;
   --secondary-foreground: #eadccc;
-  --cta: #e2be8a;
+  --cta: #eacea7;
   --cta-foreground: #080808;
-  --ctahover: #e5c698;
+  --ctahover: #edd4b2;
   --success: #cea37f;
   --success-foreground: #080808;
   --warning: #f4bb54;
@@ -42,9 +40,9 @@
   --busy-ink: #eb8c60;
   --border: #3a3734;
   --input: #3a3734;
-  --ring: #e2be8a;
+  --ring: #eacea7;
   --radius: 0.625rem;
-  --chart-primary: #e2be8a;
+  --chart-primary: #eacea7;
   --chart-secondary: #ede4c8;
   --status-success: #cea37f;
   --status-warning: #f4bb54;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(58 55 52 / 0.55);
   --panel-raised-bg: rgb(15 15 15 / 0.95);
   --panel-raised-border: rgb(58 55 52 / 1);
-  --panel-accent: #e2be8a;
+  --panel-accent: #eacea7;
   --panel-header-bg: rgb(32 32 32 / 0.6);
   --panel-header-fg: #eadccc;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(112 106 106 / 0.85);
   --scrollbar-thin-thumb: rgb(112 106 106 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(112 106 106 / 0.7);
-  --brand: #e2be8a;
+  --brand: #eacea7;
   --brand-foreground: #080808;
-  --brand-primary: #e2be8a;
+  --brand-primary: #eacea7;
   --brand-accent: #e8ab3b;
   --brand-warm: #eb8c60;
   --brand-deep: #080808;
diff --git a/src/workspaces/theme/css/themes/ado.css b/src/workspaces/theme/css/themes/ado.css
index 5c4c4494..c4ddf6cf 100644
--- a/src/workspaces/theme/css/themes/ado.css
+++ b/src/workspaces/theme/css/themes/ado.css
@@ -1,13 +1,11 @@
 /*
   Ado — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/errantProgrammer/omarchy-ado-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a09fa6;
   --accent: #1e1e20;
   --accent-foreground: #dfdee6;
-  --primary: #4545f5;
-  --primary-foreground: #dfdee6;
+  --primary: #a2e0ee;
+  --primary-foreground: #070708;
   --secondary: #1e1e20;
   --secondary-foreground: #dfdee6;
-  --cta: #4545f5;
-  --cta-foreground: #dfdee6;
-  --ctahover: #5b5bf6;
+  --cta: #a2e0ee;
+  --cta-foreground: #070708;
+  --ctahover: #ade4f0;
   --success: #014761;
   --success-foreground: #dfdee6;
   --warning: #8bb0c6;
@@ -42,9 +40,9 @@
   --busy-ink: #8e707d;
   --border: #363639;
   --input: #363639;
-  --ring: #4545f5;
+  --ring: #a2e0ee;
   --radius: 0.625rem;
-  --chart-primary: #4545f5;
+  --chart-primary: #a2e0ee;
   --chart-secondary: #25516a;
   --status-success: #014761;
   --status-warning: #8bb0c6;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(54 54 57 / 0.55);
   --panel-raised-bg: rgb(13 13 15 / 0.95);
   --panel-raised-border: rgb(54 54 57 / 1);
-  --panel-accent: #4545f5;
+  --panel-accent: #a2e0ee;
   --panel-header-bg: rgb(30 30 32 / 0.6);
   --panel-header-fg: #dfdee6;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(144 142 170 / 0.85);
   --scrollbar-thin-thumb: rgb(144 142 170 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(144 142 170 / 0.7);
-  --brand: #4545f5;
-  --brand-foreground: #dfdee6;
-  --brand-primary: #4545f5;
+  --brand: #a2e0ee;
+  --brand-foreground: #070708;
+  --brand-primary: #a2e0ee;
   --brand-accent: #45c1dd;
   --brand-warm: #8e707d;
   --brand-deep: #070708;
diff --git a/src/workspaces/theme/css/themes/adrift.css b/src/workspaces/theme/css/themes/adrift.css
index a6994e9c..2e56e110 100644
--- a/src/workspaces/theme/css/themes/adrift.css
+++ b/src/workspaces/theme/css/themes/adrift.css
@@ -1,13 +1,11 @@
 /*
   Adrift — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/jaredb1011/omarchy-adrift-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a3a294;
   --accent: #2a3836;
   --accent-foreground: #ddd6c2;
-  --primary: #a9bfbf;
+  --primary: #94d0d0;
   --primary-foreground: #0e1715;
   --secondary: #2a3836;
   --secondary-foreground: #ddd6c2;
-  --cta: #a9bfbf;
+  --cta: #94d0d0;
   --cta-foreground: #0e1715;
-  --ctahover: #b3c7c7;
+  --ctahover: #a1d6d6;
   --success: #66987b;
   --success-foreground: #0e1715;
   --warning: #bfa26b;
@@ -42,9 +40,9 @@
   --busy-ink: #c58364;
   --border: #404b46;
   --input: #404b46;
-  --ring: #a9bfbf;
+  --ring: #94d0d0;
   --radius: 0.625rem;
-  --chart-primary: #a9bfbf;
+  --chart-primary: #94d0d0;
   --chart-secondary: #9a5840;
   --status-success: #66987b;
   --status-warning: #bfa26b;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(64 75 70 / 0.55);
   --panel-raised-bg: rgb(26 41 39 / 0.95);
   --panel-raised-border: rgb(64 75 70 / 1);
-  --panel-accent: #a9bfbf;
+  --panel-accent: #94d0d0;
   --panel-header-bg: rgb(42 56 54 / 0.6);
   --panel-header-fg: #ddd6c2;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(181 181 181 / 0.85);
   --scrollbar-thin-thumb: rgb(181 181 181 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(181 181 181 / 0.7);
-  --brand: #a9bfbf;
+  --brand: #94d0d0;
   --brand-foreground: #0e1715;
-  --brand-primary: #a9bfbf;
+  --brand-primary: #94d0d0;
   --brand-accent: #a9bfbf;
   --brand-warm: #c58364;
   --brand-deep: #0e1715;
diff --git a/src/workspaces/theme/css/themes/aetheria.css b/src/workspaces/theme/css/themes/aetheria.css
index f8a675ef..562845af 100644
--- a/src/workspaces/theme/css/themes/aetheria.css
+++ b/src/workspaces/theme/css/themes/aetheria.css
@@ -1,13 +1,11 @@
 /*
   Aetheria — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/JJDizz1L/aetheria (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/JJDizz1L/aetheria (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,31 +20,31 @@
   --muted-foreground: #309396;
   --accent: #1f1a2d;
   --accent-foreground: #14b9b5;
-  --primary: #be3f50;
-  --primary-foreground: #f3f3f3;
+  --primary: #ffbe74;
+  --primary-foreground: #080510;
   --secondary: #1f1a2d;
   --secondary-foreground: #14b9b5;
-  --cta: #be3f50;
-  --cta-foreground: #f3f3f3;
-  --ctahover: #c65665;
-  --success: #c8e967;
-  --success-foreground: #080510;
+  --cta: #ffbe74;
+  --cta-foreground: #080510;
+  --ctahover: #ffc685;
+  --success: #e20342;
+  --success-foreground: #f9f9f9;
   --warning: #7cd699;
   --warning-foreground: #080510;
-  --destructive: #e20342;
-  --destructive-foreground: #f9f9f9;
+  --destructive: #c8e967;
+  --destructive-foreground: #080510;
   --info: #be3f50;
   --info-foreground: #f3f3f3;
-  --busy: #af6d6e;
+  --busy: #a2e080;
   --busy-foreground: #080510;
-  --busy-ink: #af6d6e;
+  --busy-ink: #a2e080;
   --border: #0f2b3b;
   --input: #0f2b3b;
-  --ring: #be3f50;
+  --ring: #ffbe74;
   --radius: 0.625rem;
-  --chart-primary: #be3f50;
+  --chart-primary: #ffbe74;
   --chart-secondary: #9147a8;
-  --status-success: #c8e967;
+  --status-success: #e20342;
   --status-warning: #7cd699;
   --status-in-progress: #be3f50;
   --page-bg: #080510;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(15 43 59 / 0.55);
   --panel-raised-bg: rgb(14 9 29 / 0.95);
   --panel-raised-border: rgb(15 43 59 / 1);
-  --panel-accent: #be3f50;
+  --panel-accent: #ffbe74;
   --panel-header-bg: rgb(31 26 45 / 0.6);
   --panel-header-fg: #14b9b5;
   --panel-radius: 0.75rem;
@@ -78,22 +76,22 @@
   --scrollbar-thumb-hover: rgb(197 50 83 / 0.85);
   --scrollbar-thin-thumb: rgb(197 50 83 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(197 50 83 / 0.7);
-  --brand: #be3f50;
-  --brand-foreground: #f3f3f3;
-  --brand-primary: #be3f50;
+  --brand: #ffbe74;
+  --brand-foreground: #080510;
+  --brand-primary: #ffbe74;
   --brand-accent: #ff7f41;
-  --brand-warm: #af6d6e;
+  --brand-warm: #a2e080;
   --brand-deep: #080510;
   --brand-muted: #c53253;
   --ink: #14b9b5;
   --surface-warm: #0e091d;
-  --naturegreen: #c8e967;
-  --naturegreen-foreground: #080510;
+  --naturegreen: #e20342;
+  --naturegreen-foreground: #f9f9f9;
   --duck-dark: #14b9b5;
   --duck-teal: #ff7f41;
   --duck-yellow: #7cd699;
-  --duck-orange: #af6d6e;
-  --duck-forest: #c8e967;
+  --duck-orange: #a2e080;
+  --duck-forest: #e20342;
   --duck-beige: #0f1b2c;
   --logo-src: '/officer-logo.svg';
 }
diff --git a/src/workspaces/theme/css/themes/akaito.css b/src/workspaces/theme/css/themes/akaito.css
index aed9ed9c..39b2a8ec 100644
--- a/src/workspaces/theme/css/themes/akaito.css
+++ b/src/workspaces/theme/css/themes/akaito.css
@@ -1,13 +1,11 @@
 /*
   Akaito — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Light theme (light), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Light theme (light), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/stannorbvb-cmd/akaito (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/stannorbvb-cmd/akaito (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/all-hallows-eve.css b/src/workspaces/theme/css/themes/all-hallows-eve.css
index a0667535..1c3e128b 100644
--- a/src/workspaces/theme/css/themes/all-hallows-eve.css
+++ b/src/workspaces/theme/css/themes/all-hallows-eve.css
@@ -1,13 +1,11 @@
 /*
   All Hallows Eve — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/guilhermetk/omarchy-all-hallows-eve-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b3b3b3;
   --accent: #121212;
   --accent-foreground: #ffffff;
-  --primary: #3387cc;
+  --primary: #cccc33;
   --primary-foreground: #000000;
   --secondary: #121212;
   --secondary-foreground: #ffffff;
-  --cta: #3387cc;
+  --cta: #cccc33;
   --cta-foreground: #000000;
-  --ctahover: #4b95d2;
+  --ctahover: #d2d24b;
   --success: #66cc33;
   --success-foreground: #000000;
   --warning: #cc7833;
@@ -42,9 +40,9 @@
   --busy-ink: #ca5832;
   --border: #323232;
   --input: #323232;
-  --ring: #3387cc;
+  --ring: #cccc33;
   --radius: 0.625rem;
-  --chart-primary: #3387cc;
+  --chart-primary: #cccc33;
   --chart-secondary: #9933cc;
   --status-success: #66cc33;
   --status-warning: #cc7833;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(50 50 50 / 0.55);
   --panel-raised-bg: rgb(0 0 0 / 0.95);
   --panel-raised-border: rgb(50 50 50 / 1);
-  --panel-accent: #3387cc;
+  --panel-accent: #cccc33;
   --panel-header-bg: rgb(18 18 18 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(64 64 64 / 0.85);
   --scrollbar-thin-thumb: rgb(64 64 64 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(64 64 64 / 0.7);
-  --brand: #3387cc;
+  --brand: #cccc33;
   --brand-foreground: #000000;
-  --brand-primary: #3387cc;
+  --brand-primary: #cccc33;
   --brand-accent: #cccc33;
   --brand-warm: #ca5832;
   --brand-deep: #000000;
diff --git a/src/workspaces/theme/css/themes/amberbyte.css b/src/workspaces/theme/css/themes/amberbyte.css
index 62b11744..dced8767 100644
--- a/src/workspaces/theme/css/themes/amberbyte.css
+++ b/src/workspaces/theme/css/themes/amberbyte.css
@@ -1,13 +1,11 @@
 /*
   Amberbyte — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/tahfizhabib/omarchy-amberbyte-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b2a8a8;
   --accent: #2b2223;
   --accent-foreground: #f2e8e8;
-  --primary: #d66b6b;
+  --primary: #f7b3b3;
   --primary-foreground: #0f090a;
   --secondary: #2b2223;
   --secondary-foreground: #f2e8e8;
-  --cta: #d66b6b;
+  --cta: #f7b3b3;
   --cta-foreground: #0f090a;
-  --ctahover: #db7d7d;
+  --ctahover: #f8bcbc;
   --success: #c05a5a;
   --success-foreground: #0f090a;
   --warning: #d66b6b;
@@ -42,9 +40,9 @@
   --busy-ink: #c55b5b;
   --border: #453b3c;
   --input: #453b3c;
-  --ring: #d66b6b;
+  --ring: #f7b3b3;
   --radius: 0.625rem;
-  --chart-primary: #d66b6b;
+  --chart-primary: #f7b3b3;
   --chart-secondary: #d66b6b;
   --status-success: #c05a5a;
   --status-warning: #d66b6b;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(69 59 60 / 0.55);
   --panel-raised-bg: rgb(27 17 18 / 0.95);
   --panel-raised-border: rgb(69 59 60 / 1);
-  --panel-accent: #d66b6b;
+  --panel-accent: #f7b3b3;
   --panel-header-bg: rgb(43 34 35 / 0.6);
   --panel-header-fg: #f2e8e8;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(113 103 104 / 0.85);
   --scrollbar-thin-thumb: rgb(113 103 104 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(113 103 104 / 0.7);
-  --brand: #d66b6b;
+  --brand: #f7b3b3;
   --brand-foreground: #0f090a;
-  --brand-primary: #d66b6b;
+  --brand-primary: #f7b3b3;
   --brand-accent: #f48a8a;
   --brand-warm: #c55b5b;
   --brand-deep: #0f090a;
diff --git a/src/workspaces/theme/css/themes/amekoji.css b/src/workspaces/theme/css/themes/amekoji.css
index 199273c4..e3c020f9 100644
--- a/src/workspaces/theme/css/themes/amekoji.css
+++ b/src/workspaces/theme/css/themes/amekoji.css
@@ -1,13 +1,11 @@
 /*
   Amekoji — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/atif-1402/omarchy-amekoji-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/atif-1402/omarchy-amekoji-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a5a2a2;
   --accent: #323738;
   --accent-foreground: #dcd6d6;
-  --primary: #85abbc;
+  --primary: #98b3b3;
   --primary-foreground: #131617;
   --secondary: #323738;
   --secondary-foreground: #dcd6d6;
-  --cta: #85abbc;
+  --cta: #98b3b3;
   --cta-foreground: #131617;
-  --ctahover: #94b5c4;
+  --ctahover: #a4bcbc;
   --success: #98b3a3;
   --success-foreground: #131617;
   --warning: #93b3a6;
@@ -42,9 +40,9 @@
   --busy-ink: #a3a79f;
   --border: #474a4b;
   --input: #474a4b;
-  --ring: #85abbc;
+  --ring: #98b3b3;
   --radius: 0.625rem;
-  --chart-primary: #85abbc;
+  --chart-primary: #98b3b3;
   --chart-secondary: #bea7b0;
   --status-success: #98b3a3;
   --status-warning: #93b3a6;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(71 74 75 / 0.55);
   --panel-raised-bg: rgb(35 40 41 / 0.95);
   --panel-raised-border: rgb(71 74 75 / 1);
-  --panel-accent: #85abbc;
+  --panel-accent: #98b3b3;
   --panel-header-bg: rgb(50 55 56 / 0.6);
   --panel-header-fg: #dcd6d6;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(120 133 135 / 0.85);
   --scrollbar-thin-thumb: rgb(120 133 135 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(120 133 135 / 0.7);
-  --brand: #85abbc;
+  --brand: #98b3b3;
   --brand-foreground: #131617;
-  --brand-primary: #85abbc;
+  --brand-primary: #98b3b3;
   --brand-accent: #98b3b3;
   --brand-warm: #a3a79f;
   --brand-deep: #131617;
diff --git a/src/workspaces/theme/css/themes/anonymous.css b/src/workspaces/theme/css/themes/anonymous.css
index 04cb5682..9372f59a 100644
--- a/src/workspaces/theme/css/themes/anonymous.css
+++ b/src/workspaces/theme/css/themes/anonymous.css
@@ -1,13 +1,11 @@
 /*
   Anonymous — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/j4v3l/omarchy-anonymous-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/apocalypse.css b/src/workspaces/theme/css/themes/apocalypse.css
index 57b5372a..ad346b1f 100644
--- a/src/workspaces/theme/css/themes/apocalypse.css
+++ b/src/workspaces/theme/css/themes/apocalypse.css
@@ -1,13 +1,11 @@
 /*
   Apocalypse — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/atif-1402/omarchy-apocalypse-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b8b6b6;
   --accent: #221e1d;
   --accent-foreground: #ffffff;
-  --primary: #a8a8ae;
+  --primary: #e7e9e9;
   --primary-foreground: #090707;
   --secondary: #221e1d;
   --secondary-foreground: #ffffff;
-  --cta: #a8a8ae;
+  --cta: #e7e9e9;
   --cta-foreground: #090707;
-  --ctahover: #b2b2b8;
+  --ctahover: #eaecec;
   --success: #98a09b;
   --success-foreground: #090707;
   --warning: #d3c4b8;
@@ -42,9 +40,9 @@
   --busy-ink: #bfa09a;
   --border: #403c3c;
   --input: #403c3c;
-  --ring: #a8a8ae;
+  --ring: #e7e9e9;
   --radius: 0.625rem;
-  --chart-primary: #a8a8ae;
+  --chart-primary: #e7e9e9;
   --chart-secondary: #b6afb5;
   --status-success: #98a09b;
   --status-warning: #d3c4b8;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(64 60 60 / 0.55);
   --panel-raised-bg: rgb(17 13 12 / 0.95);
   --panel-raised-border: rgb(64 60 60 / 1);
-  --panel-accent: #a8a8ae;
+  --panel-accent: #e7e9e9;
   --panel-header-bg: rgb(34 30 29 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(140 123 118 / 0.85);
   --scrollbar-thin-thumb: rgb(140 123 118 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(140 123 118 / 0.7);
-  --brand: #a8a8ae;
+  --brand: #e7e9e9;
   --brand-foreground: #090707;
-  --brand-primary: #a8a8ae;
+  --brand-primary: #e7e9e9;
   --brand-accent: #b8bdbc;
   --brand-warm: #bfa09a;
   --brand-deep: #090707;
diff --git a/src/workspaces/theme/css/themes/arc-blueberry.css b/src/workspaces/theme/css/themes/arc-blueberry.css
index 35f2e751..fd2f280d 100644
--- a/src/workspaces/theme/css/themes/arc-blueberry.css
+++ b/src/workspaces/theme/css/themes/arc-blueberry.css
@@ -1,13 +1,11 @@
 /*
   Arc Blueberry — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/vale-c/omarchy-arc-blueberry (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #898da4;
   --accent: #222431;
   --accent-foreground: #bcc1dc;
-  --primary: #69c3ff;
+  --primary: #0fffeb;
   --primary-foreground: #090b13;
   --secondary: #222431;
   --secondary-foreground: #bcc1dc;
-  --cta: #69c3ff;
+  --cta: #0fffeb;
   --cta-foreground: #090b13;
-  --ctahover: #7bcaff;
+  --ctahover: #2cffed;
   --success: #3cec85;
   --success-foreground: #090b13;
   --warning: #eacd61;
@@ -42,9 +40,9 @@
   --busy-ink: #e7914b;
   --border: #333646;
   --input: #333646;
-  --ring: #69c3ff;
+  --ring: #0fffeb;
   --radius: 0.625rem;
-  --chart-primary: #69c3ff;
+  --chart-primary: #0fffeb;
   --chart-secondary: #f38cec;
   --status-success: #3cec85;
   --status-warning: #eacd61;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(51 54 70 / 0.55);
   --panel-raised-bg: rgb(17 20 34 / 0.95);
   --panel-raised-border: rgb(51 54 70 / 1);
-  --panel-accent: #69c3ff;
+  --panel-accent: #0fffeb;
   --panel-header-bg: rgb(34 36 49 / 0.6);
   --panel-header-fg: #bcc1dc;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(49 59 98 / 0.85);
   --scrollbar-thin-thumb: rgb(49 59 98 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(49 59 98 / 0.7);
-  --brand: #69c3ff;
+  --brand: #0fffeb;
   --brand-foreground: #090b13;
-  --brand-primary: #69c3ff;
+  --brand-primary: #0fffeb;
   --brand-accent: #22ecdb;
   --brand-warm: #e7914b;
   --brand-deep: #090b13;
diff --git a/src/workspaces/theme/css/themes/archriot.css b/src/workspaces/theme/css/themes/archriot.css
index abd5fc84..dfa8e498 100644
--- a/src/workspaces/theme/css/themes/archriot.css
+++ b/src/workspaces/theme/css/themes/archriot.css
@@ -1,13 +1,11 @@
 /*
   Archriot — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/CyphrRiot/omarchy-archriot-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #babbbe;
   --accent: #2a2b35;
   --accent-foreground: #ffffff;
-  --primary: #7da6ff;
+  --primary: #73daca;
   --primary-foreground: #0e0f15;
   --secondary: #2a2b35;
   --secondary-foreground: #ffffff;
-  --cta: #7da6ff;
+  --cta: #73daca;
   --cta-foreground: #0e0f15;
-  --ctahover: #8db1ff;
+  --ctahover: #84ded0;
   --success: #9ece6a;
   --success-foreground: #0e0f15;
   --warning: #e0af68;
@@ -42,9 +40,9 @@
   --busy-ink: #f0957e;
   --border: #474851;
   --input: #474851;
-  --ring: #7da6ff;
+  --ring: #73daca;
   --radius: 0.625rem;
-  --chart-primary: #7da6ff;
+  --chart-primary: #73daca;
   --chart-secondary: #bb9af7;
   --status-success: #9ece6a;
   --status-warning: #e0af68;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(71 72 81 / 0.55);
   --panel-raised-bg: rgb(26 27 38 / 0.95);
   --panel-raised-border: rgb(71 72 81 / 1);
-  --panel-accent: #7da6ff;
+  --panel-accent: #73daca;
   --panel-header-bg: rgb(42 43 53 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(86 95 137 / 0.85);
   --scrollbar-thin-thumb: rgb(86 95 137 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(86 95 137 / 0.7);
-  --brand: #7da6ff;
+  --brand: #73daca;
   --brand-foreground: #0e0f15;
-  --brand-primary: #7da6ff;
+  --brand-primary: #73daca;
   --brand-accent: #0db9d7;
   --brand-warm: #f0957e;
   --brand-deep: #0e0f15;
diff --git a/src/workspaces/theme/css/themes/archwave.css b/src/workspaces/theme/css/themes/archwave.css
index fe3c217e..204ff90d 100644
--- a/src/workspaces/theme/css/themes/archwave.css
+++ b/src/workspaces/theme/css/themes/archwave.css
@@ -1,13 +1,11 @@
 /*
   Archwave — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/davidguttman/archwave (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a17ec3;
   --accent: #2a1e3d;
   --accent-foreground: #d4a5ff;
-  --primary: #8b9aff;
+  --primary: #8ffef4;
   --primary-foreground: #0e0719;
   --secondary: #2a1e3d;
   --secondary-foreground: #d4a5ff;
-  --cta: #8b9aff;
+  --cta: #8ffef4;
   --cta-foreground: #0e0719;
-  --ctahover: #99a6ff;
+  --ctahover: #9cfef5;
   --success: #5ffbf1;
   --success-foreground: #0e0719;
   --warning: #f9f871;
@@ -42,9 +40,9 @@
   --busy-ink: #fcb39c;
   --border: #3e2b57;
   --input: #3e2b57;
-  --ring: #8b9aff;
+  --ring: #8ffef4;
   --radius: 0.625rem;
-  --chart-primary: #8b9aff;
+  --chart-primary: #8ffef4;
   --chart-secondary: #f4a5ff;
   --status-success: #5ffbf1;
   --status-warning: #f9f871;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(62 43 87 / 0.55);
   --panel-raised-bg: rgb(26 13 46 / 0.95);
   --panel-raised-border: rgb(62 43 87 / 1);
-  --panel-accent: #8b9aff;
+  --panel-accent: #8ffef4;
   --panel-header-bg: rgb(42 30 61 / 0.6);
   --panel-header-fg: #d4a5ff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(84 58 110 / 0.85);
   --scrollbar-thin-thumb: rgb(84 58 110 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(84 58 110 / 0.7);
-  --brand: #8b9aff;
+  --brand: #8ffef4;
   --brand-foreground: #0e0719;
-  --brand-primary: #8b9aff;
+  --brand-primary: #8ffef4;
   --brand-accent: #5ffbf1;
   --brand-warm: #fcb39c;
   --brand-deep: #0e0719;
diff --git a/src/workspaces/theme/css/themes/artzen.css b/src/workspaces/theme/css/themes/artzen.css
index ca6257fa..8826014a 100644
--- a/src/workspaces/theme/css/themes/artzen.css
+++ b/src/workspaces/theme/css/themes/artzen.css
@@ -1,13 +1,11 @@
 /*
   Artzen — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/tahfizhabib/omarchy-artzen-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b8b7b7;
   --accent: #282c2f;
   --accent-foreground: #fdf9f8;
-  --primary: #b97670;
+  --primary: #ecbeb9;
   --primary-foreground: #0d0f11;
   --secondary: #282c2f;
   --secondary-foreground: #fdf9f8;
-  --cta: #b97670;
+  --cta: #ecbeb9;
   --cta-foreground: #0d0f11;
-  --ctahover: #c18681;
+  --ctahover: #eec6c1;
   --success: #9f6769;
   --success-foreground: #000000;
   --warning: #bb6d6c;
@@ -42,9 +40,9 @@
   --busy-ink: #af6b65;
   --border: #45474a;
   --input: #45474a;
-  --ring: #b97670;
+  --ring: #ecbeb9;
   --radius: 0.625rem;
-  --chart-primary: #b97670;
+  --chart-primary: #ecbeb9;
   --chart-secondary: #9a8c8a;
   --status-success: #9f6769;
   --status-warning: #bb6d6c;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(69 71 74 / 0.55);
   --panel-raised-bg: rgb(24 28 31 / 0.95);
   --panel-raised-border: rgb(69 71 74 / 1);
-  --panel-accent: #b97670;
+  --panel-accent: #ecbeb9;
   --panel-header-bg: rgb(40 44 47 / 0.6);
   --panel-header-fg: #fdf9f8;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(177 141 133 / 0.85);
   --scrollbar-thin-thumb: rgb(177 141 133 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(177 141 133 / 0.7);
-  --brand: #b97670;
+  --brand: #ecbeb9;
   --brand-foreground: #0d0f11;
-  --brand-primary: #b97670;
+  --brand-primary: #ecbeb9;
   --brand-accent: #da7a6f;
   --brand-warm: #ab635d;
   --brand-deep: #0d0f11;
diff --git a/src/workspaces/theme/css/themes/atari.css b/src/workspaces/theme/css/themes/atari.css
index d8d00153..c4dfcbbb 100644
--- a/src/workspaces/theme/css/themes/atari.css
+++ b/src/workspaces/theme/css/themes/atari.css
@@ -1,13 +1,11 @@
 /*
   Atari — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/atif-1402/omarchy-atari-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a6a0a2;
   --accent: #383238;
   --accent-foreground: #dcd6d6;
-  --primary: #9db9b2;
+  --primary: #dff1e8;
   --primary-foreground: #171317;
   --secondary: #383238;
   --secondary-foreground: #dcd6d6;
-  --cta: #9db9b2;
+  --cta: #dff1e8;
   --cta-foreground: #171317;
-  --ctahover: #a9c1bb;
+  --ctahover: #e3f3eb;
   --success: #79be9a;
   --success-foreground: #171317;
   --warning: #c3b283;
@@ -42,9 +40,9 @@
   --busy-ink: #be9379;
   --border: #4c464b;
   --input: #4c464b;
-  --ring: #9db9b2;
+  --ring: #dff1e8;
   --radius: 0.625rem;
-  --chart-primary: #9db9b2;
+  --chart-primary: #dff1e8;
   --chart-secondary: #cd9b98;
   --status-success: #79be9a;
   --status-warning: #c3b283;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(76 70 75 / 0.55);
   --panel-raised-bg: rgb(41 35 41 / 0.95);
   --panel-raised-border: rgb(76 70 75 / 1);
-  --panel-accent: #9db9b2;
+  --panel-accent: #dff1e8;
   --panel-header-bg: rgb(56 50 56 / 0.6);
   --panel-header-fg: #dcd6d6;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(135 120 135 / 0.85);
   --scrollbar-thin-thumb: rgb(135 120 135 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(135 120 135 / 0.7);
-  --brand: #9db9b2;
+  --brand: #dff1e8;
   --brand-foreground: #171317;
-  --brand-primary: #9db9b2;
+  --brand-primary: #dff1e8;
   --brand-accent: #a2d2b9;
   --brand-warm: #be9379;
   --brand-deep: #171317;
diff --git a/src/workspaces/theme/css/themes/atelier.css b/src/workspaces/theme/css/themes/atelier.css
index 92325247..e8ec1ee3 100644
--- a/src/workspaces/theme/css/themes/atelier.css
+++ b/src/workspaces/theme/css/themes/atelier.css
@@ -1,99 +1,97 @@
 /*
   Atelier — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/atif-1402/omarchy-atelier-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/atif-1402/omarchy-atelier-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
 [data-theme='atelier'] {
-  --background: #131713;
-  --foreground: #dcd6d6;
-  --card: #232923;
-  --card-foreground: #dcd6d6;
-  --popover: #232923;
-  --popover-foreground: #dcd6d6;
-  --muted: #323832;
-  --muted-foreground: #a5a2a0;
-  --accent: #323832;
-  --accent-foreground: #dcd6d6;
-  --primary: #9eb8b5;
-  --primary-foreground: #131713;
-  --secondary: #323832;
-  --secondary-foreground: #dcd6d6;
-  --cta: #9eb8b5;
-  --cta-foreground: #131713;
-  --ctahover: #aac1be;
-  --success: #8cab8f;
-  --success-foreground: #131713;
-  --warning: #b1b195;
-  --warning-foreground: #131713;
-  --destructive: #c5a687;
-  --destructive-foreground: #131713;
-  --info: #9eb8b5;
-  --info-foreground: #131713;
-  --busy: #bbac8e;
-  --busy-foreground: #131713;
-  --busy-ink: #bbac8e;
-  --border: #474b46;
-  --input: #474b46;
-  --ring: #9eb8b5;
+  --background: #13130f;
+  --foreground: #dcd9d6;
+  --card: #22221b;
+  --card-foreground: #dcd9d6;
+  --popover: #22221b;
+  --popover-foreground: #dcd9d6;
+  --muted: #31312b;
+  --muted-foreground: #a4a29e;
+  --accent: #31312b;
+  --accent-foreground: #dcd9d6;
+  --primary: #7bbf7a;
+  --primary-foreground: #13130f;
+  --secondary: #31312b;
+  --secondary-foreground: #dcd9d6;
+  --cta: #7bbf7a;
+  --cta-foreground: #13130f;
+  --ctahover: #8bc78a;
+  --success: #7d9726;
+  --success-foreground: #13130f;
+  --warning: #a5980d;
+  --warning-foreground: #13130f;
+  --destructive: #ba6236;
+  --destructive-foreground: #0d0d0b;
+  --info: #36a166;
+  --info-foreground: #13130f;
+  --busy: #b07d22;
+  --busy-foreground: #13130f;
+  --busy-ink: #b07d22;
+  --border: #464640;
+  --input: #464640;
+  --ring: #7bbf7a;
   --radius: 0.625rem;
-  --chart-primary: #9eb8b5;
-  --chart-secondary: #c5a587;
-  --status-success: #8cab8f;
-  --status-warning: #b1b195;
-  --status-in-progress: #9eb8b5;
-  --page-bg: #131713;
+  --chart-primary: #7bbf7a;
+  --chart-secondary: #9d6c7c;
+  --status-success: #7d9726;
+  --status-warning: #a5980d;
+  --status-in-progress: #36a166;
+  --page-bg: #13130f;
   --page-bg-src: '';
-  --panel-bg: rgb(35 41 35 / 0.72);
-  --panel-border: rgb(71 75 70 / 0.9);
-  --panel-border-bare: rgb(71 75 70 / 0.55);
-  --panel-raised-bg: rgb(35 41 35 / 0.95);
-  --panel-raised-border: rgb(71 75 70 / 1);
-  --panel-accent: #9eb8b5;
-  --panel-header-bg: rgb(50 56 50 / 0.6);
-  --panel-header-fg: #dcd6d6;
+  --panel-bg: rgb(34 34 27 / 0.72);
+  --panel-border: rgb(70 70 64 / 0.9);
+  --panel-border-bare: rgb(70 70 64 / 0.55);
+  --panel-raised-bg: rgb(34 34 27 / 0.95);
+  --panel-raised-border: rgb(70 70 64 / 1);
+  --panel-accent: #7bbf7a;
+  --panel-header-bg: rgb(49 49 43 / 0.6);
+  --panel-header-fg: #dcd9d6;
   --panel-radius: 0.75rem;
   --panel-blur: 12px;
-  --card-bg: #232923;
-  --glass-bg: rgb(35 41 35 / 0.55);
-  --glass-border: rgb(71 75 70 / 0.7);
-  --dock-bg: rgb(35 41 35 / 0.7);
-  --dock-border: rgb(71 75 70 / 0.8);
-  --dock-tooltip-bg: #323832;
-  --header-bg: rgb(35 41 35 / 0.8);
-  --header-border: rgb(71 75 70 / 0.9);
-  --header-fg: #dcd6d6;
+  --card-bg: #22221b;
+  --glass-bg: rgb(34 34 27 / 0.55);
+  --glass-border: rgb(70 70 64 / 0.7);
+  --dock-bg: rgb(34 34 27 / 0.7);
+  --dock-border: rgb(70 70 64 / 0.8);
+  --dock-tooltip-bg: #31312b;
+  --header-bg: rgb(34 34 27 / 0.8);
+  --header-border: rgb(70 70 64 / 0.9);
+  --header-fg: #dcd9d6;
   --header-blur: 12px;
-  --pixel-grid-color: rgb(118 119 116 / 0.07);
-  --card-grid-color: rgb(118 119 116 / 0.05);
-  --panel-grid-color: rgb(118 119 116 / 0.06);
-  --scrollbar-thumb: rgb(120 135 120 / 0.6);
-  --scrollbar-thumb-hover: rgb(120 135 120 / 0.85);
-  --scrollbar-thin-thumb: rgb(120 135 120 / 0.45);
-  --scrollbar-thin-thumb-hover: rgb(120 135 120 / 0.7);
-  --brand: #9eb8b5;
-  --brand-foreground: #131713;
-  --brand-primary: #9eb8b5;
-  --brand-accent: #b0c5b9;
-  --brand-warm: #bbac8e;
-  --brand-deep: #131713;
-  --brand-muted: #788778;
-  --ink: #dcd6d6;
-  --surface-warm: #232923;
-  --naturegreen: #8cab8f;
-  --naturegreen-foreground: #131713;
-  --duck-dark: #dcd6d6;
-  --duck-teal: #b0c5b9;
-  --duck-yellow: #b1b195;
-  --duck-orange: #bbac8e;
-  --duck-forest: #8cab8f;
-  --duck-beige: #363a35;
+  --pixel-grid-color: rgb(118 116 111 / 0.07);
+  --card-grid-color: rgb(118 116 111 / 0.05);
+  --panel-grid-color: rgb(118 116 111 / 0.06);
+  --scrollbar-thumb: rgb(108 107 90 / 0.6);
+  --scrollbar-thumb-hover: rgb(108 107 90 / 0.85);
+  --scrollbar-thin-thumb: rgb(108 107 90 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(108 107 90 / 0.7);
+  --brand: #7bbf7a;
+  --brand-foreground: #13130f;
+  --brand-primary: #7bbf7a;
+  --brand-accent: #5b9d48;
+  --brand-warm: #b07d22;
+  --brand-deep: #13130f;
+  --brand-muted: #6c6b5a;
+  --ink: #dcd9d6;
+  --surface-warm: #22221b;
+  --naturegreen: #7d9726;
+  --naturegreen-foreground: #13130f;
+  --duck-dark: #dcd9d6;
+  --duck-teal: #5b9d48;
+  --duck-yellow: #a5980d;
+  --duck-orange: #b07d22;
+  --duck-forest: #7d9726;
+  --duck-beige: #35342e;
   --logo-src: '/officer-logo.svg';
 }
diff --git a/src/workspaces/theme/css/themes/aura.css b/src/workspaces/theme/css/themes/aura.css
index 0badfb3f..6cc90c6d 100644
--- a/src/workspaces/theme/css/themes/aura.css
+++ b/src/workspaces/theme/css/themes/aura.css
@@ -1,13 +1,11 @@
 /*
   Aura — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/bjarneo/omarchy-aura-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #bababa;
   --accent: #373944;
   --accent-foreground: #f8f8f2;
-  --primary: #8be9fd;
+  --primary: #bde0fe;
   --primary-foreground: #16171e;
   --secondary: #373944;
   --secondary-foreground: #f8f8f2;
-  --cta: #8be9fd;
+  --cta: #bde0fe;
   --cta-foreground: #16171e;
-  --ctahover: #99ecfd;
+  --ctahover: #c5e4fe;
   --success: #8be9fd;
   --success-foreground: #16171e;
   --warning: #cbc3e3;
@@ -42,9 +40,9 @@
   --busy-ink: #e5b9d8;
   --border: #51525b;
   --input: #51525b;
-  --ring: #8be9fd;
+  --ring: #bde0fe;
   --radius: 0.625rem;
-  --chart-primary: #8be9fd;
+  --chart-primary: #bde0fe;
   --chart-secondary: #ffc8dd;
   --status-success: #8be9fd;
   --status-warning: #cbc3e3;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(81 82 91 / 0.55);
   --panel-raised-bg: rgb(40 42 54 / 0.95);
   --panel-raised-border: rgb(81 82 91 / 1);
-  --panel-accent: #8be9fd;
+  --panel-accent: #bde0fe;
   --panel-header-bg: rgb(55 57 68 / 0.6);
   --panel-header-fg: #f8f8f2;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(68 71 90 / 0.85);
   --scrollbar-thin-thumb: rgb(68 71 90 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(68 71 90 / 0.7);
-  --brand: #8be9fd;
+  --brand: #bde0fe;
   --brand-foreground: #16171e;
-  --brand-primary: #8be9fd;
+  --brand-primary: #bde0fe;
   --brand-accent: #8be9fd;
   --brand-warm: #e5b9d8;
   --brand-deep: #16171e;
diff --git a/src/workspaces/theme/css/themes/ayu-dark.css b/src/workspaces/theme/css/themes/ayu-dark.css
index 587b905a..483b9eef 100644
--- a/src/workspaces/theme/css/themes/ayu-dark.css
+++ b/src/workspaces/theme/css/themes/ayu-dark.css
@@ -1,13 +1,11 @@
 /*
   Ayu Dark — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/fdidron/omarchy-ayu-dark-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #898985;
   --accent: #1c1f24;
   --accent-foreground: #bfbdb6;
-  --primary: #53bdfa;
+  --primary: #95e6cb;
   --primary-foreground: #06080b;
   --secondary: #1c1f24;
   --secondary-foreground: #bfbdb6;
-  --cta: #53bdfa;
+  --cta: #95e6cb;
   --cta-foreground: #06080b;
-  --ctahover: #68c5fb;
+  --ctahover: #a2e9d1;
   --success: #7fd962;
   --success-foreground: #06080b;
   --warning: #f9af4f;
@@ -42,9 +40,9 @@
   --busy-ink: #f28e61;
   --border: #2e3034;
   --input: #2e3034;
-  --ring: #53bdfa;
+  --ring: #95e6cb;
   --radius: 0.625rem;
-  --chart-primary: #53bdfa;
+  --chart-primary: #95e6cb;
   --chart-secondary: #cda1fa;
   --status-success: #7fd962;
   --status-warning: #f9af4f;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(46 48 52 / 0.55);
   --panel-raised-bg: rgb(11 14 20 / 0.95);
   --panel-raised-border: rgb(46 48 52 / 1);
-  --panel-accent: #53bdfa;
+  --panel-accent: #95e6cb;
   --panel-header-bg: rgb(28 31 36 / 0.6);
   --panel-header-fg: #bfbdb6;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(104 104 104 / 0.85);
   --scrollbar-thin-thumb: rgb(104 104 104 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(104 104 104 / 0.7);
-  --brand: #53bdfa;
+  --brand: #95e6cb;
   --brand-foreground: #06080b;
-  --brand-primary: #53bdfa;
+  --brand-primary: #95e6cb;
   --brand-accent: #90e1c6;
   --brand-warm: #f28e61;
   --brand-deep: #06080b;
diff --git a/src/workspaces/theme/css/themes/ayu-light.css b/src/workspaces/theme/css/themes/ayu-light.css
index 4d4bbdcc..264e5867 100644
--- a/src/workspaces/theme/css/themes/ayu-light.css
+++ b/src/workspaces/theme/css/themes/ayu-light.css
@@ -1,13 +1,11 @@
 /*
   Ayu Light — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Light theme (light), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Light theme (light), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/fdidron/omarchy-ayu-light-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/ayu-mirage.css b/src/workspaces/theme/css/themes/ayu-mirage.css
index 7985faf4..fa8a4bdb 100644
--- a/src/workspaces/theme/css/themes/ayu-mirage.css
+++ b/src/workspaces/theme/css/themes/ayu-mirage.css
@@ -1,13 +1,11 @@
 /*
   Ayu Mirage — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/fdidron/omarchy-ayu-mirage-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #9b9b99;
   --accent: #2f333e;
   --accent-foreground: #cccac2;
-  --primary: #6dcbfa;
+  --primary: #95e6cb;
   --primary-foreground: #11141a;
   --secondary: #2f333e;
   --secondary-foreground: #cccac2;
-  --cta: #6dcbfa;
+  --cta: #95e6cb;
   --cta-foreground: #11141a;
-  --ctahover: #7fd1fb;
+  --ctahover: #a2e9d1;
   --success: #87d96c;
   --success-foreground: #11141a;
   --warning: #facc6e;
@@ -42,9 +40,9 @@
   --busy-ink: #f4a771;
   --border: #41444d;
   --input: #41444d;
-  --ring: #6dcbfa;
+  --ring: #95e6cb;
   --radius: 0.625rem;
-  --chart-primary: #6dcbfa;
+  --chart-primary: #95e6cb;
   --chart-secondary: #dabafa;
   --status-success: #87d96c;
   --status-warning: #facc6e;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(65 68 77 / 0.55);
   --panel-raised-bg: rgb(31 36 48 / 0.95);
   --panel-raised-border: rgb(65 68 77 / 1);
-  --panel-accent: #6dcbfa;
+  --panel-accent: #95e6cb;
   --panel-header-bg: rgb(47 51 62 / 0.6);
   --panel-header-fg: #cccac2;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(104 104 104 / 0.85);
   --scrollbar-thin-thumb: rgb(104 104 104 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(104 104 104 / 0.7);
-  --brand: #6dcbfa;
+  --brand: #95e6cb;
   --brand-foreground: #11141a;
-  --brand-primary: #6dcbfa;
+  --brand-primary: #95e6cb;
   --brand-accent: #90e1c6;
   --brand-warm: #f4a771;
   --brand-deep: #11141a;
diff --git a/src/workspaces/theme/css/themes/azure-glow.css b/src/workspaces/theme/css/themes/azure-glow.css
index cecacbe7..4e789766 100644
--- a/src/workspaces/theme/css/themes/azure-glow.css
+++ b/src/workspaces/theme/css/themes/azure-glow.css
@@ -1,13 +1,11 @@
 /*
   Azure Glow — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/Hydradevx/omarchy-azure-glow-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #79a1ba;
   --accent: #1b202a;
   --accent-foreground: #a8dfff;
-  --primary: #00aaff;
+  --primary: #99eeff;
   --primary-foreground: #06080e;
   --secondary: #1b202a;
   --secondary-foreground: #a8dfff;
-  --cta: #00aaff;
+  --cta: #99eeff;
   --cta-foreground: #06080e;
-  --ctahover: #1fb4ff;
+  --ctahover: #a5f0ff;
   --success: #00e0b8;
   --success-foreground: #06080e;
   --warning: #33ccff;
@@ -42,9 +40,9 @@
   --busy-ink: #1ab3e6;
   --border: #293847;
   --input: #293847;
-  --ring: #00aaff;
+  --ring: #99eeff;
   --radius: 0.625rem;
-  --chart-primary: #00aaff;
+  --chart-primary: #99eeff;
   --chart-secondary: #3399ff;
   --status-success: #00e0b8;
   --status-warning: #33ccff;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(41 56 71 / 0.55);
   --panel-raised-bg: rgb(10 15 26 / 0.95);
   --panel-raised-border: rgb(41 56 71 / 1);
-  --panel-accent: #00aaff;
+  --panel-accent: #99eeff;
   --panel-header-bg: rgb(27 32 42 / 0.6);
   --panel-header-fg: #a8dfff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(18 50 71 / 0.85);
   --scrollbar-thin-thumb: rgb(18 50 71 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(18 50 71 / 0.7);
-  --brand: #00aaff;
+  --brand: #99eeff;
   --brand-foreground: #06080e;
-  --brand-primary: #00aaff;
+  --brand-primary: #99eeff;
   --brand-accent: #66e0ff;
   --brand-warm: #1ab3e6;
   --brand-deep: #06080e;
diff --git a/src/workspaces/theme/css/themes/azure.css b/src/workspaces/theme/css/themes/azure.css
index 25c7bfc8..2e7ecb0c 100644
--- a/src/workspaces/theme/css/themes/azure.css
+++ b/src/workspaces/theme/css/themes/azure.css
@@ -1,13 +1,11 @@
 /*
   Azure — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/tahfizhabib/omarchy-azure-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #afb5be;
   --accent: #283446;
   --accent-foreground: #eff3f8;
-  --primary: #8da1c8;
+  --primary: #cad4e7;
   --primary-foreground: #0d141f;
   --secondary: #283446;
   --secondary-foreground: #eff3f8;
-  --cta: #8da1c8;
+  --cta: #cad4e7;
   --cta-foreground: #0d141f;
-  --ctahover: #9baccf;
+  --ctahover: #d0d9ea;
   --success: #61a7d6;
   --success-foreground: #0d141f;
   --warning: #6cabda;
@@ -42,9 +40,9 @@
   --busy-ink: #819fb7;
   --border: #424d5e;
   --input: #424d5e;
-  --ring: #8da1c8;
+  --ring: #cad4e7;
   --radius: 0.625rem;
-  --chart-primary: #8da1c8;
+  --chart-primary: #cad4e7;
   --chart-secondary: #a0adc5;
   --status-success: #61a7d6;
   --status-warning: #6cabda;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(66 77 94 / 0.55);
   --panel-raised-bg: rgb(24 37 56 / 0.95);
   --panel-raised-border: rgb(66 77 94 / 1);
-  --panel-accent: #8da1c8;
+  --panel-accent: #cad4e7;
   --panel-header-bg: rgb(40 52 70 / 0.6);
   --panel-header-fg: #eff3f8;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(73 88 109 / 0.85);
   --scrollbar-thin-thumb: rgb(73 88 109 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(73 88 109 / 0.7);
-  --brand: #8da1c8;
+  --brand: #cad4e7;
   --brand-foreground: #0d141f;
-  --brand-primary: #8da1c8;
+  --brand-primary: #cad4e7;
   --brand-accent: #5693c4;
   --brand-warm: #819fb7;
   --brand-deep: #0d141f;
diff --git a/src/workspaces/theme/css/themes/bad-hand.css b/src/workspaces/theme/css/themes/bad-hand.css
index ada69212..fe22085b 100644
--- a/src/workspaces/theme/css/themes/bad-hand.css
+++ b/src/workspaces/theme/css/themes/bad-hand.css
@@ -1,13 +1,11 @@
 /*
   Bad Hand — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/bjornramberg/omarchy-bad-hand-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/bjornramberg/omarchy-bad-hand-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/batman.css b/src/workspaces/theme/css/themes/batman.css
index f7e9b14a..c6db52d6 100644
--- a/src/workspaces/theme/css/themes/batman.css
+++ b/src/workspaces/theme/css/themes/batman.css
@@ -1,13 +1,11 @@
 /*
   Batman — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/OldJobobo/omarchy-batman-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/OldJobobo/omarchy-batman-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,33 +20,33 @@
   --muted-foreground: #949592;
   --accent: #2b2d2e;
   --accent-foreground: #a7a8a3;
-  --primary: #737174;
-  --primary-foreground: #f9f9f9;
+  --primary: #a2a2a5;
+  --primary-foreground: #0f1011;
   --secondary: #2b2d2e;
   --secondary-foreground: #a7a8a3;
-  --cta: #737174;
-  --cta-foreground: #f9f9f9;
-  --ctahover: #848285;
+  --cta: #a2a2a5;
+  --cta-foreground: #0f1011;
+  --ctahover: #adadb0;
   --success: #c8be46;
   --success-foreground: #0f1011;
-  --warning: #f4fd22;
+  --warning: #f3fd21;
   --warning-foreground: #0f1011;
-  --destructive: #e6dc44;
+  --destructive: #e6db43;
   --destructive-foreground: #0f1011;
-  --info: #737174;
+  --info: #737074;
   --info-foreground: #f9f9f9;
-  --busy: #eded33;
+  --busy: #edec32;
   --busy-foreground: #0f1011;
-  --busy-ink: #eded33;
+  --busy-ink: #edec32;
   --border: #363838;
   --input: #363838;
-  --ring: #737174;
+  --ring: #a2a2a5;
   --radius: 0.625rem;
-  --chart-primary: #737174;
-  --chart-secondary: #747271;
+  --chart-primary: #a2a2a5;
+  --chart-secondary: #737271;
   --status-success: #c8be46;
-  --status-warning: #f4fd22;
-  --status-in-progress: #737174;
+  --status-warning: #f3fd21;
+  --status-in-progress: #737074;
   --page-bg: #0f1011;
   --page-bg-src: '';
   --panel-bg: rgb(27 29 30 / 0.72);
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(54 56 56 / 0.55);
   --panel-raised-bg: rgb(27 29 30 / 0.95);
   --panel-raised-border: rgb(54 56 56 / 1);
-  --panel-accent: #737174;
+  --panel-accent: #a2a2a5;
   --panel-header-bg: rgb(43 45 46 / 0.6);
   --panel-header-fg: #a7a8a3;
   --panel-radius: 0.75rem;
@@ -74,25 +72,25 @@
   --pixel-grid-color: rgb(102 104 102 / 0.07);
   --card-grid-color: rgb(102 104 102 / 0.05);
   --panel-grid-color: rgb(102 104 102 / 0.06);
-  --scrollbar-thumb: rgb(80 83 84 / 0.6);
-  --scrollbar-thumb-hover: rgb(80 83 84 / 0.85);
-  --scrollbar-thin-thumb: rgb(80 83 84 / 0.45);
-  --scrollbar-thin-thumb-hover: rgb(80 83 84 / 0.7);
-  --brand: #737174;
-  --brand-foreground: #f9f9f9;
-  --brand-primary: #737174;
-  --brand-accent: #62605f;
-  --brand-warm: #eded33;
+  --scrollbar-thumb: rgb(109 111 110 / 0.6);
+  --scrollbar-thumb-hover: rgb(109 111 110 / 0.85);
+  --scrollbar-thin-thumb: rgb(109 111 110 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(109 111 110 / 0.7);
+  --brand: #a2a2a5;
+  --brand-foreground: #0f1011;
+  --brand-primary: #a2a2a5;
+  --brand-accent: #615f5e;
+  --brand-warm: #edec32;
   --brand-deep: #0f1011;
-  --brand-muted: #505354;
+  --brand-muted: #6d6f6e;
   --ink: #a7a8a3;
   --surface-warm: #1b1d1e;
   --naturegreen: #c8be46;
   --naturegreen-foreground: #0f1011;
   --duck-dark: #a7a8a3;
-  --duck-teal: #62605f;
-  --duck-yellow: #f4fd22;
-  --duck-orange: #eded33;
+  --duck-teal: #615f5e;
+  --duck-yellow: #f3fd21;
+  --duck-orange: #edec32;
   --duck-forest: #c8be46;
   --duck-beige: #292b2b;
   --logo-src: '/officer-logo.svg';
diff --git a/src/workspaces/theme/css/themes/batou.css b/src/workspaces/theme/css/themes/batou.css
index a250f76c..a1ae24a9 100644
--- a/src/workspaces/theme/css/themes/batou.css
+++ b/src/workspaces/theme/css/themes/batou.css
@@ -1,13 +1,11 @@
 /*
   Batou — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/HANCORE-linux/omarchy-batou-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/HANCORE-linux/omarchy-batou-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #8c8c8c;
   --accent: #232323;
   --accent-foreground: #a4a4a4;
-  --primary: #605d5b;
-  --primary-foreground: #dadada;
+  --primary: #c2bbb0;
+  --primary-foreground: #0a0a0a;
   --secondary: #232323;
   --secondary-foreground: #a4a4a4;
-  --cta: #605d5b;
-  --cta-foreground: #dadada;
-  --ctahover: #73706f;
+  --cta: #c2bbb0;
+  --cta-foreground: #0a0a0a;
+  --ctahover: #c9c3b9;
   --success: #a5a297;
   --success-foreground: #0a0a0a;
   --warning: #c6c4b0;
@@ -42,9 +40,9 @@
   --busy-ink: #d4b192;
   --border: #2f2f2f;
   --input: #2f2f2f;
-  --ring: #605d5b;
+  --ring: #c2bbb0;
   --radius: 0.625rem;
-  --chart-primary: #605d5b;
+  --chart-primary: #c2bbb0;
   --chart-secondary: #8a8575;
   --status-success: #a5a297;
   --status-warning: #c6c4b0;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(47 47 47 / 0.55);
   --panel-raised-bg: rgb(18 18 18 / 0.95);
   --panel-raised-border: rgb(47 47 47 / 1);
-  --panel-accent: #605d5b;
+  --panel-accent: #c2bbb0;
   --panel-header-bg: rgb(35 35 35 / 0.6);
   --panel-header-fg: #a4a4a4;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(56 55 53 / 0.85);
   --scrollbar-thin-thumb: rgb(56 55 53 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(56 55 53 / 0.7);
-  --brand: #605d5b;
-  --brand-foreground: #dadada;
-  --brand-primary: #605d5b;
+  --brand: #c2bbb0;
+  --brand-foreground: #0a0a0a;
+  --brand-primary: #c2bbb0;
   --brand-accent: #c2bbb0;
   --brand-warm: #d4b192;
   --brand-deep: #0a0a0a;
diff --git a/src/workspaces/theme/css/themes/bauhaus.css b/src/workspaces/theme/css/themes/bauhaus.css
index 547a35cc..6c995bf7 100644
--- a/src/workspaces/theme/css/themes/bauhaus.css
+++ b/src/workspaces/theme/css/themes/bauhaus.css
@@ -1,13 +1,11 @@
 /*
   Bauhaus — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/somerocketeer/omarchy-bauhaus-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a9adb3;
   --accent: #212428;
   --accent-foreground: #eaeff5;
-  --primary: #8999aa;
+  --primary: #809d9e;
   --primary-foreground: #090a0d;
   --secondary: #212428;
   --secondary-foreground: #eaeff5;
-  --cta: #8999aa;
+  --cta: #809d9e;
   --cta-foreground: #090a0d;
-  --ctahover: #97a5b4;
+  --ctahover: #8fa9aa;
   --success: #789fa2;
   --success-foreground: #090a0d;
   --warning: #e7a46f;
@@ -42,9 +40,9 @@
   --busy-ink: #d9966e;
   --border: #3b3e43;
   --input: #3b3e43;
-  --ring: #8999aa;
+  --ring: #809d9e;
   --radius: 0.625rem;
-  --chart-primary: #8999aa;
+  --chart-primary: #809d9e;
   --chart-secondary: #8d758f;
   --status-success: #789fa2;
   --status-warning: #e7a46f;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(59 62 67 / 0.55);
   --panel-raised-bg: rgb(16 19 24 / 0.95);
   --panel-raised-border: rgb(59 62 67 / 1);
-  --panel-accent: #8999aa;
+  --panel-accent: #809d9e;
   --panel-header-bg: rgb(33 36 40 / 0.6);
   --panel-header-fg: #eaeff5;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(58 63 76 / 0.85);
   --scrollbar-thin-thumb: rgb(58 63 76 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(58 63 76 / 0.7);
-  --brand: #8999aa;
+  --brand: #809d9e;
   --brand-foreground: #090a0d;
-  --brand-primary: #8999aa;
+  --brand-primary: #809d9e;
   --brand-accent: #809d9e;
   --brand-warm: #d9966e;
   --brand-deep: #090a0d;
diff --git a/src/workspaces/theme/css/themes/beachvan.css b/src/workspaces/theme/css/themes/beachvan.css
index 04b1fde7..4ba27aad 100644
--- a/src/workspaces/theme/css/themes/beachvan.css
+++ b/src/workspaces/theme/css/themes/beachvan.css
@@ -1,13 +1,11 @@
 /*
   Beachvan — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/haripako/omarchy-BeachVan-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a4acb4;
   --accent: #2b3a42;
   --accent-foreground: #dee3eb;
-  --primary: #6d9dca;
+  --primary: #66b0af;
   --primary-foreground: #0f181d;
   --secondary: #2b3a42;
   --secondary-foreground: #dee3eb;
-  --cta: #6d9dca;
+  --cta: #66b0af;
   --cta-foreground: #0f181d;
-  --ctahover: #7fa9d0;
+  --ctahover: #78b9b9;
   --success: #9fc69a;
   --success-foreground: #0f181d;
   --warning: #f8c76b;
@@ -42,9 +40,9 @@
   --busy-ink: #f1976e;
   --border: #414f58;
   --input: #414f58;
-  --ring: #6d9dca;
+  --ring: #66b0af;
   --radius: 0.625rem;
-  --chart-primary: #6d9dca;
+  --chart-primary: #66b0af;
   --chart-secondary: #c49ac4;
   --status-success: #9fc69a;
   --status-warning: #f8c76b;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(65 79 88 / 0.55);
   --panel-raised-bg: rgb(27 43 52 / 0.95);
   --panel-raised-border: rgb(65 79 88 / 1);
-  --panel-accent: #6d9dca;
+  --panel-accent: #66b0af;
   --panel-header-bg: rgb(43 58 66 / 0.6);
   --panel-header-fg: #dee3eb;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(106 116 124 / 0.85);
   --scrollbar-thin-thumb: rgb(106 116 124 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(106 116 124 / 0.7);
-  --brand: #6d9dca;
+  --brand: #66b0af;
   --brand-foreground: #0f181d;
-  --brand-primary: #6d9dca;
+  --brand-primary: #66b0af;
   --brand-accent: #66b0af;
   --brand-warm: #f1976e;
   --brand-deep: #0f181d;
diff --git a/src/workspaces/theme/css/themes/beta.css b/src/workspaces/theme/css/themes/beta.css
index 2d6efab1..f32ec95f 100644
--- a/src/workspaces/theme/css/themes/beta.css
+++ b/src/workspaces/theme/css/themes/beta.css
@@ -1,13 +1,11 @@
 /*
   Beta — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/jjdizz1l/beta (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/jjdizz1l/beta (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #bca67a;
   --accent: #311531;
   --accent-foreground: #ffeca0;
-  --primary: #5090f8;
+  --primary: #dce9fe;
   --primary-foreground: #120212;
   --secondary: #311531;
   --secondary-foreground: #ffeca0;
-  --cta: #5090f8;
+  --cta: #dce9fe;
   --cta-foreground: #120212;
-  --ctahover: #659df9;
+  --ctahover: #e0ecfe;
   --success: #7ad573;
   --success-foreground: #120212;
   --warning: #f2c256;
@@ -42,9 +40,9 @@
   --busy-ink: #ed6d54;
   --border: #4c313a;
   --input: #4c313a;
-  --ring: #5090f8;
+  --ring: #dce9fe;
   --radius: 0.625rem;
-  --chart-primary: #5090f8;
+  --chart-primary: #dce9fe;
   --chart-secondary: #9d58f0;
   --status-success: #7ad573;
   --status-warning: #f2c256;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(76 49 58 / 0.55);
   --panel-raised-bg: rgb(33 3 33 / 0.95);
   --panel-raised-border: rgb(76 49 58 / 1);
-  --panel-accent: #5090f8;
+  --panel-accent: #dce9fe;
   --panel-header-bg: rgb(49 21 49 / 0.6);
   --panel-header-fg: #ffeca0;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(171 84 136 / 0.85);
   --scrollbar-thin-thumb: rgb(171 84 136 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(171 84 136 / 0.7);
-  --brand: #5090f8;
+  --brand: #dce9fe;
   --brand-foreground: #120212;
-  --brand-primary: #5090f8;
+  --brand-primary: #dce9fe;
   --brand-accent: #53d0bc;
   --brand-warm: #ed6d54;
   --brand-deep: #120212;
diff --git a/src/workspaces/theme/css/themes/black-arch.css b/src/workspaces/theme/css/themes/black-arch.css
index 85c8008e..a6c3c237 100644
--- a/src/workspaces/theme/css/themes/black-arch.css
+++ b/src/workspaces/theme/css/themes/black-arch.css
@@ -1,13 +1,11 @@
 /*
   Black Arch — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/ankur311sudo/black_arch (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/ankur311sudo/black_arch (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/blackwall.css b/src/workspaces/theme/css/themes/blackwall.css
new file mode 100644
index 00000000..e49c8e23
--- /dev/null
+++ b/src/workspaces/theme/css/themes/blackwall.css
@@ -0,0 +1,97 @@
+/*
+  Blackwall — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
+
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
+
+  Source: https://github.com/rlind3r/omarchy-blackwall-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
+
+  DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
+*/
+[data-theme='blackwall'] {
+  --background: #0d0d0d;
+  --foreground: #ff3535;
+  --card: #171717;
+  --card-foreground: #ff3535;
+  --popover: #171717;
+  --popover-foreground: #ff3535;
+  --muted: #272727;
+  --muted-foreground: #d27676;
+  --accent: #272727;
+  --accent-foreground: #ff4e4e;
+  --primary: #ff3535;
+  --primary-foreground: #0d0d0d;
+  --secondary: #272727;
+  --secondary-foreground: #ff4e4e;
+  --cta: #ff3535;
+  --cta-foreground: #0d0d0d;
+  --ctahover: #ff4d4d;
+  --success: #ff3535;
+  --success-foreground: #0d0d0d;
+  --warning: #451d1d;
+  --warning-foreground: #ff5353;
+  --destructive: #ff0000;
+  --destructive-foreground: #0d0d0d;
+  --info: #ff3535;
+  --info-foreground: #0d0d0d;
+  --busy: #a20f0f;
+  --busy-foreground: #c3c3c3;
+  --busy-ink: #c05d5d;
+  --border: #441d1d;
+  --input: #492323;
+  --ring: #ff3535;
+  --radius: 0.625rem;
+  --chart-primary: #ff3535;
+  --chart-secondary: #ff3535;
+  --status-success: #ff3535;
+  --status-warning: #451d1d;
+  --status-in-progress: #ff3535;
+  --page-bg: #0d0d0d;
+  --page-bg-src: '';
+  --panel-bg: rgb(23 23 23 / 0.72);
+  --panel-border: rgb(68 29 29 / 0.9);
+  --panel-border-bare: rgb(68 29 29 / 0.55);
+  --panel-raised-bg: rgb(23 23 23 / 0.95);
+  --panel-raised-border: rgb(68 29 29 / 1);
+  --panel-accent: #ff3535;
+  --panel-header-bg: rgb(39 39 39 / 0.6);
+  --panel-header-fg: #ff3535;
+  --panel-radius: 0.75rem;
+  --panel-blur: 12px;
+  --card-bg: #171717;
+  --glass-bg: rgb(23 23 23 / 0.55);
+  --glass-border: rgb(68 29 29 / 0.7);
+  --dock-bg: rgb(23 23 23 / 0.7);
+  --dock-border: rgb(68 29 29 / 0.8);
+  --dock-tooltip-bg: #272727;
+  --header-bg: rgb(23 23 23 / 0.8);
+  --header-border: rgb(68 29 29 / 0.9);
+  --header-fg: #ff3535;
+  --header-blur: 12px;
+  --pixel-grid-color: rgb(153 81 81 / 0.07);
+  --card-grid-color: rgb(153 81 81 / 0.05);
+  --panel-grid-color: rgb(153 81 81 / 0.06);
+  --scrollbar-thumb: rgb(147 39 39 / 0.6);
+  --scrollbar-thumb-hover: rgb(147 39 39 / 0.85);
+  --scrollbar-thin-thumb: rgb(147 39 39 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(147 39 39 / 0.7);
+  --brand: #ff3535;
+  --brand-foreground: #0d0d0d;
+  --brand-primary: #ff3535;
+  --brand-accent: #742323;
+  --brand-warm: #a20f0f;
+  --brand-deep: #0d0d0d;
+  --brand-muted: #932727;
+  --ink: #ff3535;
+  --surface-warm: #171717;
+  --naturegreen: #ff3535;
+  --naturegreen-foreground: #0d0d0d;
+  --duck-dark: #ff3535;
+  --duck-teal: #742323;
+  --duck-yellow: #451d1d;
+  --duck-orange: #a20f0f;
+  --duck-forest: #ff3535;
+  --duck-beige: #2e1a1a;
+  --logo-src: '/officer-logo.svg';
+}
diff --git a/src/workspaces/theme/css/themes/blueridge.css b/src/workspaces/theme/css/themes/blueridge.css
index 7cbcf598..3c237c33 100644
--- a/src/workspaces/theme/css/themes/blueridge.css
+++ b/src/workspaces/theme/css/themes/blueridge.css
@@ -1,13 +1,11 @@
 /*
   Blueridge — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/hipsterusername/omarchy-blueridge-dark-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #ababab;
   --accent: #2c3137;
   --accent-foreground: #e8e6e3;
-  --primary: #6b8cae;
+  --primary: #9bdede;
   --primary-foreground: #0f1216;
   --secondary: #2c3137;
   --secondary-foreground: #e8e6e3;
-  --cta: #6b8cae;
+  --cta: #9bdede;
   --cta-foreground: #0f1216;
-  --ctahover: #7d9ab8;
+  --ctahover: #a7e2e2;
   --success: #7ea67c;
   --success-foreground: #0f1216;
   --warning: #d4af37;
@@ -42,9 +40,9 @@
   --busy-ink: #d1a256;
   --border: #44484d;
   --input: #44484d;
-  --ring: #6b8cae;
+  --ring: #9bdede;
   --radius: 0.625rem;
-  --chart-primary: #6b8cae;
+  --chart-primary: #9bdede;
   --chart-secondary: #9b8aa0;
   --status-success: #7ea67c;
   --status-warning: #d4af37;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(68 72 77 / 0.55);
   --panel-raised-bg: rgb(28 33 40 / 0.95);
   --panel-raised-border: rgb(68 72 77 / 1);
-  --panel-accent: #6b8cae;
+  --panel-accent: #9bdede;
   --panel-header-bg: rgb(44 49 55 / 0.6);
   --panel-header-fg: #e8e6e3;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(74 85 104 / 0.85);
   --scrollbar-thin-thumb: rgb(74 85 104 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(74 85 104 / 0.7);
-  --brand: #6b8cae;
+  --brand: #9bdede;
   --brand-foreground: #0f1216;
-  --brand-primary: #6b8cae;
+  --brand-primary: #9bdede;
   --brand-accent: #7ec8c8;
   --brand-warm: #d1a256;
   --brand-deep: #0f1216;
diff --git a/src/workspaces/theme/css/themes/brutalism.css b/src/workspaces/theme/css/themes/brutalism.css
index 40cdbf3e..e6bd7701 100644
--- a/src/workspaces/theme/css/themes/brutalism.css
+++ b/src/workspaces/theme/css/themes/brutalism.css
@@ -1,13 +1,11 @@
 /*
   Brutalism — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/bjornramberg/omarchy-brutalism-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/bjornramberg/omarchy-brutalism-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a19999;
   --accent: #232323;
   --accent-foreground: #ded3d3;
-  --primary: #ce5757;
+  --primary: #eb9696;
   --primary-foreground: #0a0a0a;
   --secondary: #232323;
   --secondary-foreground: #ded3d3;
-  --cta: #ce5757;
+  --cta: #eb9696;
   --cta-foreground: #0a0a0a;
-  --ctahover: #d46b6b;
+  --ctahover: #eda3a3;
   --success: #630a0a;
   --success-foreground: #ded3d3;
   --warning: #cc7a7a;
@@ -42,9 +40,9 @@
   --busy-ink: #a46a6a;
   --border: #3a3838;
   --input: #3a3838;
-  --ring: #ce5757;
+  --ring: #eb9696;
   --radius: 0.625rem;
-  --chart-primary: #ce5757;
+  --chart-primary: #eb9696;
   --chart-secondary: #c87777;
   --status-success: #630a0a;
   --status-warning: #cc7a7a;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(58 56 56 / 0.55);
   --panel-raised-bg: rgb(18 18 18 / 0.95);
   --panel-raised-border: rgb(58 56 56 / 1);
-  --panel-accent: #ce5757;
+  --panel-accent: #eb9696;
   --panel-header-bg: rgb(35 35 35 / 0.6);
   --panel-header-fg: #ded3d3;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(184 148 148 / 0.85);
   --scrollbar-thin-thumb: rgb(184 148 148 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(184 148 148 / 0.7);
-  --brand: #ce5757;
+  --brand: #eb9696;
   --brand-foreground: #0a0a0a;
-  --brand-primary: #ce5757;
+  --brand-primary: #eb9696;
   --brand-accent: #d48484;
   --brand-warm: #893f3f;
   --brand-deep: #0a0a0a;
diff --git a/src/workspaces/theme/css/themes/caroline-skyline.css b/src/workspaces/theme/css/themes/caroline-skyline.css
index 9bdaf9f4..035cc7ef 100644
--- a/src/workspaces/theme/css/themes/caroline-skyline.css
+++ b/src/workspaces/theme/css/themes/caroline-skyline.css
@@ -1,13 +1,11 @@
 /*
   Caroline Skyline — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/OldJobobo/omarchy-caroline-skyline-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/OldJobobo/omarchy-caroline-skyline-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/catppuccin-mocha.css b/src/workspaces/theme/css/themes/catppuccin-mocha.css
index 1d9ead23..df0c4c60 100644
--- a/src/workspaces/theme/css/themes/catppuccin-mocha.css
+++ b/src/workspaces/theme/css/themes/catppuccin-mocha.css
@@ -1,13 +1,11 @@
 /*
   Catppuccin Mocha — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/KidDogDad/omarchy-catppuccin-mocha-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #999fb9;
   --accent: #2e2e3d;
   --accent-foreground: #cdd6f4;
-  --primary: #89b4fa;
+  --primary: #94e2d5;
   --primary-foreground: #111119;
   --secondary: #2e2e3d;
   --secondary-foreground: #cdd6f4;
-  --cta: #89b4fa;
+  --cta: #94e2d5;
   --cta-foreground: #111119;
-  --ctahover: #97bdfb;
+  --ctahover: #a1e5da;
   --success: #a6e3a1;
   --success-foreground: #111119;
   --warning: #f9e2af;
@@ -42,9 +40,9 @@
   --busy-ink: #f6b7ac;
   --border: #404255;
   --input: #404255;
-  --ring: #89b4fa;
+  --ring: #94e2d5;
   --radius: 0.625rem;
-  --chart-primary: #89b4fa;
+  --chart-primary: #94e2d5;
   --chart-secondary: #f5c2e7;
   --status-success: #a6e3a1;
   --status-warning: #f9e2af;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(64 66 85 / 0.55);
   --panel-raised-bg: rgb(30 30 46 / 0.95);
   --panel-raised-border: rgb(64 66 85 / 1);
-  --panel-accent: #89b4fa;
+  --panel-accent: #94e2d5;
   --panel-header-bg: rgb(46 46 61 / 0.6);
   --panel-header-fg: #cdd6f4;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(69 71 90 / 0.85);
   --scrollbar-thin-thumb: rgb(69 71 90 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(69 71 90 / 0.7);
-  --brand: #89b4fa;
+  --brand: #94e2d5;
   --brand-foreground: #111119;
-  --brand-primary: #89b4fa;
+  --brand-primary: #94e2d5;
   --brand-accent: #94e2d5;
   --brand-warm: #f6b7ac;
   --brand-deep: #111119;
diff --git a/src/workspaces/theme/css/themes/city-783.css b/src/workspaces/theme/css/themes/city-783.css
index abbedf8d..ba5453ee 100644
--- a/src/workspaces/theme/css/themes/city-783.css
+++ b/src/workspaces/theme/css/themes/city-783.css
@@ -1,13 +1,11 @@
 /*
   City 783 — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/OldJobobo/omarchy-city-783-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/OldJobobo/omarchy-city-783-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/copper-night.css b/src/workspaces/theme/css/themes/copper-night.css
index b1d1bc32..4dfeb40f 100644
--- a/src/workspaces/theme/css/themes/copper-night.css
+++ b/src/workspaces/theme/css/themes/copper-night.css
@@ -1,34 +1,32 @@
 /*
   Copper Night — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/hembramnishant50-glitch/omarchy-coppernight-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/hembramnishant50-glitch/omarchy-coppernight-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
 [data-theme='copper-night'] {
   --background: #09090f;
-  --foreground: #e6e6e6;
+  --foreground: #cdd6f4;
   --card: #11111b;
-  --card-foreground: #e6e6e6;
+  --card-foreground: #cdd6f4;
   --popover: #11111b;
-  --popover-foreground: #e6e6e6;
+  --popover-foreground: #cdd6f4;
   --muted: #22222b;
-  --muted-foreground: #a6a6a9;
+  --muted-foreground: #959bb3;
   --accent: #22222b;
-  --accent-foreground: #e6e6e6;
-  --primary: #89b4fa;
+  --accent-foreground: #cdd6f4;
+  --primary: #94e2d5;
   --primary-foreground: #09090f;
   --secondary: #22222b;
-  --secondary-foreground: #e6e6e6;
-  --cta: #89b4fa;
+  --secondary-foreground: #cdd6f4;
+  --cta: #94e2d5;
   --cta-foreground: #09090f;
-  --ctahover: #97bdfb;
+  --ctahover: #a1e5da;
   --success: #a6e3a1;
   --success-foreground: #09090f;
   --warning: #f9e2af;
@@ -40,11 +38,11 @@
   --busy: #f6b7ac;
   --busy-foreground: #09090f;
   --busy-ink: #f6b7ac;
-  --border: #3b3b43;
-  --input: #3b3b43;
-  --ring: #89b4fa;
+  --border: #363846;
+  --input: #363846;
+  --ring: #94e2d5;
   --radius: 0.625rem;
-  --chart-primary: #89b4fa;
+  --chart-primary: #94e2d5;
   --chart-secondary: #cba6f7;
   --status-success: #a6e3a1;
   --status-warning: #f9e2af;
@@ -52,48 +50,48 @@
   --page-bg: #09090f;
   --page-bg-src: '';
   --panel-bg: rgb(17 17 27 / 0.72);
-  --panel-border: rgb(59 59 67 / 0.9);
-  --panel-border-bare: rgb(59 59 67 / 0.55);
+  --panel-border: rgb(54 56 70 / 0.9);
+  --panel-border-bare: rgb(54 56 70 / 0.55);
   --panel-raised-bg: rgb(17 17 27 / 0.95);
-  --panel-raised-border: rgb(59 59 67 / 1);
-  --panel-accent: #89b4fa;
+  --panel-raised-border: rgb(54 56 70 / 1);
+  --panel-accent: #94e2d5;
   --panel-header-bg: rgb(34 34 43 / 0.6);
-  --panel-header-fg: #e6e6e6;
+  --panel-header-fg: #cdd6f4;
   --panel-radius: 0.75rem;
   --panel-blur: 12px;
   --card-bg: #11111b;
   --glass-bg: rgb(17 17 27 / 0.55);
-  --glass-border: rgb(59 59 67 / 0.7);
+  --glass-border: rgb(54 56 70 / 0.7);
   --dock-bg: rgb(17 17 27 / 0.7);
-  --dock-border: rgb(59 59 67 / 0.8);
+  --dock-border: rgb(54 56 70 / 0.8);
   --dock-tooltip-bg: #22222b;
   --header-bg: rgb(17 17 27 / 0.8);
-  --header-border: rgb(59 59 67 / 0.9);
-  --header-fg: #e6e6e6;
+  --header-border: rgb(54 56 70 / 0.9);
+  --header-fg: #cdd6f4;
   --header-blur: 12px;
-  --pixel-grid-color: rgb(113 113 118 / 0.07);
-  --card-grid-color: rgb(113 113 118 / 0.05);
-  --panel-grid-color: rgb(113 113 118 / 0.06);
+  --pixel-grid-color: rgb(102 106 125 / 0.07);
+  --card-grid-color: rgb(102 106 125 / 0.05);
+  --panel-grid-color: rgb(102 106 125 / 0.06);
   --scrollbar-thumb: rgb(88 91 112 / 0.6);
   --scrollbar-thumb-hover: rgb(88 91 112 / 0.85);
   --scrollbar-thin-thumb: rgb(88 91 112 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(88 91 112 / 0.7);
-  --brand: #89b4fa;
+  --brand: #94e2d5;
   --brand-foreground: #09090f;
-  --brand-primary: #89b4fa;
+  --brand-primary: #94e2d5;
   --brand-accent: #94e2d5;
   --brand-warm: #f6b7ac;
   --brand-deep: #09090f;
   --brand-muted: #585b70;
-  --ink: #e6e6e6;
+  --ink: #cdd6f4;
   --surface-warm: #11111b;
   --naturegreen: #a6e3a1;
   --naturegreen-foreground: #09090f;
-  --duck-dark: #e6e6e6;
+  --duck-dark: #cdd6f4;
   --duck-teal: #94e2d5;
   --duck-yellow: #f9e2af;
   --duck-orange: #f6b7ac;
   --duck-forest: #a6e3a1;
-  --duck-beige: #26262f;
+  --duck-beige: #242531;
   --logo-src: '/officer-logo.svg';
 }
diff --git a/src/workspaces/theme/css/themes/cpunk.css b/src/workspaces/theme/css/themes/cpunk.css
index e937afd3..de91d812 100644
--- a/src/workspaces/theme/css/themes/cpunk.css
+++ b/src/workspaces/theme/css/themes/cpunk.css
@@ -1,13 +1,11 @@
 /*
   Cpunk — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/stannorbvb-cmd/cpunk (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/stannorbvb-cmd/cpunk (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b4b3b3;
   --accent: #161515;
   --accent-foreground: #ffffff;
-  --primary: #aaacac;
+  --primary: #e8e9e9;
   --primary-foreground: #020202;
   --secondary: #161515;
   --secondary-foreground: #ffffff;
-  --cta: #aaacac;
+  --cta: #e8e9e9;
   --cta-foreground: #020202;
-  --ctahover: #b4b6b6;
+  --ctahover: #ebecec;
   --success: #d1d2d1;
   --success-foreground: #020202;
   --warning: #fef348;
@@ -42,9 +40,9 @@
   --busy-ink: #fb8f39;
   --border: #353434;
   --input: #353434;
-  --ring: #aaacac;
+  --ring: #e8e9e9;
   --radius: 0.625rem;
-  --chart-primary: #aaacac;
+  --chart-primary: #e8e9e9;
   --chart-secondary: #f76e78;
   --status-success: #d1d2d1;
   --status-warning: #fef348;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(53 52 52 / 0.55);
   --panel-raised-bg: rgb(4 3 3 / 0.95);
   --panel-raised-border: rgb(53 52 52 / 1);
-  --panel-accent: #aaacac;
+  --panel-accent: #e8e9e9;
   --panel-header-bg: rgb(22 21 21 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(127 110 110 / 0.85);
   --scrollbar-thin-thumb: rgb(127 110 110 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(127 110 110 / 0.7);
-  --brand: #aaacac;
+  --brand: #e8e9e9;
   --brand-foreground: #020202;
-  --brand-primary: #aaacac;
+  --brand-primary: #e8e9e9;
   --brand-accent: #babbbb;
   --brand-warm: #fb8f39;
   --brand-deep: #020202;
diff --git a/src/workspaces/theme/css/themes/crimson.css b/src/workspaces/theme/css/themes/crimson.css
index efc884dc..5edc84f7 100644
--- a/src/workspaces/theme/css/themes/crimson.css
+++ b/src/workspaces/theme/css/themes/crimson.css
@@ -1,13 +1,11 @@
 /*
   Crimson — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/tahfizhabib/omarchy-crimson-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #bab9bc;
   --accent: #2a2631;
   --accent-foreground: #ffffff;
-  --primary: #9e96c0;
+  --primary: #e7e3ed;
   --primary-foreground: #0e0c12;
   --secondary: #2a2631;
   --secondary-foreground: #ffffff;
-  --cta: #9e96c0;
+  --cta: #e7e3ed;
   --cta-foreground: #0e0c12;
-  --ctahover: #aaa3c8;
+  --ctahover: #eae6ef;
   --success: #e48a3e;
   --success-foreground: #0e0c12;
   --warning: #da884a;
@@ -42,9 +40,9 @@
   --busy-ink: #c68061;
   --border: #47444c;
   --input: #47444c;
-  --ring: #9e96c0;
+  --ring: #e7e3ed;
   --radius: 0.625rem;
-  --chart-primary: #9e96c0;
+  --chart-primary: #e7e3ed;
   --chart-secondary: #bba7be;
   --status-success: #e48a3e;
   --status-warning: #da884a;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(71 68 76 / 0.55);
   --panel-raised-bg: rgb(26 22 33 / 0.95);
   --panel-raised-border: rgb(71 68 76 / 1);
-  --panel-accent: #9e96c0;
+  --panel-accent: #e7e3ed;
   --panel-header-bg: rgb(42 38 49 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(76 71 86 / 0.85);
   --scrollbar-thin-thumb: rgb(76 71 86 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(76 71 86 / 0.7);
-  --brand: #9e96c0;
+  --brand: #e7e3ed;
   --brand-foreground: #0e0c12;
-  --brand-primary: #9e96c0;
+  --brand-primary: #e7e3ed;
   --brand-accent: #b7acc8;
   --brand-warm: #c68061;
   --brand-deep: #0e0c12;
diff --git a/src/workspaces/theme/css/themes/dark-xp.css b/src/workspaces/theme/css/themes/dark-xp.css
index 59b287d6..0609dee7 100644
--- a/src/workspaces/theme/css/themes/dark-xp.css
+++ b/src/workspaces/theme/css/themes/dark-xp.css
@@ -1,13 +1,11 @@
 /*
   Dark XP — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/ITSZXY/dark-xp-omarchy (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/dayfox.css b/src/workspaces/theme/css/themes/dayfox.css
index 77a13929..c1b85203 100644
--- a/src/workspaces/theme/css/themes/dayfox.css
+++ b/src/workspaces/theme/css/themes/dayfox.css
@@ -1,13 +1,11 @@
 /*
   Dayfox — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Light theme (light), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Light theme (light), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/defer/omarchy-dayfox-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/dead-space.css b/src/workspaces/theme/css/themes/dead-space.css
index eaa96275..cf0a991e 100644
--- a/src/workspaces/theme/css/themes/dead-space.css
+++ b/src/workspaces/theme/css/themes/dead-space.css
@@ -1,13 +1,11 @@
 /*
   Dead Space — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/atif-1402/omarchy-deadspace-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b3b3b3;
   --accent: #131313;
   --accent-foreground: #ffffff;
-  --primary: #c1baba;
+  --primary: #f6f5f5;
   --primary-foreground: #010101;
   --secondary: #131313;
   --secondary-foreground: #ffffff;
-  --cta: #c1baba;
+  --cta: #f6f5f5;
   --cta-foreground: #010101;
-  --ctahover: #c8c2c2;
+  --ctahover: #f7f6f6;
   --success: #a49a9a;
   --success-foreground: #010101;
   --warning: #b2aaaa;
@@ -42,9 +40,9 @@
   --busy-ink: #a49a9a;
   --border: #333333;
   --input: #333333;
-  --ring: #c1baba;
+  --ring: #f6f5f5;
   --radius: 0.625rem;
-  --chart-primary: #c1baba;
+  --chart-primary: #f6f5f5;
   --chart-secondary: #cfcaca;
   --status-success: #a49a9a;
   --status-warning: #b2aaaa;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(51 51 51 / 0.55);
   --panel-raised-bg: rgb(1 1 1 / 0.95);
   --panel-raised-border: rgb(51 51 51 / 1);
-  --panel-accent: #c1baba;
+  --panel-accent: #f6f5f5;
   --panel-header-bg: rgb(19 19 19 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(221 219 219 / 0.85);
   --scrollbar-thin-thumb: rgb(221 219 219 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(221 219 219 / 0.7);
-  --brand: #c1baba;
+  --brand: #f6f5f5;
   --brand-foreground: #010101;
-  --brand-primary: #c1baba;
+  --brand-primary: #f6f5f5;
   --brand-accent: #dedada;
   --brand-warm: #a49a9a;
   --brand-deep: #010101;
diff --git a/src/workspaces/theme/css/themes/deckard.css b/src/workspaces/theme/css/themes/deckard.css
index f128b9da..3df224c0 100644
--- a/src/workspaces/theme/css/themes/deckard.css
+++ b/src/workspaces/theme/css/themes/deckard.css
@@ -1,13 +1,11 @@
 /*
   Deckard — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/OldJobobo/omarchy-deckard-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/OldJobobo/omarchy-deckard-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a7b2ac;
   --accent: #122e56;
   --accent-foreground: #eef1d7;
-  --primary: #1fb1a5;
+  --primary: #d4fcfc;
   --primary-foreground: #001128;
   --secondary: #122e56;
   --secondary-foreground: #eef1d7;
-  --cta: #1fb1a5;
+  --cta: #d4fcfc;
   --cta-foreground: #001128;
-  --ctahover: #3abab0;
+  --ctahover: #d9fcfc;
   --success: #5a9f72;
   --success-foreground: #001128;
   --warning: #d2df6f;
@@ -42,9 +40,9 @@
   --busy-ink: #ca9741;
   --border: #2f4765;
   --input: #2f4765;
-  --ring: #1fb1a5;
+  --ring: #d4fcfc;
   --radius: 0.625rem;
-  --chart-primary: #1fb1a5;
+  --chart-primary: #d4fcfc;
   --chart-secondary: #4b64fd;
   --status-success: #5a9f72;
   --status-warning: #d2df6f;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(47 71 101 / 0.55);
   --panel-raised-bg: rgb(0 30 73 / 0.95);
   --panel-raised-border: rgb(47 71 101 / 1);
-  --panel-accent: #1fb1a5;
+  --panel-accent: #d4fcfc;
   --panel-header-bg: rgb(18 46 86 / 0.6);
   --panel-header-fg: #eef1d7;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(63 116 192 / 0.85);
   --scrollbar-thin-thumb: rgb(63 116 192 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(63 116 192 / 0.7);
-  --brand: #1fb1a5;
+  --brand: #d4fcfc;
   --brand-foreground: #001128;
-  --brand-primary: #1fb1a5;
+  --brand-primary: #d4fcfc;
   --brand-accent: #83f0f1;
   --brand-warm: #ca9741;
   --brand-deep: #001128;
diff --git a/src/workspaces/theme/css/themes/delete.css b/src/workspaces/theme/css/themes/delete.css
index c91bffd0..57c6e386 100644
--- a/src/workspaces/theme/css/themes/delete.css
+++ b/src/workspaces/theme/css/themes/delete.css
@@ -1,13 +1,11 @@
 /*
   Delete — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/signaldirective/delete-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/signaldirective/delete-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #afafb8;
   --accent: #22242e;
   --accent-foreground: #f2f1fa;
-  --primary: #7575aa;
+  --primary: #e2e3ee;
   --primary-foreground: #090b11;
   --secondary: #22242e;
   --secondary-foreground: #f2f1fa;
-  --cta: #7575aa;
+  --cta: #e2e3ee;
   --cta-foreground: #090b11;
-  --ctahover: #8686b4;
+  --ctahover: #e5e6f0;
   --success: #7f86b8;
   --success-foreground: #090b11;
   --warning: #a19ece;
@@ -42,9 +40,9 @@
   --busy-ink: #a6a3d3;
   --border: #3d3f49;
   --input: #3d3f49;
-  --ring: #7575aa;
+  --ring: #e2e3ee;
   --radius: 0.625rem;
-  --chart-primary: #7575aa;
+  --chart-primary: #e2e3ee;
   --chart-secondary: #9895c7;
   --status-success: #7f86b8;
   --status-warning: #a19ece;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(61 63 73 / 0.55);
   --panel-raised-bg: rgb(17 20 30 / 0.95);
   --panel-raised-border: rgb(61 63 73 / 1);
-  --panel-accent: #7575aa;
+  --panel-accent: #e2e3ee;
   --panel-header-bg: rgb(34 36 46 / 0.6);
   --panel-header-fg: #f2f1fa;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(122 130 154 / 0.85);
   --scrollbar-thin-thumb: rgb(122 130 154 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(122 130 154 / 0.7);
-  --brand: #7575aa;
+  --brand: #e2e3ee;
   --brand-foreground: #090b11;
-  --brand-primary: #7575aa;
+  --brand-primary: #e2e3ee;
   --brand-accent: #a9accb;
   --brand-warm: #a6a3d3;
   --brand-deep: #090b11;
diff --git a/src/workspaces/theme/css/themes/delorean.css b/src/workspaces/theme/css/themes/delorean.css
index 5999ff83..9d5c5a12 100644
--- a/src/workspaces/theme/css/themes/delorean.css
+++ b/src/workspaces/theme/css/themes/delorean.css
@@ -1,13 +1,11 @@
 /*
   Delorean — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/jbnunn/omarchy-delorean-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b2afb8;
   --accent: #1e1431;
   --accent-foreground: #f9f9f9;
-  --primary: #01cdfe;
+  --primary: #52fff7;
   --primary-foreground: #070112;
   --secondary: #1e1431;
   --secondary-foreground: #f9f9f9;
-  --cta: #01cdfe;
+  --cta: #52fff7;
   --cta-foreground: #070112;
-  --ctahover: #1fd3fe;
+  --ctahover: #67fff8;
   --success: #05ffa1;
   --success-foreground: #070112;
   --warning: #fffb96;
@@ -42,9 +40,9 @@
   --busy-ink: #ff9382;
   --border: #3b324b;
   --input: #3b324b;
-  --ring: #01cdfe;
+  --ring: #52fff7;
   --radius: 0.625rem;
-  --chart-primary: #01cdfe;
+  --chart-primary: #52fff7;
   --chart-secondary: #b967ff;
   --status-success: #05ffa1;
   --status-warning: #fffb96;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(59 50 75 / 0.55);
   --panel-raised-bg: rgb(13 2 33 / 0.95);
   --panel-raised-border: rgb(59 50 75 / 1);
-  --panel-accent: #01cdfe;
+  --panel-accent: #52fff7;
   --panel-header-bg: rgb(30 20 49 / 0.6);
   --panel-header-fg: #f9f9f9;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(76 26 87 / 0.85);
   --scrollbar-thin-thumb: rgb(76 26 87 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(76 26 87 / 0.7);
-  --brand: #01cdfe;
+  --brand: #52fff7;
   --brand-foreground: #070112;
-  --brand-primary: #01cdfe;
+  --brand-primary: #52fff7;
   --brand-accent: #05ffa1;
   --brand-warm: #ff9382;
   --brand-deep: #070112;
diff --git a/src/workspaces/theme/css/themes/demon.css b/src/workspaces/theme/css/themes/demon.css
index 7bfe5eca..82b545fc 100644
--- a/src/workspaces/theme/css/themes/demon.css
+++ b/src/workspaces/theme/css/themes/demon.css
@@ -1,13 +1,11 @@
 /*
   Demon — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/HANCORE-linux/omarchy-demon-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/HANCORE-linux/omarchy-demon-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a1998c;
   --accent: #202020;
   --accent-foreground: #e0d4c2;
-  --primary: #5c624b;
-  --primary-foreground: #e3d8c8;
+  --primary: #7a7d80;
+  --primary-foreground: #080808;
   --secondary: #202020;
   --secondary-foreground: #e0d4c2;
-  --cta: #5c624b;
-  --cta-foreground: #e3d8c8;
-  --ctahover: #707561;
+  --cta: #7a7d80;
+  --cta-foreground: #080808;
+  --ctahover: #8a8d8f;
   --success: #586259;
   --success-foreground: #e3d8c8;
   --warning: #e24c00;
@@ -42,9 +40,9 @@
   --busy-ink: #d44826;
   --border: #383632;
   --input: #383632;
-  --ring: #5c624b;
+  --ring: #7a7d80;
   --radius: 0.625rem;
-  --chart-primary: #5c624b;
+  --chart-primary: #7a7d80;
   --chart-secondary: #655e56;
   --status-success: #586259;
   --status-warning: #e24c00;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(56 54 50 / 0.55);
   --panel-raised-bg: rgb(15 15 15 / 0.95);
   --panel-raised-border: rgb(56 54 50 / 1);
-  --panel-accent: #5c624b;
+  --panel-accent: #7a7d80;
   --panel-header-bg: rgb(32 32 32 / 0.6);
   --panel-header-fg: #e0d4c2;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(107 104 103 / 0.85);
   --scrollbar-thin-thumb: rgb(107 104 103 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(107 104 103 / 0.7);
-  --brand: #5c624b;
-  --brand-foreground: #e3d8c8;
-  --brand-primary: #5c624b;
+  --brand: #7a7d80;
+  --brand-foreground: #080808;
+  --brand-primary: #7a7d80;
   --brand-accent: #7a7d80;
   --brand-warm: #cf340e;
   --brand-deep: #080808;
diff --git a/src/workspaces/theme/css/themes/dotrb.css b/src/workspaces/theme/css/themes/dotrb.css
index 41f36c3d..aa3ea506 100644
--- a/src/workspaces/theme/css/themes/dotrb.css
+++ b/src/workspaces/theme/css/themes/dotrb.css
@@ -1,13 +1,11 @@
 /*
   Dotrb — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/dotsilva/omarchy-dotrb-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/dotsilva/omarchy-dotrb-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b1b1b1;
   --accent: #232323;
   --accent-foreground: #f5f5f5;
-  --primary: #4a8b8b;
+  --primary: #b4b4b4;
   --primary-foreground: #0a0a0a;
   --secondary: #232323;
   --secondary-foreground: #f5f5f5;
-  --cta: #4a8b8b;
+  --cta: #b4b4b4;
   --cta-foreground: #0a0a0a;
-  --ctahover: #609999;
+  --ctahover: #bdbdbd;
   --success: #b14242;
   --success-foreground: #f5f5f5;
   --warning: #f0be66;
@@ -42,9 +40,9 @@
   --busy-ink: #e3964e;
   --border: #3f3f3f;
   --input: #3f3f3f;
-  --ring: #4a8b8b;
+  --ring: #b4b4b4;
   --radius: 0.625rem;
-  --chart-primary: #4a8b8b;
+  --chart-primary: #b4b4b4;
   --chart-secondary: #a7a7a7;
   --status-success: #b14242;
   --status-warning: #f0be66;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(63 63 63 / 0.55);
   --panel-raised-bg: rgb(18 18 18 / 0.95);
   --panel-raised-border: rgb(63 63 63 / 1);
-  --panel-accent: #4a8b8b;
+  --panel-accent: #b4b4b4;
   --panel-header-bg: rgb(35 35 35 / 0.6);
   --panel-header-fg: #f5f5f5;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(148 148 148 / 0.85);
   --scrollbar-thin-thumb: rgb(148 148 148 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(148 148 148 / 0.7);
-  --brand: #4a8b8b;
+  --brand: #b4b4b4;
   --brand-foreground: #0a0a0a;
-  --brand-primary: #4a8b8b;
+  --brand-primary: #b4b4b4;
   --brand-accent: #b4b4b4;
   --brand-warm: #e3964e;
   --brand-deep: #0a0a0a;
diff --git a/src/workspaces/theme/css/themes/drac.css b/src/workspaces/theme/css/themes/drac.css
index 984f2937..39237eab 100644
--- a/src/workspaces/theme/css/themes/drac.css
+++ b/src/workspaces/theme/css/themes/drac.css
@@ -1,13 +1,11 @@
 /*
   Drac — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/ShehabShaef/omarchy-drac-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #aeb1ba;
   --accent: #212437;
   --accent-foreground: #f2f4f8;
-  --primary: #50fa7b;
+  --primary: #a4ffff;
   --primary-foreground: #090b16;
   --secondary: #212437;
   --secondary-foreground: #f2f4f8;
-  --cta: #50fa7b;
+  --cta: #a4ffff;
   --cta-foreground: #090b16;
-  --ctahover: #65fb8b;
+  --ctahover: #afffff;
   --success: #1e90ff;
   --success-foreground: #090b16;
   --warning: #f1fa8c;
@@ -42,9 +40,9 @@
   --busy-ink: #f8a871;
   --border: #3c4051;
   --input: #3c4051;
-  --ring: #50fa7b;
+  --ring: #a4ffff;
   --radius: 0.625rem;
-  --chart-primary: #50fa7b;
+  --chart-primary: #a4ffff;
   --chart-secondary: #ff79c6;
   --status-success: #1e90ff;
   --status-warning: #f1fa8c;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(60 64 81 / 0.55);
   --panel-raised-bg: rgb(16 20 40 / 0.95);
   --panel-raised-border: rgb(60 64 81 / 1);
-  --panel-accent: #50fa7b;
+  --panel-accent: #a4ffff;
   --panel-header-bg: rgb(33 36 55 / 0.6);
   --panel-header-fg: #f2f4f8;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(85 85 85 / 0.85);
   --scrollbar-thin-thumb: rgb(85 85 85 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(85 85 85 / 0.7);
-  --brand: #50fa7b;
+  --brand: #a4ffff;
   --brand-foreground: #090b16;
-  --brand-primary: #50fa7b;
+  --brand-primary: #a4ffff;
   --brand-accent: #8be9fd;
   --brand-warm: #f8a871;
   --brand-deep: #090b16;
diff --git a/src/workspaces/theme/css/themes/dracula.css b/src/workspaces/theme/css/themes/dracula.css
index 88d84dc2..eec86018 100644
--- a/src/workspaces/theme/css/themes/dracula.css
+++ b/src/workspaces/theme/css/themes/dracula.css
@@ -1,13 +1,11 @@
 /*
   Dracula — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/catlee/omarchy-dracula-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #bababa;
   --accent: #373944;
   --accent-foreground: #f8f8f2;
-  --primary: #bd93f9;
+  --primary: #a4ffff;
   --primary-foreground: #16171e;
   --secondary: #373944;
   --secondary-foreground: #f8f8f2;
-  --cta: #bd93f9;
+  --cta: #a4ffff;
   --cta-foreground: #16171e;
-  --ctahover: #c5a0fa;
+  --ctahover: #afffff;
   --success: #50fa7b;
   --success-foreground: #16171e;
   --warning: #f1fa8c;
@@ -42,9 +40,9 @@
   --busy-ink: #f8a871;
   --border: #51525b;
   --input: #51525b;
-  --ring: #bd93f9;
+  --ring: #a4ffff;
   --radius: 0.625rem;
-  --chart-primary: #bd93f9;
+  --chart-primary: #a4ffff;
   --chart-secondary: #ff79c6;
   --status-success: #50fa7b;
   --status-warning: #f1fa8c;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(81 82 91 / 0.55);
   --panel-raised-bg: rgb(40 42 54 / 0.95);
   --panel-raised-border: rgb(81 82 91 / 1);
-  --panel-accent: #bd93f9;
+  --panel-accent: #a4ffff;
   --panel-header-bg: rgb(55 57 68 / 0.6);
   --panel-header-fg: #f8f8f2;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(98 114 164 / 0.85);
   --scrollbar-thin-thumb: rgb(98 114 164 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(98 114 164 / 0.7);
-  --brand: #bd93f9;
+  --brand: #a4ffff;
   --brand-foreground: #16171e;
-  --brand-primary: #bd93f9;
+  --brand-primary: #a4ffff;
   --brand-accent: #8be9fd;
   --brand-warm: #f8a871;
   --brand-deep: #16171e;
diff --git a/src/workspaces/theme/css/themes/dragon.css b/src/workspaces/theme/css/themes/dragon.css
index b5132a6f..c84dbcbb 100644
--- a/src/workspaces/theme/css/themes/dragon.css
+++ b/src/workspaces/theme/css/themes/dragon.css
@@ -1,13 +1,11 @@
 /*
   Dragon — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/thatmechguy/omarchy-dragon-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #aca49c;
   --accent: #281e25;
   --accent-foreground: #ebe5d6;
-  --primary: #5298c4;
+  --primary: #95caca;
   --primary-foreground: #0d070c;
   --secondary: #281e25;
   --secondary-foreground: #ebe5d6;
-  --cta: #5298c4;
+  --cta: #95caca;
   --cta-foreground: #0d070c;
-  --ctahover: #67a4cb;
+  --ctahover: #a2d0d0;
   --success: #78a682;
   --success-foreground: #0d070c;
   --warning: #f7e1c7;
@@ -42,9 +40,9 @@
   --busy-ink: #fb8f91;
   --border: #41373b;
   --input: #41373b;
-  --ring: #5298c4;
+  --ring: #95caca;
   --radius: 0.625rem;
-  --chart-primary: #5298c4;
+  --chart-primary: #95caca;
   --chart-secondary: #c479a9;
   --status-success: #78a682;
   --status-warning: #f7e1c7;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(65 55 59 / 0.55);
   --panel-raised-bg: rgb(24 13 21 / 0.95);
   --panel-raised-border: rgb(65 55 59 / 1);
-  --panel-accent: #5298c4;
+  --panel-accent: #95caca;
   --panel-header-bg: rgb(40 30 37 / 0.6);
   --panel-header-fg: #ebe5d6;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(58 26 34 / 0.85);
   --scrollbar-thin-thumb: rgb(58 26 34 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(58 26 34 / 0.7);
-  --brand: #5298c4;
+  --brand: #95caca;
   --brand-foreground: #0d070c;
-  --brand-primary: #5298c4;
+  --brand-primary: #95caca;
   --brand-accent: #7abaa9;
   --brand-warm: #fb8f91;
   --brand-deep: #0d070c;
diff --git a/src/workspaces/theme/css/themes/dreamwave.css b/src/workspaces/theme/css/themes/dreamwave.css
index 210fd3e7..364363fc 100644
--- a/src/workspaces/theme/css/themes/dreamwave.css
+++ b/src/workspaces/theme/css/themes/dreamwave.css
@@ -1,13 +1,11 @@
 /*
   Dreamwave — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/RiO7MAKK3R/omarchy-dreamwave-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #afa6b8;
   --accent: #1b1826;
   --accent-foreground: #f5eafd;
-  --primary: #ca2cb0;
-  --primary-foreground: #ffffff;
+  --primary: #e37bd1;
+  --primary-foreground: #06040c;
   --secondary: #1b1826;
   --secondary-foreground: #f5eafd;
-  --cta: #ca2cb0;
-  --cta-foreground: #ffffff;
-  --ctahover: #d045b9;
+  --cta: #e37bd1;
+  --cta-foreground: #06040c;
+  --ctahover: #e68bd7;
   --success: #7f049e;
   --success-foreground: #f5eafd;
   --warning: #790aac;
@@ -42,9 +40,9 @@
   --busy-ink: #b154ad;
   --border: #383443;
   --input: #383443;
-  --ring: #ca2cb0;
+  --ring: #e37bd1;
   --radius: 0.625rem;
-  --chart-primary: #ca2cb0;
+  --chart-primary: #e37bd1;
   --chart-secondary: #a604e9;
   --status-success: #7f049e;
   --status-warning: #790aac;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(56 52 67 / 0.55);
   --panel-raised-bg: rgb(10 7 22 / 0.95);
   --panel-raised-border: rgb(56 52 67 / 1);
-  --panel-accent: #ca2cb0;
+  --panel-accent: #e37bd1;
   --panel-header-bg: rgb(27 24 38 / 0.6);
   --panel-header-fg: #f5eafd;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(140 83 183 / 0.85);
   --scrollbar-thin-thumb: rgb(140 83 183 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(140 83 183 / 0.7);
-  --brand: #ca2cb0;
-  --brand-foreground: #ffffff;
-  --brand-primary: #ca2cb0;
+  --brand: #e37bd1;
+  --brand-foreground: #06040c;
+  --brand-primary: #e37bd1;
   --brand-accent: #c429b2;
   --brand-warm: #900b8a;
   --brand-deep: #06040c;
diff --git a/src/workspaces/theme/css/themes/ember-n-ash.css b/src/workspaces/theme/css/themes/ember-n-ash.css
index fb16137a..cda78ec6 100644
--- a/src/workspaces/theme/css/themes/ember-n-ash.css
+++ b/src/workspaces/theme/css/themes/ember-n-ash.css
@@ -1,13 +1,11 @@
 /*
   Ember N Ash — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/Hydradevx/omarchy-ember-n-ash-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/eva-unit-01.css b/src/workspaces/theme/css/themes/eva-unit-01.css
index 305af7ef..3ac0ccc7 100644
--- a/src/workspaces/theme/css/themes/eva-unit-01.css
+++ b/src/workspaces/theme/css/themes/eva-unit-01.css
@@ -1,13 +1,11 @@
 /*
   Eva Unit 01 — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/OldJobobo/omarchy-01-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/OldJobobo/omarchy-01-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a79cbc;
   --accent: #30243e;
   --accent-foreground: #e1d6f8;
-  --primary: #ce67f0;
+  --primary: #a4d2ec;
   --primary-foreground: #120b1a;
   --secondary: #30243e;
   --secondary-foreground: #e1d6f8;
-  --cta: #ce67f0;
+  --cta: #a4d2ec;
   --cta-foreground: #120b1a;
-  --ctahover: #d479f2;
+  --ctahover: #afd7ee;
   --success: #8edf5f;
   --success-foreground: #120b1a;
   --warning: #d99145;
@@ -42,9 +40,9 @@
   --busy-ink: #cc5f39;
   --border: #463a57;
   --input: #463a57;
-  --ring: #ce67f0;
+  --ring: #a4d2ec;
   --radius: 0.625rem;
-  --chart-primary: #ce67f0;
+  --chart-primary: #a4d2ec;
   --chart-secondary: #875faf;
   --status-success: #8edf5f;
   --status-warning: #d99145;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(70 58 87 / 0.55);
   --panel-raised-bg: rgb(32 20 48 / 0.95);
   --panel-raised-border: rgb(70 58 87 / 1);
-  --panel-accent: #ce67f0;
+  --panel-accent: #a4d2ec;
   --panel-header-bg: rgb(48 36 62 / 0.6);
   --panel-header-fg: #e1d6f8;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(161 160 173 / 0.85);
   --scrollbar-thin-thumb: rgb(161 160 173 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(161 160 173 / 0.7);
-  --brand: #ce67f0;
+  --brand: #a4d2ec;
   --brand-foreground: #120b1a;
-  --brand-primary: #ce67f0;
+  --brand-primary: #a4d2ec;
   --brand-accent: #9dafd1;
   --brand-warm: #cc5f39;
   --brand-deep: #120b1a;
diff --git a/src/workspaces/theme/css/themes/event-horizon.css b/src/workspaces/theme/css/themes/event-horizon.css
index e5897dc0..319ad3ea 100644
--- a/src/workspaces/theme/css/themes/event-horizon.css
+++ b/src/workspaces/theme/css/themes/event-horizon.css
@@ -1,13 +1,11 @@
 /*
   Event Horizon — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/OldJobobo/omarchy-event-horizon-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/OldJobobo/omarchy-event-horizon-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #97999d;
   --accent: #2c2e35;
   --accent-foreground: #cbced0;
-  --primary: #26bbd9;
+  --primary: #6be4e6;
   --primary-foreground: #0f1115;
   --secondary: #2c2e35;
   --secondary-foreground: #cbced0;
-  --cta: #26bbd9;
+  --cta: #6be4e6;
   --cta-foreground: #0f1115;
-  --ctahover: #40c3de;
+  --ctahover: #7de7e9;
   --success: #29d398;
   --success-foreground: #0f1115;
   --warning: #fac29a;
@@ -42,9 +40,9 @@
   --busy-ink: #f28c89;
   --border: #3e4047;
   --input: #3e4047;
-  --ring: #26bbd9;
+  --ring: #6be4e6;
   --radius: 0.625rem;
-  --chart-primary: #26bbd9;
+  --chart-primary: #6be4e6;
   --chart-secondary: #ee64ac;
   --status-success: #29d398;
   --status-warning: #fac29a;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(62 64 71 / 0.55);
   --panel-raised-bg: rgb(28 30 38 / 0.95);
   --panel-raised-border: rgb(62 64 71 / 1);
-  --panel-accent: #26bbd9;
+  --panel-accent: #6be4e6;
   --panel-header-bg: rgb(44 46 53 / 0.6);
   --panel-header-fg: #cbced0;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(111 111 112 / 0.85);
   --scrollbar-thin-thumb: rgb(111 111 112 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(111 111 112 / 0.7);
-  --brand: #26bbd9;
+  --brand: #6be4e6;
   --brand-foreground: #0f1115;
-  --brand-primary: #26bbd9;
+  --brand-primary: #6be4e6;
   --brand-accent: #59e1e3;
   --brand-warm: #f28c89;
   --brand-deep: #0f1115;
diff --git a/src/workspaces/theme/css/themes/everblush.css b/src/workspaces/theme/css/themes/everblush.css
index 512f0c8c..7c651e1b 100644
--- a/src/workspaces/theme/css/themes/everblush.css
+++ b/src/workspaces/theme/css/themes/everblush.css
@@ -1,13 +1,11 @@
 /*
   Everblush — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/Swarnim114/omarchy-everblush-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #9fa1a2;
   --accent: #242b2e;
   --accent-foreground: #dadada;
-  --primary: #67b0e8;
+  --primary: #6cbfbf;
   --primary-foreground: #0b0f11;
   --secondary: #242b2e;
   --secondary-foreground: #dadada;
-  --cta: #67b0e8;
+  --cta: #6cbfbf;
   --cta-foreground: #0b0f11;
-  --ctahover: #79b9eb;
+  --ctahover: #7ec7c7;
   --success: #8ccf7e;
   --success-foreground: #0b0f11;
   --warning: #e5c76b;
@@ -42,9 +40,9 @@
   --busy-ink: #e59e70;
   --border: #3b4143;
   --input: #3b4143;
-  --ring: #67b0e8;
+  --ring: #6cbfbf;
   --radius: 0.625rem;
-  --chart-primary: #67b0e8;
+  --chart-primary: #6cbfbf;
   --chart-secondary: #c47fd5;
   --status-success: #8ccf7e;
   --status-warning: #e5c76b;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(59 65 67 / 0.55);
   --panel-raised-bg: rgb(20 27 30 / 0.95);
   --panel-raised-border: rgb(59 65 67 / 1);
-  --panel-accent: #67b0e8;
+  --panel-accent: #6cbfbf;
   --panel-header-bg: rgb(36 43 46 / 0.6);
   --panel-header-fg: #dadada;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(35 42 45 / 0.85);
   --scrollbar-thin-thumb: rgb(35 42 45 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(35 42 45 / 0.7);
-  --brand: #67b0e8;
+  --brand: #6cbfbf;
   --brand-foreground: #0b0f11;
-  --brand-primary: #67b0e8;
+  --brand-primary: #6cbfbf;
   --brand-accent: #6cbfbf;
   --brand-warm: #e59e70;
   --brand-deep: #0b0f11;
diff --git a/src/workspaces/theme/css/themes/farline.css b/src/workspaces/theme/css/themes/farline.css
index a83f75b5..c7eea7e1 100644
--- a/src/workspaces/theme/css/themes/farline.css
+++ b/src/workspaces/theme/css/themes/farline.css
@@ -1,13 +1,11 @@
 /*
   Farline — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/atif-1402/omarchy-farline-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a0a5a4;
   --accent: #323438;
   --accent-foreground: #d6dcd9;
-  --primary: #879ab0;
+  --primary: #90bcba;
   --primary-foreground: #131417;
   --secondary: #323438;
   --secondary-foreground: #d6dcd9;
-  --cta: #879ab0;
+  --cta: #90bcba;
   --cta-foreground: #131417;
-  --ctahover: #95a6b9;
+  --ctahover: #9dc4c2;
   --success: #9bab8c;
   --success-foreground: #131417;
   --warning: #b1b195;
@@ -42,9 +40,9 @@
   --busy-ink: #ab9b8d;
   --border: #46494b;
   --input: #46494b;
-  --ring: #879ab0;
+  --ring: #90bcba;
   --radius: 0.625rem;
-  --chart-primary: #879ab0;
+  --chart-primary: #90bcba;
   --chart-secondary: #bea7ad;
   --status-success: #9bab8c;
   --status-warning: #b1b195;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(70 73 75 / 0.55);
   --panel-raised-bg: rgb(35 37 41 / 0.95);
   --panel-raised-border: rgb(70 73 75 / 1);
-  --panel-accent: #879ab0;
+  --panel-accent: #90bcba;
   --panel-header-bg: rgb(50 52 56 / 0.6);
   --panel-header-fg: #d6dcd9;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(120 124 135 / 0.85);
   --scrollbar-thin-thumb: rgb(120 124 135 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(120 124 135 / 0.7);
-  --brand: #879ab0;
+  --brand: #90bcba;
   --brand-foreground: #131417;
-  --brand-primary: #879ab0;
+  --brand-primary: #90bcba;
   --brand-accent: #7eadac;
   --brand-warm: #ab9b8d;
   --brand-deep: #131417;
diff --git a/src/workspaces/theme/css/themes/felix.css b/src/workspaces/theme/css/themes/felix.css
index ac52bdec..05175bb3 100644
--- a/src/workspaces/theme/css/themes/felix.css
+++ b/src/workspaces/theme/css/themes/felix.css
@@ -1,13 +1,11 @@
 /*
   Felix — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/TyRichards/omarchy-felix-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/TyRichards/omarchy-felix-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a2a3a4;
   --accent: #121212;
   --accent-foreground: #e7e9ea;
-  --primary: #626262;
-  --primary-foreground: #e7e9ea;
+  --primary: #9e9e9e;
+  --primary-foreground: #000000;
   --secondary: #121212;
   --secondary-foreground: #e7e9ea;
-  --cta: #626262;
-  --cta-foreground: #e7e9ea;
-  --ctahover: #757575;
+  --cta: #9e9e9e;
+  --cta-foreground: #000000;
+  --ctahover: #aaaaaa;
   --success: #e7e9ea;
   --success-foreground: #000000;
   --warning: #9e9e9e;
@@ -42,9 +40,9 @@
   --busy-ink: #949494;
   --border: #2d2e2e;
   --input: #2d2e2e;
-  --ring: #626262;
+  --ring: #9e9e9e;
   --radius: 0.625rem;
-  --chart-primary: #626262;
+  --chart-primary: #9e9e9e;
   --chart-secondary: #8a8a8a;
   --status-success: #e7e9ea;
   --status-warning: #9e9e9e;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(45 46 46 / 0.55);
   --panel-raised-bg: rgb(0 0 0 / 0.95);
   --panel-raised-border: rgb(45 46 46 / 1);
-  --panel-accent: #626262;
+  --panel-accent: #9e9e9e;
   --panel-header-bg: rgb(18 18 18 / 0.6);
   --panel-header-fg: #e7e9ea;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(98 98 98 / 0.85);
   --scrollbar-thin-thumb: rgb(98 98 98 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(98 98 98 / 0.7);
-  --brand: #626262;
-  --brand-foreground: #e7e9ea;
-  --brand-primary: #626262;
+  --brand: #9e9e9e;
+  --brand-foreground: #000000;
+  --brand-primary: #9e9e9e;
   --brand-accent: #767676;
   --brand-warm: #949494;
   --brand-deep: #000000;
diff --git a/src/workspaces/theme/css/themes/flat-dracula.css b/src/workspaces/theme/css/themes/flat-dracula.css
index 82d64296..dbf0e7c2 100644
--- a/src/workspaces/theme/css/themes/flat-dracula.css
+++ b/src/workspaces/theme/css/themes/flat-dracula.css
@@ -1,13 +1,11 @@
 /*
   Flat Dracula — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/OldJobobo/omarchy-flat-dracula-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/OldJobobo/omarchy-flat-dracula-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #bababa;
   --accent: #373944;
   --accent-foreground: #f8f8f2;
-  --primary: #bd93f9;
+  --primary: #a4ffff;
   --primary-foreground: #16171e;
   --secondary: #373944;
   --secondary-foreground: #f8f8f2;
-  --cta: #bd93f9;
+  --cta: #a4ffff;
   --cta-foreground: #16171e;
-  --ctahover: #c5a0fa;
+  --ctahover: #afffff;
   --success: #50fa7b;
   --success-foreground: #16171e;
   --warning: #f1fa8c;
@@ -42,9 +40,9 @@
   --busy-ink: #f8a871;
   --border: #51525b;
   --input: #51525b;
-  --ring: #bd93f9;
+  --ring: #a4ffff;
   --radius: 0.625rem;
-  --chart-primary: #bd93f9;
+  --chart-primary: #a4ffff;
   --chart-secondary: #ff79c6;
   --status-success: #50fa7b;
   --status-warning: #f1fa8c;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(81 82 91 / 0.55);
   --panel-raised-bg: rgb(40 42 54 / 0.95);
   --panel-raised-border: rgb(81 82 91 / 1);
-  --panel-accent: #bd93f9;
+  --panel-accent: #a4ffff;
   --panel-header-bg: rgb(55 57 68 / 0.6);
   --panel-header-fg: #f8f8f2;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(98 114 164 / 0.85);
   --scrollbar-thin-thumb: rgb(98 114 164 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(98 114 164 / 0.7);
-  --brand: #bd93f9;
+  --brand: #a4ffff;
   --brand-foreground: #16171e;
-  --brand-primary: #bd93f9;
+  --brand-primary: #a4ffff;
   --brand-accent: #8be9fd;
   --brand-warm: #f8a871;
   --brand-deep: #16171e;
diff --git a/src/workspaces/theme/css/themes/florida-man.css b/src/workspaces/theme/css/themes/florida-man.css
index b21af872..1b5c9997 100644
--- a/src/workspaces/theme/css/themes/florida-man.css
+++ b/src/workspaces/theme/css/themes/florida-man.css
@@ -1,13 +1,11 @@
 /*
   Florida Man — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/OldJobobo/omarchy-florida-man-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/OldJobobo/omarchy-florida-man-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #aab0c6;
   --accent: #3e4253;
   --accent-foreground: #b5bfe2;
-  --primary: #8caaee;
+  --primary: #81c8be;
   --primary-foreground: #1a1d27;
   --secondary: #3e4253;
   --secondary-foreground: #b5bfe2;
-  --cta: #8caaee;
+  --cta: #81c8be;
   --cta-foreground: #1a1d27;
-  --ctahover: #9ab4f0;
+  --ctahover: #90cfc6;
   --success: #a6d189;
   --success-foreground: #1a1d27;
   --warning: #e5c890;
@@ -42,9 +40,9 @@
   --busy-ink: #e6a58a;
   --border: #4a4f65;
   --input: #4a4f65;
-  --ring: #8caaee;
+  --ring: #81c8be;
   --radius: 0.625rem;
-  --chart-primary: #8caaee;
+  --chart-primary: #81c8be;
   --chart-secondary: #ca9ee6;
   --status-success: #a6d189;
   --status-warning: #e5c890;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(74 79 101 / 0.55);
   --panel-raised-bg: rgb(48 52 70 / 0.95);
   --panel-raised-border: rgb(74 79 101 / 1);
-  --panel-accent: #8caaee;
+  --panel-accent: #81c8be;
   --panel-header-bg: rgb(62 66 83 / 0.6);
   --panel-header-fg: #b5bfe2;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(81 87 109 / 0.85);
   --scrollbar-thin-thumb: rgb(81 87 109 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(81 87 109 / 0.7);
-  --brand: #8caaee;
+  --brand: #81c8be;
   --brand-foreground: #1a1d27;
-  --brand-primary: #8caaee;
+  --brand-primary: #81c8be;
   --brand-accent: #81c8be;
   --brand-warm: #e6a58a;
   --brand-deep: #1a1d27;
diff --git a/src/workspaces/theme/css/themes/fluid-glass.css b/src/workspaces/theme/css/themes/fluid-glass.css
index 9ff17658..6cc8e1b9 100644
--- a/src/workspaces/theme/css/themes/fluid-glass.css
+++ b/src/workspaces/theme/css/themes/fluid-glass.css
@@ -1,13 +1,11 @@
 /*
   Fluid Glass — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/ripple0328/omarchy-fluid-glass-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b2b4b6;
   --accent: #202024;
   --accent-foreground: #f8fafc;
-  --primary: #0ea5e9;
+  --primary: #22d3ee;
   --primary-foreground: #08080b;
   --secondary: #202024;
   --secondary-foreground: #f8fafc;
-  --cta: #0ea5e9;
+  --cta: #22d3ee;
   --cta-foreground: #08080b;
-  --ctahover: #2bb0ec;
+  --ctahover: #3dd8f0;
   --success: #10b981;
   --success-foreground: #08080b;
   --warning: #f59e0b;
@@ -42,9 +40,9 @@
   --busy-ink: #f27128;
   --border: #3d3d41;
   --input: #3d3d41;
-  --ring: #0ea5e9;
+  --ring: #22d3ee;
   --radius: 0.625rem;
-  --chart-primary: #0ea5e9;
+  --chart-primary: #22d3ee;
   --chart-secondary: #8b5cf6;
   --status-success: #10b981;
   --status-warning: #f59e0b;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(61 61 65 / 0.55);
   --panel-raised-bg: rgb(15 15 20 / 0.95);
   --panel-raised-border: rgb(61 61 65 / 1);
-  --panel-accent: #0ea5e9;
+  --panel-accent: #22d3ee;
   --panel-header-bg: rgb(32 32 36 / 0.6);
   --panel-header-fg: #f8fafc;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(71 85 105 / 0.85);
   --scrollbar-thin-thumb: rgb(71 85 105 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(71 85 105 / 0.7);
-  --brand: #0ea5e9;
+  --brand: #22d3ee;
   --brand-foreground: #08080b;
-  --brand-primary: #0ea5e9;
+  --brand-primary: #22d3ee;
   --brand-accent: #06b6d4;
   --brand-warm: #f27128;
   --brand-deep: #08080b;
diff --git a/src/workspaces/theme/css/themes/forest-green.css b/src/workspaces/theme/css/themes/forest-green.css
index c80e816a..3b6782ed 100644
--- a/src/workspaces/theme/css/themes/forest-green.css
+++ b/src/workspaces/theme/css/themes/forest-green.css
@@ -1,13 +1,11 @@
 /*
   Forest Green — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/abhijeet-swami/omarchy-forest-green-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #7aa977;
   --accent: #202a24;
   --accent-foreground: #a8e6a1;
-  --primary: #5fa9a8;
+  --primary: #8be9fd;
   --primary-foreground: #080e0b;
   --secondary: #202a24;
   --secondary-foreground: #a8e6a1;
-  --cta: #5fa9a8;
+  --cta: #8be9fd;
   --cta-foreground: #080e0b;
-  --ctahover: #72b3b2;
+  --ctahover: #99ecfd;
   --success: #6bbf7a;
   --success-foreground: #080e0b;
   --warning: #d7ba7d;
@@ -42,9 +40,9 @@
   --busy-ink: #dc9379;
   --border: #2d4230;
   --input: #2d4230;
-  --ring: #5fa9a8;
+  --ring: #8be9fd;
   --radius: 0.625rem;
-  --chart-primary: #5fa9a8;
+  --chart-primary: #8be9fd;
   --chart-secondary: #c678dd;
   --status-success: #6bbf7a;
   --status-warning: #d7ba7d;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(45 66 48 / 0.55);
   --panel-raised-bg: rgb(15 26 20 / 0.95);
   --panel-raised-border: rgb(45 66 48 / 1);
-  --panel-accent: #5fa9a8;
+  --panel-accent: #8be9fd;
   --panel-header-bg: rgb(32 42 36 / 0.6);
   --panel-header-fg: #a8e6a1;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(58 74 61 / 0.85);
   --scrollbar-thin-thumb: rgb(58 74 61 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(58 74 61 / 0.7);
-  --brand: #5fa9a8;
+  --brand: #8be9fd;
   --brand-foreground: #080e0b;
-  --brand-primary: #5fa9a8;
+  --brand-primary: #8be9fd;
   --brand-accent: #56b6c2;
   --brand-warm: #dc9379;
   --brand-deep: #080e0b;
diff --git a/src/workspaces/theme/css/themes/glory-antic.css b/src/workspaces/theme/css/themes/glory-antic.css
index 5129100b..fb47b641 100644
--- a/src/workspaces/theme/css/themes/glory-antic.css
+++ b/src/workspaces/theme/css/themes/glory-antic.css
@@ -1,13 +1,11 @@
 /*
   Glory Antic — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/clement-rtfm/glory-antic (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b2afae;
   --accent: #282421;
   --accent-foreground: #f4f2f1;
-  --primary: #cf9b68;
+  --primary: #ddcd7e;
   --primary-foreground: #0d0a09;
   --secondary: #282421;
   --secondary-foreground: #f4f2f1;
-  --cta: #cf9b68;
+  --cta: #ddcd7e;
   --cta-foreground: #0d0a09;
-  --ctahover: #d5a77a;
+  --ctahover: #e1d38d;
   --success: #cd6a6a;
   --success-foreground: #0d0a09;
   --warning: #cf8677;
@@ -42,9 +40,9 @@
   --busy-ink: #c87071;
   --border: #433f3c;
   --input: #433f3c;
-  --ring: #cf9b68;
+  --ring: #ddcd7e;
   --radius: 0.625rem;
-  --chart-primary: #cf9b68;
+  --chart-primary: #ddcd7e;
   --chart-secondary: #d6be8f;
   --status-success: #cd6a6a;
   --status-warning: #cf8677;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(67 63 60 / 0.55);
   --panel-raised-bg: rgb(24 19 16 / 0.95);
   --panel-raised-border: rgb(67 63 60 / 1);
-  --panel-accent: #cf9b68;
+  --panel-accent: #ddcd7e;
   --panel-header-bg: rgb(40 36 33 / 0.6);
   --panel-header-fg: #f4f2f1;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(132 109 98 / 0.85);
   --scrollbar-thin-thumb: rgb(132 109 98 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(132 109 98 / 0.7);
-  --brand: #cf9b68;
+  --brand: #ddcd7e;
   --brand-foreground: #0d0a09;
-  --brand-primary: #cf9b68;
+  --brand-primary: #ddcd7e;
   --brand-accent: #cdbc6a;
   --brand-warm: #c87071;
   --brand-deep: #0d0a09;
diff --git a/src/workspaces/theme/css/themes/gold-rush.css b/src/workspaces/theme/css/themes/gold-rush.css
index 639c2f2e..6e9e5454 100644
--- a/src/workspaces/theme/css/themes/gold-rush.css
+++ b/src/workspaces/theme/css/themes/gold-rush.css
@@ -1,13 +1,11 @@
 /*
   Gold Rush — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/tahayvr/omarchy-gold-rush-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/tahayvr/omarchy-gold-rush-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #9d9d9d;
   --accent: #232323;
   --accent-foreground: #d9d9d9;
-  --primary: #926c15;
-  --primary-foreground: #f9f9f9;
+  --primary: #dbb42c;
+  --primary-foreground: #0a0a0a;
   --secondary: #232323;
   --secondary-foreground: #d9d9d9;
-  --cta: #926c15;
-  --cta-foreground: #f9f9f9;
-  --ctahover: #9f7e31;
+  --cta: #dbb42c;
+  --cta-foreground: #0a0a0a;
+  --ctahover: #dfbd45;
   --success: #a47e1b;
   --success-foreground: #0a0a0a;
   --warning: #fad643;
@@ -42,9 +40,9 @@
   --busy-ink: #ebc538;
   --border: #393939;
   --input: #393939;
-  --ring: #926c15;
+  --ring: #dbb42c;
   --radius: 0.625rem;
-  --chart-primary: #926c15;
+  --chart-primary: #dbb42c;
   --chart-secondary: #b69121;
   --status-success: #a47e1b;
   --status-warning: #fad643;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(57 57 57 / 0.55);
   --panel-raised-bg: rgb(18 18 18 / 0.95);
   --panel-raised-border: rgb(57 57 57 / 1);
-  --panel-accent: #926c15;
+  --panel-accent: #dbb42c;
   --panel-header-bg: rgb(35 35 35 / 0.6);
   --panel-header-fg: #d9d9d9;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(128 91 16 / 0.85);
   --scrollbar-thin-thumb: rgb(128 91 16 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(128 91 16 / 0.7);
-  --brand: #926c15;
-  --brand-foreground: #f9f9f9;
-  --brand-primary: #926c15;
+  --brand: #dbb42c;
+  --brand-foreground: #0a0a0a;
+  --brand-primary: #dbb42c;
   --brand-accent: #805b10;
   --brand-warm: #ebc538;
   --brand-deep: #0a0a0a;
diff --git a/src/workspaces/theme/css/themes/gornergrat-station.css b/src/workspaces/theme/css/themes/gornergrat-station.css
new file mode 100644
index 00000000..747ff14b
--- /dev/null
+++ b/src/workspaces/theme/css/themes/gornergrat-station.css
@@ -0,0 +1,97 @@
+/*
+  Gornergrat Station — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
+
+  Light theme (light), by luminance of its own background — the source repo carries no mode flag of its own to read.
+
+  Source: https://gitlab.com/bhavabhuthi/omarchy-gornergrat-station-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
+
+  DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
+*/
+[data-theme='gornergrat-station'] {
+  --background: #cad0d8;
+  --foreground: #0b1626;
+  --card: #c3c9d0;
+  --card-foreground: #0b1626;
+  --popover: #c3c9d0;
+  --popover-foreground: #0b1626;
+  --muted: #bec4cb;
+  --muted-foreground: #444e5b;
+  --accent: #bec4cb;
+  --accent-foreground: #0b1626;
+  --primary: #19293f;
+  --primary-foreground: #b6bbc2;
+  --secondary: #bec4cb;
+  --secondary-foreground: #0b1626;
+  --cta: #19293f;
+  --cta-foreground: #b6bbc2;
+  --ctahover: #162437;
+  --success: #2a5f5f;
+  --success-foreground: #caced3;
+  --warning: #8b7355;
+  --warning-foreground: #03070b;
+  --destructive: #8b5a5a;
+  --destructive-foreground: #e7e8e9;
+  --info: #21477a;
+  --info-foreground: #b6bbc2;
+  --busy: #8b6758;
+  --busy-foreground: #f3f3f4;
+  --busy-ink: #6f5246;
+  --border: #adb3bc;
+  --input: #adb3bc;
+  --ring: #19293f;
+  --radius: 0.625rem;
+  --chart-primary: #19293f;
+  --chart-secondary: #536a89;
+  --status-success: #2a5f5f;
+  --status-warning: #8b7355;
+  --status-in-progress: #21477a;
+  --page-bg: #cad0d8;
+  --page-bg-src: '';
+  --panel-bg: rgb(195 201 208 / 0.72);
+  --panel-border: rgb(173 179 188 / 0.9);
+  --panel-border-bare: rgb(173 179 188 / 0.55);
+  --panel-raised-bg: rgb(195 201 208 / 0.95);
+  --panel-raised-border: rgb(173 179 188 / 1);
+  --panel-accent: #19293f;
+  --panel-header-bg: rgb(190 196 203 / 0.6);
+  --panel-header-fg: #0b1626;
+  --panel-radius: 0.75rem;
+  --panel-blur: 12px;
+  --card-bg: #c3c9d0;
+  --glass-bg: rgb(195 201 208 / 0.55);
+  --glass-border: rgb(173 179 188 / 0.7);
+  --dock-bg: rgb(195 201 208 / 0.7);
+  --dock-border: rgb(173 179 188 / 0.8);
+  --dock-tooltip-bg: #bec4cb;
+  --header-bg: rgb(195 201 208 / 0.8);
+  --header-border: rgb(173 179 188 / 0.9);
+  --header-fg: #0b1626;
+  --header-blur: 12px;
+  --pixel-grid-color: rgb(104 112 122 / 0.07);
+  --card-grid-color: rgb(104 112 122 / 0.05);
+  --panel-grid-color: rgb(104 112 122 / 0.06);
+  --scrollbar-thumb: rgb(168 178 192 / 0.6);
+  --scrollbar-thumb-hover: rgb(168 178 192 / 0.85);
+  --scrollbar-thin-thumb: rgb(168 178 192 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(168 178 192 / 0.7);
+  --brand: #19293f;
+  --brand-foreground: #b6bbc2;
+  --brand-primary: #19293f;
+  --brand-accent: #274369;
+  --brand-warm: #8b6758;
+  --brand-deep: #bec4cb;
+  --brand-muted: #a8b2c0;
+  --ink: #0b1626;
+  --surface-warm: #c3c9d0;
+  --naturegreen: #2a5f5f;
+  --naturegreen-foreground: #caced3;
+  --duck-dark: #0b1626;
+  --duck-teal: #274369;
+  --duck-yellow: #8b7355;
+  --duck-orange: #8b6758;
+  --duck-forest: #2a5f5f;
+  --duck-beige: #b1b7bf;
+  --logo-src: '/officer-logo.svg';
+}
diff --git a/src/workspaces/theme/css/themes/gotham-city.css b/src/workspaces/theme/css/themes/gotham-city.css
index f4954f39..4152b720 100644
--- a/src/workspaces/theme/css/themes/gotham-city.css
+++ b/src/workspaces/theme/css/themes/gotham-city.css
@@ -1,13 +1,11 @@
 /*
   Gotham City — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/JustArmaan/omarchy-gotham-city-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #999a9c;
   --accent: #202429;
   --accent-foreground: #d4d4d4;
-  --primary: #5c7a8c;
-  --primary-foreground: #030406;
+  --primary: #88b3bd;
+  --primary-foreground: #080b0e;
   --secondary: #202429;
   --secondary-foreground: #d4d4d4;
-  --cta: #5c7a8c;
-  --cta-foreground: #030406;
-  --ctahover: #708a9a;
+  --cta: #88b3bd;
+  --cta-foreground: #080b0e;
+  --ctahover: #96bcc5;
   --success: #7a9b76;
   --success-foreground: #080b0e;
   --warning: #d9b768;
@@ -42,9 +40,9 @@
   --busy-ink: #d78959;
   --border: #363a3e;
   --input: #363a3e;
-  --ring: #5c7a8c;
+  --ring: #88b3bd;
   --radius: 0.625rem;
-  --chart-primary: #5c7a8c;
+  --chart-primary: #88b3bd;
   --chart-secondary: #8c6a7a;
   --status-success: #7a9b76;
   --status-warning: #d9b768;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(54 58 62 / 0.55);
   --panel-raised-bg: rgb(15 20 25 / 0.95);
   --panel-raised-border: rgb(54 58 62 / 1);
-  --panel-accent: #5c7a8c;
+  --panel-accent: #88b3bd;
   --panel-header-bg: rgb(32 36 41 / 0.6);
   --panel-header-fg: #d4d4d4;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(61 69 82 / 0.85);
   --scrollbar-thin-thumb: rgb(61 69 82 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(61 69 82 / 0.7);
-  --brand: #5c7a8c;
-  --brand-foreground: #030406;
-  --brand-primary: #5c7a8c;
+  --brand: #88b3bd;
+  --brand-foreground: #080b0e;
+  --brand-primary: #88b3bd;
   --brand-accent: #6b9199;
   --brand-warm: #d78959;
   --brand-deep: #080b0e;
diff --git a/src/workspaces/theme/css/themes/greek-noir.css b/src/workspaces/theme/css/themes/greek-noir.css
index 25972485..063f97ad 100644
--- a/src/workspaces/theme/css/themes/greek-noir.css
+++ b/src/workspaces/theme/css/themes/greek-noir.css
@@ -1,13 +1,11 @@
 /*
   Greek Noir — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/HANCORE-linux/omarchy-greek-noir-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/HANCORE-linux/omarchy-greek-noir-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/green-city.css b/src/workspaces/theme/css/themes/green-city.css
index fd90301b..5465b197 100644
--- a/src/workspaces/theme/css/themes/green-city.css
+++ b/src/workspaces/theme/css/themes/green-city.css
@@ -1,13 +1,11 @@
 /*
   Green City — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/zillamtt/omarchy-green-city (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #9faca9;
   --accent: #1c2523;
   --accent-foreground: #dfede9;
-  --primary: #249762;
+  --primary: #cde998;
   --primary-foreground: #060c0a;
   --secondary: #1c2523;
   --secondary-foreground: #dfede9;
-  --cta: #249762;
+  --cta: #cde998;
   --cta-foreground: #060c0a;
-  --ctahover: #3ea375;
+  --ctahover: #d3eca4;
   --success: #67cd3b;
   --success-foreground: #060c0a;
   --warning: #289347;
@@ -42,9 +40,9 @@
   --busy-ink: #36a243;
   --border: #343f3c;
   --input: #343f3c;
-  --ring: #249762;
+  --ring: #cde998;
   --radius: 0.625rem;
-  --chart-primary: #249762;
+  --chart-primary: #cde998;
   --chart-secondary: #47aa4a;
   --status-success: #67cd3b;
   --status-warning: #289347;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(52 63 60 / 0.55);
   --panel-raised-bg: rgb(11 21 18 / 0.95);
   --panel-raised-border: rgb(52 63 60 / 1);
-  --panel-accent: #249762;
+  --panel-accent: #cde998;
   --panel-header-bg: rgb(28 37 35 / 0.6);
   --panel-header-fg: #dfede9;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(109 140 131 / 0.85);
   --scrollbar-thin-thumb: rgb(109 140 131 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(109 140 131 / 0.7);
-  --brand: #249762;
+  --brand: #cde998;
   --brand-foreground: #060c0a;
-  --brand-primary: #249762;
+  --brand-primary: #cde998;
   --brand-accent: #a4d744;
   --brand-warm: #36a243;
   --brand-deep: #060c0a;
diff --git a/src/workspaces/theme/css/themes/green-garden.css b/src/workspaces/theme/css/themes/green-garden.css
index 65e42b36..0ab56e0e 100644
--- a/src/workspaces/theme/css/themes/green-garden.css
+++ b/src/workspaces/theme/css/themes/green-garden.css
@@ -1,13 +1,11 @@
 /*
   Green Garden — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/kalk-ak/omarchy-Green-Garden-theme (ghostty.conf), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b4b2a2;
   --accent: #2d362f;
   --accent-foreground: #f5eeda;
-  --primary: #649ed3;
+  --primary: #b3fff7;
   --primary-foreground: #101511;
   --secondary: #2d362f;
   --secondary-foreground: #f5eeda;
-  --cta: #649ed3;
+  --cta: #b3fff7;
   --cta-foreground: #101511;
-  --ctahover: #77aad8;
+  --ctahover: #bcfff8;
   --success: #95b86f;
   --success-foreground: #101511;
   --warning: #e8b36f;
@@ -42,9 +40,9 @@
   --busy-ink: #e1916f;
   --border: #474e44;
   --input: #474e44;
-  --ring: #649ed3;
+  --ring: #b3fff7;
   --radius: 0.625rem;
-  --chart-primary: #649ed3;
+  --chart-primary: #b3fff7;
   --chart-secondary: #f09d73;
   --status-success: #95b86f;
   --status-warning: #e8b36f;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(71 78 68 / 0.55);
   --panel-raised-bg: rgb(29 39 31 / 0.95);
   --panel-raised-border: rgb(71 78 68 / 1);
-  --panel-accent: #649ed3;
+  --panel-accent: #b3fff7;
   --panel-header-bg: rgb(45 54 47 / 0.6);
   --panel-header-fg: #f5eeda;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(107 123 105 / 0.85);
   --scrollbar-thin-thumb: rgb(107 123 105 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(107 123 105 / 0.7);
-  --brand: #649ed3;
+  --brand: #b3fff7;
   --brand-foreground: #101511;
-  --brand-primary: #649ed3;
+  --brand-primary: #b3fff7;
   --brand-accent: #a0f0e8;
   --brand-warm: #e1916f;
   --brand-deep: #101511;
diff --git a/src/workspaces/theme/css/themes/gruber-tsoding.css b/src/workspaces/theme/css/themes/gruber-tsoding.css
index f1dd3058..fbb966d5 100644
--- a/src/workspaces/theme/css/themes/gruber-tsoding.css
+++ b/src/workspaces/theme/css/themes/gruber-tsoding.css
@@ -1,13 +1,11 @@
 /*
   Gruber Tsoding — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/davide-ferrara/omarchy-gruberdark-tsoding-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/grudark.css b/src/workspaces/theme/css/themes/grudark.css
index 5d03669e..6e46692c 100644
--- a/src/workspaces/theme/css/themes/grudark.css
+++ b/src/workspaces/theme/css/themes/grudark.css
@@ -1,13 +1,11 @@
 /*
   Grudark — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/zillamtt/omarchy-grudark (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #babbb9;
   --accent: #2d302e;
   --accent-foreground: #fdfdfb;
-  --primary: #88c2ce;
+  --primary: #ddf4f4;
   --primary-foreground: #101211;
   --secondary: #2d302e;
   --secondary-foreground: #fdfdfb;
-  --cta: #88c2ce;
+  --cta: #ddf4f4;
   --cta-foreground: #101211;
-  --ctahover: #96c9d4;
+  --ctahover: #e1f5f5;
   --success: #89ae92;
   --success-foreground: #101211;
   --warning: #dacf6d;
@@ -42,9 +40,9 @@
   --busy-ink: #bfaa79;
   --border: #494b49;
   --input: #494b49;
-  --ring: #88c2ce;
+  --ring: #ddf4f4;
   --radius: 0.625rem;
-  --chart-primary: #88c2ce;
+  --chart-primary: #ddf4f4;
   --chart-secondary: #b3b0b5;
   --status-success: #89ae92;
   --status-warning: #dacf6d;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(73 75 73 / 0.55);
   --panel-raised-bg: rgb(29 32 30 / 0.95);
   --panel-raised-border: rgb(73 75 73 / 1);
-  --panel-accent: #88c2ce;
+  --panel-accent: #ddf4f4;
   --panel-header-bg: rgb(45 48 46 / 0.6);
   --panel-header-fg: #fdfdfb;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(79 84 81 / 0.85);
   --scrollbar-thin-thumb: rgb(79 84 81 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(79 84 81 / 0.7);
-  --brand: #88c2ce;
+  --brand: #ddf4f4;
   --brand-foreground: #101211;
-  --brand-primary: #88c2ce;
+  --brand-primary: #ddf4f4;
   --brand-accent: #9adadb;
   --brand-warm: #bfaa79;
   --brand-deep: #101211;
diff --git a/src/workspaces/theme/css/themes/harbor.css b/src/workspaces/theme/css/themes/harbor.css
index 862a2eb3..2b21c892 100644
--- a/src/workspaces/theme/css/themes/harbor.css
+++ b/src/workspaces/theme/css/themes/harbor.css
@@ -1,13 +1,11 @@
 /*
   Harbor — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Light theme (light), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Light theme (light), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/HANCORE-linux/omarchy-harbor-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/HANCORE-linux/omarchy-harbor-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/hex.css b/src/workspaces/theme/css/themes/hex.css
index 77ce6e77..60ebbe02 100644
--- a/src/workspaces/theme/css/themes/hex.css
+++ b/src/workspaces/theme/css/themes/hex.css
@@ -1,13 +1,11 @@
 /*
   Hex — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/OldJobobo/omarchy-hex-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/OldJobobo/omarchy-hex-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/himalaya.css b/src/workspaces/theme/css/themes/himalaya.css
index 81f63071..74cccd92 100644
--- a/src/workspaces/theme/css/themes/himalaya.css
+++ b/src/workspaces/theme/css/themes/himalaya.css
@@ -1,13 +1,11 @@
 /*
   Himalaya — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/rondilley/omarchy-himalaya-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b7b7b6;
   --accent: #201f1c;
   --accent-foreground: #ffffff;
-  --primary: #6cb3ee;
+  --primary: #dedfde;
   --primary-foreground: #080806;
   --secondary: #201f1c;
   --secondary-foreground: #ffffff;
-  --cta: #6cb3ee;
+  --cta: #dedfde;
   --cta-foreground: #080806;
-  --ctahover: #7ebcf0;
+  --ctahover: #e2e3e2;
   --success: #4a8ad7;
   --success-foreground: #080806;
   --warning: #5d9fe2;
@@ -42,9 +40,9 @@
   --busy-ink: #508dd6;
   --border: #3e3d3b;
   --input: #3e3d3b;
-  --ring: #6cb3ee;
+  --ring: #dedfde;
   --radius: 0.625rem;
-  --chart-primary: #6cb3ee;
+  --chart-primary: #dedfde;
   --chart-secondary: #73b2e5;
   --status-success: #4a8ad7;
   --status-warning: #5d9fe2;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(62 61 59 / 0.55);
   --panel-raised-bg: rgb(15 14 11 / 0.95);
   --panel-raised-border: rgb(62 61 59 / 1);
-  --panel-accent: #6cb3ee;
+  --panel-accent: #dedfde;
   --panel-header-bg: rgb(32 31 28 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(135 155 169 / 0.85);
   --scrollbar-thin-thumb: rgb(135 155 169 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(135 155 169 / 0.7);
-  --brand: #6cb3ee;
+  --brand: #dedfde;
   --brand-foreground: #080806;
-  --brand-primary: #6cb3ee;
+  --brand-primary: #dedfde;
   --brand-accent: #abacab;
   --brand-warm: #508dd6;
   --brand-deep: #080806;
diff --git a/src/workspaces/theme/css/themes/hinterlands.css b/src/workspaces/theme/css/themes/hinterlands.css
index 27abca58..5e579c64 100644
--- a/src/workspaces/theme/css/themes/hinterlands.css
+++ b/src/workspaces/theme/css/themes/hinterlands.css
@@ -1,13 +1,11 @@
 /*
   Hinterlands — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/OldJobobo/omarchy-hinterlands-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/OldJobobo/omarchy-hinterlands-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #bdbdbd;
   --accent: #313131;
   --accent-foreground: #ffffff;
-  --primary: #686868;
-  --primary-foreground: #ffffff;
+  --primary: #868686;
+  --primary-foreground: #131313;
   --secondary: #313131;
   --secondary-foreground: #ffffff;
-  --cta: #686868;
-  --cta-foreground: #ffffff;
-  --ctahover: #7a7a7a;
+  --cta: #868686;
+  --cta-foreground: #131313;
+  --ctahover: #959595;
   --success: #8b8b8b;
   --success-foreground: #131313;
   --warning: #a0a0a0;
@@ -42,9 +40,9 @@
   --busy-ink: #8e8e8e;
   --border: #4d4d4d;
   --input: #4d4d4d;
-  --ring: #686868;
+  --ring: #868686;
   --radius: 0.625rem;
-  --chart-primary: #686868;
+  --chart-primary: #868686;
   --chart-secondary: #747474;
   --status-success: #8b8b8b;
   --status-warning: #a0a0a0;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(77 77 77 / 0.55);
   --panel-raised-bg: rgb(34 34 34 / 0.95);
   --panel-raised-border: rgb(77 77 77 / 1);
-  --panel-accent: #686868;
+  --panel-accent: #868686;
   --panel-header-bg: rgb(49 49 49 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(82 82 82 / 0.85);
   --scrollbar-thin-thumb: rgb(82 82 82 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(82 82 82 / 0.7);
-  --brand: #686868;
-  --brand-foreground: #ffffff;
-  --brand-primary: #686868;
+  --brand: #868686;
+  --brand-foreground: #131313;
+  --brand-primary: #868686;
   --brand-accent: #868686;
   --brand-warm: #8e8e8e;
   --brand-deep: #131313;
diff --git a/src/workspaces/theme/css/themes/infernium-dark.css b/src/workspaces/theme/css/themes/infernium-dark.css
index 054e5cf0..2f207648 100644
--- a/src/workspaces/theme/css/themes/infernium-dark.css
+++ b/src/workspaces/theme/css/themes/infernium-dark.css
@@ -1,13 +1,11 @@
 /*
   Infernium Dark — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/RiO7MAKK3R/omarchy-infernium-dark-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a5a5a5;
   --accent: #2c2c2c;
   --accent-foreground: #e0e0e0;
-  --primary: #aeb1c0;
+  --primary: #f7d383;
   --primary-foreground: #0f0f0f;
   --secondary: #2c2c2c;
   --secondary-foreground: #e0e0e0;
-  --cta: #aeb1c0;
+  --cta: #f7d383;
   --cta-foreground: #0f0f0f;
-  --ctahover: #b8bac8;
+  --ctahover: #f8d892;
   --success: #767476;
   --success-foreground: #ffffff;
   --warning: #f7d383;
@@ -42,9 +40,9 @@
   --busy-ink: #e79e5e;
   --border: #424242;
   --input: #424242;
-  --ring: #aeb1c0;
+  --ring: #f7d383;
   --radius: 0.625rem;
-  --chart-primary: #aeb1c0;
+  --chart-primary: #f7d383;
   --chart-secondary: #ba6435;
   --status-success: #767476;
   --status-warning: #f7d383;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(66 66 66 / 0.55);
   --panel-raised-bg: rgb(28 28 28 / 0.95);
   --panel-raised-border: rgb(66 66 66 / 1);
-  --panel-accent: #aeb1c0;
+  --panel-accent: #f7d383;
   --panel-header-bg: rgb(44 44 44 / 0.6);
   --panel-header-fg: #e0e0e0;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(118 116 118 / 0.85);
   --scrollbar-thin-thumb: rgb(118 116 118 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(118 116 118 / 0.7);
-  --brand: #aeb1c0;
+  --brand: #f7d383;
   --brand-foreground: #0f0f0f;
-  --brand-primary: #aeb1c0;
+  --brand-primary: #f7d383;
   --brand-accent: #e99867;
   --brand-warm: #e79e5e;
   --brand-deep: #0f0f0f;
diff --git a/src/workspaces/theme/css/themes/infernium.css b/src/workspaces/theme/css/themes/infernium.css
index 913f40cd..863cc3a2 100644
--- a/src/workspaces/theme/css/themes/infernium.css
+++ b/src/workspaces/theme/css/themes/infernium.css
@@ -1,13 +1,11 @@
 /*
   Infernium — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Light theme (light), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Light theme (light), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/RiO7MAKK3R/omarchy-infernium-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/killer-klowns.css b/src/workspaces/theme/css/themes/killer-klowns.css
index ec5467ba..432ce482 100644
--- a/src/workspaces/theme/css/themes/killer-klowns.css
+++ b/src/workspaces/theme/css/themes/killer-klowns.css
@@ -1,13 +1,11 @@
 /*
   Killer Klowns — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/Deoxizn/omarchy-killer-klowns-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/Deoxizn/omarchy-killer-klowns-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a29ea3;
   --accent: #231725;
   --accent-foreground: #e0e0e0;
-  --primary: #ff1493;
+  --primary: #7fffd4;
   --primary-foreground: #0a030c;
   --secondary: #231725;
   --secondary-foreground: #e0e0e0;
-  --cta: #ff1493;
+  --cta: #7fffd4;
   --cta-foreground: #0a030c;
-  --ctahover: #ff30a0;
+  --ctahover: #8effd9;
   --success: #39ff14;
   --success-foreground: #0a030c;
   --warning: #ffff00;
@@ -42,9 +40,9 @@
   --busy-ink: #ee8a1e;
   --border: #3a303d;
   --input: #3a303d;
-  --ring: #ff1493;
+  --ring: #7fffd4;
   --radius: 0.625rem;
-  --chart-primary: #ff1493;
+  --chart-primary: #7fffd4;
   --chart-secondary: #bf00ff;
   --status-success: #39ff14;
   --status-warning: #ffff00;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(58 48 61 / 0.55);
   --panel-raised-bg: rgb(18 5 21 / 0.95);
   --panel-raised-border: rgb(58 48 61 / 1);
-  --panel-accent: #ff1493;
+  --panel-accent: #7fffd4;
   --panel-header-bg: rgb(35 23 37 / 0.6);
   --panel-header-fg: #e0e0e0;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(75 0 130 / 0.85);
   --scrollbar-thin-thumb: rgb(75 0 130 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(75 0 130 / 0.7);
-  --brand: #ff1493;
+  --brand: #7fffd4;
   --brand-foreground: #0a030c;
-  --brand-primary: #ff1493;
+  --brand-primary: #7fffd4;
   --brand-accent: #00ffff;
   --brand-warm: #ee8a1e;
   --brand-deep: #0a030c;
diff --git a/src/workspaces/theme/css/themes/kurayami.css b/src/workspaces/theme/css/themes/kurayami.css
index 8b254759..8e752321 100644
--- a/src/workspaces/theme/css/themes/kurayami.css
+++ b/src/workspaces/theme/css/themes/kurayami.css
@@ -1,13 +1,11 @@
 /*
   Kurayami — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/bjornramberg/omarchy-kurayami-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/bjornramberg/omarchy-kurayami-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #bec0bd;
   --accent: #3b3d36;
   --accent-foreground: #fdfefd;
-  --primary: #c6d0b6;
+  --primary: #ebefe5;
   --primary-foreground: #181915;
   --secondary: #3b3d36;
   --secondary-foreground: #fdfefd;
-  --cta: #c6d0b6;
+  --cta: #ebefe5;
   --cta-foreground: #181915;
-  --ctahover: #cdd6bf;
+  --ctahover: #edf1e8;
   --success: #d2dfc1;
   --success-foreground: #181915;
   --warning: #dfdfb9;
@@ -42,9 +40,9 @@
   --busy-ink: #dccea0;
   --border: #555751;
   --input: #555751;
-  --ring: #c6d0b6;
+  --ring: #ebefe5;
   --radius: 0.625rem;
-  --chart-primary: #c6d0b6;
+  --chart-primary: #ebefe5;
   --chart-secondary: #cfc9af;
   --status-success: #d2dfc1;
   --status-warning: #dfdfb9;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(85 87 81 / 0.55);
   --panel-raised-bg: rgb(44 46 39 / 0.95);
   --panel-raised-border: rgb(85 87 81 / 1);
-  --panel-accent: #c6d0b6;
+  --panel-accent: #ebefe5;
   --panel-header-bg: rgb(59 61 54 / 0.6);
   --panel-header-fg: #fdfefd;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(162 164 154 / 0.85);
   --scrollbar-thin-thumb: rgb(162 164 154 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(162 164 154 / 0.7);
-  --brand: #c6d0b6;
+  --brand: #ebefe5;
   --brand-foreground: #181915;
-  --brand-primary: #c6d0b6;
+  --brand-primary: #ebefe5;
   --brand-accent: #c1cead;
   --brand-warm: #dccea0;
   --brand-deep: #181915;
diff --git a/src/workspaces/theme/css/themes/lain.css b/src/workspaces/theme/css/themes/lain.css
index b7399857..cc5a5b4d 100644
--- a/src/workspaces/theme/css/themes/lain.css
+++ b/src/workspaces/theme/css/themes/lain.css
@@ -1,13 +1,11 @@
 /*
   Lain — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/ITSZXY/lain-omarchy (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #948882;
   --accent: #151414;
   --accent-foreground: #d2c1b9;
-  --primary: #c16a7f;
+  --primary: #d07489;
   --primary-foreground: #020101;
   --secondary: #151414;
   --secondary-foreground: #d2c1b9;
-  --cta: #c16a7f;
+  --cta: #d07489;
   --cta-foreground: #020101;
-  --ctahover: #c87c8e;
+  --ctahover: #d68597;
   --success: #744b4f;
   --success-foreground: #d8c9c2;
   --warning: #955763;
@@ -42,9 +40,9 @@
   --busy-ink: #996d76;
   --border: #2c2826;
   --input: #2c2826;
-  --ring: #c16a7f;
+  --ring: #d07489;
   --radius: 0.625rem;
-  --chart-primary: #c16a7f;
+  --chart-primary: #d07489;
   --chart-secondary: #a08876;
   --status-success: #744b4f;
   --status-warning: #955763;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(44 40 38 / 0.55);
   --panel-raised-bg: rgb(3 2 2 / 0.95);
   --panel-raised-border: rgb(44 40 38 / 1);
-  --panel-accent: #c16a7f;
+  --panel-accent: #d07489;
   --panel-header-bg: rgb(21 20 20 / 0.6);
   --panel-header-fg: #d2c1b9;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(147 135 129 / 0.85);
   --scrollbar-thin-thumb: rgb(147 135 129 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(147 135 129 / 0.7);
-  --brand: #c16a7f;
+  --brand: #d07489;
   --brand-foreground: #020101;
-  --brand-primary: #c16a7f;
+  --brand-primary: #d07489;
   --brand-accent: #d07489;
   --brand-warm: #7f4854;
   --brand-deep: #020101;
diff --git a/src/workspaces/theme/css/themes/lairetam.css b/src/workspaces/theme/css/themes/lairetam.css
index 4ac74c75..29a45a98 100644
--- a/src/workspaces/theme/css/themes/lairetam.css
+++ b/src/workspaces/theme/css/themes/lairetam.css
@@ -1,13 +1,11 @@
 /*
   Lairetam — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/chrisintheshell/omarchy-lairetam-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #bec2c3;
   --accent: #354046;
   --accent-foreground: #ffffff;
-  --primary: #37b6ff;
+  --primary: #9affe6;
   --primary-foreground: #151c1f;
   --secondary: #354046;
   --secondary-foreground: #ffffff;
-  --cta: #37b6ff;
+  --cta: #9affe6;
   --cta-foreground: #151c1f;
-  --ctahover: #4fbfff;
+  --ctahover: #a6ffe9;
   --success: #5cf19e;
   --success-foreground: #151c1f;
   --warning: #fed032;
@@ -42,9 +40,9 @@
   --busy-ink: #fd843a;
   --border: #515a5f;
   --input: #515a5f;
-  --ring: #37b6ff;
+  --ring: #9affe6;
   --radius: 0.625rem;
-  --chart-primary: #37b6ff;
+  --chart-primary: #9affe6;
   --chart-secondary: #fc226e;
   --status-success: #5cf19e;
   --status-warning: #fed032;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(81 90 95 / 0.55);
   --panel-raised-bg: rgb(38 50 56 / 0.95);
   --panel-raised-border: rgb(81 90 95 / 1);
-  --panel-accent: #37b6ff;
+  --panel-accent: #9affe6;
   --panel-header-bg: rgb(53 64 70 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(161 176 184 / 0.85);
   --scrollbar-thin-thumb: rgb(161 176 184 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(161 176 184 / 0.7);
-  --brand: #37b6ff;
+  --brand: #9affe6;
   --brand-foreground: #151c1f;
-  --brand-primary: #37b6ff;
+  --brand-primary: #9affe6;
   --brand-accent: #59ffd1;
   --brand-warm: #fd843a;
   --brand-deep: #151c1f;
diff --git a/src/workspaces/theme/css/themes/latch-dark.css b/src/workspaces/theme/css/themes/latch-dark.css
index 1d296670..1d1182ed 100644
--- a/src/workspaces/theme/css/themes/latch-dark.css
+++ b/src/workspaces/theme/css/themes/latch-dark.css
@@ -1,13 +1,11 @@
 /*
   Latch Dark — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/atif-1402/omarchy-latchdark-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/atif-1402/omarchy-latchdark-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #acacac;
   --accent: #252525;
   --accent-foreground: #edecec;
-  --primary: #aca3a3;
+  --primary: #e1dede;
   --primary-foreground: #0c0c0c;
   --secondary: #252525;
   --secondary-foreground: #edecec;
-  --cta: #aca3a3;
+  --cta: #e1dede;
   --cta-foreground: #0c0c0c;
-  --ctahover: #b6aeae;
+  --ctahover: #e5e2e2;
   --success: #a19696;
   --success-foreground: #0c0c0c;
   --warning: #9d9393;
@@ -42,9 +40,9 @@
   --busy-ink: #9c9191;
   --border: #3f3f3f;
   --input: #3f3f3f;
-  --ring: #aca3a3;
+  --ring: #e1dede;
   --radius: 0.625rem;
-  --chart-primary: #aca3a3;
+  --chart-primary: #e1dede;
   --chart-secondary: #bab3b3;
   --status-success: #a19696;
   --status-warning: #9d9393;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(63 63 63 / 0.55);
   --panel-raised-bg: rgb(21 21 21 / 0.95);
   --panel-raised-border: rgb(63 63 63 / 1);
-  --panel-accent: #aca3a3;
+  --panel-accent: #e1dede;
   --panel-header-bg: rgb(37 37 37 / 0.6);
   --panel-header-fg: #edecec;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(199 197 197 / 0.85);
   --scrollbar-thin-thumb: rgb(199 197 197 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(199 197 197 / 0.7);
-  --brand: #aca3a3;
+  --brand: #e1dede;
   --brand-foreground: #0c0c0c;
-  --brand-primary: #aca3a3;
+  --brand-primary: #e1dede;
   --brand-accent: #c9c3c3;
   --brand-warm: #9c9191;
   --brand-deep: #0c0c0c;
diff --git a/src/workspaces/theme/css/themes/latch.css b/src/workspaces/theme/css/themes/latch.css
index ebc69106..68e811df 100644
--- a/src/workspaces/theme/css/themes/latch.css
+++ b/src/workspaces/theme/css/themes/latch.css
@@ -1,13 +1,11 @@
 /*
   Latch — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Light theme (light), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Light theme (light), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/atif-1402/omarchy-latch-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/lilly.css b/src/workspaces/theme/css/themes/lilly.css
new file mode 100644
index 00000000..030c440b
--- /dev/null
+++ b/src/workspaces/theme/css/themes/lilly.css
@@ -0,0 +1,97 @@
+/*
+  Lilly — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
+
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
+
+  Source: https://github.com/JJDizz1L/lilly (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
+
+  DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
+*/
+[data-theme='lilly'] {
+  --background: #0c141c;
+  --foreground: #d9607d;
+  --card: #162533;
+  --card-foreground: #da6480;
+  --popover: #162533;
+  --popover-foreground: #da6480;
+  --muted: #263441;
+  --muted-foreground: #c18c9c;
+  --accent: #263441;
+  --accent-foreground: #e07c94;
+  --primary: #a5d4ec;
+  --primary-foreground: #0c141c;
+  --secondary: #263441;
+  --secondary-foreground: #e07c94;
+  --cta: #a5d4ec;
+  --cta-foreground: #0c141c;
+  --ctahover: #b0d9ee;
+  --success: #29a0d6;
+  --success-foreground: #0c141c;
+  --warning: #d92640;
+  --warning-foreground: #f9f9f9;
+  --destructive: #9c413e;
+  --destructive-foreground: #dbdcdd;
+  --info: #6a6a95;
+  --info-foreground: #f3f3f4;
+  --busy: #bb343f;
+  --busy-foreground: #e7e8e8;
+  --busy-ink: #c95d65;
+  --border: #3c3042;
+  --input: #3c3042;
+  --ring: #a5d4ec;
+  --radius: 0.625rem;
+  --chart-primary: #a5d4ec;
+  --chart-secondary: #96698e;
+  --status-success: #29a0d6;
+  --status-warning: #d92640;
+  --status-in-progress: #6a6a95;
+  --page-bg: #0c141c;
+  --page-bg-src: '';
+  --panel-bg: rgb(22 37 51 / 0.72);
+  --panel-border: rgb(60 48 66 / 0.9);
+  --panel-border-bare: rgb(60 48 66 / 0.55);
+  --panel-raised-bg: rgb(22 37 51 / 0.95);
+  --panel-raised-border: rgb(60 48 66 / 1);
+  --panel-accent: #a5d4ec;
+  --panel-header-bg: rgb(38 52 65 / 0.6);
+  --panel-header-fg: #da6480;
+  --panel-radius: 0.75rem;
+  --panel-blur: 12px;
+  --card-bg: #162533;
+  --glass-bg: rgb(22 37 51 / 0.55);
+  --glass-border: rgb(60 48 66 / 0.7);
+  --dock-bg: rgb(22 37 51 / 0.7);
+  --dock-border: rgb(60 48 66 / 0.8);
+  --dock-tooltip-bg: #263441;
+  --header-bg: rgb(22 37 51 / 0.8);
+  --header-border: rgb(60 48 66 / 0.9);
+  --header-fg: #da6480;
+  --header-blur: 12px;
+  --pixel-grid-color: rgb(139 102 118 / 0.07);
+  --card-grid-color: rgb(139 102 118 / 0.05);
+  --panel-grid-color: rgb(139 102 118 / 0.06);
+  --scrollbar-thumb: rgb(59 73 87 / 0.6);
+  --scrollbar-thumb-hover: rgb(59 73 87 / 0.85);
+  --scrollbar-thin-thumb: rgb(59 73 87 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(59 73 87 / 0.7);
+  --brand: #a5d4ec;
+  --brand-foreground: #0c141c;
+  --brand-primary: #a5d4ec;
+  --brand-accent: #349bcb;
+  --brand-warm: #bb343f;
+  --brand-deep: #0c141c;
+  --brand-muted: #3b4957;
+  --ink: #d9607d;
+  --surface-warm: #162533;
+  --naturegreen: #29a0d6;
+  --naturegreen-foreground: #0c141c;
+  --duck-dark: #d9607d;
+  --duck-teal: #349bcb;
+  --duck-yellow: #d92640;
+  --duck-orange: #bb343f;
+  --duck-forest: #29a0d6;
+  --duck-beige: #2a2b3a;
+  --logo-src: '/officer-logo.svg';
+}
diff --git a/src/workspaces/theme/css/themes/lowlight.css b/src/workspaces/theme/css/themes/lowlight.css
index 5fe402a0..85d61cd2 100644
--- a/src/workspaces/theme/css/themes/lowlight.css
+++ b/src/workspaces/theme/css/themes/lowlight.css
@@ -1,13 +1,11 @@
 /*
   Lowlight — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/atif-1402/omarchy-lowlight-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/atif-1402/omarchy-lowlight-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a6a1a0;
   --accent: #383232;
   --accent-foreground: #dcd7d6;
-  --primary: #a39eb8;
+  --primary: #e5e7ec;
   --primary-foreground: #171313;
   --secondary: #383232;
   --secondary-foreground: #dcd7d6;
-  --cta: #a39eb8;
+  --cta: #e5e7ec;
   --cta-foreground: #171313;
-  --ctahover: #aeaac1;
+  --ctahover: #e8eaee;
   --success: #af8a79;
   --success-foreground: #171313;
   --warning: #a88373;
@@ -42,9 +40,9 @@
   --busy-ink: #a6847c;
   --border: #4c4646;
   --input: #4c4646;
-  --ring: #a39eb8;
+  --ring: #e5e7ec;
   --radius: 0.625rem;
-  --chart-primary: #a39eb8;
+  --chart-primary: #e5e7ec;
   --chart-secondary: #bea7bd;
   --status-success: #af8a79;
   --status-warning: #a88373;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(76 70 70 / 0.55);
   --panel-raised-bg: rgb(41 35 35 / 0.95);
   --panel-raised-border: rgb(76 70 70 / 1);
-  --panel-accent: #a39eb8;
+  --panel-accent: #e5e7ec;
   --panel-header-bg: rgb(56 50 50 / 0.6);
   --panel-header-fg: #dcd7d6;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(135 120 120 / 0.85);
   --scrollbar-thin-thumb: rgb(135 120 120 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(135 120 120 / 0.7);
-  --brand: #a39eb8;
+  --brand: #e5e7ec;
   --brand-foreground: #171313;
-  --brand-primary: #a39eb8;
+  --brand-primary: #e5e7ec;
   --brand-accent: #b0b7c5;
   --brand-warm: #a6847c;
   --brand-deep: #171313;
diff --git a/src/workspaces/theme/css/themes/lunar.css b/src/workspaces/theme/css/themes/lunar.css
index d9a6adf9..c3c4d62c 100644
--- a/src/workspaces/theme/css/themes/lunar.css
+++ b/src/workspaces/theme/css/themes/lunar.css
@@ -1,13 +1,11 @@
 /*
   Lunar — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/pdfosborne/omarchy-lunar-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/manga.css b/src/workspaces/theme/css/themes/manga.css
index 04f52b56..19fb856b 100644
--- a/src/workspaces/theme/css/themes/manga.css
+++ b/src/workspaces/theme/css/themes/manga.css
@@ -1,13 +1,11 @@
 /*
   Manga — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/atif-1402/omarchy-manga-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #939292;
   --accent: #141414;
   --accent-foreground: #d1cfcf;
-  --primary: #afa6a6;
+  --primary: #dbd6d6;
   --primary-foreground: #010101;
   --secondary: #141414;
   --secondary-foreground: #d1cfcf;
-  --cta: #afa6a6;
+  --cta: #dbd6d6;
   --cta-foreground: #010101;
-  --ctahover: #b9b1b1;
+  --ctahover: #dfdbdb;
   --success: #a19797;
   --success-foreground: #010101;
   --warning: #a89e9e;
@@ -42,9 +40,9 @@
   --busy-ink: #a19696;
   --border: #2b2a2a;
   --input: #2b2a2a;
-  --ring: #afa6a6;
+  --ring: #dbd6d6;
   --radius: 0.625rem;
-  --chart-primary: #afa6a6;
+  --chart-primary: #dbd6d6;
   --chart-secondary: #9f9595;
   --status-success: #a19797;
   --status-warning: #a89e9e;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(43 42 42 / 0.55);
   --panel-raised-bg: rgb(2 2 2 / 0.95);
   --panel-raised-border: rgb(43 42 42 / 1);
-  --panel-accent: #afa6a6;
+  --panel-accent: #dbd6d6;
   --panel-header-bg: rgb(20 20 20 / 0.6);
   --panel-header-fg: #d1cfcf;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(172 167 167 / 0.85);
   --scrollbar-thin-thumb: rgb(172 167 167 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(172 167 167 / 0.7);
-  --brand: #afa6a6;
+  --brand: #dbd6d6;
   --brand-foreground: #010101;
-  --brand-primary: #afa6a6;
+  --brand-primary: #dbd6d6;
   --brand-accent: #aea5a5;
   --brand-warm: #a19696;
   --brand-deep: #010101;
diff --git a/src/workspaces/theme/css/themes/mapquest.css b/src/workspaces/theme/css/themes/mapquest.css
index e9c8f3b7..d18c9976 100644
--- a/src/workspaces/theme/css/themes/mapquest.css
+++ b/src/workspaces/theme/css/themes/mapquest.css
@@ -1,13 +1,11 @@
 /*
   Mapquest — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Light theme (light), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Light theme (light), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/ItsABigIgloo/omarchy-mapquest-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/mars.css b/src/workspaces/theme/css/themes/mars.css
index dc8e73ba..ac7fec50 100644
--- a/src/workspaces/theme/css/themes/mars.css
+++ b/src/workspaces/theme/css/themes/mars.css
@@ -1,13 +1,11 @@
 /*
   Mars — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/steve-lohmeyer/omarchy-mars-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/mecha-no-onna.css b/src/workspaces/theme/css/themes/mecha-no-onna.css
index 0fce7db6..7dd28650 100644
--- a/src/workspaces/theme/css/themes/mecha-no-onna.css
+++ b/src/workspaces/theme/css/themes/mecha-no-onna.css
@@ -1,13 +1,11 @@
 /*
   Mecha NO Onna — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/HANCORE-linux/omarchy-mechanoonna-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/HANCORE-linux/omarchy-mechanoonna-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b0a891;
   --accent: #2c2b29;
   --accent-foreground: #f0e4c5;
-  --primary: #908d88;
+  --primary: #e7c07c;
   --primary-foreground: #0f0f0e;
   --secondary: #2c2b29;
   --secondary-foreground: #f0e4c5;
-  --cta: #908d88;
+  --cta: #e7c07c;
   --cta-foreground: #0f0f0e;
-  --ctahover: #9d9b96;
+  --ctahover: #eac88c;
   --success: #a89984;
   --success-foreground: #0f0f0e;
   --warning: #ebdbb2;
@@ -42,9 +40,9 @@
   --busy-ink: #d8997e;
   --border: #45423b;
   --input: #45423b;
-  --ring: #908d88;
+  --ring: #e7c07c;
   --radius: 0.625rem;
-  --chart-primary: #908d88;
+  --chart-primary: #e7c07c;
   --chart-secondary: #afa499;
   --status-success: #a89984;
   --status-warning: #ebdbb2;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(69 66 59 / 0.55);
   --panel-raised-bg: rgb(28 27 25 / 0.95);
   --panel-raised-border: rgb(69 66 59 / 1);
-  --panel-accent: #908d88;
+  --panel-accent: #e7c07c;
   --panel-header-bg: rgb(44 43 41 / 0.6);
   --panel-header-fg: #f0e4c5;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(107 101 92 / 0.85);
   --scrollbar-thin-thumb: rgb(107 101 92 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(107 101 92 / 0.7);
-  --brand: #908d88;
+  --brand: #e7c07c;
   --brand-foreground: #0f0f0e;
-  --brand-primary: #908d88;
+  --brand-primary: #e7c07c;
   --brand-accent: #d4bd99;
   --brand-warm: #d8997e;
   --brand-deep: #0f0f0e;
diff --git a/src/workspaces/theme/css/themes/memento-mori.css b/src/workspaces/theme/css/themes/memento-mori.css
index 9c5d81e3..1a678706 100644
--- a/src/workspaces/theme/css/themes/memento-mori.css
+++ b/src/workspaces/theme/css/themes/memento-mori.css
@@ -1,13 +1,11 @@
 /*
   Memento Mori — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/hipsterusername/omarchy-memento-mori-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #8d97ab;
   --accent: #1b1f24;
   --accent-foreground: #c5d1eb;
-  --primary: #6bb5ff;
+  --primary: #7dd6ed;
   --primary-foreground: #06080b;
   --secondary: #1b1f24;
   --secondary-foreground: #c5d1eb;
-  --cta: #6bb5ff;
+  --cta: #7dd6ed;
   --cta-foreground: #06080b;
-  --ctahover: #7dbeff;
+  --ctahover: #8ddbef;
   --success: #73d0ff;
   --success-foreground: #06080b;
   --warning: #8bc4ff;
@@ -42,9 +40,9 @@
   --busy-ink: #83b3fb;
   --border: #2f343e;
   --input: #2f343e;
-  --ring: #6bb5ff;
+  --ring: #7dd6ed;
   --radius: 0.625rem;
-  --chart-primary: #6bb5ff;
+  --chart-primary: #7dd6ed;
   --chart-secondary: #a9b1d6;
   --status-success: #73d0ff;
   --status-warning: #8bc4ff;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(47 52 62 / 0.55);
   --panel-raised-bg: rgb(10 14 20 / 0.95);
   --panel-raised-border: rgb(47 52 62 / 1);
-  --panel-accent: #6bb5ff;
+  --panel-accent: #7dd6ed;
   --panel-header-bg: rgb(27 31 36 / 0.6);
   --panel-header-fg: #c5d1eb;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(30 39 51 / 0.85);
   --scrollbar-thin-thumb: rgb(30 39 51 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(30 39 51 / 0.7);
-  --brand: #6bb5ff;
+  --brand: #7dd6ed;
   --brand-foreground: #06080b;
-  --brand-primary: #6bb5ff;
+  --brand-primary: #7dd6ed;
   --brand-accent: #5ccfe6;
   --brand-warm: #83b3fb;
   --brand-deep: #06080b;
diff --git a/src/workspaces/theme/css/themes/midnight.css b/src/workspaces/theme/css/themes/midnight.css
index 45c7a55e..1b6dbd8c 100644
--- a/src/workspaces/theme/css/themes/midnight.css
+++ b/src/workspaces/theme/css/themes/midnight.css
@@ -1,13 +1,11 @@
 /*
   Midnight — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark) — the source repo's own colors.toml says so directly.
 
-  Source: https://github.com/JaxonWright/omarchy-midnight-theme (ghostty.conf), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/JaxonWright/omarchy-midnight-theme (colors.toml (Omarchy schema)), read by scripts/port-community-themes.ts. Values
+  came straight from the repo's own colors.toml — the same schema and reader the official 22 themes
+  use, so nothing here is reconstructed. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -19,81 +17,81 @@
   --popover: #000000;
   --popover-foreground: #efefef;
   --muted: #121212;
-  --muted-foreground: #a7a7a7;
+  --muted-foreground: #8a8a8d;
   --accent: #121212;
   --accent-foreground: #efefef;
-  --primary: #e68e0d;
-  --primary-foreground: #000000;
+  --primary: #407e70;
+  --primary-foreground: #ffffff;
   --secondary: #121212;
   --secondary-foreground: #efefef;
-  --cta: #e68e0d;
-  --cta-foreground: #000000;
-  --ctahover: #e99c2a;
-  --success: #ffc107;
+  --cta: #407e70;
+  --cta-foreground: #ffffff;
+  --ctahover: #578d81;
+  --success: #8a9a7b;
   --success-foreground: #000000;
-  --warning: #b91c1c;
-  --warning-foreground: #efefef;
+  --warning: #ffc107;
+  --warning-foreground: #000000;
   --destructive: #d35f5f;
   --destructive-foreground: #000000;
-  --info: #e68e0d;
+  --info: #8a9fbe;
   --info-foreground: #000000;
-  --busy: #c63e3e;
-  --busy-foreground: #f2f2f2;
-  --busy-ink: #c94848;
-  --border: #2f2f2f;
-  --input: #2f2f2f;
-  --ring: #e68e0d;
+  --busy: #f59e0b;
+  --busy-foreground: #000000;
+  --busy-ink: #f59e0b;
+  --border: #272727;
+  --input: #272727;
+  --ring: #407e70;
   --radius: 0.625rem;
-  --chart-primary: #e68e0d;
-  --chart-secondary: #d35f5f;
-  --status-success: #ffc107;
-  --status-warning: #b91c1c;
-  --status-in-progress: #e68e0d;
+  --chart-primary: #407e70;
+  --chart-secondary: #c1a1c1;
+  --status-success: #8a9a7b;
+  --status-warning: #ffc107;
+  --status-in-progress: #8a9fbe;
   --page-bg: #000000;
   --page-bg-src: '';
   --panel-bg: rgb(0 0 0 / 0.72);
-  --panel-border: rgb(47 47 47 / 0.9);
-  --panel-border-bare: rgb(47 47 47 / 0.55);
+  --panel-border: rgb(39 39 39 / 0.9);
+  --panel-border-bare: rgb(39 39 39 / 0.55);
   --panel-raised-bg: rgb(0 0 0 / 0.95);
-  --panel-raised-border: rgb(47 47 47 / 1);
-  --panel-accent: #e68e0d;
+  --panel-raised-border: rgb(39 39 39 / 1);
+  --panel-accent: #407e70;
   --panel-header-bg: rgb(18 18 18 / 0.6);
   --panel-header-fg: #efefef;
   --panel-radius: 0.75rem;
   --panel-blur: 12px;
   --card-bg: #000000;
   --glass-bg: rgb(0 0 0 / 0.55);
-  --glass-border: rgb(47 47 47 / 0.7);
+  --glass-border: rgb(39 39 39 / 0.7);
   --dock-bg: rgb(0 0 0 / 0.7);
-  --dock-border: rgb(47 47 47 / 0.8);
+  --dock-border: rgb(39 39 39 / 0.8);
   --dock-tooltip-bg: #121212;
   --header-bg: rgb(0 0 0 / 0.8);
-  --header-border: rgb(47 47 47 / 0.9);
+  --header-border: rgb(39 39 39 / 0.9);
   --header-fg: #efefef;
   --header-blur: 12px;
-  --pixel-grid-color: rgb(108 108 108 / 0.07);
-  --card-grid-color: rgb(108 108 108 / 0.05);
-  --panel-grid-color: rgb(108 108 108 / 0.06);
-  --scrollbar-thumb: rgb(138 138 141 / 0.6);
-  --scrollbar-thumb-hover: rgb(138 138 141 / 0.85);
-  --scrollbar-thin-thumb: rgb(138 138 141 / 0.45);
-  --scrollbar-thin-thumb-hover: rgb(138 138 141 / 0.7);
-  --brand: #e68e0d;
-  --brand-foreground: #000000;
-  --brand-primary: #e68e0d;
-  --brand-accent: #bebebe;
-  --brand-warm: #c63e3e;
+  --pixel-grid-color: rgb(94 94 94 / 0.07);
+  --card-grid-color: rgb(94 94 94 / 0.05);
+  --panel-grid-color: rgb(94 94 94 / 0.06);
+  --scrollbar-thumb: rgb(30 30 30 / 0.6);
+  --scrollbar-thumb-hover: rgb(30 30 30 / 0.85);
+  --scrollbar-thin-thumb: rgb(30 30 30 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(30 30 30 / 0.7);
+  --brand: #407e70;
+  --brand-foreground: #ffffff;
+  --brand-primary: #407e70;
+  --brand-accent: #88aabb;
+  --brand-warm: #f59e0b;
   --brand-deep: #000000;
-  --brand-muted: #8a8a8d;
+  --brand-muted: #1e1e1e;
   --ink: #efefef;
   --surface-warm: #000000;
-  --naturegreen: #ffc107;
+  --naturegreen: #8a9a7b;
   --naturegreen-foreground: #000000;
   --duck-dark: #efefef;
-  --duck-teal: #bebebe;
-  --duck-yellow: #b91c1c;
-  --duck-orange: #c63e3e;
-  --duck-forest: #ffc107;
+  --duck-teal: #88aabb;
+  --duck-yellow: #ffc107;
+  --duck-orange: #f59e0b;
+  --duck-forest: #8a9a7b;
   --duck-beige: #181818;
   --logo-src: '/officer-logo.svg';
 }
diff --git a/src/workspaces/theme/css/themes/miles-morales.css b/src/workspaces/theme/css/themes/miles-morales.css
index ec736953..a913fcb6 100644
--- a/src/workspaces/theme/css/themes/miles-morales.css
+++ b/src/workspaces/theme/css/themes/miles-morales.css
@@ -1,13 +1,11 @@
 /*
   Miles Morales — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/ahmed-z0/omarchy-miles-morales-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/milkmatcha-light.css b/src/workspaces/theme/css/themes/milkmatcha-light.css
new file mode 100644
index 00000000..456248f3
--- /dev/null
+++ b/src/workspaces/theme/css/themes/milkmatcha-light.css
@@ -0,0 +1,97 @@
+/*
+  Milkmatcha Light — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
+
+  Light theme (light), by luminance of its own background — the source repo carries no mode flag of its own to read.
+
+  Source: https://github.com/hipsterusername/omarchy-milkmatcha-light-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
+
+  DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
+*/
+[data-theme='milkmatcha-light'] {
+  --background: #f4f1e8;
+  --foreground: #5c6a53;
+  --card: #ebe9e0;
+  --card-foreground: #5c6a53;
+  --popover: #ebe9e0;
+  --popover-foreground: #5c6a53;
+  --muted: #e5e3da;
+  --muted-foreground: #61675a;
+  --accent: #e5e3da;
+  --accent-foreground: #5a6751;
+  --primary: #778ea1;
+  --primary-foreground: #21211f;
+  --secondary: #e5e3da;
+  --secondary-foreground: #5a6751;
+  --cta: #778ea1;
+  --cta-foreground: #21211f;
+  --ctahover: #697d8e;
+  --success: #7a9461;
+  --success-foreground: #21211f;
+  --warning: #d4a574;
+  --warning-foreground: #3a4234;
+  --destructive: #c65f5f;
+  --destructive-foreground: #111010;
+  --info: #7a92a5;
+  --info-foreground: #272625;
+  --busy: #cd826a;
+  --busy-foreground: #2c2b2a;
+  --busy-ink: #955e4d;
+  --border: #dadacf;
+  --input: #cfcfc5;
+  --ring: #778ea1;
+  --radius: 0.625rem;
+  --chart-primary: #778ea1;
+  --chart-secondary: #a17a8f;
+  --status-success: #7a9461;
+  --status-warning: #d4a574;
+  --status-in-progress: #7a92a5;
+  --page-bg: #f4f1e8;
+  --page-bg-src: '';
+  --panel-bg: rgb(235 233 224 / 0.72);
+  --panel-border: rgb(218 218 207 / 0.9);
+  --panel-border-bare: rgb(218 218 207 / 0.55);
+  --panel-raised-bg: rgb(235 233 224 / 0.95);
+  --panel-raised-border: rgb(218 218 207 / 1);
+  --panel-accent: #778ea1;
+  --panel-header-bg: rgb(229 227 218 / 0.6);
+  --panel-header-fg: #5c6a53;
+  --panel-radius: 0.75rem;
+  --panel-blur: 12px;
+  --card-bg: #ebe9e0;
+  --glass-bg: rgb(235 233 224 / 0.55);
+  --glass-border: rgb(218 218 207 / 0.7);
+  --dock-bg: rgb(235 233 224 / 0.7);
+  --dock-border: rgb(218 218 207 / 0.8);
+  --dock-tooltip-bg: #e5e3da;
+  --header-bg: rgb(235 233 224 / 0.8);
+  --header-border: rgb(218 218 207 / 0.9);
+  --header-fg: #5c6a53;
+  --header-blur: 12px;
+  --pixel-grid-color: rgb(132 135 124 / 0.07);
+  --card-grid-color: rgb(132 135 124 / 0.05);
+  --panel-grid-color: rgb(132 135 124 / 0.06);
+  --scrollbar-thumb: rgb(214 204 185 / 0.6);
+  --scrollbar-thumb-hover: rgb(214 204 185 / 0.85);
+  --scrollbar-thin-thumb: rgb(214 204 185 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(214 204 185 / 0.7);
+  --brand: #778ea1;
+  --brand-foreground: #21211f;
+  --brand-primary: #778ea1;
+  --brand-accent: #6fa695;
+  --brand-warm: #cd826a;
+  --brand-deep: #e5e3da;
+  --brand-muted: #d6ccb9;
+  --ink: #5c6a53;
+  --surface-warm: #ebe9e0;
+  --naturegreen: #7a9461;
+  --naturegreen-foreground: #21211f;
+  --duck-dark: #5c6a53;
+  --duck-teal: #6fa695;
+  --duck-yellow: #d4a574;
+  --duck-orange: #cd826a;
+  --duck-forest: #7a9461;
+  --duck-beige: #dddcd2;
+  --logo-src: '/officer-logo.svg';
+}
diff --git a/src/workspaces/theme/css/themes/mocha.css b/src/workspaces/theme/css/themes/mocha.css
index cbe211bb..378cfc7a 100644
--- a/src/workspaces/theme/css/themes/mocha.css
+++ b/src/workspaces/theme/css/themes/mocha.css
@@ -1,13 +1,11 @@
 /*
   Mocha — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/gitcoder89431/omarchy-mocha-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/gitcoder89431/omarchy-mocha-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #999fb9;
   --accent: #2e2e3d;
   --accent-foreground: #cdd6f4;
-  --primary: #cba6f7;
+  --primary: #94e2d5;
   --primary-foreground: #111119;
   --secondary: #2e2e3d;
   --secondary-foreground: #cdd6f4;
-  --cta: #cba6f7;
+  --cta: #94e2d5;
   --cta-foreground: #111119;
-  --ctahover: #d1b1f8;
+  --ctahover: #a1e5da;
   --success: #a6e3a1;
   --success-foreground: #111119;
   --warning: #f9e2af;
@@ -42,9 +40,9 @@
   --busy-ink: #f6b7ac;
   --border: #404255;
   --input: #404255;
-  --ring: #cba6f7;
+  --ring: #94e2d5;
   --radius: 0.625rem;
-  --chart-primary: #cba6f7;
+  --chart-primary: #94e2d5;
   --chart-secondary: #f5c2e7;
   --status-success: #a6e3a1;
   --status-warning: #f9e2af;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(64 66 85 / 0.55);
   --panel-raised-bg: rgb(30 30 46 / 0.95);
   --panel-raised-border: rgb(64 66 85 / 1);
-  --panel-accent: #cba6f7;
+  --panel-accent: #94e2d5;
   --panel-header-bg: rgb(46 46 61 / 0.6);
   --panel-header-fg: #cdd6f4;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(88 91 112 / 0.85);
   --scrollbar-thin-thumb: rgb(88 91 112 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(88 91 112 / 0.7);
-  --brand: #cba6f7;
+  --brand: #94e2d5;
   --brand-foreground: #111119;
-  --brand-primary: #cba6f7;
+  --brand-primary: #94e2d5;
   --brand-accent: #94e2d5;
   --brand-warm: #f6b7ac;
   --brand-deep: #111119;
diff --git a/src/workspaces/theme/css/themes/monochrome.css b/src/workspaces/theme/css/themes/monochrome.css
index d0919cab..636e8c40 100644
--- a/src/workspaces/theme/css/themes/monochrome.css
+++ b/src/workspaces/theme/css/themes/monochrome.css
@@ -1,13 +1,11 @@
 /*
   Monochrome — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/Swarnim114/omarchy-monochrome-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a0a0a0;
   --accent: #373737;
   --accent-foreground: #d4d4d4;
-  --primary: #d4d4d4;
+  --primary: #ffffff;
   --primary-foreground: #161616;
   --secondary: #373737;
   --secondary-foreground: #d4d4d4;
-  --cta: #d4d4d4;
+  --cta: #ffffff;
   --cta-foreground: #161616;
-  --ctahover: #d9d9d9;
+  --ctahover: #ffffff;
   --success: #d4d4d4;
   --success-foreground: #161616;
   --warning: #d4d4d4;
@@ -42,9 +40,9 @@
   --busy-ink: #d4d4d4;
   --border: #4a4a4a;
   --input: #4a4a4a;
-  --ring: #d4d4d4;
+  --ring: #ffffff;
   --radius: 0.625rem;
-  --chart-primary: #d4d4d4;
+  --chart-primary: #ffffff;
   --chart-secondary: #d4d4d4;
   --status-success: #d4d4d4;
   --status-warning: #d4d4d4;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(74 74 74 / 0.55);
   --panel-raised-bg: rgb(40 40 40 / 0.95);
   --panel-raised-border: rgb(74 74 74 / 1);
-  --panel-accent: #d4d4d4;
+  --panel-accent: #ffffff;
   --panel-header-bg: rgb(55 55 55 / 0.6);
   --panel-header-fg: #d4d4d4;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(118 118 118 / 0.85);
   --scrollbar-thin-thumb: rgb(118 118 118 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(118 118 118 / 0.7);
-  --brand: #d4d4d4;
+  --brand: #ffffff;
   --brand-foreground: #161616;
-  --brand-primary: #d4d4d4;
+  --brand-primary: #ffffff;
   --brand-accent: #d4d4d4;
   --brand-warm: #d4d4d4;
   --brand-deep: #161616;
diff --git a/src/workspaces/theme/css/themes/monokai-dark.css b/src/workspaces/theme/css/themes/monokai-dark.css
index c214285e..d7f52b5c 100644
--- a/src/workspaces/theme/css/themes/monokai-dark.css
+++ b/src/workspaces/theme/css/themes/monokai-dark.css
@@ -1,13 +1,11 @@
 /*
   Monokai Dark — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/ericrswanny/omarchy-monokai-dark-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b9bab4;
   --accent: #363731;
   --accent-foreground: #f8f8f2;
-  --primary: #66d9ef;
+  --primary: #a1efe4;
   --primary-foreground: #151613;
   --secondary: #363731;
   --secondary-foreground: #f8f8f2;
-  --cta: #66d9ef;
+  --cta: #a1efe4;
   --cta-foreground: #151613;
-  --ctahover: #78def1;
+  --ctahover: #acf1e7;
   --success: #a6e22e;
   --success-foreground: #151613;
   --warning: #e6db74;
@@ -42,9 +40,9 @@
   --busy-ink: #f08173;
   --border: #50514b;
   --input: #50514b;
-  --ring: #66d9ef;
+  --ring: #a1efe4;
   --radius: 0.625rem;
-  --chart-primary: #66d9ef;
+  --chart-primary: #a1efe4;
   --chart-secondary: #ae81ff;
   --status-success: #a6e22e;
   --status-warning: #e6db74;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(80 81 75 / 0.55);
   --panel-raised-bg: rgb(39 40 34 / 0.95);
   --panel-raised-border: rgb(80 81 75 / 1);
-  --panel-accent: #66d9ef;
+  --panel-accent: #a1efe4;
   --panel-header-bg: rgb(54 55 49 / 0.6);
   --panel-header-fg: #f8f8f2;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(117 113 94 / 0.85);
   --scrollbar-thin-thumb: rgb(117 113 94 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(117 113 94 / 0.7);
-  --brand: #66d9ef;
+  --brand: #a1efe4;
   --brand-foreground: #151613;
-  --brand-primary: #66d9ef;
+  --brand-primary: #a1efe4;
   --brand-accent: #a1efe4;
   --brand-warm: #f08173;
   --brand-deep: #151613;
diff --git a/src/workspaces/theme/css/themes/monokai.css b/src/workspaces/theme/css/themes/monokai.css
index 5836da92..5e753228 100644
--- a/src/workspaces/theme/css/themes/monokai.css
+++ b/src/workspaces/theme/css/themes/monokai.css
@@ -1,13 +1,11 @@
 /*
   Monokai — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/bjarneo/omarchy-monokai-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/monolith.css b/src/workspaces/theme/css/themes/monolith.css
index 391502e3..5536c7ec 100644
--- a/src/workspaces/theme/css/themes/monolith.css
+++ b/src/workspaces/theme/css/themes/monolith.css
@@ -1,47 +1,45 @@
 /*
   Monolith — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark) — the source repo's own colors.toml says so directly.
 
-  Source: https://github.com/OldJobobo/omarchy-monolith-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/OldJobobo/omarchy-monolith-theme (colors.toml (Omarchy schema)), read by scripts/port-community-themes.ts. Values
+  came straight from the repo's own colors.toml — the same schema and reader the official 22 themes
+  use, so nothing here is reconstructed. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
 [data-theme='monolith'] {
-  --background: #13121e;
+  --background: #12111b;
   --foreground: #e0def4;
   --card: #232136;
   --card-foreground: #e0def4;
   --popover: #232136;
   --popover-foreground: #e0def4;
-  --muted: #323144;
-  --muted-foreground: #a7a5bb;
-  --accent: #323144;
+  --muted: #2a273f;
+  --muted-foreground: #e0def4;
+  --accent: #2a273f;
   --accent-foreground: #e0def4;
   --primary: #9ccfd8;
-  --primary-foreground: #13121e;
-  --secondary: #323144;
+  --primary-foreground: #12111b;
+  --secondary: #2a273f;
   --secondary-foreground: #e0def4;
   --cta: #9ccfd8;
-  --cta-foreground: #13121e;
+  --cta-foreground: #12111b;
   --ctahover: #a8d5dd;
   --success: #3e8fb0;
-  --success-foreground: #13121e;
+  --success-foreground: #12111b;
   --warning: #f6c177;
-  --warning-foreground: #13121e;
+  --warning-foreground: #12111b;
   --destructive: #eb6f92;
-  --destructive-foreground: #13121e;
+  --destructive-foreground: #12111b;
   --info: #9ccfd8;
-  --info-foreground: #13121e;
-  --busy: #f19885;
-  --busy-foreground: #13121e;
-  --busy-ink: #f19885;
-  --border: #48465b;
-  --input: #48465b;
+  --info-foreground: #12111b;
+  --busy: #f6c177;
+  --busy-foreground: #12111b;
+  --busy-ink: #f6c177;
+  --border: #58566b;
+  --input: #58566b;
   --ring: #9ccfd8;
   --radius: 0.625rem;
   --chart-primary: #9ccfd8;
@@ -49,50 +47,50 @@
   --status-success: #3e8fb0;
   --status-warning: #f6c177;
   --status-in-progress: #9ccfd8;
-  --page-bg: #13121e;
+  --page-bg: #12111b;
   --page-bg-src: '';
   --panel-bg: rgb(35 33 54 / 0.72);
-  --panel-border: rgb(72 70 91 / 0.9);
-  --panel-border-bare: rgb(72 70 91 / 0.55);
+  --panel-border: rgb(88 86 107 / 0.9);
+  --panel-border-bare: rgb(88 86 107 / 0.55);
   --panel-raised-bg: rgb(35 33 54 / 0.95);
-  --panel-raised-border: rgb(72 70 91 / 1);
+  --panel-raised-border: rgb(88 86 107 / 1);
   --panel-accent: #9ccfd8;
-  --panel-header-bg: rgb(50 49 68 / 0.6);
+  --panel-header-bg: rgb(42 39 63 / 0.6);
   --panel-header-fg: #e0def4;
   --panel-radius: 0.75rem;
   --panel-blur: 12px;
   --card-bg: #232136;
   --glass-bg: rgb(35 33 54 / 0.55);
-  --glass-border: rgb(72 70 91 / 0.7);
+  --glass-border: rgb(88 86 107 / 0.7);
   --dock-bg: rgb(35 33 54 / 0.7);
-  --dock-border: rgb(72 70 91 / 0.8);
-  --dock-tooltip-bg: #323144;
+  --dock-border: rgb(88 86 107 / 0.8);
+  --dock-tooltip-bg: #2a273f;
   --header-bg: rgb(35 33 54 / 0.8);
-  --header-border: rgb(72 70 91 / 0.9);
+  --header-border: rgb(88 86 107 / 0.9);
   --header-fg: #e0def4;
   --header-blur: 12px;
-  --pixel-grid-color: rgb(120 118 140 / 0.07);
-  --card-grid-color: rgb(120 118 140 / 0.05);
-  --panel-grid-color: rgb(120 118 140 / 0.06);
+  --pixel-grid-color: rgb(144 140 170 / 0.07);
+  --card-grid-color: rgb(144 140 170 / 0.05);
+  --panel-grid-color: rgb(144 140 170 / 0.06);
   --scrollbar-thumb: rgb(110 106 134 / 0.6);
   --scrollbar-thumb-hover: rgb(110 106 134 / 0.85);
   --scrollbar-thin-thumb: rgb(110 106 134 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(110 106 134 / 0.7);
   --brand: #9ccfd8;
-  --brand-foreground: #13121e;
+  --brand-foreground: #12111b;
   --brand-primary: #9ccfd8;
   --brand-accent: #ea9a97;
-  --brand-warm: #f19885;
-  --brand-deep: #13121e;
+  --brand-warm: #f6c177;
+  --brand-deep: #12111b;
   --brand-muted: #6e6a86;
   --ink: #e0def4;
   --surface-warm: #232136;
   --naturegreen: #3e8fb0;
-  --naturegreen-foreground: #13121e;
+  --naturegreen-foreground: #12111b;
   --duck-dark: #e0def4;
   --duck-teal: #ea9a97;
   --duck-yellow: #f6c177;
-  --duck-orange: #f19885;
+  --duck-orange: #f6c177;
   --duck-forest: #3e8fb0;
   --duck-beige: #363449;
   --logo-src: '/officer-logo.svg';
diff --git a/src/workspaces/theme/css/themes/moon-orbit.css b/src/workspaces/theme/css/themes/moon-orbit.css
new file mode 100644
index 00000000..ec40e4ae
--- /dev/null
+++ b/src/workspaces/theme/css/themes/moon-orbit.css
@@ -0,0 +1,97 @@
+/*
+  Moon Orbit — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
+
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
+
+  Source: https://github.com/JJDizz1L/moon-orbit (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
+
+  DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
+*/
+[data-theme='moon-orbit'] {
+  --background: #191723;
+  --foreground: #6096fd;
+  --card: #2d2940;
+  --card-foreground: #6096fd;
+  --popover: #2d2940;
+  --popover-foreground: #6096fd;
+  --muted: #3c384d;
+  --muted-foreground: #8ea5d9;
+  --accent: #3c384d;
+  --accent-foreground: #74a3fd;
+  --primary: #a19bd4;
+  --primary-foreground: #191723;
+  --secondary: #3c384d;
+  --secondary-foreground: #74a3fd;
+  --cta: #a19bd4;
+  --cta-foreground: #191723;
+  --ctahover: #aca7d9;
+  --success: #965f81;
+  --success-foreground: #f9f9fa;
+  --warning: #fca766;
+  --warning-foreground: #191723;
+  --destructive: #c0685f;
+  --destructive-foreground: #191723;
+  --info: #7b79a4;
+  --info-foreground: #14121c;
+  --busy: #de8863;
+  --busy-foreground: #191723;
+  --busy-ink: #de8863;
+  --border: #373e65;
+  --input: #373e65;
+  --ring: #a19bd4;
+  --radius: 0.625rem;
+  --chart-primary: #a19bd4;
+  --chart-secondary: #987195;
+  --status-success: #965f81;
+  --status-warning: #fca766;
+  --status-in-progress: #7b79a4;
+  --page-bg: #191723;
+  --page-bg-src: '';
+  --panel-bg: rgb(45 41 64 / 0.72);
+  --panel-border: rgb(55 62 101 / 0.9);
+  --panel-border-bare: rgb(55 62 101 / 0.55);
+  --panel-raised-bg: rgb(45 41 64 / 0.95);
+  --panel-raised-border: rgb(55 62 101 / 1);
+  --panel-accent: #a19bd4;
+  --panel-header-bg: rgb(60 56 77 / 0.6);
+  --panel-header-fg: #6096fd;
+  --panel-radius: 0.75rem;
+  --panel-blur: 12px;
+  --card-bg: #2d2940;
+  --glass-bg: rgb(45 41 64 / 0.55);
+  --glass-border: rgb(55 62 101 / 0.7);
+  --dock-bg: rgb(45 41 64 / 0.7);
+  --dock-border: rgb(55 62 101 / 0.8);
+  --dock-tooltip-bg: #3c384d;
+  --header-bg: rgb(45 41 64 / 0.8);
+  --header-border: rgb(55 62 101 / 0.9);
+  --header-fg: #6096fd;
+  --header-blur: 12px;
+  --pixel-grid-color: rgb(101 119 168 / 0.07);
+  --card-grid-color: rgb(101 119 168 / 0.05);
+  --panel-grid-color: rgb(101 119 168 / 0.06);
+  --scrollbar-thumb: rgb(104 71 100 / 0.6);
+  --scrollbar-thumb-hover: rgb(104 71 100 / 0.85);
+  --scrollbar-thin-thumb: rgb(104 71 100 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(104 71 100 / 0.7);
+  --brand: #a19bd4;
+  --brand-foreground: #191723;
+  --brand-primary: #a19bd4;
+  --brand-accent: #7c79a5;
+  --brand-warm: #de8863;
+  --brand-deep: #191723;
+  --brand-muted: #684764;
+  --ink: #6096fd;
+  --surface-warm: #2d2940;
+  --naturegreen: #965f81;
+  --naturegreen-foreground: #f9f9fa;
+  --duck-dark: #6096fd;
+  --duck-teal: #7c79a5;
+  --duck-yellow: #fca766;
+  --duck-orange: #de8863;
+  --duck-forest: #965f81;
+  --duck-beige: #323453;
+  --logo-src: '/officer-logo.svg';
+}
diff --git a/src/workspaces/theme/css/themes/nagai-poolside.css b/src/workspaces/theme/css/themes/nagai-poolside.css
index 7d5f2f1f..b84ebc02 100644
--- a/src/workspaces/theme/css/themes/nagai-poolside.css
+++ b/src/workspaces/theme/css/themes/nagai-poolside.css
@@ -1,13 +1,11 @@
 /*
   Nagai Poolside — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/somerocketeer/omarchy-nagai-poolside-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a6b1b5;
   --accent: #202b31;
   --accent-foreground: #e6f1f4;
-  --primary: #2295d9;
+  --primary: #5ec2d6;
   --primary-foreground: #080f13;
   --secondary: #202b31;
   --secondary-foreground: #e6f1f4;
-  --cta: #2295d9;
+  --cta: #5ec2d6;
   --cta-foreground: #080f13;
-  --ctahover: #3da2de;
+  --ctahover: #71c9db;
   --success: #7ca348;
   --success-foreground: #080f13;
   --warning: #eed59a;
@@ -42,9 +40,9 @@
   --busy-ink: #f7a083;
   --border: #39454b;
   --input: #39454b;
-  --ring: #2295d9;
+  --ring: #5ec2d6;
   --radius: 0.625rem;
-  --chart-primary: #2295d9;
+  --chart-primary: #5ec2d6;
   --chart-secondary: #58afd8;
   --status-success: #7ca348;
   --status-warning: #eed59a;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(57 69 75 / 0.55);
   --panel-raised-bg: rgb(15 27 34 / 0.95);
   --panel-raised-border: rgb(57 69 75 / 1);
-  --panel-accent: #2295d9;
+  --panel-accent: #5ec2d6;
   --panel-header-bg: rgb(32 43 49 / 0.6);
   --panel-header-fg: #e6f1f4;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(42 70 82 / 0.85);
   --scrollbar-thin-thumb: rgb(42 70 82 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(42 70 82 / 0.7);
-  --brand: #2295d9;
+  --brand: #5ec2d6;
   --brand-foreground: #080f13;
-  --brand-primary: #2295d9;
+  --brand-primary: #5ec2d6;
   --brand-accent: #3a9fb7;
   --brand-warm: #f7a083;
   --brand-deep: #080f13;
diff --git a/src/workspaces/theme/css/themes/nagai-twilight.css b/src/workspaces/theme/css/themes/nagai-twilight.css
index 9b98ccfa..361c1e4b 100644
--- a/src/workspaces/theme/css/themes/nagai-twilight.css
+++ b/src/workspaces/theme/css/themes/nagai-twilight.css
@@ -1,13 +1,11 @@
 /*
   Nagai Twilight — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/somerocketeer/omarchy-nagai-twilight-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/nebulite.css b/src/workspaces/theme/css/themes/nebulite.css
index 1d3fbeaa..0f43a09f 100644
--- a/src/workspaces/theme/css/themes/nebulite.css
+++ b/src/workspaces/theme/css/themes/nebulite.css
@@ -1,13 +1,11 @@
 /*
   Nebulite — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/atif-1402/omarchy-nebulite-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a5a1a2;
   --accent: #323438;
   --accent-foreground: #dcd6d6;
-  --primary: #9e9eb8;
+  --primary: #d2d2df;
   --primary-foreground: #131417;
   --secondary: #323438;
   --secondary-foreground: #dcd6d6;
-  --cta: #9e9eb8;
+  --cta: #d2d2df;
   --cta-foreground: #131417;
-  --ctahover: #aaaac1;
+  --ctahover: #d7d7e3;
   --success: #98b398;
   --success-foreground: #131417;
   --warning: #bab292;
@@ -42,9 +40,9 @@
   --busy-ink: #b69d8c;
   --border: #47484b;
   --input: #47484b;
-  --ring: #9e9eb8;
+  --ring: #d2d2df;
   --radius: 0.625rem;
-  --chart-primary: #9e9eb8;
+  --chart-primary: #d2d2df;
   --chart-secondary: #bea7b7;
   --status-success: #98b398;
   --status-warning: #bab292;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(71 72 75 / 0.55);
   --panel-raised-bg: rgb(35 37 41 / 0.95);
   --panel-raised-border: rgb(71 72 75 / 1);
-  --panel-accent: #9e9eb8;
+  --panel-accent: #d2d2df;
   --panel-header-bg: rgb(50 52 56 / 0.6);
   --panel-header-fg: #dcd6d6;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(120 124 135 / 0.85);
   --scrollbar-thin-thumb: rgb(120 124 135 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(120 124 135 / 0.7);
-  --brand: #9e9eb8;
+  --brand: #d2d2df;
   --brand-foreground: #131417;
-  --brand-primary: #9e9eb8;
+  --brand-primary: #d2d2df;
   --brand-accent: #95a8b0;
   --brand-warm: #b69d8c;
   --brand-deep: #131417;
diff --git a/src/workspaces/theme/css/themes/neo-sploosh.css b/src/workspaces/theme/css/themes/neo-sploosh.css
index f673c9bb..b0a07b1e 100644
--- a/src/workspaces/theme/css/themes/neo-sploosh.css
+++ b/src/workspaces/theme/css/themes/neo-sploosh.css
@@ -1,13 +1,11 @@
 /*
   Neo Sploosh — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/monoooki/omarchy-neo-sploosh-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b5b5b6;
   --accent: #313135;
   --accent-foreground: #f4f4f4;
-  --primary: #008dc9;
+  --primary: #33acde;
   --primary-foreground: #121315;
   --secondary: #313135;
   --secondary-foreground: #f4f4f4;
-  --cta: #008dc9;
+  --cta: #33acde;
   --cta-foreground: #121315;
-  --ctahover: #1f9bcf;
+  --ctahover: #4bb6e2;
   --success: #92bf38;
   --success-foreground: #121315;
   --warning: #a4d149;
@@ -42,9 +40,9 @@
   --busy-ink: #97814d;
   --border: #4a4b4e;
   --input: #4a4b4e;
-  --ring: #008dc9;
+  --ring: #33acde;
   --radius: 0.625rem;
-  --chart-primary: #008dc9;
+  --chart-primary: #33acde;
   --chart-secondary: #48b7e7;
   --status-success: #92bf38;
   --status-warning: #a4d149;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(74 75 78 / 0.55);
   --panel-raised-bg: rgb(33 34 38 / 0.95);
   --panel-raised-border: rgb(74 75 78 / 1);
-  --panel-accent: #008dc9;
+  --panel-accent: #33acde;
   --panel-header-bg: rgb(49 49 53 / 0.6);
   --panel-header-fg: #f4f4f4;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(89 89 89 / 0.85);
   --scrollbar-thin-thumb: rgb(89 89 89 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(89 89 89 / 0.7);
-  --brand: #008dc9;
+  --brand: #33acde;
   --brand-foreground: #121315;
-  --brand-primary: #008dc9;
+  --brand-primary: #33acde;
   --brand-accent: #33acde;
   --brand-warm: #97814d;
   --brand-deep: #121315;
diff --git a/src/workspaces/theme/css/themes/neon-street.css b/src/workspaces/theme/css/themes/neon-street.css
index 9fdab506..cefd8116 100644
--- a/src/workspaces/theme/css/themes/neon-street.css
+++ b/src/workspaces/theme/css/themes/neon-street.css
@@ -1,13 +1,11 @@
 /*
   Neon Street — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/atif-1402/omarchy-neonstreet-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a7a9b5;
   --accent: #143946;
   --accent-foreground: #eddfea;
-  --primary: #9c9dba;
+  --primary: #d5f8fb;
   --primary-foreground: #01171f;
   --secondary: #143946;
   --secondary-foreground: #eddfea;
-  --cta: #9c9dba;
+  --cta: #d5f8fb;
   --cta-foreground: #01171f;
-  --ctahover: #a8a9c2;
+  --ctahover: #daf9fb;
   --success: #68cfa3;
   --success-foreground: #01171f;
   --warning: #a8ae98;
@@ -42,9 +40,9 @@
   --busy-ink: #bb859e;
   --border: #304e5b;
   --input: #304e5b;
-  --ring: #9c9dba;
+  --ring: #d5f8fb;
   --radius: 0.625rem;
-  --chart-primary: #9c9dba;
+  --chart-primary: #d5f8fb;
   --chart-secondary: #cf96cc;
   --status-success: #68cfa3;
   --status-warning: #a8ae98;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(48 78 91 / 0.55);
   --panel-raised-bg: rgb(2 42 56 / 0.95);
   --panel-raised-border: rgb(48 78 91 / 1);
-  --panel-accent: #9c9dba;
+  --panel-accent: #d5f8fb;
   --panel-header-bg: rgb(20 57 70 / 0.6);
   --panel-header-fg: #eddfea;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(92 169 196 / 0.85);
   --scrollbar-thin-thumb: rgb(92 169 196 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(92 169 196 / 0.7);
-  --brand: #9c9dba;
+  --brand: #d5f8fb;
   --brand-foreground: #01171f;
-  --brand-primary: #9c9dba;
+  --brand-primary: #d5f8fb;
   --brand-accent: #86e7ee;
   --brand-warm: #bb859e;
   --brand-deep: #01171f;
diff --git a/src/workspaces/theme/css/themes/neovoid.css b/src/workspaces/theme/css/themes/neovoid.css
index 733f4917..faadd35f 100644
--- a/src/workspaces/theme/css/themes/neovoid.css
+++ b/src/workspaces/theme/css/themes/neovoid.css
@@ -1,13 +1,11 @@
 /*
   Neovoid — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/RiO7MAKK3R/omarchy-neovoid-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/night-owl.css b/src/workspaces/theme/css/themes/night-owl.css
new file mode 100644
index 00000000..7d71e8f9
--- /dev/null
+++ b/src/workspaces/theme/css/themes/night-owl.css
@@ -0,0 +1,97 @@
+/*
+  Night Owl — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
+
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
+
+  Source: https://github.com/maxberggren/omarchy-night-owl-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
+
+  DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
+*/
+[data-theme='night-owl'] {
+  --background: #020e18;
+  --foreground: #7a8c91;
+  --card: #03192c;
+  --card-foreground: #7a8c91;
+  --popover: #03192c;
+  --popover-foreground: #7a8c91;
+  --muted: #15293b;
+  --muted-foreground: #84939a;
+  --accent: #15293b;
+  --accent-foreground: #819297;
+  --primary: #2aa198;
+  --primary-foreground: #020e18;
+  --secondary: #15293b;
+  --secondary-foreground: #819297;
+  --cta: #2aa198;
+  --cta-foreground: #020e18;
+  --ctahover: #44aca4;
+  --success: #809900;
+  --success-foreground: #020e18;
+  --warning: #b38800;
+  --warning-foreground: #020e18;
+  --destructive: #d8322f;
+  --destructive-foreground: #f9f9f9;
+  --info: #268bd2;
+  --info-foreground: #020e18;
+  --busy: #c65d18;
+  --busy-foreground: #020e18;
+  --busy-ink: #c65d18;
+  --border: #1a3040;
+  --input: #1a3040;
+  --ring: #2aa198;
+  --radius: 0.625rem;
+  --chart-primary: #2aa198;
+  --chart-secondary: #d03682;
+  --status-success: #809900;
+  --status-warning: #b38800;
+  --status-in-progress: #268bd2;
+  --page-bg: #020e18;
+  --page-bg-src: '';
+  --panel-bg: rgb(3 25 44 / 0.72);
+  --panel-border: rgb(26 48 64 / 0.9);
+  --panel-border-bare: rgb(26 48 64 / 0.55);
+  --panel-raised-bg: rgb(3 25 44 / 0.95);
+  --panel-raised-border: rgb(26 48 64 / 1);
+  --panel-accent: #2aa198;
+  --panel-header-bg: rgb(21 41 59 / 0.6);
+  --panel-header-fg: #7a8c91;
+  --panel-radius: 0.75rem;
+  --panel-blur: 12px;
+  --card-bg: #03192c;
+  --glass-bg: rgb(3 25 44 / 0.55);
+  --glass-border: rgb(26 48 64 / 0.7);
+  --dock-bg: rgb(3 25 44 / 0.7);
+  --dock-border: rgb(26 48 64 / 0.8);
+  --dock-tooltip-bg: #15293b;
+  --header-bg: rgb(3 25 44 / 0.8);
+  --header-border: rgb(26 48 64 / 0.9);
+  --header-fg: #7a8c91;
+  --header-blur: 12px;
+  --pixel-grid-color: rgb(87 104 114 / 0.07);
+  --card-grid-color: rgb(87 104 114 / 0.05);
+  --panel-grid-color: rgb(87 104 114 / 0.06);
+  --scrollbar-thumb: rgb(95 111 116 / 0.6);
+  --scrollbar-thumb-hover: rgb(95 111 116 / 0.85);
+  --scrollbar-thin-thumb: rgb(95 111 116 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(95 111 116 / 0.7);
+  --brand: #2aa198;
+  --brand-foreground: #020e18;
+  --brand-primary: #2aa198;
+  --brand-accent: #2aa198;
+  --brand-warm: #c65d18;
+  --brand-deep: #020e18;
+  --brand-muted: #5f6f74;
+  --ink: #7a8c91;
+  --surface-warm: #03192c;
+  --naturegreen: #809900;
+  --naturegreen-foreground: #020e18;
+  --duck-dark: #7a8c91;
+  --duck-teal: #2aa198;
+  --duck-yellow: #b38800;
+  --duck-orange: #c65d18;
+  --duck-forest: #809900;
+  --duck-beige: #0f2536;
+  --logo-src: '/officer-logo.svg';
+}
diff --git a/src/workspaces/theme/css/themes/nyc.css b/src/workspaces/theme/css/themes/nyc.css
index 6b8f49b2..7bf737e5 100644
--- a/src/workspaces/theme/css/themes/nyc.css
+++ b/src/workspaces/theme/css/themes/nyc.css
@@ -1,13 +1,11 @@
 /*
   Nyc — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/WillyV3/omarchy-nyc-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b8b8b8;
   --accent: #232323;
   --accent-foreground: #ffffff;
-  --primary: #8484c3;
+  --primary: #cacae7;
   --primary-foreground: #0a0a0a;
   --secondary: #232323;
   --secondary-foreground: #ffffff;
-  --cta: #8484c3;
+  --cta: #cacae7;
   --cta-foreground: #0a0a0a;
-  --ctahover: #9393ca;
+  --ctahover: #d0d0ea;
   --success: #e09a5c;
   --success-foreground: #0a0a0a;
   --warning: #ce8678;
@@ -42,9 +40,9 @@
   --busy-ink: #ce9088;
   --border: #404040;
   --input: #404040;
-  --ring: #8484c3;
+  --ring: #cacae7;
   --radius: 0.625rem;
-  --chart-primary: #8484c3;
+  --chart-primary: #cacae7;
   --chart-secondary: #c498cd;
   --status-success: #e09a5c;
   --status-warning: #ce8678;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(64 64 64 / 0.55);
   --panel-raised-bg: rgb(18 18 18 / 0.95);
   --panel-raised-border: rgb(64 64 64 / 1);
-  --panel-accent: #8484c3;
+  --panel-accent: #cacae7;
   --panel-header-bg: rgb(35 35 35 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(158 158 158 / 0.85);
   --scrollbar-thin-thumb: rgb(158 158 158 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(158 158 158 / 0.7);
-  --brand: #8484c3;
+  --brand: #cacae7;
   --brand-foreground: #0a0a0a;
-  --brand-primary: #8484c3;
+  --brand-primary: #cacae7;
   --brand-accent: #6887b6;
   --brand-warm: #ce9088;
   --brand-deep: #0a0a0a;
diff --git a/src/workspaces/theme/css/themes/oxford.css b/src/workspaces/theme/css/themes/oxford.css
index 20307852..bca5c81b 100644
--- a/src/workspaces/theme/css/themes/oxford.css
+++ b/src/workspaces/theme/css/themes/oxford.css
@@ -1,13 +1,11 @@
 /*
   Oxford — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/HANCORE-linux/omarchy-oxford-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/HANCORE-linux/omarchy-oxford-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a7a4a0;
   --accent: #383a3f;
   --accent-foreground: #d6d1c9;
-  --primary: #bda07f;
+  --primary: #d8c3a5;
   --primary-foreground: #17181b;
   --secondary: #383a3f;
   --secondary-foreground: #d6d1c9;
-  --cta: #bda07f;
+  --cta: #d8c3a5;
   --cta-foreground: #17181b;
-  --ctahover: #c5ab8e;
+  --ctahover: #ddcab0;
   --success: #76856a;
   --success-foreground: #17181b;
   --warning: #f3e9bd;
@@ -42,9 +40,9 @@
   --busy-ink: #e89f81;
   --border: #4b4b4f;
   --input: #4b4b4f;
-  --ring: #bda07f;
+  --ring: #d8c3a5;
   --radius: 0.625rem;
-  --chart-primary: #bda07f;
+  --chart-primary: #d8c3a5;
   --chart-secondary: #b7a593;
   --status-success: #76856a;
   --status-warning: #f3e9bd;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(75 75 79 / 0.55);
   --panel-raised-bg: rgb(41 43 49 / 0.95);
   --panel-raised-border: rgb(75 75 79 / 1);
-  --panel-accent: #bda07f;
+  --panel-accent: #d8c3a5;
   --panel-header-bg: rgb(56 58 63 / 0.6);
   --panel-header-fg: #d6d1c9;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(100 100 102 / 0.85);
   --scrollbar-thin-thumb: rgb(100 100 102 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(100 100 102 / 0.7);
-  --brand: #bda07f;
+  --brand: #d8c3a5;
   --brand-foreground: #17181b;
-  --brand-primary: #bda07f;
+  --brand-primary: #d8c3a5;
   --brand-accent: #9b907f;
   --brand-warm: #e89f81;
   --brand-deep: #17181b;
diff --git a/src/workspaces/theme/css/themes/oxocarbon-dark.css b/src/workspaces/theme/css/themes/oxocarbon-dark.css
index 07cab05a..e1363bb9 100644
--- a/src/workspaces/theme/css/themes/oxocarbon-dark.css
+++ b/src/workspaces/theme/css/themes/oxocarbon-dark.css
@@ -1,13 +1,11 @@
 /*
   Oxocarbon Dark — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/HANCORE-linux/omarchy-oxocarbon-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/HANCORE-linux/omarchy-oxocarbon-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b0b1b4;
   --accent: #262626;
   --accent-foreground: #f2f4f8;
-  --primary: #42be65;
+  --primary: #dde1e6;
   --primary-foreground: #0c0c0c;
   --secondary: #262626;
   --secondary-foreground: #f2f4f8;
-  --cta: #42be65;
+  --cta: #dde1e6;
   --cta-foreground: #0c0c0c;
-  --ctahover: #59c677;
+  --ctahover: #e1e5e9;
   --success: #33b1ff;
   --success-foreground: #0c0c0c;
   --warning: #ee5396;
@@ -42,9 +40,9 @@
   --busy-ink: #9697b8;
   --border: #414142;
   --input: #414142;
-  --ring: #42be65;
+  --ring: #dde1e6;
   --radius: 0.625rem;
-  --chart-primary: #42be65;
+  --chart-primary: #dde1e6;
   --chart-secondary: #be95ff;
   --status-success: #33b1ff;
   --status-warning: #ee5396;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(65 65 66 / 0.55);
   --panel-raised-bg: rgb(22 22 22 / 0.95);
   --panel-raised-border: rgb(65 65 66 / 1);
-  --panel-accent: #42be65;
+  --panel-accent: #dde1e6;
   --panel-header-bg: rgb(38 38 38 / 0.6);
   --panel-header-fg: #f2f4f8;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(82 82 82 / 0.85);
   --scrollbar-thin-thumb: rgb(82 82 82 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(82 82 82 / 0.7);
-  --brand: #42be65;
+  --brand: #dde1e6;
   --brand-foreground: #0c0c0c;
-  --brand-primary: #42be65;
+  --brand-primary: #dde1e6;
   --brand-accent: #ff7eb6;
   --brand-warm: #9697b8;
   --brand-deep: #0c0c0c;
diff --git a/src/workspaces/theme/css/themes/pandora.css b/src/workspaces/theme/css/themes/pandora.css
index 19279e64..39ea49e8 100644
--- a/src/workspaces/theme/css/themes/pandora.css
+++ b/src/workspaces/theme/css/themes/pandora.css
@@ -1,13 +1,11 @@
 /*
   Pandora — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/imbypass/omarchy-pandora-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #838584;
   --accent: #1b1b1d;
   --accent-foreground: #b2b5b3;
-  --primary: #7aa2f7;
+  --primary: #4abaaf;
   --primary-foreground: #060607;
   --secondary: #1b1b1d;
   --secondary-foreground: #b2b5b3;
-  --cta: #7aa2f7;
+  --cta: #4abaaf;
   --cta-foreground: #060607;
-  --ctahover: #8aadf8;
+  --ctahover: #60c2b9;
   --success: #9ece6a;
   --success-foreground: #060607;
   --warning: #e0af68;
@@ -42,9 +40,9 @@
   --busy-ink: #ec937b;
   --border: #2b2c2d;
   --input: #2b2c2d;
-  --ring: #7aa2f7;
+  --ring: #4abaaf;
   --radius: 0.625rem;
-  --chart-primary: #7aa2f7;
+  --chart-primary: #4abaaf;
   --chart-secondary: #bb9af7;
   --status-success: #9ece6a;
   --status-warning: #e0af68;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(43 44 45 / 0.55);
   --panel-raised-bg: rgb(10 10 12 / 0.95);
   --panel-raised-border: rgb(43 44 45 / 1);
-  --panel-accent: #7aa2f7;
+  --panel-accent: #4abaaf;
   --panel-header-bg: rgb(27 27 29 / 0.6);
   --panel-header-fg: #b2b5b3;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(54 54 56 / 0.85);
   --scrollbar-thin-thumb: rgb(54 54 56 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(54 54 56 / 0.7);
-  --brand: #7aa2f7;
+  --brand: #4abaaf;
   --brand-foreground: #060607;
-  --brand-primary: #7aa2f7;
+  --brand-primary: #4abaaf;
   --brand-accent: #4abaaf;
   --brand-warm: #ec937b;
   --brand-deep: #060607;
diff --git a/src/workspaces/theme/css/themes/phosphor-os.css b/src/workspaces/theme/css/themes/phosphor-os.css
new file mode 100644
index 00000000..8bc4d8d9
--- /dev/null
+++ b/src/workspaces/theme/css/themes/phosphor-os.css
@@ -0,0 +1,97 @@
+/*
+  Phosphor OS — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
+
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
+
+  Source: https://github.com/OldJobobo/omarchy-phosphor-os-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
+
+  DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
+*/
+[data-theme='phosphor-os'] {
+  --background: #080e0f;
+  --foreground: #668566;
+  --card: #0f191c;
+  --card-foreground: #6a886a;
+  --popover: #0f191c;
+  --popover-foreground: #6a886a;
+  --muted: #20292c;
+  --muted-foreground: #819283;
+  --accent: #20292c;
+  --accent-foreground: #7c967c;
+  --primary: #11ff25;
+  --primary-foreground: #080e0f;
+  --secondary: #20292c;
+  --secondary-foreground: #7c967c;
+  --cta: #11ff25;
+  --cta-foreground: #080e0f;
+  --ctahover: #2eff3f;
+  --success: #faff00;
+  --success-foreground: #080e0f;
+  --warning: #90d762;
+  --warning-foreground: #080e0f;
+  --destructive: #688060;
+  --destructive-foreground: #080d0e;
+  --info: #11ff25;
+  --info-foreground: #080e0f;
+  --busy: #7cac61;
+  --busy-foreground: #080e0f;
+  --busy-ink: #7cac61;
+  --border: #1c2b26;
+  --input: #22302b;
+  --ring: #11ff25;
+  --radius: 0.625rem;
+  --chart-primary: #11ff25;
+  --chart-secondary: #c1ff8a;
+  --status-success: #faff00;
+  --status-warning: #90d762;
+  --status-in-progress: #11ff25;
+  --page-bg: #080e0f;
+  --page-bg-src: '';
+  --panel-bg: rgb(15 25 28 / 0.72);
+  --panel-border: rgb(28 43 38 / 0.9);
+  --panel-border-bare: rgb(28 43 38 / 0.55);
+  --panel-raised-bg: rgb(15 25 28 / 0.95);
+  --panel-raised-border: rgb(28 43 38 / 1);
+  --panel-accent: #11ff25;
+  --panel-header-bg: rgb(32 41 44 / 0.6);
+  --panel-header-fg: #6a886a;
+  --panel-radius: 0.75rem;
+  --panel-blur: 12px;
+  --card-bg: #0f191c;
+  --glass-bg: rgb(15 25 28 / 0.55);
+  --glass-border: rgb(28 43 38 / 0.7);
+  --dock-bg: rgb(15 25 28 / 0.7);
+  --dock-border: rgb(28 43 38 / 0.8);
+  --dock-tooltip-bg: #20292c;
+  --header-bg: rgb(15 25 28 / 0.8);
+  --header-border: rgb(28 43 38 / 0.9);
+  --header-fg: #6a886a;
+  --header-blur: 12px;
+  --pixel-grid-color: rgb(86 104 92 / 0.07);
+  --card-grid-color: rgb(86 104 92 / 0.05);
+  --panel-grid-color: rgb(86 104 92 / 0.06);
+  --scrollbar-thumb: rgb(255 215 0 / 0.6);
+  --scrollbar-thumb-hover: rgb(255 215 0 / 0.85);
+  --scrollbar-thin-thumb: rgb(255 215 0 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(255 215 0 / 0.7);
+  --brand: #11ff25;
+  --brand-foreground: #080e0f;
+  --brand-primary: #11ff25;
+  --brand-accent: #4f7e7e;
+  --brand-warm: #7cac61;
+  --brand-deep: #080e0f;
+  --brand-muted: #ffd700;
+  --ink: #668566;
+  --surface-warm: #0f191c;
+  --naturegreen: #faff00;
+  --naturegreen-foreground: #080e0f;
+  --duck-dark: #668566;
+  --duck-teal: #4f7e7e;
+  --duck-yellow: #90d762;
+  --duck-orange: #7cac61;
+  --duck-forest: #faff00;
+  --duck-beige: #182423;
+  --logo-src: '/officer-logo.svg';
+}
diff --git a/src/workspaces/theme/css/themes/pink-blood.css b/src/workspaces/theme/css/themes/pink-blood.css
index f73a2a46..a41ec40a 100644
--- a/src/workspaces/theme/css/themes/pink-blood.css
+++ b/src/workspaces/theme/css/themes/pink-blood.css
@@ -1,13 +1,11 @@
 /*
   Pink Blood — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/ITSZXY/pink-blood-omarchy-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/pulsar.css b/src/workspaces/theme/css/themes/pulsar.css
index f8d388cb..c610a8b7 100644
--- a/src/workspaces/theme/css/themes/pulsar.css
+++ b/src/workspaces/theme/css/themes/pulsar.css
@@ -1,13 +1,11 @@
 /*
   Pulsar — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/bjarneo/omarchy-pulsar-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a0a2b9;
   --accent: #1b1524;
   --accent-foreground: #e0e6ff;
-  --primary: #3298fa;
+  --primary: #59ffff;
   --primary-foreground: #06020b;
   --secondary: #1b1524;
   --secondary-foreground: #e0e6ff;
-  --cta: #3298fa;
+  --cta: #59ffff;
   --cta-foreground: #06020b;
-  --ctahover: #4ba4fb;
+  --ctahover: #6dffff;
   --success: #5cb960;
   --success-foreground: #06020b;
   --warning: #f2e42e;
@@ -42,9 +40,9 @@
   --busy-ink: #ec9148;
   --border: #343042;
   --input: #343042;
-  --ring: #3298fa;
+  --ring: #59ffff;
   --radius: 0.625rem;
-  --chart-primary: #3298fa;
+  --chart-primary: #59ffff;
   --chart-secondary: #b82aff;
   --status-success: #5cb960;
   --status-warning: #f2e42e;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(52 48 66 / 0.55);
   --panel-raised-bg: rgb(10 3 20 / 0.95);
   --panel-raised-border: rgb(52 48 66 / 1);
-  --panel-accent: #3298fa;
+  --panel-accent: #59ffff;
   --panel-header-bg: rgb(27 21 36 / 0.6);
   --panel-header-fg: #e0e6ff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(170 90 188 / 0.85);
   --scrollbar-thin-thumb: rgb(170 90 188 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(170 90 188 / 0.7);
-  --brand: #3298fa;
+  --brand: #59ffff;
   --brand-foreground: #06020b;
-  --brand-primary: #3298fa;
+  --brand-primary: #59ffff;
   --brand-accent: #3df2f2;
   --brand-warm: #ec9148;
   --brand-deep: #06020b;
diff --git a/src/workspaces/theme/css/themes/purple-moon.css b/src/workspaces/theme/css/themes/purple-moon.css
index 87e01301..ff04e857 100644
--- a/src/workspaces/theme/css/themes/purple-moon.css
+++ b/src/workspaces/theme/css/themes/purple-moon.css
@@ -1,13 +1,11 @@
 /*
   Purple Moon — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/Grey-007/purple-moon (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b3b3b5;
   --accent: #141218;
   --accent-foreground: #ffffff;
-  --primary: #9b49c8;
-  --primary-foreground: #ffffff;
+  --primary: #f6ebe3;
+  --primary-foreground: #010004;
   --secondary: #141218;
   --secondary-foreground: #ffffff;
-  --cta: #9b49c8;
-  --cta-foreground: #ffffff;
-  --ctahover: #a75fcf;
+  --cta: #f6ebe3;
+  --cta-foreground: #010004;
+  --ctahover: #f7ede6;
   --success: #643aad;
   --success-foreground: #ffffff;
   --warning: #9845c6;
@@ -42,9 +40,9 @@
   --busy-ink: #8a63b7;
   --border: #343238;
   --input: #343238;
-  --ring: #9b49c8;
+  --ring: #f6ebe3;
   --radius: 0.625rem;
-  --chart-primary: #9b49c8;
+  --chart-primary: #f6ebe3;
   --chart-secondary: #9865cf;
   --status-success: #643aad;
   --status-warning: #9845c6;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(52 50 56 / 0.55);
   --panel-raised-bg: rgb(2 0 7 / 0.95);
   --panel-raised-border: rgb(52 50 56 / 1);
-  --panel-accent: #9b49c8;
+  --panel-accent: #f6ebe3;
   --panel-header-bg: rgb(20 18 24 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(156 108 208 / 0.85);
   --scrollbar-thin-thumb: rgb(156 108 208 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(156 108 208 / 0.7);
-  --brand: #9b49c8;
-  --brand-foreground: #ffffff;
-  --brand-primary: #9b49c8;
+  --brand: #f6ebe3;
+  --brand-foreground: #010004;
+  --brand-primary: #f6ebe3;
   --brand-accent: #b895dd;
   --brand-warm: #6836a2;
   --brand-deep: #010004;
diff --git a/src/workspaces/theme/css/themes/purplewave.css b/src/workspaces/theme/css/themes/purplewave.css
index 0c1c8de1..bfcf1aaa 100644
--- a/src/workspaces/theme/css/themes/purplewave.css
+++ b/src/workspaces/theme/css/themes/purplewave.css
@@ -1,13 +1,11 @@
 /*
   Purplewave — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/dotsilva/omarchy-purplewave-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/dotsilva/omarchy-purplewave-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #9e8198;
   --accent: #232323;
   --accent-foreground: #d7accd;
-  --primary: #7ea7c9;
+  --primary: #8adb8a;
   --primary-foreground: #0a0a0a;
   --secondary: #232323;
   --secondary-foreground: #d7accd;
-  --cta: #7ea7c9;
+  --cta: #8adb8a;
   --cta-foreground: #0a0a0a;
-  --ctahover: #8db2cf;
+  --ctahover: #98df98;
   --success: #8673d4;
   --success-foreground: #0a0a0a;
   --warning: #ca2edc;
@@ -42,9 +40,9 @@
   --busy-ink: #e53ec1;
   --border: #393037;
   --input: #393037;
-  --ring: #7ea7c9;
+  --ring: #8adb8a;
   --radius: 0.625rem;
-  --chart-primary: #7ea7c9;
+  --chart-primary: #8adb8a;
   --chart-secondary: #b683c3;
   --status-success: #8673d4;
   --status-warning: #ca2edc;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(57 48 55 / 0.55);
   --panel-raised-bg: rgb(18 18 18 / 0.95);
   --panel-raised-border: rgb(57 48 55 / 1);
-  --panel-accent: #7ea7c9;
+  --panel-accent: #8adb8a;
   --panel-header-bg: rgb(35 35 35 / 0.6);
   --panel-header-fg: #d7accd;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(255 154 203 / 0.85);
   --scrollbar-thin-thumb: rgb(255 154 203 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(255 154 203 / 0.7);
-  --brand: #7ea7c9;
+  --brand: #8adb8a;
   --brand-foreground: #0a0a0a;
-  --brand-primary: #7ea7c9;
+  --brand-primary: #8adb8a;
   --brand-accent: #8adb8a;
   --brand-warm: #e53ec1;
   --brand-deep: #0a0a0a;
diff --git a/src/workspaces/theme/css/themes/rainy-night.css b/src/workspaces/theme/css/themes/rainy-night.css
index 29e3fc2e..1a8a7c72 100644
--- a/src/workspaces/theme/css/themes/rainy-night.css
+++ b/src/workspaces/theme/css/themes/rainy-night.css
@@ -1,13 +1,11 @@
 /*
   Rainy Night — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/atif-1402/omarchy-rainynight-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/atif-1402/omarchy-rainynight-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #999fb9;
   --accent: #2e2e3d;
   --accent-foreground: #cdd6f4;
-  --primary: #89b4fa;
+  --primary: #94e2d5;
   --primary-foreground: #111119;
   --secondary: #2e2e3d;
   --secondary-foreground: #cdd6f4;
-  --cta: #89b4fa;
+  --cta: #94e2d5;
   --cta-foreground: #111119;
-  --ctahover: #97bdfb;
+  --ctahover: #a1e5da;
   --success: #a6e3a1;
   --success-foreground: #111119;
   --warning: #f9e2af;
@@ -42,9 +40,9 @@
   --busy-ink: #f6b7ac;
   --border: #404255;
   --input: #404255;
-  --ring: #89b4fa;
+  --ring: #94e2d5;
   --radius: 0.625rem;
-  --chart-primary: #89b4fa;
+  --chart-primary: #94e2d5;
   --chart-secondary: #cba6f7;
   --status-success: #a6e3a1;
   --status-warning: #f9e2af;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(64 66 85 / 0.55);
   --panel-raised-bg: rgb(30 30 46 / 0.95);
   --panel-raised-border: rgb(64 66 85 / 1);
-  --panel-accent: #89b4fa;
+  --panel-accent: #94e2d5;
   --panel-header-bg: rgb(46 46 61 / 0.6);
   --panel-header-fg: #cdd6f4;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(88 91 112 / 0.85);
   --scrollbar-thin-thumb: rgb(88 91 112 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(88 91 112 / 0.7);
-  --brand: #89b4fa;
+  --brand: #94e2d5;
   --brand-foreground: #111119;
-  --brand-primary: #89b4fa;
+  --brand-primary: #94e2d5;
   --brand-accent: #94e2d5;
   --brand-warm: #f6b7ac;
   --brand-deep: #111119;
diff --git a/src/workspaces/theme/css/themes/rdddcs.css b/src/workspaces/theme/css/themes/rdddcs.css
index c0fdd3a0..f63a48ec 100644
--- a/src/workspaces/theme/css/themes/rdddcs.css
+++ b/src/workspaces/theme/css/themes/rdddcs.css
@@ -1,13 +1,11 @@
 /*
   Rdddcs — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/mohamedredachakir/LINUX-OMARCHY-REDDCS (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/mohamedredachakir/LINUX-OMARCHY-REDDCS (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/red-monarch.css b/src/workspaces/theme/css/themes/red-monarch.css
index 87e59757..6fbacb84 100644
--- a/src/workspaces/theme/css/themes/red-monarch.css
+++ b/src/workspaces/theme/css/themes/red-monarch.css
@@ -1,13 +1,11 @@
 /*
   Red Monarch — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/kamatealip/omarchy-red-monarch-theme (ghostty.conf), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/kamatealip/omarchy-red-monarch-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,33 +20,33 @@
   --muted-foreground: #aba9a9;
   --accent: #211a1c;
   --accent-foreground: #ededed;
-  --primary: #bf1111;
-  --primary-foreground: #ededed;
+  --primary: #ededed;
+  --primary-foreground: #090506;
   --secondary: #211a1c;
   --secondary-foreground: #ededed;
-  --cta: #bf1111;
-  --cta-foreground: #ededed;
-  --ctahover: #c72e2e;
-  --success: #bf1111;
+  --cta: #ededed;
+  --cta-foreground: #090506;
+  --ctahover: #efefef;
+  --success: #6c0000;
   --success-foreground: #ededed;
-  --warning: #bf1111;
+  --warning: #6c0000;
   --warning-foreground: #ededed;
-  --destructive: #bf1111;
+  --destructive: #6c0000;
   --destructive-foreground: #ededed;
-  --info: #bf1111;
+  --info: #6c0000;
   --info-foreground: #ededed;
-  --busy: #bf1111;
+  --busy: #6c0000;
   --busy-foreground: #ededed;
-  --busy-ink: #cf4d4d;
+  --busy-ink: #a76666;
   --border: #3b3637;
   --input: #3b3637;
-  --ring: #bf1111;
+  --ring: #ededed;
   --radius: 0.625rem;
-  --chart-primary: #bf1111;
-  --chart-secondary: #bf1111;
-  --status-success: #bf1111;
-  --status-warning: #bf1111;
-  --status-in-progress: #bf1111;
+  --chart-primary: #ededed;
+  --chart-secondary: #6c0000;
+  --status-success: #6c0000;
+  --status-warning: #6c0000;
+  --status-in-progress: #6c0000;
   --page-bg: #090506;
   --page-bg-src: '';
   --panel-bg: rgb(16 9 11 / 0.72);
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(59 54 55 / 0.55);
   --panel-raised-bg: rgb(16 9 11 / 0.95);
   --panel-raised-border: rgb(59 54 55 / 1);
-  --panel-accent: #bf1111;
+  --panel-accent: #ededed;
   --panel-header-bg: rgb(33 26 28 / 0.6);
   --panel-header-fg: #ededed;
   --panel-radius: 0.75rem;
@@ -78,22 +76,22 @@
   --scrollbar-thumb-hover: rgb(104 100 101 / 0.85);
   --scrollbar-thin-thumb: rgb(104 100 101 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(104 100 101 / 0.7);
-  --brand: #bf1111;
-  --brand-foreground: #ededed;
-  --brand-primary: #bf1111;
-  --brand-accent: #bf1111;
-  --brand-warm: #bf1111;
+  --brand: #ededed;
+  --brand-foreground: #090506;
+  --brand-primary: #ededed;
+  --brand-accent: #6c0000;
+  --brand-warm: #6c0000;
   --brand-deep: #090506;
   --brand-muted: #686465;
   --ink: #ededed;
   --surface-warm: #10090b;
-  --naturegreen: #bf1111;
+  --naturegreen: #6c0000;
   --naturegreen-foreground: #ededed;
   --duck-dark: #ededed;
-  --duck-teal: #bf1111;
-  --duck-yellow: #bf1111;
-  --duck-orange: #bf1111;
-  --duck-forest: #bf1111;
+  --duck-teal: #6c0000;
+  --duck-yellow: #6c0000;
+  --duck-orange: #6c0000;
+  --duck-forest: #6c0000;
   --duck-beige: #262022;
   --logo-src: '/officer-logo.svg';
 }
diff --git a/src/workspaces/theme/css/themes/retropc.css b/src/workspaces/theme/css/themes/retropc.css
index 1e6deb26..64d70e69 100644
--- a/src/workspaces/theme/css/themes/retropc.css
+++ b/src/workspaces/theme/css/themes/retropc.css
@@ -1,13 +1,11 @@
 /*
   Retropc — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/rondilley/omarchy-retropc-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b67e02;
   --accent: #1b1b19;
   --accent-foreground: #ffb000;
-  --primary: #cc9900;
+  --primary: #ffbb00;
   --primary-foreground: #060604;
   --secondary: #1b1b19;
   --secondary-foreground: #ffb000;
-  --cta: #cc9900;
+  --cta: #ffbb00;
   --cta-foreground: #060604;
-  --ctahover: #d2a51f;
+  --ctahover: #ffc31f;
   --success: #ffcc00;
   --success-foreground: #060604;
   --warning: #ffd700;
@@ -42,9 +40,9 @@
   --busy-ink: #ffb000;
   --border: #3a2a06;
   --input: #3a2a06;
-  --ring: #cc9900;
+  --ring: #ffbb00;
   --radius: 0.625rem;
-  --chart-primary: #cc9900;
+  --chart-primary: #ffbb00;
   --chart-secondary: #ff9900;
   --status-success: #ffcc00;
   --status-warning: #ffd700;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(58 42 6 / 0.55);
   --panel-raised-bg: rgb(10 10 8 / 0.95);
   --panel-raised-border: rgb(58 42 6 / 1);
-  --panel-accent: #cc9900;
+  --panel-accent: #ffbb00;
   --panel-header-bg: rgb(27 27 25 / 0.6);
   --panel-header-fg: #ffb000;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(128 85 0 / 0.85);
   --scrollbar-thin-thumb: rgb(128 85 0 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(128 85 0 / 0.7);
-  --brand: #cc9900;
+  --brand: #ffbb00;
   --brand-foreground: #060604;
-  --brand-primary: #cc9900;
+  --brand-primary: #ffbb00;
   --brand-accent: #cc9900;
   --brand-warm: #ffb000;
   --brand-deep: #060604;
diff --git a/src/workspaces/theme/css/themes/robco-mojave.css b/src/workspaces/theme/css/themes/robco-mojave.css
index e256672e..5dfe64b0 100644
--- a/src/workspaces/theme/css/themes/robco-mojave.css
+++ b/src/workspaces/theme/css/themes/robco-mojave.css
@@ -1,13 +1,11 @@
 /*
   Robco Mojave — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/signaldirective/robco-mojave (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/signaldirective/robco-mojave (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b67e02;
   --accent: #1b1b19;
   --accent-foreground: #ffb000;
-  --primary: #cc9900;
+  --primary: #ffbb00;
   --primary-foreground: #060604;
   --secondary: #1b1b19;
   --secondary-foreground: #ffb000;
-  --cta: #cc9900;
+  --cta: #ffbb00;
   --cta-foreground: #060604;
-  --ctahover: #d2a51f;
+  --ctahover: #ffc31f;
   --success: #ffcc00;
   --success-foreground: #060604;
   --warning: #ffd700;
@@ -42,9 +40,9 @@
   --busy-ink: #ffb000;
   --border: #3a2a06;
   --input: #3a2a06;
-  --ring: #cc9900;
+  --ring: #ffbb00;
   --radius: 0.625rem;
-  --chart-primary: #cc9900;
+  --chart-primary: #ffbb00;
   --chart-secondary: #ff9900;
   --status-success: #ffcc00;
   --status-warning: #ffd700;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(58 42 6 / 0.55);
   --panel-raised-bg: rgb(10 10 8 / 0.95);
   --panel-raised-border: rgb(58 42 6 / 1);
-  --panel-accent: #cc9900;
+  --panel-accent: #ffbb00;
   --panel-header-bg: rgb(27 27 25 / 0.6);
   --panel-header-fg: #ffb000;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(128 85 0 / 0.85);
   --scrollbar-thin-thumb: rgb(128 85 0 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(128 85 0 / 0.7);
-  --brand: #cc9900;
+  --brand: #ffbb00;
   --brand-foreground: #060604;
-  --brand-primary: #cc9900;
+  --brand-primary: #ffbb00;
   --brand-accent: #cc9900;
   --brand-warm: #ffb000;
   --brand-deep: #060604;
diff --git a/src/workspaces/theme/css/themes/robco.css b/src/workspaces/theme/css/themes/robco.css
index d2a96340..891f188a 100644
--- a/src/workspaces/theme/css/themes/robco.css
+++ b/src/workspaces/theme/css/themes/robco.css
@@ -1,47 +1,45 @@
 /*
   Robco — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/signaldirective/robco-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/signaldirective/robco-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
 [data-theme='robco'] {
-  --background: #060604;
+  --background: #060f0b;
   --foreground: #59cf77;
-  --card: #0a0a08;
+  --card: #0a1c14;
   --card-foreground: #59cf77;
-  --popover: #0a0a08;
+  --popover: #0a1c14;
   --popover-foreground: #59cf77;
-  --muted: #1b1b19;
-  --muted-foreground: #419456;
-  --accent: #1b1b19;
+  --muted: #1b2c24;
+  --muted-foreground: #4fa165;
+  --accent: #1b2c24;
   --accent-foreground: #59cf77;
   --primary: #2e7d4a;
-  --primary-foreground: #f3f3f2;
-  --secondary: #1b1b19;
+  --primary-foreground: #f3f3f3;
+  --secondary: #1b2c24;
   --secondary-foreground: #59cf77;
   --cta: #2e7d4a;
-  --cta-foreground: #f3f3f2;
+  --cta-foreground: #f3f3f3;
   --ctahover: #478d60;
   --success: #59cf77;
-  --success-foreground: #060604;
+  --success-foreground: #060f0b;
   --warning: #6fe685;
-  --warning-foreground: #060604;
+  --warning-foreground: #060f0b;
   --destructive: #3da862;
-  --destructive-foreground: #060604;
+  --destructive-foreground: #060f0b;
   --info: #2e7d4a;
-  --info-foreground: #f3f3f2;
+  --info-foreground: #f3f3f3;
   --busy: #56c774;
-  --busy-foreground: #060604;
+  --busy-foreground: #060f0b;
   --busy-ink: #56c774;
-  --border: #19311e;
-  --input: #19311e;
+  --border: #193f27;
+  --input: #193f27;
   --ring: #2e7d4a;
   --radius: 0.625rem;
   --chart-primary: #2e7d4a;
@@ -49,51 +47,51 @@
   --status-success: #59cf77;
   --status-warning: #6fe685;
   --status-in-progress: #2e7d4a;
-  --page-bg: #060604;
+  --page-bg: #060f0b;
   --page-bg-src: '';
-  --panel-bg: rgb(10 10 8 / 0.72);
-  --panel-border: rgb(25 49 30 / 0.9);
-  --panel-border-bare: rgb(25 49 30 / 0.55);
-  --panel-raised-bg: rgb(10 10 8 / 0.95);
-  --panel-raised-border: rgb(25 49 30 / 1);
+  --panel-bg: rgb(10 28 20 / 0.72);
+  --panel-border: rgb(25 63 39 / 0.9);
+  --panel-border-bare: rgb(25 63 39 / 0.55);
+  --panel-raised-bg: rgb(10 28 20 / 0.95);
+  --panel-raised-border: rgb(25 63 39 / 1);
   --panel-accent: #2e7d4a;
-  --panel-header-bg: rgb(27 27 25 / 0.6);
+  --panel-header-bg: rgb(27 44 36 / 0.6);
   --panel-header-fg: #59cf77;
   --panel-radius: 0.75rem;
   --panel-blur: 12px;
-  --card-bg: #0a0a08;
-  --glass-bg: rgb(10 10 8 / 0.55);
-  --glass-border: rgb(25 49 30 / 0.7);
-  --dock-bg: rgb(10 10 8 / 0.7);
-  --dock-border: rgb(25 49 30 / 0.8);
-  --dock-tooltip-bg: #1b1b19;
-  --header-bg: rgb(10 10 8 / 0.8);
-  --header-border: rgb(25 49 30 / 0.9);
+  --card-bg: #0a1c14;
+  --glass-bg: rgb(10 28 20 / 0.55);
+  --glass-border: rgb(25 63 39 / 0.7);
+  --dock-bg: rgb(10 28 20 / 0.7);
+  --dock-border: rgb(25 63 39 / 0.8);
+  --dock-tooltip-bg: #1b2c24;
+  --header-bg: rgb(10 28 20 / 0.8);
+  --header-border: rgb(25 63 39 / 0.9);
   --header-fg: #59cf77;
   --header-blur: 12px;
-  --pixel-grid-color: rgb(56 107 68 / 0.07);
-  --card-grid-color: rgb(56 107 68 / 0.05);
-  --panel-grid-color: rgb(56 107 68 / 0.06);
-  --scrollbar-thumb: rgb(42 89 52 / 0.6);
-  --scrollbar-thumb-hover: rgb(42 89 52 / 0.85);
-  --scrollbar-thin-thumb: rgb(42 89 52 / 0.45);
-  --scrollbar-thin-thumb-hover: rgb(42 89 52 / 0.7);
+  --pixel-grid-color: rgb(51 113 70 / 0.07);
+  --card-grid-color: rgb(51 113 70 / 0.05);
+  --panel-grid-color: rgb(51 113 70 / 0.06);
+  --scrollbar-thumb: rgb(42 100 60 / 0.6);
+  --scrollbar-thumb-hover: rgb(42 100 60 / 0.85);
+  --scrollbar-thin-thumb: rgb(42 100 60 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(42 100 60 / 0.7);
   --brand: #2e7d4a;
-  --brand-foreground: #f3f3f2;
+  --brand-foreground: #f3f3f3;
   --brand-primary: #2e7d4a;
   --brand-accent: #2e7d4a;
   --brand-warm: #56c774;
-  --brand-deep: #060604;
-  --brand-muted: #2a5934;
+  --brand-deep: #060f0b;
+  --brand-muted: #2a643c;
   --ink: #59cf77;
-  --surface-warm: #0a0a08;
+  --surface-warm: #0a1c14;
   --naturegreen: #59cf77;
-  --naturegreen-foreground: #060604;
+  --naturegreen-foreground: #060f0b;
   --duck-dark: #59cf77;
   --duck-teal: #2e7d4a;
   --duck-yellow: #6fe685;
   --duck-orange: #56c774;
   --duck-forest: #59cf77;
-  --duck-beige: #121e13;
+  --duck-beige: #122e1e;
   --logo-src: '/officer-logo.svg';
 }
diff --git a/src/workspaces/theme/css/themes/roseofdune.css b/src/workspaces/theme/css/themes/roseofdune.css
index f18ff5c9..82c86112 100644
--- a/src/workspaces/theme/css/themes/roseofdune.css
+++ b/src/workspaces/theme/css/themes/roseofdune.css
@@ -1,13 +1,11 @@
 /*
   Roseofdune — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Light theme (light), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Light theme (light), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/HANCORE-linux/omarchy-roseofdune-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/HANCORE-linux/omarchy-roseofdune-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/royal.css b/src/workspaces/theme/css/themes/royal.css
index c3fb76db..1fa5f12d 100644
--- a/src/workspaces/theme/css/themes/royal.css
+++ b/src/workspaces/theme/css/themes/royal.css
@@ -1,13 +1,11 @@
 /*
   Royal — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/notSagyo/omarchy-royal-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b1a390;
   --accent: #2a2a2c;
   --accent-foreground: #f2ddc2;
-  --primary: #cbb15b;
+  --primary: #e5eae9;
   --primary-foreground: #0e0e0f;
   --secondary: #2a2a2c;
   --secondary-foreground: #f2ddc2;
-  --cta: #cbb15b;
+  --cta: #e5eae9;
   --cta-foreground: #0e0e0f;
-  --ctahover: #d1ba6f;
+  --ctahover: #e8edec;
   --success: #d7be67;
   --success-foreground: #0e0e0f;
   --warning: #f5c651;
@@ -42,9 +40,9 @@
   --busy-ink: #f6ae2b;
   --border: #44403c;
   --input: #44403c;
-  --ring: #cbb15b;
+  --ring: #e5eae9;
   --radius: 0.625rem;
-  --chart-primary: #cbb15b;
+  --chart-primary: #e5eae9;
   --chart-secondary: #e7b211;
   --status-success: #d7be67;
   --status-warning: #f5c651;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(68 64 60 / 0.55);
   --panel-raised-bg: rgb(26 26 28 / 0.95);
   --panel-raised-border: rgb(68 64 60 / 1);
-  --panel-accent: #cbb15b;
+  --panel-accent: #e5eae9;
   --panel-header-bg: rgb(42 42 44 / 0.6);
   --panel-header-fg: #f2ddc2;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(84 90 88 / 0.85);
   --scrollbar-thin-thumb: rgb(84 90 88 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(84 90 88 / 0.7);
-  --brand: #cbb15b;
+  --brand: #e5eae9;
   --brand-foreground: #0e0e0f;
-  --brand-primary: #cbb15b;
+  --brand-primary: #e5eae9;
   --brand-accent: #f9e198;
   --brand-warm: #f6ae2b;
   --brand-deep: #0e0e0f;
diff --git a/src/workspaces/theme/css/themes/rustleaf.css b/src/workspaces/theme/css/themes/rustleaf.css
index 7f4a7543..32b30181 100644
--- a/src/workspaces/theme/css/themes/rustleaf.css
+++ b/src/workspaces/theme/css/themes/rustleaf.css
@@ -1,13 +1,11 @@
 /*
   Rustleaf — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/tahfizhabib/omarchy-rustleaf-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #9c9894;
   --accent: #312f30;
   --accent-foreground: #bcb7b0;
-  --primary: #9393c3;
+  --primary: #cdcde5;
   --primary-foreground: #131112;
   --secondary: #312f30;
   --secondary-foreground: #bcb7b0;
-  --cta: #9393c3;
+  --cta: #cdcde5;
   --cta-foreground: #131112;
-  --ctahover: #a0a0ca;
+  --ctahover: #d3d3e8;
   --success: #80b780;
   --success-foreground: #131112;
   --warning: #bdbd89;
@@ -42,9 +40,9 @@
   --busy-ink: #b8997f;
   --border: #403d3c;
   --input: #403d3c;
-  --ring: #9393c3;
+  --ring: #cdcde5;
   --radius: 0.625rem;
-  --chart-primary: #9393c3;
+  --chart-primary: #cdcde5;
   --chart-secondary: #ae6fae;
   --status-success: #80b780;
   --status-warning: #bdbd89;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(64 61 60 / 0.55);
   --panel-raised-bg: rgb(34 31 32 / 0.95);
   --panel-raised-border: rgb(64 61 60 / 1);
-  --panel-accent: #9393c3;
+  --panel-accent: #cdcde5;
   --panel-header-bg: rgb(49 47 48 / 0.6);
   --panel-header-fg: #bcb7b0;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(95 84 72 / 0.85);
   --scrollbar-thin-thumb: rgb(95 84 72 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(95 84 72 / 0.7);
-  --brand: #9393c3;
+  --brand: #cdcde5;
   --brand-foreground: #131112;
-  --brand-primary: #9393c3;
+  --brand-primary: #cdcde5;
   --brand-accent: #7cb6b6;
   --brand-warm: #b8997f;
   --brand-deep: #131112;
diff --git a/src/workspaces/theme/css/themes/seashells.css b/src/workspaces/theme/css/themes/seashells.css
new file mode 100644
index 00000000..a4a295c3
--- /dev/null
+++ b/src/workspaces/theme/css/themes/seashells.css
@@ -0,0 +1,97 @@
+/*
+  Seashells — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
+
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
+
+  Source: https://github.com/odysseyalive/omarchy-seashells-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
+
+  DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
+*/
+[data-theme='seashells'] {
+  --background: #040a0e;
+  --foreground: #deb88d;
+  --card: #08131a;
+  --card-foreground: #deb88d;
+  --popover: #08131a;
+  --popover-foreground: #deb88d;
+  --muted: #19242a;
+  --muted-foreground: #9e876b;
+  --accent: #19242a;
+  --accent-foreground: #deb88d;
+  --primary: #1abcdd;
+  --primary-foreground: #040a0e;
+  --secondary: #19242a;
+  --secondary-foreground: #deb88d;
+  --cta: #1abcdd;
+  --cta-foreground: #040a0e;
+  --ctahover: #35c4e1;
+  --success: #027b9b;
+  --success-foreground: #f9f9f9;
+  --warning: #fba02f;
+  --warning-foreground: #040a0e;
+  --destructive: #d05023;
+  --destructive-foreground: #040a0e;
+  --info: #2d6870;
+  --info-foreground: #edd8c0;
+  --busy: #e67829;
+  --busy-foreground: #040a0e;
+  --busy-ink: #e67829;
+  --border: #323331;
+  --input: #323331;
+  --ring: #1abcdd;
+  --radius: 0.625rem;
+  --chart-primary: #1abcdd;
+  --chart-secondary: #68d3f0;
+  --status-success: #027b9b;
+  --status-warning: #fba02f;
+  --status-in-progress: #2d6870;
+  --page-bg: #040a0e;
+  --page-bg-src: '';
+  --panel-bg: rgb(8 19 26 / 0.72);
+  --panel-border: rgb(50 51 49 / 0.9);
+  --panel-border-bare: rgb(50 51 49 / 0.55);
+  --panel-raised-bg: rgb(8 19 26 / 0.95);
+  --panel-raised-border: rgb(50 51 49 / 1);
+  --panel-accent: #1abcdd;
+  --panel-header-bg: rgb(25 36 42 / 0.6);
+  --panel-header-fg: #deb88d;
+  --panel-radius: 0.75rem;
+  --panel-blur: 12px;
+  --card-bg: #08131a;
+  --glass-bg: rgb(8 19 26 / 0.55);
+  --glass-border: rgb(50 51 49 / 0.7);
+  --dock-bg: rgb(8 19 26 / 0.7);
+  --dock-border: rgb(50 51 49 / 0.8);
+  --dock-tooltip-bg: #19242a;
+  --header-bg: rgb(8 19 26 / 0.8);
+  --header-border: rgb(50 51 49 / 0.9);
+  --header-fg: #deb88d;
+  --header-blur: 12px;
+  --pixel-grid-color: rgb(108 97 82 / 0.07);
+  --card-grid-color: rgb(108 97 82 / 0.05);
+  --panel-grid-color: rgb(108 97 82 / 0.06);
+  --scrollbar-thumb: rgb(66 75 82 / 0.6);
+  --scrollbar-thumb-hover: rgb(66 75 82 / 0.85);
+  --scrollbar-thin-thumb: rgb(66 75 82 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(66 75 82 / 0.7);
+  --brand: #1abcdd;
+  --brand-foreground: #040a0e;
+  --brand-primary: #1abcdd;
+  --brand-accent: #50a3b5;
+  --brand-warm: #e67829;
+  --brand-deep: #040a0e;
+  --brand-muted: #424b52;
+  --ink: #deb88d;
+  --surface-warm: #08131a;
+  --naturegreen: #027b9b;
+  --naturegreen-foreground: #f9f9f9;
+  --duck-dark: #deb88d;
+  --duck-teal: #50a3b5;
+  --duck-yellow: #fba02f;
+  --duck-orange: #e67829;
+  --duck-forest: #027b9b;
+  --duck-beige: #1d2426;
+  --logo-src: '/officer-logo.svg';
+}
diff --git a/src/workspaces/theme/css/themes/snow-black.css b/src/workspaces/theme/css/themes/snow-black.css
index ccb82723..64d9fdd4 100644
--- a/src/workspaces/theme/css/themes/snow-black.css
+++ b/src/workspaces/theme/css/themes/snow-black.css
@@ -1,54 +1,52 @@
 /*
   Snow Black — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/ankur311sudo/snow_black (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/ankur311sudo/snow_black (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
 [data-theme='snow-black'] {
   --background: #000000;
-  --foreground: #fefefe;
+  --foreground: #ffffff;
   --card: #000000;
-  --card-foreground: #fefefe;
+  --card-foreground: #ffffff;
   --popover: #000000;
-  --popover-foreground: #fefefe;
+  --popover-foreground: #ffffff;
   --muted: #121212;
-  --muted-foreground: #b2b2b2;
+  --muted-foreground: #b3b3b3;
   --accent: #121212;
-  --accent-foreground: #fefefe;
-  --primary: #bdbdbd;
+  --accent-foreground: #ffffff;
+  --primary: #aaaaaa;
   --primary-foreground: #000000;
   --secondary: #121212;
-  --secondary-foreground: #fefefe;
-  --cta: #bdbdbd;
+  --secondary-foreground: #ffffff;
+  --cta: #aaaaaa;
   --cta-foreground: #000000;
-  --ctahover: #c5c5c5;
-  --success: #bdbdbd;
+  --ctahover: #b4b4b4;
+  --success: #dd9999;
   --success-foreground: #000000;
-  --warning: #cfcfcf;
+  --warning: #a06666;
   --warning-foreground: #000000;
-  --destructive: #fefefe;
+  --destructive: #5f8787;
   --destructive-foreground: #000000;
-  --info: #bdbdbd;
+  --info: #888888;
   --info-foreground: #000000;
-  --busy: #e7e7e7;
+  --busy: #807777;
   --busy-foreground: #000000;
-  --busy-ink: #e7e7e7;
+  --busy-ink: #807777;
   --border: #323232;
   --input: #323232;
-  --ring: #bdbdbd;
+  --ring: #aaaaaa;
   --radius: 0.625rem;
-  --chart-primary: #bdbdbd;
-  --chart-secondary: #bdbdbd;
-  --status-success: #bdbdbd;
-  --status-warning: #cfcfcf;
-  --status-in-progress: #bdbdbd;
+  --chart-primary: #aaaaaa;
+  --chart-secondary: #999999;
+  --status-success: #dd9999;
+  --status-warning: #a06666;
+  --status-in-progress: #888888;
   --page-bg: #000000;
   --page-bg-src: '';
   --panel-bg: rgb(0 0 0 / 0.72);
@@ -56,9 +54,9 @@
   --panel-border-bare: rgb(50 50 50 / 0.55);
   --panel-raised-bg: rgb(0 0 0 / 0.95);
   --panel-raised-border: rgb(50 50 50 / 1);
-  --panel-accent: #bdbdbd;
+  --panel-accent: #aaaaaa;
   --panel-header-bg: rgb(18 18 18 / 0.6);
-  --panel-header-fg: #fefefe;
+  --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
   --panel-blur: 12px;
   --card-bg: #000000;
@@ -69,31 +67,31 @@
   --dock-tooltip-bg: #121212;
   --header-bg: rgb(0 0 0 / 0.8);
   --header-border: rgb(50 50 50 / 0.9);
-  --header-fg: #fefefe;
+  --header-fg: #ffffff;
   --header-blur: 12px;
-  --pixel-grid-color: rgb(114 114 114 / 0.07);
-  --card-grid-color: rgb(114 114 114 / 0.05);
-  --panel-grid-color: rgb(114 114 114 / 0.06);
-  --scrollbar-thumb: rgb(26 26 26 / 0.6);
-  --scrollbar-thumb-hover: rgb(26 26 26 / 0.85);
-  --scrollbar-thin-thumb: rgb(26 26 26 / 0.45);
-  --scrollbar-thin-thumb-hover: rgb(26 26 26 / 0.7);
-  --brand: #bdbdbd;
+  --pixel-grid-color: rgb(115 115 115 / 0.07);
+  --card-grid-color: rgb(115 115 115 / 0.05);
+  --panel-grid-color: rgb(115 115 115 / 0.06);
+  --scrollbar-thumb: rgb(51 51 51 / 0.6);
+  --scrollbar-thumb-hover: rgb(51 51 51 / 0.85);
+  --scrollbar-thin-thumb: rgb(51 51 51 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(51 51 51 / 0.7);
+  --brand: #aaaaaa;
   --brand-foreground: #000000;
-  --brand-primary: #bdbdbd;
-  --brand-accent: #bdbdbd;
-  --brand-warm: #e7e7e7;
+  --brand-primary: #aaaaaa;
+  --brand-accent: #aaaaaa;
+  --brand-warm: #807777;
   --brand-deep: #000000;
-  --brand-muted: #1a1a1a;
-  --ink: #fefefe;
+  --brand-muted: #333333;
+  --ink: #ffffff;
   --surface-warm: #000000;
-  --naturegreen: #bdbdbd;
+  --naturegreen: #dd9999;
   --naturegreen-foreground: #000000;
-  --duck-dark: #fefefe;
-  --duck-teal: #bdbdbd;
-  --duck-yellow: #cfcfcf;
-  --duck-orange: #e7e7e7;
-  --duck-forest: #bdbdbd;
-  --duck-beige: #191919;
+  --duck-dark: #ffffff;
+  --duck-teal: #aaaaaa;
+  --duck-yellow: #a06666;
+  --duck-orange: #807777;
+  --duck-forest: #dd9999;
+  --duck-beige: #1a1a1a;
   --logo-src: '/officer-logo.svg';
 }
diff --git a/src/workspaces/theme/css/themes/solarized-light.css b/src/workspaces/theme/css/themes/solarized-light.css
new file mode 100644
index 00000000..8cf5611a
--- /dev/null
+++ b/src/workspaces/theme/css/themes/solarized-light.css
@@ -0,0 +1,97 @@
+/*
+  Solarized Light — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
+
+  Light theme (light), by luminance of its own background — the source repo carries no mode flag of its own to read.
+
+  Source: https://github.com/dfrico/omarchy-solarized-light-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
+
+  DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
+*/
+[data-theme='solarized-light'] {
+  --background: #fdf6e3;
+  --foreground: #586e75;
+  --card: #f4eddb;
+  --card-foreground: #586e75;
+  --popover: #f4eddb;
+  --popover-foreground: #586e75;
+  --muted: #eee7d5;
+  --muted-foreground: #616a69;
+  --accent: #eee7d5;
+  --accent-foreground: #566b72;
+  --primary: #268bd2;
+  --primary-foreground: #1d1c1a;
+  --secondary: #eee7d5;
+  --secondary-foreground: #566b72;
+  --cta: #268bd2;
+  --cta-foreground: #1d1c1a;
+  --ctahover: #217ab9;
+  --success: #859900;
+  --success-foreground: #282724;
+  --warning: #b58900;
+  --warning-foreground: #282724;
+  --destructive: #dc322f;
+  --destructive-foreground: #fcfcfa;
+  --info: #268bd2;
+  --info-foreground: #1d1c1a;
+  --busy: #c95e18;
+  --busy-foreground: #11110f;
+  --busy-ink: #b55516;
+  --border: #e2ded0;
+  --input: #d7d3c6;
+  --ring: #268bd2;
+  --radius: 0.625rem;
+  --chart-primary: #268bd2;
+  --chart-secondary: #d33682;
+  --status-success: #859900;
+  --status-warning: #b58900;
+  --status-in-progress: #268bd2;
+  --page-bg: #fdf6e3;
+  --page-bg-src: '';
+  --panel-bg: rgb(244 237 219 / 0.72);
+  --panel-border: rgb(226 222 208 / 0.9);
+  --panel-border-bare: rgb(226 222 208 / 0.55);
+  --panel-raised-bg: rgb(244 237 219 / 0.95);
+  --panel-raised-border: rgb(226 222 208 / 1);
+  --panel-accent: #268bd2;
+  --panel-header-bg: rgb(238 231 213 / 0.6);
+  --panel-header-fg: #586e75;
+  --panel-radius: 0.75rem;
+  --panel-blur: 12px;
+  --card-bg: #f4eddb;
+  --glass-bg: rgb(244 237 219 / 0.55);
+  --glass-border: rgb(226 222 208 / 0.7);
+  --dock-bg: rgb(244 237 219 / 0.7);
+  --dock-border: rgb(226 222 208 / 0.8);
+  --dock-tooltip-bg: #eee7d5;
+  --header-bg: rgb(244 237 219 / 0.8);
+  --header-border: rgb(226 222 208 / 0.9);
+  --header-fg: #586e75;
+  --header-blur: 12px;
+  --pixel-grid-color: rgb(130 134 129 / 0.07);
+  --card-grid-color: rgb(130 134 129 / 0.05);
+  --panel-grid-color: rgb(130 134 129 / 0.06);
+  --scrollbar-thumb: rgb(0 43 54 / 0.6);
+  --scrollbar-thumb-hover: rgb(0 43 54 / 0.85);
+  --scrollbar-thin-thumb: rgb(0 43 54 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(0 43 54 / 0.7);
+  --brand: #268bd2;
+  --brand-foreground: #1d1c1a;
+  --brand-primary: #268bd2;
+  --brand-accent: #2aa198;
+  --brand-warm: #c95e18;
+  --brand-deep: #eee7d5;
+  --brand-muted: #002b36;
+  --ink: #586e75;
+  --surface-warm: #f4eddb;
+  --naturegreen: #859900;
+  --naturegreen-foreground: #282724;
+  --duck-dark: #586e75;
+  --duck-teal: #2aa198;
+  --duck-yellow: #b58900;
+  --duck-orange: #c95e18;
+  --duck-forest: #859900;
+  --duck-beige: #e4e0d1;
+  --logo-src: '/officer-logo.svg';
+}
diff --git a/src/workspaces/theme/css/themes/solarized-osaka.css b/src/workspaces/theme/css/themes/solarized-osaka.css
new file mode 100644
index 00000000..9a530d77
--- /dev/null
+++ b/src/workspaces/theme/css/themes/solarized-osaka.css
@@ -0,0 +1,97 @@
+/*
+  Solarized Osaka — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
+
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
+
+  Source: https://github.com/motorsss/omarchy-solarizedosaka-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
+
+  DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
+*/
+[data-theme='solarized-osaka'] {
+  --background: #000f18;
+  --foreground: #707f84;
+  --card: #001c2b;
+  --card-foreground: #77868a;
+  --popover: #001c2b;
+  --popover-foreground: #77868a;
+  --muted: #122c3a;
+  --muted-foreground: #869398;
+  --accent: #122c3a;
+  --accent-foreground: #869397;
+  --primary: #2aa198;
+  --primary-foreground: #000f18;
+  --secondary: #122c3a;
+  --secondary-foreground: #869397;
+  --cta: #2aa198;
+  --cta-foreground: #000f18;
+  --ctahover: #44aca4;
+  --success: #809900;
+  --success-foreground: #000f18;
+  --warning: #b38800;
+  --warning-foreground: #000f18;
+  --destructive: #d8322f;
+  --destructive-foreground: #f9f9f9;
+  --info: #268bd2;
+  --info-foreground: #000f18;
+  --busy: #c65d18;
+  --busy-foreground: #000f18;
+  --busy-ink: #c65d18;
+  --border: #152f3c;
+  --input: #152f3c;
+  --ring: #2aa198;
+  --radius: 0.625rem;
+  --chart-primary: #2aa198;
+  --chart-secondary: #d03682;
+  --status-success: #809900;
+  --status-warning: #b38800;
+  --status-in-progress: #268bd2;
+  --page-bg: #000f18;
+  --page-bg-src: '';
+  --panel-bg: rgb(0 28 43 / 0.72);
+  --panel-border: rgb(21 47 60 / 0.9);
+  --panel-border-bare: rgb(21 47 60 / 0.55);
+  --panel-raised-bg: rgb(0 28 43 / 0.95);
+  --panel-raised-border: rgb(21 47 60 / 1);
+  --panel-accent: #2aa198;
+  --panel-header-bg: rgb(18 44 58 / 0.6);
+  --panel-header-fg: #77868a;
+  --panel-radius: 0.75rem;
+  --panel-blur: 12px;
+  --card-bg: #001c2b;
+  --glass-bg: rgb(0 28 43 / 0.55);
+  --glass-border: rgb(21 47 60 / 0.7);
+  --dock-bg: rgb(0 28 43 / 0.7);
+  --dock-border: rgb(21 47 60 / 0.8);
+  --dock-tooltip-bg: #122c3a;
+  --header-bg: rgb(0 28 43 / 0.8);
+  --header-border: rgb(21 47 60 / 0.9);
+  --header-fg: #77868a;
+  --header-blur: 12px;
+  --pixel-grid-color: rgb(90 108 117 / 0.07);
+  --card-grid-color: rgb(90 108 117 / 0.05);
+  --panel-grid-color: rgb(90 108 117 / 0.06);
+  --scrollbar-thumb: rgb(95 111 116 / 0.6);
+  --scrollbar-thumb-hover: rgb(95 111 116 / 0.85);
+  --scrollbar-thin-thumb: rgb(95 111 116 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(95 111 116 / 0.7);
+  --brand: #2aa198;
+  --brand-foreground: #000f18;
+  --brand-primary: #2aa198;
+  --brand-accent: #2aa198;
+  --brand-warm: #c65d18;
+  --brand-deep: #000f18;
+  --brand-muted: #5f6f74;
+  --ink: #707f84;
+  --surface-warm: #001c2b;
+  --naturegreen: #809900;
+  --naturegreen-foreground: #000f18;
+  --duck-dark: #707f84;
+  --duck-teal: #2aa198;
+  --duck-yellow: #b38800;
+  --duck-orange: #c65d18;
+  --duck-forest: #809900;
+  --duck-beige: #0b2634;
+  --logo-src: '/officer-logo.svg';
+}
diff --git a/src/workspaces/theme/css/themes/solarized.css b/src/workspaces/theme/css/themes/solarized.css
new file mode 100644
index 00000000..1d13eed3
--- /dev/null
+++ b/src/workspaces/theme/css/themes/solarized.css
@@ -0,0 +1,97 @@
+/*
+  Solarized — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
+
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
+
+  Source: https://github.com/Gazler/omarchy-solarized-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
+
+  DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
+*/
+[data-theme='solarized'] {
+  --background: #00181e;
+  --foreground: #839496;
+  --card: #002b36;
+  --card-foreground: #839496;
+  --popover: #002b36;
+  --popover-foreground: #839496;
+  --muted: #123a44;
+  --muted-foreground: #91a2a5;
+  --accent: #123a44;
+  --accent-foreground: #93a1a3;
+  --primary: #93a1a1;
+  --primary-foreground: #00181e;
+  --secondary: #123a44;
+  --secondary-foreground: #93a1a3;
+  --cta: #93a1a1;
+  --cta-foreground: #00181e;
+  --ctahover: #a0acac;
+  --success: #859900;
+  --success-foreground: #00181e;
+  --warning: #b58900;
+  --warning-foreground: #00181e;
+  --destructive: #dc322f;
+  --destructive-foreground: #ffffff;
+  --info: #268bd2;
+  --info-foreground: #00181e;
+  --busy: #c95e18;
+  --busy-foreground: #00161c;
+  --busy-ink: #ca621e;
+  --border: #1a4049;
+  --input: #1a4049;
+  --ring: #93a1a1;
+  --radius: 0.625rem;
+  --chart-primary: #93a1a1;
+  --chart-secondary: #d33682;
+  --status-success: #859900;
+  --status-warning: #b58900;
+  --status-in-progress: #268bd2;
+  --page-bg: #00181e;
+  --page-bg-src: '';
+  --panel-bg: rgb(0 43 54 / 0.72);
+  --panel-border: rgb(26 64 73 / 0.9);
+  --panel-border-bare: rgb(26 64 73 / 0.55);
+  --panel-raised-bg: rgb(0 43 54 / 0.95);
+  --panel-raised-border: rgb(26 64 73 / 1);
+  --panel-accent: #93a1a1;
+  --panel-header-bg: rgb(18 58 68 / 0.6);
+  --panel-header-fg: #839496;
+  --panel-radius: 0.75rem;
+  --panel-blur: 12px;
+  --card-bg: #002b36;
+  --glass-bg: rgb(0 43 54 / 0.55);
+  --glass-border: rgb(26 64 73 / 0.7);
+  --dock-bg: rgb(0 43 54 / 0.7);
+  --dock-border: rgb(26 64 73 / 0.8);
+  --dock-tooltip-bg: #123a44;
+  --header-bg: rgb(0 43 54 / 0.8);
+  --header-border: rgb(26 64 73 / 0.9);
+  --header-fg: #839496;
+  --header-blur: 12px;
+  --pixel-grid-color: rgb(93 119 125 / 0.07);
+  --card-grid-color: rgb(93 119 125 / 0.05);
+  --panel-grid-color: rgb(93 119 125 / 0.06);
+  --scrollbar-thumb: rgb(52 85 92 / 0.6);
+  --scrollbar-thumb-hover: rgb(52 85 92 / 0.85);
+  --scrollbar-thin-thumb: rgb(52 85 92 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(52 85 92 / 0.7);
+  --brand: #93a1a1;
+  --brand-foreground: #00181e;
+  --brand-primary: #93a1a1;
+  --brand-accent: #2aa198;
+  --brand-warm: #c95e18;
+  --brand-deep: #00181e;
+  --brand-muted: #34555c;
+  --ink: #839496;
+  --surface-warm: #002b36;
+  --naturegreen: #859900;
+  --naturegreen-foreground: #00181e;
+  --duck-dark: #839496;
+  --duck-teal: #2aa198;
+  --duck-yellow: #b58900;
+  --duck-orange: #c95e18;
+  --duck-forest: #859900;
+  --duck-beige: #0d3640;
+  --logo-src: '/officer-logo.svg';
+}
diff --git a/src/workspaces/theme/css/themes/space-bound.css b/src/workspaces/theme/css/themes/space-bound.css
index d6aa3b84..1b2350df 100644
--- a/src/workspaces/theme/css/themes/space-bound.css
+++ b/src/workspaces/theme/css/themes/space-bound.css
@@ -1,13 +1,11 @@
 /*
   Space Bound — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/Deoxizn/omarchy-space-bound-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/Deoxizn/omarchy-space-bound-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #bcbcc0;
   --accent: #2e2e3d;
   --accent-foreground: #ffffff;
-  --primary: #89b4fa;
+  --primary: #94e2d5;
   --primary-foreground: #111119;
   --secondary: #2e2e3d;
   --secondary-foreground: #ffffff;
-  --cta: #89b4fa;
+  --cta: #94e2d5;
   --cta-foreground: #111119;
-  --ctahover: #97bdfb;
+  --ctahover: #a1e5da;
   --success: #a6e3a1;
   --success-foreground: #111119;
   --warning: #f9e2af;
@@ -42,9 +40,9 @@
   --busy-ink: #f6b7ac;
   --border: #4a4a57;
   --input: #4a4a57;
-  --ring: #89b4fa;
+  --ring: #94e2d5;
   --radius: 0.625rem;
-  --chart-primary: #89b4fa;
+  --chart-primary: #94e2d5;
   --chart-secondary: #cba6f7;
   --status-success: #a6e3a1;
   --status-warning: #f9e2af;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(74 74 87 / 0.55);
   --panel-raised-bg: rgb(30 30 46 / 0.95);
   --panel-raised-border: rgb(74 74 87 / 1);
-  --panel-accent: #89b4fa;
+  --panel-accent: #94e2d5;
   --panel-header-bg: rgb(46 46 61 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(69 71 90 / 0.85);
   --scrollbar-thin-thumb: rgb(69 71 90 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(69 71 90 / 0.7);
-  --brand: #89b4fa;
+  --brand: #94e2d5;
   --brand-foreground: #111119;
-  --brand-primary: #89b4fa;
+  --brand-primary: #94e2d5;
   --brand-accent: #94e2d5;
   --brand-warm: #f6b7ac;
   --brand-deep: #111119;
diff --git a/src/workspaces/theme/css/themes/space-monkey.css b/src/workspaces/theme/css/themes/space-monkey.css
index 62ab502c..f446f5a1 100644
--- a/src/workspaces/theme/css/themes/space-monkey.css
+++ b/src/workspaces/theme/css/themes/space-monkey.css
@@ -1,13 +1,11 @@
 /*
   Space Monkey — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/TyRichards/omarchy-space-monkey-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/TyRichards/omarchy-space-monkey-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #ae8249;
   --accent: #2c1f12;
   --accent-foreground: #e7aa5a;
-  --primary: #66a891;
+  --primary: #9bf1e1;
   --primary-foreground: #0f0800;
   --secondary: #2c1f12;
   --secondary-foreground: #e7aa5a;
-  --cta: #66a891;
+  --cta: #9bf1e1;
   --cta-foreground: #0f0800;
-  --ctahover: #78b29e;
+  --ctahover: #a7f3e5;
   --success: #df782d;
   --success-foreground: #0f0800;
   --warning: #f9cc6c;
@@ -42,9 +40,9 @@
   --busy-ink: #fb9a78;
   --border: #442d12;
   --input: #442d12;
-  --ring: #66a891;
+  --ring: #9bf1e1;
   --radius: 0.625rem;
-  --chart-primary: #66a891;
+  --chart-primary: #9bf1e1;
   --chart-secondary: #a8a9eb;
   --status-success: #df782d;
   --status-warning: #f9cc6c;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(68 45 18 / 0.55);
   --panel-raised-bg: rgb(28 14 0 / 0.95);
   --panel-raised-border: rgb(68 45 18 / 1);
-  --panel-accent: #66a891;
+  --panel-accent: #9bf1e1;
   --panel-header-bg: rgb(44 31 18 / 0.6);
   --panel-header-fg: #e7aa5a;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(148 138 139 / 0.85);
   --scrollbar-thin-thumb: rgb(148 138 139 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(148 138 139 / 0.7);
-  --brand: #66a891;
+  --brand: #9bf1e1;
   --brand-foreground: #0f0800;
-  --brand-primary: #66a891;
+  --brand-primary: #9bf1e1;
   --brand-accent: #bd4924;
   --brand-warm: #fb9a78;
   --brand-deep: #0f0800;
diff --git a/src/workspaces/theme/css/themes/spark.css b/src/workspaces/theme/css/themes/spark.css
index 205bf38d..b1ce2b0e 100644
--- a/src/workspaces/theme/css/themes/spark.css
+++ b/src/workspaces/theme/css/themes/spark.css
@@ -1,13 +1,11 @@
 /*
   Spark — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/stefanomainardi/omarchy-sf-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/stefanomainardi/omarchy-sf-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b3b9be;
   --accent: #152536;
   --accent-foreground: #ffffff;
-  --primary: #027aca;
-  --primary-foreground: #ffffff;
+  --primary: #40c6cf;
+  --primary-foreground: #020c15;
   --secondary: #152536;
   --secondary-foreground: #ffffff;
-  --cta: #027aca;
-  --cta-foreground: #ffffff;
-  --ctahover: #208ad0;
+  --cta: #40c6cf;
+  --cta-foreground: #020c15;
+  --ctahover: #57cdd5;
   --success: #008844;
   --success-foreground: #ffffff;
   --warning: #f7ad2c;
@@ -42,9 +40,9 @@
   --busy-ink: #f15716;
   --border: #344351;
   --input: #344351;
-  --ring: #027aca;
+  --ring: #40c6cf;
   --radius: 0.625rem;
-  --chart-primary: #027aca;
+  --chart-primary: #40c6cf;
   --chart-secondary: #8d1971;
   --status-success: #008844;
   --status-warning: #f7ad2c;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(52 67 81 / 0.55);
   --panel-raised-bg: rgb(3 21 39 / 0.95);
   --panel-raised-border: rgb(52 67 81 / 1);
-  --panel-accent: #027aca;
+  --panel-accent: #40c6cf;
   --panel-header-bg: rgb(21 37 54 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(12 51 90 / 0.85);
   --scrollbar-thin-thumb: rgb(12 51 90 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(12 51 90 / 0.7);
-  --brand: #027aca;
-  --brand-foreground: #ffffff;
-  --brand-primary: #027aca;
+  --brand: #40c6cf;
+  --brand-foreground: #020c15;
+  --brand-primary: #40c6cf;
   --brand-accent: #40c6cf;
   --brand-warm: #f15716;
   --brand-deep: #020c15;
diff --git a/src/workspaces/theme/css/themes/spectra.css b/src/workspaces/theme/css/themes/spectra.css
index 131f2e96..0434e7a5 100644
--- a/src/workspaces/theme/css/themes/spectra.css
+++ b/src/workspaces/theme/css/themes/spectra.css
@@ -1,13 +1,11 @@
 /*
   Spectra — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/abhijeet-swami/omarchy-spectra-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #acacb0;
   --accent: #2a2b2e;
   --accent-foreground: #eaeaef;
-  --primary: #7ca5ff;
+  --primary: #94e8e3;
   --primary-foreground: #0e0f11;
   --secondary: #2a2b2e;
   --secondary-foreground: #eaeaef;
-  --cta: #7ca5ff;
+  --cta: #94e8e3;
   --cta-foreground: #0e0f11;
-  --ctahover: #8cb0ff;
+  --ctahover: #a1ebe6;
   --success: #8edb73;
   --success-foreground: #0e0f11;
   --warning: #f7c553;
@@ -42,9 +40,9 @@
   --busy-ink: #f3915d;
   --border: #434447;
   --input: #434447;
-  --ring: #7ca5ff;
+  --ring: #94e8e3;
   --radius: 0.625rem;
-  --chart-primary: #7ca5ff;
+  --chart-primary: #94e8e3;
   --chart-secondary: #e29ef3;
   --status-success: #8edb73;
   --status-warning: #f7c553;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(67 68 71 / 0.55);
   --panel-raised-bg: rgb(26 27 30 / 0.95);
   --panel-raised-border: rgb(67 68 71 / 1);
-  --panel-accent: #7ca5ff;
+  --panel-accent: #94e8e3;
   --panel-header-bg: rgb(42 43 46 / 0.6);
   --panel-header-fg: #eaeaef;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(80 82 88 / 0.85);
   --scrollbar-thin-thumb: rgb(80 82 88 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(80 82 88 / 0.7);
-  --brand: #7ca5ff;
+  --brand: #94e8e3;
   --brand-foreground: #0e0f11;
-  --brand-primary: #7ca5ff;
+  --brand-primary: #94e8e3;
   --brand-accent: #7dd8d3;
   --brand-warm: #f3915d;
   --brand-deep: #0e0f11;
diff --git a/src/workspaces/theme/css/themes/stellar.css b/src/workspaces/theme/css/themes/stellar.css
index 6bfcad1d..7403d213 100644
--- a/src/workspaces/theme/css/themes/stellar.css
+++ b/src/workspaces/theme/css/themes/stellar.css
@@ -1,13 +1,11 @@
 /*
   Stellar — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/cicorias/omarchy-stellar-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #acb1b7;
   --accent: #1e2227;
   --accent-foreground: #f0f6fc;
-  --primary: #58a6ff;
+  --primary: #56d4dd;
   --primary-foreground: #07090d;
   --secondary: #1e2227;
   --secondary-foreground: #f0f6fc;
-  --cta: #58a6ff;
+  --cta: #56d4dd;
   --cta-foreground: #07090d;
-  --ctahover: #6cb1ff;
+  --ctahover: #6ad9e1;
   --success: #3fb950;
   --success-foreground: #07090d;
   --warning: #d29922;
@@ -42,9 +40,9 @@
   --busy-ink: #e98a4a;
   --border: #3a3e44;
   --input: #3a3e44;
-  --ring: #58a6ff;
+  --ring: #56d4dd;
   --radius: 0.625rem;
-  --chart-primary: #58a6ff;
+  --chart-primary: #56d4dd;
   --chart-secondary: #bc8cff;
   --status-success: #3fb950;
   --status-warning: #d29922;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(58 62 68 / 0.55);
   --panel-raised-bg: rgb(13 17 23 / 0.95);
   --panel-raised-border: rgb(58 62 68 / 1);
-  --panel-accent: #58a6ff;
+  --panel-accent: #56d4dd;
   --panel-header-bg: rgb(30 34 39 / 0.6);
   --panel-header-fg: #f0f6fc;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(72 79 88 / 0.85);
   --scrollbar-thin-thumb: rgb(72 79 88 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(72 79 88 / 0.7);
-  --brand: #58a6ff;
+  --brand: #56d4dd;
   --brand-foreground: #07090d;
-  --brand-primary: #58a6ff;
+  --brand-primary: #56d4dd;
   --brand-accent: #39c5cf;
   --brand-warm: #e98a4a;
   --brand-deep: #07090d;
diff --git a/src/workspaces/theme/css/themes/stillmoon.css b/src/workspaces/theme/css/themes/stillmoon.css
index 604cade5..d81f1190 100644
--- a/src/workspaces/theme/css/themes/stillmoon.css
+++ b/src/workspaces/theme/css/themes/stillmoon.css
@@ -1,13 +1,11 @@
 /*
   Stillmoon — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/atif-1402/omarchy-stillmoon-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a5a5a2;
   --accent: #323738;
   --accent-foreground: #dcdbd6;
-  --primary: #a0997e;
+  --primary: #ebece5;
   --primary-foreground: #131617;
   --secondary: #323738;
   --secondary-foreground: #dcdbd6;
-  --cta: #a0997e;
+  --cta: #ebece5;
   --cta-foreground: #131617;
-  --ctahover: #aba58d;
+  --ctahover: #edeee8;
   --success: #9cab8c;
   --success-foreground: #131617;
   --warning: #b1ad95;
@@ -42,9 +40,9 @@
   --busy-ink: #aba68d;
   --border: #474b4b;
   --input: #474b4b;
-  --ring: #a0997e;
+  --ring: #ebece5;
   --radius: 0.625rem;
-  --chart-primary: #a0997e;
+  --chart-primary: #ebece5;
   --chart-secondary: #9f997e;
   --status-success: #9cab8c;
   --status-warning: #b1ad95;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(71 75 75 / 0.55);
   --panel-raised-bg: rgb(35 40 41 / 0.95);
   --panel-raised-border: rgb(71 75 75 / 1);
-  --panel-accent: #a0997e;
+  --panel-accent: #ebece5;
   --panel-header-bg: rgb(50 55 56 / 0.6);
   --panel-header-fg: #dcdbd6;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(120 133 135 / 0.85);
   --scrollbar-thin-thumb: rgb(120 133 135 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(120 133 135 / 0.7);
-  --brand: #a0997e;
+  --brand: #ebece5;
   --brand-foreground: #131617;
-  --brand-primary: #a0997e;
+  --brand-primary: #ebece5;
   --brand-accent: #c1c5b0;
   --brand-warm: #aba68d;
   --brand-deep: #131617;
diff --git a/src/workspaces/theme/css/themes/sunset.css b/src/workspaces/theme/css/themes/sunset.css
index a8258186..1ef6559b 100644
--- a/src/workspaces/theme/css/themes/sunset.css
+++ b/src/workspaces/theme/css/themes/sunset.css
@@ -1,13 +1,11 @@
 /*
   Sunset — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/rondilley/omarchy-sunset-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b5b4b4;
   --accent: #181717;
   --accent-foreground: #ffffff;
-  --primary: #d0b59b;
+  --primary: #ffffff;
   --primary-foreground: #040303;
   --secondary: #181717;
   --secondary-foreground: #ffffff;
-  --cta: #d0b59b;
+  --cta: #ffffff;
   --cta-foreground: #040303;
-  --ctahover: #d6bea7;
+  --ctahover: #ffffff;
   --success: #f7ce6e;
   --success-foreground: #040303;
   --warning: #b2a295;
@@ -42,9 +40,9 @@
   --busy-ink: #c8a47b;
   --border: #383736;
   --input: #383736;
-  --ring: #d0b59b;
+  --ring: #ffffff;
   --radius: 0.625rem;
-  --chart-primary: #d0b59b;
+  --chart-primary: #ffffff;
   --chart-secondary: #ebd2a4;
   --status-success: #f7ce6e;
   --status-warning: #b2a295;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(56 55 54 / 0.55);
   --panel-raised-bg: rgb(7 6 5 / 0.95);
   --panel-raised-border: rgb(56 55 54 / 1);
-  --panel-accent: #d0b59b;
+  --panel-accent: #ffffff;
   --panel-header-bg: rgb(24 23 23 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(150 149 150 / 0.85);
   --scrollbar-thin-thumb: rgb(150 149 150 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(150 149 150 / 0.7);
-  --brand: #d0b59b;
+  --brand: #ffffff;
   --brand-foreground: #040303;
-  --brand-primary: #d0b59b;
+  --brand-primary: #ffffff;
   --brand-accent: #fce7b0;
   --brand-warm: #c8a47b;
   --brand-deep: #040303;
diff --git a/src/workspaces/theme/css/themes/synthetica.css b/src/workspaces/theme/css/themes/synthetica.css
index abd4e835..ac32df8d 100644
--- a/src/workspaces/theme/css/themes/synthetica.css
+++ b/src/workspaces/theme/css/themes/synthetica.css
@@ -1,99 +1,97 @@
 /*
   Synthetica — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/stannorbvb-cmd/synthetica (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/stannorbvb-cmd/synthetica (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
 [data-theme='synthetica'] {
-  --background: #000000;
-  --foreground: #e7dfdf;
-  --card: #000000;
-  --card-foreground: #e7dfdf;
-  --popover: #000000;
-  --popover-foreground: #e7dfdf;
-  --muted: #121212;
-  --muted-foreground: #a29c9c;
-  --accent: #121212;
-  --accent-foreground: #e7dfdf;
-  --primary: #6f6f92;
-  --primary-foreground: #f9f9f9;
-  --secondary: #121212;
-  --secondary-foreground: #e7dfdf;
-  --cta: #6f6f92;
-  --cta-foreground: #f9f9f9;
-  --ctahover: #80809f;
-  --success: #598672;
-  --success-foreground: #000000;
-  --warning: #ea1654;
-  --warning-foreground: #000000;
-  --destructive: #ec0042;
-  --destructive-foreground: #000000;
-  --info: #6f6f92;
-  --info-foreground: #f9f9f9;
-  --busy: #eb0b4b;
-  --busy-foreground: #000000;
-  --busy-ink: #eb0b4b;
-  --border: #2d2c2c;
-  --input: #2d2c2c;
-  --ring: #6f6f92;
+  --background: #151718;
+  --foreground: #eaeaea;
+  --card: #262a2c;
+  --card-foreground: #eaeaea;
+  --popover: #262a2c;
+  --popover-foreground: #eaeaea;
+  --muted: #35393b;
+  --muted-foreground: #afb0b1;
+  --accent: #35393b;
+  --accent-foreground: #eaeaea;
+  --primary: #f5f5f5;
+  --primary-foreground: #151718;
+  --secondary: #35393b;
+  --secondary-foreground: #eaeaea;
+  --cta: #f5f5f5;
+  --cta-foreground: #151718;
+  --ctahover: #f6f6f6;
+  --success: #bebebe;
+  --success-foreground: #151718;
+  --warning: #e0e0e0;
+  --warning-foreground: #151718;
+  --destructive: #6b6c6d;
+  --destructive-foreground: #eeeeee;
+  --info: #cfcfcf;
+  --info-foreground: #151718;
+  --busy: #a6a6a7;
+  --busy-foreground: #151718;
+  --busy-ink: #a6a6a7;
+  --border: #4c5051;
+  --input: #4c5051;
+  --ring: #f5f5f5;
   --radius: 0.625rem;
-  --chart-primary: #6f6f92;
-  --chart-secondary: #c7b1c7;
-  --status-success: #598672;
-  --status-warning: #ea1654;
-  --status-in-progress: #6f6f92;
-  --page-bg: #000000;
+  --chart-primary: #f5f5f5;
+  --chart-secondary: #d6d6d6;
+  --status-success: #bebebe;
+  --status-warning: #e0e0e0;
+  --status-in-progress: #cfcfcf;
+  --page-bg: #151718;
   --page-bg-src: '';
-  --panel-bg: rgb(0 0 0 / 0.72);
-  --panel-border: rgb(45 44 44 / 0.9);
-  --panel-border-bare: rgb(45 44 44 / 0.55);
-  --panel-raised-bg: rgb(0 0 0 / 0.95);
-  --panel-raised-border: rgb(45 44 44 / 1);
-  --panel-accent: #6f6f92;
-  --panel-header-bg: rgb(18 18 18 / 0.6);
-  --panel-header-fg: #e7dfdf;
+  --panel-bg: rgb(38 42 44 / 0.72);
+  --panel-border: rgb(76 80 81 / 0.9);
+  --panel-border-bare: rgb(76 80 81 / 0.55);
+  --panel-raised-bg: rgb(38 42 44 / 0.95);
+  --panel-raised-border: rgb(76 80 81 / 1);
+  --panel-accent: #f5f5f5;
+  --panel-header-bg: rgb(53 57 59 / 0.6);
+  --panel-header-fg: #eaeaea;
   --panel-radius: 0.75rem;
   --panel-blur: 12px;
-  --card-bg: #000000;
-  --glass-bg: rgb(0 0 0 / 0.55);
-  --glass-border: rgb(45 44 44 / 0.7);
-  --dock-bg: rgb(0 0 0 / 0.7);
-  --dock-border: rgb(45 44 44 / 0.8);
-  --dock-tooltip-bg: #121212;
-  --header-bg: rgb(0 0 0 / 0.8);
-  --header-border: rgb(45 44 44 / 0.9);
-  --header-fg: #e7dfdf;
+  --card-bg: #262a2c;
+  --glass-bg: rgb(38 42 44 / 0.55);
+  --glass-border: rgb(76 80 81 / 0.7);
+  --dock-bg: rgb(38 42 44 / 0.7);
+  --dock-border: rgb(76 80 81 / 0.8);
+  --dock-tooltip-bg: #35393b;
+  --header-bg: rgb(38 42 44 / 0.8);
+  --header-border: rgb(76 80 81 / 0.9);
+  --header-fg: #eaeaea;
   --header-blur: 12px;
-  --pixel-grid-color: rgb(104 100 100 / 0.07);
-  --card-grid-color: rgb(104 100 100 / 0.05);
-  --panel-grid-color: rgb(104 100 100 / 0.06);
-  --scrollbar-thumb: rgb(62 62 93 / 0.6);
-  --scrollbar-thumb-hover: rgb(62 62 93 / 0.85);
-  --scrollbar-thin-thumb: rgb(62 62 93 / 0.45);
-  --scrollbar-thin-thumb-hover: rgb(62 62 93 / 0.7);
-  --brand: #6f6f92;
-  --brand-foreground: #f9f9f9;
-  --brand-primary: #6f6f92;
-  --brand-accent: #8091a2;
-  --brand-warm: #eb0b4b;
-  --brand-deep: #000000;
-  --brand-muted: #3e3e5d;
-  --ink: #e7dfdf;
-  --surface-warm: #000000;
-  --naturegreen: #598672;
-  --naturegreen-foreground: #000000;
-  --duck-dark: #e7dfdf;
-  --duck-teal: #8091a2;
-  --duck-yellow: #ea1654;
-  --duck-orange: #eb0b4b;
-  --duck-forest: #598672;
-  --duck-beige: #171616;
+  --pixel-grid-color: rgb(126 128 130 / 0.07);
+  --card-grid-color: rgb(126 128 130 / 0.05);
+  --panel-grid-color: rgb(126 128 130 / 0.06);
+  --scrollbar-thumb: rgb(116 119 120 / 0.6);
+  --scrollbar-thumb-hover: rgb(116 119 120 / 0.85);
+  --scrollbar-thin-thumb: rgb(116 119 120 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(116 119 120 / 0.7);
+  --brand: #f5f5f5;
+  --brand-foreground: #151718;
+  --brand-primary: #f5f5f5;
+  --brand-accent: #e0e0e0;
+  --brand-warm: #a6a6a7;
+  --brand-deep: #151718;
+  --brand-muted: #747778;
+  --ink: #eaeaea;
+  --surface-warm: #262a2c;
+  --naturegreen: #bebebe;
+  --naturegreen-foreground: #151718;
+  --duck-dark: #eaeaea;
+  --duck-teal: #e0e0e0;
+  --duck-yellow: #e0e0e0;
+  --duck-orange: #a6a6a7;
+  --duck-forest: #bebebe;
+  --duck-beige: #3a3d3f;
   --logo-src: '/officer-logo.svg';
 }
diff --git a/src/workspaces/theme/css/themes/synthwave-84.css b/src/workspaces/theme/css/themes/synthwave-84.css
index 91b17215..ea119de1 100644
--- a/src/workspaces/theme/css/themes/synthwave-84.css
+++ b/src/workspaces/theme/css/themes/synthwave-84.css
@@ -1,13 +1,11 @@
 /*
   Synthwave 84 — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/omacom-io/omarchy-synthwave84-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #bdb3c3;
   --accent: #331245;
   --accent-foreground: #ffffff;
-  --primary: #0080ff;
+  --primary: #03edf9;
   --primary-foreground: #14001e;
   --secondary: #331245;
   --secondary-foreground: #ffffff;
-  --cta: #0080ff;
+  --cta: #03edf9;
   --cta-foreground: #14001e;
-  --ctahover: #1f8fff;
+  --ctahover: #21effa;
   --success: #8f00ff;
   --success-foreground: #ffffff;
   --warning: #f3e70f;
@@ -42,9 +40,9 @@
   --busy-ink: #f97428;
   --border: #4f325e;
   --input: #4f325e;
-  --ring: #0080ff;
+  --ring: #03edf9;
   --radius: 0.625rem;
-  --chart-primary: #0080ff;
+  --chart-primary: #03edf9;
   --chart-secondary: #ff00ff;
   --status-success: #8f00ff;
   --status-warning: #f3e70f;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(79 50 94 / 0.55);
   --panel-raised-bg: rgb(36 0 55 / 0.95);
   --panel-raised-border: rgb(79 50 94 / 1);
-  --panel-accent: #0080ff;
+  --panel-accent: #03edf9;
   --panel-header-bg: rgb(51 18 69 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(97 77 133 / 0.85);
   --scrollbar-thin-thumb: rgb(97 77 133 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(97 77 133 / 0.7);
-  --brand: #0080ff;
+  --brand: #03edf9;
   --brand-foreground: #14001e;
-  --brand-primary: #0080ff;
+  --brand-primary: #03edf9;
   --brand-accent: #03edf9;
   --brand-warm: #f97428;
   --brand-deep: #14001e;
diff --git a/src/workspaces/theme/css/themes/taikami.css b/src/workspaces/theme/css/themes/taikami.css
index 39fc97cf..17ed74f3 100644
--- a/src/workspaces/theme/css/themes/taikami.css
+++ b/src/workspaces/theme/css/themes/taikami.css
@@ -1,13 +1,11 @@
 /*
   Taikami — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/SamuelCam14/taikami (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a3a5a8;
   --accent: #2d2d2d;
   --accent-foreground: #dcdfe4;
-  --primary: #8ab8ff;
+  --primary: #adc8ff;
   --primary-foreground: #101010;
   --secondary: #2d2d2d;
   --secondary-foreground: #dcdfe4;
-  --cta: #8ab8ff;
+  --cta: #adc8ff;
   --cta-foreground: #101010;
-  --ctahover: #98c1ff;
+  --ctahover: #b7cfff;
   --success: #92c88b;
   --success-foreground: #101010;
   --warning: #ffb58a;
@@ -42,9 +40,9 @@
   --busy-ink: #f9a08a;
   --border: #434344;
   --input: #434344;
-  --ring: #8ab8ff;
+  --ring: #adc8ff;
   --radius: 0.625rem;
-  --chart-primary: #8ab8ff;
+  --chart-primary: #adc8ff;
   --chart-secondary: #ff9be2;
   --status-success: #92c88b;
   --status-warning: #ffb58a;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(67 67 68 / 0.55);
   --panel-raised-bg: rgb(29 29 29 / 0.95);
   --panel-raised-border: rgb(67 67 68 / 1);
-  --panel-accent: #8ab8ff;
+  --panel-accent: #adc8ff;
   --panel-header-bg: rgb(45 45 45 / 0.6);
   --panel-header-fg: #dcdfe4;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(105 107 109 / 0.85);
   --scrollbar-thin-thumb: rgb(105 107 109 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(105 107 109 / 0.7);
-  --brand: #8ab8ff;
+  --brand: #adc8ff;
   --brand-foreground: #101010;
-  --brand-primary: #8ab8ff;
+  --brand-primary: #adc8ff;
   --brand-accent: #c89bff;
   --brand-warm: #f9a08a;
   --brand-deep: #101010;
diff --git a/src/workspaces/theme/css/themes/tarot.css b/src/workspaces/theme/css/themes/tarot.css
index 39962af8..fbf6017e 100644
--- a/src/workspaces/theme/css/themes/tarot.css
+++ b/src/workspaces/theme/css/themes/tarot.css
@@ -1,13 +1,11 @@
 /*
   Tarot — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/jjdizz1l/base16-tarot (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/jjdizz1l/base16-tarot (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #aa7a74;
   --accent: #1f1a2d;
   --accent-foreground: #dc8f7c;
-  --primary: #6e6080;
-  --primary-foreground: #e6e6e7;
+  --primary: #8c9785;
+  --primary-foreground: #080510;
   --secondary: #1f1a2d;
   --secondary-foreground: #dc8f7c;
-  --cta: #6e6080;
-  --cta-foreground: #e6e6e7;
-  --ctahover: #7f738f;
+  --cta: #8c9785;
+  --cta-foreground: #080510;
+  --ctahover: #9aa394;
   --success: #a68e5a;
   --success-foreground: #080510;
   --warning: #ff6565;
@@ -42,9 +40,9 @@
   --busy-ink: #e24c5c;
   --border: #362330;
   --input: #362330;
-  --ring: #6e6080;
+  --ring: #8c9785;
   --radius: 0.625rem;
-  --chart-primary: #6e6080;
+  --chart-primary: #8c9785;
   --chart-secondary: #a45782;
   --status-success: #a68e5a;
   --status-warning: #ff6565;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(54 35 48 / 0.55);
   --panel-raised-bg: rgb(14 9 29 / 0.95);
   --panel-raised-border: rgb(54 35 48 / 1);
-  --panel-accent: #6e6080;
+  --panel-accent: #8c9785;
   --panel-header-bg: rgb(31 26 45 / 0.6);
   --panel-header-fg: #dc8f7c;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(75 32 84 / 0.85);
   --scrollbar-thin-thumb: rgb(75 32 84 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(75 32 84 / 0.7);
-  --brand: #6e6080;
-  --brand-foreground: #e6e6e7;
-  --brand-primary: #6e6080;
+  --brand: #8c9785;
+  --brand-foreground: #080510;
+  --brand-primary: #8c9785;
   --brand-accent: #8c9785;
   --brand-warm: #e24c5c;
   --brand-deep: #080510;
diff --git a/src/workspaces/theme/css/themes/temerald.css b/src/workspaces/theme/css/themes/temerald.css
index 8693ae9a..9d2ef144 100644
--- a/src/workspaces/theme/css/themes/temerald.css
+++ b/src/workspaces/theme/css/themes/temerald.css
@@ -1,13 +1,11 @@
 /*
   Temerald — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/Ahmad-Mtr/omarchy-temerald-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #9fb6a7;
   --accent: #232222;
   --accent-foreground: #dcfce7;
-  --primary: #93c5fd;
+  --primary: #bbf7d0;
   --primary-foreground: #0a0909;
   --secondary: #232222;
   --secondary-foreground: #dcfce7;
-  --cta: #93c5fd;
+  --cta: #bbf7d0;
   --cta-foreground: #0a0909;
-  --ctahover: #a0ccfd;
+  --ctahover: #c3f8d6;
   --success: #4ade7f;
   --success-foreground: #0a0909;
   --warning: #d4953b;
@@ -42,9 +40,9 @@
   --busy-ink: #d47a4d;
   --border: #393f3b;
   --input: #393f3b;
-  --ring: #93c5fd;
+  --ring: #bbf7d0;
   --radius: 0.625rem;
-  --chart-primary: #93c5fd;
+  --chart-primary: #bbf7d0;
   --chart-secondary: #a78bfa;
   --status-success: #4ade7f;
   --status-warning: #d4953b;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(57 63 59 / 0.55);
   --panel-raised-bg: rgb(18 17 17 / 0.95);
   --panel-raised-border: rgb(57 63 59 / 1);
-  --panel-accent: #93c5fd;
+  --panel-accent: #bbf7d0;
   --panel-header-bg: rgb(35 34 34 / 0.6);
   --panel-header-fg: #dcfce7;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(107 107 107 / 0.85);
   --scrollbar-thin-thumb: rgb(107 107 107 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(107 107 107 / 0.7);
-  --brand: #93c5fd;
+  --brand: #bbf7d0;
   --brand-foreground: #0a0909;
-  --brand-primary: #93c5fd;
+  --brand-primary: #bbf7d0;
   --brand-accent: #86efab;
   --brand-warm: #d47a4d;
   --brand-deep: #0a0909;
diff --git a/src/workspaces/theme/css/themes/terramour.css b/src/workspaces/theme/css/themes/terramour.css
index 864559e2..175bff85 100644
--- a/src/workspaces/theme/css/themes/terramour.css
+++ b/src/workspaces/theme/css/themes/terramour.css
@@ -1,13 +1,11 @@
 /*
   Terramour — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/atif-1402/omarchy-terramour-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/atif-1402/omarchy-terramour-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b6a9a9;
   --accent: #493e3f;
   --accent-foreground: #eadddd;
-  --primary: #8fa3d1;
+  --primary: #9fb3df;
   --primary-foreground: #201a1b;
   --secondary: #493e3f;
   --secondary-foreground: #eadddd;
-  --cta: #8fa3d1;
+  --cta: #9fb3df;
   --cta-foreground: #201a1b;
-  --ctahover: #9caed7;
+  --ctahover: #abbce3;
   --success: #7fa68f;
   --success-foreground: #201a1b;
   --warning: #d6c37a;
@@ -42,9 +40,9 @@
   --busy-ink: #d39f7a;
   --border: #5d5153;
   --input: #5d5153;
-  --ring: #8fa3d1;
+  --ring: #9fb3df;
   --radius: 0.625rem;
-  --chart-primary: #8fa3d1;
+  --chart-primary: #9fb3df;
   --chart-secondary: #b08fd1;
   --status-success: #7fa68f;
   --status-warning: #d6c37a;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(93 81 83 / 0.55);
   --panel-raised-bg: rgb(59 47 49 / 0.95);
   --panel-raised-border: rgb(93 81 83 / 1);
-  --panel-accent: #8fa3d1;
+  --panel-accent: #9fb3df;
   --panel-header-bg: rgb(73 62 63 / 0.6);
   --panel-header-fg: #eadddd;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(156 140 141 / 0.85);
   --scrollbar-thin-thumb: rgb(156 140 141 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(156 140 141 / 0.7);
-  --brand: #8fa3d1;
+  --brand: #9fb3df;
   --brand-foreground: #201a1b;
-  --brand-primary: #8fa3d1;
+  --brand-primary: #9fb3df;
   --brand-accent: #79a6a3;
   --brand-warm: #d39f7a;
   --brand-deep: #201a1b;
diff --git a/src/workspaces/theme/css/themes/thegreek.css b/src/workspaces/theme/css/themes/thegreek.css
index 56f49e26..9eb4bc31 100644
--- a/src/workspaces/theme/css/themes/thegreek.css
+++ b/src/workspaces/theme/css/themes/thegreek.css
@@ -1,13 +1,11 @@
 /*
   Thegreek — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Light theme (light), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Light theme (light), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/HANCORE-linux/omarchy-thegreek-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/HANCORE-linux/omarchy-thegreek-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/turbonite.css b/src/workspaces/theme/css/themes/turbonite.css
index 20d9f463..a1d0e8d7 100644
--- a/src/workspaces/theme/css/themes/turbonite.css
+++ b/src/workspaces/theme/css/themes/turbonite.css
@@ -1,13 +1,11 @@
 /*
   Turbonite — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/HANCORE-linux/omarchy-turbonite-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/HANCORE-linux/omarchy-turbonite-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a7a7a3;
   --accent: #1c1d1d;
   --accent-foreground: #eae9e3;
-  --primary: #847b4e;
+  --primary: #ebd698;
   --primary-foreground: #060707;
   --secondary: #1c1d1d;
   --secondary-foreground: #eae9e3;
-  --cta: #847b4e;
+  --cta: #ebd698;
   --cta-foreground: #060707;
-  --ctahover: #938b63;
+  --ctahover: #eddba4;
   --success: #6e6a64;
   --success-foreground: #ecebe6;
   --warning: #ed9a1d;
@@ -42,9 +40,9 @@
   --busy-ink: #f06f27;
   --border: #373736;
   --input: #373736;
-  --ring: #847b4e;
+  --ring: #ebd698;
   --radius: 0.625rem;
-  --chart-primary: #847b4e;
+  --chart-primary: #ebd698;
   --chart-secondary: #a7a483;
   --status-success: #6e6a64;
   --status-warning: #ed9a1d;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(55 55 54 / 0.55);
   --panel-raised-bg: rgb(11 12 12 / 0.95);
   --panel-raised-border: rgb(55 55 54 / 1);
-  --panel-accent: #847b4e;
+  --panel-accent: #ebd698;
   --panel-header-bg: rgb(28 29 29 / 0.6);
   --panel-header-fg: #eae9e3;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(49 54 58 / 0.85);
   --scrollbar-thin-thumb: rgb(49 54 58 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(49 54 58 / 0.7);
-  --brand: #847b4e;
+  --brand: #ebd698;
   --brand-foreground: #060707;
-  --brand-primary: #847b4e;
+  --brand-primary: #ebd698;
   --brand-accent: #ebd698;
   --brand-warm: #f06f27;
   --brand-deep: #060707;
diff --git a/src/workspaces/theme/css/themes/tycho.css b/src/workspaces/theme/css/themes/tycho.css
index 24d66621..c86c2cdc 100644
--- a/src/workspaces/theme/css/themes/tycho.css
+++ b/src/workspaces/theme/css/themes/tycho.css
@@ -1,13 +1,11 @@
 /*
   Tycho — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/leonardobetti/omarchy-tycho (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b1adb0;
   --accent: #2e3134;
   --accent-foreground: #f0e9ec;
-  --primary: #9b826b;
+  --primary: #c4b5a8;
   --primary-foreground: #111214;
   --secondary: #2e3134;
   --secondary-foreground: #f0e9ec;
-  --cta: #9b826b;
+  --cta: #c4b5a8;
   --cta-foreground: #111214;
-  --ctahover: #a7917d;
+  --ctahover: #cbbeb2;
   --success: #b4756b;
   --success-foreground: #111214;
   --warning: #c17a6a;
@@ -42,9 +40,9 @@
   --busy-ink: #ac716d;
   --border: #47484c;
   --input: #47484c;
-  --ring: #9b826b;
+  --ring: #c4b5a8;
   --radius: 0.625rem;
-  --chart-primary: #9b826b;
+  --chart-primary: #c4b5a8;
   --chart-secondary: #b48162;
   --status-success: #b4756b;
   --status-warning: #c17a6a;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(71 72 76 / 0.55);
   --panel-raised-bg: rgb(30 33 37 / 0.95);
   --panel-raised-border: rgb(71 72 76 / 1);
-  --panel-accent: #9b826b;
+  --panel-accent: #c4b5a8;
   --panel-header-bg: rgb(46 49 52 / 0.6);
   --panel-header-fg: #f0e9ec;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(137 121 129 / 0.85);
   --scrollbar-thin-thumb: rgb(137 121 129 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(137 121 129 / 0.7);
-  --brand: #9b826b;
+  --brand: #c4b5a8;
   --brand-foreground: #111214;
-  --brand-primary: #9b826b;
+  --brand-primary: #c4b5a8;
   --brand-accent: #706b82;
   --brand-warm: #ac716d;
   --brand-deep: #111214;
diff --git a/src/workspaces/theme/css/themes/type-17.css b/src/workspaces/theme/css/themes/type-17.css
index 04e7752e..2c94a090 100644
--- a/src/workspaces/theme/css/themes/type-17.css
+++ b/src/workspaces/theme/css/themes/type-17.css
@@ -1,13 +1,11 @@
 /*
   Type 17 — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/atif-1402/omarchy-type17-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #a0a5a6;
   --accent: #323738;
   --accent-foreground: #d6dbdc;
-  --primary: #95abb6;
+  --primary: #e5eaec;
   --primary-foreground: #131617;
   --secondary: #323738;
   --secondary-foreground: #d6dbdc;
-  --cta: #95abb6;
+  --cta: #e5eaec;
   --cta-foreground: #131617;
-  --ctahover: #a2b5bf;
+  --ctahover: #e8edee;
   --success: #98b3aa;
   --success-foreground: #131617;
   --warning: #98b3b0;
@@ -42,9 +40,9 @@
   --busy-ink: #96afb4;
   --border: #464b4c;
   --input: #464b4c;
-  --ring: #95abb6;
+  --ring: #e5eaec;
   --radius: 0.625rem;
-  --chart-primary: #95abb6;
+  --chart-primary: #e5eaec;
   --chart-secondary: #97aab4;
   --status-success: #98b3aa;
   --status-warning: #98b3b0;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(70 75 76 / 0.55);
   --panel-raised-bg: rgb(35 40 41 / 0.95);
   --panel-raised-border: rgb(70 75 76 / 1);
-  --panel-accent: #95abb6;
+  --panel-accent: #e5eaec;
   --panel-header-bg: rgb(50 55 56 / 0.6);
   --panel-header-fg: #d6dbdc;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(120 132 135 / 0.85);
   --scrollbar-thin-thumb: rgb(120 132 135 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(120 132 135 / 0.7);
-  --brand: #95abb6;
+  --brand: #e5eaec;
   --brand-foreground: #131617;
-  --brand-primary: #95abb6;
+  --brand-primary: #e5eaec;
   --brand-accent: #b0c0c5;
   --brand-warm: #96afb4;
   --brand-deep: #131617;
diff --git a/src/workspaces/theme/css/themes/unicorn-dream.css b/src/workspaces/theme/css/themes/unicorn-dream.css
index 14b03c4c..7322a06b 100644
--- a/src/workspaces/theme/css/themes/unicorn-dream.css
+++ b/src/workspaces/theme/css/themes/unicorn-dream.css
@@ -1,99 +1,97 @@
 /*
   Unicorn Dream — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Light theme (light), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Light theme (light), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/Deoxizn/omarchy-unicorn-dream-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/Deoxizn/omarchy-unicorn-dream-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
 [data-theme='unicorn-dream'] {
   --background: #fff0f5;
-  --foreground: #3d2632;
+  --foreground: #5c3a4a;
   --card: #f6e8ec;
-  --card-foreground: #3d2632;
+  --card-foreground: #5c3a4a;
   --popover: #f6e8ec;
-  --popover-foreground: #3d2632;
+  --popover-foreground: #5c3a4a;
   --muted: #f0e2e6;
-  --muted-foreground: #74616a;
+  --muted-foreground: #78606a;
   --accent: #f0e2e6;
-  --accent-foreground: #3d2632;
-  --primary: #d16c8b;
-  --primary-foreground: #321f29;
+  --accent-foreground: #5c3a4a;
+  --primary: #ae7f8b;
+  --primary-foreground: #332029;
   --secondary: #f0e2e6;
-  --secondary-foreground: #3d2632;
-  --cta: #d16c8b;
-  --cta-foreground: #321f29;
-  --ctahover: #b85f7a;
-  --success: #c4a35a;
-  --success-foreground: #3d2632;
-  --warning: #c4a574;
-  --warning-foreground: #3d2632;
-  --destructive: #e85d75;
-  --destructive-foreground: #34202b;
-  --info: #e8789a;
-  --info-foreground: #3d2632;
-  --busy: #d68175;
-  --busy-foreground: #3d2632;
-  --busy-ink: #9b5e55;
-  --border: #e0d1d6;
-  --input: #daccd1;
-  --ring: #d16c8b;
+  --secondary-foreground: #5c3a4a;
+  --cta: #ae7f8b;
+  --cta-foreground: #332029;
+  --ctahover: #99707a;
+  --success: #f5d78e;
+  --success-foreground: #5c3a4a;
+  --warning: #d4b896;
+  --warning-foreground: #5c3a4a;
+  --destructive: #f8a5b5;
+  --destructive-foreground: #5c3a4a;
+  --info: #f8b5c6;
+  --info-foreground: #5c3a4a;
+  --busy: #e6afa6;
+  --busy-foreground: #5c3a4a;
+  --busy-ink: #84655f;
+  --border: #e4d3d9;
+  --input: #deced4;
+  --ring: #ae7f8b;
   --radius: 0.625rem;
-  --chart-primary: #d16c8b;
-  --chart-secondary: #e88fa8;
-  --status-success: #c4a35a;
-  --status-warning: #c4a574;
-  --status-in-progress: #e8789a;
+  --chart-primary: #ae7f8b;
+  --chart-secondary: #f8c8d4;
+  --status-success: #f5d78e;
+  --status-warning: #d4b896;
+  --status-in-progress: #f8b5c6;
   --page-bg: #fff0f5;
   --page-bg-src: '';
   --panel-bg: rgb(246 232 236 / 0.72);
-  --panel-border: rgb(224 209 214 / 0.9);
-  --panel-border-bare: rgb(224 209 214 / 0.55);
+  --panel-border: rgb(228 211 217 / 0.9);
+  --panel-border-bare: rgb(228 211 217 / 0.55);
   --panel-raised-bg: rgb(246 232 236 / 0.95);
-  --panel-raised-border: rgb(224 209 214 / 1);
-  --panel-accent: #d16c8b;
+  --panel-raised-border: rgb(228 211 217 / 1);
+  --panel-accent: #ae7f8b;
   --panel-header-bg: rgb(240 226 230 / 0.6);
-  --panel-header-fg: #3d2632;
+  --panel-header-fg: #5c3a4a;
   --panel-radius: 0.75rem;
   --panel-blur: 12px;
   --card-bg: #f6e8ec;
   --glass-bg: rgb(246 232 236 / 0.55);
-  --glass-border: rgb(224 209 214 / 0.7);
+  --glass-border: rgb(228 211 217 / 0.7);
   --dock-bg: rgb(246 232 236 / 0.7);
-  --dock-border: rgb(224 209 214 / 0.8);
+  --dock-border: rgb(228 211 217 / 0.8);
   --dock-tooltip-bg: #f0e2e6;
   --header-bg: rgb(246 232 236 / 0.8);
-  --header-border: rgb(224 209 214 / 0.9);
-  --header-fg: #3d2632;
+  --header-border: rgb(228 211 217 / 0.9);
+  --header-fg: #5c3a4a;
   --header-blur: 12px;
-  --pixel-grid-color: rgb(147 130 137 / 0.07);
-  --card-grid-color: rgb(147 130 137 / 0.05);
-  --panel-grid-color: rgb(147 130 137 / 0.06);
-  --scrollbar-thumb: rgb(166 138 152 / 0.6);
-  --scrollbar-thumb-hover: rgb(166 138 152 / 0.85);
-  --scrollbar-thin-thumb: rgb(166 138 152 / 0.45);
-  --scrollbar-thin-thumb-hover: rgb(166 138 152 / 0.7);
-  --brand: #d16c8b;
-  --brand-foreground: #321f29;
-  --brand-primary: #d16c8b;
-  --brand-accent: #c9b8a8;
-  --brand-warm: #d68175;
+  --pixel-grid-color: rgb(150 130 139 / 0.07);
+  --card-grid-color: rgb(150 130 139 / 0.05);
+  --panel-grid-color: rgb(150 130 139 / 0.06);
+  --scrollbar-thumb: rgb(212 165 181 / 0.6);
+  --scrollbar-thumb-hover: rgb(212 165 181 / 0.85);
+  --scrollbar-thin-thumb: rgb(212 165 181 / 0.45);
+  --scrollbar-thin-thumb-hover: rgb(212 165 181 / 0.7);
+  --brand: #ae7f8b;
+  --brand-foreground: #332029;
+  --brand-primary: #ae7f8b;
+  --brand-accent: #f0e6d8;
+  --brand-warm: #e6afa6;
   --brand-deep: #f0e2e6;
-  --brand-muted: #a68a98;
-  --ink: #3d2632;
+  --brand-muted: #d4a5b5;
+  --ink: #5c3a4a;
   --surface-warm: #f6e8ec;
-  --naturegreen: #c4a35a;
-  --naturegreen-foreground: #3d2632;
-  --duck-dark: #3d2632;
-  --duck-teal: #c9b8a8;
-  --duck-yellow: #c4a574;
-  --duck-orange: #d68175;
-  --duck-forest: #c4a35a;
-  --duck-beige: #e4d5d9;
+  --naturegreen: #f5d78e;
+  --naturegreen-foreground: #5c3a4a;
+  --duck-dark: #5c3a4a;
+  --duck-teal: #f0e6d8;
+  --duck-yellow: #d4b896;
+  --duck-orange: #e6afa6;
+  --duck-forest: #f5d78e;
+  --duck-beige: #e7d7dc;
   --logo-src: '/officer-logo.svg';
 }
diff --git a/src/workspaces/theme/css/themes/van-gogh.css b/src/workspaces/theme/css/themes/van-gogh.css
index 6364315b..beef4a1b 100644
--- a/src/workspaces/theme/css/themes/van-gogh.css
+++ b/src/workspaces/theme/css/themes/van-gogh.css
@@ -1,13 +1,11 @@
 /*
   Van Gogh — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/Nirmal314/omarchy-van-gogh-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/Nirmal314/omarchy-van-gogh-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #aca681;
   --accent: #1b293e;
   --accent-foreground: #f2e2a4;
-  --primary: #4a78a8;
-  --primary-foreground: #ffffff;
+  --primary: #b8e1dd;
+  --primary-foreground: #060e1a;
   --secondary: #1b293e;
   --secondary-foreground: #f2e2a4;
-  --cta: #4a78a8;
-  --cta-foreground: #ffffff;
-  --ctahover: #6088b2;
+  --cta: #b8e1dd;
+  --cta-foreground: #060e1a;
+  --ctahover: #c1e5e1;
   --success: #7fb3d5;
   --success-foreground: #060e1a;
   --warning: #f2e2a4;
@@ -42,9 +40,9 @@
   --busy-ink: #e6b268;
   --border: #374046;
   --input: #374046;
-  --ring: #4a78a8;
+  --ring: #b8e1dd;
   --radius: 0.625rem;
-  --chart-primary: #4a78a8;
+  --chart-primary: #b8e1dd;
   --chart-secondary: #d9822b;
   --status-success: #7fb3d5;
   --status-warning: #f2e2a4;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(55 64 70 / 0.55);
   --panel-raised-bg: rgb(10 25 47 / 0.95);
   --panel-raised-border: rgb(55 64 70 / 1);
-  --panel-accent: #4a78a8;
+  --panel-accent: #b8e1dd;
   --panel-header-bg: rgb(27 41 62 / 0.6);
   --panel-header-fg: #f2e2a4;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(44 70 104 / 0.85);
   --scrollbar-thin-thumb: rgb(44 70 104 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(44 70 104 / 0.7);
-  --brand: #4a78a8;
-  --brand-foreground: #ffffff;
-  --brand-primary: #4a78a8;
+  --brand: #b8e1dd;
+  --brand-foreground: #060e1a;
+  --brand-primary: #b8e1dd;
   --brand-accent: #9fd3c7;
   --brand-warm: #e6b268;
   --brand-deep: #060e1a;
diff --git a/src/workspaces/theme/css/themes/velocity.css b/src/workspaces/theme/css/themes/velocity.css
index 9b71223c..91246c34 100644
--- a/src/workspaces/theme/css/themes/velocity.css
+++ b/src/workspaces/theme/css/themes/velocity.css
@@ -1,13 +1,11 @@
 /*
   Velocity — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/perfektnacht/omarchy-velocity-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b1b1ac;
   --accent: #1b1b1b;
   --accent-foreground: #f8f8f2;
-  --primary: #4a9ef1;
+  --primary: #8be9fd;
   --primary-foreground: #060606;
   --secondary: #1b1b1b;
   --secondary-foreground: #f8f8f2;
-  --cta: #4a9ef1;
+  --cta: #8be9fd;
   --cta-foreground: #060606;
-  --ctahover: #60aaf3;
+  --ctahover: #99ecfd;
   --success: #4adf86;
   --success-foreground: #060606;
   --warning: #ff8c42;
@@ -42,9 +40,9 @@
   --busy-ink: #ff6a4d;
   --border: #393937;
   --input: #393937;
-  --ring: #4a9ef1;
+  --ring: #8be9fd;
   --radius: 0.625rem;
-  --chart-primary: #4a9ef1;
+  --chart-primary: #8be9fd;
   --chart-secondary: #bd93f9;
   --status-success: #4adf86;
   --status-warning: #ff8c42;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(57 57 55 / 0.55);
   --panel-raised-bg: rgb(10 10 10 / 0.95);
   --panel-raised-border: rgb(57 57 55 / 1);
-  --panel-accent: #4a9ef1;
+  --panel-accent: #8be9fd;
   --panel-header-bg: rgb(27 27 27 / 0.6);
   --panel-header-fg: #f8f8f2;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(136 136 136 / 0.85);
   --scrollbar-thin-thumb: rgb(136 136 136 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(136 136 136 / 0.7);
-  --brand: #4a9ef1;
+  --brand: #8be9fd;
   --brand-foreground: #060606;
-  --brand-primary: #4a9ef1;
+  --brand-primary: #8be9fd;
   --brand-accent: #4a9ef1;
   --brand-warm: #ff6a4d;
   --brand-deep: #060606;
diff --git a/src/workspaces/theme/css/themes/velvet-night.css b/src/workspaces/theme/css/themes/velvet-night.css
index cc972fbf..c9f30c23 100644
--- a/src/workspaces/theme/css/themes/velvet-night.css
+++ b/src/workspaces/theme/css/themes/velvet-night.css
@@ -1,13 +1,11 @@
 /*
   Velvet Night — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/HANCORE-linux/omarchy-velvetnight-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/HANCORE-linux/omarchy-velvetnight-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b6b7bc;
   --accent: #1b212f;
   --accent-foreground: #ffffff;
-  --primary: #9099a5;
+  --primary: #dc9b68;
   --primary-foreground: #060911;
   --secondary: #1b212f;
   --secondary-foreground: #ffffff;
-  --cta: #9099a5;
+  --cta: #dc9b68;
   --cta-foreground: #060911;
-  --ctahover: #9da5b0;
+  --ctahover: #e0a77a;
   --success: #5c637a;
   --success-foreground: #ffffff;
   --warning: #e5af1b;
@@ -42,9 +40,9 @@
   --busy-ink: #b5642f;
   --border: #3a3f4b;
   --input: #3a3f4b;
-  --ring: #9099a5;
+  --ring: #dc9b68;
   --radius: 0.625rem;
-  --chart-primary: #9099a5;
+  --chart-primary: #dc9b68;
   --chart-secondary: #e2687c;
   --status-success: #5c637a;
   --status-warning: #e5af1b;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(58 63 75 / 0.55);
   --panel-raised-bg: rgb(10 16 31 / 0.95);
   --panel-raised-border: rgb(58 63 75 / 1);
-  --panel-accent: #9099a5;
+  --panel-accent: #dc9b68;
   --panel-header-bg: rgb(27 33 47 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(107 114 168 / 0.85);
   --scrollbar-thin-thumb: rgb(107 114 168 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(107 114 168 / 0.7);
-  --brand: #9099a5;
+  --brand: #dc9b68;
   --brand-foreground: #060911;
-  --brand-primary: #9099a5;
+  --brand-primary: #dc9b68;
   --brand-accent: #c24f40;
   --brand-warm: #b3602a;
   --brand-deep: #060911;
diff --git a/src/workspaces/theme/css/themes/vesper.css b/src/workspaces/theme/css/themes/vesper.css
index d6ab3c59..ff85433b 100644
--- a/src/workspaces/theme/css/themes/vesper.css
+++ b/src/workspaces/theme/css/themes/vesper.css
@@ -1,13 +1,11 @@
 /*
   Vesper — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/Zheonatan/omarchy-vesper-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #999999;
   --accent: #212121;
   --accent-foreground: #d4d4d4;
-  --primary: #a0a0a0;
+  --primary: #b8fff0;
   --primary-foreground: #090909;
   --secondary: #212121;
   --secondary-foreground: #d4d4d4;
-  --cta: #a0a0a0;
+  --cta: #b8fff0;
   --cta-foreground: #090909;
-  --ctahover: #ababab;
+  --ctahover: #c1fff2;
   --success: #99ffe4;
   --success-foreground: #090909;
   --warning: #ffc799;
@@ -42,9 +40,9 @@
   --busy-ink: #ffa48d;
   --border: #363636;
   --input: #363636;
-  --ring: #a0a0a0;
+  --ring: #b8fff0;
   --radius: 0.625rem;
-  --chart-primary: #a0a0a0;
+  --chart-primary: #b8fff0;
   --chart-secondary: #ffcfa8;
   --status-success: #99ffe4;
   --status-warning: #ffc799;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(54 54 54 / 0.55);
   --panel-raised-bg: rgb(16 16 16 / 0.95);
   --panel-raised-border: rgb(54 54 54 / 1);
-  --panel-accent: #a0a0a0;
+  --panel-accent: #b8fff0;
   --panel-header-bg: rgb(33 33 33 / 0.6);
   --panel-header-fg: #d4d4d4;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(80 80 80 / 0.85);
   --scrollbar-thin-thumb: rgb(80 80 80 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(80 80 80 / 0.7);
-  --brand: #a0a0a0;
+  --brand: #b8fff0;
   --brand-foreground: #090909;
-  --brand-primary: #a0a0a0;
+  --brand-primary: #b8fff0;
   --brand-accent: #99ffe4;
   --brand-warm: #ffa48d;
   --brand-deep: #090909;
diff --git a/src/workspaces/theme/css/themes/vhs80.css b/src/workspaces/theme/css/themes/vhs80.css
index fb535bbf..00acf715 100644
--- a/src/workspaces/theme/css/themes/vhs80.css
+++ b/src/workspaces/theme/css/themes/vhs80.css
@@ -1,13 +1,11 @@
 /*
   Vhs80 — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/tahayvr/omarchy-vhs80-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/tahayvr/omarchy-vhs80-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #9a9a9a;
   --accent: #232323;
   --accent-foreground: #d4d4d4;
-  --primary: #8b7f2e;
+  --primary: #c6b441;
   --primary-foreground: #0a0a0a;
   --secondary: #232323;
   --secondary-foreground: #d4d4d4;
-  --cta: #8b7f2e;
+  --cta: #c6b441;
   --cta-foreground: #0a0a0a;
-  --ctahover: #998e47;
+  --ctahover: #cdbd58;
   --success: #277d46;
   --success-foreground: #f3f3f3;
   --warning: #a85511;
@@ -42,9 +40,9 @@
   --busy-ink: #ae674d;
   --border: #383838;
   --input: #383838;
-  --ring: #8b7f2e;
+  --ring: #c6b441;
   --radius: 0.625rem;
-  --chart-primary: #8b7f2e;
+  --chart-primary: #c6b441;
   --chart-secondary: #932a37;
   --status-success: #277d46;
   --status-warning: #a85511;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(56 56 56 / 0.55);
   --panel-raised-bg: rgb(18 18 18 / 0.95);
   --panel-raised-border: rgb(56 56 56 / 1);
-  --panel-accent: #8b7f2e;
+  --panel-accent: #c6b441;
   --panel-header-bg: rgb(35 35 35 / 0.6);
   --panel-header-fg: #d4d4d4;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(138 138 141 / 0.85);
   --scrollbar-thin-thumb: rgb(138 138 141 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(138 138 141 / 0.7);
-  --brand: #8b7f2e;
+  --brand: #c6b441;
   --brand-foreground: #0a0a0a;
-  --brand-primary: #8b7f2e;
+  --brand-primary: #c6b441;
   --brand-accent: #2f8383;
   --brand-warm: #973b19;
   --brand-deep: #0a0a0a;
diff --git a/src/workspaces/theme/css/themes/vice-city.css b/src/workspaces/theme/css/themes/vice-city.css
index fa7acb9b..363fbcf5 100644
--- a/src/workspaces/theme/css/themes/vice-city.css
+++ b/src/workspaces/theme/css/themes/vice-city.css
@@ -1,13 +1,11 @@
 /*
   Vice City — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/lavarinimoreira/omarchy-vice-city-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b26ea0;
   --accent: #1b1b24;
   --accent-foreground: #f793d9;
-  --primary: #00a8ff;
+  --primary: #7df9ff;
   --primary-foreground: #06060b;
   --secondary: #1b1b24;
   --secondary-foreground: #f793d9;
-  --cta: #00a8ff;
+  --cta: #7df9ff;
   --cta-foreground: #06060b;
-  --ctahover: #1fb2ff;
+  --ctahover: #8dfaff;
   --success: #00ff88;
   --success-foreground: #06060b;
   --warning: #ffff00;
@@ -42,9 +40,9 @@
   --busy-ink: #ff8027;
   --border: #38253b;
   --input: #38253b;
-  --ring: #00a8ff;
+  --ring: #7df9ff;
   --radius: 0.625rem;
-  --chart-primary: #00a8ff;
+  --chart-primary: #7df9ff;
   --chart-secondary: #ff6ec7;
   --status-success: #00ff88;
   --status-warning: #ffff00;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(56 37 59 / 0.55);
   --panel-raised-bg: rgb(10 10 20 / 0.95);
   --panel-raised-border: rgb(56 37 59 / 1);
-  --panel-accent: #00a8ff;
+  --panel-accent: #7df9ff;
   --panel-header-bg: rgb(27 27 36 / 0.6);
   --panel-header-fg: #f793d9;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(74 61 90 / 0.85);
   --scrollbar-thin-thumb: rgb(74 61 90 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(74 61 90 / 0.7);
-  --brand: #00a8ff;
+  --brand: #7df9ff;
   --brand-foreground: #06060b;
-  --brand-primary: #00a8ff;
+  --brand-primary: #7df9ff;
   --brand-accent: #00ffff;
   --brand-warm: #ff8027;
   --brand-deep: #06060b;
diff --git a/src/workspaces/theme/css/themes/void.css b/src/workspaces/theme/css/themes/void.css
index 70b144f5..4ae53cc0 100644
--- a/src/workspaces/theme/css/themes/void.css
+++ b/src/workspaces/theme/css/themes/void.css
@@ -1,13 +1,11 @@
 /*
   Void — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/vyrx-dev/omarchy-void-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/vyrx-dev/omarchy-void-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b4b3b6;
   --accent: #17131d;
   --accent-foreground: #ffffff;
-  --primary: #bb9af7;
+  --primary: #c2ccff;
   --primary-foreground: #030107;
   --secondary: #17131d;
   --secondary-foreground: #ffffff;
-  --cta: #bb9af7;
+  --cta: #c2ccff;
   --cta-foreground: #030107;
-  --ctahover: #c3a6f8;
+  --ctahover: #c9d2ff;
   --success: #c2b8ff;
   --success-foreground: #030107;
   --warning: #ddccff;
@@ -42,9 +40,9 @@
   --busy-ink: #e79fbc;
   --border: #36333c;
   --input: #36333c;
-  --ring: #bb9af7;
+  --ring: #c2ccff;
   --radius: 0.625rem;
-  --chart-primary: #bb9af7;
+  --chart-primary: #c2ccff;
   --chart-secondary: #b49ae6;
   --status-success: #c2b8ff;
   --status-warning: #ddccff;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(54 51 60 / 0.55);
   --panel-raised-bg: rgb(5 1 12 / 0.95);
   --panel-raised-border: rgb(54 51 60 / 1);
-  --panel-accent: #bb9af7;
+  --panel-accent: #c2ccff;
   --panel-header-bg: rgb(23 19 29 / 0.6);
   --panel-header-fg: #ffffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(107 87 143 / 0.85);
   --scrollbar-thin-thumb: rgb(107 87 143 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(107 87 143 / 0.7);
-  --brand: #bb9af7;
+  --brand: #c2ccff;
   --brand-foreground: #030107;
-  --brand-primary: #bb9af7;
+  --brand-primary: #c2ccff;
   --brand-accent: #a6b8ff;
   --brand-warm: #e79fbc;
   --brand-deep: #030107;
diff --git a/src/workspaces/theme/css/themes/vurple.css b/src/workspaces/theme/css/themes/vurple.css
index e91287c8..d0cdb99f 100644
--- a/src/workspaces/theme/css/themes/vurple.css
+++ b/src/workspaces/theme/css/themes/vurple.css
@@ -1,13 +1,11 @@
 /*
   Vurple — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/tahfizhabib/omarchy-vurple-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #8eb3b8;
   --accent: #171322;
   --accent-foreground: #c9ffff;
-  --primary: #7d7bdb;
+  --primary: #94e8ff;
   --primary-foreground: #030109;
   --secondary: #171322;
   --secondary-foreground: #c9ffff;
-  --cta: #7d7bdb;
+  --cta: #94e8ff;
   --cta-foreground: #030109;
-  --ctahover: #8d8bdf;
+  --ctahover: #a1ebff;
   --success: #4efaff;
   --success-foreground: #030109;
   --warning: #46d6fd;
@@ -42,9 +40,9 @@
   --busy-ink: #7385f8;
   --border: #2b3340;
   --input: #2b3340;
-  --ring: #7d7bdb;
+  --ring: #94e8ff;
   --radius: 0.625rem;
-  --chart-primary: #7d7bdb;
+  --chart-primary: #94e8ff;
   --chart-secondary: #ae7aeb;
   --status-success: #4efaff;
   --status-warning: #46d6fd;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(43 51 64 / 0.55);
   --panel-raised-bg: rgb(5 1 17 / 0.95);
   --panel-raised-border: rgb(43 51 64 / 1);
-  --panel-accent: #7d7bdb;
+  --panel-accent: #94e8ff;
   --panel-header-bg: rgb(23 19 34 / 0.6);
   --panel-header-fg: #c9ffff;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(46 33 88 / 0.85);
   --scrollbar-thin-thumb: rgb(46 33 88 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(46 33 88 / 0.7);
-  --brand: #7d7bdb;
+  --brand: #94e8ff;
   --brand-foreground: #030109;
-  --brand-primary: #7d7bdb;
+  --brand-primary: #94e8ff;
   --brand-accent: #39d4fe;
   --brand-warm: #7385f8;
   --brand-deep: #030109;
diff --git a/src/workspaces/theme/css/themes/wasteland.css b/src/workspaces/theme/css/themes/wasteland.css
index 2ffdae72..b1edb826 100644
--- a/src/workspaces/theme/css/themes/wasteland.css
+++ b/src/workspaces/theme/css/themes/wasteland.css
@@ -1,13 +1,11 @@
 /*
   Wasteland — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/perfektnacht/omarchy-wasteland-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
diff --git a/src/workspaces/theme/css/themes/waveform-dark.css b/src/workspaces/theme/css/themes/waveform-dark.css
index 26454db1..70dedebd 100644
--- a/src/workspaces/theme/css/themes/waveform-dark.css
+++ b/src/workspaces/theme/css/themes/waveform-dark.css
@@ -1,13 +1,11 @@
 /*
   Waveform Dark — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/hipsterusername/omarchy-waveform-dark-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #b87272;
   --accent: #1b1b1b;
   --accent-foreground: #ff9999;
-  --primary: #cc00ff;
+  --primary: #ff99dd;
   --primary-foreground: #060606;
   --secondary: #1b1b1b;
   --secondary-foreground: #ff9999;
-  --cta: #cc00ff;
+  --cta: #ff99dd;
   --cta-foreground: #060606;
-  --ctahover: #d21fff;
+  --ctahover: #ffa5e1;
   --success: #ff6600;
   --success-foreground: #060606;
   --warning: #ffaa00;
@@ -42,9 +40,9 @@
   --busy-ink: #ff6f1a;
   --border: #3a2626;
   --input: #3a2626;
-  --ring: #cc00ff;
+  --ring: #ff99dd;
   --radius: 0.625rem;
-  --chart-primary: #cc00ff;
+  --chart-primary: #ff99dd;
   --chart-secondary: #ff00aa;
   --status-success: #ff6600;
   --status-warning: #ffaa00;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(58 38 38 / 0.55);
   --panel-raised-bg: rgb(10 10 10 / 0.95);
   --panel-raised-border: rgb(58 38 38 / 1);
-  --panel-accent: #cc00ff;
+  --panel-accent: #ff99dd;
   --panel-header-bg: rgb(27 27 27 / 0.6);
   --panel-header-fg: #ff9999;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(74 32 32 / 0.85);
   --scrollbar-thin-thumb: rgb(74 32 32 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(74 32 32 / 0.7);
-  --brand: #cc00ff;
+  --brand: #ff99dd;
   --brand-foreground: #060606;
-  --brand-primary: #cc00ff;
+  --brand-primary: #ff99dd;
   --brand-accent: #ff66cc;
   --brand-warm: #ff6f1a;
   --brand-deep: #060606;
diff --git a/src/workspaces/theme/css/themes/white-gold.css b/src/workspaces/theme/css/themes/white-gold.css
index 16bd0054..6419745e 100644
--- a/src/workspaces/theme/css/themes/white-gold.css
+++ b/src/workspaces/theme/css/themes/white-gold.css
@@ -1,13 +1,11 @@
 /*
   White Gold — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Light theme (light), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Light theme (light), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
-  Source: https://github.com/HANCORE-linux/omarchy-whitegold-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  Source: https://github.com/HANCORE-linux/omarchy-whitegold-theme (colors.toml (16-colour ANSI)), read by scripts/port-community-themes.ts. Values
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #4b4a4a;
   --accent: #d1cebc;
   --accent-foreground: #0c0c14;
-  --primary: #005c32;
+  --primary: #2e311a;
   --primary-foreground: #c8c5b4;
   --secondary: #d1cebc;
   --secondary-foreground: #0c0c14;
-  --cta: #005c32;
+  --cta: #2e311a;
   --cta-foreground: #c8c5b4;
-  --ctahover: #00512c;
+  --ctahover: #282b17;
   --success: #725c0a;
   --success-foreground: #dad8cc;
   --warning: #2e311a;
@@ -42,9 +40,9 @@
   --busy-ink: #3d1a0f;
   --border: #bebbac;
   --input: #bebbac;
-  --ring: #005c32;
+  --ring: #2e311a;
   --radius: 0.625rem;
-  --chart-primary: #005c32;
+  --chart-primary: #2e311a;
   --chart-secondary: #762b2f;
   --status-success: #725c0a;
   --status-warning: #2e311a;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(190 187 172 / 0.55);
   --panel-raised-bg: rgb(214 211 193 / 0.95);
   --panel-raised-border: rgb(190 187 172 / 1);
-  --panel-accent: #005c32;
+  --panel-accent: #2e311a;
   --panel-header-bg: rgb(209 206 188 / 0.6);
   --panel-header-fg: #0c0c14;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(154 144 120 / 0.85);
   --scrollbar-thin-thumb: rgb(154 144 120 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(154 144 120 / 0.7);
-  --brand: #005c32;
+  --brand: #2e311a;
   --brand-foreground: #c8c5b4;
-  --brand-primary: #005c32;
+  --brand-primary: #2e311a;
   --brand-accent: #3b3b3b;
   --brand-warm: #3d1a0f;
   --brand-deep: #d1cebc;
diff --git a/src/workspaces/theme/css/themes/yuugure.css b/src/workspaces/theme/css/themes/yuugure.css
index ed1902f3..0290c56e 100644
--- a/src/workspaces/theme/css/themes/yuugure.css
+++ b/src/workspaces/theme/css/themes/yuugure.css
@@ -1,13 +1,11 @@
 /*
   Yuugure — ported from a community Omarchy theme, not from basecamp/omarchy's own set.
 
-  Dark theme (dark), by luminance of its own
-  background — the source repo carries no mode flag of its own to read.
+  Dark theme (dark), by luminance of its own background — the source repo carries no mode flag of its own to read.
 
   Source: https://github.com/ItsABigIgloo/omarchy-yuugure-theme (alacritty.toml), read by scripts/port-community-themes.ts. Values
-  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because a single-theme repo ships
-  per-app configs, not Omarchy 4's own colors.toml shape — some tokens here are reconstructed, not
-  authored. Every text/surface pair is contrast-checked the same way the official themes are.
+  went through deriveOmarchyPalette (scripts/themes/from-ansi.ts) because the source has no Omarchy 4
+  colors.toml — some tokens here are reconstructed, not authored. Every text/surface pair is contrast-checked the same way the official themes are.
 
   DO NOT EDIT BY HAND. Re-run the script to refresh from the source repo.
 */
@@ -22,13 +20,13 @@
   --muted-foreground: #999fb9;
   --accent: #2e2e3d;
   --accent-foreground: #cdd6f4;
-  --primary: #89b4fa;
+  --primary: #94e2d5;
   --primary-foreground: #111119;
   --secondary: #2e2e3d;
   --secondary-foreground: #cdd6f4;
-  --cta: #89b4fa;
+  --cta: #94e2d5;
   --cta-foreground: #111119;
-  --ctahover: #97bdfb;
+  --ctahover: #a1e5da;
   --success: #a6e3a1;
   --success-foreground: #111119;
   --warning: #f9e2af;
@@ -42,9 +40,9 @@
   --busy-ink: #f6b7ac;
   --border: #404255;
   --input: #404255;
-  --ring: #89b4fa;
+  --ring: #94e2d5;
   --radius: 0.625rem;
-  --chart-primary: #89b4fa;
+  --chart-primary: #94e2d5;
   --chart-secondary: #cba6f7;
   --status-success: #a6e3a1;
   --status-warning: #f9e2af;
@@ -56,7 +54,7 @@
   --panel-border-bare: rgb(64 66 85 / 0.55);
   --panel-raised-bg: rgb(30 30 46 / 0.95);
   --panel-raised-border: rgb(64 66 85 / 1);
-  --panel-accent: #89b4fa;
+  --panel-accent: #94e2d5;
   --panel-header-bg: rgb(46 46 61 / 0.6);
   --panel-header-fg: #cdd6f4;
   --panel-radius: 0.75rem;
@@ -78,9 +76,9 @@
   --scrollbar-thumb-hover: rgb(88 91 112 / 0.85);
   --scrollbar-thin-thumb: rgb(88 91 112 / 0.45);
   --scrollbar-thin-thumb-hover: rgb(88 91 112 / 0.7);
-  --brand: #89b4fa;
+  --brand: #94e2d5;
   --brand-foreground: #111119;
-  --brand-primary: #89b4fa;
+  --brand-primary: #94e2d5;
   --brand-accent: #94e2d5;
   --brand-warm: #f6b7ac;
   --brand-deep: #111119;
diff --git a/src/workspaces/theme/src/themes.ts b/src/workspaces/theme/src/themes.ts
index 0b59984f..b8ff6afb 100644
--- a/src/workspaces/theme/src/themes.ts
+++ b/src/workspaces/theme/src/themes.ts
@@ -110,6 +110,7 @@ export const THEMES: readonly Theme[] = [
   { id: 'black-gold', name: 'Black Gold', family: 'Black Gold', applyDarkClass: true },
   { id: 'black-money', name: 'Black Money', family: 'Black Money', applyDarkClass: true },
   { id: 'blackturq', name: 'Blackturq', family: 'Blackturq', applyDarkClass: true },
+  { id: 'blackwall', name: 'Blackwall', family: 'Blackwall', applyDarkClass: true },
   { id: 'blueridge', name: 'Blueridge', family: 'Blueridge', applyDarkClass: true },
   { id: 'brutalism', name: 'Brutalism', family: 'Brutalism', applyDarkClass: true },
   { id: 'caroline-skyline', name: 'Caroline Skyline', family: 'Caroline Skyline', applyDarkClass: true },
@@ -157,6 +158,7 @@ export const THEMES: readonly Theme[] = [
   { id: 'ghost-pastel', name: 'Ghost Pastel', family: 'Ghost Pastel', applyDarkClass: true },
   { id: 'glory-antic', name: 'Glory Antic', family: 'Glory Antic', applyDarkClass: true },
   { id: 'gold-rush', name: 'Gold Rush', family: 'Gold Rush', applyDarkClass: true },
+  { id: 'gornergrat-station', name: 'Gornergrat Station', family: 'Gornergrat Station', applyDarkClass: false },
   { id: 'gotham-city', name: 'Gotham City', family: 'Gotham City', applyDarkClass: true },
   { id: 'greek-noir', name: 'Greek Noir', family: 'Greek Noir', applyDarkClass: true },
   { id: 'green-city', name: 'Green City', family: 'Green City', applyDarkClass: true },
@@ -181,6 +183,7 @@ export const THEMES: readonly Theme[] = [
   { id: 'lairetam', name: 'Lairetam', family: 'Lairetam', applyDarkClass: true },
   { id: 'latch', name: 'Latch', family: 'Latch', applyDarkClass: false },
   { id: 'latch-dark', name: 'Latch Dark', family: 'Latch Dark', applyDarkClass: true },
+  { id: 'lilly', name: 'Lilly', family: 'Lilly', applyDarkClass: true },
   { id: 'lowlight', name: 'Lowlight', family: 'Lowlight', applyDarkClass: true },
   { id: 'lunar', name: 'Lunar', family: 'Lunar', applyDarkClass: true },
   { id: 'manga', name: 'Manga', family: 'Manga', applyDarkClass: true },
@@ -190,6 +193,7 @@ export const THEMES: readonly Theme[] = [
   { id: 'memento-mori', name: 'Memento Mori', family: 'Memento Mori', applyDarkClass: true },
   { id: 'midnight', name: 'Midnight', family: 'Midnight', applyDarkClass: true },
   { id: 'miles-morales', name: 'Miles Morales', family: 'Miles Morales', applyDarkClass: true },
+  { id: 'milkmatcha-light', name: 'Milkmatcha Light', family: 'Milkmatcha Light', applyDarkClass: false },
   { id: 'mocha', name: 'Mocha', family: 'Mocha', applyDarkClass: true },
   { id: 'monochrome', name: 'Monochrome', family: 'Monochrome', applyDarkClass: true },
   { id: 'monokai', name: 'Monokai', family: 'Monokai', applyDarkClass: true },
@@ -197,6 +201,7 @@ export const THEMES: readonly Theme[] = [
   { id: 'monolith', name: 'Monolith', family: 'Monolith', applyDarkClass: true },
   { id: 'monolith-2', name: 'Monolith 2', family: 'Monolith 2', applyDarkClass: true },
   { id: 'moodpeak', name: 'Moodpeak', family: 'Moodpeak', applyDarkClass: true },
+  { id: 'moon-orbit', name: 'Moon Orbit', family: 'Moon Orbit', applyDarkClass: true },
   { id: 'nagai-poolside', name: 'Nagai Poolside', family: 'Nagai Poolside', applyDarkClass: true },
   { id: 'nagai-twilight', name: 'Nagai Twilight', family: 'Nagai Twilight', applyDarkClass: true },
   { id: 'nebulite', name: 'Nebulite', family: 'Nebulite', applyDarkClass: true },
@@ -204,11 +209,13 @@ export const THEMES: readonly Theme[] = [
   { id: 'neon-street', name: 'Neon Street', family: 'Neon Street', applyDarkClass: true },
   { id: 'neovoid', name: 'Neovoid', family: 'Neovoid', applyDarkClass: true },
   { id: 'nes', name: 'Nes', family: 'Nes', applyDarkClass: true },
+  { id: 'night-owl', name: 'Night Owl', family: 'Night Owl', applyDarkClass: true },
   { id: 'nyc', name: 'Nyc', family: 'Nyc', applyDarkClass: true },
   { id: 'one-dark-pro', name: 'One Dark Pro', family: 'One Dark Pro', applyDarkClass: true },
   { id: 'oxford', name: 'Oxford', family: 'Oxford', applyDarkClass: true },
   { id: 'oxocarbon-dark', name: 'Oxocarbon Dark', family: 'Oxocarbon Dark', applyDarkClass: true },
   { id: 'pandora', name: 'Pandora', family: 'Pandora', applyDarkClass: true },
+  { id: 'phosphor-os', name: 'Phosphor OS', family: 'Phosphor OS', applyDarkClass: true },
   { id: 'pina', name: 'Pina', family: 'Pina', applyDarkClass: true },
   { id: 'pink-blood', name: 'Pink Blood', family: 'Pink Blood', applyDarkClass: true },
   { id: 'pmndrs', name: 'Pmndrs', family: 'Pmndrs', applyDarkClass: true },
@@ -229,10 +236,14 @@ export const THEMES: readonly Theme[] = [
   { id: 'saga', name: 'Saga', family: 'Saga', applyDarkClass: true },
   { id: 'sakura', name: 'Sakura', family: 'Sakura', applyDarkClass: true },
   { id: 'sapphire', name: 'Sapphire', family: 'Sapphire', applyDarkClass: true },
+  { id: 'seashells', name: 'Seashells', family: 'Seashells', applyDarkClass: true },
   { id: 'serenity', name: 'Serenity', family: 'Serenity', applyDarkClass: true },
   { id: 'shadesofjade', name: 'Shadesofjade', family: 'Shadesofjade', applyDarkClass: true },
   { id: 'snow', name: 'Snow', family: 'Snow', applyDarkClass: false },
   { id: 'snow-black', name: 'Snow Black', family: 'Snow Black', applyDarkClass: true },
+  { id: 'solarized', name: 'Solarized', family: 'Solarized', applyDarkClass: true },
+  { id: 'solarized-light', name: 'Solarized Light', family: 'Solarized Light', applyDarkClass: false },
+  { id: 'solarized-osaka', name: 'Solarized Osaka', family: 'Solarized Osaka', applyDarkClass: true },
   { id: 'space-bound', name: 'Space Bound', family: 'Space Bound', applyDarkClass: true },
   { id: 'space-monkey', name: 'Space Monkey', family: 'Space Monkey', applyDarkClass: true },
   { id: 'spark', name: 'Spark', family: 'Spark', applyDarkClass: true },