You are a constitutional council ranking individual git commits for ownership allocation.

Compare these two commits. Decide which contributed more lasting value to the project.

Judge substance, not spectacle:
- Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise.
- Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one.
- Do not favor a side merely because its patch is longer or noisier.
- Weight what the change does for the project, not the contributor's name.

Return ONLY a JSON object: {"winner": "A" or "B", "ratio": "N:M", "explanation": "..."}
The explanation must cite concrete differences in the patches (1-3 sentences).

Side A — contributor: tommy-mor
Side A — commit message:
[4e327784] deploy live constitution dashboard

Expose auditable progress and event streaming, configure the production roots and runtime, and make tested main-branch commits the deployment authority.

Co-authored-by: Cursor <cursoragent@cursor.com>

Side A — unified diff (full patch):
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..c9d63a722beba0a0297fc853089332c460ab78dd
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,7 @@
+.git
+.venv
+.hypothesis
+__pycache__
+tests
+*.json
+*.bsp
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 0000000000000000000000000000000000000000..76dcdf82d53177c1e47d86b23a54523239d232a6
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,49 @@
+name: Test and deploy
+
+on:
+  push:
+    branches: [main]
+
+concurrency:
+  group: production
+  cancel-in-progress: false
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: astral-sh/setup-uv@v6
+        with:
+          enable-cache: true
+
+      - name: Run Python tests
+        run: uv run pytest -q
+
+      - name: Install Babashka
+        run: |
+          curl -fsSL https://raw.githubusercontent.com/babashka/babashka/master/install \
+            | sudo bash -s -- --dir /usr/local/bin
+
+      - name: Run process integration tests
+        run: bb TEST.sh
+
+  deploy:
+    needs: test
+    runs-on: ubuntu-latest
+    environment:
+      name: production
+      url: https://token.slug.social
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+
+      - name: Deploy to Fly
+        run: flyctl deploy --remote-only
+        env:
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..c9a5c00782371c19ad5ab5c58cf6f5a8ffec0141
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,17 @@
+FROM ghcr.io/astral-sh/uv:python3.11-bookworm-slim
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends git ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+COPY pyproject.toml uv.lock ./
+RUN uv sync --frozen --no-install-project
+
+COPY constitution.py ./
+
+ENV PATH="/app/.venv/bin:${PATH}" \
+    PYTHONUNBUFFERED="1"
+
+EXPOSE 8080
+CMD ["python", "constitution.py"]
diff --git a/constitution.py b/constitution.py
index 4bee9f83663ab7fb36db95129b92b64b4ef57258..a58257e1881b21d1d6fa8e68a3faa222e4f661ef 100644
--- a/constitution.py
+++ b/constitution.py
@@ -24,12 +24,12 @@ A daily GitHub Action backs up the JSONL ledger to the same repo.
 Run: uv run constitution.py
 """
 
-from decimal import Decimal, getcontext
+from decimal import Decimal, getcontext, DefaultContext
 from datetime import datetime, timezone
 from fastapi import FastAPI, Request, Response
 from fastapi.responses import PlainTextResponse, HTMLResponse
 from starlette.middleware.sessions import SessionMiddleware
-import json, time, os, asyncio, httpx, pathlib, subprocess, hashlib, re, fcntl
+import json, time, os, asyncio, httpx, pathlib, subprocess, hashlib, re, fcntl, base64
 import sympy as sp  # type: ignore[reportMissingImports]
 from tenacity import retry, retry_if_exception, stop_after_attempt, wait_exponential
 from evaleval import (
@@ -37,6 +37,7 @@ from evaleval import (
     exec_event, One, Two, Three, Selector, MORPH, PREPEND,
 )
 
+DefaultContext.prec = 50
 getcontext().prec = 50
 
 app = FastAPI()
@@ -129,14 +130,47 @@ OPENROUTER_BASE_URL = os.environ.get("OPENROUTER_BASE_URL", "https://openrouter.
 # using the exact same source; their normalized values are committed to every
 # discovery event.
 DEFAULT_REPOSITORIES = [
+    {
+        "id": "constitution",
+        "url": "https://github.com/sortersocial/constitution.git",
+        "refs": ["refs/heads/**"],
+    },
     {
         "id": "slug",
-        "url": "https://github.com/tommy-mor/slug.git",
+        "url": "https://github.com/sortersocial/slug.git",
+        "refs": ["refs/heads/**"],
+    },
+    {
+        "id": "sorter",
+        "url": "https://github.com/sorterisntonline/sorter.git",
+        "refs": ["refs/heads/**"],
+    },
+    {
+        "id": "sorter2",
+        "url": "https://github.com/sortersocial/sorter2.git",
+        "refs": ["refs/heads/**"],
+    },
+    {
+        "id": "sorter-oldest",
+        "url": "https://github.com/tommy-mor/sorter.git",
         "refs": ["refs/heads/**"],
     },
 ]
 DEFAULT_CONTRIBUTORS = {
     "tommy-mor": ["thmorriss@gmail.com"],
+    "christopher-whitman": [
+        "chris@cwwhitman.com",
+        "7566903+cwwhitman@users.noreply.github.com",
+    ],
+    "jake-chvatal": [
+        "jake+github@uln.industries",
+        "jakechvatal@gmail.com",
+        "jake@isnt.online",
+    ],
+    "lara": ["me@lara.lv"],
+    "nat-reid": ["nathanielreid@gmail.com"],
+    "zod": ["jason.p.mcel@gmail.com", "me@zod.tf"],
+    "jovan": ["jovan@slug.social", "jovan@getcivicai.com"],
 }
 
 REPOSITORIES = json.loads(
@@ -147,6 +181,7 @@ CONTRIBUTORS = json.loads(
 )
 GIT_MIRROR_DIR = pathlib.Path(os.environ.get("GIT_MIRROR_DIR", "/data/git"))
 GIT_TIMEOUT_SECONDS = int(os.environ.get("GIT_TIMEOUT_SECONDS", "120"))
+GITHUB_TOKEN = os.environ.get("GITHUB_TOKEN", "")
 
 # Council model IDs: slug.social garden rank under this parent (bodies = OpenRouter URLs), then top-up from OpenRouter list.
 SLUG_SOCIAL_BASE_URL = os.environ.get("SLUG_SOCIAL_BASE_URL", "https://slug.social").rstrip("/")
@@ -661,20 +696,30 @@ def _git(repo: pathlib.Path | None, *args: str, input_bytes: bytes | None = None
     if repo is not None:
         command += ["-C", str(repo)]
     command += list(args)
+    git_env = {
+        **os.environ,
+        "GIT_CONFIG_NOSYSTEM": "1",
+        "GIT_CONFIG_GLOBAL": os.devnull,
+        "GIT_NO_REPLACE_OBJECTS": "1",
+        "LC_ALL": "C",
+        "TZ": "UTC",
+    }
+    if GITHUB_TOKEN:
+        credential = base64.b64encode(
+            f"x-access-token:{GITHUB_TOKEN}".encode()
+        ).decode()
+        git_env.update({
+            "GIT_CONFIG_COUNT": "1",
+            "GIT_CONFIG_KEY_0": "http.https://github.com/.extraHeader",
+            "GIT_CONFIG_VALUE_0": f"Authorization: Basic {credential}",
+        })
     try:
         result = subprocess.run(
             command,
             input=input_bytes,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
-            env={
-                **os.environ,
-                "GIT_CONFIG_NOSYSTEM": "1",
-                "GIT_CONFIG_GLOBAL": os.devnull,
-                "GIT_NO_REPLACE_OBJECTS": "1",
-                "LC_ALL": "C",
-                "TZ": "UTC",
-            },
+            env=git_env,
             timeout=GIT_TIMEOUT_SECONDS,
             check=False,
         )
@@ -844,9 +889,15 @@ def _build_discovery(epoch_n: int, boundary_ms: int, events: list) -> GitDiscove
         canonical_location = min(
             locations[qualified_oid], key=lambda x: (x[0], x[1])
         )
+        # One commit may be reachable from dozens of refs in the same mirror.
+        # Verify its object once per repository, not once per source ref.
+        object_locations = {
+            (str(m), raw_oid): (m, raw_oid)
+            for _, _, m, raw_oid in locations[qualified_oid]
+        }
         object_hashes = {
             hashlib.sha256(_git(m, "cat-file", "commit", raw_oid)).hexdigest()
-            for _, _, m, raw_oid in locations[qualified_oid]
+            for m, raw_oid in object_locations.values()
         }
         if len(object_hashes) != 1:
             raise RuntimeError(f"conflicting Git objects share OID {qualified_oid}")
@@ -994,11 +1045,55 @@ async def discover_repositories(epoch_n: int, boundary_ms: int) -> GitDiscovery:
 
 
 SSE_CLIENTS = []
+AUDIT_HISTORY = []
+AUDIT_SEQUENCE = 0
+PROCESS_STATE = {
+    "running": False,
+    "phase": "idle",
+    "progress": 100,
+    "message": "Waiting for the next epoch",
+}
+
+
+def _sse_event(event_name: str, payload: dict) -> str:
+    return (
+        f"event: {event_name}\n"
+        f"data: {json.dumps(payload, separators=(',', ':'))}\n\n"
+    )
+
+
+async def broadcast_audit(
+    kind: str,
+    message: str,
+    *,
+    progress: int | None = None,
+    phase: str | None = None,
+) -> dict:
+    global AUDIT_SEQUENCE
+    AUDIT_SEQUENCE += 1
+    if progress is not None:
+        PROCESS_STATE["progress"] = max(0, min(100, int(progress)))
+    if phase is not None:
+        PROCESS_STATE["phase"] = phase
+    PROCESS_STATE["message"] = message
+    payload = {
+        "id": AUDIT_SEQUENCE,
+        "timestamp_ms": int(time.time() * 1000),
+        "kind": kind,
+        "message": message,
+        **PROCESS_STATE,
+    }
+    AUDIT_HISTORY.append(payload)
+    del AUDIT_HISTORY[:-200]
+    wire = _sse_event("audit", payload)
+    for queue in list(SSE_CLIENTS):
+        await queue.put(wire)
+    return payload
 
 
 async def broadcast_js(js: str):
     """Send a JS snippet to all connected SSE clients."""
-    for queue in SSE_CLIENTS:
+    for queue in list(SSE_CLIENTS):
         await queue.put(js)
 
 
@@ -1006,10 +1101,29 @@ async def rank_commits(commits: list[dict]):
     if not commits:
         return {}, []
 
-    models = await fetch_top_models(n=3)
     contributors = sorted(set(c["contributor"] for c in commits))
-    if len(contributors) > 1 and not models:
+    if len(contributors) == 1:
+        await broadcast_audit(
+            "ranking",
+            f"Only {contributors[0]} is eligible; rank is 1.0",
+            progress=90,
+            phase="finalizing",
+        )
+        return {contributors[0]: Decimal("1")}, []
+    if not (OPENROUTER_API_KEY or "").strip():
+        raise RuntimeError(
+            "OPENROUTER_API_KEY is required when multiple contributors need ranking"
+        )
+
+    models = await fetch_top_models(n=3)
+    if not models:
         raise RuntimeError("no council models available for contributor ranking")
+    await broadcast_audit(
+        "council",
+        f"Council selected: {', '.join(models)}",
+        progress=35,
+        phase="ranking",
+    )
     await broadcast_js(exec_event(Three[Selector("#emission-log")][PREPEND][
         ["div.log-council", f"Council: {', '.join(models)} — {len(commits)} commits"]
     ]))
@@ -1035,6 +1149,11 @@ async def rank_commits(commits: list[dict]):
 
     async def compare_fn(i, j):
         a1, a2 = authors[i], authors[j]
+        await broadcast_audit(
+            "comparison",
+            f"Comparing {a1} with {a2}",
+            phase="ranking",
+        )
         await broadcast_js(exec_event(Three[Selector("#emission-status")][MORPH][
             ["div#emission-status", f"Comparing {a1} vs {a2}…"]
         ]))
@@ -1050,6 +1169,11 @@ async def rank_commits(commits: list[dict]):
                 if winner_weight <= 0 or loser_weight <= 0:
                     raise ValueError("ratio weights must be positive")
                 results.append((w, l, winner_weight, loser_weight))
+                await broadcast_audit(
+                    "vote",
+                    f"{model}: {authors[w]} over {authors[l]} ({result['ratio']})",
+                    phase="ranking",
+                )
                 await broadcast_js(exec_event(Three[Selector("#emission-log")][PREPEND][
                     ["div.log-vote",
                         ["span.model", model], " — ",
@@ -1059,6 +1183,11 @@ async def rank_commits(commits: list[dict]):
                     ]
                 ]))
             except Exception as e:
+                await broadcast_audit(
+                    "error",
+                    f"{model} failed: {e}",
+                    phase="error",
+                )
                 await broadcast_js(exec_event(Three[Selector("#emission-log")][PREPEND][
                     ["div.log-error", f"⚠ {model}: {e}"]
                 ]))
@@ -1068,8 +1197,13 @@ async def rank_commits(commits: list[dict]):
     async def progress_fn(ev):
         if ev["phase"] == "spanning_tree":
             label = f"Spanning tree: {ev['step']}/{ev['total']}"
+            percent = 35 + round(35 * ev["step"] / max(ev["total"], 1))
         else:
             label = f"Zip pass {ev['pass']}: {ev['step']}/{ev['total']}"
+            percent = 70 + round(20 * ev["step"] / max(ev["total"], 1))
+        await broadcast_audit(
+            "progress", label, progress=percent, phase="ranking"
+        )
         await broadcast_js(exec_event(Three[Selector("#emission-status")][MORPH][
             ["div#emission-status", label]
         ]))
@@ -1083,6 +1217,12 @@ async def rank_commits(commits: list[dict]):
     scores = rank_centrality(pairs)
     ranking = {authors[i]: Decimal(str(scores[i])) for i in range(len(authors))}
     ranking_rows = sorted(ranking.items(), key=lambda x: x[1], reverse=True)
+    await broadcast_audit(
+        "ranking",
+        "Ranking: " + ", ".join(f"{a} {s:.4f}" for a, s in ranking_rows),
+        progress=90,
+        phase="finalizing",
+    )
     await broadcast_js(exec_event(Three[Selector("#emission-log")][PREPEND][
         ["div.log-ranking",
             ["b", "Ranking: "],
@@ -1104,11 +1244,33 @@ def pool_remaining(events: list) -> Decimal:
 
 
 async def run_emission(epoch_n, boundary_ms):
+    PROCESS_STATE["running"] = True
+    await broadcast_audit(
+        "start",
+        f"Epoch {epoch_n} emission started",
+        progress=2,
+        phase="starting",
+    )
     await broadcast_js(exec_event(Three[Selector("#emission-log")][PREPEND][
         ["div.log-start", f"⚡ Epoch {epoch_n} emission started"]
     ]))
 
+    await broadcast_audit(
+        "discovery",
+        "Fetching configured repositories and snapshotting refs",
+        progress=8,
+        phase="discovery",
+    )
     discovery = await discover_repositories(epoch_n, boundary_ms)
+    await broadcast_audit(
+        "discovery",
+        (
+            f"Discovered {len(discovery.observations)} new commits; "
+            f"{len(discovery.commits)} are eligible"
+        ),
+        progress=30,
+        phase="discovery",
+    )
     ranking, models = await rank_commits(discovery.commits)
 
     def make_emission(events):
@@ -1146,6 +1308,13 @@ async def run_emission(epoch_n, boundary_ms):
 
     entry = await store.atomic(make_emission)
     if entry:
+        PROCESS_STATE["running"] = False
+        await broadcast_audit(
+            "complete",
+            f"Epoch {entry.epoch} complete; emitted {entry.total_emitted} SLG",
+            progress=100,
+            phase="idle",
+        )
         await broadcast_js(exec_event(Three[Selector("#emission-log")][PREPEND][
             ["div.log-amount",
                 f"Pool {entry.pool_before} → emit {entry.total_emitted} → {entry.pool_after}"]
@@ -1189,13 +1358,24 @@ async def distribute_usdc(holdings, treasury_balance):
 async def epoch_loop():
     while True:
         epoch_n, current_start, next_boundary = current_epoch()
+        processed = {e.epoch for e in store.read() if isinstance(e, Emission)}
+        if epoch_n >= 0 and epoch_n not in processed:
+            try:
+                await run_emission(epoch_n, current_start)
+            except Exception as exc:
+                PROCESS_STATE["running"] = False
+                await broadcast_audit(
+                    "error",
+                    f"Epoch {epoch_n} failed: {exc}; retrying in 60 seconds",
+                    phase="error",
+                )
+                print(f"epoch {epoch_n} emission failed: {exc}", flush=True)
+                await asyncio.sleep(60)
+                continue
+
         now = int(time.time() * 1000)
         wait_ms = next_boundary - now
-
         if wait_ms <= 0:
-            processed = {e.epoch for e in store.read() if isinstance(e, Emission)}
-            if epoch_n not in processed and epoch_n >= 0:
-                await run_emission(epoch_n, current_start)
             await asyncio.sleep(60)
         elif wait_ms < 86_400_000:
             await broadcast_js(exec_event(Three[Selector("#emission-status")][MORPH][
@@ -1243,6 +1423,36 @@ async def get_ranking():
     return {"ranking": latest.ranking, "epoch": latest.epoch}
 
 
+@app.get("/api/status")
+async def get_status():
+    events = store.read()
+    discoveries = [e for e in events if isinstance(e, GitDiscovery)]
+    emissions = [e for e in events if isinstance(e, Emission)]
+    return {
+        **PROCESS_STATE,
+        "epoch": current_epoch()[0],
+        "openrouter_configured": bool((OPENROUTER_API_KEY or "").strip()),
+        "sse_clients": len(SSE_CLIENTS),
+        "latest_discovery": (
+            {
+                "epoch": discoveries[-1].epoch,
+                "snapshot_id": discoveries[-1].snapshot_id,
+                "observations": len(discoveries[-1].observations),
+                "eligible_commits": len(discoveries[-1].commits),
+            }
+            if discoveries else None
+        ),
+        "latest_emission": (
+            {
+                "epoch": emissions[-1].epoch,
+                "total_emitted": emissions[-1].total_emitted,
+                "ranking": emissions[-1].ranking,
+            }
+            if emissions else None
+        ),
+    }
+
+
 @app.get("/api/contributor/{github_username}")
 async def get_contributor(github_username: str):
     history = [
@@ -1306,13 +1516,6 @@ async def test_emit():
 
 # ===========================================================================
 # §9. SSE — live audit stream of the pairwise voting process
-#
-# TODO: the /sse emission audit page needs a real SSE-driven UI. votes arrive
-# incrementally during rank_commits(), and the client should show a live
-# progress bar and per-vote results as they stream in. this requires a
-# dedicated page that connects to /sse and updates the DOM on each event
-# (council, comparing, vote, ranking, emission_complete). defer until we
-# have playwright tests to cover it — the incremental rendering is fiddly.
 # ===========================================================================
 
 @app.get("/sse")
@@ -1322,6 +1525,13 @@ async def sse_stream(request: Request):
 
     async def generate():
         try:
+            yield _sse_event("audit", {
+                "id": AUDIT_SEQUENCE,
+                "timestamp_ms": int(time.time() * 1000),
+                "kind": "connection",
+                "message": f"Connected to epoch {current_epoch()[0]}",
+                **PROCESS_STATE,
+            })
             yield exec_event(Three[Selector("#emission-status")][MORPH][
                 ["div#emission-status", f"Connected — epoch {current_epoch()[0]}"]
             ])
@@ -1334,10 +1544,15 @@ async def sse_stream(request: Request):
                 except asyncio.TimeoutError:
                     yield ": keepalive\n\n"
         finally:
-            SSE_CLIENTS.remove(queue)
+            if queue in SSE_CLIENTS:
+                SSE_CLIENTS.remove(queue)
 
     from starlette.responses import StreamingResponse
-    return StreamingResponse(generate(), media_type="text/event-stream")
+    return StreamingResponse(
+        generate(),
+        media_type="text/event-stream",
+        headers={"Cache-Control": "no-cache", "X-Accel-Buffering": "no"},
+    )
 
 
 # ===========================================================================
@@ -1359,6 +1574,7 @@ def _page(title: str, body: list) -> HTMLResponse:
             ["meta", {"charset": "utf-8"}],
             ["meta", {"name": "viewport", "content": "width=device-width, initial-scale=1"}],
             ["title", title],
+            ["style", RawContent(_WATCH_CSS)],
         ],
         ["body",
             body,
@@ -1367,6 +1583,387 @@ def _page(title: str, body: list) -> HTMLResponse:
     ]))
 
 
+_WATCH_CSS = """
+/* ================================================================
+   ZIGGURAT — bevel-first dark theme
+   --spread (0→1) controls bevel depth. 0 = flat. 1 = full relief.
+   Light source: top-left. Shadow: bottom-right.
+   Platforms nest. Each level is raised. Nothing is rounded.
+   ================================================================ */
+
+:root {
+  color-scheme: dark;
+  --spread: 1;
+
+  --g0: #080808;
+  --g1: #131313;
+  --g2: #1c1c1c;
+  --g3: #252525;
+  --g4: #2e2e2e;
+  --g5: #383838;
+
+  --hi: #5e5e5e;
+  --lo: #050505;
+  --bv: calc(var(--spread) * 4px + 1px);
+  --bv-lg: calc(var(--spread) * 6px + 2px);
+
+  --signal: #f0f0f0;
+  --prose: #c2c2c2;
+  --ui: #888;
+  --meta: #4a4a4a;
+  --link: #8899ee;
+  --code-fg: #c8dda0;
+
+  --font-prose: "Iowan Old Style", "Palatino Linotype", Palatino, "Book Antiqua", Georgia, serif;
+  --font-ui: system-ui, -apple-system, sans-serif;
+  --font-code: ui-monospace, "Cascadia Code", "SF Mono", Menlo, monospace;
+}
+
+*, *::before, *::after { box-sizing: border-box; }
+html, body { margin: 0; padding: 0; }
+
+body {
+  background: var(--g0);
+  color: var(--prose);
+  font-family: var(--font-ui);
+  font-size: 14px;
+  line-height: 1.6;
+  margin: 0 auto;
+  max-width: 560px;
+  min-height: 100vh;
+  padding: 0 16px 48px;
+}
+main { width: 100%; padding: 18px 0 48px; }
+
+h1, h2, h3 {
+  color: var(--signal);
+  font-size: 11px;
+  font-weight: bold;
+  letter-spacing: 0.12em;
+  margin: 14px 0 6px;
+  text-transform: uppercase;
+}
+a { color: var(--link); text-decoration: none; }
+a:hover { color: var(--signal); }
+.eyebrow {
+  background: var(--g2);
+  border: var(--bv) solid;
+  border-color: var(--hi) var(--lo) var(--lo) var(--hi);
+  color: var(--ui);
+  font-size: 11px;
+  letter-spacing: 0.12em;
+  padding: 4px 10px;
+  text-transform: uppercase;
+  width: fit-content;
+}
+
+/* Every dashboard section is a raised platform. */
+.panel {
+  background: var(--g2);
+  border: var(--bv-lg) solid;
+  border-color: var(--hi) var(--lo) var(--lo) var(--hi);
+  margin: 8px 0;
+  padding: 10px;
+  width: 100%;
+}
+.status-row {
+  align-items: center;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  justify-content: space-between;
+}
+#process-status { color: var(--signal); font-family: var(--font-code); font-weight: bold; }
+.badge {
+  align-items: center;
+  background: var(--g3);
+  border: var(--bv) solid;
+  border-color: var(--hi) var(--lo) var(--lo) var(--hi);
+  color: var(--ui);
+  display: inline-flex;
+  font-size: 11px;
+  gap: 7px;
+  padding: 3px 8px;
+}
+.dot { background: var(--meta); height: 8px; width: 8px; }
+.live .dot { background: #7acc7a; }
+.warn .dot { background: #cc9955; }
+
+/* The progress track is inset; its signal is raised inside it. */
+.progress-shell {
+  background: var(--g1);
+  border: var(--bv-lg) solid;
+  border-color: var(--lo) var(--hi) var(--hi) var(--lo);
+  height: 58px;
+  margin: 14px 0 10px;
+  overflow: hidden;
+  position: relative;
+}
+#progress-fill {
+  background: var(--link);
+  border: var(--bv) solid;
+  border-color: var(--hi) var(--lo) var(--lo) var(--hi);
+  height: 100%;
+  transition: width .35s steps(8, end);
+  width: 0;
+}
+#progress-label {
+  color: var(--signal);
+  display: grid;
+  font-family: var(--font-code);
+  font-size: 18px;
+  font-weight: bold;
+  inset: 0;
+  place-items: center;
+  position: absolute;
+  text-shadow: 1px 1px var(--lo);
+}
+
+.controls { align-items: center; display: flex; flex-wrap: wrap; gap: 8px; }
+button {
+  background: var(--g5);
+  border: var(--bv) solid;
+  border-color: var(--hi) var(--lo) var(--lo) var(--hi);
+  color: var(--signal);
+  cursor: pointer;
+  font: inherit;
+  font-size: 12px;
+  padding: 4px 10px;
+}
+button:hover { background: #404040; }
+button:active {
+  background: var(--g4);
+  border-color: var(--lo) var(--hi) var(--hi) var(--lo);
+  transform: translate(1px, 1px);
+}
+button:disabled { cursor: default; opacity: .4; }
+.note { color: var(--meta); font-size: 11px; margin: 4px 0; }
+
+.feed-head { align-items: baseline; display: flex; justify-content: space-between; }
+#audit-feed {
+  background: var(--g1);
+  border: var(--bv) solid;
+  border-color: var(--lo) var(--hi) var(--hi) var(--lo);
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+  margin-top: 8px;
+  padding: 6px;
+}
+.event {
+  background: var(--g3);
+  border: var(--bv) solid;
+  border-color: var(--hi) var(--lo) var(--lo) var(--hi);
+  display: grid;
+  gap: 6px;
+  grid-template-columns: 82px 88px 1fr;
+  padding: 5px 8px;
+}
+.event[data-kind="error"] { border-left-color: #cc5555; }
+.event[data-kind="complete"], .event[data-kind="ranking"] { border-left-color: #7acc7a; }
+.event[data-kind="vote"] { border-left-color: var(--link); }
+.event time, .event-kind { color: var(--meta); font-family: var(--font-code); font-size: 10px; }
+.event-kind { text-transform: uppercase; }
+.event-message { color: var(--prose); font-family: var(--font-prose); }
+
+code {
+  background: var(--g1);
+  border: 2px solid;
+  border-color: var(--lo) var(--hi) var(--hi) var(--lo);
+  color: var(--code-fg);
+  font-family: var(--font-code);
+  font-size: 12px;
+  padding: 1px 4px;
+}
+
+@media (max-width: 520px) {
+  .event { grid-template-columns: 72px 1fr; }
+  .event-message { grid-column: 1 / -1; }
+}
+"""
+
+
+def _watch_initial_state() -> dict:
+    events = store.read()
+    feed = []
+    for event_ in events[-40:]:
+        if isinstance(event_, GitDiscovery):
+            feed.append({
+                "id": f"discovery-{event_.snapshot_id}",
+                "timestamp_ms": event_.timestamp_ms,
+                "kind": "discovery",
+                "message": (
+                    f"Epoch {event_.epoch}: observed {len(event_.observations)} commits; "
+                    f"{len(event_.commits)} eligible"
+                ),
+            })
+        elif isinstance(event_, Emission):
+            feed.append({
+                "id": f"emission-{event_.epoch}",
+                "timestamp_ms": event_.timestamp_ms,
+                "kind": "complete",
+                "message": (
+                    f"Epoch {event_.epoch}: emitted {event_.total_emitted} SLG; "
+                    f"ranking {event_.ranking}"
+                ),
+            })
+    feed.extend(AUDIT_HISTORY)
+    return {
+        "process": dict(PROCESS_STATE),
+        "openrouter_configured": bool((OPENROUTER_API_KEY or "").strip()),
+        "epoch": current_epoch()[0],
+        "feed": feed[-200:],
+    }
+
+
+_WATCH_JS = """
+const initial = __INITIAL__;
+const feed = document.querySelector('#audit-feed');
+const processStatus = document.querySelector('#process-status');
+const connection = document.querySelector('#connection-status');
+const fill = document.querySelector('#progress-fill');
+const progressLabel = document.querySelector('#progress-label');
+const play = document.querySelector('#play');
+const pause = document.querySelector('#pause');
+const seen = new Set();
+let source = null;
+
+function setProgress(value) {
+  const n = Math.max(0, Math.min(100, Number(value ?? 0)));
+  fill.style.width = `${n}%`;
+  progressLabel.textContent = `${Math.round(n)}%`;
+  document.querySelector('.progress-shell').setAttribute('aria-valuenow', String(n));
+}
+
+function addEvent(event) {
+  const id = String(event.id);
+  if (seen.has(id)) return;
+  seen.add(id);
+  const row = document.createElement('div');
+  row.className = 'event';
+  row.dataset.kind = event.kind || 'event';
+  const when = document.createElement('time');
+  when.dateTime = new Date(event.timestamp_ms).toISOString();
+  when.textContent = new Date(event.timestamp_ms).toLocaleTimeString();
+  const kind = document.createElement('span');
+  kind.className = 'event-kind';
+  kind.textContent = event.kind || 'event';
+  const message = document.createElement('span');
+  message.className = 'event-message';
+  message.textContent = event.message;
+  row.append(when, kind, message);
+  feed.prepend(row);
+  while (feed.children.length > 200) feed.lastElementChild.remove();
+}
+
+function applyState(event) {
+  processStatus.textContent = event.message || 'Waiting for the next epoch';
+  setProgress(event.progress);
+  if (event.kind !== 'connection') addEvent(event);
+}
+
+function connect() {
+  if (source) return;
+  source = new EventSource('/sse');
+  connection.classList.remove('warn');
+  connection.classList.add('live');
+  connection.querySelector('span:last-child').textContent = 'connecting';
+  play.disabled = true;
+  pause.disabled = false;
+  source.onopen = () => {
+    connection.querySelector('span:last-child').textContent = 'live';
+  };
+  source.addEventListener('audit', event => applyState(JSON.parse(event.data)));
+  source.onerror = () => {
+    connection.classList.remove('live');
+    connection.classList.add('warn');
+    connection.querySelector('span:last-child').textContent = 'reconnecting';
+  };
+}
+
+function disconnect() {
+  if (source) source.close();
+  source = null;
+  connection.classList.remove('live');
+  connection.classList.add('warn');
+  connection.querySelector('span:last-child').textContent = 'paused locally';
+  play.disabled = false;
+  pause.disabled = true;
+}
+
+play.addEventListener('click', connect);
+pause.addEventListener('click', disconnect);
+initial.feed.forEach(addEvent);
+processStatus.textContent = initial.process.message;
+setProgress(initial.process.progress);
+connect();
+"""
+
+
+@app.get("/watch")
+async def watch():
+    initial = json.dumps(
+        _watch_initial_state(), separators=(",", ":")
+    ).replace("</", "<\\/")
+    script = _WATCH_JS.replace("__INITIAL__", initial)
+    key_ok = bool((OPENROUTER_API_KEY or "").strip())
+    return HTMLResponse(render(["html",
+        ["head",
+            ["meta", {"charset": "utf-8"}],
+            ["meta", {"name": "viewport", "content": "width=device-width, initial-scale=1"}],
+            ["title", "slug — live constitution"],
+            ["style", RawContent(_WATCH_CSS)],
+        ],
+        ["body", ["main",
+            ["div.eyebrow", f"epoch {current_epoch()[0]} · constitutional audit"],
+            ["h1", "watch the process"],
+            ["section.panel",
+                ["div.status-row",
+                    ["div#process-status", PROCESS_STATE["message"]],
+                    ["div#connection-status.badge", ["span.dot"], ["span", "connecting"]],
+                ],
+                ["div.progress-shell", {
+                    "role": "progressbar", "aria-label": "Emission progress",
+                    "aria-valuemin": "0", "aria-valuemax": "100",
+                    "aria-valuenow": str(PROCESS_STATE["progress"]),
+                },
+                    ["div#progress-fill"],
+                    ["div#progress-label", f"{PROCESS_STATE['progress']}%"],
+                ],
+                ["div.controls",
+                    ["button#play", {"type": "button", "disabled": "true"}, "▶ Play live feed"],
+                    ["button#pause", {"type": "button"}, "Ⅱ Pause feed"],
+                    ["span.note", "Pause stops local updates; the constitutional process continues."],
+                ],
+            ],
+            ["section.panel",
+                ["div.status-row",
+                    ["strong", "Council readiness"],
+                    ["div.badge" + (".live" if key_ok else ".warn"),
+                        ["span.dot"],
+                        ["span", "OpenRouter configured" if key_ok else "OpenRouter key missing"],
+                    ],
+                ],
+                ["p.note",
+                    (
+                        "Pairwise council voting is ready."
+                        if key_ok else
+                        "Single-contributor epochs can finalize, but contested rankings require OPENROUTER_API_KEY."
+                    )
+                ],
+            ],
+            ["section.panel",
+                ["div.feed-head", ["h2", "event feed"], ["a", {"href": "/sse"}, "raw SSE"]],
+                ["div#audit-feed"],
+            ],
+            ["p", ["a", {"href": "/"}, "← constitution"], " · ",
+                  ["a", {"href": "/api/status"}, "status JSON"], " · ",
+                  ["a", {"href": "/api/ledger"}, "ledger"]],
+        ]],
+        ["script", {"type": "module"}, RawContent(script)],
+    ]))
+
+
 async def redeem(github_user: str, wallet_address: str):
     await store.append(Redemption(
         timestamp_ms=int(time.time() * 1000),
@@ -1386,7 +1983,7 @@ async def index(request: Request):
             ["p", "Total supply is 1.0 SLUG ownership unit. FDV is 177,600 USDC. Initial LP seed is 1,331 USDC."],
             ["p", ["a", {"href": "/login"}, "Login with GitHub to check your emissions"]],
             ["p",
-                ["a", {"href": "/sse"}, "Watch emission process live"], " | ",
+                ["a", {"href": "/watch"}, "Watch emission process live"], " | ",
                 ["a", {"href": "/api/epoch"}, "Current epoch"], " | ",
                 ["a", {"href": "/api/ledger"}, "Full ledger"], " | ",
                 ["a", {"href": "/api/halvening"}, "Jubilee countdown"],
@@ -1414,7 +2011,7 @@ async def index(request: Request):
         ["p",
             ["a", {"href": "/api/epoch"}, "Current epoch"], " | ",
             ["a", {"href": "/api/ledger"}, "Full ledger"], " | ",
-            ["a", {"href": "/sse"}, "Watch emission live"],
+            ["a", {"href": "/watch"}, "Watch emission live"],
         ],
     ])
 
diff --git a/fly.toml b/fly.toml
new file mode 100644
index 0000000000000000000000000000000000000000..1b08c7090185b1f8a17884eb86254c1e8d16ad60
--- /dev/null
+++ b/fly.toml
@@ -0,0 +1,35 @@
+app = "slug-constitution"
+primary_region = "ord"
+
+[build]
+  dockerfile = "Dockerfile"
+
+[env]
+  GENESIS_MS = "1775364391260"
+  JSONL_PATH = "/data/ledger.jsonl"
+  GIT_MIRROR_DIR = "/data/git"
+  PORT = "8080"
+
+[http_service]
+  internal_port = 8080
+  force_https = true
+  auto_stop_machines = "off"
+  auto_start_machines = true
+  min_machines_running = 1
+  processes = ["app"]
+
+  [[http_service.checks]]
+    interval = "30s"
+    timeout = "10s"
+    grace_period = "30s"
+    method = "GET"
+    path = "/api/epoch"
+
+[[mounts]]
+  source = "slug_data"
+  destination = "/data"
+
+[[vm]]
+  memory = "2gb"
+  cpu_kind = "shared"
+  cpus = 1
diff --git a/tests/integration.clj b/tests/integration.clj
index 0d34e3b237b4037a28f5e99350e8d447455665de..06b9715e63966d14311b159cbc7058952bff2fbc 100644
--- a/tests/integration.clj
+++ b/tests/integration.clj
@@ -468,14 +468,29 @@
         (assert! (= 1 (count (:history contrib-resp)))   "alice has 1 emission in history")
         (assert! (pos? (parse-double (:total_earned contrib-resp))) "total_earned > 0")
 
-        ;; 9. SSE connects and sends initial event
+        ;; 9. watch UI exposes progress, controls, readiness, and live SSE
+        (println "\nchecking /watch UI…")
+        (bind watch-html (slurp (str base-url "/watch")))
+        (assert! (str/includes? watch-html "role=\"progressbar\"")
+                 "watch page has progress bar")
+        (assert! (str/includes? watch-html "id=\"play\"")
+                 "watch page has play control")
+        (assert! (str/includes? watch-html "id=\"pause\"")
+                 "watch page has pause control")
+        (assert! (str/includes? watch-html "OpenRouter configured")
+                 "watch page reports council readiness")
+        (bind status-resp (get-json base-url "/api/status"))
+        (assert! (true? (:openrouter_configured status-resp))
+                 "status API reports OpenRouter configuration")
+
+        ;; 10. SSE connects and sends initial event
         (println "\nchecking /sse initial event…")
         (bind sse-events (read-sse-events (str base-url "/sse") 1 5000))
         (assert! (= 1 (count sse-events))             "received 1 SSE event")
         (assert! (not (str/blank? (first sse-events)))
                  "initial SSE event contains executable audit data")
 
-        ;; 10. POST /test/emit — full ranking pipeline hits mocks
+        ;; 11. POST /test/emit — full ranking pipeline hits mocks
         (println "\ntriggering /test/emit (epoch 1)…")
         (bind emit-resp (post-json! base-url "/test/emit"))
         (assert! (= "emission" (:type emit-resp))     "emit response type is emission")
@@ -503,7 +518,7 @@
         (bind rank-after (get-json base-url "/api/ranking"))
         (assert! (= 1 (:epoch rank-after))           "latest ranking is epoch 1")
 
-        ;; 11. kill and restart — prove replay determinism
+        ;; 12. kill and restart — prove replay determinism
         (println "\nkilling server for replay test…")
         (.destroyForcibly (:proc server))
         (deref server)
diff --git a/tests/test_git_discovery.py b/tests/test_git_discovery.py
index 0dd31bc42a19bc8c59842dc61f193c595c474659..5a9e167e16ad2ffb25988af85820f6f19e8910cd 100644
--- a/tests/test_git_discovery.py
+++ b/tests/test_git_discovery.py
@@ -393,7 +393,9 @@ def test_empty_epoch_records_zero_emission_without_burning_pool(
     monkeypatch.setattr(c, "store", c.JsonlStore(discovery_config / "ledger.jsonl"))
 
     async def discover(_epoch, _boundary):
-        return SimpleNamespace(commits=[], snapshot_id="empty-snapshot")
+        return SimpleNamespace(
+            observations=[], commits=[], snapshot_id="empty-snapshot"
+        )
 
     async def rank(_commits):
         return {}, []
@@ -412,7 +414,11 @@ def test_emission_distribution_sums_exactly_to_total(
     monkeypatch.setattr(c, "store", c.JsonlStore(discovery_config / "ledger.jsonl"))
 
     async def discover(_epoch, _boundary):
-        return SimpleNamespace(commits=[{"x": 1}], snapshot_id="ranked-snapshot")
+        return SimpleNamespace(
+            observations=[{"x": 1}],
+            commits=[{"x": 1}],
+            snapshot_id="ranked-snapshot",
+        )
 
     async def rank(_commits):
         return {
@@ -454,6 +460,7 @@ def test_any_council_failure_aborts_ranking(monkeypatch):
 
     monkeypatch.setattr(c, "fetch_top_models", models)
     monkeypatch.setattr(c, "llm_pairwise_compare", compare)
+    monkeypatch.setattr(c, "OPENROUTER_API_KEY", "test-key")
     commits = [
         {
             "contributor": contributor,
@@ -465,3 +472,54 @@ def test_any_council_failure_aborts_ranking(monkeypatch):
     ]
     with pytest.raises(RuntimeError, match="council model failed"):
         asyncio.run(c.rank_commits(commits))
+
+
+def test_contested_ranking_requires_openrouter_key(monkeypatch):
+    monkeypatch.setattr(c, "OPENROUTER_API_KEY", "")
+    commits = [
+        {
+            "contributor": contributor,
+            "oid": "sha1:" + char * 40,
+            "message": contributor,
+            "patch": "patch",
+        }
+        for contributor, char in [("alice", "a"), ("bob", "b")]
+    ]
+    with pytest.raises(RuntimeError, match="OPENROUTER_API_KEY"):
+        asyncio.run(c.rank_commits(commits))
+
+
+def test_watch_page_has_live_controls_progress_and_key_warning(
+    discovery_config, monkeypatch
+):
+    monkeypatch.setattr(c, "store", c.JsonlStore(discovery_config / "ledger.jsonl"))
+    monkeypatch.setattr(c, "OPENROUTER_API_KEY", "")
+    monkeypatch.setattr(c, "current_epoch", lambda: (3, 0, 1))
+    response = asyncio.run(c.watch())
+    html = response.body.decode()
+    assert 'role="progressbar"' in html
+    assert 'id="play"' in html
+    assert 'id="pause"' in html
+    assert "new EventSource('/sse')" in html
+    assert "OpenRouter key missing" in html
+
+
+def test_audit_events_are_json_sse_and_update_process_state(monkeypatch):
+    clients = []
+    history = []
+    monkeypatch.setattr(c, "SSE_CLIENTS", clients)
+    monkeypatch.setattr(c, "AUDIT_HISTORY", history)
+    queue = asyncio.Queue()
+    clients.append(queue)
+
+    async def emit():
+        event = await c.broadcast_audit(
+            "progress", "halfway", progress=50, phase="ranking"
+        )
+        return event, await queue.get()
+
+    event, wire = asyncio.run(emit())
+    assert event["progress"] == 50
+    assert event["phase"] == "ranking"
+    assert wire.startswith("event: audit\ndata: {")
+    assert '"message":"halfway"' in wire


Side B — contributor: tommy-mor
Side B — commit message:
[2fe70b0e] themes

Side B — unified diff (full patch):
diff --git a/server/src/api/auth.rs b/server/src/api/auth.rs
index 559db65de14c6157690ffbf18eca0cf65b0a5202..b3631b06153d52f88348fef927e7a024b7b85ad6 100644
--- a/server/src/api/auth.rs
+++ b/server/src/api/auth.rs
@@ -1,7 +1,7 @@
 use axum::{
     body::Body,
     extract::{Path, Query, State},
-    http::{header, HeaderMap, HeaderValue, StatusCode},
+    http::{header, HeaderMap, HeaderValue, StatusCode, Uri},
     response::{IntoResponse, Redirect, Response},
     Form, Json,
 };
@@ -17,7 +17,7 @@ use crate::{
     events::{Event, GrantAdded, TokenIssued, UserRegistered},
     html::{
         auth_complete_page, auth_signed_in_fragment, choose_username_error_fragment,
-        choose_username_page, JsBuilder,
+        choose_username_page, theme_cookie_header_from_jar, theme_from_jar, theme_next_from_uri, JsBuilder,
     },
     identity::{parse_agent, parse_username},
     reducer::ReducerState,
@@ -48,15 +48,17 @@ fn js_form_error_fragment(session: &str, error: &str) -> Response {
         .into_response()
 }
 
-fn js_signed_in_fragment(bearer: &str) -> Response {
+fn js_signed_in_fragment(bearer: &str, jar: &CookieJar) -> Response {
     let mut response = JsBuilder::new()
         .id("choose-username-form")
         .morph_inner(auth_signed_in_fragment())
         .redirect("/auth/complete")
         .into_response();
-    response
-        .headers_mut()
-        .insert(header::SET_COOKIE, session_cookie_header_value(bearer));
+    let headers = response.headers_mut();
+    headers.append(header::SET_COOKIE, session_cookie_header_value(bearer));
+    if let Some(theme) = theme_cookie_header_from_jar(jar) {
+        headers.append(header::SET_COOKIE, theme);
+    }
     response
 }
 
@@ -69,13 +71,18 @@ pub fn optional_principal(headers: &HeaderMap, jar: &CookieJar, reduced: &Reduce
     verify_token(reduced, c.value()).ok()
 }
 
-fn redirect_with_session_cookie(public_url: &str, path_and_query: &str, bearer: &str) -> Response {
-    Response::builder()
+fn redirect_with_session_cookie(public_url: &str, path_and_query: &str, bearer: &str, jar: &CookieJar) -> Response {
+    let mut res = Response::builder()
         .status(StatusCode::TEMPORARY_REDIRECT)
         .header(header::LOCATION, format!("{public_url}{path_and_query}"))
-        .header(header::SET_COOKIE, session_cookie_header_value(bearer))
         .body(Body::empty())
-        .unwrap()
+        .unwrap();
+    let headers = res.headers_mut();
+    headers.append(header::SET_COOKIE, session_cookie_header_value(bearer));
+    if let Some(theme) = theme_cookie_header_from_jar(jar) {
+        headers.append(header::SET_COOKIE, theme);
+    }
+    res
 }
 
 async fn apply_invite_redemption(state: &AppState, invite_token: &str, grantee_username: &str) -> Result<(), String> {
@@ -286,7 +293,11 @@ pub struct AuthCallbackQuery {
     pub state: String,
 }
 
-pub async fn get_auth_callback(Query(q): Query<AuthCallbackQuery>, State(state): State<AppState>) -> impl IntoResponse {
+pub async fn get_auth_callback(
+    Query(q): Query<AuthCallbackQuery>,
+    State(state): State<AppState>,
+    jar: CookieJar,
+) -> impl IntoResponse {
     let sessions = pending_sessions(&state);
     {
         let sessions_read = sessions.read().await;
@@ -365,7 +376,7 @@ pub async fn get_auth_callback(Query(q): Query<AuthCallbackQuery>, State(state):
             }
             let cookie_bearer = bearer.clone();
             s.complete = Some((username, bearer));
-            return redirect_with_session_cookie(&public_url, "/", &cookie_bearer).into_response();
+            return redirect_with_session_cookie(&public_url, "/", &cookie_bearer, &jar).into_response();
         }
     }
 
@@ -378,14 +389,20 @@ pub struct ChooseUsernameQuery {
     pub error: Option<String>,
 }
 
-pub async fn get_choose_username(Query(q): Query<ChooseUsernameQuery>, State(state): State<AppState>) -> impl IntoResponse {
+pub async fn get_choose_username(
+    Query(q): Query<ChooseUsernameQuery>,
+    State(state): State<AppState>,
+    jar: CookieJar,
+    uri: Uri,
+) -> impl IntoResponse {
     let sessions = pending_sessions(&state);
     let sessions_read = sessions.read().await;
     if !sessions_read.contains_key(&q.session) {
         return api_error(StatusCode::NOT_FOUND, "unknown session", None).into_response();
     }
     drop(sessions_read);
-    choose_username_page(&q.session, q.error.as_deref()).into_response()
+    let next = theme_next_from_uri(&uri);
+    choose_username_page(&q.session, q.error.as_deref(), theme_from_jar(&jar), &next).into_response()
 }
 
 #[derive(Debug, Deserialize)]
@@ -396,6 +413,7 @@ pub struct ChooseUsernameForm {
 
 pub async fn post_choose_username(
     State(state): State<AppState>,
+    jar: CookieJar,
     Form(form): Form<ChooseUsernameForm>,
 ) -> impl IntoResponse {
     let canon_user = match parse_username(&form.username) {
@@ -477,7 +495,7 @@ pub async fn post_choose_username(
         s.complete = Some((canon_user.clone(), bearer.clone()));
     }
 
-    js_signed_in_fragment(&bearer).into_response()
+    js_signed_in_fragment(&bearer, &jar).into_response()
 }
 
 /// Start a browser-only OAuth flow (no CLI polling). Sets session cookie on success.
@@ -569,8 +587,9 @@ pub async fn get_pending_session(
     .into_response()
 }
 
-pub async fn get_auth_complete() -> impl IntoResponse {
-    auth_complete_page()
+pub async fn get_auth_complete(jar: CookieJar, uri: Uri) -> impl IntoResponse {
+    let next = theme_next_from_uri(&uri);
+    auth_complete_page(theme_from_jar(&jar), &next).into_response()
 }
 
 pub async fn get_whoami(State(state): State<AppState>, headers: HeaderMap) -> impl IntoResponse {
diff --git a/server/src/api/helpers.rs b/server/src/api/helpers.rs
index 81e2a55fa3abb8609b4099f91a989480336e11eb..9b71491e9f9efc44a2a4beba09be8f64bd2ff2ee 100644
--- a/server/src/api/helpers.rs
+++ b/server/src/api/helpers.rs
@@ -39,6 +39,55 @@ pub fn item_path_for_api(item: &str) -> String {
     }
 }
 
+/// Same as [`item_path_for_api`], but for private rooms ontology items are prefixed with
+/// `/r/{short}/{slug}` so the URL matches the web app (`/r/…/~/…` routes).
+pub fn item_path_for_api_in_room(item: &str, room_wire: &str) -> String {
+    let room = room_wire.trim();
+    if room.is_empty() || room == "public" {
+        return item_path_for_api(item);
+    }
+    let Some((short, slug)) = room.split_once('/') else {
+        return item_path_for_api(item);
+    };
+    if short.is_empty() || slug.is_empty() {
+        return item_path_for_api(item);
+    }
+    let Some(c) = CanonicalItemUrl::parse(item) else {
+        return item_path_for_api(item);
+    };
+    let root = CanonicalItemUrl::ontology_root();
+    let item_norm = c.as_str().trim_end_matches('/');
+    let root_norm = root.as_str().trim_end_matches('/');
+    if let Some(tail) = c.tilde_tail() {
+        return if tail.is_empty() {
+            format!("https://slug.social/r/{short}/{slug}/~")
+        } else {
+            format!("https://slug.social/r/{short}/{slug}/~/{}", tail)
+        };
+    }
+    if item_norm == root_norm {
+        return format!("https://slug.social/r/{short}/{slug}/~");
+    }
+    item_path_for_api(item)
+}
+
+/// Absolute thread URL for forum JSON (`/t/…` vs `/r/…/t/…`).
+pub fn forum_thread_web_url(room_wire: &str, thread_tag: &str) -> String {
+    let room = room_wire.trim();
+    let tag = thread_tag.trim().trim_start_matches('#');
+    if room.is_empty() || room == "public" {
+        format!("https://slug.social/t/{tag}")
+    } else if let Some((short, slug)) = room.split_once('/') {
+        if short.is_empty() || slug.is_empty() {
+            format!("https://slug.social/t/{tag}")
+        } else {
+            format!("https://slug.social/r/{short}/{slug}/t/{tag}")
+        }
+    } else {
+        format!("https://slug.social/t/{tag}")
+    }
+}
+
 /// Resolve an item path as a first-class canonical path.
 pub fn resolve_item(item: &str) -> Result<String, String> {
     let canonical = canonicalize_item(item);
@@ -188,3 +237,52 @@ pub fn vote_touches_path(a: &str, b: &str, parent_canon: &str) -> bool {
     let under = |item: &str| item == parent_canon || item.starts_with(&format!("{}/", parent_canon));
     under(a) || under(b)
 }
+
+#[cfg(test)]
+mod wire_url_tests {
+    use super::{forum_thread_web_url, item_path_for_api_in_room};
+
+    #[test]
+    fn public_room_unchanged() {
+        let u = "https://slug.social/~/a/b";
+        assert_eq!(item_path_for_api_in_room(u, "public"), u);
+    }
+
+    #[test]
+    fn private_room_prefixes_ontology() {
+        assert_eq!(
+            item_path_for_api_in_room("https://slug.social/~/topic/x", "9ab12cd/my-room"),
+            "https://slug.social/r/9ab12cd/my-room/~/topic/x"
+        );
+    }
+
+    #[test]
+    fn private_room_ontology_root() {
+        assert_eq!(
+            item_path_for_api_in_room("https://slug.social/~", "9ab12cd/my-room"),
+            "https://slug.social/r/9ab12cd/my-room/~"
+        );
+        assert_eq!(
+            item_path_for_api_in_room("https://slug.social/~/", "9ab12cd/my-room"),
+            "https://slug.social/r/9ab12cd/my-room/~"
+        );
+    }
+
+    #[test]
+    fn external_url_untouched_in_private_room() {
+        let u = "https://example.com/z";
+        assert_eq!(item_path_for_api_in_room(u, "9ab12cd/my-room"), u);
+    }
+
+    #[test]
+    fn forum_web_public_vs_room() {
+        assert_eq!(
+            forum_thread_web_url("public", "debate"),
+            "https://slug.social/t/debate"
+        );
+        assert_eq!(
+            forum_thread_web_url("9ab12cd/my-room", "#debate"),
+            "https://slug.social/r/9ab12cd/my-room/t/debate"
+        );
+    }
+}
diff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs
index 31f5fcfb4eaf4df0a9cbac532dd3dedfe3611810..5b91f5836625eedbb1cd9423168046e3fb576c17 100644
--- a/server/src/api/rpc.rs
+++ b/server/src/api/rpc.rs
@@ -27,8 +27,9 @@ use crate::{
 
 use super::auth::verify_bearer_principal;
 use super::helpers::{
-    compute_connectivity_stats, is_pair_voted, item_path_for_api, now_ms, paginate_rankings,
-    parse_parent_specs, pick_random_distinct, resolve_item, vote_touches_path,
+    compute_connectivity_stats, forum_thread_web_url, is_pair_voted, item_path_for_api,
+    item_path_for_api_in_room, now_ms, paginate_rankings, parse_parent_specs, pick_random_distinct,
+    resolve_item, vote_touches_path,
 };
 use super::validate::{normalize_room_and_thread, validate_ingest_document};
 
@@ -148,6 +149,7 @@ fn compute_scope_rank_changes(
     parent: &str,
     before: &crate::scope_rank::ChildrenRankings,
     after: &crate::scope_rank::ChildrenRankings,
+    room_wire: &str,
 ) -> Option<ScopeRankChanges> {
     fn build_positions(rankings: &crate::scope_rank::ChildrenRankings) -> HashMap<String, Option<RankPosition>> {
         let mut map = HashMap::new();
@@ -182,7 +184,7 @@ fn compute_scope_rank_changes(
         };
         if changed {
             changes.push(RankChange {
-                item: item_path_for_api(&item),
+                item: item_path_for_api_in_room(&item, room_wire),
                 before: b,
                 after: a,
             });
@@ -204,7 +206,7 @@ fn compute_scope_rank_changes(
         parent: if parent.is_empty() {
             "/".to_string()
         } else {
-            item_path_for_api(parent)
+            item_path_for_api_in_room(parent, room_wire)
         },
         changes,
     })
@@ -256,6 +258,7 @@ fn build_rank_response_for_content(
     offset: usize,
     limit: Option<usize>,
     want_percent: bool,
+    room_wire: &str,
 ) -> Result<RankResponse, RpcErr> {
     let parent_owned = parent.map(|s| s.to_string());
     let specs = parse_parent_specs(parent_owned.as_ref());
@@ -299,7 +302,7 @@ fn build_rank_response_for_content(
                     .ranked
                     .into_iter()
                     .map(|r| RankRow {
-                        item: item_path_for_api(r.item.as_str()),
+                        item: item_path_for_api_in_room(r.item.as_str(), room_wire),
                         percent: if want_percent {
                             Some((r.score / max_score) * 100.0)
                         } else {
@@ -315,7 +318,7 @@ fn build_rank_response_for_content(
     let prefixed_unranked: Vec<String> = rankings
         .unranked_items
         .into_iter()
-        .map(|s| item_path_for_api(s.as_str()))
+        .map(|s| item_path_for_api_in_room(s.as_str(), room_wire))
         .collect();
 
     let (components, unranked_items) = if offset > 0 || limit.is_some() {
@@ -522,7 +525,7 @@ async fn rpc_post(
             .filter_map(|p| {
                 let before = pre_rankings.get(p)?;
                 let after = crate::scope_rank::build_children_rankings(content, p);
-                compute_scope_rank_changes(p.as_str(), before, &after)
+                compute_scope_rank_changes(p.as_str(), before, &after, &room_key)
             })
             .collect();
         if v.is_empty() { None } else { Some(v) }
@@ -530,14 +533,28 @@ async fn rpc_post(
         None
     };
 
+    let (pair_hint, rank_hint, web_url) = if room_key == "public" {
+        (
+            "npx slugsocial public garden pair".to_string(),
+            "npx slugsocial public garden rank".to_string(),
+            forum_thread_web_url("public", &thread_id),
+        )
+    } else {
+        (
+            format!("npx slugsocial private {room_key} garden pair"),
+            format!("npx slugsocial private {room_key} garden rank"),
+            forum_thread_web_url(&room_key, &thread_id),
+        )
+    };
+
     Ok(RpcResult::PostOk {
         events_appended,
         ranking_changes,
         threads: vec![format!("#{}", thread_id)],
         next: NextMoves {
-            pair: "npx slugsocial public garden pair".to_string(),
-            rank: "npx slugsocial public garden rank".to_string(),
-            web: format!("https://slug.social/t/{}", thread_id),
+            pair: pair_hint,
+            rank: rank_hint,
+            web: web_url,
         },
     })
 }
@@ -609,7 +626,7 @@ async fn rpc_check(
         raw: v.raw_text.clone(),
         principal,
         delegate,
-        room_id: room_key,
+        room_id: room_key.clone(),
         thread_tag: thread_id.clone(),
     });
 
@@ -647,7 +664,7 @@ async fn rpc_check(
                         .ranked
                         .into_iter()
                         .map(|r| RankRow {
-                            item: item_path_for_api(r.item.as_str()),
+                            item: item_path_for_api_in_room(r.item.as_str(), &room_key),
                             score: r.score,
                             percent: None,
                         })
@@ -655,25 +672,35 @@ async fn rpc_check(
                 })
                 .collect();
             CheckScopeRanking {
-                parent: item_path_for_api(parent.as_str()),
+                parent: item_path_for_api_in_room(parent.as_str(), &room_key),
                 components,
                 unranked_items: scoped
                     .unranked_items
                     .into_iter()
-                    .map(|it| item_path_for_api(it.as_str()))
+                    .map(|it| item_path_for_api_in_room(it.as_str(), &room_key))
                     .collect(),
             }
         })
         .collect();
 
+    let check_next = if room_key == "public" {
+        vec![
+            "npx slugsocial public forum post <TAG> --delegate <uuid:rig:model>".to_string(),
+            "npx slugsocial public forum list".to_string(),
+            forum_thread_web_url("public", &thread_id),
+        ]
+    } else {
+        vec![
+            format!("npx slugsocial private {room_key} forum post <TAG> --delegate <uuid:rig:model>"),
+            format!("npx slugsocial private {room_key} forum list"),
+            forum_thread_web_url(&room_key, &thread_id),
+        ]
+    };
+
     Ok(RpcResult::CheckOk {
         rankings,
         threads: vec![format!("#{}", thread_id)],
-        next: vec![
-            "npx slugsocial public forum post <TAG> --delegate <uuid:rig:model>".to_string(),
-            "npx slugsocial public forum list".to_string(),
-            format!("https://slug.social/t/{}", thread_id),
-        ],
+        next: check_next,
     })
 }
 
@@ -690,7 +717,7 @@ fn rpc_list_forum_threads(reduced: &ReducerState, room: &str) -> ThreadsResponse
         .map(|((_, tag), ts)| ThreadSummary {
             thread: format!("#{tag}"),
             last_activity_ts: ts.last_activity_ts,
-            web: format!("https://slug.social/t/{}", tag),
+            web: forum_thread_web_url(room, tag),
         })
         .collect();
     out.sort_by(|a, b| b.last_activity_ts.cmp(&a.last_activity_ts));
@@ -1031,8 +1058,8 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re
         .collect();
     let cs = compute_connectivity_stats(&content.ranking_group, &pool);
     Ok(RpcResult::Pair(PairResponse {
-        left: item_path_for_api(&left),
-        right: item_path_for_api(&right),
+        left: item_path_for_api_in_room(&left, &room),
+        right: item_path_for_api_in_room(&right, &room),
         left_body: lb,
         right_body: rb,
         threads: th,
@@ -1088,6 +1115,7 @@ pub async fn handle_rpc_batch(
                     offset.unwrap_or(0),
                     limit,
                     percent.unwrap_or(false),
+                    &room,
                 ) {
                     Ok(r) => line_ok(RpcResult::GardenRank(r)),
                     Err((e, h)) => line_err(e, h),
@@ -1109,7 +1137,7 @@ pub async fn handle_rpc_batch(
                 if !content.items.contains(&item) {
                     line_err(
                         "item not found",
-                        Some(format!("{} does not exist", item_path_for_api(&item_str))),
+                        Some(format!("{} does not exist", item_path_for_api_in_room(&item_str, &room))),
                     )
                 } else {
                     const MAX_ITEM_BODY: usize = 10_000;
@@ -1132,7 +1160,7 @@ pub async fn handle_rpc_batch(
                         .map(|s| s.iter().cloned().collect())
                         .unwrap_or_default();
                     line_ok(RpcResult::GardenItem(ItemResponse {
-                        item: item_str,
+                        item: item_path_for_api_in_room(&item_str, &room),
                         body,
                         truncated,
                         body_len,
@@ -1525,7 +1553,11 @@ pub async fn handle_rpc_batch(
                     let range = (top - bot).max(1e-12);
                     for r in items {
                         let pct = want_percent.then(|| ((r.score - bot) / range * 100.0).clamp(0.0, 100.0));
-                        ranked.push(RankRow { item: item_path_for_api(r.item.as_str()), score: r.score, percent: pct });
+                        ranked.push(RankRow {
+                            item: item_path_for_api_in_room(r.item.as_str(), &room),
+                            score: r.score,
+                            percent: pct,
+                        });
                     }
                 }
 
@@ -1542,7 +1574,7 @@ pub async fn handle_rpc_batch(
                 let page: Vec<RankRow> = ranked
                     .into_iter()
                     .chain(unranked.into_iter().map(|it| RankRow {
-                        item: item_path_for_api(&it),
+                        item: item_path_for_api_in_room(&it, &room),
                         score: 0.0,
                         percent: want_percent.then_some(0.0),
                     }))
@@ -1586,7 +1618,7 @@ pub async fn handle_rpc_batch(
                 if !content.items.contains(&item) {
                     line_err(
                         "item not found",
-                        Some(format!("{} does not exist", item_path_for_api(&item_str))),
+                        Some(format!("{} does not exist", item_path_for_api_in_room(&item_str, &room))),
                     )
                 } else {
                     let votes: Vec<VoteRow> = content
@@ -1597,8 +1629,8 @@ pub async fn handle_rpc_batch(
                                 .take(limit)
                                 .map(|v| VoteRow {
                                     ts: v.ts,
-                                    a: v.a.as_str().to_string(),
-                                    b: v.b.as_str().to_string(),
+                                    a: item_path_for_api_in_room(v.a.as_str(), &room),
+                                    b: item_path_for_api_in_room(v.b.as_str(), &room),
                                     ratio: format!("{}:{}", v.ratio_left, v.ratio_right),
                                     actor: Some(v.principal.clone()),
                                     body: v.body.clone(),
@@ -1608,7 +1640,7 @@ pub async fn handle_rpc_batch(
                         })
                         .unwrap_or_default();
                     line_ok(RpcResult::Matchup(MatchupResponse {
-                        item: item_path_for_api(&item_str),
+                        item: item_path_for_api_in_room(&item_str, &room),
                         votes,
                     }))
                 }
@@ -1635,8 +1667,8 @@ pub async fn handle_rpc_batch(
                                     if a == item_str || b == item_str {
                                         Some(VoteRow {
                                             ts: e.ts,
-                                            a: item_path_for_api(&a),
-                                            b: item_path_for_api(&b),
+                                            a: item_path_for_api_in_room(&a, &room),
+                                            b: item_path_for_api_in_room(&b, &room),
                                             ratio: format!("{}:{}", ratio_left, ratio_right),
                                             actor: reduced.ingests_by_id.get(&e.post_id).map(|ing| ing.principal.clone()),
                                             body: explanation,
@@ -1672,7 +1704,7 @@ pub async fn handle_rpc_batch(
                     }
                 }).collect();
                 line_ok(RpcResult::RankHistory(RankHistoryResponse {
-                    item: item_path_for_api(&item_str),
+                    item: item_path_for_api_in_room(&item_str, &room),
                     history,
                 }))
                 }
@@ -1691,6 +1723,10 @@ pub async fn handle_rpc_batch(
                     .map(|p| p.as_str().to_string())
                     .collect();
                 paths.sort();
+                let paths: Vec<String> = paths
+                    .into_iter()
+                    .map(|p| item_path_for_api_in_room(&p, &room))
+                    .collect();
                 line_ok(RpcResult::Leaves(LeavesResponse { paths }))
                 }
             },
@@ -1707,10 +1743,21 @@ pub async fn handle_rpc_batch(
                         let mut v: Vec<PathSummary> = roots.iter()
                             .map(|path| {
                                 let children = content.item_children.get(path.as_str()).map(|s| s.len()).unwrap_or(0);
+                                let path_label = CanonicalItemUrl::parse(path.as_str())
+                                    .and_then(|c| {
+                                        c.tilde_tail().map(|t| {
+                                            if t.is_empty() {
+                                                "~/".to_string()
+                                            } else {
+                                                format!("~/{}", t)
+                                            }
+                                        })
+                                    })
+                                    .unwrap_or_else(|| path.to_string());
                                 PathSummary {
-                                    path: format!("~/{}", path),
+                                    path: path_label,
                                     children,
-                                    web: format!("https://slug.social/~/{}", path),
+                                    web: item_path_for_api_in_room(path.as_str(), &room),
                                 }
                             }).collect();
                         v.sort_by(|a, b| a.path.cmp(&b.path));
@@ -1743,8 +1790,8 @@ pub async fn handle_rpc_batch(
                     .take(limit)
                     .map(|v| VoteRow {
                         ts: v.ts,
-                        a: v.a.as_str().to_string(),
-                        b: v.b.as_str().to_string(),
+                        a: item_path_for_api_in_room(v.a.as_str(), &room),
+                        b: item_path_for_api_in_room(v.b.as_str(), &room),
                         ratio: format!("{}:{}", v.ratio_left, v.ratio_right),
                         actor: Some(v.principal.clone()),
                         body: v.body.clone(),
diff --git a/server/src/html/auth.rs b/server/src/html/auth.rs
index d57b1c725ce3e06b1d904882b9388c3da48d85cb..5df77c76b89ed2bb11d936e1dbb804d50a0e79a1 100644
--- a/server/src/html/auth.rs
+++ b/server/src/html/auth.rs
@@ -23,7 +23,7 @@ fn form_inner(session: &str, error: Option<&str>) -> Markup {
     }
 }
 
-pub fn choose_username_page(session: &str, error: Option<&str>) -> Markup {
+pub fn choose_username_page(session: &str, error: Option<&str>, theme: &str, theme_next: &str) -> Markup {
     let body = html! {
         nav.breadcrumb {
             a href="/" { "slug.social" }
@@ -36,7 +36,7 @@ pub fn choose_username_page(session: &str, error: Option<&str>) -> Markup {
             (form_inner(session, error))
         }
     };
-    super::layout("join — slug.social", "view-auth", body, None)
+    super::layout("join — slug.social", "view-auth", body, None, theme, theme_next)
 }
 
 /// Fragment returned to the poem JS on error — replaces the form's innerHTML.
@@ -52,7 +52,7 @@ pub fn auth_signed_in_fragment() -> Markup {
     }
 }
 
-pub fn auth_complete_page() -> Markup {
+pub fn auth_complete_page(theme: &str, theme_next: &str) -> Markup {
     let body = html! {
         nav.breadcrumb {
             a href="/" { "slug.social" }
@@ -63,5 +63,5 @@ pub fn auth_complete_page() -> Markup {
         p { "Return to your terminal — your agent is polling and will collect your token automatically." }
         p.auth-hint { "You can close this tab." }
     };
-    super::layout("signed in — slug.social", "view-auth", body, None)
+    super::layout("signed in — slug.social", "view-auth", body, None, theme, theme_next)
 }
diff --git a/server/src/html/editor.rs b/server/src/html/editor.rs
index 07f6ab3b778f07f60765fa3f39060ebc5f72bc1a..ecdd226b1b17d5f11d1b79f99add5759ef918281 100644
--- a/server/src/html/editor.rs
+++ b/server/src/html/editor.rs
@@ -1,8 +1,10 @@
 use axum::{
     extract::State,
+    http::Uri,
     response::{Html, IntoResponse},
     Form,
 };
+use axum_extra::extract::cookie::CookieJar;
 use maud::{html, Markup};
 use serde::Deserialize;
 
@@ -13,7 +15,7 @@ use crate::{
     state::AppState,
 };
 
-use super::{bc_segment, layout};
+use super::{bc_segment, layout, theme_from_jar, theme_next_from_uri};
 
 fn bc_try() -> Markup {
     html! {
@@ -23,7 +25,7 @@ fn bc_try() -> Markup {
 }
 
 /// The interactive editor page — `/try`.
-pub async fn editor_page() -> impl IntoResponse {
+pub async fn editor_page(jar: CookieJar, uri: Uri) -> impl IntoResponse {
     let page = layout(
         "try — slug.social",
         "view-thread",
@@ -68,6 +70,8 @@ pub async fn editor_page() -> impl IntoResponse {
 "#)) }
         },
         None,
+        theme_from_jar(&jar),
+        &theme_next_from_uri(&uri),
     );
     Html(page.into_string())
 }
diff --git a/server/src/html/forum.rs b/server/src/html/forum.rs
index 5c5f9e2ba0e5cb1d661c113117988ec80c01deca..368b1016eb43d83e9ff39464ff6164fa9a8b558a 100644
--- a/server/src/html/forum.rs
+++ b/server/src/html/forum.rs
@@ -1,6 +1,6 @@
 use axum::{
     extract::{Path, Query, State},
-    http::{HeaderMap, StatusCode},
+    http::{HeaderMap, StatusCode, Uri},
     response::{Html, IntoResponse},
 };
 use axum_extra::extract::cookie::CookieJar;
@@ -19,7 +19,7 @@ use crate::{
 
 use super::{
     bc_segment, bc_threads, cli_panel, layout, now_ms, profile_href, recency_class,
-    render_linkified_with_embeds_in_scope, JsBuilder,
+    render_linkified_with_embeds_in_scope, theme_from_jar, theme_next_from_uri, JsBuilder,
 };
 
 #[derive(Clone)]
@@ -577,6 +577,7 @@ pub async fn home(
     State(state): State<AppState>,
     headers: HeaderMap,
     jar: CookieJar,
+    uri: Uri,
 ) -> impl IntoResponse {
     let now = now_ms();
     let reduced = state.reduced.read().await;
@@ -624,6 +625,8 @@ pub async fn home(
             (cli_panel("npx slugsocial public forum list"))
         },
         None,
+        theme_from_jar(&jar),
+        &theme_next_from_uri(&uri),
     );
     Html(page.into_string())
 }
@@ -679,6 +682,7 @@ async fn thread_view_inner(
     nav: ThreadNav,
     headers: HeaderMap,
     jar: CookieJar,
+    uri: Uri,
 ) -> impl IntoResponse {
     let tag = canonicalize_tag(&tag);
     let scope = nav.scope();
@@ -778,6 +782,8 @@ async fn thread_view_inner(
             (cli_panel(&cli))
         },
         None,
+        theme_from_jar(&jar),
+        &theme_next_from_uri(&uri),
     );
     Html(page.into_string()).into_response()
 }
@@ -789,8 +795,9 @@ pub async fn thread_view(
     Query(q): Query<ThreadViewQuery>,
     headers: HeaderMap,
     jar: CookieJar,
+    uri: Uri,
 ) -> impl IntoResponse {
-    thread_view_inner(state, tag, q, ThreadNav::public(), headers, jar).await
+    thread_view_inner(state, tag, q, ThreadNav::public(), headers, jar, uri).await
 }
 
 /// Room thread — `/r/:short/:slug/t/:tag`
@@ -800,31 +807,39 @@ pub async fn room_thread_view(
     Query(q): Query<ThreadViewQuery>,
     headers: HeaderMap,
     jar: CookieJar,
+    uri: Uri,
 ) -> impl IntoResponse {
     let room_id = format!("{room_short}/{room_slug}");
     let reduced = state.reduced.read().await;
     let user = optional_principal(&headers, &jar, &reduced);
     if !user_can_view_room(&reduced, &room_id, user.as_deref()) {
         drop(reduced);
-        return room_not_found_page().into_response();
+        return room_not_found_page(&jar, &uri).into_response();
     }
     drop(reduced);
     let Some(nav) = ThreadNav::from_room_id(&room_id) else {
         return (StatusCode::NOT_FOUND, "bad room path").into_response();
     };
-    thread_view_inner(state, tag, q, nav, headers, jar)
+    thread_view_inner(state, tag, q, nav, headers, jar, uri)
         .await
         .into_response()
 }
 
-fn room_not_found_page() -> impl IntoResponse {
+fn room_not_found_page(jar: &CookieJar, uri: &Uri) -> impl IntoResponse {
     let body = html! {
         nav class="breadcrumb" { a href="/" { "slug.social" } }
         h1 { "not found" }
         p { "The requested page could not be found." }
         p { a href="/" { "home" } }
     };
-    let page = layout("not found — slug.social", "view-thread", body, None);
+    let page = layout(
+        "not found — slug.social",
+        "view-thread",
+        body,
+        None,
+        theme_from_jar(jar),
+        &theme_next_from_uri(uri),
+    );
     (StatusCode::NOT_FOUND, Html(page.into_string()))
 }
 
@@ -834,6 +849,7 @@ pub async fn room_page(
     Path((room_short, room_slug)): Path<(String, String)>,
     headers: HeaderMap,
     jar: CookieJar,
+    uri: Uri,
 ) -> impl IntoResponse {
     let room_id = format!("{room_short}/{room_slug}");
     let now = now_ms();
@@ -845,7 +861,7 @@ pub async fn room_page(
     let user = optional_principal(&headers, &jar, &reduced);
     if !user_can_view_room(&reduced, &room_id, user.as_deref()) {
         drop(reduced);
-        return room_not_found_page().into_response();
+        return room_not_found_page(&jar, &uri).into_response();
     }
     let scope = ScopeId::Room(room_id.clone());
     let mut rows = collect_thread_rows_for_scope(&reduced, &scope, now);
@@ -902,6 +918,8 @@ pub async fn room_page(
             (cli_panel(&audit_cli))
         },
         None,
+        theme_from_jar(&jar),
+        &theme_next_from_uri(&uri),
     );
     Html(page.into_string()).into_response()
 }
@@ -943,6 +961,8 @@ async fn thread_post_view_inner(
     index_str: String,
     nav: ThreadNav,
     viewer: Option<String>,
+    jar: CookieJar,
+    uri: Uri,
 ) -> impl IntoResponse {
     let tag = canonicalize_tag(&tag);
     let index: usize = index_str.parse().unwrap_or(0);
@@ -987,6 +1007,8 @@ async fn thread_post_view_inner(
             }
         },
         None,
+        theme_from_jar(&jar),
+        &theme_next_from_uri(&uri),
     );
     Html(page.into_string()).into_response()
 }
@@ -996,11 +1018,12 @@ pub async fn thread_post_view(
     Path((tag, index_str)): Path<(String, String)>,
     headers: HeaderMap,
     jar: CookieJar,
+    uri: Uri,
 ) -> impl IntoResponse {
     let reduced = state.reduced.read().await;
     let viewer = optional_principal(&headers, &jar, &reduced);
     drop(reduced);
-    thread_post_view_inner(state, tag, index_str, ThreadNav::public(), viewer)
+    thread_post_view_inner(state, tag, index_str, ThreadNav::public(), viewer, jar, uri)
         .await
 }
 
@@ -1009,19 +1032,20 @@ pub async fn room_thread_post_view(
     Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,
     headers: HeaderMap,
     jar: CookieJar,
+    uri: Uri,
 ) -> impl IntoResponse {
     let room_id = format!("{room_short}/{room_slug}");
     let reduced = state.reduced.read().await;
     let user = optional_principal(&headers, &jar, &reduced);
     if !user_can_view_room(&reduced, &room_id, user.as_deref()) {
         drop(reduced);
-        return room_not_found_page().into_response();
+        return room_not_found_page(&jar, &uri).into_response();
     }
     drop(reduced);
     let Some(nav) = ThreadNav::from_room_id(&room_id) else {
         return (StatusCode::NOT_FOUND, "bad room path").into_response();
     };
-    thread_post_view_inner(state, tag, index_str, nav, user)
+    thread_post_view_inner(state, tag, index_str, nav, user, jar, uri)
         .await
         .into_response()
 }
@@ -1193,6 +1217,7 @@ pub async fn user_profile_page(
     Path(username): Path<String>,
     headers: HeaderMap,
     jar: CookieJar,
+    uri: Uri,
 ) -> impl IntoResponse {
     let canon = match parse_username(&username) {
         Ok(u) => u,
@@ -1270,6 +1295,8 @@ pub async fn user_profile_page(
             (cli_panel(&format!("npx slugsocial public forum list")))
         },
         None,
+        theme_from_jar(&jar),
+        &theme_next_from_uri(&uri),
     );
     Html(page.into_string()).into_response()
 }
@@ -1292,13 +1319,14 @@ pub async fn room_thread_post_expand(
     Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,
     headers: HeaderMap,
     jar: CookieJar,
+    uri: Uri,
 ) -> impl IntoResponse {
     let room_id = format!("{room_short}/{room_slug}");
     let reduced = state.reduced.read().await;
     let user = optional_principal(&headers, &jar, &reduced);
     if !user_can_view_room(&reduced, &room_id, user.as_deref()) {
         drop(reduced);
-        return room_not_found_page().into_response();
+        return room_not_found_page(&jar, &uri).into_response();
     }
     let Some(nav) = ThreadNav::from_room_id(&room_id) else {
         drop(reduced);
@@ -1328,13 +1356,14 @@ pub async fn room_thread_post_expand_deleted(
     Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,
     headers: HeaderMap,
     jar: CookieJar,
+    uri: Uri,
 ) -> impl IntoResponse {
     let room_id = format!("{room_short}/{room_slug}");
     let reduced = state.reduced.read().await;
     let user = optional_principal(&headers, &jar, &reduced);
     if !user_can_view_room(&reduced, &room_id, user.as_deref()) {
         drop(reduced);
-        return room_not_found_page().into_response();
+        return room_not_found_page(&jar, &uri).into_response();
     }
     let Some(nav) = ThreadNav::from_room_id(&room_id) else {
         drop(reduced);
@@ -1364,13 +1393,14 @@ pub async fn room_thread_post_collapse_deleted(
     Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,
     headers: HeaderMap,
     jar: CookieJar,
+    uri: Uri,
 ) -> impl IntoResponse {
     let room_id = format!("{room_short}/{room_slug}");
     let reduced = state.reduced.read().await;
     let user = optional_principal(&headers, &jar, &reduced);
     if !user_can_view_room(&reduced, &room_id, user.as_deref()) {
         drop(reduced);
-        return room_not_found_page().into_response();
+        return room_not_found_page(&jar, &uri).into_response();
     }
     let Some(nav) = ThreadNav::from_room_id(&room_id) else {
         drop(reduced);
diff --git a/server/src/html/garden.rs b/server/src/html/garden.rs
index e08f068ae04f5a2542ec2c43c240f931f87146bf..9b4789a79c3e293cbfc5f033a0eac8650320d94d 100644
--- a/server/src/html/garden.rs
+++ b/server/src/html/garden.rs
@@ -1,6 +1,6 @@
 use axum::{
     extract::{Path, State},
-    http::{HeaderMap, StatusCode},
+    http::{HeaderMap, StatusCode, Uri},
     response::{Html, IntoResponse},
 };
 use axum_extra::extract::cookie::CookieJar;
@@ -20,7 +20,8 @@ use crate::{
 
 use super::{
     bc_path, bc_segment, cli_panel, layout, now_ms, ratio_pct,
-    render_linkified_with_embeds_in_scope, breadcrumb_path::OntologyPath,
+    render_linkified_with_embeds_in_scope, theme_from_jar, theme_next_from_uri,
+    breadcrumb_path::OntologyPath,
     forum::ThreadNav,
 };
 
@@ -59,14 +60,21 @@ fn scoped_bc_path(path: &OntologyPath, nav: &ThreadNav) -> maud::Markup {
     }
 }
 
-fn room_not_found_page() -> impl IntoResponse {
+fn room_not_found_page(jar: &CookieJar, uri: &Uri) -> impl IntoResponse {
     let body = html! {
         nav class="breadcrumb" { a href="/" { "slug.social" } }
         h1 { "not found" }
         p { "The requested page could not be found." }
         p { a href="/" { "home" } }
     };
-    let page = layout("not found — slug.social", "view-thread", body, None);
+    let page = layout(
+        "not found — slug.social",
+        "view-thread",
+        body,
+        None,
+        theme_from_jar(jar),
+        &theme_next_from_uri(uri),
+    );
     (StatusCode::NOT_FOUND, Html(page.into_string()))
 }
 
@@ -81,7 +89,11 @@ fn user_can_view_room(reduced: &ReducerState, room_id: &str, username: Option<&s
 }
 
 /// Ontology index — root-level paths. Private (UUID) roots are excluded.
-pub async fn garden_index(State(state): State<AppState>) -> impl IntoResponse {
+pub async fn garden_index(
+    State(state): State<AppState>,
+    jar: CookieJar,
+    uri: Uri,
+) -> impl IntoResponse {
     let nav = ThreadNav::public();
     let child_rankings = {
         let reduced = state.reduced.read().await;
@@ -130,6 +142,8 @@ pub async fn garden_index(State(state): State<AppState>) -> impl IntoResponse {
             (cli_panel("npx slugsocial garden tree"))
         },
         None,
+        theme_from_jar(&jar),
+        &theme_next_from_uri(&uri),
     );
     Html(page.into_string())
 }
@@ -138,9 +152,11 @@ pub async fn garden_index(State(state): State<AppState>) -> impl IntoResponse {
 pub async fn ontology_path(
     State(state): State<AppState>,
     Path(path): Path<String>,
+    jar: CookieJar,
+    uri: Uri,
 ) -> impl IntoResponse {
     let path = OntologyPath::from_input(&path);
-    render_scope_view(state, path, ThreadNav::public()).await
+    render_scope_view(state, path, ThreadNav::public(), jar, uri).await
 }
 
 pub async fn room_garden_index(
@@ -148,19 +164,20 @@ pub async fn room_garden_index(
     Path((room_short, room_slug)): Path<(String, String)>,
     headers: HeaderMap,
     jar: CookieJar,
+    uri: Uri,
 ) -> impl IntoResponse {
     let room_id = format!("{room_short}/{room_slug}");
     let reduced = state.reduced.read().await;
     let user = optional_principal(&headers, &jar, &reduced);
     if !user_can_view_room(&reduced, &room_id, user.as_deref()) {
         drop(reduced);
-        return room_not_found_page().into_response();
+        return room_not_found_page(&jar, &uri).into_response();
     }
     drop(reduced);
     let Some(nav) = ThreadNav::from_room_id(&room_id) else {
         return (StatusCode::NOT_FOUND, "bad room path").into_response();
     };
-    render_scope_view(state, OntologyPath::root(), nav).await
+    render_scope_view(state, OntologyPath::root(), nav, jar, uri).await
 }
 
 pub async fn room_ontology_path(
@@ -168,20 +185,21 @@ pub async fn room_ontology_path(
     Path((room_short, room_slug, path)): Path<(String, String, String)>,
     headers: HeaderMap,
     jar: CookieJar,
+    uri: Uri,
 ) -> impl IntoResponse {
     let room_id = format!("{room_short}/{room_slug}");
     let reduced = state.reduced.read().await;
     let user = optional_principal(&headers, &jar, &reduced);
     if !user_can_view_room(&reduced, &room_id, user.as_deref()) {
         drop(reduced);
-        return room_not_found_page().into_response();
+        return room_not_found_page(&jar, &uri).into_response();
     }
     drop(reduced);
     let Some(nav) = ThreadNav::from_room_id(&room_id) else {
         return (StatusCode::NOT_FOUND, "bad room path").into_response();
     };
     let path = OntologyPath::from_input(&path);
-    render_scope_view(state, path, nav).await
+    render_scope_view(state, path, nav, jar, uri).await
 }
 
 #[derive(Debug, Clone)]
@@ -375,6 +393,8 @@ async fn render_scope_view(
     state: AppState,
     path: OntologyPath,
     nav: ThreadNav,
+    jar: CookieJar,
+    uri: Uri,
 ) -> axum::response::Response {
     let scope = nav.scope();
     let model = {
@@ -525,6 +545,8 @@ async fn render_scope_view(
             (cli_panel(&cli))
         },
         None,
+        theme_from_jar(&jar),
+        &theme_next_from_uri(&uri),
     );
 
     Html(page.into_string()).into_response()
diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs
index a8fd73433d120b07351dd027faf0b25f8f101321..53041a0cf0b30e6f20749c92ecc15a4e9ac56e09 100644
--- a/server/src/html/mod.rs
+++ b/server/src/html/mod.rs
@@ -1,10 +1,13 @@
 use axum::{
     body::Body,
     extract::Path,
-    http::{header, StatusCode},
+    http::{header, HeaderValue, StatusCode, Uri},
     response::{IntoResponse, Response},
+    Form,
 };
+use axum_extra::extract::cookie::CookieJar;
 use maud::{html, Markup, DOCTYPE};
+use serde::Deserialize;
 use std::collections::HashSet;
 
 mod auth;
@@ -33,6 +36,75 @@ pub(crate) fn profile_href(username: &str) -> String {
     format!("/u/{username}")
 }
 
+/// Cookie name for UI theme (must match document.cookie migration in [`layout`]).
+pub const SLUG_THEME_COOKIE: &str = "slug-theme";
+
+/// Normalize a requested theme id to a known stylesheet key.
+pub fn normalize_theme(raw: &str) -> &'static str {
+    match raw {
+        "retro" => "retro",
+        "retro_craft" => "retro_craft",
+        _ => "default",
+    }
+}
+
+/// Resolved theme for rendering and cookie re-issue.
+pub fn theme_from_jar(jar: &CookieJar) -> &'static str {
+    jar.get(SLUG_THEME_COOKIE)
+        .map(|c| normalize_theme(c.value()))
+        .unwrap_or("default")
+}
+
+/// `Path` + optional `?query` for round-tripping after `POST /theme`.
+pub fn theme_next_from_uri(uri: &Uri) -> String {
+    uri.path_and_query()
+        .map(|pq| pq.as_str().to_string())
+        .filter(|s| !s.is_empty())
+        .unwrap_or_else(|| "/".to_string())
+}
+
+/// `Set-Cookie` for a validated theme (ASCII cookie value).
+pub fn theme_cookie_header_value(theme: &str) -> HeaderValue {
+    let t = normalize_theme(theme);
+    let s = format!("{SLUG_THEME_COOKIE}={t}; Path=/; SameSite=Lax; Max-Age=31536000");
+    HeaderValue::from_str(&s).expect("theme cookie must be ASCII")
+}
+
+/// Re-issue theme cookie on responses that also set `slug_session`, so login does not drop theme.
+pub fn theme_cookie_header_from_jar(jar: &CookieJar) -> Option<HeaderValue> {
+    let c = jar.get(SLUG_THEME_COOKIE)?;
+    Some(theme_cookie_header_value(c.value()))
+}
+
+fn sanitize_theme_next(next: Option<&str>) -> String {
+    let s = next.unwrap_or("/").trim();
+    if s.starts_with('/') && !s.starts_with("//") && s.len() < 8192 {
+        s.to_string()
+    } else {
+        "/".to_string()
+    }
+}
+
+#[derive(Debug, Deserialize)]
+pub struct ThemeForm {
+    theme: String,
+    next: Option<String>,
+}
+
+/// `POST /theme` — set theme cookie and redirect back (full navigation, no fetch).
+pub async fn post_theme(Form(form): Form<ThemeForm>) -> impl IntoResponse {
+    let theme = normalize_theme(&form.theme);
+    let next = sanitize_theme_next(form.next.as_deref());
+    let loc = HeaderValue::try_from(next.as_str())
+        .unwrap_or_else(|_| HeaderValue::from_static("/"));
+    Response::builder()
+        .status(StatusCode::SEE_OTHER)
+        .header(header::LOCATION, loc)
+        .header(header::SET_COOKIE, theme_cookie_header_value(theme))
+        .body(Body::empty())
+        .expect("theme redirect response")
+}
+
 // Embed CSS files at compile time
 const THEME_DEFAULT_CSS: &str = include_str!("../../static/theme_default.css");
 const THEME_RETRO_CSS: &str = include_str!("../../static/theme_retro.css");
@@ -173,7 +245,9 @@ impl JsQueryBuilder {
     }
 }
 
-pub(super) fn layout(title: &str, view: &str, body: Markup, views: Option<u64>) -> Markup {
+pub(super) fn layout(title: &str, view: &str, body: Markup, views: Option<u64>, theme: &str, theme_next: &str) -> Markup {
+    let theme = normalize_theme(theme);
+    let css_href = format!("/static/theme_{theme}.css");
     html! {
         (DOCTYPE)
         html {
@@ -181,7 +255,20 @@ pub(super) fn layout(title: &str, view: &str, body: Markup, views: Option<u64>)
                 meta charset="utf-8";
                 meta name="viewport" content="width=device-width, initial-scale=1";
                 title { (title) }
-                link rel="stylesheet" href="/static/theme_default.css" id="theme-stylesheet";
+                script { (maud::PreEscaped(r#"
+(function() {
+  try {
+    var ls = localStorage.getItem('slug-theme');
+    if (!ls) return;
+    var m = document.cookie.match(/(?:^|;\s*)slug-theme=([^;]+)/);
+    var c = m ? decodeURIComponent(m[1].replace(/\+/g, ' ')) : '';
+    if (ls === c) { localStorage.removeItem('slug-theme'); return; }
+    document.cookie = 'slug-theme=' + encodeURIComponent(ls) + '; Path=/; SameSite=Lax; Max-Age=31536000';
+    location.reload();
+  } catch (e) {}
+})();
+"#)) }
+                link rel="stylesheet" href=(css_href) id="theme-stylesheet";
                 script src="https://unpkg.com/idiomorph@0.3.0/dist/idiomorph.min.js" {}
             }
             body class=(view) {
@@ -196,32 +283,21 @@ pub(super) fn layout(title: &str, view: &str, body: Markup, views: Option<u64>)
                         input type="range" id="spread-slider" min="0" max="1" step="0.05" value="1";
                     }
                     a id="search-btn" href="/search" { "search" }
-                    div id="theme-switcher" { "theme" }
+                    form id="slug-theme-form" method="post" action="/theme" {
+                        input type="hidden" name="next" value=(theme_next);
+                        select id="theme-select" name="theme" onchange="this.form.submit()" aria-label="Theme" {
+                            @for (val, label) in [("default", "default"), ("retro", "retro"), ("retro_craft", "craft")] {
+                                @if theme == val {
+                                    option value=(val) selected { (label) }
+                                } @else {
+                                    option value=(val) { (label) }
+                                }
+                            }
+                        }
+                    }
                 }
 script { (maud::PreEscaped(r#"
                     (function() {
-                        // Theme switching
-                        const themes = ['default', 'retro', 'retro_craft'];
-                        const themeLabel = { default: 'default', retro: 'retro', retro_craft: 'craft' };
-                        const storedTheme = localStorage.getItem('slug-theme') || 'default';
-                        const switcher = document.getElementById('theme-switcher');
-                        const stylesheet = document.getElementById('theme-stylesheet');
-
-                        function setTheme(name) {
-                            stylesheet.href = `/static/theme_${name}.css`;
-                            localStorage.setItem('slug-theme', name);
-                            switcher.textContent = themeLabel[name] || name;
-                            setTimeout(() => setSpread(parseFloat(slider.value)), 50);
-                        }
-
-                        setTheme(storedTheme);
-
-                        switcher.addEventListener('click', function() {
-                            const current = themes.indexOf(localStorage.getItem('slug-theme') || 'default');
-                            const next = (current + 1) % themes.length;
-                            setTheme(themes[next]);
-                        });
-
                         // Spread control
                         const slider = document.getElementById('spread-slider');
                         const storedSpread = localStorage.getItem('slug-spread');
@@ -245,6 +321,7 @@ script { (maud::PreEscaped(r#"
                             const f = e.target;
                             if (!f || f.tagName !== 'FORM') return;
                             if ((f.method || 'get').toLowerCase() !== 'post') return;
+                            if (f.id === 'slug-theme-form') return;
                             e.preventDefault();
                             const resp = await fetch(f.action, {
                                 method: 'POST',
diff --git a/server/src/html/search.rs b/server/src/html/search.rs
index 0871ddb7a87e3153e2cb6c1f827b46de2c9f0f3b..28ceaa53c3fcac6777311535e95fb771b19438f5 100644
--- a/server/src/html/search.rs
+++ b/server/src/html/search.rs
@@ -1,6 +1,6 @@
 use axum::{
     extract::{Query, State},
-    http::HeaderMap,
+    http::{HeaderMap, Uri},
     response::{Html, IntoResponse},
 };
 use axum_extra::extract::cookie::CookieJar;
@@ -15,7 +15,7 @@ use crate::{
     timeago,
 };
 
-use super::{authorship_address, bc_segment, cli_panel, layout, now_ms};
+use super::{authorship_address, bc_segment, cli_panel, layout, now_ms, theme_from_jar, theme_next_from_uri};
 
 /// Escape HTML special chars for safe injection.
 fn escape_html(s: &str) -> String {
@@ -396,6 +396,7 @@ pub async fn search_page(
     Query(params): Query<SearchQuery>,
     headers: HeaderMap,
     jar: CookieJar,
+    uri: Uri,
 ) -> impl IntoResponse {
     let query = params.q.clone().unwrap_or_default();
     let results = if query.len() >= 2 {
@@ -420,6 +421,8 @@ pub async fn search_page(
             (cli_panel("npx slugsocial search <query>"))
         },
         None,
+        theme_from_jar(&jar),
+        &theme_next_from_uri(&uri),
     );
     Html(page.into_string())
 }
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 43b63293c2a62b9700948767c618cb0614ddf6d9..b9d4b79791ba8dd3a3c26ff777943a2548092de5 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -33,6 +33,7 @@ pub fn create_app(state: AppState) -> Router {
         .route("/post", post(api::post_web_ingest))
         .route("/post/redact", post(api::post_web_redact))
         .route("/post/check", post(api::check_web_ingest))
+        .route("/theme", post(crate::html::post_theme))
         .route("/sse", get(api::get_html_stream))
         .route("/stream", get(api::get_stream))
         .route("/search", get(crate::html::search_page))
diff --git a/server/src/path_types.rs b/server/src/path_types.rs
index 997597f6659c1ba2092bc5348e393bf7a8fa7ae0..cad58cac7da948f92d6ea2a5587d917ab21d57ea 100644
--- a/server/src/path_types.rs
+++ b/server/src/path_types.rs
@@ -8,6 +8,12 @@
 //!
 //! This module adds lightweight newtypes so code can be explicit about what it
 //! expects without changing core storage formats.
+//!
+//! **Storage vs wire:** [`CanonicalItemUrl`] values are shared across scopes
+//! (`https://slug.social/~/…`); which [`crate::reducer::ContentState`] they live in
+//! is determined by scope, not by embedding the room id in the string. For JSON/RPC
+//! and browser links in a private room, use [`crate::api::helpers::item_path_for_api_in_room`]
+//! so ontology items become `https://slug.social/r/{short}/{slug}/~/…`.
 
 use std::borrow::Borrow;
 use std::fmt;
diff --git a/server/static/theme_default.css b/server/static/theme_default.css
index 2b06b12f3e77c9ed305272fe3ab47a8ad08504df..5e6304bcc36caed8aeda913fd241fc8fb9cf6d25 100644
--- a/server/static/theme_default.css
+++ b/server/static/theme_default.css
@@ -678,7 +678,10 @@ details > summary::-webkit-details-marker { display: none; }
   gap: 6px;
 }
 #spread-slider { accent-color: var(--ui); width: 80px; }
-#theme-switcher {
+#slug-theme-form {
+  display: contents;
+}
+#theme-select {
   background: var(--g4);
   border: var(--bv) solid;
   border-color: var(--hi) var(--lo) var(--lo) var(--hi);
@@ -688,8 +691,8 @@ details > summary::-webkit-details-marker { display: none; }
   padding: 2px 10px;
   user-select: none;
 }
-#theme-switcher:hover  { color: var(--signal); }
-#theme-switcher:active {
+#theme-select:hover  { color: var(--signal); }
+#theme-select:active {
   border-color: var(--lo) var(--hi) var(--hi) var(--lo);
   transform: translate(1px, 1px);
 }
diff --git a/server/static/theme_retro_craft.css b/server/static/theme_retro_craft.css
index 508222443a3bb2f16d3034a07af53a7df37a0314..3fde7e2b77fa4e4f46418927eb0fb0e5cd195c75 100644
--- a/server/static/theme_retro_craft.css
+++ b/server/static/theme_retro_craft.css
@@ -35,7 +35,6 @@ h1, h2, h3 {
   font-weight: 600;
   letter-spacing: 0.14em;
   margin: 1.5rem 0 0.5rem;
-  text-transform: uppercase;
 }
 
 a {
@@ -354,7 +353,10 @@ div.cli-panel {
   accent-color: var(--accent);
   width: 72px;
 }
-#theme-switcher,
+#slug-theme-form {
+  display: contents;
+}
+#theme-select,
 #search-btn,
 a#src-link {
   border: 1px solid var(--line);
@@ -365,7 +367,7 @@ a#src-link {
   padding: 0.25rem 0.6rem;
   text-decoration: none;
 }
-#theme-switcher:hover,
+#theme-select:hover,
 #search-btn:hover,
 a#src-link:hover {
   border-color: var(--accent);