diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn
index 1f0f82ccd..af4647fb4 100644
--- a/.clj-kondo/config.edn
+++ b/.clj-kondo/config.edn
@@ -1,8 +1,47 @@
-{:output {:exclude-files [".*resources/public/js/compiled.*"
+{;; Prevent analysis of compiled CLJS output -- source copies live there
+ ;; and cause "redefined var" when IDE analyzes both src/ and compiled/.
+ :exclude-files "resources/public/js/compiled"
+ :output {:exclude-files [".*resources/public/js/compiled.*"
                           ".*docker/scripts/.*"]}
- :linters {:shadowed-fn-param {:level :off}
-           :shadowed-var {:level :off}
+ :linters {;; Enabled at :warning so NEW accidental shadows are caught.
+           ;; :exclude covers established patterns: core vars used as param names
+           ;; (name, key, type, etc.) and domain terms used as both defs and params
+           ;; (level, ability, armor, etc.) across modifier/option/character code.
+           :shadowed-fn-param {:level :warning
+                               :exclude [source character]}
+           :shadowed-var {:level :warning
+                          :exclude [;; clojure.core / cljs.core vars used as parameter names
+                                    name key type val num first last next ns fn comp
+                                    int char chars bytes str time atom ref set class
+                                    list map range min max mod count filter flatten
+                                    keys vals identity ancestors comparator cond
+                                    list? sequential? set?
+                                    ;; re-frame.core/path — used as param in route handlers
+                                    path
+                                    ;; Domain terms used as both ns-level defs and fn params
+                                    ;; in modifiers.cljc, options.cljc, character.cljc, etc.
+                                    level levels level-key ability abilities armor weapon weapons
+                                    action alignment cls equipment size subclass-name
+                                    skill-options skill-expertise tool-options weapon-proficiency-options
+                                    spellcasting-template feat-selections cantrip-selections
+                                    sorted-items selected-plugin-options built-template
+                                    ;; One-off project-var shadows — established code patterns
+                                    ;; where a fn/let binding intentionally shadows its ns def
+                                    actual-path all-armor-inventory app-header
+                                    available-selections builder-page character-summary
+                                    children critical-hit-values custom-equipment entity
+                                    first-class? following-usernames i instant item-adder
+                                    languages levels-selection message mod-cfg mod-key
+                                    name-result parties party-owner prepared-spells-by-class
+                                    prepares-spells query-map search-results source speed
+                                    spells-known style view]}
+           ;; 213 warnings. Many namespaces are required purely for side effects:
+           ;; re-frame event/sub registrations, modifier macros, spec loading.
+           ;; Remaining are test cleanup debt (genuinely unused test requires).
            :unused-namespace {:level :off}
+           ;; 567 warnings. Destructured map bindings used for documentation or
+           ;; structure (e.g. {:keys [name level key]} where only some are used
+           ;; in the body). Renaming to _ would lose semantic readability.
            :unused-binding {:level :off}
            :missing-else-branch {:level :warning}
            :clojure-lsp/unused-public-var
@@ -14,7 +53,7 @@
                       orcpub.dnd.e5.options/spell-tags
                       orcpub.dnd.e5.options/potent-spellcasting
                       ;; Live callers exist but LSP can't trace them
-                      orcpub.common/dissoc-in                ; events.cljs
+                      orcpub.common/dissoc-in                ; events.cljs:2976
                       orcpub.dnd.e5.character/add-ability-namespaces ; test
                       ;; Cross-file refs: used in template.cljc but defined in spell_subs.cljs
                       orcpub.dnd.e5.spell-subs/sunlight-sensitivity
@@ -22,9 +61,9 @@
             ;; re-frame event handlers are dispatched via keyword, not var reference.
             ;; LSP can't connect reg-event-db registration to (dispatch [:keyword]).
             :exclude-when-defined-by #{re-frame.core/reg-event-db
-                                        re-frame.core/reg-event-fx
-                                        re-frame.core/reg-sub
-                                        re-frame.core/reg-sub-raw}}
+                                       re-frame.core/reg-event-fx
+                                       re-frame.core/reg-sub
+                                       re-frame.core/reg-sub-raw}}
            ;; garden.selectors vars are generated by macros (defselector,
            ;; defpseudoclass, gen-pseudo-class-defs, etc.) at compile time.
            ;; clj-kondo can't resolve macro-generated vars statically and
@@ -34,8 +73,9 @@
                       ;; errors.cljc macros behind #?(:clj) reader conditional —
                       ;; one kondo instance can't resolve them
                       orcpub.errors]}
-           ;; read-string is a valid cljs.core symbol that clj-kondo
-           ;; doesn't recognize in its ClojureScript analysis data.
+           ;; Macros that introduce bindings kondo can't resolve statically.
+           ;; Each (ns/macro) entry suppresses unresolved symbols inside that
+           ;; macro's body. Modifier macros use defmacro with gensym bindings.
            :unresolved-symbol
            {:exclude
             [read-string
@@ -66,7 +106,16 @@
              (orcpub.entity-spec/make-entity)
              (orcpub.routes-test/with-conn)
              (orcpub.routes.folder-test/with-conn)
+             (orcpub.email-change-test/with-conn)
              (user/with-db)]}}
+ ;; native/cljs and web/cljs are separate source roots; kondo doesn't know
+ ;; about them so ns names appear to mismatch their file paths.
+ :config-in-ns {orcpub.core {:linters {:namespace-name-mismatch {:level :off}}}
+                orcpub.views {:linters {:namespace-name-mismatch {:level :off}}}
+                orcpub.dnd.e5.native-views {:linters {:namespace-name-mismatch {:level :off}}}}
+ ;; with-conn macros use bare symbol bindings — handled via
+ ;; :unresolved-symbol :exclude above (macroexpand hooks can't find
+ ;; the test namespaces and produce noisy warnings).
  :lint-as {reagent.core/with-let clojure.core/let
            hiccup.def/defhtml clojure.core/defn
            user/with-db clojure.core/let
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 000000000..b14ae8418
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,30 @@
+FROM clojure:temurin-21-lein
+
+# Install useful dev tools (including unzip for Datomic Pro)
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends rlwrap git curl tmux make git-lfs lsof iproute2 unzip rsync maven \
+    libfreetype6 fontconfig fonts-dejavu-core fonts-liberation libxrender1 libxext6 libxi6 libxrandr2 \
+ && rm -rf /var/lib/apt/lists/*
+
+# Ensure git-lfs is configured system-wide so LFS files are available in Codespaces
+RUN git lfs install --system || true
+
+# Install Leiningen so `lein` is available for LSP and project tasks
+RUN curl -fsSL https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein -o /usr/local/bin/lein \
+    && chmod +x /usr/local/bin/lein \
+    && /usr/local/bin/lein --version || true
+
+WORKDIR /workspace
+
+# Copy project source (lib/ includes pdfbox vendor deps from host)
+COPY . /workspace
+
+# Pre-cache Datomic Pro zip so post-create.sh skips the download.
+# The actual install (extract, flatten, maven-install) is done by post-create.sh
+# because the volume mount overwrites /workspace during container creation.
+ARG DATOMIC_VERSION=1.0.7482
+RUN curl --fail -L -o "/tmp/datomic-pro-${DATOMIC_VERSION}.zip" \
+      "https://datomic-pro-downloads.s3.amazonaws.com/${DATOMIC_VERSION}/datomic-pro-${DATOMIC_VERSION}.zip"
+
+# Default shell to bash for VS Code terminal
+SHELL ["/bin/bash", "-c"]
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 000000000..d1194a929
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,45 @@
+{
+  "name": "ClojureScript Lein-Figwheel Dev",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "context": ".."
+  },
+  "features": {
+    "ghcr.io/devcontainers/features/sshd:1": {
+      "version": "latest"
+    }
+  },
+  "forwardPorts": [8890, 3449, 4334],
+  "portsAttributes": {
+    "8890": {
+      "label": "Backend Server",
+      "onAutoForward": "notify"
+    },
+    "3449": {
+      "label": "Figwheel",
+      "onAutoForward": "silent"
+    },
+    "4334": {
+      "label": "Datomic",
+      "onAutoForward": "silent"
+    }
+  },
+  "postCreateCommand": [
+    "bash",
+    "./.devcontainer/post-create.sh"
+  ],
+  "containerEnv": {
+    "POST_CREATE_VERBOSE": "1",
+    "DATOMIC_VERSION": "1.0.7482",
+    "DATOMIC_URL": "datomic:dev://localhost:4334/orcpub"
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "betterthantomorrow.calva",
+        "borkdude.clj-kondo"
+      ],
+      "settings": {}
+    }
+  }
+}
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
new file mode 100755
index 000000000..832fb00a9
--- /dev/null
+++ b/.devcontainer/post-create.sh
@@ -0,0 +1,114 @@
+#!/usr/bin/env bash
+#
+# Datomic Pro install script for devcontainer
+#
+# 1. Always remove lib/com/datomic/datomic-{type}/<version> if it exists
+# 2. Unzip the Datomic zip (from /lib or /tmp, download if missing) into target dir
+# 3. Flatten top-level subdir if present (some zips nest contents)
+# 4. Run vendor maven-install from bin/
+#
+# This script does NOT cherry-pick, rename, or check for specific files before extraction.
+# All contents of the zip are placed in the target directory, overwriting any previous install.
+#
+
+set -euo pipefail
+
+# Source .env from repo root if present (authoritative config)
+REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+if [ -f "$REPO_ROOT/.env" ]; then
+  set -a
+  # shellcheck disable=SC1090
+  . "$REPO_ROOT/.env"
+  set +a
+fi
+
+# Redirect all output to persistent logs for visibility during Codespace creation
+LOG="/tmp/orcpub-post-create.log"
+WORKSPACE_LOG="$REPO_ROOT/.devcontainer/post-create.log"
+# Ensure workspace log exists and is writable (best-effort)
+mkdir -p "$(dirname "$WORKSPACE_LOG")" 2>/dev/null || true
+touch "$WORKSPACE_LOG" 2>/dev/null || true
+# Tee to both /tmp and workspace log so it's inspectable in Codespaces UI
+exec > >(tee -a "$LOG" "$WORKSPACE_LOG") 2>&1
+
+# Optional verbose tracing: set POST_CREATE_VERBOSE=1 to enable `set -x`
+if [ "${POST_CREATE_VERBOSE:-0}" = "1" ]; then
+  echo "[POST-CREATE] Verbose tracing enabled"
+  set -x
+fi
+
+# Timestamp helper
+ts() { date -u +"%Y-%m-%dT%H:%M:%SZ"; }
+log() { echo "$(ts) [POST-CREATE] $*"; }
+
+log "Starting postCreateCommand... (logging to $LOG and $WORKSPACE_LOG)"
+
+# Configuration with defaults
+DATOMIC_TYPE="${DATOMIC_TYPE:-pro}"
+RAW_DATOMIC_VERSION="${DATOMIC_VERSION:-1.0.7482}"
+# basename in case a path was provided (e.g., /tmp/datomic-pro-1.0.7482.zip)
+RAW_DATOMIC_VERSION="$(basename "$RAW_DATOMIC_VERSION")"
+# strip leading prefix and trailing .zip if present
+DATOMIC_VERSION="${RAW_DATOMIC_VERSION#datomic-${DATOMIC_TYPE}-}"
+DATOMIC_VERSION="${DATOMIC_VERSION%.zip}"
+
+log "Using DATOMIC_TYPE=$DATOMIC_TYPE, DATOMIC_VERSION=$DATOMIC_VERSION"
+
+# Paths
+TARGET_DIR="lib/com/datomic/datomic-${DATOMIC_TYPE}/${DATOMIC_VERSION}"
+ZIP_NAME="datomic-${DATOMIC_TYPE}-${DATOMIC_VERSION}.zip"
+DOWNLOAD_URL="https://datomic-pro-downloads.s3.amazonaws.com/${DATOMIC_VERSION}/${ZIP_NAME}"
+
+# Clean and prepare target directory
+if [ -d "${TARGET_DIR}" ]; then
+  log "Removing existing installation at ${TARGET_DIR}"
+  rm -rf "${TARGET_DIR}"
+fi
+mkdir -p "${TARGET_DIR}"
+
+# Find Datomic zip in /lib/ or /tmp/, download if missing
+ZIP_PATH="/lib/${ZIP_NAME}"
+if [ ! -f "$ZIP_PATH" ]; then
+  ZIP_PATH="/tmp/${ZIP_NAME}"
+  if [ ! -f "$ZIP_PATH" ]; then
+    log "Downloading Datomic from $DOWNLOAD_URL"
+    curl --fail --location --progress-bar -o "$ZIP_PATH" "$DOWNLOAD_URL"
+  fi
+fi
+
+# Verify zip integrity (handles corrupt/incomplete downloads)
+if ! unzip -t "$ZIP_PATH" >/dev/null 2>&1; then
+  log "Corrupt or incomplete zip detected, removing and re-downloading..."
+  rm -f "$ZIP_PATH"
+  curl --fail --location --progress-bar -o "$ZIP_PATH" "$DOWNLOAD_URL"
+
+  # Verify the re-download
+  if ! unzip -t "$ZIP_PATH" >/dev/null 2>&1; then
+    log "ERROR: Re-downloaded zip is still corrupt. Check network connection or URL."
+    log "URL: $DOWNLOAD_URL"
+    exit 1
+  fi
+fi
+
+# Unzip Datomic distribution into target dir
+log "Extracting $ZIP_PATH to $TARGET_DIR"
+unzip -q "$ZIP_PATH" -d "${TARGET_DIR}"
+
+# Flatten if needed (some zips nest contents in a subdirectory)
+TOP_SUBDIR=$(find "${TARGET_DIR}" -mindepth 1 -maxdepth 1 -type d -print -quit || true)
+if [ -n "${TOP_SUBDIR}" ] && [ -z "$(find "${TARGET_DIR}" -maxdepth 1 -type f -print -quit)" ]; then
+  log "Flattening nested directory structure"
+  mv "${TOP_SUBDIR}"/* "${TARGET_DIR}/"
+  rmdir "${TOP_SUBDIR}"
+fi
+
+# Run vendor maven-install
+if [ -x "${TARGET_DIR}/bin/maven-install" ]; then
+  log "Running maven-install..."
+  (cd "${TARGET_DIR}" && bash bin/maven-install)
+else
+  log "ERROR: bin/maven-install not found or not executable in ${TARGET_DIR}/bin"
+  exit 1
+fi
+
+log "Datomic ${DATOMIC_TYPE} ${DATOMIC_VERSION} installed successfully to ${TARGET_DIR}"
diff --git a/.dockerignore b/.dockerignore
index 2be7f65ff..46d72bf57 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -8,4 +8,8 @@ test/*
 *.md
 data/*
 log/*
-backups/*
\ No newline at end of file
+backups/*
+backup/*
+
+# Datomic Pro distribution (~280MB) — Docker images download their own from S3
+lib/com/datomic/
\ No newline at end of file
diff --git a/.env.example b/.env.example
index 4444c8eba..37bf73b63 100644
--- a/.env.example
+++ b/.env.example
@@ -12,17 +12,30 @@
 PORT=8890
 
 # --- Datomic Database ---
+# Datomic Pro with dev storage protocol (required for Java 21 support)
 # ADMIN_PASSWORD secures the Datomic admin interface
 # DATOMIC_PASSWORD is used by the application to connect to Datomic
 # The password in DATOMIC_URL must match DATOMIC_PASSWORD
 ADMIN_PASSWORD=change-me-admin
 DATOMIC_PASSWORD=change-me-datomic
-DATOMIC_URL=datomic:free://datomic:4334/orcpub?password=change-me-datomic
+DATOMIC_URL=datomic:dev://datomic:4334/orcpub?password=change-me-datomic
 
 # --- Security ---
-# Secret used to sign JWT tokens (20+ characters recommended)
+# REQUIRED: JWT signing secret. Authentication will fail without this.
+# 20+ random characters recommended (e.g., openssl rand -hex 16)
 SIGNATURE=change-me-to-something-unique-and-long
 
+# Content Security Policy (strict|permissive|none)
+CSP_POLICY=strict
+
+# Dev mode: CSP violations are logged (Report-Only) instead of blocked,
+# allowing Figwheel hot-reload scripts to execute.
+DEV_MODE=true
+
+# --- Logs ---
+# Defaults to project logs/ if unset
+LOG_DIR=
+
 # --- Email (SMTP) ---
 # Leave EMAIL_SERVER_URL empty to disable email functionality
 EMAIL_SERVER_URL=
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 56db5e5f7..698c1f670 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -164,6 +164,7 @@ jobs:
 
       - name: Post PR comment with results
         if: github.event_name == 'pull_request' && always()
+        continue-on-error: true  # Fork PRs get read-only GITHUB_TOKEN
         uses: actions/github-script@v7
         with:
           script: |
diff --git a/.github/workflows/docker-integration.yml b/.github/workflows/docker-integration.yml
index 0c9c86c65..39c9a89f1 100644
--- a/.github/workflows/docker-integration.yml
+++ b/.github/workflows/docker-integration.yml
@@ -1,6 +1,10 @@
-# Docker integration tests: script validation always runs, container tests
-# only run when Docker Hub images are available (orcpub/orcpub:latest may
-# not exist for all release cycles).
+# Dual-stack Docker integration tests: auto-detects Java 8 (develop) vs Java 21
+# (breaking/) based on whether dev.cljs.edn exists in the checkout.
+#
+# Java 8 (legacy):  Pulls pre-built images from Docker Hub — skipped gracefully
+#                    when images are unavailable.
+# Java 21 (modern): Builds from source using docker-compose-build.yaml with
+#                    Datomic Pro and eclipse-temurin:21.
 
 name: Docker Integration Test
 
@@ -17,10 +21,40 @@ on:
   workflow_dispatch:
 
 jobs:
+  detect-stack:
+    name: Detect Stack
+    runs-on: ubuntu-latest
+    outputs:
+      build-mode: ${{ steps.detect.outputs.build-mode }}
+      compose-file: ${{ steps.detect.outputs.compose-file }}
+      stack-label: ${{ steps.detect.outputs.stack-label }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Detect stack from project files
+        id: detect
+        run: |
+          if [ -f "dev.cljs.edn" ]; then
+            echo "Detected: Java 21 / Datomic Pro / figwheel-main → build from source"
+            echo "build-mode=build" >> $GITHUB_OUTPUT
+            echo "compose-file=docker-compose-build.yaml" >> $GITHUB_OUTPUT
+            echo "stack-label=Java 21 / Datomic Pro (build)" >> $GITHUB_OUTPUT
+          else
+            echo "Detected: Java 8 / Datomic Free / cljsbuild → pull pre-built"
+            echo "build-mode=pull" >> $GITHUB_OUTPUT
+            echo "compose-file=docker-compose.yaml" >> $GITHUB_OUTPUT
+            echo "stack-label=Java 8 / Datomic Free (pre-built)" >> $GITHUB_OUTPUT
+          fi
+
   docker-test:
-    name: Docker Setup & User Management
+    name: Docker Setup & User Management (${{ needs.detect-stack.outputs.stack-label }})
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    needs: detect-stack
+    timeout-minutes: 25
+
+    env:
+      COMPOSE_FILE: ${{ needs.detect-stack.outputs.compose-file }}
 
     steps:
       - name: Checkout
@@ -77,21 +111,37 @@ jobs:
           fi
           echo "OK: --force regenerated .env with consistent passwords"
 
-      # ── Container tests (only if images are available) ───────────
+      # ── Container image acquisition ─────────────────────────────
+      # Java 21: build from source (no pre-built images for new stack)
+      # Java 8:  pull pre-built images from Docker Hub (skip if unavailable)
 
-      - name: Pull container images
+      - name: Build container images (Java 21)
+        id: build
+        if: needs.detect-stack.outputs.build-mode == 'build'
+        run: |
+          echo "Building from source with $COMPOSE_FILE..."
+          docker compose build
+          echo "Build complete"
+
+      - name: Pull container images (Java 8)
         id: pull
+        if: needs.detect-stack.outputs.build-mode == 'pull'
         continue-on-error: true
         run: docker compose pull
 
+      # ── Container tests ─────────────────────────────────────────
+      # Run if images were built (Java 21) or successfully pulled (Java 8).
+      # steps.build.outcome is only set when the step runs; default to 'skipped'.
+
       - name: Start datomic (no deps)
-        if: steps.pull.outcome == 'success'
+        id: start-datomic
+        if: steps.build.outcome == 'success' || steps.pull.outcome == 'success'
         run: |
           docker compose up -d --no-deps datomic
           echo "Datomic container started, waiting for health..."
 
       - name: Wait for datomic healthy
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: |
           for i in $(seq 1 90); do
             CID=$(docker compose ps -q datomic 2>/dev/null) || true
@@ -124,13 +174,13 @@ jobs:
           done
 
       - name: Start orcpub and web
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: |
           docker compose up -d
           docker compose ps
 
       - name: Wait for orcpub healthy
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: |
           for i in $(seq 1 90); do
             CID=$(docker compose ps -q orcpub 2>/dev/null) || true
@@ -161,13 +211,13 @@ jobs:
           docker compose ps
 
       - name: Test — create user
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: |
           ./docker-user.sh create testadmin admin@test.local SecurePass123
           echo "Exit code: $?"
 
       - name: Test — check user exists
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: |
           OUTPUT=$(./docker-user.sh check testadmin)
           echo "$OUTPUT"
@@ -176,14 +226,14 @@ jobs:
           echo "$OUTPUT" | grep -q "true"   # verified
 
       - name: Test — list includes user
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: |
           OUTPUT=$(./docker-user.sh list)
           echo "$OUTPUT"
           echo "$OUTPUT" | grep -q "testadmin"
 
       - name: Test — duplicate user fails
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: |
           if ./docker-user.sh create testadmin admin@test.local SecurePass123 2>&1; then
             echo "FAIL: Should have rejected duplicate user"
@@ -192,11 +242,11 @@ jobs:
           echo "OK: Duplicate user correctly rejected"
 
       - name: Test — create second user
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: ./docker-user.sh create player2 player2@test.local AnotherPass456
 
       - name: Test — list shows both users
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: |
           OUTPUT=$(./docker-user.sh list)
           echo "$OUTPUT"
@@ -204,14 +254,14 @@ jobs:
           echo "$OUTPUT" | grep -q "player2"
 
       - name: Test — verify already-verified user is idempotent
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: |
           OUTPUT=$(./docker-user.sh verify testadmin)
           echo "$OUTPUT"
           echo "$OUTPUT" | grep -q "already verified"
 
       - name: Test — batch create users (with duplicates)
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: |
           cat > /tmp/test-users.txt <<'TXT'
           # Test batch file
@@ -231,7 +281,7 @@ jobs:
           echo "OK: Batch created 2 new, skipped 1 duplicate"
 
       - name: Test — batch users appear in list
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: |
           OUTPUT=$(./docker-user.sh list)
           echo "$OUTPUT"
@@ -239,7 +289,7 @@ jobs:
           echo "$OUTPUT" | grep -q "batch2"
 
       - name: Test — init creates admin from .env
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: |
           # Append INIT_ADMIN_* vars to .env
           printf '\nINIT_ADMIN_USER=initadmin\nINIT_ADMIN_EMAIL=initadmin@test.local\nINIT_ADMIN_PASSWORD=InitPass789\n' >> .env
@@ -258,7 +308,7 @@ jobs:
           echo "OK: init created admin from .env"
 
       - name: Test — init is idempotent (re-run skips existing)
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: |
           # Running init again should not fail — duplicate is handled
           if ./docker-user.sh init 2>&1; then
@@ -268,7 +318,7 @@ jobs:
           echo "OK: init correctly reports duplicate on re-run"
 
       - name: Test — check nonexistent user fails
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: |
           if ./docker-user.sh check nobody@nowhere.com 2>&1; then
             echo "FAIL: Should have reported user not found"
@@ -277,7 +327,7 @@ jobs:
           echo "OK: Nonexistent user correctly not found"
 
       - name: Test — created user can log in via HTTP
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: |
           # Use nginx (port 443) since orcpub:8890 is not exposed to host
           RESPONSE=$(curl -sk -X POST https://localhost/login \
@@ -301,7 +351,7 @@ jobs:
           fi
 
       - name: Test — wrong password is rejected
-        if: steps.pull.outcome == 'success'
+        if: steps.start-datomic.outcome == 'success'
         run: |
           HTTP_CODE=$(curl -sk -o /dev/null -w "%{http_code}" \
             -X POST https://localhost/login \
diff --git a/.gitignore b/.gitignore
index 80f856836..7375787d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+# Ignore environment file (secrets/config)
+.env
 .editorconfig
 .gitattributes
 /resources/public/css/compiled
@@ -7,6 +9,10 @@ figwheel_server.log
 pom.xml
 *jar
 /lib/
+# Vendored snapshot allowed: pdfbox is required locally (vendor snapshot not available upstream)
+!lib/org/apache/pdfbox/
+!lib/org/apache/pdfbox/pdfbox/2.1.0-SNAPSHOT/
+!lib/org/apache/pdfbox/pdfbox/2.1.0-SNAPSHOT/*
 /classes/
 /out/
 /target/
@@ -50,5 +56,32 @@ cljs-test-runner-out
 # As created by some LSP-protocol tooling, e.g. nvim-lsp
 .lsp
 
-# Claude Code local session data
+# Datomic local files
+/.datomic/
+
+# Local audit outputs
+/audit/
+
+# Cursor IDE local config (contains user-specific paths)
+.cursor/
+
+# Claude Code local data (conversation history, credentials)
 .claude-data/
+
+# Ignore all log files in logs/
+logs/
+
+*/*.log
+/workspaces/.codespaces/.persistedshare/creation.log
+.devcontainer/post-create.log
+
+scripts/analyze/
+
+# Test user credentials log (created by ./menu user create / dev-setup.sh)
+.test-users
+
+# cljsjs extracted externs (build artifact from classpath)
+cljsjs/
+
+# Local devcontainer setup (superseded by dotfiles)
+.devcontainer/local-setup.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98c9ccec0..54de2eccb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,190 +1,252 @@
-# Changelog: Error Handling, Import Validation & Content Reconciliation
+# Changelog
 
-All changes target `develop` from `feature/error-handling-import-validation`.
+All notable changes to this project will be documented in this file.
+Format: per-commit entries grouped by category, newest first.
+
+## [breaking/2026-stack-modernization]
+
+### Infrastructure
+
+- **2026 full-stack modernization** (`22823da`)
+  Java 8 → 21, Datomic Free → Pro, Pedestal 0.5 → 0.7.0, React 15 → 18,
+  Reagent 0.6 → 2.0, re-frame 0.x → 1.4.4, PDFBox 2 → 3, clj-time → java-time,
+  figwheel-main, lambdaisland/garden, Jackson/Guava pinning.
+
+- **Consolidate dev tooling** (`6249565`)
+  Unified `user.clj` with lazy figwheel, nREPL helpers, lein aliases
+  (`fig:dev`, `fig:watch`, `fig:build`, `fig:test`), operational scripts
+  (`start.sh`, `stop.sh`, `menu`), `:dev`/`:uberjar`/`:lint`/`:init-db` profiles.
+
+- **Merge develop** (`1d50782`)
+  Integrate character folders, weapon builder (special/loading properties),
+  docker-compose updates from `origin/develop` (24 commits).
+
+### Bug Fixes
+
+- **`:class-name` → `:class`** (`263f290`)
+  Reagent 2.x overwrites hiccup tag classes with `:class-name`. Converted all
+  UI uses to `:class`; 18 remaining `:class-name` are D&D data keys (correct).
+
+- **Subscribe-outside-reactive-context — phase 1** (`c2290ca`)
+  42 fixes across events.cljs, options.cljc, classes.cljc, core.cljs.
+  Patterns: direct db read, plugin-data map, track! template cache, SSOT pure fns.
+
+- **Subscribe-outside-reactive-context — phase 2** (`09d7e4c`)
+  14 fixes across options.cljc, pdf_spec.cljc, equipment_subs.cljs, views.cljs.
+  Patterns: plugin-data threading, reg-sub-raw, move to render scope.
+
+- **Prereq subscribes → pure character fns** (`9cbc25a`)
+  22 prereq-fn lambdas in options.cljc converted from `@(subscribe)` to pure
+  `(fn [character] ...)` functions.
+
+- **Multiclass/wizard prereqs** (`3249f88`)
+  7 multiclass and spell-mastery prereqs in classes.cljc converted to pure fns.
+
+- **`def` + `partial` → `defn`** (`f578cdb`)
+  `option-language-proficiency-choice` captured subscribe at load time via
+  `partial`. Converted to `defn` for proper reactive context.
+
+### Cleanup
+
+- **Remove 11 orphaned subscriptions** (`bb2400d`)
+  4 static map wrappers deleted (superseded by homebrew-aware versions).
+  7 unused subs reader-discarded (`#_`) with comments: `all-melee-weapons`,
+  `item`, `base-spells-map`, `spell-option`, `spell-options`,
+  `filtered-monster-names`, `has-prof?`. Pre-existing tech debt, not caused
+  by subscribe refactor.
+
+- **Fix 591 missing-else-branch lint warnings** (`29c9f28`, via `fix/lint-missing-else`)
+  Mechanical `if→when`, `if-let→when-let`, `if-not→when-not` across 33 files.
+  Scripted fix (`scripts/fix-missing-else.py`) with column-precise substitution.
+  Also fixed 2 pre-existing bugs: `when` used instead of `if` for two-branch
+  conditionals in classes.cljc:1808 and options.cljc:463.
+
+- **Fix forward-reference lint error** (`792fe3c`)
+  `show-generic-error` used before its `def` alias in events.cljs. Changed to
+  fully-qualified `event-utils/show-generic-error`.
+
+- **Consolidate lint config** (`7476f10`)
+  All linter settings moved from project.clj `:lint` profile to
+  `.clj-kondo/config.edn` (single source of truth for IDE + CLI). Lint scope
+  expanded to cover `native/`, `test/`, `web/`. clj-kondo bumped to 2026.01.19.
+  LSP false-positive suppression via `:exclude-when-defined-by` for re-frame.
+
+- **Dead code cleanup — ~92 vars** (`6bbcd9a`, `b68b917`)
+  `#_` reader-discard on dead defs across 10 source files: deprecated ua/scag
+  refs, superseded template UI (ability roller, amazon frames), 17 never-dispatched
+  event handlers, dead style defs, duplicate constants. Includes cascade cleanup
+  (helpers that lost all callers). Each `#_` has a comment explaining why.
+
+- **Redundant expression fixes** (in `6bbcd9a`, `b68b917`, `429152e`)
+  Remove nested `(str (str ...))`, flatten `(and (and ...))`, remove duplicate
+  destructuring param, remove unused refers, narrow test `:refer` lists,
+  fix unreachable code in registration.cljc.
+
+### Enhancements
+
+- **Input debounce** (`d108134`)
+  Moved debounce from component-level `input-field` to `debounced-build-sub`
+  in subs.cljs (leading+trailing edge, 500ms). Eliminates per-keystroke
+  entity/build recomputation.
+
+- **Folder hardening** (`f28f58f`)
+  `on-folder-failure` event re-fetches server state on HTTP error. Client +
+  server blank-name validation. `check-folder-owner` wrapped with
+  `interceptor/interceptor`, returns 404 for missing folders. Named tempid
+  `"new-folder"` + `d/resolve-tempid`. `case` default clause in folders sub.
+  CSS class fix (`builder-dropdown` → `builder-option-dropdown`).
+
+- **UI polish** (`d163ca9`)
+  Zero-warning dev/prod builds, dev-mode CSP nonce, favicon, custom
+  `externs.js` for React 18 advanced compilation.
+
+### Tests
+
+- **CLJS test infrastructure** (`b96b1b6`)
+  figwheel-main test build, `test_runner.cljs`, pure function tests for
+  compute, entity, character accessors.
+
+- **JVM tests for new code** (`6124d9f`)
+  `compute-all-weapons-map`, feat-prereqs, pdf_spec pure functions, folder
+  routes (CRUD + blank rejection + trimming).
+
+- **Folder validation tests** (in `f28f58f`)
+  Blank name → 400, whitespace trimming, nil defaults to "New Folder",
+  name unchanged after rejected renames.
+
+### Documentation
+
+- **Migration docs** (`026b031`)
+  MIGRATION-INDEX.md, JAVA-COMPATIBILITY.md, datomic-pro.md, pedestal-0.7.md,
+  frontend-stack.md, library-upgrades.md, dev-tooling.md, ENVIRONMENT.md,
+  testing.md.
+
+- **STACK.md** (in `f28f58f`)
+  Library/dependency onboarding guide: architecture diagram, all frameworks,
+  build system, profiles, dependency pinning rationale.
+
+### Current Status
+
+- **174 JVM tests**, 444 assertions, 0 failures
+- **0 CLJS errors**, 0 warnings (dev + advanced)
+- **0 subscribe warnings** in browser console
+- **0 linter errors**, 0 warnings
 
 ---
 
-## New Features
+## [feature/error-handling-import-validation] (merged)
+
+### New Features
 
-### Import Validation (`import_validation.cljs` -- new file)
+#### Import Validation (`import_validation.cljs` -- new file)
 - **Unicode normalization**: Converts smart quotes, em-dashes, non-breaking spaces, and 40+ other problematic Unicode characters to ASCII equivalents on import and homebrew save. Prevents copy-paste corruption from Word/Google Docs.
 - **Required field detection & auto-fill**: On import, missing required fields (`:name`, `:hit-die`, `:speed`, etc.) are auto-filled with placeholder values like `[Missing Name]`. Content types covered: classes, subclasses, races, subraces, backgrounds, feats, spells, monsters, invocations, languages, encounters.
 - **Trait validation**: Nested `:traits` arrays are checked for missing `:name` fields and auto-filled.
 - **Option validation**: Empty options (`{}`) created by the UI are detected and auto-filled with unique default names ("Option 1", "Option 2", etc.).
 - **Multi-plugin format detection**: Distinguishes single-plugin from multi-source orcbrew files for correct processing.
 
-### Export Validation
+#### Export Validation
 - **Pre-export warning modal**: Before exporting homebrew, all content is validated for missing required fields. If issues are found, a modal lists them with an "Export Anyway" option.
 - **Specific save error messages**: `reg-save-homebrew` now extracts field names from spec failures and shows targeted messages instead of generic "You must specify a name" errors.
 
-### Content Reconciliation (`content_reconciliation.cljs` -- new file)
+#### Content Reconciliation (`content_reconciliation.cljs` -- new file)
 - **Missing content detection**: When a character references homebrew content that isn't loaded (e.g., deleted plugin), the system detects missing races, classes, and subclasses.
 - **Fuzzy key matching**: Uses prefix matching and base-keyword similarity to suggest available content that resembles missing keys (top 5 matches with similarity scores).
 - **Source inference**: Guesses which plugin pack a missing key likely came from based on key structure.
 
-### Missing Content Warning UI (`character_builder.cljs`)
+#### Missing Content Warning UI (`character_builder.cljs`)
 - **Warning banner**: Orange expandable banner appears in character builder when content is missing, showing count and details.
 - **Detail panel**: Lists each missing item with its content type, key, inferred source, and suggestions for similar available content.
 - **DOM IDs for testability**: `#missing-content-warning`, `#missing-content-details`, `.missing-content-item` with `data-key` and `data-type` attributes.
 
-### Conflict Resolution Modal (`views/conflict_resolution.cljs`, `events.cljs`)
+#### Conflict Resolution Modal (`views/conflict_resolution.cljs`, `events.cljs`)
 - **Duplicate key detection**: On import, detects keys that conflict with already-loaded homebrew (both internal duplicates within a file and external conflicts with existing content).
 - **Resolution UI**: Modal presents each conflict with rename options. Key renaming updates internal references (subclass -> parent class mappings, etc.).
 - **Color-coded radio options**: Rename (cyan), Keep (orange), Skip (purple) with left-border + tinted background. All styles in Garden CSS.
 
-### Import Log Panel (`views/import_log.cljs`)
+#### Import Log Panel (`views/import_log.cljs`)
 - **Grouped collapsible sections**: Changes grouped into Key Renames, Field Fixes, Data Cleanup, and Advanced Details (collapsed by default). Empty sections hidden automatically.
 - **Detailed field fix reporting**: Field Fixes section shows per-item breakdown — which item, content type, which fields were filled, how many traits/options were fixed.
 - **Collapsible section component**: Reusable `collapsible-section` with configurable icon, colors, and default-expanded state.
 
-### OrcBrew CLI Debug Tool (`tools/orcbrew.clj` -- new file)
+#### OrcBrew CLI Debug Tool (`tools/orcbrew.clj` -- new file)
 - `lein prettify-orcbrew <file>` -- Pretty-prints orcbrew EDN for readability.
 - `lein prettify-orcbrew <file> --analyze` -- Reports potential issues: nil-nil patterns, problematic Unicode, disabled entries, missing trait names, file structure summary.
 
----
-
-## Bug Fixes
+### Bug Fixes
 
-### nil nil Corruption (`events.cljs`)
+#### nil nil Corruption (`events.cljs`)
 - **Root cause fix**: `set-class-path-prop` was calling `assoc-in` with a nil path, producing `{nil nil}` entries in character data. Now guards against nil path before the second `assoc-in`.
 
-### Nil Character ID Crash (`views.cljs`)
+#### Nil Character ID Crash (`views.cljs`)
 - Character list page crashed with "Cannot form URI without a value given for :id parameter" when characters had nil `:db/id`. Added `(when id ...)` guard to skip rendering those entries.
 
-### Subclass Key Preservation (`options.cljc`, `spell_subs.cljs`)
+#### Subclass Key Preservation (`options.cljc`, `spell_subs.cljs`)
 - Subclass processing now uses explicit `:key` field if present (for renamed plugins), falling back to name-generated key. Prevents renamed keys from reverting.
 - `plugin-subclasses` subscription preserves map keys and sets `:key` on subclass data correctly.
 
-### Plugin Data Robustness (`spell_subs.cljs`)
+#### Plugin Data Robustness (`spell_subs.cljs`)
 - `plugin-vals` subscription wrapped in try-catch to skip malformed plugin data instead of crashing.
 - `level-modifier` handles unknown modifier types gracefully (logs warning, returns nil instead of throwing).
 - `make-levels` filters out nil modifiers with `keep`.
 
-### Unhandled HTTP Status Crash (`subs.cljs`, `equipment_subs.cljs`)
+#### Unhandled HTTP Status Crash (`subs.cljs`, `equipment_subs.cljs`)
 - All 7 API-calling subscriptions used bare `case` on HTTP status with no default clause. Any unexpected status (e.g., 400) threw `No matching clause`. Replaced with `handle-api-response` HOF that logs unhandled statuses to console.
 
-### Import Log "Renamed key nil -> nil" (`events.cljs`, `import_validation.cljs`)
+#### Import Log "Renamed key nil -> nil" (`events.cljs`, `import_validation.cljs`)
 - Key rename change entries used `:old-key`/`:new-key` fields but display code expected `:from`/`:to`. Unified on `:from`/`:to` across creation, application, and display.
 
----
+### Error Handling (Backend)
 
-## Error Handling (Backend)
-
-### Database (`datomic.clj`)
+#### Database (`datomic.clj`)
 - Startup wrapped in try-catch with structured errors: `:missing-db-uri`, `:db-connection-failed`, `:schema-initialization-failed`.
 
-### Email (`email.clj`)
+#### Email (`email.clj`)
 - Email config parsing catches `NumberFormatException` for invalid port (`:invalid-port`).
 - `send-verification-email` and `send-reset-email` check postal response and raise on failure (`:verification-email-failed`).
 
-### PDF Generation (`pdf.clj`, `pdf_spec.cljc`)
+#### PDF Generation (`pdf.clj`, `pdf_spec.cljc`)
 - Network timeouts (10s connect, 10s read) for image loading. Specific handling for `SocketTimeoutException` and `UnknownHostException`.
 - Nil guards throughout `pdf_spec.cljc`: `total-length`, `trait-string`, `resistance-strings`, `profs-paragraph`, `keyword-vec-trait`, `damage-str`, spell name lookup. All use fallback strings like "(unknown)", "(Unknown Spell)", "(Unnamed Trait)".
 
-### Routes (`routes.clj`, `routes/party.clj`)
+#### Routes (`routes.clj`, `routes/party.clj`)
 - All mutation endpoints wrapped with error handling: verification, password reset, entity CRUD, party operations. Each uses structured error codes (`:verification-failed`, `:entity-creation-failed`, `:party-creation-failed`, etc.).
 
-### System (`system.clj`)
+#### System (`system.clj`)
 - PORT environment variable parsing validates numeric input (`:invalid-port`).
 
-### Error Infrastructure (`errors.cljc` -- expanded)
+#### Error Infrastructure (`errors.cljc` -- expanded)
 - New error code constants for auth flows.
 - `log-error`, `create-error` utility functions.
 - `with-db-error-handling`, `with-email-error-handling`, `with-validation` macros for consistent patterns.
 
----
-
-## Supporting Changes
+### Supporting Changes
 
-### Common Utilities (`common.cljc`)
+#### Common Utilities (`common.cljc`)
 - `kw-base`: Extracts keyword base before first dash (e.g., `:artificer-kibbles` -> `"artificer"`).
 - `traverse-nested`: Higher-order function for recursively walking nested option structures.
 
-### Styles (`styles/core.clj`)
+#### Styles (`styles/core.clj`)
 - `.bg-warning`, `.bg-warning-item` CSS classes for warning banner UI.
 - `.conflict-*` Garden CSS classes for conflict resolution modal (backdrop, modal, header, footer, body, radio options with color-coded variants: cyan/rename, orange/keep, purple/skip).
 - `.export-issue-*` Garden CSS classes for export warning modal.
 
-### App State (`db.cljs`)
+#### App State (`db.cljs`)
 - Added `import-log` and `conflict-resolution` state maps to re-frame db.
 
-### Subscriptions (`subs.cljs`, `equipment_subs.cljs`)
+#### Subscriptions (`subs.cljs`, `equipment_subs.cljs`)
 - Import log, conflict resolution, export warning, missing content report subscriptions.
-- `handle-api-response` HOF (`events.cljs`) — centralizes HTTP status dispatch with sensible defaults (401 → login, 500 → generic error) and catch-all logging for unhandled statuses. Replaces bare `case` statements across 7 API-calling subscriptions.
+- `handle-api-response` HOF (`event_utils.cljc`) — centralizes HTTP status dispatch with sensible defaults (401 → login, 500 → generic error) and catch-all logging for unhandled statuses. Replaces bare `case` statements across 7 API-calling subscriptions.
 
-### Entry Point (`core.cljs`)
+#### Entry Point (`core.cljs`)
 - Dev version logging on startup.
 - Import log overlay component mounted in main view wrapper.
 
-### Linter Configuration
+#### Linter Configuration
 - `.clj-kondo/config.edn`: Exclusions for `with-db` macro and user namespace functions.
 - `.lsp/config.edn` (new): Explicit source-paths to prevent clojure-lsp from scanning compiled CLJS output in `resources/public/js/compiled/out/`.
 
----
-
-## Files Changed
-
-| Status | File | Category |
-|--------|------|----------|
-| Modified | `src/clj/orcpub/datomic.clj` | Error handling |
-| Modified | `src/clj/orcpub/email.clj` | Error handling |
-| Modified | `src/clj/orcpub/pdf.clj` | Error handling |
-| Modified | `src/clj/orcpub/routes.clj` | Error handling |
-| Modified | `src/clj/orcpub/routes/party.clj` | Error handling |
-| Modified | `src/clj/orcpub/styles/core.clj` | UI styles |
-| Modified | `src/clj/orcpub/system.clj` | Error handling |
-| **New** | `src/clj/orcpub/tools/orcbrew.clj` | CLI tool |
-| Modified | `src/cljc/orcpub/common.cljc` | Utilities |
-| Modified | `src/cljc/orcpub/dnd/e5/options.cljc` | Bug fix |
-| Modified | `src/cljc/orcpub/errors.cljc` | Error infrastructure |
-| Modified | `src/cljc/orcpub/pdf_spec.cljc` | Nil guards |
-| Modified | `src/cljs/orcpub/character_builder.cljs` | Warning UI |
-| **New** | `src/cljs/orcpub/dnd/e5/content_reconciliation.cljs` | Missing content detection |
-| Modified | `src/cljs/orcpub/dnd/e5/db.cljs` | App state |
-| Modified | `src/cljs/orcpub/dnd/e5/events.cljs` | Import/export events |
-| **New** | `src/cljs/orcpub/dnd/e5/import_validation.cljs` | Validation framework |
-| Modified | `src/cljs/orcpub/dnd/e5/spell_subs.cljs` | Plugin robustness |
-| Modified | `src/cljs/orcpub/dnd/e5/subs.cljs` | Subscriptions |
-| Modified | `src/cljs/orcpub/dnd/e5/views.cljs` | Fuzzy matching, nil guards |
-| **New** | `src/cljs/orcpub/dnd/e5/views/import_log.cljs` | Import log panel |
-| **New** | `src/cljs/orcpub/dnd/e5/views/conflict_resolution.cljs` | Conflict/export modals |
-| Modified | `web/cljs/orcpub/core.cljs` | Entry point |
-| **New** | `test/clj/orcpub/errors_test.clj` | Unit tests |
-| **New** | `test/cljc/orcpub/dnd/e5/favored_enemy_language_test.cljc` | Unit tests |
-| **New** | `test/clj/orcpub/tools/orcbrew_test.clj` | Unit tests |
-| **New** | `test/cljc/orcpub/pdf_spec_test.clj` | Unit tests |
-| **New** | `test/cljs/orcpub/dnd/e5/content_reconciliation_test.cljs` | Unit tests |
-| **New** | `test/cljs/orcpub/dnd/e5/import_validation_test.cljs` | Unit tests |
-| Modified | `test/cljc/orcpub/dnd/e5/folder_test.clj` | Lint fix |
-| **New** | `test/duplicate-external-a.orcbrew` | Test fixture |
-| **New** | `test/duplicate-external-b.orcbrew` | Test fixture |
-| Modified | `.clj-kondo/config.edn` | Linter config |
-| **New** | `.lsp/config.edn` | LSP config |
-| **New** | `docs/CONFLICT_RESOLUTION.md` | Feature documentation |
-| **New** | `docs/CONTENT_RECONCILIATION.md` | Feature documentation |
-| **New** | `docs/ERROR_HANDLING.md` | Feature documentation |
-| **New** | `docs/HOMEBREW_REQUIRED_FIELDS.md` | Feature documentation |
-| **New** | `docs/ORCBREW_FILE_VALIDATION.md` | Feature documentation |
-| **New** | `docs/LANGUAGE_SELECTION_FIX.md` | Feature documentation |
-| **New** | `docs/README.md` | Documentation index |
-| Modified | `.gitignore` | Ignore patterns |
-
----
-
-## Documentation
-
-Feature documentation is included in `docs/`:
-
-| Document | Covers |
-|----------|--------|
-| [ERROR_HANDLING.md](docs/ERROR_HANDLING.md) | Backend error macros, error codes, usage patterns |
-| [CONFLICT_RESOLUTION.md](docs/CONFLICT_RESOLUTION.md) | Duplicate key detection, resolution modal, reference updates |
-| [CONTENT_RECONCILIATION.md](docs/CONTENT_RECONCILIATION.md) | Missing content detection, fuzzy matching strategies |
-| [HOMEBREW_REQUIRED_FIELDS.md](docs/HOMEBREW_REQUIRED_FIELDS.md) | Required fields per content type, breaking code locations |
-| [ORCBREW_FILE_VALIDATION.md](docs/ORCBREW_FILE_VALIDATION.md) | Import/export validation user and developer guide |
-| [LANGUAGE_SELECTION_FIX.md](docs/LANGUAGE_SELECTION_FIX.md) | Ranger favored enemy language corruption fix (#296) |
-
-## Design Principles
+### Design Principles
 
 - **Import = permissive** (auto-fix and continue), **Export = strict** (warn user, let them decide)
 - **Placeholder text convention**: `[Missing Name]` format (square brackets indicate auto-filled)
diff --git a/README.md b/README.md
index f64254102..77b360d03 100644
--- a/README.md
+++ b/README.md
@@ -6,449 +6,449 @@
 </div>
 
 <div align="center">
-    <h4>A web site that provides a D&D 5e Character sheet generator.</h4>
+    <h4>A D&D 5e Character Sheet Generator</h4>
 
-
-This is the code forked from OrcPub2, from the [original](https://github.com/larrychristensen/orcpub) repository on Jan 7, 2019 with improvements.
+Forked from [OrcPub2](https://github.com/larrychristensen/orcpub) (Jan 2019) with ongoing improvements.
 
 ![GitHub language count](https://img.shields.io/github/languages/count/orcpub/orcpub) ![GitHub top language](https://img.shields.io/github/languages/top/orcpub/orcpub) ![GitHub contributors](https://img.shields.io/github/contributors/orcpub/orcpub) ![GitHub repo size](https://img.shields.io/github/repo-size/orcpub/orcpub)
-![GitHub last commit (branch)](https://img.shields.io/github/last-commit/orcpub/orcpub/develop) 
+![GitHub last commit (branch)](https://img.shields.io/github/last-commit/orcpub/orcpub/develop)
 
 ![GitHub pull requests](https://img.shields.io/github/issues-pr/orcpub/orcpub) ![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed/orcpub/orcpub)
 
 ![GitHub issues](https://img.shields.io/github/issues/orcpub/orcpub) ![GitHub closed issues](https://img.shields.io/github/issues-closed/orcpub/orcpub)
 
-![Docker Pulls](https://img.shields.io/docker/pulls/orcpub/orcpub)
-![Docker Cloud Automated build](https://img.shields.io/docker/cloud/automated/orcpub/orcpub)
-![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/orcpub/orcpub)
+![CI](https://img.shields.io/github/actions/workflow/status/orcpub/orcpub/continuous-integration.yml?branch=develop&label=CI) ![Docker Pulls](https://img.shields.io/docker/pulls/orcpub/orcpub)
 
-[About](#about) • [Getting Started](#getting-started) • [Development](#development) • [Contributing](#how-do-i-contribute?) • [Fundamentals](#Fundamentals)
+[About](#about) | [Quick Start](#quick-start) | [Development](#development) | [Architecture](#architecture) | [Contributing](#contributing) | [FAQ](#faq)
 
 </div>
 
 ## About
-Dungeon Master's Vault is a web server that allows you to host your own Character Generator website for D&D 5th Edition.
-
-
-## Getting Started
-
-To run your own install of Dungeon Master's Vault, there are two ways to do this.  
-
-1. Pulls docker containers from our docker repository.
-2. Build your own.
 
-In this section we will pull from the docker repository.  If you want to build your own docker containers from source, see [Development](#development)
+Dungeon Master's Vault is a full-stack Clojure/ClojureScript web application for generating and managing D&D 5th Edition character sheets. You can host your own instance or contribute to development.
 
-You will need a few tools:
+### Stack
 
-- git
-- A system that can run docker, with docker-compose (windows or unix)
-- A SSL certificate.  Self signed or from an issuing CA.
-- smtp relay
-- copy of this repo (for the ./deploy directory)
+| Layer | Technology |
+|-------|-----------|
+| Runtime | Java 21 (OpenJDK) |
+| Backend | Clojure 1.12, Pedestal 0.7, Buddy auth |
+| Frontend | ClojureScript, React 18, Reagent 2.0, re-frame |
+| Database | Datomic Pro (dev transactor) |
+| Build | Leiningen, cljsbuild, figwheel-main |
+| Dev environment | VS Code devcontainer (recommended) |
 
-### Check out this branch
+---
 
- Clone a copy of our repository to your machine:
+## Quick Start
 
- `git clone https://github.com/Orcpub/orcpub.git` if you don't have a github account
+### Development (devcontainer)
 
- `git clone git@github.com:Orcpub/orcpub.git` if you do want to make changes to the code and make pull requests.
-
-### Quick Setup (Recommended)
-
-Run the automated setup script to generate secure passwords, SSL certificates, and all required directories:
+The fastest path. Requires [VS Code](https://code.visualstudio.com/) with [Dev Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers), or [GitHub Codespaces](https://github.com/features/codespaces).
 
 ```bash
-./docker-setup.sh              # Interactive — prompts for each value
-./docker-setup.sh --auto       # Non-interactive — generates secure defaults
+git clone https://github.com/orcpub/orcpub.git
+cd orcpub && code .
+# Click "Reopen in Container" when prompted, then:
+./scripts/dev-setup.sh     # Install deps, init DB, create test user
+./menu                     # Interactive service launcher
 ```
 
-Then start the containers and create your first user:
+### Development (local machine)
+
+Requires Java 21, Leiningen 2.9+, and Datomic Pro (free, Apache 2.0).
 
 ```bash
-docker-compose up -d
-./docker-user.sh create admin admin@example.com MySecurePass123
+git clone https://github.com/orcpub/orcpub.git
+cd orcpub
+cp .env.example .env       # Dev defaults work out of the box
+./scripts/dev-setup.sh     # Install deps, start Datomic, init DB, create test user
+./menu start server        # Backend on port 8890
+./menu start figwheel      # Frontend hot-reload on port 3449
 ```
 
-The `create` command creates a **pre-verified** account — no SMTP server or email confirmation needed. For batch user creation, additional commands, and full details see the [Docker User Management](docs/docker-user-management.md) guide.
-
-### Edit docker-compose.yaml
-
-Edit the `docker-compose.yaml` and update all the environmental variables and or paths as needed.
+Log in at `http://localhost:8890` with **test@test.com** / **testpass**.
 
-The application configuration is environmental variables based, meaning that its behavior will change when modifying them at start time. 
+For the full walkthrough (including manual setup without scripts), see **[docs/GETTING-STARTED.md](docs/GETTING-STARTED.md)**.
 
-To modify the variables edit the `docker-compose.yaml` or set your own in your shell/environment variables.
+### Self-hosting (Docker)
 
-Example environment variables:
+For running your own production instance:
 
-```shell
-EMAIL_SERVER_URL: '' # DNS name of your smtp server
-EMAIL_ACCESS_KEY: '' # User for the mail server
-EMAIL_SECRET_KEY: '' # Password for the user
-EMAIL_SERVER_PORT: 587 # Mail server port
-EMAIL_FROM_ADDRESS: '' # Email address to send from, will default to 'no-reply@orcpub.com' if not set
-EMAIL_ERRORS_TO: '' # Email address that errors will be sent to
-EMAIL_SSL: 'false' # Should SSL be used? Gmail requires this.
-EMAIL_TLS: 'false' # Should TLS be used? 
-DATOMIC_URL: datomic:free://datomic:4334/orcpub?password=yourpassword # Url for the database
-ADMIN_PASSWORD: supersecretpassword #The datomic admin password (should be different than the DATOMIC_PASSWORD)
-DATOMIC_PASSWORD: yourpassword #The datomic application password
-SIGNATURE: '<change me to something unique>' # The Secret used to hash your password in the browser, 20+ characters recommended
+```bash
+git clone https://github.com/orcpub/orcpub.git && cd orcpub
+./docker-setup.sh           # generates .env, SSL certs, directories
+docker compose up -d        # pull images and start
+./docker-user.sh init       # create admin from .env settings
 ```
 
-The `ADMIN_PASSWORD` and `DATOMIC_PASSWORD`
+Visit `https://localhost`. See the [Docker deployment section](#docker-deployment) for full details including migration from older versions.
 
-Update the `<change this>` in the `DATOMIC_URL` to match the password used in `DATOMIC_PASSWORD`.
-Create an SSL certificate using `deploy/snakeoil.sh (or bat)` or simply edit the paths to an existing SSL certificate and key in the `web` service definition.
+---
 
-These passwords are used to secure the database server Datomic.
+## Development
 
-### Create a certificate or use an existing one
+> **New to Clojure?** See [docs/migration/dev-tooling.md](docs/migration/dev-tooling.md) for an explanation of Leiningen, profiles, the REPL, and how the dev tooling is organized. For the full stack upgrade context, see [docs/MIGRATION-INDEX.md](docs/MIGRATION-INDEX.md).
 
-You will need a webserver certificate.  For a quick SSL certificate, the script at `./deploy/snakeoil.sh` (unix) or `./deploy/snakeoil.bat` (windows) will create self signed certificate you can use, or you can make a request to a CA and install one from there.
+### Prerequisites
 
-By default the certificate is named `snakeoil.crt` and `snakeoil.key` and used by the nginx container here:
+If not using the devcontainer, you need:
 
-```shell
-    volumes:
-      - ./deploy/nginx.conf:/etc/nginx/conf.d/default.conf
-      - ./deploy/snakeoil.crt:/etc/nginx/snakeoil.crt
-      - ./deploy/snakeoil.key:/etc/nginx/snakeoil.key
-      - ./deploy/homebrew/:/usr/share/nginx/html/homebrew/
-```
+- **Java 21** (OpenJDK recommended) - [Adoptium](https://adoptium.net/)
+- **Leiningen** 2.9+ - [install guide](https://leiningen.org/#install)
+- **Datomic Pro** transactor - see [docs/migration/datomic-pro.md](docs/migration/datomic-pro.md)
 
-For windows you will need OpenSSL installed to run the `./deploy/snakeoil.bat`. 
+### Project Layout
 
-OpenSSL be installed via [chocolatey](https://chocolatey.org/) `choco install openssl`
+```
+src/
+├── clj/      # Server-only Clojure (JVM)
+├── cljc/     # Shared code (runs on both JVM and JS)
+└── cljs/     # Client-only ClojureScript
+web/
+└── cljs/     # Frontend application (Reagent/re-frame)
+dev/
+└── user.clj  # Dev tooling hub (REPL helpers + CLI)
+test/
+├── clj/      # Server-side tests
+├── cljc/     # Shared tests
+└── cljs/     # Frontend tests
+scripts/      # Shell scripts for service management
+docs/         # Technical documentation and migration guides
+```
 
-### nginx.conf
+### Starting the Dev Environment
 
-You will need the `./deploy/nginx.conf` or roll your own.
+There are two ways to run services: the **interactive menu** or **shell scripts** directly.
 
-### Launch the docker containers
+#### Interactive Menu (recommended)
 
-```shell
-   docker-compose pull
-   docker-compose up 
-   -or-
-   docker-compose up -d
+```bash
+./menu
 ```
 
-If all went well you should be able to hit the site via `https://localhost`
-
-If not - run the docker containers with `docker-compose up` which will show you the logs of the containers and troubleshoot from there.
+Displays service status and lets you start/stop services with single keystrokes.
 
-### Importing your orcbrews automatically
+#### User Management
 
-To have your orcbrew file you want to load automatically when a new client connects, place it in the `./deploy/homebrew/homebrew.orcbrew`
-
-All orcbrew files have to be combined into a single file named "homebrew.orcbrew".
+```bash
+./menu add bob pass123                # Create bob@test.com (auto-verified)
+./menu add user                       # Interactive prompt for name/password
+./menu verify bob                     # Verify an existing user
+./menu delete bob                     # Delete a user
+./menu user                           # Show all user commands
+```
 
-### Character Data
+Email auto-generates as `<name>@test.com`. Credentials are logged to `.test-users` (gitignored).
 
-**Data directory**
+#### Shell Scripts
 
-Character item data is held in a database provided by Datomic.  Datomic stores the character and magic item information in the `./data` directory.
+```bash
+# 1. Start Datomic transactor
+./scripts/start.sh datomic
 
-If you want to backup the database you only need to copy the `./data` directory after Datomic is shutdown.
+# 2. Initialize database (first time only)
+./scripts/start.sh init-db
 
-If you want a new database, delete the `./data` directory to start over.
+# 3. Start backend REPL
+./scripts/start.sh server
 
-**Log directory**
+# 4. Start Figwheel (frontend hot-reload, headless watcher)
+./scripts/start.sh figwheel
 
-The `./logs` directory contains error logs for Datomic itself and any files here can be safely removed with out affecting character data.  
+# 5. Start Garden (CSS auto-compilation)
+./scripts/start.sh garden
+```
 
-Watch this directory and clean up old files, it can grow quite large quickly.  It is recommended to setup log rotate or some other mechanism to clean these up.
+Or run the first-time setup script, which starts Datomic, initializes the database, and creates a test user (`test` / `test@test.com` / `testpass`):
 
-## Development
+```bash
+./scripts/dev-setup.sh
+```
 
-### Building your own docker images
+#### First-Time Dev Setup (manual)
 
-There are three docker containers that will be built.
+If not using the devcontainer or dev-setup.sh, you can run the steps yourself using `lein` (Leiningen, the Clojure build tool):
 
-- orcpub_datomic_1 - the database service.
-- orcpub_orcpub_1 - the JRE service that is the website.
-- orcpub_web_1 - the ngnix web server that reverse proxies back to the JRE service.
+```bash
+# Download all project dependencies
+lein deps
 
-**Dependencies**
+# Start the Datomic database transactor
+./scripts/start.sh datomic
 
-- [Docker](https://docs.docker.com/install/)
-- [Docker Compose](https://docs.docker.com/compose/)
-- [git](https://git-scm.com/downloads)
+# Create the database and apply the schema.
+# "with-profile init-db" tells Leiningen to skip slow ClojureScript compilation.
+# "run -m user init-db" runs the init-db command in dev/user.clj.
+lein with-profile init-db run -m user init-db
 
+# Create a test user (auto-verified, email = test@test.com)
+./menu add test testpass
+```
 
-Unix instructions [here](https://github.com/Orcpub/orcpub/wiki/Orcpub-on-Ubuntu-18.04-with-Docker)
+### REPL Workflow
 
-Windows instructions [here](https://github.com/Orcpub/orcpub/wiki/Orcpub-on-Windows-10-with-Docker)
+Clojure development centers on the REPL (Read-Eval-Print Loop). Start one with:
 
-Docker Cheat [Sheet](https://github.com/Orcpub/orcpub/wiki/Docker-Cheat-sheet)
+```bash
+lein repl
+```
 
+The `user` namespace loads automatically with these helpers:
 
-### Getting started - building the docker image from source
+```clojure
+;; Start/stop the web server
+(start-server)
+(stop-server)
 
-There are two docker-compose example files in this repository.
+;; Initialize the database (first time)
+(init-database)
 
-`docker-compose.yaml` will pull from the docker repo which the community maintains and is rebuilt with the latest code from the develop branch. **this is the default**
+;; Start Figwheel from the REPL
+(fig-start)
+(cljs-repl)    ; connect to ClojureScript REPL (after fig-start)
 
-`docker-compose-build.yaml` is an example of how to build from the local source from a git clone. 
+;; Database operations (no running server needed)
+(create-user! (conn) {:username "bob" :email "bob@example.com" :password "pass" :verify? true})
+(verify-user! (conn) "bob@example.com")
+(delete-user! (conn) "bob@example.com")
+```
 
-Rename docker-compose-build.yaml to docker-compose.yaml and it will build from your downloaded cloned directory. 
+For the full list, see [docs/migration/dev-tooling.md](docs/migration/dev-tooling.md).
 
-1. Start by forking this repo in your own github account and checkout the **develop** branch.   `git clone git@github.com:Orcpub/orcpub.git`
-2. Create snakeoil (self-signed) ssl certificates by running `./deploy/snakeoil.sh | .bat` or modify the docker-compose.yaml to your certificates.
-3. Modify the docker-compose.yaml and code you want to.
-4. Run `docker-compose build` to create the new containers built from the source.
-5. Run docker-compose `docker-compose up` or if you want to demonize it `docker-compose up -d`
-6. The website should be accessible via browser in `https://localhost`
+### Validation
 
-**NOTE**
+Run these before committing:
 
-The application configuration is Environmental Variable based, meaning that its behavior will change when modifying them at start time. To modify the variables edit the `docker-compose.yaml` or `docker-compose-build.yaml` or set your own in your shell/environment.
+```bash
+# Server-side tests (74 tests, 237 assertions)
+lein test
 
-Example variables:
+# Linter (0 errors expected; warnings are from third-party libs)
+lein lint
 
-```shell
-EMAIL_SERVER_URL: '' # Url to a smtp server
-EMAIL_ACCESS_KEY: '' # User for the mail server
-EMAIL_SECRET_KEY: '' # Password for the user
-EMAIL_SERVER_PORT: 587 # Mail server port
-EMAIL_FROM_ADDRESS: '' # Email address to send from, will default to 'no-reply@orcpub.com'
-EMAIL_ERRORS_TO: '' # Email address that errors will be sent to
-EMAIL_SSL: 'false' # Should SSL be used? Gmail requires this.
-DATOMIC_URL: datomic:free://datomic:4334/orcpub?password=yourpassword # Url for the database
-ADMIN_PASSWORD: supersecretpassword
-DATOMIC_PASSWORD: yourpassword  #(Same as above)
-SIGNATURE: '<change me to something unique>' # The Secret used to hash your password in the browser, 20+ characters recommended
+# ClojureScript compilation check
+lein cljsbuild once dev
 ```
 
-To change the datomic passwords you can do it through the environment variables `ADMIN_PASSWORD_OLD` and `DATOMIC_PASSWORD_OLD` start the container once, then set the `ADMIN_PASSWORD` and `DATOMIC_PASSWORD` to your new passwords.
+| Command | Scope | Catches |
+|---------|-------|---------|
+| `lein test` | Backend (JVM) | Logic, routes, DB, PDF errors |
+| `lein lint` | CLJ + CLJS | Typos, unused vars, style |
+| `lein cljsbuild once dev` | Frontend (CLJS) | Reagent/re-frame API changes |
+| `lein fig:build` | Full frontend | One-time CLJS compilation check |
 
-More on these passwords here.
-[ADMIN_PASSWORD](https://docs.datomic.com/on-prem/configuring-embedded.html#sec-2-1)
-[DATOMIC_PASSWORD](https://docs.datomic.com/on-prem/configuring-embedded.html#sec-2-1)
+### Frontend Hot-Reload
 
-## How do I contribute?
-Thank you for rolling for initiative!
+| Command | Mode | Use when |
+|---------|------|----------|
+| `./scripts/start.sh figwheel` | Headless watcher | Background/scripted startup |
+| `lein fig:dev` | Interactive REPL | You want a ClojureScript REPL in your terminal |
+| `lein fig:build` | One-time build | CI or quick compilation check |
 
-We work on forks, and branches.  Fork our repo, then create a new branch for any bug or new feature that you want to work on.
+**CSS** is compiled separately by Garden (`lein garden once` or `./scripts/start.sh garden` for auto-watch). Both Figwheel and Garden need to run during active frontend work.
 
-### Get started
+### Editors
 
-- Install Java: http://openjdk.java.net/ 
-- or http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
-- For MacOS/Linux Download [Datomic](https://www.datomic.com/get-datomic.html), and unzip it into a directory.
+Any editor with Clojure support works. Recommended options:
 
-* For Windows [DMV Datomic](https://github.com/Orcpub/orcpub/raw/refs/heads/develop/lib/datomic-free-0.9.5703.tar.gz) - newer versions do not work on Windows. it's a known issue that the Datomic team hasn't bothered to solve.  It has to do with the max characters that windows can hold for a path.
+| Editor | Plugin | REPL Connection |
+|--------|--------|----------------|
+| **VS Code** | [Calva](https://marketplace.visualstudio.com/items?itemName=betterthantomorrow.calva) | Jack-in with Leiningen, select `:dev` profile |
+| **IntelliJ** | [Cursive](https://cursive-ide.com/) | Built-in REPL support |
+| **Emacs** | [CIDER](https://cider.readthedocs.io/) | `C-c M-j` to jack in |
+| **Vim/Neovim** | [vim-fireplace](https://github.com/tpope/vim-fireplace) | Connect to nREPL |
 
-  Launch Datomic by going to shell/cmd prompt in the unzipped directory and run:
+### Environment Variables
 
-  On Windows:
+Configuration is managed through a `.env` file at the repository root. Copy `.env.example` to get started:
 
-  `bin\transactor config/samples/free-transactor-template.properties`
+```bash
+cp .env.example .env
+```
 
-  On Mac/Unix:
+Key variables:
 
-  `bin/transactor config/samples/free-transactor-template.properties`
+| Variable | Purpose | Default |
+|----------|---------|---------|
+| `DATOMIC_URL` | Database connection string | `datomic:dev://localhost:4334/orcpub` |
+| `SIGNATURE` | JWT signing secret (**required**) | dev default in `.lein-env` |
+| `PORT` | Web server port | `8890` |
+| `EMAIL_SERVER_URL` | SMTP server | (optional) |
+| `CSP_POLICY` | Content Security Policy mode | `strict` |
+| `DEV_MODE` | Enable dev features | `true` in dev |
 
+**How env vars are loaded:**
 
-- Install [leiningen](https://leiningen.org/#install)
-  - Mac / Linux: The latest version (2.9.1 as of this writing) should work.
-  - Windows: 2.9.3 Can be installed with [chocolatey](https://chocolatey.org/install) using `choco install lein --version 2.9.3`
+- **`./menu` and `./scripts/start.sh`** source `.env` automatically — recommended for most workflows.
+- **`lein repl` / `lein run`** read dev defaults from `.lein-env` (generated by `lein-environ` from the `:dev` profile). This includes a dev-only `SIGNATURE` so auth works out of the box.
+- **`.env` values** (via scripts) and **real env vars** override `.lein-env` defaults.
 
-- Download the code from your git fork
+See [docs/ENVIRONMENT.md](docs/ENVIRONMENT.md) for the full list and precedence rules.
 
-   `git clone git@github.com:yourrepo/your.git`
- 
-   Use the clone url in YOUR repo.
+---
 
-- cd into orcpub
-- create a new branch for the bug fix or feature you are about to work on `git checkout -b <your_new_branch_name>`
-- Pick an editor from the next steps.
-- run `lein with-profile +start-server repl`
-- run `lein figwheel` Once lein figwheel finishes, a browser will launch.
+## Docker Deployment
 
-You should have all three processes running: the Datomic transactor, lein repl, and lein figwheel. 
+For self-hosting a production instance.
 
-On the front end, When you save changes, it will auto compile and send all changes to the browser without the
-need to reload. After the compilation process is complete, you will get a Browser Connected REPL. 
+### Containers
 
-An easy way to try it is:
+| Container | Purpose |
+|-----------|---------|
+| `datomic` | Datomic Pro database transactor |
+| `orcpub` | JVM application server (Java 21) |
+| `web` | nginx reverse proxy with SSL termination |
 
-```clojure
-(js/alert "Am I connected?")
-```
+### Fresh Install
 
-and you should see an alert in the browser window.
-On the backend (PDF generation) you will have to restart lein repl to get your changes.
+```bash
+git clone https://github.com/orcpub/orcpub.git && cd orcpub
 
-Code away! and make your commits.
+# Interactive setup — generates .env, SSL certs, and directories
+./docker-setup.sh
 
-When your branch is ready create a pull request on our repo for a code review and merge back into our branch.
+# Pull pre-built images and start
+docker compose up -d
 
+# Create your first user (once containers are healthy)
+./docker-user.sh init                                   # from .env settings
+./docker-user.sh create <username> <email> <password>   # or directly
+```
 
-### Suggested Editors
+Visit `https://localhost` when running.
 
-### Emacs
-Emacs with [Cider](https://cider.readthedocs.io/en/latest/) you can run the command to start the Cider REPL:
+To build from source instead of pulling images:
 
+```bash
+docker compose -f docker-compose-build.yaml build
+docker compose -f docker-compose-build.yaml up -d
 ```
-C-c M-j
-```
-
-### Vim
-[vim-fireplace](https://github.com/tpope/vim-fireplace) provides a good way to interact with a running repl without leaving Vim.
-
-### IntelliJ / Cursive
-You can use the community edition of [IntelliJ IDEA](https://www.jetbrains.com/idea/download/) with the [Cursive plug-in](https://cursive-ide.com/).
 
-### VS Code
-You can use the open source edition of [Visual Studio Code](https://code.visualstudio.com/Download) with the Calva: Clojure & ClojureScript Interactive Programming, Clojure Code, and Bookmarks Extensions.
+For environment variable details, see [docs/ENVIRONMENT.md](docs/ENVIRONMENT.md).
 
-To start REPL with VS Code:
-* first launch datomic in a cmd window with the transactor snippet from above: `bin\transactor config/samples/free-transactor-template.properties`
-  * you can also just add that to a `.ps1` file inside your project for easier reference eg. `run-datomic ps1`
-* THEN jack-in using the `Leiningen + Legacy Figwheel`, `figwheel-native`, and select the `:dev` and optionally `:start-server`
+### Upgrading from Datomic Free (pre-2026)
 
-### REPL
+If you have an existing deployment using the old Java 8 / Datomic Free stack,
+your `./data` directory is **not compatible** with the new Datomic Pro transactor.
+The storage protocols (`datomic:free://` vs `datomic:dev://`) use different formats.
 
-Once you have a REPL, you can run this from within it to create the database, transact the database schema, and start the server:
+**You must migrate your database before upgrading.** The migration tool handles this:
 
-You only need to `(init-database)` ONCE.
+**Bare metal** — use `scripts/migrate-db.sh` which wraps the `bin/datomic` CLI:
 
-```clojure
-user=> (init-database)
-user=> (start-server)
+```bash
+./scripts/migrate-db.sh backup                    # With old (Free) transactor running
+# ... stop Free transactor, move ./data aside, start Pro transactor ...
+./scripts/migrate-db.sh restore "datomic:dev://localhost:4334/orcpub?password=..."
+./scripts/migrate-db.sh verify
 ```
 
-To stop you will need to do this:
+**Docker** — use `docker-migrate.sh` which runs `bin/datomic` inside containers:
 
-```clojure
-user=> (stop-server)
+```bash
+./docker-migrate.sh backup        # With old stack running
+docker compose down
+docker compose -f docker-compose-build.yaml build
+docker compose -f docker-compose-build.yaml up -d
+./docker-migrate.sh restore       # After new stack is healthy
+./docker-migrate.sh verify
 ```
 
-Within Emacs you should be able to save your file (C-x C-s) and reload it into the REPL (C-c C-w) to get your server-side changes to take effect. Within Vim with `vim-fireplace` you can eval a form with `cpp`, a paragraph with `cpip`, etc; check out its help file for more information. Regardless of editor, your client-side changes will take effect immediately when you change a CLJS or CLJC file while `lein figwheel` is running.
+Or run `./docker-migrate.sh full` for a guided migration.
 
-## Fundamentals
+The backup is storage-protocol-independent and writes to `./backup/`, so databases
+of any size (including 20GB+) are handled. See [docs/migration/datomic-data-migration.md](docs/migration/datomic-data-migration.md)
+for the full guide including disk space planning and troubleshooting.
 
-### Overview - from the original author - Larry
+### User Management
 
-The design is based around the concept of hierarchical option selections applying modifiers to a entity. 
-
-Consider D&D 5e as an example. In D&D 5e you build and maintain characters, which are entities, by selecting from a set of character options, such as race and class. When you select a race you will be afforded other option selections, such as subrace or subclass. 
-
-Option selections also apply modifiers to your character, such as 'Darkvision 60'. Option selections are defined in templates. An entity is really just a record of hierarchical choices made. 
-
-A built entity is a collection of derived attributes and functions derived from applying all of the modifiers of all the choices made. Here is some pseudocode to this more concrete:
-
-```clojure
-user> (def character-entity {:options {:race
-                                       {:key :elf,
-                                        :options {:subrace {:key :high-elf}}}}})
-                                          
-user> (def template {:selections [{:key :race
-                                   :min 1
-                                   :max 1
-                                   :options [{:name "Elf"
-                                              :key :elf
-                                              :modifiers [(modifier ?dex-bonus (+ ?dex-bonus 2))
-                                                          (modifier ?race "Elf")]
-                                              :selections [{:key :subrace
-                                                            :min 1
-                                                            :max 1
-                                                            :options [{:name "High Elf"
-                                                                       :key :high-elf
-                                                                       :modifiers [(modifier ?subrace "High Elf")
-                                                                                   (modifier ?int-bonus (+ ?int-bonus 1))]}]}]}]}]}
-                                                                 
-user> (def built-character (build-entity charater-entity template))
-
-user> built-character
-{:race "Elf"
- :subrace "High Elf"
- :dex-bonus 2
- :int-bonus 1}
+```bash
+./docker-user.sh create <user> <email> <password>   # Create a verified user
+./docker-user.sh batch users.txt                     # Bulk create from file
+./docker-user.sh list                                # List all users
+./docker-user.sh check <user>                        # Check user status
+./docker-user.sh verify <user>                       # Verify unverified user
 ```
 
-This may seem overly complicated, but after my work on the Original Orcpub.com, I realized that this really the only real correct solution as it models how character building actually works. 
+See [docs/docker-user-management.md](docs/docker-user-management.md) for details.
 
-The original Orcpub stored characters essentially like the built-character above with a centralized set of functions to compute other derived values. This is the most straightforward solution, but this has flaws:
+### Importing Homebrew Content
 
-* You have difficulty figuring out which options have been selected and which ones still need to be selected.
-* You keep having to patch your data as your application evolves. For example, say you store a character's known spells as a list of spell IDs. Then you realize later that users want to also know what their attack bonus is for each spell. At the very least you'll have to make some significant changes to every stored character.
-* It is not scalable. Every time you add in more options, say from some new sourcebook, you have to pile on more conditional logic in your derived attribute functions. Believe me, this gets unmanageable very quickly.
-* It's not reusable in, say, a Rifts character builder.
+Place your `.orcbrew` file at `./deploy/homebrew/homebrew.orcbrew` — it loads automatically when clients connect. All homebrew must be combined into this single file.
 
-The architecture fixes these problems:
+### Data Management
 
-* You know exactly which options have been selected, which have not, and how every modifier is arrived at, given the entity and the most up-to-date templates.
-* You don't need to patch up stored characters if you find a bug since characters are stored as just a set of very generic choices.
-* It's scalable and pluggable. Most logic for derived values is stored inside of the options that create or modify these derived values. Many rules within D&D 5e allow for picking the best of alternate calculations for a particular attribute (AC comes to mind). With the OrcPub2 solution you can have an option easily override or modify a calculation without any other code having to know about it. This makes for a MUCH more manageable solution and makes it easy to add options as plugins. 
-* The entity builder engine could be used for building any character in any system. In fact, it could be used to build any entity in any system. For example, say you have a game system with well-defined mechanics building a vehicle, the entity builder engine could do that.
+- **Database**: Stored in `./data/`. Back up this directory when Datomic is stopped. Delete it to start fresh.
+- **Logs**: Stored in `./logs/`. Safe to clean up; does not affect character data. Set up log rotation for production.
 
-### Modifiers
+### Scripts Reference
 
-Character modifiers are tough to get right. As mentioned above, the naive approach is to try to centralize all logic for a calculation in one place. For example you might have a character that looks like this:
+| Script | Purpose |
+|--------|---------|
+| `scripts/migrate-db.sh` | Migrate data from Datomic Free to Pro (bare metal) |
+| `docker-migrate.sh` | Migrate data from Datomic Free to Pro (Docker) |
+| `docker-setup.sh` | Generate `.env`, SSL certs, and directories |
+| `docker-user.sh` | Create, verify, and list users in the database |
 
-```clojure
-{:race "Elf"
- :subrace "High Elf"
- :base-abilities {:int 12
-                  :dex 13}}
-```
+---
 
-Given this, you might start calculating initiative as follows:
+## Architecture
 
-```clojure
-(defn ability-modifier [value] ...)
-
-(defn race-dexterity [character]
-  (case (:race character)
-    "Elf" 2
-    ...))
-    
-(defn subrace-dexterity [character] ...)
-
-(defn base-ability [character ability-key]
-  (get-in character [:base-abilities ability-key]))
-
-(defn dexterity [character]
-  (+ (base-ability character :dex)
-     (race-dexterity character)
-     (subrace-dexterity character)))
-     
-(defn initiative [character]
-   (ability-modifier (dexterity character)))
-```
+*From the original author, Larry Christensen*
 
-Consider what happens when you need to account for the 'Improved Initiative' feat, you'll need to add the calculation to the initiative function. Okay, this is probably still manageable. 
+### Overview
 
-Then consider what happens when some cool subclass comes along that gets an initiative bonus at 9th level. Now it starts getting more unmanageable. When you try to add every option from every book into the mix, each of which might have some totally new condition for modifying initiative, you quickly end up with a nauseating ball of mud that will be scary to work with.
+The design is based around the concept of hierarchical option selections applying modifiers to an entity.
 
-This method decentralizes most calculations using modifiers associated with selected character options. When you add options you also specify any modifiers associated with that option. 
+In D&D 5e you build characters (entities) by selecting from character options like race and class. Each selection may offer further sub-selections (subrace, subclass) and applies modifiers to the character (e.g., "Darkvision 60", "+2 Dexterity").
 
-For example, in the entity example above, we have the elf option:
+Option selections are defined in **templates**. An entity is just a record of hierarchical choices. A **built entity** is a collection of derived attributes computed by applying all modifiers from all choices.
 
 ```clojure
-{:name "Elf"
-  :key :elf
-  :modifiers [(modifier ?dex-bonus (+ ?dex-bonus 2))
-              (modifier ?race "Elf")]
-  ...}
+;; An entity records choices
+(def character-entity {:options {:race
+                                 {:key :elf,
+                                  :options {:subrace {:key :high-elf}}}}})
+
+;; A template defines available options and their modifiers
+(def template {:selections [{:key :race
+                             :min 1 :max 1
+                             :options [{:name "Elf"
+                                        :key :elf
+                                        :modifiers [(modifier ?dex-bonus (+ ?dex-bonus 2))
+                                                    (modifier ?race "Elf")]
+                                        :selections [{:key :subrace
+                                                      :min 1 :max 1
+                                                      :options [{:name "High Elf"
+                                                                 :key :high-elf
+                                                                 :modifiers [(modifier ?subrace "High Elf")
+                                                                             (modifier ?int-bonus (+ ?int-bonus 1))]}]}]}]}]})
+
+;; Building resolves all modifiers into concrete values
+(def built-character (build-entity character-entity template))
+;; => {:race "Elf" :subrace "High Elf" :dex-bonus 2 :int-bonus 1}
 ```
 
-If you build a character that has this :elf option selected, the modifiers will be applied the the :dex-bonus and :race in the built character. Let's look closer at the ?dex-bonus modifier. 
+### Why This Architecture?
 
-The second argument to the modifier function is a special symbol that prefixes a ? on the attribute instead of the : we'll expect on the output attribute key, in this case ?dex-bonus will be modifying the value output to the :dex-bonus attribute. 
+The naive approach stores characters as flat attribute maps with centralized calculation functions. This has problems:
 
-The third argument is a modifier body. 
+- Hard to track which options are selected vs. still needed
+- Data patches required as the application evolves
+- Centralized calculation functions become unmanageable as options grow
+- Not reusable across game systems
 
-This can be any Clojure expression you like, but if you will be deriving your new value from an old value or from another attribute you must use the ?<attribute-name> reference. In this example we updating ?dex-bonus by adding 2 to it. 
+The entity/template/modifier architecture fixes these:
 
-Modifiers can be derived from attributes that are derived from other attributes, and so forth.
+- You know exactly which options are selected and how every value is derived
+- Characters are stored as generic choices — no data migration needed when templates change
+- Logic for derived values lives with the options that create them, making it scalable and pluggable
+- The engine works for any entity in any system (characters, vehicles, etc.)
 
-For example, we may have a character whose options provide the following chain of modifiers:
+### Modifiers
+
+Modifiers use `?<attribute-name>` references to build dependency chains:
 
 ```clojure
 (modifier ?dexterity 12)
@@ -456,41 +456,45 @@ For example, we may have a character whose options provide the following chain o
 (modifier ?dex-mod (ability-mod ?dexterity))
 (modifier ?int-mod (ability-mod ?intelligence))
 (modifier ?initiative ?dex-mod)
-(modifier ?initiative (+ ?initiative (* 2 ?intelligence-mod)))
+(modifier ?initiative (+ ?initiative (* 2 ?int-mod)))
 ```
 
-### Modifier Order is Important!
+**Order matters.** Since modifiers can reference attributes set by other modifiers, the system builds a dependency graph and applies modifiers in topologically sorted order. The `?<attribute-name>` references are what make this dependency tracking possible.
 
-Consider what would happen if we applied the above modifiers in a different order:
+---
 
-```clojure
-(modifier ?initiative (+ ?initiative (* 2 ?int-mod)))
-(modifier ?dexterity 12)
-(modifier ?intelligence 15)
-(modifier ?dex-mod (ability-mod ?dexterity))
-(modifier ?int-mod (ability-mod ?intelligence))
-(modifier ?initiative ?dex-mod)
-```
-Either our initiative calculation would throw an error our it would be completely wrong since the other derived attributes it depends on have not been applied yet. There is no logical ordering for which options should be applied, so modifiers can very well be provided out of order. 
+## Contributing
+
+1. Fork the repository
+2. Create a feature branch: `git checkout -b my-feature`
+3. Make your changes
+4. Run validation: `lein test && lein lint`
+5. Submit a pull request against `develop`
 
-For this reason we have to build a dependency graph of derived attributes and then apply the modifiers in topologically sorted order. Identifying these dependencies is why we use the ?<attribute-name> references. 
+We cannot accept pull requests containing copyrighted D&D content. You're welcome to fork and add content for private use.
 
-## FAQs
-**Q: I'm a newb Clojure developer looking to get my feet wet, where to start?**
+---
 
-**A:** *First I would start by getting the fundamentals down at https://4clojure.oxal.org/ From there you might add some unit tests or pick up an open issue on the "Issues" tab (and add unit tests with it).*
+## FAQ
 
+**Q: I'm new to Clojure — where do I start?**
 
-**Q: Your DSL for defining character options is pretty cool, I can build any type of character option out there. How about I add a bunch on content from the Player's Handbook?**
+A: Try [4Clojure exercises](https://4clojure.oxal.org/) for fundamentals, then pick up a small issue from the Issues tab. The [dev tooling guide](docs/migration/dev-tooling.md) explains the project-specific tooling.
 
-**A:** *We love your enthusiasm, but we cannot accept pull requests containing copyrighted content. We do, however, encourage you to fork us and create your own private version with the full content options.*
+**Q: Can I add content from the Player's Handbook?**
+
+A: We cannot accept PRs with copyrighted content. Fork the project and add content for your own private use.
+
+---
 
 ## Disclaimer
 
-The use of this tool is meant for use for your own use and your own content. It is only meant and should only be used on campaigns with content that you legally possess. This tool is not affiliated with Roll20, or Wizards of the Coast.
+This tool is for personal use with content you legally possess. It is not affiliated with Roll20 or Wizards of the Coast.
 
 ## Credits
-Larry Christensen original author of [Orcpub2](https://github.com/larrychristensen/orcpub)
+
+Larry Christensen — original author of [OrcPub2](https://github.com/larrychristensen/orcpub)
 
 ## License
-[EPL-2.0](LICENSE)
\ No newline at end of file
+
+[EPL-2.0](LICENSE)
diff --git a/deploy/start.sh b/deploy/start.sh
index 538b1dc5a..76fdde4d2 100644
--- a/deploy/start.sh
+++ b/deploy/start.sh
@@ -10,18 +10,18 @@ if [ -z "$DATOMIC_PASSWORD" ]; then
   exit 1
 fi
 
-sed "/host=datomic/a alt-host=${ALT_HOST:-127.0.0.1}" -i  /datomic/transactor.properties
-sed "s/# storage-admin-password=/storage-admin-password=${ADMIN_PASSWORD}/" -i /datomic/transactor.properties
-sed "s/# storage-datomic-password=/storage-datomic-password=${DATOMIC_PASSWORD}/" -i /datomic/transactor.properties
+sed -i "/host=datomic/a alt-host=${ALT_HOST:-127.0.0.1}" /datomic/transactor.properties
+sed -i "s/# storage-admin-password=/storage-admin-password=${ADMIN_PASSWORD}/" /datomic/transactor.properties
+sed -i "s/# storage-datomic-password=/storage-datomic-password=${DATOMIC_PASSWORD}/" /datomic/transactor.properties
 
 if [ -n "$ADMIN_PASSWORD_OLD" ]; then
-  sed "s/# old-storage-admin-password=/old-storage-admin-password=$ADMIN_PASSWORD_OLD/" -i /datomic/transactor.properties
+  sed -i "s/# old-storage-admin-password=/old-storage-admin-password=$ADMIN_PASSWORD_OLD/" /datomic/transactor.properties
 fi
 
 if [ -n "$DATOMIC_PASSWORD_OLD" ]; then
-  sed "s/# old-storage-datomic-password=/old-storage-datomic-password=$DATOMIC_PASSWORD_OLD/" -i /datomic/transactor.properties
+  sed -i "s/# old-storage-datomic-password=/old-storage-datomic-password=$DATOMIC_PASSWORD_OLD/" /datomic/transactor.properties
 fi
 
-sed "s/# encrypt-channel=true/encrypt-channel=${ENCRYPT_CHANNEL:-true}/" -i /datomic/transactor.properties
+sed -i "s/# encrypt-channel=true/encrypt-channel=${ENCRYPT_CHANNEL:-true}/" /datomic/transactor.properties
 
 /datomic/bin/transactor /datomic/transactor.properties
diff --git a/dev.cljs.edn b/dev.cljs.edn
new file mode 100644
index 000000000..dc4244ac0
--- /dev/null
+++ b/dev.cljs.edn
@@ -0,0 +1,13 @@
+;; Figwheel-main build: dev
+;; Run with: lein fig:dev
+^{:watch-dirs ["web/cljs" "src/cljc" "src/cljs"]
+  :css-dirs ["resources/public/css"]
+  :ring-server-options {:port 3449}
+  :open-url "http://localhost:8890"}
+{:main orcpub.core
+ :output-to "resources/public/js/compiled/orcpub.js"
+ :output-dir "resources/public/js/compiled/out"
+ :asset-path "/js/compiled/out"
+ :optimizations :none
+ :closure-defines {goog.DEBUG true}
+ :preloads [devtools.preload]}
diff --git a/dev/user.clj b/dev/user.clj
index 694b22b19..82ba7926e 100644
--- a/dev/user.clj
+++ b/dev/user.clj
@@ -1,29 +1,46 @@
 (ns user
   (:require [clojure.java.io :as io]
+            [clojure.string :as str]
             [com.stuartsierra.component :as component]
-            [figwheel-sidecar.repl-api :as f]
             [datomic.api :as datomic]
+            [buddy.hashers :as hashers]
             [orcpub.routes :as r]
             [orcpub.system :as s]
-            [orcpub.db.schema :as schema]))
+            [orcpub.db.schema :as schema]
+            [orcpub.config :as config])
+  (:gen-class))
 
-(alter-var-root #'*print-length* (constantly 50))
-
-;; user is a namespace that the Clojure runtime looks for and
-;; loads if its available
-
-;; You can place helper functions in here. This is great for starting
-;; and stopping your webserver and other development services
-
-;; The definitions in here will be available if you run "lein repl" or launch a
-;; Clojure repl some other way
+;; ---------------------------------------------------------------------------
+;; Dev tooling hub — REPL helpers and CLI entrypoint.
+;;
+;; The `user` namespace is special in Clojure: the runtime automatically looks
+;; for and loads it when starting a REPL. Any functions defined here are
+;; immediately available when you run `lein repl`.
+;;
+;; This file lives in dev/ and is only on the classpath in :dev and :init-db
+;; profiles. It is NOT included in the production uberjar — keeping dev
+;; tooling (user creation, DB init, Figwheel) out of production builds.
+;;
+;; Two ways to use it:
+;;   1. REPL: (start-server), (init-database), (create-user! (conn) {...}), etc.
+;;   2. CLI:  lein with-profile init-db run -m user <command> [args]
+;;            (see -main at bottom for available commands)
+;;
+;; The :init-db profile skips ClojureScript/Garden compilation for fast CLI
+;; startup. It includes dev/ in source-paths so this file is loadable.
+;; ---------------------------------------------------------------------------
 
-;; You have to ensure that the libraries you :require are listed in your dependencies
+;; Lazy-load figwheel-main only when needed (avoids loading it for server-only REPL)
+(def ^:private fig-api
+  (delay
+    (try
+      (require 'figwheel.main.api)
+      (find-ns 'figwheel.main.api)
+      (catch Exception e
+        (println "figwheel.main.api not available:" (.getMessage e))
+        nil))))
 
-;; Once you start down this path
-;; you will probably want to look at
-;; tools.namespace https://github.com/clojure/tools.namespace
-;; and Component https://github.com/stuartsierra/component
+(alter-var-root #'*print-length* (constantly 50))
 
 (defonce -server (atom nil))
 
@@ -72,11 +89,15 @@
 
 (defn init-database
   ([]
-   (init-database :free))
+   (init-database nil))
   ([mode]
-   (when-not (contains? #{:free :dev :mem} mode)
-     (throw (IllegalArgumentException. (str "Unknown db type " mode))))
-   (let [db-uri (str "datomic" mode "://localhost:4334/orcpub")]
+   (let [env-uri (config/datomic-env)
+         db-uri (if (some-> env-uri not-empty)
+                  env-uri
+                  (let [m (or mode :dev)]
+                    (when-not (contains? #{:free :dev :mem} m)
+                      (throw (IllegalArgumentException. (str "Unknown db type " m))))
+                    (str "datomic" m "://localhost:4334/orcpub")))]
      (datomic/create-database db-uri)
      (let [conn (datomic/connect db-uri)]
        (datomic/transact conn schema/all-schemas)))))
@@ -106,25 +127,22 @@
 
 (defn fig-start
   "This starts the figwheel server and watch based auto-compiler.
+  Uses figwheel-main 0.2.20 with dev.cljs.edn build config.
 
   Afterwards, call (cljs-repl) to connect."
   ([]
    (fig-start "dev"))
   ([build-id]
-   ;; this call will only work as long as your :cljsbuild and
-   ;; :figwheel configurations are at the top level of your project.clj
-   ;; and are not spread across different lein profiles
-
-   ;; otherwise you can pass a configuration into start-figwheel! manually
-   (f/start-figwheel!
-     {:figwheel-options {}
-      :build-ids [build-id]
-      :all-builds (get-cljs-build build-id)})))
+   (if-let [api @fig-api]
+     ((ns-resolve api 'start) build-id)
+     (println "figwheel-main not available. Run 'lein fig:dev' instead."))))
 
 (defn fig-stop
   "Stop the figwheel server and watch based auto-compiler."
   []
-  (f/stop-figwheel!))
+  (if-let [api @fig-api]
+    ((ns-resolve api 'stop-all))
+    (println "figwheel-main not available.")))
 
 ;; if you are in an nREPL environment you will need to make sure you
 ;; have setup piggieback for this to work
@@ -132,5 +150,149 @@
   "Launch a ClojureScript REPL that is connected to your build and host environment.
 
   (NB: Call fig-start first.)"
+  ([]
+   (cljs-repl "dev"))
+  ([build-id]
+   (if-let [api @fig-api]
+     ((ns-resolve api 'cljs-repl) build-id)
+     (println "figwheel-main not available."))))
+
+(defn add-test-user
+  "Creates a test user for development, already marked as verified. Only runs if ORCPUB_ENV=dev."
   []
-  (f/cljs-repl))
+  (if (= (System/getenv "ORCPUB_ENV") "dev")
+    (let [username "test"
+          email "test@example.com"
+          password "testpass"]
+      (r/register {:username username :email email :password password :verified true}))
+    (println "add-test-user is disabled outside dev environment.")))
+
+;; ---------------------------------------------------------------------------
+;; Standalone DB connection (no running server required)
+;; ---------------------------------------------------------------------------
+
+(defn conn
+  "Connect to Datomic without starting the full server.
+   Uses DATOMIC_URL env or default."
+  ([] (conn (config/get-datomic-uri)))
+  ([uri] (datomic/connect uri)))
+
+;; ---------------------------------------------------------------------------
+;; User CRUD (for CLI and REPL use — does not require a running server)
+;; ---------------------------------------------------------------------------
+
+(defn email-exists? [db email]
+  (boolean (datomic/q '[:find ?e . :in $ ?email :where [?e :orcpub.user/email ?email]]
+                      db (str/lower-case email))))
+
+(defn username-exists? [db username]
+  (boolean (datomic/q '[:find ?e . :in $ ?username :where [?e :orcpub.user/username ?username]]
+                      db username)))
+
+(defn create-user!
+  "Create a user directly in the database. Does not require a running server.
+
+  Usage from REPL:
+    (create-user! (conn) {:username \"bob\" :email \"bob@example.com\" :password \"pass\" :verify? true})
+
+  Usage from CLI:
+    lein with-profile init-db run -m user create-user bob bob@example.com pass verify"
+  [conn {:keys [username email password verify? send-updates?] :or {verify? false send-updates? false}}]
+  (let [db (datomic/db conn)
+        email (when email (str/lower-case (str/trim email)))
+        username (when username (str/trim username))]
+    (cond
+      (and email (email-exists? db email))
+      (throw (ex-info "Email already exists" {:email email}))
+
+      (and username (username-exists? db username))
+      (throw (ex-info "Username already exists" {:username username}))
+
+      :else
+      (let [now (java.util.Date.)
+            pw (hashers/encrypt (or password "password"))
+            tx {:orcpub.user/email email
+                :orcpub.user/username username
+                :orcpub.user/password pw
+                :orcpub.user/created now
+                :orcpub.user/send-updates? (boolean send-updates?)
+                :orcpub.user/verified? (boolean verify?)}]
+        @(datomic/transact conn [tx])))))
+
+(defn verify-user!
+  "Mark an existing user as verified by username or email.
+   Does not require a running server."
+  [conn username-or-email]
+  (let [db (datomic/db conn)
+        user (r/find-user-by-username-or-email db username-or-email)]
+    (if-not user
+      (throw (ex-info "User not found" {:username-or-email username-or-email}))
+      @(datomic/transact conn [[:db/add (:db/id user) :orcpub.user/verified? true]]))))
+
+(defn delete-user!
+  "Remove a user entity by username or email. Dev only."
+  [conn username-or-email]
+  (let [db (datomic/db conn)
+        user (r/find-user-by-username-or-email db username-or-email)]
+    (if-not user
+      (throw (ex-info "User not found" {:username-or-email username-or-email}))
+      @(datomic/transact conn [[:db/retractEntity (:db/id user)]]))))
+
+;; ---------------------------------------------------------------------------
+;; CLI entrypoint — used by scripts/start.sh, scripts/create_dummy_user.sh
+;;
+;; Usage:
+;;   lein with-profile init-db run -m user init-db
+;;   lein with-profile init-db run -m user init-db --add-test-user
+;;   lein with-profile init-db run -m user create-user <name> <email> <pass> [verify]
+;;   lein with-profile init-db run -m user verify-user <name-or-email>
+;;   lein with-profile init-db run -m user delete-user <name-or-email>
+;; ---------------------------------------------------------------------------
+
+(defn -main [& [cmd & args]]
+  (try
+    (case cmd
+      "init-db"
+      (let [uri (config/get-datomic-uri)]
+        (println "Ensuring database exists at" uri)
+        (datomic/create-database uri)
+        (let [c (datomic/connect uri)]
+          (println "Applying schema...")
+          (datomic/transact c schema/all-schemas)
+          (println "DB init done.")
+          (when (some #{"--add-test-user"} args)
+            (println "Creating test user...")
+            (add-test-user))))
+
+      "create-user"
+      (let [[username email password & flags] args
+            verify? (some #{"verify"} flags)
+            c (conn)]
+        (println "Creating user:" username email "verified?" (boolean verify?))
+        (create-user! c {:username username :email email :password password :verify? verify?})
+        (println "User created."))
+
+      "verify-user"
+      (do (verify-user! (conn) (first args))
+          (println "User verified:" (first args)))
+
+      "delete-user"
+      (do (delete-user! (conn) (first args))
+          (println "User deleted:" (first args)))
+
+      ;; default
+      (do (println "Usage: lein with-profile init-db run -m user <command> [args]")
+          (println "")
+          (println "Commands:")
+          (println "  init-db [--add-test-user]   Create database and apply schema")
+          (println "  create-user <u> <e> <p> [verify]   Create a user")
+          (println "  verify-user <name-or-email>        Mark user as verified")
+          (println "  delete-user <name-or-email>        Delete a user")
+          (System/exit 1)))
+    (catch Exception e
+      (binding [*out* *err*]
+        (println "Error:" (.getMessage e)))
+      (System/exit 1)))
+  ;; Datomic peer metrics thread is non-daemon and prevents clean JVM exit.
+  ;; Force exit after successful command completion.
+  (System/exit 0))
diff --git a/docker-compose-build.yaml b/docker-compose-build.yaml
index 015b6daa8..ca66cad9c 100644
--- a/docker-compose-build.yaml
+++ b/docker-compose-build.yaml
@@ -14,13 +14,15 @@ services:
       EMAIL_ERRORS_TO: ${EMAIL_ERRORS_TO:-}
       EMAIL_SSL: ${EMAIL_SSL:-FALSE}
       EMAIL_TLS: ${EMAIL_TLS:-FALSE}
-      DATOMIC_URL: ${DATOMIC_URL:-datomic:free://datomic:4334/orcpub?password=change-me}
+      # Datomic Pro with dev storage protocol (required for Java 21 support)
+      DATOMIC_URL: ${DATOMIC_URL:-datomic:dev://datomic:4334/orcpub?password=change-me}
       SIGNATURE: ${SIGNATURE:-change-me-to-something-unique}
     depends_on:
       datomic:
         condition: service_healthy
     healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8890/"]
+      # BusyBox wget (Alpine): only -q and --spider are supported
+      test: ["CMD", "wget", "-q", "--spider", "http://localhost:8890/"]
       interval: 5s
       timeout: 3s
       retries: 20
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 08e508977..545e4bff6 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,7 +1,9 @@
 ---
 services:
   orcpub:
-    image: orcpub/orcpub:latest
+    # No :latest tag on Docker Hub — pin to newest published version.
+    # Override with ORCPUB_TAG env var for custom builds.
+    image: orcpub/orcpub:${ORCPUB_TAG:-release-v2.5.0.27}
     environment:
       PORT: ${PORT:-8890}
       EMAIL_SERVER_URL: ${EMAIL_SERVER_URL:-}
@@ -12,13 +14,15 @@ services:
       EMAIL_ERRORS_TO: ${EMAIL_ERRORS_TO:-}
       EMAIL_SSL: ${EMAIL_SSL:-FALSE}
       EMAIL_TLS: ${EMAIL_TLS:-FALSE}
-      DATOMIC_URL: ${DATOMIC_URL:-datomic:free://datomic:4334/orcpub?password=change-me}
+      # Datomic Pro with dev storage protocol (required for Java 21 support)
+      DATOMIC_URL: ${DATOMIC_URL:-datomic:dev://datomic:4334/orcpub?password=change-me}
       SIGNATURE: ${SIGNATURE:-change-me-to-something-unique}
     depends_on:
       datomic:
         condition: service_healthy
     healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8890/"]
+      # BusyBox wget (Alpine): only -q and --spider are supported
+      test: ["CMD", "wget", "-q", "--spider", "http://localhost:8890/"]
       interval: 5s
       timeout: 3s
       retries: 20
diff --git a/docker-migrate.sh b/docker-migrate.sh
new file mode 100755
index 000000000..d7ee74859
--- /dev/null
+++ b/docker-migrate.sh
@@ -0,0 +1,457 @@
+#!/usr/bin/env bash
+# =============================================================================
+# docker-migrate.sh — Datomic Free → Pro migration for Docker deployments
+# =============================================================================
+# Wraps the bin/datomic CLI (backup-db / restore-db) in Docker containers.
+# For bare-metal, use scripts/migrate-db.sh instead.
+#
+# The backup format is storage-protocol-independent — a Free backup restores
+# into Pro. Uses bind-mounted volumes so 20GB+ databases write directly to
+# the host filesystem without filling the container overlay.
+#
+# Note: Passwords in database URIs are passed as command-line arguments to
+# docker run, which makes them visible in process lists and docker inspect.
+# This is acceptable for self-hosted/dev environments.
+#
+# Usage:
+#   ./docker-migrate.sh backup     Back up the running (Free) database
+#   ./docker-migrate.sh restore    Restore into the new (Pro) database
+#   ./docker-migrate.sh verify     Verify backup integrity
+#   ./docker-migrate.sh full       Guided full migration (backup → swap → restore)
+#
+# Prerequisites:
+#   - Docker Compose v2 (docker compose plugin)
+#   - For backup:  OLD datomic container must be running
+#   - For restore: NEW datomic container must be running
+#   - .env file must exist (run docker-setup.sh first)
+#
+# See docs/migration/datomic-data-migration.md for the full guide.
+# =============================================================================
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+BACKUP_DIR="${SCRIPT_DIR}/backup"
+
+# Run all docker compose commands from the repo root so project context
+# is correct regardless of the caller's working directory.
+cd "$SCRIPT_DIR"
+
+# Interrupt handler — warn about potentially incomplete operations
+trap 'echo ""; error "Interrupted. If a backup or restore was in progress, it may be incomplete."; exit 130' INT TERM
+
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
+
+# Colors (disabled when not a terminal)
+if [[ -t 1 ]] && [[ -z "${NO_COLOR:-}" ]]; then
+  _green='\033[0;32m' _yellow='\033[1;33m'
+  _red='\033[0;31m'   _cyan='\033[0;36m' _nc='\033[0m'
+else
+  _green='' _yellow='' _red='' _cyan='' _nc=''
+fi
+
+info()   { printf '%b[OK]%b    %s\n' "$_green" "$_nc" "$*"; }
+warn()   { printf '%b[WARN]%b  %s\n' "$_yellow" "$_nc" "$*"; }
+error()  { printf '%b[ERROR]%b %s\n' "$_red" "$_nc" "$*" >&2; }
+header() { printf '\n%b=== %s ===%b\n\n' "$_cyan" "$*" "$_nc"; }
+
+usage() {
+  cat <<'USAGE'
+Datomic Free → Pro Migration (Docker)
+
+Migrates data between Datomic storage protocols using the bin/datomic CLI
+inside Docker containers. Backup/restore use bind-mounted volumes so
+databases of any size are handled without filling the container overlay.
+
+Usage:
+  ./docker-migrate.sh backup     Back up the running (Free) database
+  ./docker-migrate.sh restore    Restore into the new (Pro) database
+  ./docker-migrate.sh verify     Verify backup integrity
+  ./docker-migrate.sh full       Guided full migration (backup → swap → restore)
+
+Options (must come BEFORE the command):
+  --compose-yaml <file>  Override compose file for rebuild (default: docker-compose-build.yaml)
+  --old-uri <uri>        Override source database URI detection
+  --new-uri <uri>        Override target database URI detection
+  --help                 Show this help
+
+Examples:
+  # Step-by-step (recommended for large databases)
+  ./docker-migrate.sh backup           # With old stack running
+  docker compose down
+  docker compose -f docker-compose-build.yaml up -d
+  ./docker-migrate.sh restore          # After new stack is healthy
+  ./docker-migrate.sh verify           # Verify backup integrity
+
+  # Automatic
+  ./docker-migrate.sh full
+USAGE
+}
+
+# Source .env for password/URI configuration.
+# Uses a subshell to avoid exporting all .env vars (which could set Docker
+# Compose's COMPOSE_FILE env var and change compose behavior globally).
+load_env() {
+  local env_file="${SCRIPT_DIR}/.env"
+  if [[ -f "$env_file" ]]; then
+    # Read specific variables we need rather than exporting everything
+    # shellcheck disable=SC1090
+    DATOMIC_PASSWORD="${DATOMIC_PASSWORD:-$(. "$env_file" && echo "${DATOMIC_PASSWORD:-}")}"
+  fi
+}
+
+# Check that Docker Compose v2 is available
+check_docker_compose() {
+  if ! docker compose version &>/dev/null; then
+    error "Docker Compose v2 plugin required ('docker compose')."
+    error "The standalone 'docker-compose' v1 is not supported."
+    exit 1
+  fi
+}
+
+# Detect the Docker Compose network from the running datomic container.
+# Compose creates a default network that includes all services; we take the
+# first network which is that default in the common single-network case.
+get_compose_network() {
+  local cid
+  cid=$(docker compose ps -q datomic 2>/dev/null || true)
+  if [[ -z "$cid" ]]; then
+    error "No running datomic container found. Is the stack running?"
+    exit 1
+  fi
+  docker inspect "$cid" \
+    -f '{{range $k,$v := .NetworkSettings.Networks}}{{println $k}}{{end}}' \
+    | head -1
+}
+
+# Detect the image of the running datomic container
+get_datomic_image() {
+  local cid
+  cid=$(docker compose ps -q datomic 2>/dev/null || true)
+  if [[ -z "$cid" ]]; then
+    error "No running datomic container found. Is the stack running?"
+    exit 1
+  fi
+  docker inspect "$cid" -f '{{.Config.Image}}'
+}
+
+# Detect DATOMIC_URL from the running orcpub container's environment.
+# The orcpub container (the peer) holds the connection URI including password;
+# the datomic container (the transactor) doesn't have DATOMIC_URL.
+get_container_datomic_url() {
+  local cid
+  cid=$(docker compose ps -q orcpub 2>/dev/null || true)
+  if [[ -z "$cid" ]]; then
+    return 1
+  fi
+  docker inspect "$cid" \
+    -f '{{range .Config.Env}}{{println .}}{{end}}' \
+    | grep '^DATOMIC_URL=' | cut -d= -f2- || true
+}
+
+# Wait for a compose service to become healthy
+wait_healthy() {
+  local service="$1"
+  local max_wait="${2:-180}"
+  local waited=0
+  local cid=""
+  local status=""
+
+  printf "Waiting for %s to become healthy" "$service"
+  while [[ $waited -lt $max_wait ]]; do
+    cid=$(docker compose ps -q "$service" 2>/dev/null || true)
+    if [[ -n "$cid" ]]; then
+      status=$(docker inspect --format='{{.State.Health.Status}}' "$cid" 2>/dev/null || echo "starting")
+      if [[ "$status" == "healthy" ]]; then
+        echo ""
+        info "$service is healthy (${waited}s)"
+        return 0
+      fi
+      if [[ "$status" == "unhealthy" ]]; then
+        echo ""
+        error "$service reported unhealthy"
+        docker compose logs "$service" | tail -20
+        exit 1
+      fi
+    fi
+    printf "."
+    sleep 2
+    waited=$((waited + 2))
+  done
+  echo ""
+  error "$service did not become healthy within ${max_wait}s"
+  error "Check: docker compose ps; docker compose logs $service"
+  exit 1
+}
+
+# Run bin/datomic CLI in a temporary container that shares the compose
+# network and bind-mounts the backup directory.
+#
+# Uses the datomic image (which has the full Datomic distribution at
+# WORKDIR=/datomic, so relative path bin/datomic resolves to /datomic/bin/datomic).
+run_datomic_cli() {
+  local image="$1"
+  shift
+
+  local network
+  network=$(get_compose_network)
+
+  docker run --rm \
+    --network="$network" \
+    -v "${BACKUP_DIR}:/backup" \
+    "$image" \
+    bin/datomic "$@"
+}
+
+# ---------------------------------------------------------------------------
+# Commands
+# ---------------------------------------------------------------------------
+
+do_backup() {
+  header "Backup — Datomic Database"
+
+  local datomic_image
+  datomic_image=$(get_datomic_image)
+  info "Datomic image: $datomic_image"
+
+  local old_url="${OLD_URI:-}"
+  if [[ -z "$old_url" ]]; then
+    old_url=$(get_container_datomic_url 2>/dev/null || true)
+  fi
+  if [[ -z "$old_url" ]]; then
+    old_url="datomic:free://datomic:4334/orcpub"
+    warn "Could not detect DATOMIC_URL; using default: $old_url"
+  fi
+  info "Source URI: $old_url"
+
+  mkdir -p "$BACKUP_DIR"
+
+  # Handle existing backup safely
+  if [[ -d "${BACKUP_DIR}/orcpub" ]]; then
+    warn "Existing backup found at ${BACKUP_DIR}/orcpub"
+    if [[ -t 0 ]]; then
+      read -rp "Overwrite? [y/N] " confirm
+      if [[ "${confirm,,}" != "y" ]]; then
+        echo "Aborted."
+        exit 0
+      fi
+    else
+      warn "Non-interactive — overwriting existing backup."
+    fi
+  fi
+
+  info "Backup destination: file:/backup/orcpub"
+  info "Starting backup (large databases may take 30+ minutes)..."
+  echo ""
+
+  if ! run_datomic_cli "$datomic_image" \
+    backup-db "$old_url" "file:/backup/orcpub"; then
+    error "backup-db failed. Is the source transactor running and reachable?"
+    exit 1
+  fi
+
+  echo ""
+  # Save metadata for the restore phase
+  echo "$old_url" > "${BACKUP_DIR}/.source-uri"
+  date -u +"%Y-%m-%dT%H:%M:%SZ" > "${BACKUP_DIR}/.backup-timestamp"
+  info "Backup complete → ${BACKUP_DIR}/orcpub"
+}
+
+do_restore() {
+  header "Restore — Datomic Pro Database"
+
+  if [[ ! -d "${BACKUP_DIR}/orcpub" ]]; then
+    error "No backup found at ${BACKUP_DIR}/orcpub"
+    error "Run './docker-migrate.sh backup' first (with the old stack running)."
+    exit 1
+  fi
+
+  if [[ -f "${BACKUP_DIR}/.backup-timestamp" ]]; then
+    info "Backup timestamp: $(cat "${BACKUP_DIR}/.backup-timestamp")"
+  fi
+
+  local datomic_image
+  datomic_image=$(get_datomic_image)
+  info "Datomic image: $datomic_image"
+
+  local new_url="${NEW_URI:-}"
+  if [[ -z "$new_url" ]]; then
+    new_url=$(get_container_datomic_url 2>/dev/null || true)
+  fi
+  if [[ -z "$new_url" ]]; then
+    load_env
+    if [[ -z "${DATOMIC_PASSWORD:-}" ]]; then
+      warn "DATOMIC_PASSWORD not set in .env — falling back to default 'datomic'"
+    fi
+    new_url="datomic:dev://datomic:4334/orcpub?password=${DATOMIC_PASSWORD:-datomic}"
+    warn "Could not detect DATOMIC_URL; constructed from DATOMIC_PASSWORD"
+  fi
+  info "Target URI: $new_url"
+
+  info "Starting restore (large databases may take 30+ minutes)..."
+  echo ""
+
+  if ! run_datomic_cli "$datomic_image" \
+    restore-db "file:/backup/orcpub" "$new_url"; then
+    error "restore-db failed. Is the target transactor running?"
+    error "If 'database already exists', clear ./data and restart the transactor."
+    exit 1
+  fi
+
+  echo ""
+  info "Restore complete. Log in and verify your data."
+}
+
+do_verify() {
+  header "Verify — Backup Integrity"
+
+  if [[ ! -d "${BACKUP_DIR}/orcpub" ]]; then
+    error "No backup found at ${BACKUP_DIR}/orcpub"
+    exit 1
+  fi
+
+  local datomic_image
+  datomic_image=$(get_datomic_image)
+
+  # List available backup points
+  info "Backup points:"
+  run_datomic_cli "$datomic_image" list-backups "file:/backup/orcpub"
+  echo ""
+
+  # Get the latest t for verification
+  local latest_t
+  latest_t=$(run_datomic_cli "$datomic_image" list-backups "file:/backup/orcpub" 2>&1 | tail -1 || true)
+
+  if [[ -z "$latest_t" ]]; then
+    error "Could not determine latest backup point."
+    exit 1
+  fi
+
+  info "Verifying backup at t=$latest_t (reads every segment)..."
+
+  if ! run_datomic_cli "$datomic_image" verify-backup "file:/backup/orcpub" true "$latest_t"; then
+    error "Backup verification failed."
+    exit 1
+  fi
+
+  echo ""
+  info "Backup verification passed."
+}
+
+do_full() {
+  header "Full Migration — Datomic Free → Pro"
+
+  # Use a distinct variable name to avoid colliding with Docker Compose's
+  # COMPOSE_FILE env var (which changes docker compose's behavior globally).
+  local compose_yaml="${COMPOSE_YAML:-docker-compose-build.yaml}"
+  info "New compose file: $compose_yaml"
+  echo ""
+
+  if ! [[ -t 0 ]]; then
+    error "Full migration requires an interactive terminal."
+    error "Run the steps individually — see docs/migration/datomic-data-migration.md"
+    exit 1
+  fi
+
+  # Phase 1: Backup from old stack
+  do_backup
+
+  # Phase 2: Verify backup before we tear anything down
+  do_verify
+
+  # Phase 3: Swap stacks
+  header "Swapping Stacks"
+  info "Stopping old containers..."
+  docker compose down
+  info "Old stack stopped."
+  echo ""
+
+  # Move old data directory safely (avoid nesting if target exists)
+  if [[ -d "${SCRIPT_DIR}/data" ]]; then
+    if [[ -d "${SCRIPT_DIR}/data.free-backup" ]]; then
+      warn "data.free-backup already exists — removing stale copy"
+      rm -rf "${SCRIPT_DIR}/data.free-backup"
+    fi
+    warn "Moving ./data → ./data.free-backup (Free storage format)"
+    mv "${SCRIPT_DIR}/data" "${SCRIPT_DIR}/data.free-backup"
+    mkdir -p "${SCRIPT_DIR}/data"
+  fi
+
+  info "Building and starting new stack with ${compose_yaml}..."
+  docker compose -f "$compose_yaml" build
+  docker compose -f "$compose_yaml" up -d
+  wait_healthy datomic 180
+  wait_healthy orcpub 120
+
+  # Phase 4: Restore into new stack
+  do_restore
+
+  echo ""
+  header "Migration Complete"
+  info "Old Free data preserved at: ./data.free-backup"
+  info "New Pro data stored in:     ./data"
+  info "Log in and verify your data, then:"
+  info "  rm -rf ./data.free-backup   # remove old Free storage"
+  info "  rm -rf ./backup             # remove backup (or keep as insurance)"
+  info ""
+  info "To rollback: docker compose down, rm -rf data, mv data.free-backup data,"
+  info "  then restart with the original compose file."
+}
+
+# ---------------------------------------------------------------------------
+# Argument parsing — options must come BEFORE the command word
+# ---------------------------------------------------------------------------
+
+OLD_URI=""
+NEW_URI=""
+COMPOSE_YAML=""
+CMD=""
+
+# Pre-flight check
+check_docker_compose
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --compose-yaml)
+      if [[ $# -lt 2 ]]; then error "--compose-yaml requires a value"; exit 1; fi
+      COMPOSE_YAML="$2"; shift 2 ;;
+    --old-uri)
+      if [[ $# -lt 2 ]]; then error "--old-uri requires a value"; exit 1; fi
+      OLD_URI="$2"; shift 2 ;;
+    --new-uri)
+      if [[ $# -lt 2 ]]; then error "--new-uri requires a value"; exit 1; fi
+      NEW_URI="$2"; shift 2 ;;
+    --help|-h)
+      usage; exit 0 ;;
+    -*)
+      error "Unknown option: $1"
+      error "Options must come BEFORE the command. Run with --help for usage."
+      exit 1 ;;
+    backup|restore|verify|full)
+      if [[ -n "$CMD" ]]; then
+        error "Multiple commands given: '$CMD' and '$1'"
+        exit 1
+      fi
+      CMD="$1"; shift ;;
+    *)
+      error "Unknown argument: $1"
+      usage
+      exit 1 ;;
+  esac
+done
+
+if [[ -z "${CMD:-}" ]]; then
+  usage
+  exit 1
+fi
+
+load_env
+
+case "$CMD" in
+  backup)  do_backup ;;
+  restore) do_restore ;;
+  verify)  do_verify ;;
+  full)    do_full ;;
+esac
diff --git a/docker-setup.sh b/docker-setup.sh
index 6d97a64fa..6dbd7be63 100755
--- a/docker-setup.sh
+++ b/docker-setup.sh
@@ -198,7 +198,7 @@ PORT=${PORT}
 # The password in DATOMIC_URL must match DATOMIC_PASSWORD
 ADMIN_PASSWORD=${ADMIN_PASSWORD}
 DATOMIC_PASSWORD=${DATOMIC_PASSWORD}
-DATOMIC_URL=datomic:free://datomic:4334/orcpub?password=${DATOMIC_PASSWORD}
+DATOMIC_URL=datomic:dev://datomic:4334/orcpub?password=${DATOMIC_PASSWORD}
 
 # --- Security ---
 # Secret used to sign JWT tokens (20+ characters recommended)
diff --git a/docker-user.sh b/docker-user.sh
index 1ca3151e2..914ed1bc4 100755
--- a/docker-user.sh
+++ b/docker-user.sh
@@ -150,7 +150,8 @@ wait_for_ready() {
   warn "No Docker healthcheck found; polling HTTP on container port..."
   printf "Waiting for app"
   while [ $waited -lt $max_wait ]; do
-    if docker exec "$container" wget --no-verbose --tries=1 --spider \
+    # BusyBox wget (Alpine): only -q and --spider are supported
+    if docker exec "$container" wget -q --spider \
       "http://localhost:${PORT:-8890}/" 2>/dev/null; then
       echo ""
       return 0
diff --git a/docker/datomic/Dockerfile b/docker/datomic/Dockerfile
index d3dda3182..58c2f4ff4 100644
--- a/docker/datomic/Dockerfile
+++ b/docker/datomic/Dockerfile
@@ -1,25 +1,30 @@
-FROM eclipse-temurin:8-jre-alpine
+# Datomic Pro transactor — dev storage protocol (datomic:dev://)
+FROM eclipse-temurin:21-jre-alpine-3.22 as base
 
-ENV DATOMIC_VERSION 0.9.5703
+ENV DATOMIC_VERSION=1.0.7482
 
-RUN wget https://github.com/Orcpub/orcpub/raw/refs/heads/develop/lib/datomic-free-0.9.5703.tar.gz -qO /tmp/datomic.tar.gz \
-  && cd /tmp \
-  && tar -xvzf /tmp/datomic.tar.gz \
-  && rm /tmp/datomic.tar.gz \
-  && mv datomic-free-0.9.5703 /datomic
+RUN apk add --no-cache curl unzip bash
 
-WORKDIR /datomic
+RUN curl --fail --location --silent --show-error \
+      -o /tmp/datomic-pro.zip \
+      "https://datomic-pro-downloads.s3.amazonaws.com/${DATOMIC_VERSION}/datomic-pro-${DATOMIC_VERSION}.zip" \
+ && mkdir -p /datomic \
+ && unzip -q /tmp/datomic-pro.zip -d /datomic \
+ && mv /datomic/datomic-pro-${DATOMIC_VERSION}/* /datomic/ \
+ && rmdir /datomic/datomic-pro-${DATOMIC_VERSION} \
+ && rm /tmp/datomic-pro.zip
 
-RUN cp /datomic/config/samples/free-transactor-template.properties transactor.properties
+WORKDIR /datomic
 
-RUN mkdir /data
-RUN sed "s/# data-dir=data/data-dir=\/data/" -i transactor.properties
+# Use dev-transactor-template (dev storage protocol for datomic:dev://)
+RUN cp /datomic/config/samples/dev-transactor-template.properties transactor.properties
 
-RUN mkdir /log
-RUN sed "s/# log-dir=log/log-dir=\/log/" -i transactor.properties
+RUN mkdir -p /data /log
+RUN sed -i "s/# data-dir=data/data-dir=\/data/" transactor.properties
+RUN sed -i "s/# log-dir=log/log-dir=\/log/" transactor.properties
 
-RUN sed "s/host=localhost/host=0.0.0.0/" -i transactor.properties
-RUN sed "s/# storage-access=local/storage-access=remote/" -i transactor.properties
+RUN sed -i "s/host=localhost/host=0.0.0.0/" transactor.properties
+RUN sed -i "s/# storage-access=local/storage-access=remote/" transactor.properties
 
 ADD deploy/start.sh /datomic/
 RUN chmod +x /datomic/start.sh
diff --git a/docker/orcpub/Dockerfile b/docker/orcpub/Dockerfile
index 8c0f1cfc5..ddc72c4cd 100644
--- a/docker/orcpub/Dockerfile
+++ b/docker/orcpub/Dockerfile
@@ -1,7 +1,25 @@
-FROM clojure:lein as builder
+FROM clojure:temurin-21-lein-alpine as builder
 
-# Build cache layer
+RUN apk add --no-cache curl unzip
+
+# Vendor jars (pdfbox snapshots) → Maven local repo
 ADD ./lib/ /root/.m2/repository/
+
+# Datomic Pro peer jar isn't in public Maven repos.
+# Download the distribution zip and install the peer jar + pom manually
+# (bin/maven-install calls mvn, which isn't in this image).
+ENV DATOMIC_VERSION=1.0.7482
+RUN curl --fail --location --silent --show-error \
+      -o /tmp/datomic-pro.zip \
+      "https://datomic-pro-downloads.s3.amazonaws.com/${DATOMIC_VERSION}/datomic-pro-${DATOMIC_VERSION}.zip" \
+ && unzip -q /tmp/datomic-pro.zip -d /tmp \
+ && mkdir -p /root/.m2/repository/com/datomic/peer/${DATOMIC_VERSION} \
+ && cp /tmp/datomic-pro-${DATOMIC_VERSION}/peer-${DATOMIC_VERSION}.jar \
+       /root/.m2/repository/com/datomic/peer/${DATOMIC_VERSION}/ \
+ && cp /tmp/datomic-pro-${DATOMIC_VERSION}/pom.xml \
+       /root/.m2/repository/com/datomic/peer/${DATOMIC_VERSION}/peer-${DATOMIC_VERSION}.pom \
+ && rm -rf /tmp/datomic-pro*
+
 WORKDIR /orcpub
 COPY project.clj /orcpub/
 RUN lein deps
@@ -10,7 +28,11 @@ ADD ./ /orcpub
 RUN printenv &&\
 	lein uberjar
 
-FROM eclipse-temurin:8-jre-alpine as runner
+# Alpine runner — BusyBox wget handles healthchecks (use -q --spider, not GNU flags)
+FROM eclipse-temurin:21-jre-alpine-3.22 as runner
+
+# PDFBox requires fontconfig, fonts, and lcms2 for PDF character sheet generation
+RUN apk add --no-cache fontconfig ttf-dejavu freetype lcms2
 
 COPY --from=builder /orcpub/target/orcpub.jar /orcpub.jar
 
diff --git a/docker/scripts/manage-user.clj b/docker/scripts/manage-user.clj
index b02cac2ca..19cd1dde5 100644
--- a/docker/scripts/manage-user.clj
+++ b/docker/scripts/manage-user.clj
@@ -17,7 +17,7 @@
 
 (def datomic-url
   (or (System/getenv "DATOMIC_URL")
-      "datomic:free://datomic:4334/orcpub?password=datomic"))
+      "datomic:dev://datomic:4334/orcpub?password=datomic"))
 
 (defn get-conn []
   (try
diff --git a/docker/scripts/migrate-db.clj b/docker/scripts/migrate-db.clj
new file mode 100644
index 000000000..3daca7af8
--- /dev/null
+++ b/docker/scripts/migrate-db.clj
@@ -0,0 +1,95 @@
+;; Datomic Database Verification Tool
+;;
+;; Connects to a running Datomic database and reports statistics: basis-t,
+;; user count, and entity (character) count. Used after migration to verify
+;; data integrity by comparing pre- and post-migration numbers.
+;;
+;; Requires the uberjar on the classpath (includes Clojure + Datomic peer):
+;;   java -cp target/orcpub.jar clojure.main docker/scripts/migrate-db.clj verify [db-uri]
+;;
+;; Note: Backup and restore use the bin/datomic CLI (backup-db, restore-db),
+;; NOT the Peer API — those functions do not exist in datomic.api.
+;; See scripts/migrate-db.sh (bare-metal) or docker-migrate.sh (Docker).
+
+(ns migrate-db
+  (:require [datomic.api :as d]))
+
+;; ---------------------------------------------------------------------------
+;; Configuration
+;; ---------------------------------------------------------------------------
+
+(def ^{:doc "Database URI. Set via DATOMIC_URL env var."}
+  datomic-url
+  (or (System/getenv "DATOMIC_URL")
+      "datomic:dev://datomic:4334/orcpub"))
+
+;; ---------------------------------------------------------------------------
+;; Database statistics — used for pre/post migration verification
+;; ---------------------------------------------------------------------------
+
+(defn db-stats
+  "Returns a map of database statistics: basis-t, user count, entity count."
+  [db]
+  (let [users    (or (d/q '[:find (count ?e) .
+                             :where [?e :orcpub.user/username]]
+                           db) 0)
+        entities (or (d/q '[:find (count ?e) .
+                             :where [?e :orcpub.entity/owner]]
+                           db) 0)]
+    {:basis-t  (d/basis-t db)
+     :users    users
+     :entities entities}))
+
+(defn print-stats
+  "Prints database statistics in a readable format."
+  [stats]
+  (println (format "  Basis-t:    %d" (:basis-t stats)))
+  (println (format "  Users:      %d" (:users stats)))
+  (println (format "  Characters: %d" (:entities stats))))
+
+;; ---------------------------------------------------------------------------
+;; Verify — connects to a database and reports stats
+;; ---------------------------------------------------------------------------
+
+(defn verify!
+  "Connects to a database and reports statistics."
+  [db-uri]
+  (println "Connecting to" db-uri "...")
+  (let [conn  (d/connect db-uri)
+        db    (d/db conn)
+        stats (db-stats db)]
+    (println "Database statistics:")
+    (print-stats stats)
+    stats))
+
+;; ---------------------------------------------------------------------------
+;; CLI dispatch
+;; ---------------------------------------------------------------------------
+
+(let [args *command-line-args*
+      cmd  (first args)]
+  (try
+    (case cmd
+      "verify" (let [[_ db-uri] args]
+                 (verify! (or db-uri datomic-url)))
+
+      ;; Default: show usage
+      (do
+        (println "Datomic Database Verification Tool")
+        (println)
+        (println "Usage:")
+        (println "  migrate-db.clj verify [uri]    Report database stats (defaults to DATOMIC_URL)")
+        (println)
+        (println "Environment:")
+        (println "  DATOMIC_URL    Database URI (default: datomic:dev://datomic:4334/orcpub)")
+        (println)
+        (println "For backup and restore, use the bin/datomic CLI:")
+        (println "  bin/datomic backup-db  <from-db-uri> <to-backup-uri>")
+        (println "  bin/datomic restore-db <from-backup-uri> <to-db-uri>")
+        (System/exit 1)))
+    (catch Exception e
+      (binding [*out* *err*]
+        (println "FATAL:" (.getMessage e)))
+      (System/exit 1)))
+  ;; Datomic peer threads are non-daemon; force clean exit
+  (System/exit 0))
diff --git a/docs/CONTENT_RECONCILIATION.md b/docs/CONTENT_RECONCILIATION.md
index e9e9de6f2..f79e18ed7 100644
--- a/docs/CONTENT_RECONCILIATION.md
+++ b/docs/CONTENT_RECONCILIATION.md
@@ -4,125 +4,120 @@
 
 Detects when characters reference missing homebrew content and suggests alternatives using fuzzy matching.
 
-**Why this exists:** User deletes homebrew plugin, reopens character, sees `:artificer (not loaded)` with no context. No way to know which plugin to reinstall or what similar content exists.
+**Why this exists:** User deletes homebrew plugin, reopens character, sees missing content with no context. No way to know which plugin to reinstall or what similar content exists.
 
-**Design decision:** Use multiple fuzzy matching strategies (exact key, Levenshtein distance, prefix matching) to catch common cases: typos, versioning (`:blood-hunter-v2`), and renamed content.
+**Design decision:** Use multiple fuzzy matching strategies (exact key, prefix matching, keyword-base comparison, display name matching) to catch common cases: typos, versioning (`:blood-hunter-v2`), and renamed content.
 
-**Key gotcha:** Must exclude built-in content (PHB, Xanathar's, etc.) or system suggests switching from homebrew Artificer to PHB Artificer (which doesn't exist in most books).
+**Key gotcha:** Must exclude SRD built-in content. The `available-content` subscription only includes plugin content, so SRD content (hardcoded in the app) would be false-flagged as missing without explicit exclusion sets.
 
 ## How It Works
 
 ### Missing Content Detection
 
-Scans character options tree for `::entity/key` references → Checks if key exists in loaded content → Reports missing with suggestions
+Scans character options tree for `::entity/key` references, classifies each by content type, checks if key exists in loaded content, reports missing with suggestions.
 
-**Supported types:** Classes, subclasses, races, subraces, backgrounds
+**Supported types:** Classes, subclasses, races, subraces, backgrounds, feats
 
 **Implementation:** `content_reconciliation.cljs`
 
-### Fuzzy Matching
+### Content Type Detection
 
-Four strategies find similar content:
+The character entity stores options differently based on selection type:
+- **Single-select** (race, background, subrace) — stored as maps, path has no index
+- **Multi-select** (class, feats) — stored as vectors, path includes indices
 
-**1. Exact key, different source**
-```
-Missing: :artificer from "Serakat's Compendium"
-Suggests: :artificer from "Player's Handbook"
-```
+`annotate-content-type` strips integer indices from paths before matching:
+- `[:class 0]` → `[:class]` → class
+- `[:class 0 :martial-archetype]` → `[:class :martial-archetype]` → subclass
+- `[:race]` → race (already index-free, single-select)
+- `[:class 0 :levels 3 :asi-or-feat :feats 0]` → detected by `:feats` parent keyword → feat
 
-**2. Levenshtein distance** (max 3 edits for typos)
+### Fuzzy Matching
+
+Three strategies find similar content (`find-similar-content`):
+
+**1. Exact key match** (similarity 1.0)
 ```
-Missing: :artficer
-Suggests: :artificer
+Missing: :artificer
+Available: :artificer (from different source)
 ```
 
-**3. Prefix matching** (min 4 chars, for versioning)
+**2. Prefix matching** (similarity 0.7)
 ```
 Missing: :battle-smith-v2
 Suggests: :battle-smith
 ```
 
-**4. Display name similarity** (max 3 edits)
+**3. Keyword-base comparison** (similarity 0.8 via `common/kw-base`)
 ```
-Missing: :drunken_master
-Suggests: :drunken-master
+Missing: :blood-hunter-order-of-the-lycan
+Suggests: :blood-hunter (same base before first dash)
 ```
 
-**Why multiple strategies:** Single strategy missed too many cases. Levenshtein alone doesn't catch versioning (`:fighter-v2`). Prefix alone doesn't catch typos (`:artficer`). Combined approach catches ~80% of common cases.
-
-### Warning UI
-
-Displays in character builder:
+**4. Display name similarity** (similarity 0.6)
 ```
-:missing-content (not loaded)
-:missing-content (not loaded - try :suggested-content?)
-:missing-content from "Plugin Name" (not loaded - try :suggested-content?)
+Missing: :drunken_master
+Suggests: :drunken-master (name matches after normalization)
 ```
 
-**Implementation:** `views.cljs` (display), `subs.cljs` (subscriptions)
-
 ### Built-in Content Exclusions
 
-Excludes PHB, Xanathar's, Tasha's, and 9 other official books from warnings.
-
-**Why:** Built-in content is always available. Without exclusion, system suggests "try PHB Artificer" when user's homebrew Artificer is missing (but PHB doesn't have Artificer in 5e).
+Excludes **SRD-only** content from warnings. This is NOT all PHB content — only what's hardcoded in the app:
 
-## Common Scenarios
-
-**Deleted plugin:** Character shows `:rune-knight from "Fighter Subclasses" (not loaded - try :eldritch-knight?)` → Re-import plugin or use suggested alternative
-
-**Shared character:** Friend's character uses homebrew → Warnings show which plugins needed → Ask friend for files or use suggested official alternatives
-
-**Renamed content:** Updated `:blood-hunter` to `:blood-hunter-v2` → Old characters suggest new version → Prefix matching catches versioning
-
-## Implementation
-
-**Key files:**
-- `content_reconciliation.cljs` - Detection, fuzzy matching (`find-missing-content`, `find-suggestion`, `levenshtein-distance`)
-- `subs.cljs`, `views.cljs` - UI integration (subscriptions, warning display)
-- `common.cljc` - Utilities (`kw-base`, `traverse-nested`)
-- `import_validation_test.cljs` - Tests
-
-**Data flow:**
-Character loaded → `extract-character-keys` → `classify-content-type` → `find-available-content` → Missing? → `find-suggestion` → Display warning with suggestion
+| Type | SRD Built-ins | Everything else |
+|------|--------------|-----------------|
+| Classes | All 12 base classes | — |
+| Races | 9 races + their subraces | — |
+| Subclasses | 1 per class (Champion, Berserker, Lore, Life, Land, Open Hand, Devotion, Hunter, Thief, Draconic, Fiend, Evocation) | All others from plugins |
+| Backgrounds | Acolyte only | All others from plugins |
+| Feats | None | All from plugins |
 
-**Performance:** ~10ms detection + ~5ms per missing item for fuzzy matching. 100+ missing items may need optimization.
+**Critical distinction:** Non-SRD PHB content (Battle Master, Totem Warrior, Folk Hero, etc.) comes from plugins and SHOULD be flagged when plugins are removed. Earlier versions incorrectly excluded all PHB content.
 
-## Testing
+### Warning UI
 
-**Automated:** `import_validation_test.cljs` - Covers detection, fuzzy matching accuracy, built-in exclusions
+Displays in character builder via the import log overlay. Shows missing content with type, inferred source, and suggestions.
 
-**Critical manual tests:**
-1. Delete plugin → Reopen character → Should show "(not loaded)" warning
-2. Rename `:blood-hunter` to `:blood-hunter-v2` → Should suggest new version
-3. PHB Wizard with Evocation → Should NOT warn (built-in exclusion)
+**Implementation:** `views/conflict_resolution.cljs` (display), `subs.cljs` (subscriptions)
 
-## Extending
+## Data Flow
 
-**Adjust thresholds:** Edit `levenshtein-distance-threshold`, `prefix-match-length`, `name-similarity-threshold` in `content_reconciliation.cljs` (defaults: 3, 4, 3)
+```
+Character loaded
+  → extract-content-keys (walks ::entity/options tree via traverse-nested)
+  → annotate-content-type (classifies by path shape)
+  → check-content-availability (compares against available-content subscription)
+  → find-similar-content (fuzzy matching for suggestions)
+  → generate-missing-content-report
+  → ::char5e/missing-content-report subscription
+  → UI overlay
+```
 
-**Add content types:** Add to `content-type-paths` and `content-type->field` maps
+## Key Files
 
-**Exclude sources:** Add to `built-in-sources` set
+- `content_reconciliation.cljs` — Detection, classification, fuzzy matching
+- `subs.cljs` — `::char5e/available-content`, `::char5e/missing-content-report` subscriptions
+- `common.cljc` — `kw-base`, `traverse-nested`, `name-to-kw` utilities
+- `views/conflict_resolution.cljs` — UI display
 
-## Troubleshooting
+## Common Scenarios
 
-**"Not loaded" but exists:** Check key matches exactly (`:blood-hunter` vs `:bloodhunter`), verify plugin loaded
+**Deleted plugin:** Character shows missing class/subclass/background/feat with suggestions for similar available content
 
-**Wrong suggestions:** Adjust matching thresholds, check for duplicate keys
+**Shared character:** Friend's character uses homebrew → Warnings show which content types are missing
 
-**Built-in showing warnings:** Source name doesn't match exclusion list exactly, add variant to `built-in-sources`
+**Renamed content:** Updated `:blood-hunter` to `:blood-hunter-v2` → Old characters detect missing, prefix matching suggests new version
 
-## Future Enhancements
+## Extending
 
-**Auto-fix button:** One-click apply suggestion
+**Add content types:** Add to `content-type-paths`, `content-type->field`, and `available-content` subscription in `subs.cljs`
 
-**Smart migration:** Auto-update characters when content renamed (detect renames, prompt to update all affected characters)
+**Adjust thresholds:** Edit similarity cutoff (0.3) in `find-similar-content`
 
-**Plugin recommendations:** Suggest which plugin to install based on missing content library lookup
+**Add SRD exclusions:** Only add truly hardcoded content to `builtin-*` sets. Plugin content should NOT be excluded.
 
 ## Related Documentation
 
-- [ORCBREW_FILE_VALIDATION.md](ORCBREW_FILE_VALIDATION.md) - Import/export validation
-- [CONFLICT_RESOLUTION.md](CONFLICT_RESOLUTION.md) - Duplicate key handling
-- [HOMEBREW_REQUIRED_FIELDS.md](HOMEBREW_REQUIRED_FIELDS.md) - Content field requirements
+- [ORCBREW_FILE_VALIDATION.md](ORCBREW_FILE_VALIDATION.md) — Import/export validation
+- [CONFLICT_RESOLUTION.md](CONFLICT_RESOLUTION.md) — Duplicate key handling
+- [HOMEBREW_REQUIRED_FIELDS.md](HOMEBREW_REQUIRED_FIELDS.md) — Content field requirements
diff --git a/docs/ENVIRONMENT.md b/docs/ENVIRONMENT.md
new file mode 100644
index 000000000..4076ddb03
--- /dev/null
+++ b/docs/ENVIRONMENT.md
@@ -0,0 +1,82 @@
+# Environment Variables
+
+All configuration is managed via a `.env` file at the repository root. Copy `.env.example` to `.env` and edit as needed.
+
+## Precedence
+
+1. `.env` in repo root (authoritative — sourced by all scripts and read by `environ`)
+2. `containerEnv` in `.devcontainer/devcontainer.json` (fallback defaults)
+3. System environment variables
+
+> **Note:** `./menu` and `./scripts/start.sh` source `.env` automatically (via `scripts/common.sh`).
+> Running `lein` commands directly (e.g., `lein repl`, `lein run`) reads dev defaults
+> from `.lein-env` (generated by `lein-environ` from the `:dev` profile in `project.clj`).
+> This includes `SIGNATURE` so auth works out of the box for local development.
+> To use your `.env` values with `lein` directly:
+> ```bash
+> source .env && lein repl
+> ```
+
+## Variables
+
+### Datomic
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `DATOMIC_URL` | `datomic:dev://localhost:4334/orcpub` | Database connection URI |
+| `DATOMIC_VERSION` | `1.0.7482` | Datomic Pro version for installer |
+| `DATOMIC_TYPE` | `pro` | Datomic distribution type |
+| `DATOMIC_PASSWORD` | — | Transactor password |
+
+### Application
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `PORT` | `8080` | Production web server port (dev uses 8890) |
+| `SIGNATURE` | — | **Required.** JWT signing secret for authentication. All login and API calls fail without it. |
+| `ADMIN_PASSWORD` | — | Admin password |
+
+### Security
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `CSP_POLICY` | `strict` | Content Security Policy mode: `strict`, `permissive`, or `none` |
+| `DEV_MODE` | `true` (in :dev profile) | Enables dev-mode CSP (Report-Only instead of enforcing) |
+
+CSP modes:
+- **strict** — nonce-based CSP with `strict-dynamic`. Dev mode uses `Report-Only` header (logs violations but doesn't block). Prod uses enforcing header.
+- **permissive** — allows `unsafe-inline` and `unsafe-eval`. Legacy fallback.
+- **none** — disables CSP entirely. Not recommended for production.
+
+### Email (SMTP)
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `EMAIL_HOST` | — | SMTP server hostname |
+| `EMAIL_PORT` | — | SMTP port |
+| `EMAIL_USER` | — | SMTP username |
+| `EMAIL_PASSWORD` | — | SMTP password |
+
+### Logging
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `LOG_DIR` | `./logs` | Directory for log files |
+| `POST_CREATE_VERBOSE` | `1` (in devcontainer) | Enable verbose post-create logging |
+
+### Development
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `ORCPUB_ENV` | — | Set to `dev` to enable `add-test-user` in user.clj |
+
+## Files That Read Environment
+
+| File | Variables Used |
+|------|---------------|
+| `src/clj/orcpub/config.clj` | `DATOMIC_URL`, `CSP_POLICY`, `DEV_MODE` |
+| `src/clj/orcpub/system.clj` | `PORT` (via `System/getenv`) |
+| `src/clj/orcpub/routes.clj` | `SIGNATURE`, `EMAIL_*`, `ADMIN_PASSWORD` |
+| `.devcontainer/post-create.sh` | `DATOMIC_VERSION`, `DATOMIC_TYPE` |
+| `scripts/start.sh` | `DATOMIC_URL`, `LOG_DIR` |
+| `dev/user.clj` | `ORCPUB_ENV` (for add-test-user guard) |
diff --git a/docs/GETTING-STARTED.md b/docs/GETTING-STARTED.md
new file mode 100644
index 000000000..8553dfb78
--- /dev/null
+++ b/docs/GETTING-STARTED.md
@@ -0,0 +1,213 @@
+# Getting Started
+
+This guide takes you from a fresh clone to a running dev server. Two paths are covered:
+
+1. **Devcontainer** (recommended) - everything installs automatically
+2. **Local machine** - you install Java, Leiningen, and Datomic yourself
+
+Both paths end at the same place: Datomic running, backend serving on port 8890, and Figwheel hot-reloading the frontend.
+
+---
+
+## Path 1: Devcontainer
+
+Requires [VS Code](https://code.visualstudio.com/) with the [Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers), or [GitHub Codespaces](https://github.com/features/codespaces).
+
+### 1. Open in container
+
+```bash
+git clone https://github.com/orcpub/orcpub.git
+cd orcpub
+code .
+```
+
+When VS Code prompts **"Reopen in Container"**, click it. The container installs Java 21, Leiningen, and Datomic Pro automatically.
+
+### 2. Run first-time setup
+
+Once the container is built, open a terminal inside VS Code:
+
+```bash
+./scripts/dev-setup.sh
+```
+
+This will:
+- Download project dependencies (`lein deps`)
+- Start the Datomic transactor
+- Initialize the database schema
+- Create a test user: **test** / **test@test.com** / **testpass**
+
+### 3. Start services
+
+```bash
+./menu
+```
+
+The interactive menu shows service status and lets you start/stop with single keystrokes. Or start individually:
+
+```bash
+./menu start server      # Backend on port 8890
+./menu start figwheel    # Frontend hot-reload on port 3449
+```
+
+### 4. Open the app
+
+Navigate to `http://localhost:8890` (or the Codespaces forwarded URL). Log in with **test@test.com** / **testpass**.
+
+---
+
+## Path 2: Local Machine
+
+### 1. Prerequisites
+
+| Tool | Version | Install |
+|------|---------|---------|
+| Java | 21+ (OpenJDK) | [Adoptium](https://adoptium.net/) |
+| Leiningen | 2.9+ | [leiningen.org](https://leiningen.org/#install) |
+| Datomic Pro | 1.0.7482 | See below |
+
+**Datomic Pro** is free (Apache 2.0 license). The devcontainer installer handles this automatically, but on a local machine you need to install it manually:
+
+```bash
+# The install script downloads and extracts Datomic Pro
+./.devcontainer/post-create.sh
+```
+
+Or follow the manual steps in [docs/migration/datomic-pro.md](migration/datomic-pro.md). Datomic should end up at `lib/com/datomic/datomic-pro/1.0.7482/`.
+
+### 2. Configure environment
+
+```bash
+cp .env.example .env
+```
+
+Edit `.env` if needed. The defaults work for local development. The most important variable is `SIGNATURE` (JWT secret) -a dev default is provided automatically via `.lein-env`, so this step is optional for local dev.
+
+See [ENVIRONMENT.md](ENVIRONMENT.md) for the full variable list.
+
+### 3. Download dependencies
+
+```bash
+lein deps
+```
+
+### 4. Start Datomic
+
+```bash
+./scripts/start.sh datomic
+```
+
+Wait for "Datomic is ready" before continuing. The transactor listens on port 4334.
+
+### 5. Initialize the database
+
+First time only -creates the schema and applies seed data:
+
+```bash
+./scripts/start.sh init-db
+```
+
+### 6. Create a test user
+
+```bash
+./menu add test testpass
+```
+
+This creates **test@test.com** with password **testpass**, already verified.
+
+### 7. Start the backend
+
+```bash
+./scripts/start.sh server
+```
+
+The server starts on port 8890 with an nREPL port for editor connections.
+
+### 8. Start Figwheel (frontend hot-reload)
+
+In a separate terminal:
+
+```bash
+./scripts/start.sh figwheel
+```
+
+Figwheel compiles ClojureScript and serves it on port 3449. Changes to `.cljs` files are pushed to the browser automatically.
+
+### 9. Open the app
+
+Navigate to `http://localhost:8890`. Log in with **test@test.com** / **testpass**.
+
+---
+
+## Using the REPL directly
+
+If you prefer `lein repl` over the shell scripts:
+
+```bash
+lein repl
+```
+
+The `user` namespace loads automatically with helpers:
+
+```clojure
+(start-server)     ; Start web server on port 8890
+(stop-server)      ; Stop web server
+(init-database)    ; Initialize DB schema (first time)
+(fig-start)        ; Start Figwheel from the REPL
+(cljs-repl)        ; Connect to ClojureScript REPL (after fig-start)
+```
+
+The `:dev` profile provides a dev `SIGNATURE` via `.lein-env`, so auth works without extra setup. If you need to override with your `.env` values:
+
+```bash
+source .env && lein repl
+```
+
+---
+
+## Verification
+
+After starting services, confirm everything is working:
+
+| Check | Expected |
+|-------|----------|
+| `http://localhost:8890` loads | Splash page appears |
+| Log in with test@test.com / testpass | Character list page |
+| Create a new character | Builder loads with race/class options |
+| Edit and wait 7.5 seconds | Autosave (check Network tab for POST) |
+| Upload a `.orcbrew` file (My Content page) | Homebrew options appear in builder |
+
+---
+
+## Troubleshooting
+
+**Server returns 500 on login or API calls**
+
+The `SIGNATURE` env var is missing. If using `./menu` or `./scripts/start.sh`, check that `.env` exists and has `SIGNATURE` set. If using `lein repl`, the dev profile provides a default -but if you've overridden it with an empty value, auth will fail.
+
+**Datomic won't start**
+
+- Check that port 4334 isn't already in use: `lsof -i :4334`
+- Verify Datomic is installed: `ls lib/com/datomic/datomic-pro/1.0.7482/bin/transactor`
+- Check logs: `cat logs/datomic.log`
+
+**Figwheel compilation errors**
+
+- Run `lein fig:build` for a one-shot compile to see all errors
+- First compilation can be slow (1-2 minutes) as it downloads ClojureScript dependencies
+
+**Port already in use**
+
+```bash
+./scripts/stop.sh          # Stop all services
+./scripts/stop.sh server   # Stop just the server
+```
+
+---
+
+## What's next
+
+- [Architecture overview](../README.md#architecture) -how entities, templates, and modifiers work
+- [Dev tooling guide](migration/dev-tooling.md) -Leiningen profiles, REPL helpers, build commands
+- [Environment variables](ENVIRONMENT.md) -full config reference
+- [Stack migration context](MIGRATION-INDEX.md) -why Java 21, Datomic Pro, React 18, etc.
diff --git a/docs/JAVA-COMPATIBILITY.md b/docs/JAVA-COMPATIBILITY.md
new file mode 100644
index 000000000..784514b5c
--- /dev/null
+++ b/docs/JAVA-COMPATIBILITY.md
@@ -0,0 +1,40 @@
+# Java Compatibility
+
+## Requirement: Java 21
+
+This project requires **Java 21** (LTS). The CI workflow, devcontainer, and all scripts are configured for Java 21.
+
+## Why Not Java 8
+
+The original project ran on Java 8. The upgrade to Java 21 was driven by:
+
+1. **Datomic Pro** — the actively maintained Datomic distribution targets Java 11+
+2. **Pedestal 0.7** — uses Jetty 11, which requires Java 11+
+3. **Security** — Java 8 is past end of public updates
+4. **Ecosystem** — modern Clojure libraries increasingly require Java 11+
+
+## Datomic Free + Java 21: Incompatible
+
+Datomic Free 0.9.5703 fails on Java 21 with an SSL handshake timeout. The peer cannot connect to the transactor. This is caused by changes in Java's TLS implementation that break ActiveMQ Artemis (Datomic's internal messaging). Datomic Free is unmaintained — no fix is available.
+
+**Solution**: Migrate to Datomic Pro (`com.datomic/peer`), which supports Java 21.
+
+## Pedestal + Jetty Constraint
+
+Pedestal 0.7.0 uses **Jetty 11**. Pedestal 0.7.1+ uses **Jetty 12**.
+
+Jetty 12 removes `ScopedHandler`, causing `NoClassDefFoundError` when figwheel-main is running (figwheel-main's Ring adapter depends on Jetty 11 classes).
+
+**Current pin**: Pedestal 0.7.0 with Jetty 11. This constraint is about Pedestal/Jetty compatibility, not Java version.
+
+## javax.servlet-api
+
+Java 9+ removed `javax.servlet` from the default classpath. Added explicitly:
+
+```clojure
+[javax.servlet/javax.servlet-api "4.0.1"]
+```
+
+## CI Configuration
+
+`.github/workflows/continuous-integration.yml` uses `setup-java@v4` with `temurin` distribution, Java 21.
diff --git a/docs/MIGRATION-INDEX.md b/docs/MIGRATION-INDEX.md
new file mode 100644
index 000000000..bb90208f6
--- /dev/null
+++ b/docs/MIGRATION-INDEX.md
@@ -0,0 +1,39 @@
+# Migration Index
+
+This branch (`breaking/2026-stack-modernization`) upgrades the full OrcPub stack from its original 2017-era dependencies to a modern 2026 baseline. Every change ships together because the upgrades are interdependent.
+
+## What Changed
+
+| Topic | Summary | Details |
+|-------|---------|---------|
+| Java runtime | 8 → 21 | [JAVA-COMPATIBILITY.md](JAVA-COMPATIBILITY.md) |
+| Database | Datomic Free → Datomic Pro | [migration/datomic-pro.md](migration/datomic-pro.md) |
+| Database data | Migrating existing Free databases | [migration/datomic-data-migration.md](migration/datomic-data-migration.md) |
+| Web framework | Pedestal 0.5.1 → 0.7.0 | [migration/pedestal-0.7.md](migration/pedestal-0.7.md) |
+| Frontend | React 15 / Reagent 0.6 → React 18 / Reagent 2.0 | [migration/frontend-stack.md](migration/frontend-stack.md) |
+| Libraries | clj-time, PDFBox 2, Buddy 1, etc. | [migration/library-upgrades.md](migration/library-upgrades.md) |
+| Dev tooling | Consolidated CLI + REPL into user.clj, profiles, scripts | [migration/dev-tooling.md](migration/dev-tooling.md) |
+| Environment | `.env` pattern, new variables | [ENVIRONMENT.md](ENVIRONMENT.md) |
+| Stack overview | Architecture, dependencies, build system | [STACK.md](STACK.md) |
+
+## Why One Branch
+
+These upgrades form a dependency chain:
+
+1. **Java 21** is required by modern Datomic Pro and Pedestal 0.7
+2. **Datomic Free** doesn't work on Java 21 (SSL handshake failure), so **Datomic Pro** is required
+3. **Pedestal 0.7** requires interceptor wrapping and adds default CSP with `strict-dynamic`, which breaks inline scripts unless nonces are added
+4. **Pedestal 0.7.0** specifically — 0.7.1+ uses Jetty 12, which breaks figwheel-main's Ring adapter
+5. **Reagent 2.0** / **React 18** use the `createRoot` API (React 17 deprecated `render`)
+6. **clj-time → java-time** because clj-time wraps Joda-Time, which is EOL on Java 21
+
+Upgrading any one of these in isolation would leave the application broken.
+
+## Test Status
+
+- Backend: 206 tests, 945 assertions, 0 failures, 0 errors
+- Lint: 0 errors, 0 warnings
+- Dev CLJS build: 0 errors, 0 warnings
+- Production CLJS build (`:advanced`): succeeds with custom `externs.js` for React 18 APIs
+- Garden CSS: 0 warnings (after lambdaisland/garden upgrade)
+- CI: Java 21, `lein test` + `lein lint` + `lein cljsbuild once dev`
diff --git a/docs/README.md b/docs/README.md
index 76590fd3a..ba1159f08 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -102,5 +102,3 @@ All in `src/cljs/orcpub/dnd/e5/` unless noted.
 **Conflicts on import:** Modal should appear automatically → Choose rename/skip/replace per item
 
 ---
-
-**Branch:** `feature/error-handling-import-validation` | **Last updated:** 2026-02-19
diff --git a/docs/STACK.md b/docs/STACK.md
new file mode 100644
index 000000000..ccc657305
--- /dev/null
+++ b/docs/STACK.md
@@ -0,0 +1,209 @@
+# Stack Overview
+
+A guide to the libraries, frameworks, and architecture for developers getting oriented with the codebase.
+
+## Architecture at a Glance
+
+```
+Browser (ClojureScript)          Server (Clojure/JVM)
+┌─────────────────────┐          ┌─────────────────────┐
+│  Reagent + React 18 │  HTTP    │  Pedestal 0.7       │
+│  re-frame           │ ◄──────► │  Buddy (auth)       │
+│  Garden (CSS)       │  Transit │  PDFBox 3 (PDF gen) │
+│  Figwheel (dev)     │          │  Datomic Pro (db)   │
+└─────────────────────┘          └─────────────────────┘
+```
+
+This is a **Clojure/ClojureScript monorepo**. Code lives in three source trees:
+
+| Path | Language | Runs on |
+|------|----------|---------|
+| `src/clj/` | Clojure | JVM only (server, routes, PDF) |
+| `src/cljs/` | ClojureScript | Browser only (UI, re-frame events/subs) |
+| `src/cljc/` | Clojure(Script) | Both — shared logic (character model, templates, specs) |
+
+## Frontend
+
+### React 18 + Reagent 2.0
+
+[Reagent](https://reagent-project.github.io/) wraps React with ClojureScript idioms. Components are plain functions returning hiccup vectors:
+
+```clojure
+(defn greeting [name]
+  [:div.hello "Welcome, " name])
+```
+
+Reagent 2.0 uses React 18's `createRoot` API. The app mounts via `reagent.dom.client/render`.
+
+**Key gotcha**: Use `:class` (not `:class-name`) when the hiccup tag has inline classes like `[:div.foo ...]`. Reagent 2.x changed `:class-name` to overwrite rather than merge.
+
+### re-frame (State Management)
+
+[re-frame](https://day8.github.io/re-frame/) is a data-flow framework built on Reagent. It follows a unidirectional cycle:
+
+```
+Event → Handler → Effects → App-DB → Subscriptions → Components → Event
+```
+
+- **Events** (`reg-event-fx`, `reg-event-db`): Handle user actions and side effects — `src/cljs/.../events.cljs`
+- **Subscriptions** (`reg-sub`): Derived views of app-db — `src/cljs/.../subs.cljs`
+- **Effects** (`reg-fx`): Side effects like HTTP requests — `:http` fx in events.cljs
+- **App-DB**: Single atom holding all application state
+
+### Garden (CSS-in-Clojure)
+
+[Garden](https://github.com/lambdaisland/garden) compiles Clojure data structures to CSS. Styles live in `src/clj/orcpub/styles/core.clj` and compile to `resources/public/css/compiled/styles.css`.
+
+```clojure
+[:.builder-option-dropdown
+ {:background-color :transparent
+  :cursor :pointer}]
+```
+
+Compile: `lein garden once`
+
+We use the **lambdaisland/garden** fork (drop-in replacement) because the original noprompt/garden is unmaintained and causes `clojure.core/abs` shadowing warnings on Clojure 1.11+.
+
+### Figwheel (Hot Reload)
+
+[figwheel-main](https://figwheel.org/) provides hot code reloading during development:
+
+| Command | Mode | Use |
+|---------|------|-----|
+| `lein fig:dev` | REPL + watch | Interactive development |
+| `lein fig:watch` | Watch (headless) | Background/scripted |
+| `lein fig:build` | Build once | CI / compilation check |
+
+Config: `dev.cljs.edn` (preloads, compiler options).
+
+## Backend
+
+### Pedestal 0.7 (Web Framework)
+
+[Pedestal](http://pedestal.io/) is an interceptor-based web framework. Routes map URL patterns to interceptor chains:
+
+```clojure
+["/api/folders" ^:interceptors [check-auth]
+ {:post `create-folder
+  :get  `list-folders}]
+```
+
+Interceptors are composable middleware units (auth, parsing, ownership checks). Always wrap with `interceptor/interceptor` for proper Pedestal records.
+
+**Pinned at 0.7.0**: Pedestal 0.7.1+ uses Jetty 12, which breaks figwheel-main's Ring adapter. See `project.clj` comments.
+
+### Datomic Pro (Database)
+
+[Datomic](https://docs.datomic.com/) is an immutable, time-aware database. Key concepts:
+
+- **Entities**: Maps with `:db/id` — similar to documents
+- **Transactions**: Immutable facts added over time — never UPDATE, always assert new facts
+- **Pull**: Declarative data retrieval (like GraphQL)
+- **Queries**: Datalog (logic programming)
+
+```clojure
+;; Pull an entity
+(d/pull db [:db/id ::folder/name] folder-id)
+
+;; Query
+(d/q '[:find ?e :where [?e ::folder/owner "alice"]] db)
+```
+
+Connection uses `datomic:dev://` protocol (required for Java 21). Schema lives in `src/clj/orcpub/db/schema.clj`.
+
+### Buddy (Authentication)
+
+[Buddy](https://funcool.github.io/buddy-auth/latest/) handles JWT token signing and bcrypt password hashing:
+
+- `buddy-auth` — Token-based authentication middleware
+- `buddy-hashers` — Password hashing (bcrypt)
+
+Tokens are signed with the `SIGNATURE` env var. See `src/clj/orcpub/routes.clj` for the `check-auth` interceptor.
+
+### PDFBox 3 (PDF Generation)
+
+[Apache PDFBox](https://pdfbox.apache.org/) fills PDF character sheet templates. The app loads a blank D&D character sheet PDF, fills in field values from the built character, and returns the result.
+
+```clojure
+(with-open [doc (Loader/loadPDF input)]
+  ;; fill fields...
+  (.save doc output))
+```
+
+**PDFBox 3.x API change**: Use `Loader/loadPDF` instead of `PDDocument/load`.
+
+## Shared Code (.cljc)
+
+The character model, D&D rules, templates, and entity system are all `.cljc` — they run on both JVM (for testing and PDF generation) and browser (for the UI). Key namespaces:
+
+| Namespace | Purpose |
+|-----------|---------|
+| `orcpub.entity` | Entity/template system (build, from-strict, to-strict) |
+| `orcpub.dnd.e5.character` | Character accessors (abilities, HP, AC, etc.) |
+| `orcpub.dnd.e5.options` | D&D class/race/feat option builders |
+| `orcpub.dnd.e5.template` | Full character template (all classes, races, backgrounds) |
+| `orcpub.pdf-spec` | PDF field mapping (pure — no re-frame dependency) |
+| `orcpub.dnd.e5.magic-items` | Magic item/weapon computation (homebrew-aware) |
+
+## Build System
+
+### Leiningen
+
+The project uses [Leiningen](https://leiningen.org/) for builds, dependency management, and task running.
+
+Key aliases:
+
+| Command | What it does |
+|---------|-------------|
+| `lein test` | Run JVM tests (206 tests) |
+| `lein fig:build` | One-shot CLJS compilation |
+| `lein fig:dev` | CLJS dev with REPL + hot reload |
+| `lein fig:test` | Compile + run CLJS tests in browser |
+| `lein garden once` | Compile CSS |
+| `lein lint` | Run clj-kondo linter |
+| `lein uberjar` | Production build (AOT + advanced CLJS + CSS) |
+
+### Profiles
+
+| Profile | Purpose |
+|---------|---------|
+| `:dev` | Development (devtools, piggieback, re-frame-10x) |
+| `:uberjar` | Production build (AOT, advanced optimizations) |
+| `:lint` | clj-kondo linting |
+| `:init-db` | Minimal profile for DB init scripts (no CLJS/Garden) |
+
+### Local JARs
+
+Some dependencies (Datomic Pro, PDFBox) are loaded from `lib/` via a `file:lib` local Maven repository. This avoids requiring Datomic credentials or dealing with non-standard Maven repos.
+
+## Data Serialization
+
+Client-server communication uses [Transit](https://github.com/cognitect/transit-format) (JSON-based, preserves Clojure types like keywords and sets). The `cljs-http` library handles Transit encoding/decoding automatically.
+
+Homebrew content (`.orcbrew` files) uses Transit for import/export. Users regularly import 2-5MB plugin files.
+
+## Docker
+
+Three services in `docker-compose.yaml`:
+
+| Service | Image | Purpose |
+|---------|-------|---------|
+| `orcpub` | Application | Clojure app server (port 8890) |
+| `datomic` | Database | Datomic Pro transactor |
+| `web` | nginx:alpine | Reverse proxy (ports 80/443) |
+
+Config via `.env` file — see `.env.example` for all variables.
+
+## Dependency Pinning
+
+Several dependencies are pinned to specific versions for compatibility:
+
+| Dependency | Pin | Reason |
+|-----------|-----|--------|
+| Pedestal | 0.7.0 | 0.7.1+ uses Jetty 12, breaks figwheel |
+| Jackson | 2.15.2 | Resolves transitive conflicts and CVEs |
+| Guava | 32.1.2-jre | Same |
+| commons-io | 2.15.1 | Required by Pedestal 0.7 ring-middlewares |
+| javax.servlet-api | 4.0.1 | Required on Java 9+ |
+
+See [migration/library-upgrades.md](migration/library-upgrades.md) for the full upgrade history.
diff --git a/docs/TODO.md b/docs/TODO.md
new file mode 100644
index 000000000..79134dada
--- /dev/null
+++ b/docs/TODO.md
@@ -0,0 +1,47 @@
+# TODO — Tracked Issues
+
+## localStorage corrupt data persistence
+
+**Status:** Open
+**Severity:** Medium
+**Reported:** 2026-02-21
+
+### Problem
+
+When `reg-local-store-cofx` reads localStorage data that fails spec validation,
+it logs a warning and ignores the data — but never removes it. The corrupt data
+persists across reloads, producing `INVALID ITEM FOUND, IGNORING` on every page
+load. If the user never interacts with the affected feature (to trigger an
+overwrite), the corrupt data stays indefinitely.
+
+Known corruption vector: `assoc-in` on `nil` builds maps with integer keys
+instead of vectors. Example from combat tracker:
+
+```clojure
+(assoc-in nil [:monsters 0 :monster] :adult-gold-dragon)
+;; => {:monsters {0 {:monster :adult-gold-dragon}}}  — MAP, not vector
+```
+
+This was partially fixed by guarding `set-combat-path-prop` with
+`(or combat default-combat)`, but other handlers using `assoc-in` through
+`path` interceptors may have the same vulnerability.
+
+### Proposed fix
+
+Scope cleanup by data criticality:
+
+| Category | Examples | Action on invalid |
+|----------|----------|-------------------|
+| Ephemeral | combat, builder state | `.removeItem` — safe to lose |
+| Rebuildable | spells, monsters | `.removeItem` — regenerated from source |
+| Critical | plugins, characters, user | Quarantine: rename key to `<key>_corrupt_<timestamp>` |
+
+This preserves recovery options for irreplaceable user data (homebrew plugins
+can be 2-5MB of daily imports) while cleaning up transient state that would
+otherwise stubbornly persist.
+
+### Related
+
+- `src/cljs/orcpub/dnd/e5/db.cljs` — `reg-local-store-cofx` (line ~252)
+- `src/cljs/orcpub/dnd/e5/events.cljs` — `set-combat-path-prop` nil guard
+- All `*->local-store` serializers use `(str data)` / `reader/read-string`
diff --git a/docs/migration/datomic-data-migration.md b/docs/migration/datomic-data-migration.md
new file mode 100644
index 000000000..efa4572bc
--- /dev/null
+++ b/docs/migration/datomic-data-migration.md
@@ -0,0 +1,338 @@
+# Datomic Data Migration — Free to Pro
+
+Existing self-hosted deployments have a Datomic Free database in `./data` that
+must be migrated before upgrading to the new Java 21 / Datomic Pro Docker stack.
+The storage protocols (`datomic:free://` vs `datomic:dev://`) are incompatible at
+the file level — the Pro transactor cannot read Free storage, and vice versa.
+
+## Why Migration Is Needed
+
+Datomic Free and Datomic Pro use different storage protocols:
+
+| | Datomic Free | Datomic Pro (dev) |
+|---|---|---|
+| URI scheme | `datomic:free://` | `datomic:dev://` |
+| Storage engine | H2 (different on-disk schema) | H2 (different on-disk schema) |
+| Transport | Custom (pre-1.0) | ActiveMQ Artemis |
+| Authentication | None | Password-based |
+| Java support | Java 8 only | Java 11, 17, 21 |
+
+Despite both using H2, the Pro transactor cannot open Free's H2 files — same
+data model, incompatible storage.
+
+## How It Works
+
+The migration uses Datomic's `bin/datomic` CLI — **not** the Peer API
+(`datomic.api`). `backup-db` creates a portable, protocol-independent backup
+from the running Free transactor. `restore-db` writes it into a new Pro database.
+
+```
+  Free transactor (running)         Pro transactor (running)
+  ┌──────────────────┐              ┌──────────────────┐
+  │  port 4334       │              │  port 4334       │
+  └────────┬─────────┘              └────────┬─────────┘
+           │                                 │
+  bin/datomic backup-db             bin/datomic restore-db
+  (Free distribution)               (Pro distribution)
+           │                                 │
+           ▼                                 ▼
+      file:./backup/orcpub  ────────>  file:./backup/orcpub
+```
+
+**Peer library matching is critical**: the Free CLI can only connect to Free
+transactors, the Pro CLI can only connect to Pro transactors. Backup must use the
+Free distribution's `bin/datomic`; restore must use Pro's. The migration scripts
+handle this automatically.
+
+The backup format is storage-protocol-independent and the backup/restore cycle
+is **lossless** — all datoms, full transaction history, timestamps, entity IDs,
+and schema are preserved exactly. Only the storage layer changes.
+
+**Commands reference:**
+
+```bash
+bin/datomic backup-db  <from-db-uri> <to-backup-uri>    # backup (Free or Pro)
+bin/datomic restore-db <from-backup-uri> <to-db-uri>     # restore (Free or Pro)
+bin/datomic list-backups <backup-uri>                     # list backup points
+bin/datomic verify-backup <backup-uri> true <t>           # verify (Pro only)
+```
+
+## Quick Start (Bare Metal)
+
+```bash
+# 1. With the old (Free) transactor running:
+./scripts/migrate-db.sh backup
+
+# 2. Stop the Free transactor, move data aside, start Pro transactor
+# (see "Step-by-Step" below for details)
+
+# 3. Restore into the new Pro database:
+./scripts/migrate-db.sh restore "datomic:dev://localhost:4334/orcpub?password=..."
+
+# 4. Verify backup integrity:
+./scripts/migrate-db.sh verify
+```
+
+## Quick Start (Docker)
+
+```bash
+# 1. With the OLD Docker stack still running:
+./docker-migrate.sh backup
+
+# 2. Stop old stack, build and start new:
+docker compose down
+docker compose -f docker-compose-build.yaml build
+docker compose -f docker-compose-build.yaml up -d
+
+# 3. After services are healthy, restore:
+./docker-migrate.sh restore
+
+# 4. Verify backup integrity:
+./docker-migrate.sh verify
+```
+
+Or run everything in one command: `./docker-migrate.sh full`
+
+## Step-by-Step (Bare Metal)
+
+### Prerequisites
+
+- Datomic Free transactor running with your existing data
+- `.env` file with `DATOMIC_URL` (pointing to the Free transactor) and `DATOMIC_PASSWORD`
+- Datomic Pro installed (`lib/com/datomic/datomic-pro/...`)
+- Enough disk space for the backup (see [Performance](#performance))
+
+### Phase 1: Backup
+
+With the Free transactor running:
+
+```bash
+./scripts/migrate-db.sh backup
+```
+
+The script detects `datomic:free://` in your `DATOMIC_URL` and looks for the
+Free distribution in `lib/`. If it can't find one interactively, it will prompt
+for the path — or press Enter to extract the bundled tarball
+(`lib/datomic-free-0.9.5703.tar.gz`). To skip the prompt:
+
+```bash
+./scripts/migrate-db.sh --datomic-dir /path/to/datomic-free backup
+```
+
+### Phase 2: Swap Transactors
+
+```bash
+./scripts/stop.sh datomic
+mv ./data ./data.free-backup
+mkdir -p ./data
+./scripts/start.sh datomic
+```
+
+Wait for the transactor to become healthy (port 4334).
+
+### Phase 3: Restore
+
+```bash
+./scripts/migrate-db.sh restore "datomic:dev://localhost:4334/orcpub?password=${DATOMIC_PASSWORD}"
+```
+
+**The target database must not already exist.** If the application already created
+it on first connect, delete `./data/*` and restart the transactor before restoring.
+
+### Phase 4: Verify
+
+```bash
+./scripts/migrate-db.sh verify
+
+# Optionally check DB-level stats (user/entity counts):
+# java -cp target/orcpub.jar clojure.main docker/scripts/migrate-db.clj verify [db-uri]
+```
+
+Then log in and verify your data — characters load, homebrew content is
+accessible, user accounts work.
+
+## Step-by-Step (Docker)
+
+### Prerequisites
+
+- Old Docker stack running (`docker compose ps` shows healthy datomic + orcpub)
+- `.env` file with correct `DATOMIC_PASSWORD`
+- Enough disk space (see [Performance](#performance))
+- New source code checked out (has `docker-compose-build.yaml` and migration scripts)
+
+Each phase launches a **temporary container** (`docker run --rm`) on the Compose
+network, bind-mounting `./backup/` for I/O. No running containers are modified.
+
+```
+ Old Stack (running)                     New Stack (running)
+┌─────────────┐  ┌────────────┐    ┌─────────────┐  ┌────────────┐
+│  orcpub      │  │  datomic   │    │  orcpub      │  │  datomic   │
+│  (Free peer) │  │  (Free tx) │    │  (Pro peer)  │  │  (Pro tx)  │
+└──────────────┘  └──────┬─────┘    └──────────────┘  └──────┬─────┘
+                         │                                    │
+                  Compose Network                      Compose Network
+                         │                                    │
+                ┌────────┴─────────┐              ┌───────────┴────────┐
+                │  Temp container   │              │  Temp container     │
+                │  (old datomic img)│              │  (new datomic img)  │
+                │  backup-db ──────►│ ./backup/   │◄─────── restore-db │
+                └──────────────────┘  (bind mount) └────────────────────┘
+```
+
+### Phase 1: Backup
+
+```bash
+./docker-migrate.sh backup
+```
+
+### Phase 2: Swap Stacks
+
+```bash
+docker compose down
+mv ./data ./data.free-backup
+mkdir -p ./data
+docker compose -f docker-compose-build.yaml build
+docker compose -f docker-compose-build.yaml up -d
+```
+
+Wait for healthy: `docker compose ps`
+
+### Phase 3: Restore
+
+```bash
+./docker-migrate.sh restore
+```
+
+URI is auto-detected from the running container, or constructed from
+`DATOMIC_PASSWORD` in `.env`.
+
+### Phase 4: Verify
+
+```bash
+./docker-migrate.sh verify
+```
+
+Test a login:
+
+```bash
+curl -sk -X POST https://localhost/login \
+  -H "Content-Type: application/json" \
+  -d '{"username":"youruser","password":"yourpass"}'
+```
+
+## Rollback
+
+You can roll back at any point before deleting `./data.free-backup`:
+
+**Bare metal:**
+
+```bash
+./scripts/stop.sh datomic
+rm -rf ./data
+mv ./data.free-backup ./data
+./scripts/start.sh datomic
+```
+
+**Docker:**
+
+```bash
+docker compose down
+rm -rf ./data
+mv ./data.free-backup ./data
+docker compose up -d      # OLD compose file, not docker-compose-build.yaml
+```
+
+The backup directory is never modified — you can re-attempt the restore as many
+times as needed. Just clear `./data/*` and restart the transactor before each attempt.
+
+## Cleanup
+
+Once verified:
+
+```bash
+rm -rf ./data.free-backup   # old Free storage
+rm -rf ./backup             # portable backup (or keep as insurance)
+```
+
+## Performance
+
+Rough estimates — actual performance depends on disk speed, CPU, and database
+complexity.
+
+| Database Size | Backup/Restore Time | Peak Disk Space |
+|--------------|---------------------|-----------------|
+| < 1 GB | 1-5 min | ~3 GB |
+| 1-10 GB | 5-30 min | ~30 GB |
+| 10-25 GB | 30-90 min | ~75 GB |
+| 25-50 GB | 1-3 hours | ~150 GB |
+
+**Peak disk** = old `./data` + `./backup` + new `./data` (all coexist during
+migration). Monitor progress with `du -sh ./backup/orcpub`.
+
+**Memory**: The default 1GB JVM heap (`bin/run`) suffices for most databases.
+For 50GB+, increase with `DATOMIC_JAVA_OPTS="-Xmx4g"` before running.
+
+## Troubleshooting
+
+### "Cannot connect to Datomic"
+
+**Bare metal**: Ensure the transactor is running and `DATOMIC_URL` in `.env` is
+correct.
+
+**Docker**: The temp container must be on the same Compose network. The script
+auto-detects this. For unusual setups, use `--old-uri` or `--new-uri` (**before
+the command word**):
+
+```bash
+./docker-migrate.sh --old-uri "datomic:free://datomic:4334/orcpub" backup
+./docker-migrate.sh --new-uri "datomic:dev://datomic:4334/orcpub?password=mypass" restore
+```
+
+### "Target database already exists"
+
+`restore-db` requires the target database to not exist. If the app auto-created
+it on first boot:
+
+1. `docker compose down` (or stop the transactor)
+2. `rm -rf ./data/*`
+3. Restart, then retry restore
+
+### Interrupted backup
+
+Delete the incomplete backup directory and re-run. Backups are not resumable
+mid-segment.
+
+### Data discrepancy after restore
+
+Run `./scripts/migrate-db.sh verify`, then log in and check: characters load,
+homebrew content accessible, users can log in. If wrong, delete `./data`,
+re-restore from the same backup.
+
+## FAQ
+
+### Can I use the Pro transactor with the Free peer library?
+
+No. The peer library and transactor must match — Free peer speaks
+`datomic:free://` only, Pro peer speaks `datomic:dev://` only. They use
+different transport protocols and are not interchangeable.
+
+### What happens after migration?
+
+The migrated database works identically to one that was always on Pro. No
+ongoing migration state or compatibility mode. `backup-db` and `restore-db`
+continue to work for regular backups going forward.
+
+## Scripts
+
+| Script | Environment | Purpose |
+|--------|-------------|---------|
+| `scripts/migrate-db.sh` | Bare metal | Primary migration tool, wraps `bin/datomic` CLI |
+| `docker-migrate.sh` | Docker | Containerized wrapper, auto-detects images/networks |
+| `docker/scripts/migrate-db.clj` | Either (optional) | DB-level stats verification (user/entity counts) |
+
+## Related
+
+- [datomic-pro.md](datomic-pro.md) — Code-level changes (dependency, URI, API)
+- [../ENVIRONMENT.md](../ENVIRONMENT.md) — Environment variable reference
+- [../../docker-setup.sh](../../docker-setup.sh) — Initial Docker setup
+- [../../docker-user.sh](../../docker-user.sh) — User management after migration
diff --git a/docs/migration/datomic-pro.md b/docs/migration/datomic-pro.md
new file mode 100644
index 000000000..1afd3acc9
--- /dev/null
+++ b/docs/migration/datomic-pro.md
@@ -0,0 +1,78 @@
+# Datomic Free → Datomic Pro
+
+## Why
+
+Datomic Free 0.9.5703 does not work on Java 21. The peer-to-transactor connection fails with an SSL handshake timeout in ActiveMQ Artemis (Datomic's internal messaging layer). This is not configurable — Datomic Free is unmaintained and will never be fixed.
+
+Datomic Pro is free under the Apache 2.0 license and supports Java 11, 17, and 21.
+
+## What Changed
+
+### Connection URI
+
+```
+# Before (Datomic Free)
+datomic:free://localhost:4334/orcpub
+
+# After (Datomic Pro dev protocol)
+datomic:dev://localhost:4334/orcpub
+```
+
+The `dev` protocol uses the Datomic Pro dev transactor (same data model, same API, different transport).
+
+### Maven Dependency
+
+```clojure
+;; Before
+[com.datomic/datomic-free "0.9.5703"]
+
+;; After
+[com.datomic/peer "1.0.7482" :exclusions [org.slf4j/slf4j-nop]]
+```
+
+The Datomic Pro peer library is `com.datomic/peer` (not `com.datomic/datomic-pro`). The `slf4j-nop` exclusion avoids duplicate SLF4J binding warnings.
+
+### Installation
+
+Datomic Pro is installed during container creation by `.devcontainer/post-create.sh`:
+
+1. Downloads the Datomic Pro zip from S3
+2. Extracts to `lib/com/datomic/datomic-pro/<version>/`
+3. Runs `bin/maven-install` to populate the local Maven repository
+
+The peer JAR resolves via the existing `file:lib` repository pattern in `project.clj`.
+
+### Transactor
+
+The transactor is a separate process started by `scripts/start.sh datomic`. It uses a properties file generated from the template at the Datomic install path. The transactor is **not** a JAR — it's the `bin/transactor` script with a config file.
+
+### Configuration
+
+All Datomic config flows through `src/clj/orcpub/config.clj`:
+
+```clojure
+(config/get-datomic-uri)
+;; Returns DATOMIC_URL env var or default "datomic:dev://localhost:4334/orcpub"
+```
+
+Environment variables (see `.env.example`):
+- `DATOMIC_URL` — connection URI
+- `DATOMIC_VERSION` — version for installer (default: `1.0.7482`)
+- `DATOMIC_TYPE` — `pro` (default)
+- `DATOMIC_PASSWORD` — transactor password
+
+### Code Changes
+
+| File | Change |
+|------|--------|
+| `project.clj` | `datomic-free` → `com.datomic/peer`, version `1.0.7482` |
+| `src/clj/orcpub/config.clj` | New — `get-datomic-uri`, `datomic-env` (SSOT for URI) |
+| `src/clj/orcpub/system.clj` | Uses `config/get-datomic-uri` instead of inline logic |
+| `src/clj/orcpub/datomic.clj` | Connection logic unchanged — `datomic.api` is the same |
+| `dev/user.clj` | `init-database` uses `config/datomic-env` |
+| `.devcontainer/post-create.sh` | Datomic Pro installer (download, extract, maven-install) |
+| `.env.example` | Datomic Pro defaults |
+
+### Datomock Compatibility
+
+The test suite uses `datomock` for in-memory database testing. The original `vvvvalvalval/datomock 0.2.0` causes `AbstractMethodError` with Datomic Pro (new `transact` signature). Replaced with `org.clojars.favila/datomock 0.2.2-favila1`.
diff --git a/docs/migration/dev-tooling.md b/docs/migration/dev-tooling.md
new file mode 100644
index 000000000..73a46190c
--- /dev/null
+++ b/docs/migration/dev-tooling.md
@@ -0,0 +1,178 @@
+# Dev Tooling
+
+## How Clojure Dev Tooling Works (Quick Primer)
+
+Clojure projects use **Leiningen** (`lein`) as their build tool — similar to npm for JavaScript or Maven for Java. Leiningen reads `project.clj` for configuration.
+
+**Profiles** are named configurations that control what code is available and how things compile. Think of them like npm scripts that also change the project's classpath:
+
+- `:dev` — full development mode (REPL, Figwheel, ClojureScript, all dev helpers)
+- `:init-db` — minimal mode for CLI tasks (no ClojureScript, no CSS, fast startup)
+- `:uberjar` — production build (AOT-compiled, no dev code)
+
+A **REPL** (Read-Eval-Print Loop) is an interactive Clojure session. You type expressions and get results immediately — it's how most Clojure development happens. The `user` namespace loads automatically when you start a REPL in dev mode.
+
+## user.clj — The Dev Tooling Hub
+
+**Location**: `dev/user.clj`
+
+This single file is the hub for all dev tooling. It serves two purposes:
+
+1. **REPL helpers** — functions you call interactively during development
+2. **CLI entrypoint** — a `-main` function that shell scripts call for automation
+
+### Why dev/ and not src/
+
+`user.clj` lives in the `dev/` directory, which is **only** on the classpath in development profiles (`:dev` and `:init-db`). It is **never** included in the production jar. This means none of the dev tooling (user creation, database initialization, Figwheel helpers) ships to production — a deliberate security choice.
+
+### REPL Functions
+
+When you start a REPL (`lein repl`), the `user` namespace loads automatically. These functions are available:
+
+| Function | What it does | Needs running server? |
+|----------|-------------|----------------------|
+| `(start-server)` | Start Pedestal web server + Datomic | No (starts it) |
+| `(stop-server)` | Stop the server | Yes |
+| `(init-database)` | Create database + apply schema | No |
+| `(add-test-user)` | Create a pre-verified test user | No |
+| `(conn)` | Get a raw Datomic connection | No |
+| `(create-user! (conn) {...})` | Create a user with options | No |
+| `(verify-user! (conn) "email")` | Mark a user as verified | No |
+| `(delete-user! (conn) "email")` | Remove a user | No |
+| `(verify-new-user "email")` | Verify via routes (legacy) | Yes |
+| `(fig-start)` | Start Figwheel hot-reload | No |
+| `(fig-stop)` | Stop Figwheel | — |
+| `(cljs-repl)` | Connect to ClojureScript REPL | Figwheel running |
+| `(with-db [conn db] ...)` | Ad-hoc DB access macro | Yes |
+
+**"Needs running server?"** — Some functions (like `create-user!`) connect directly to Datomic, so they work without the web server. Others (like `verify-new-user`) go through the route handlers and need the full system running.
+
+### CLI Commands
+
+Shell scripts call user.clj via Leiningen's `run -m` flag, which invokes the `-main` function:
+
+```bash
+# Initialize database (create + apply schema)
+lein with-profile init-db run -m user init-db
+
+# Initialize database AND create a test user
+lein with-profile init-db run -m user init-db --add-test-user
+
+# Create an arbitrary user (with duplicate checking)
+lein with-profile init-db run -m user create-user bob bob@example.com s3cret verify
+
+# Mark a user as verified (useful when emails don't send in dev)
+lein with-profile init-db run -m user verify-user bob@example.com
+
+# Delete a user
+lein with-profile init-db run -m user delete-user bob@example.com
+```
+
+**Why `with-profile init-db`?** Without it, Leiningen loads the full `:dev` profile which compiles ClojureScript and CSS — slow and unnecessary for database tasks. The `:init-db` profile skips all that for fast startup.
+
+## Shell Scripts
+
+You don't need to remember the `lein` commands above. Shell scripts wrap them:
+
+### start.sh — Service Launcher
+
+```bash
+./scripts/start.sh datomic    # Start Datomic transactor
+./scripts/start.sh init-db    # Initialize database (calls user.clj init-db)
+./scripts/start.sh server     # Start backend REPL
+./scripts/start.sh figwheel   # Start Figwheel hot-reload (headless watcher)
+./scripts/start.sh garden     # Start Garden CSS watcher
+```
+
+Flags: `--quiet` (less output), `--check` (pre-flight only), `--idempotent` (succeed if already running)
+
+### Figwheel Modes
+
+Figwheel-main has three modes, exposed as Leiningen aliases:
+
+| Alias | Command | What it does |
+|-------|---------|-------------|
+| `lein fig:dev` | `--build dev --repl` | Build + watch + interactive REPL (needs a terminal) |
+| `lein fig:watch` | `--build dev` | Build + watch, headless (works with nohup/background) |
+| `lein fig:build` | `--build-once dev` | One-time build, no watcher |
+
+**`start.sh figwheel`** uses `fig:watch` (headless) so it works when backgrounded. If you want an interactive ClojureScript REPL, run `lein fig:dev` directly in a terminal instead.
+
+### Garden CSS
+
+Garden compiles Clojure style definitions (`src/clj/orcpub/styles/core.clj`) into CSS (`resources/public/css/compiled/styles.css`).
+
+- **One-time compile**: `lein garden once`
+- **Auto-watch**: `lein garden auto` (blocks the terminal — run in a separate session or use `./scripts/start.sh garden`)
+- **start.sh garden**: Runs `lein garden auto` in the background
+
+Garden and Figwheel are independent — Figwheel hot-reloads ClojureScript, Garden compiles CSS. Both need to run during active frontend development.
+
+### stop.sh — Service Shutdown
+
+```bash
+./scripts/stop.sh datomic --yes --quiet
+```
+
+### menu — Interactive Hub + CLI
+
+```bash
+./menu                                # Interactive terminal menu with status display
+./menu add bob pass123                # Create bob@test.com (auto-verified)
+./menu add bob pass123 --no-verify    # Create without verification
+./menu add user                       # Interactive prompt for name/password
+./menu verify bob                     # Verify existing user
+./menu delete bob                     # Delete bob@test.com
+./menu user                           # Show all user commands
+```
+
+Email auto-generates as `<name>@test.com`. Credentials are logged to `.test-users` (gitignored) for easy lookup.
+
+### create_dummy_user.sh — Create a User (full control)
+
+For cases where you need a specific email address (not `@test.com`):
+
+```bash
+./scripts/create_dummy_user.sh testuser custom@email.com s3cret verify
+```
+
+### dev-setup.sh — First-Time Onboarding
+
+Runs the full first-time setup: start Datomic, install dependencies, initialize database, and create a verified test user.
+
+```bash
+./scripts/dev-setup.sh                # full setup including test user
+./scripts/dev-setup.sh --no-test-user # skip test user creation
+./scripts/dev-setup.sh --skip-datomic # skip Datomic startup (if already running)
+```
+
+Default test user credentials: `test` / `test@test.com` / `testpass` (pre-verified, ready to log in).
+
+All user-creation paths log credentials to `.test-users` in the repo root (gitignored).
+
+## config.clj — Configuration Hub
+
+**Location**: `src/clj/orcpub/config.clj`
+
+Single source of truth for all runtime configuration. Reads environment variables via the `environ` library. Unlike user.clj, this file IS in production — it's the config layer the app uses at runtime.
+
+| Function | Returns |
+|----------|---------|
+| `(config/get-datomic-uri)` | `DATOMIC_URL` env or `"datomic:dev://localhost:4334/orcpub"` |
+| `(config/get-csp-policy)` | `CSP_POLICY` env or `"strict"` |
+| `(config/strict-csp?)` | `true` when CSP policy is strict |
+| `(config/dev-mode?)` | `true` when `DEV_MODE` env is truthy |
+| `(config/get-secure-headers-config)` | Pedestal secure-headers map based on CSP policy |
+
+Used by: `system.clj`, `pedestal.clj`, `user.clj`
+
+## Profile Security Model
+
+| Profile | Source paths | Includes dev/? | In production jar? |
+|---------|-------------|----------------|-------------------|
+| `:dev` | src/clj, src/cljc, src/cljs, web/cljs, dev | Yes | No |
+| `:init-db` | src/clj, src/cljc, dev | Yes | No |
+| `:uberjar` | src/clj, src/cljc, src/cljs, web/cljs | No | Yes |
+| (base) | src/clj, src/cljc, src/cljs | No | — |
+
+The `dev/` directory (containing user.clj) is only available in development profiles. The production uberjar contains zero dev tooling.
diff --git a/docs/migration/frontend-stack.md b/docs/migration/frontend-stack.md
new file mode 100644
index 000000000..a117353e1
--- /dev/null
+++ b/docs/migration/frontend-stack.md
@@ -0,0 +1,255 @@
+# Frontend Stack Upgrade
+
+## React 15 → 18
+
+React 18 introduces the `createRoot` API and deprecates the legacy `ReactDOM.render()`.
+
+### Dependencies
+
+```clojure
+;; Before
+[cljsjs/react "15.x"]
+[cljsjs/react-dom "15.x"]
+[reagent "0.6.x"]
+
+;; After
+[cljsjs/react "18.3.1-1"]
+[cljsjs/react-dom "18.3.1-1"]
+[reagent "2.0.1"]
+```
+
+### createRoot Migration
+
+In `web/cljs/orcpub/core.cljs`, the app mounts using Reagent 2.0's `reagent.dom.client` namespace:
+
+```clojure
+(ns orcpub.core
+  (:require [reagent.dom.client :as rdc] ...))
+
+;; createRoot-based mounting (React 18)
+```
+
+This replaces the old `reagent.dom/render` call.
+
+### Reagent 2.x: `:class` vs `:class-name`
+
+Reagent 2.x changed how CSS classes merge. The `:class-name` prop **overwrites** classes set on the hiccup tag, while `:class` **merges** with them:
+
+```clojure
+;; BAD — .white is lost, only bg-red applies
+[:div.white {:class-name "bg-red"}]
+
+;; GOOD — both .white and .bg-red apply
+[:div.white {:class "bg-red"}]
+```
+
+Always use `:class` (not `:class-name`) when the hiccup tag already has classes like `[:div.foo.bar ...]`.
+
+### Production Build: Externs for React 18
+
+The `cljsjs/react-dom 18.3.1-1` package has incomplete externs. Under Closure Compiler `:advanced` optimization, two React 18 APIs get renamed, causing a runtime crash (`c0 is not a function`):
+
+- `ReactDOM.Root.render` — used by `reagent.dom.client/render`
+- `ReactDOM.flushSync` — used by `reagent.impl.batching/react-flush`
+
+**Fix**: A custom `externs.js` at the repo root declares these symbols:
+
+```javascript
+ReactDOM.Root.render = function(children) {};
+ReactDOM.flushSync = function(callback) {};
+```
+
+The uberjar profile references it:
+
+```clojure
+:compiler {:optimizations :advanced
+           :infer-externs true
+           :externs       ["externs.js"]}
+```
+
+### re-frame
+
+Updated from `0.x` to `1.4.4`. The event/subscription API is unchanged — existing handlers, subscriptions, and effects work without modification.
+
+#### Subscribe-outside-reactive-context: Fixed
+
+The original codebase had **56 instances** of `@(subscribe [...])` called outside Reagent reactive context (inside event handlers, modifier conditions, top-level code, and pure `.cljc` namespaces). In re-frame 0.x these worked silently; in 1.3+ they produce console warnings and leak Reaction objects. All 56 have been fixed across two phases.
+
+**Fix patterns used** (stable re-frame APIs only — no `re-frame.alpha` or third-party libs):
+
+| Pattern | When to use | Instances |
+|---------|-------------|-----------|
+| Direct db read | Subscription is `(get db :key)` | 3 |
+| Pass from component | Component already has the value | 4 |
+| Extract pure helpers | Subscription computes derived data | 2 |
+| Replace with dispatch | `reg-sub-raw` used for side effects | 1 |
+| Template cache via `track!` | Autosave handler (no component context) | 1 |
+| Direct db read (character) | Character already in db map | 1 |
+| SSOT pure fn + `@app-db` | Modifier conditions needing dynamic data | 4 |
+| Thread parameter from caller | Data already in the calling chain | 1 |
+| Plugin-data map | Pure `.cljc` namespace, multiple subscribes | 7 |
+| `reg-sub-raw` | Conditional subscription routing | 1 |
+| Move to render scope | `@(subscribe)` in event closure | 1 |
+| Pure character fns | Prereq functions with subscribe | 22 |
+| `def` + `partial` → `defn` | Subscribe at load time via `partial` | 1 |
+
+**Phase 1** (events.cljs, options.cljc, classes.cljc, core.cljs): 42 fixes
+**Phase 2** (options.cljc, pdf_spec.cljc, equipment_subs.cljs, views.cljs): 14 fixes
+**Browser console**: zero subscribe warnings on fresh page load.
+
+**Key insight**: Most subscriptions were Layer 3 (computed/derived). Naively replacing `@(subscribe [...])` with `(get db ...)` would have returned `nil` — the computed values only exist in the subscription cache, not in app-db. Custom/homebrew content is especially tricky: `mi/all-weapons-map` (static) does NOT include user-imported weapons.
+
+#### Utility namespace: `orcpub.dnd.e5.event-utils`
+
+A circular dependency prevented `events.cljs` from importing subscription computation code:
+
+```
+equipment_subs.cljs → events.cljs (url-for-route, show-generic-error)
+subs.cljs           → events.cljs (url-for-route, show-generic-error, mod-cfg, default-mod-set)
+spell_subs.cljs     → events.cljs (dead import)
+```
+
+**Fix**: Shared utility functions extracted from `events.cljs` into `event_utils.cljs`:
+
+| Function | Purpose |
+|----------|---------|
+| `backend-url` | Rewrites path to localhost:8890 in dev |
+| `url-for-route` | Builds backend URL from bidi route |
+| `auth-headers` | Returns `Authorization` header map (was duplicated 3x) |
+| `show-generic-error` | Returns generic error dispatch vector |
+| `mod-cfg` | Builds modifier config map |
+| `mod-key` | Multimethod: extracts comparison key from modifier |
+| `compare-mod-keys` | Comparator for modifier configs |
+| `default-mod-set` | Ensures modifier set is sorted |
+
+Subscription files now import `event-utils` instead of `events`, breaking the circle. `events.cljs` aliases the moved functions for backward compatibility.
+
+#### Template caching via `reagent.core/track!`
+
+**THIS IS A NEW PATTERN IN THIS PROJECT.** `track!` has never been used elsewhere in the codebase. It is stable Reagent API (since ~0.6) but warrants extra testing attention.
+
+**Problem**: The autosave handler (`::char5e/save-character`) needs `built-character`, which requires the full template. The template is computed by a 12-input subscription chain. The handler is dispatched from a timer (no component context), so it can't subscribe.
+
+**Solution**: `autosave_fx.cljs` creates a `track!` watcher that observes the `::char5e/template` subscription in a proper reactive context and caches the result in app-db:
+
+```clojure
+;; autosave_fx.cljs
+(defonce _init-template-cache
+  (js/setTimeout
+    (fn []
+      (r/track!
+        (fn []
+          (when-let [template @(subscribe [::char5e/template])]
+            (dispatch [::cache-template template])))))
+    0))
+```
+
+The save handler then reads the cached template and computes `entity/build(character, template)` directly:
+
+```clojure
+;; events.cljs — ::char5e/save-character
+(let [cached-template (get db ::autosave-fx/cached-template)]
+  (if-not cached-template
+    {} ;; template not cached yet — skip this cycle
+    (let [built-character (entity/build character cached-template)]
+      ...)))
+```
+
+**Why `js/setTimeout 0`**: The `track!` must run after all subscription registrations. Since `autosave_fx.cljs` loads before `equipment_subs.cljs` (where `::char5e/template` is registered), the timeout defers creation to end-of-event-loop when all modules are loaded.
+
+**Why `built-template` is a no-op**: The `built-template` function in `subs.cljs:254-270` has its plugin-merging logic entirely commented out (`#_`). It returns the input template unchanged. This means the cached `::char5e/template` IS the effective `built-template`.
+
+**Safety**: If the template hasn't cached yet (e.g., app just loaded), the handler returns `{}` (no-op). The next autosave cycle (7.5s later) retries.
+
+**Risk factors**:
+- `track!` creates a long-lived reactive watcher — ensure it doesn't leak if the app is torn down
+- If `::char5e/template` subscription is ever renamed/removed, the `track!` will silently fail
+- The `js/setTimeout 0` relies on module load order — all `reg-sub` calls must complete before the timeout fires
+- If `built-template` plugin merging is ever re-enabled, the cached template would need to include plugin-option processing
+
+#### Files changed (subscribe refactor)
+
+| File | Changes |
+|------|---------|
+| `src/cljs/orcpub/dnd/e5/event_utils.cljs` | **NEW**: shared utilities extracted from events.cljs |
+| `src/cljs/orcpub/dnd/e5/events.cljs` | All handler fixes, compute helpers, verify-user-session, subscribe removed from requires |
+| `src/cljs/orcpub/dnd/e5/autosave_fx.cljs` | Template cache via `track!` |
+| `src/cljs/orcpub/dnd/e5/subs.cljs` | Import event-utils, remove local auth-headers |
+| `src/cljs/orcpub/dnd/e5/equipment_subs.cljs` | Import event-utils, remove local auth-headers |
+| `src/cljs/orcpub/dnd/e5/spell_subs.cljs` | Remove dead events import |
+| `src/cljs/orcpub/character_builder.cljs` | Pass built-char via dispatch (save, random name) |
+| `src/cljc/orcpub/dnd/e5/options.cljc` | Multi-arity custom-option-builder (inject-template? flag) |
+| `web/cljs/orcpub/core.cljs` | Replace `@(subscribe [:user false])` with `(dispatch-sync [:verify-user-session])` |
+
+#### Test coverage
+
+Pure function tests now cover many refactored modules. CLJS-only tests exist for re-frame handler integration. The JVM test suite includes tests for `compute-all-weapons-map`, feat-prereqs, pdf_spec pure functions, folder routes (CRUD + validation), and event handler round-trips.
+
+**Current**: 206 JVM tests, 945 assertions, 0 failures.
+
+**CLJS-only tests** (browser via `lein fig:test`):
+- `test/cljs/orcpub/dnd/e5/events_test.cljs` — re-frame handler tests
+
+**Manual testing checklist**:
+- [ ] Save character (manual) — verify character saves with correct summary
+- [ ] Autosave — edit character, wait 7.5s, verify save fires
+- [ ] Random name — verify race/subrace/sex-appropriate name generated
+- [ ] Filter spells — type 3+ characters, verify spell list filters
+- [ ] Filter items — type 3+ characters, verify item list filters
+- [ ] Level up — verify character navigates to builder
+- [ ] Export plugins — verify .orcbrew file downloads
+- [ ] Custom subclass/feat — verify name input works in homebrew builder
+- [ ] Login — verify auth check on app startup
+- [ ] Homebrew import — import a 2-5MB .orcbrew file, verify content loads
+
+## Figwheel
+
+Migrated from **lein-figwheel** (deprecated) to **figwheel-main 0.2.20**.
+
+### What Changed
+
+| Aspect | Before | After |
+|--------|--------|-------|
+| Plugin | `lein-figwheel` | `com.bhauman/figwheel-main 0.2.20` |
+| Config | `:figwheel {}` in project.clj | `dev.cljs.edn` + `:figwheel {}` in project.clj |
+| REPL | `lein figwheel` | `lein fig:dev` |
+| Port | 3449 | 3449 (unchanged) |
+
+### Port
+
+Figwheel runs on **port 3449**. This has not changed. The devcontainer forwards this port.
+
+### Figwheel Modes
+
+Three Leiningen aliases expose figwheel-main's different modes:
+
+| Alias | Command | Use when |
+|-------|---------|----------|
+| `lein fig:dev` | `--build dev --repl` | Interactive development (needs a terminal) |
+| `lein fig:watch` | `--build dev` | Background/scripted startup (headless, works with nohup) |
+| `lein fig:build` | `--build-once dev` | CI or quick compilation check |
+
+**Important**: `fig:dev` uses `--repl` which requires an interactive terminal. Running it under `nohup` causes the REPL to read EOF and the watcher dies. `start.sh figwheel` uses `fig:watch` (headless) for this reason.
+
+### user.clj Integration
+
+`dev/user.clj` lazy-loads figwheel-main to avoid pulling in CLJS tooling for server-only REPL sessions:
+
+```clojure
+(def ^:private fig-api
+  (delay
+    (require 'figwheel.main.api)
+    (find-ns 'figwheel.main.api)))
+```
+
+REPL functions: `(fig-start)`, `(fig-stop)`, `(cljs-repl)`
+
+## Other Frontend Dependencies
+
+| Library | Before | After | Notes |
+|---------|--------|-------|-------|
+| `binaryage/devtools` | 0.x | 1.0.7 | Chrome devtools for CLJS |
+| `cider/piggieback` | 0.3.x | 0.5.3 | nREPL middleware for CLJS REPL |
+| `day8.re-frame/re-frame-10x` | old | 1.11.0 | re-frame debugging panel |
+| `hiccup` | 1.x | 2.0.0 | HTML templating |
+| `com.cognitect/transit-cljs` | 0.8.x | 0.8.280 | Transit serialization |
diff --git a/docs/migration/library-upgrades.md b/docs/migration/library-upgrades.md
new file mode 100644
index 000000000..8dc3551ca
--- /dev/null
+++ b/docs/migration/library-upgrades.md
@@ -0,0 +1,156 @@
+# Library Upgrades
+
+All dependency changes in `project.clj`, grouped by category.
+
+## Clojure / ClojureScript Core
+
+| Library | Before | After |
+|---------|--------|-------|
+| `org.clojure/clojure` | 1.9.0 | 1.12.4 |
+| `org.clojure/clojurescript` | 1.9.x | 1.12.134 |
+| `org.clojure/core.async` | 0.3.x | 1.8.741 |
+| `org.clojure/core.match` | old | 1.1.1 |
+| `org.clojure/test.check` | old | 1.1.1 |
+| `org.clojure/data.json` | old | 2.5.0 |
+
+## Date/Time: clj-time → java-time
+
+**clj-time** wraps Joda-Time, which is end-of-life. Replaced with **java-time** which wraps `java.time` (built into Java 8+).
+
+```clojure
+;; Before
+[clj-time "0.x"]
+
+;; After
+[clojure.java-time "1.4.2"]
+```
+
+The require alias is preserved to minimize churn:
+
+```clojure
+;; Same alias, different library
+[clj-time.core :as t]  →  [java-time.api :as t]
+```
+
+**Files affected**: `src/clj/orcpub/pedestal.clj` (`parse-date` rewritten)
+
+**Frontend**: `com.andrewmcveigh/cljs-time 0.5.2` is unchanged (it wraps goog.date, not Joda).
+
+## PDF Generation
+
+```clojure
+;; Before
+[org.apache.pdfbox/pdfbox "2.x"]
+
+;; After
+[org.apache.pdfbox/pdfbox "3.0.6"]
+```
+
+PDFBox 3 has API changes in font handling and document loading. The vendored JAR is in `lib/org/apache/pdfbox/` and resolves via the `file:lib` repository.
+
+## Authentication
+
+```clojure
+;; Before
+[buddy/buddy-auth "1.x"]
+[buddy/buddy-hashers "1.x"]
+
+;; After
+[buddy/buddy-auth "3.0.323"]
+[buddy/buddy-hashers "2.0.167"]
+```
+
+Buddy 3 is compatible with Java 21. The JWS token handling in `orcpub.routes` is unchanged.
+
+## Web Framework
+
+See [pedestal-0.7.md](pedestal-0.7.md) for details.
+
+```clojure
+;; Before
+[io.pedestal/pedestal.service "0.5.1"]
+[io.pedestal/pedestal.route "0.5.1"]
+[io.pedestal/pedestal.jetty "0.5.1"]
+
+;; After (pinned — see pedestal-0.7.md for why)
+[io.pedestal/pedestal.service "0.7.0"]
+[io.pedestal/pedestal.route "0.7.0"]
+[io.pedestal/pedestal.jetty "0.7.0"]
+[io.pedestal/pedestal.error "0.7.0"]   ;; new
+[commons-io/commons-io "2.15.1"]       ;; required by Pedestal 0.7 ring-middlewares
+```
+
+## Component / Infrastructure
+
+| Library | Before | After |
+|---------|--------|-------|
+| `com.stuartsierra/component` | old | 1.2.0 |
+| `com.google.guava/guava` | old | 32.1.2-jre |
+| `com.fasterxml.jackson.core/*` | old | 2.15.2 |
+| `environ` | 1.1.0 | 1.2.0 |
+
+Jackson and Guava are pinned to resolve transitive dependency conflicts and CVEs.
+
+## Other
+
+| Library | Before | After | Notes |
+|---------|--------|-------|-------|
+| `funcool/cuerdas` | old | 2026.415 | String utilities (Clojars versioning) |
+| `clj-http` | old | 3.13.1 | HTTP client (JVM) |
+| `cljs-http` | 0.1.45 | 0.1.49 | HTTP client (CLJS) — fixes `no.en.core` shadowing (see below) |
+| `hiccup` | 1.x | 2.0.0 | HTML rendering |
+| `garden` → `com.lambdaisland/garden` | old | 1.9.606 | CSS-in-Clojure (see below) |
+| `bidi` | old | 2.1.6 | Routing |
+| `com.draines/postal` | old | 2.0.5 | Email |
+| `javax.servlet/javax.servlet-api` | — | 4.0.1 | Required on Java 9+ |
+
+## Garden: noprompt → lambdaisland Fork
+
+```clojure
+;; Before
+[garden "1.3.10"]
+
+;; After
+[com.lambdaisland/garden "1.9.606"]
+```
+
+The original `noprompt/garden` is unmaintained. On Clojure 1.12, it causes a `clojure.core/abs` shadowing warning because it only excludes `complement` from core, not `abs` (added in Clojure 1.11).
+
+The [lambdaisland/garden](https://github.com/lambdaisland/garden) fork fixes this by adding `abs` to `:refer-clojure :exclude`. It's a **drop-in replacement** — same namespaces, same API, same `lein-garden` plugin compatibility.
+
+## Test Dependencies
+
+| Library | Before | After | Notes |
+|---------|--------|-------|-------|
+| `org.clojars.favila/datomock` | — | 0.2.2-favila1 | Replaces `vvvvalvalval/datomock` (Datomic Pro compatible) |
+
+## Dev Dependencies
+
+| Library | Before | After |
+|---------|--------|-------|
+| `com.bhauman/figwheel-main` | — | 0.2.20 |
+| `com.bhauman/rebel-readline-cljs` | — | 0.1.4 |
+| `binaryage/devtools` | old | 1.0.7 |
+| `cider/piggieback` | old | 0.5.3 |
+| `day8.re-frame/re-frame-10x` | old | 1.11.0 |
+
+## Clojure 1.11+ Core Shadowing Pattern
+
+Clojure 1.11 added `abs`, `parse-long`, `parse-double`, and `parse-integer` to `clojure.core`. Libraries written before 1.11 that define their own versions of these functions produce shadowing warnings on modern Clojure/ClojureScript.
+
+This affected two dependencies in this project:
+
+| Library | Shadowed functions | Fix |
+|---------|-------------------|-----|
+| `garden` (noprompt) | `abs` | Switched to `com.lambdaisland/garden` fork |
+| `noencore` (via `cljs-http`) | `parse-long`, `parse-double` | Upgraded `cljs-http` 0.1.45 → 0.1.49 |
+
+**If you see similar warnings from other libraries in the future**, the fix is usually: check for a newer version that adds the functions to `:refer-clojure :exclude`, or switch to a maintained fork.
+
+## Build Plugins
+
+| Plugin | Before | After |
+|--------|--------|-------|
+| `lein-cljsbuild` | 1.1.7 | 1.1.7 (unchanged) |
+| `lein-garden` | 0.3.0 | 0.3.0 (unchanged) |
+| `clj-kondo` (via lint profile) | — | 2024.05.22 |
diff --git a/docs/migration/pedestal-0.7.md b/docs/migration/pedestal-0.7.md
new file mode 100644
index 000000000..22c183413
--- /dev/null
+++ b/docs/migration/pedestal-0.7.md
@@ -0,0 +1,73 @@
+# Pedestal 0.5.1 → 0.7.0
+
+## Version Pin
+
+Pedestal is pinned to **0.7.0** in `project.clj`. This is intentional:
+
+- **0.7.0** uses Jetty 11, which is compatible with figwheel-main's Ring adapter
+- **0.7.1+** and **0.8.x** use Jetty 12, which removes `ScopedHandler` — causing `NoClassDefFoundError` at startup when figwheel-main is running
+
+This pin stays until figwheel-main supports Jetty 12.
+
+## Breaking Changes
+
+### 1. Interceptor Maps Must Be Wrapped
+
+Pedestal 0.7 requires explicit interceptor coercion. Plain maps cause `AssertionError`.
+
+**Before** (0.5.1):
+```clojure
+(def db-interceptor
+  {:name :db-interceptor
+   :enter (fn [context] ...)})
+```
+
+**After** (0.7.0):
+```clojure
+(defn db-interceptor [conn]
+  (interceptor/interceptor
+   {:name :db-interceptor
+    :enter (fn [context] ...)}))
+```
+
+Changed in: `src/clj/orcpub/pedestal.clj` — `db-interceptor` and `etag-interceptor`
+
+### 2. Content Security Policy (CSP)
+
+Pedestal 0.5.1 had no CSP support. Pedestal 0.7.0 adds a default CSP via `::http/secure-headers` with `strict-dynamic`.
+
+In CSP Level 3 browsers (all modern browsers), `strict-dynamic` causes the browser to **ignore** `unsafe-inline` and `unsafe-eval`. Without nonces, this breaks:
+- Figwheel's `document.write()` for hot-reload script injection
+- Any inline `<script>` tags in HTML templates
+
+**Solution**: Nonce-based CSP with per-request cryptographic nonces.
+
+**New files**:
+- `src/clj/orcpub/csp.clj` — nonce generation + CSP header builder
+- CSP config section in `src/clj/orcpub/config.clj`
+
+**How it works**:
+
+1. `nonce-interceptor` (in `pedestal.clj`) generates a 128-bit nonce per request
+2. The nonce is stored in `[:request :csp-nonce]` for templates to read
+3. On `:leave`, the interceptor sets the `Content-Security-Policy` header with the nonce
+4. **Dev mode**: The nonce interceptor is a no-op — no nonce is generated, no CSP header is added. Pedestal 0.7's built-in `secure-headers` still applies its own defaults, but the custom nonce header is skipped entirely. This avoids flooding the browser console with Report-Only violations from Figwheel's inline scripts.
+5. **Prod mode**: Enforcing `Content-Security-Policy` with per-request nonces
+
+**Configuration** via `CSP_POLICY` env var (see `.env.example`):
+- `strict` (default) — nonce-based with `strict-dynamic`
+- `permissive` — allows `unsafe-inline` + `unsafe-eval` (legacy fallback)
+- `none` — disables CSP entirely
+
+### 3. Date Parsing
+
+`parse-date` in `pedestal.clj` was rewritten from clj-time to java-time.api. Same alias (`t`), different implementation. See [library-upgrades.md](library-upgrades.md).
+
+## Files Changed
+
+| File | What Changed |
+|------|-------------|
+| `src/clj/orcpub/pedestal.clj` | Interceptor wrapping, nonce-interceptor, java-time parse-date |
+| `src/clj/orcpub/csp.clj` | New — nonce generation + CSP header building |
+| `src/clj/orcpub/config.clj` | New — CSP policy config (`get-csp-policy`, `strict-csp?`, `get-secure-headers-config`) |
+| `src/clj/orcpub/system.clj` | `::http/secure-headers` now uses `config/get-secure-headers-config` |
diff --git a/docs/migration/remaining-subscribe-issues.md b/docs/migration/remaining-subscribe-issues.md
new file mode 100644
index 000000000..3420e5a2c
--- /dev/null
+++ b/docs/migration/remaining-subscribe-issues.md
@@ -0,0 +1,85 @@
+# Subscribe-Outside-Reactive-Context Issues — ALL FIXED
+
+All 14 subscribe-outside-reactive-context warnings have been resolved
+on `breaking/2026-stack-modernization`.
+
+## Fixed Issues
+
+### options.cljc — Modifier Conditions (2) ✓
+
+**Lines 1148, 1726** — `@(subscribe [::mi/all-weapons-map])`
+
+Replaced with `(mi/compute-all-weapons-map (get @re-frame.db/app-db ::mi/custom-items))`.
+New pure function `compute-all-weapons-map` in magic_items.cljc serves as
+SSOT for both subscriptions and condition code. Includes custom/homebrew items.
+
+### options.cljc — Homebrew Prereq (1) ✓
+
+**Line 2050** — `@(subscribe [:homebrew? path])`
+
+Replaced with direct app-db read:
+`(get-in (:character @re-frame.db/app-db) [::entity/homebrew-paths path])`.
+Same data path the `:homebrew?` subscription used internally.
+
+### options.cljc — Race Map Lookup (1) ✓
+
+**Line 3177** — `@(subscribe [::races/race-map])`
+
+Threaded `race-map` parameter through `template-selections` →
+`feat-option-from-cfg` → `feat-prereqs`. Caller in template.cljc computes
+`(common/map-by-key races)` from already-available `races` collection.
+
+### pdf_spec.cljc — PDF Generation (7) ✓
+
+All 7 subscribes removed. `make-spec` now accepts a `plugin-data` map
+with keys `:spells-map`, `:plugin-spells-map`, `:language-map`,
+`:all-weapons-map`, `:current-armor-class`. Callers in views.cljs subscribe
+in render context and pass the map into onClick closures.
+
+`[re-frame.core :refer [subscribe]]` removed from pdf_spec.cljc entirely.
+
+### equipment_subs.cljs — Subscribe Inside reg-sub (1) ✓
+
+**Line 264** — `@(subscribe [::mi5e/remote-item key])`
+
+Converted `::mi5e/item` from `reg-sub` to `reg-sub-raw`. For int keys,
+returns `(subscribe [::mi5e/remote-item key])` directly (reaction).
+For keyword keys, wraps static lookup in `reagent.ratom/make-reaction`.
+
+### views.cljs — onClick Closure (1) ✓
+
+**Line 7920** — `@(subscribe [::char/character character-id])`
+
+Moved subscribe to render-time `let` binding. The `character` value is
+now captured at render and closed over in the onClick handler.
+
+### views.cljs — Top-Level def with subscribe (1) ✓
+
+**Line 4336** — `@(subscribe [::langs/languages])`
+
+`option-language-proficiency-choice` was a `def` using `partial` that
+evaluated `@(subscribe ...)` at namespace load time. Converted to `defn`
+so the subscribe runs during render (inside reactive context). This single
+call site produced 4 cascading warnings because `::langs/languages` has a
+3-deep subscription chain — each inner `reg-sub` input function also calls
+`subscribe`, each triggering its own warning.
+
+---
+
+## Dead Code (unchanged, not executing)
+
+| File | Lines | Notes |
+|------|-------|-------|
+| options.cljc | 2139, 2719 | `#_` homebrew prereqs |
+| templates/scag.cljc | 25, 452 | `#_` class defs |
+| templates/ua_revised_ranger.cljc | 39 | `#_` multiclass prereq |
+| templates/ua_warlock_and_wizard.cljc | 120 | `#_` patron prereq |
+| templates/ua_base.cljc | 555 | `#_` entire ns require |
+
+---
+
+## Summary
+
+All 14 active subscribe-outside-reactive-context instances are resolved.
+Browser console is clean — zero subscribe warnings on fresh page load.
+Dead code in `#_` blocks is inert and can be cleaned up separately.
diff --git a/docs/migration/testing.md b/docs/migration/testing.md
new file mode 100644
index 000000000..c2b0cb1b4
--- /dev/null
+++ b/docs/migration/testing.md
@@ -0,0 +1,59 @@
+# Testing
+
+## Running Tests
+
+| Command | What | Runtime |
+|---------|------|---------|
+| `lein test` | JVM tests (`test/clj/` + `test/cljc/`) | JVM |
+| `lein fig:test` | CLJS tests (`test/cljs/` + transitive `.cljc`) | Browser |
+| `lein fig:build` | Compilation check (no tests) | CLJS |
+
+`fig:test` compiles to `target/test/js/test.js` — tests auto-run in browser via `auto-testing`. No headless runner (doo) yet.
+
+## Directory Layout
+
+```
+test/
+  clj/     JVM-only (.clj)
+  cljc/    Cross-platform (.clj and .cljc — both run on JVM, .cljc also on CLJS)
+  cljs/    CLJS-only (.cljs)
+    orcpub/
+      test_runner.cljs         fig:test entry point
+      dnd/e5/events_test.cljs  re-frame handler tests
+```
+
+## Adding a Pure Function Test (.cljc)
+
+1. Create `test/cljc/your/namespace_test.cljc`
+2. Use `clojure.test` (aliased automatically in `.cljc`)
+3. Add to `test/cljs/orcpub/test_runner.cljs` requires + `run-tests`
+4. Verify: `lein test` + `lein fig:test`
+
+## Adding a re-frame Handler Test (.cljs)
+
+1. Create `test/cljs/your/namespace_test.cljs`
+2. Use `cljs.test` with `refer-macros`
+3. Require the events namespace (registers handlers at load time)
+4. `reset! app-db` before each test
+5. Assert on `@app-db` after `rf/dispatch-sync`
+6. Add to test runner
+7. Verify: `lein fig:test` only
+
+```clojure
+;; Example: testing a reg-event-db handler
+(reset! app-db {:plugins {}})
+(rf/dispatch-sync [::char5e/filter-spells "fire"])
+(let [result (::char5e/filtered-spells @app-db)]
+  (is (contains? (set (map :name result)) "Fireball")))
+```
+
+Effect interception (`:http`, `:dispatch`) requires `day8.re-frame/re-frame-test` — not currently a dependency.
+
+## What's NOT Tested (Manual Only)
+
+- `track!` template cache — needs live Reagent reactive context
+- Component dispatch-site changes — needs full rendering
+- HTTP calls (verify-user-session, save) — needs HTTP mock
+- Browser-specific behavior (CSP, favicon, CSS)
+
+See the manual checklist in [frontend-stack.md](frontend-stack.md#test-coverage).
diff --git a/externs.js b/externs.js
new file mode 100644
index 000000000..7e5bd958a
--- /dev/null
+++ b/externs.js
@@ -0,0 +1,9 @@
+/**
+ * React 18 APIs missing from cljsjs/react-dom 18.3.1-1 externs.
+ * Without these, Closure Compiler renames them under :advanced optimization,
+ * breaking reagent.dom.client/render and reagent.impl.batching/react-flush.
+ * @externs
+ */
+
+ReactDOM.Root.render = function(children) {};
+ReactDOM.flushSync = function(callback) {};
diff --git a/menu b/menu
new file mode 100755
index 000000000..897a07697
--- /dev/null
+++ b/menu
@@ -0,0 +1,789 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# =============================================================================
+# menu - OrcPub Development Hub
+# =============================================================================
+# A wrapper/hub for starting, stopping, and checking OrcPub services.
+# Intended for LOCAL DEVELOPMENT - an alternative to Calva/IDE-based workflows.
+#
+# Usage:
+#   ./menu              Interactive menu
+#   ./menu start        Start all services (calls start.sh)
+#   ./menu stop         Stop all services (calls stop.sh)
+#   ./menu status       Show service status (calls stop.sh --dry-run)
+#   ./menu help         Show help
+# =============================================================================
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# Source shared utilities (colors, logging, port config)
+# shellcheck source=scripts/common.sh
+source "$SCRIPT_DIR/scripts/common.sh"
+
+# -----------------------------------------------------------------------------
+# Help
+# -----------------------------------------------------------------------------
+
+show_help() {
+    cat << 'EOF'
+OrcPub Development Hub
+
+Usage:
+  ./menu                      Interactive menu (recommended)
+  ./menu start [service]      Start services (passthrough to start.sh)
+  ./menu stop [service]       Stop services (passthrough to stop.sh)
+  ./menu status               Show service status
+  ./menu cleanup              Kill duplicate processes & show memory
+
+Quick CLI examples:
+  ./menu start datomic        Start just Datomic
+  ./menu start server         Start just server
+  ./menu stop datomic         Stop just Datomic
+  ./menu stop --yes           Stop all without prompting
+  ./menu status               Check what's running
+
+User management (email = <name>@test.com):
+  ./menu add <name> <pass>              Create user (auto-verified)
+  ./menu add <name> <pass> --no-verify  Create without verification
+  ./menu add user                       Interactive prompt
+  ./menu verify <name>                  Verify existing user
+  ./menu delete <name>                  Delete user
+  ./menu user                           Show user commands
+
+Start options (passed through to start.sh):
+  datomic|server|figwheel|garden   Specific service
+  init-db                          Initialize database
+  --quiet                          Suppress output
+  --idempotent                     Skip if already running
+  --background                     Run in background
+  --tmux                           Run in tmux session
+
+Stop options (passed through to stop.sh):
+  datomic|server|repl|figwheel     Specific service
+  --yes, -y                        Skip confirmation
+  --force, -f                      Use SIGKILL if needed
+
+Tmux tips:
+  Attach:  tmux attach -t orcpub
+  Detach:  Ctrl+B, then D
+  Kill:    tmux kill-session -t orcpub
+EOF
+}
+
+# -----------------------------------------------------------------------------
+# Status Display
+# -----------------------------------------------------------------------------
+
+show_status_header() {
+    "$SCRIPT_DIR/scripts/stop.sh" --dry-run 2>/dev/null || true
+}
+
+# -----------------------------------------------------------------------------
+# Start Services Submenu
+# -----------------------------------------------------------------------------
+
+show_start_submenu() {
+    echo ""
+    echo -e "${BOLD}Start Services${NC}"
+    echo "───────────────────────────────────────"
+    echo "  1) Datomic only"
+    echo "  2) Server only"
+    echo "  3) Figwheel (ClojureScript)"
+    echo "  4) Garden Auto (CSS watcher)"
+    echo ""
+    echo "  a) All (foreground)"
+    echo "  b) All (background)"
+    echo ""
+    echo "  0) Back"
+    echo ""
+}
+
+handle_start_submenu() {
+    local choice
+    while true; do
+        show_start_submenu
+        read -r -p "Select: " -n 1 choice
+        echo ""
+
+        case "$choice" in
+            1)
+                if ! "$SCRIPT_DIR/scripts/start.sh" datomic; then
+                    echo ""
+                    read -r -p "Press Enter to return to menu..."
+                fi
+                return
+                ;;
+            2)
+                if ! "$SCRIPT_DIR/scripts/start.sh" server; then
+                    echo ""
+                    read -r -p "Press Enter to return to menu..."
+                fi
+                return
+                ;;
+            3)
+                if ! "$SCRIPT_DIR/scripts/start.sh" figwheel; then
+                    echo ""
+                    read -r -p "Press Enter to return to menu..."
+                fi
+                return
+                ;;
+            4)
+                if ! "$SCRIPT_DIR/scripts/start.sh" garden; then
+                    echo ""
+                    read -r -p "Press Enter to return to menu..."
+                fi
+                return
+                ;;
+            a|A)
+                if ! "$SCRIPT_DIR/scripts/start.sh"; then
+                    echo ""
+                    read -r -p "Press Enter to return to menu..."
+                fi
+                return
+                ;;
+            b|B)
+                "$SCRIPT_DIR/scripts/start.sh" --background || true
+                echo ""
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            0|""|$'\e'|$'\x7f')  # 0, Enter, Escape, or Backspace
+                return
+                ;;
+            *)
+                echo -e "${YELLOW}Invalid choice${NC}"
+                sleep 0.5
+                ;;
+        esac
+    done
+}
+
+# -----------------------------------------------------------------------------
+# Stop Services Submenu
+# -----------------------------------------------------------------------------
+
+show_stop_submenu() {
+    echo ""
+    echo -e "${BOLD}Stop Services${NC}"
+    echo "───────────────────────────────────────"
+    echo "  1) Stop all"
+    echo "  2) Datomic only"
+    echo "  3) Server only"
+    echo "  4) nREPL only"
+    echo "  5) Figwheel only"
+    echo ""
+    echo "  0) Back"
+    echo ""
+}
+
+handle_stop_submenu() {
+    local choice
+    while true; do
+        show_stop_submenu
+        read -r -p "Select: " -n 1 choice
+        echo ""
+
+        case "$choice" in
+            1)
+                "$SCRIPT_DIR/scripts/stop.sh" || true
+                echo ""
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            2)
+                "$SCRIPT_DIR/scripts/stop.sh" datomic || true
+                echo ""
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            3)
+                "$SCRIPT_DIR/scripts/stop.sh" server || true
+                echo ""
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            4)
+                "$SCRIPT_DIR/scripts/stop.sh" repl || true
+                echo ""
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            5)
+                "$SCRIPT_DIR/scripts/stop.sh" figwheel || true
+                echo ""
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            0|""|$'\e'|$'\x7f')
+                return
+                ;;
+            *)
+                echo -e "${YELLOW}Invalid choice${NC}"
+                sleep 0.5
+                ;;
+        esac
+    done
+}
+
+# -----------------------------------------------------------------------------
+# Tmux Submenu
+# -----------------------------------------------------------------------------
+
+show_tmux_submenu() {
+    local session_status
+    if tmux has-session -t orcpub 2>/dev/null; then
+        session_status="${GREEN}(session exists)${NC}"
+    else
+        session_status="${YELLOW}(no session)${NC}"
+    fi
+
+    echo ""
+    echo -e "${BOLD}Tmux${NC} $session_status"
+    echo "───────────────────────────────────────"
+    echo "  1) Start all in tmux"
+    echo "  2) Attach to session"
+    echo "  3) Kill session"
+    echo ""
+    echo "  0) Back"
+    echo ""
+}
+
+handle_tmux_submenu() {
+    local choice
+    while true; do
+        show_tmux_submenu
+        read -r -p "Select: " -n 1 choice
+        echo ""
+
+        case "$choice" in
+            1)
+                if "$SCRIPT_DIR/scripts/start.sh" --tmux; then
+                    echo ""
+                    echo -e "${CYAN}Services started in tmux session 'orcpub'.${NC}"
+                    echo ""
+                    echo "To attach:  tmux attach -t orcpub"
+                    echo "To detach:  Ctrl+B, then D"
+                fi
+                echo ""
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            2)
+                if tmux has-session -t orcpub 2>/dev/null; then
+                    echo ""
+                    echo "Attaching to tmux session 'orcpub'..."
+                    echo "(Detach with Ctrl+B, then D)"
+                    echo ""
+                    sleep 1
+                    tmux attach -t orcpub || {
+                        echo ""
+                        echo -e "${YELLOW}Session ended or detached.${NC}"
+                    }
+                else
+                    echo ""
+                    echo -e "${YELLOW}No tmux session 'orcpub' found.${NC}"
+                    echo "Use option 1 to start services in tmux first."
+                fi
+                echo ""
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            3)
+                if tmux has-session -t orcpub 2>/dev/null; then
+                    if tmux kill-session -t orcpub 2>/dev/null; then
+                        echo ""
+                        echo -e "${GREEN}Killed tmux session 'orcpub'.${NC}"
+                    else
+                        echo ""
+                        echo -e "${YELLOW}Session may have already ended.${NC}"
+                    fi
+                else
+                    echo ""
+                    echo -e "${YELLOW}No tmux session 'orcpub' to kill.${NC}"
+                fi
+                echo ""
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            0|""|$'\e'|$'\x7f')
+                return
+                ;;
+            *)
+                echo -e "${YELLOW}Invalid choice${NC}"
+                sleep 0.5
+                ;;
+        esac
+    done
+}
+
+# -----------------------------------------------------------------------------
+# Tail Logs Submenu
+# -----------------------------------------------------------------------------
+
+show_tail_submenu() {
+    echo ""
+    echo -e "${BOLD}Tail Logs${NC}"
+    echo "───────────────────────────────────────"
+    echo "  1) Datomic"
+    echo "  2) Server"
+    echo "  3) Figwheel"
+    echo "  4) All (interleaved)"
+    echo ""
+    echo "  (Press Ctrl+C to stop tailing)"
+    echo ""
+    echo "  0) Back"
+    echo ""
+}
+
+handle_tail_submenu() {
+    local choice
+    while true; do
+        show_tail_submenu
+        read -r -p "Select: " -n 1 choice
+        echo ""
+
+        case "$choice" in
+            1)
+                local log="$LOG_DIR/datomic.log"
+                if [[ -f "$log" ]]; then
+                    echo ""
+                    echo -e "${CYAN}Tailing $log (Ctrl+C to stop)${NC}"
+                    echo ""
+                    tail -f "$log" || true
+                    echo ""
+                else
+                    echo -e "${YELLOW}Log not found: $log${NC}"
+                fi
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            2)
+                local log="$LOG_DIR/server.log"
+                if [[ -f "$log" ]]; then
+                    echo ""
+                    echo -e "${CYAN}Tailing $log (Ctrl+C to stop)${NC}"
+                    echo ""
+                    tail -f "$log" || true
+                    echo ""
+                else
+                    echo -e "${YELLOW}Log not found: $log${NC}"
+                fi
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            3)
+                local log="$LOG_DIR/figwheel.log"
+                if [[ -f "$log" ]]; then
+                    echo ""
+                    echo -e "${CYAN}Tailing $log (Ctrl+C to stop)${NC}"
+                    echo ""
+                    tail -f "$log" || true
+                    echo ""
+                else
+                    echo -e "${YELLOW}Log not found: $log${NC}"
+                fi
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            4)
+                echo ""
+                echo -e "${CYAN}Tailing all logs (Ctrl+C to stop)${NC}"
+                echo ""
+                # Use tail -f on all existing logs
+                local logs=()
+                [[ -f "$LOG_DIR/datomic.log" ]] && logs+=("$LOG_DIR/datomic.log")
+                [[ -f "$LOG_DIR/server.log" ]] && logs+=("$LOG_DIR/server.log")
+                [[ -f "$LOG_DIR/figwheel.log" ]] && logs+=("$LOG_DIR/figwheel.log")
+                if [[ ${#logs[@]} -gt 0 ]]; then
+                    tail -f "${logs[@]}" || true
+                    echo ""
+                else
+                    echo -e "${YELLOW}No log files found in $LOG_DIR${NC}"
+                fi
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            0|""|$'\e'|$'\x7f')
+                return
+                ;;
+            *)
+                echo -e "${YELLOW}Invalid choice${NC}"
+                sleep 0.5
+                ;;
+        esac
+    done
+}
+
+# -----------------------------------------------------------------------------
+# Open in VS Code Submenu
+# -----------------------------------------------------------------------------
+
+show_vscode_submenu() {
+    echo ""
+    echo -e "${BOLD}Open Log in VS Code${NC}"
+    echo "───────────────────────────────────────"
+    echo "  1) Datomic log"
+    echo "  2) Server log"
+    echo "  3) Figwheel log"
+    echo ""
+    echo "  0) Back"
+    echo ""
+}
+
+handle_vscode_submenu() {
+    local choice
+    while true; do
+        show_vscode_submenu
+        read -r -p "Select: " -n 1 choice
+        echo ""
+
+        case "$choice" in
+            1)
+                open_log_in_editor "$LOG_DIR/datomic.log"
+                return
+                ;;
+            2)
+                open_log_in_editor "$LOG_DIR/server.log"
+                return
+                ;;
+            3)
+                open_log_in_editor "$LOG_DIR/figwheel.log"
+                return
+                ;;
+            0|""|$'\e'|$'\x7f')
+                return
+                ;;
+            *)
+                echo -e "${YELLOW}Invalid choice${NC}"
+                sleep 0.5
+                ;;
+        esac
+    done
+}
+
+open_log_in_editor() {
+    local log="$1"
+
+    if [[ ! -f "$log" ]]; then
+        echo ""
+        echo -e "${YELLOW}Log not found: $log${NC}"
+        read -r -p "Press Enter to continue..."
+        return
+    fi
+
+    if command -v code >/dev/null 2>&1; then
+        echo ""
+        echo -e "${GREEN}Opening in VS Code: $log${NC}"
+        code --goto "$log:1" || {
+            echo -e "${YELLOW}Failed to open VS Code. Path: $log${NC}"
+        }
+    else
+        echo ""
+        echo -e "${YELLOW}VS Code CLI not found.${NC}"
+        echo "Log path: $log"
+    fi
+    read -r -p "Press Enter to continue..."
+}
+
+# -----------------------------------------------------------------------------
+# Utilities Submenu
+# -----------------------------------------------------------------------------
+
+show_utils_submenu() {
+    echo ""
+    echo -e "${BOLD}Utilities${NC}"
+    echo "───────────────────────────────────────"
+    echo "  l) Tail logs →"
+    echo "  o) Open log in VS Code →"
+    echo ""
+    echo "  u) Create test user (verified)"
+    echo "  i) Install Datomic"
+    echo "  c) Check prerequisites"
+    echo "  m) Memory cleanup (kill duplicates)"
+    echo "  r) Refresh status"
+    echo ""
+    echo "  0) Back"
+    echo ""
+}
+
+handle_utils_submenu() {
+    local choice
+    while true; do
+        show_utils_submenu
+        read -r -p "Select: " -n 1 choice
+        echo ""
+
+        case "$choice" in
+            l|L)
+                handle_tail_submenu
+                ;;
+            o|O)
+                handle_vscode_submenu
+                ;;
+            u|U)
+                echo ""
+                echo -e "${CYAN}Creating test user (test@example.com / testpass)...${NC}"
+                if "$SCRIPT_DIR/scripts/create_dummy_user.sh" test test@example.com testpass verify; then
+                    echo -e "${GREEN}Test user created successfully${NC}"
+                else
+                    echo -e "${YELLOW}User creation failed (may already exist)${NC}"
+                fi
+                echo ""
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            i|I)
+                "$SCRIPT_DIR/scripts/start.sh" --install || true
+                echo ""
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            c|C)
+                "$SCRIPT_DIR/scripts/start.sh" --check || true
+                echo ""
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            m|M)
+                echo ""
+                "$SCRIPT_DIR/scripts/cleanup-duplicates.sh"
+                echo ""
+                read -r -p "Press Enter to continue..."
+                return
+                ;;
+            r|R)
+                return  # Just return to refresh main menu
+                ;;
+            0|""|$'\e'|$'\x7f')
+                return
+                ;;
+            *)
+                echo -e "${YELLOW}Invalid choice${NC}"
+                sleep 0.5
+                ;;
+        esac
+    done
+}
+
+# -----------------------------------------------------------------------------
+# User Management CLI
+# -----------------------------------------------------------------------------
+
+# Append credentials to .test-users so you can look them up later.
+# File is gitignored. Format: username | email | password | status | timestamp
+log_test_user() {
+    local user="$1" email="$2" pass="$3" status="${4:-unverified}"
+    local file="$SCRIPT_DIR/.test-users"
+    # Add header on first use
+    if [[ ! -f "$file" ]]; then
+        echo "# Test users created by dev tooling (gitignored)" > "$file"
+        echo "# username | email | password | status | created" >> "$file"
+    fi
+    echo "$user | $email | $pass | $status | $(date -u +%Y-%m-%dT%H:%M:%SZ)" >> "$file"
+}
+
+# Create a user. Auto-verified unless --no-verify.
+# Email auto-generates as <username>@test.com.
+do_add_user() {
+    local username="$1" password="$2" flag="${3:-}"
+    local email="${username}@test.com"
+    if [[ "$flag" == "--no-verify" ]]; then
+        log_test_user "$username" "$email" "$password" "unverified"
+        lein with-profile init-db run -m user create-user "$username" "$email" "$password"
+    else
+        log_test_user "$username" "$email" "$password" "verified"
+        lein with-profile init-db run -m user create-user "$username" "$email" "$password" verify
+    fi
+}
+
+# Interactive user creation prompt
+do_add_user_interactive() {
+    echo ""
+    read -rp "Username: " username
+    if [[ -z "$username" ]]; then echo "Username required."; exit 1; fi
+    read -rsp "Password: " password; echo ""
+    if [[ -z "$password" ]]; then echo "Password required."; exit 1; fi
+    do_add_user "$username" "$password"
+}
+
+# User submenu (./menu user)
+handle_user_submenu() {
+    echo ""
+    echo "User commands (email = <name>@test.com):"
+    echo ""
+    echo "  ./menu add <name> <pass>              Create (auto-verified)"
+    echo "  ./menu add <name> <pass> --no-verify  Create (skip verification)"
+    echo "  ./menu add user                       Create (interactive prompt)"
+    echo "  ./menu verify <name>                  Verify existing user"
+    echo "  ./menu delete <name>                  Delete user"
+    echo ""
+}
+
+# -----------------------------------------------------------------------------
+# Main Menu
+# -----------------------------------------------------------------------------
+
+show_main_menu() {
+    echo ""
+    echo -e "${BOLD}OrcPub Development Hub${NC}"
+    echo "══════════════════════════════════════════════════════════════════"
+    echo ""
+    echo -e "${GREEN}Quick Actions${NC}"
+    echo "  1) Start Datomic"
+    echo "  2) Init Database"
+    echo "  3) Stop all services"
+    echo "  q) Quit"
+    echo ""
+    echo "  4) Start Services →"
+    echo "  5) Stop Services →"
+    echo "  6) Utilities →"
+    echo "  7) Tmux →"
+    echo "  8) Help"
+    echo ""
+}
+
+interactive_menu() {
+    local choice
+    local timeout_sec=120  # Auto-refresh status every 2 minutes
+
+    while true; do
+        # Show status at top of menu
+        show_status_header
+        show_main_menu
+
+        # Read with timeout for auto-refresh, -r to handle backslash
+        if read -t "$timeout_sec" -r -p "Select: " -n 1 choice; then
+            echo ""  # Newline after single-char input
+        else
+            # Timeout reached - just refresh
+            echo ""
+            echo -e "${CYAN}[Auto-refresh]${NC}"
+            continue
+        fi
+
+        case "$choice" in
+            1)
+                echo ""
+                if ! "$SCRIPT_DIR/scripts/start.sh" datomic; then
+                    # start.sh failed (port conflict declined, prereq error, etc.)
+                    echo ""
+                    read -r -p "Press Enter to return to menu..."
+                fi
+                ;;
+            2)
+                echo ""
+                "$SCRIPT_DIR/scripts/start.sh" init-db || true
+                echo ""
+                read -r -p "Press Enter to continue..."
+                ;;
+            3)
+                echo ""
+                "$SCRIPT_DIR/scripts/stop.sh" || true
+                echo ""
+                read -r -p "Press Enter to continue..."
+                ;;
+            4)
+                handle_start_submenu
+                ;;
+            5)
+                handle_stop_submenu
+                ;;
+            6)
+                handle_utils_submenu
+                ;;
+            7)
+                handle_tmux_submenu
+                ;;
+            8)
+                echo ""
+                show_help
+                echo ""
+                read -r -p "Press Enter to continue..."
+                ;;
+            q|Q|$'\e')  # q, Q, or Escape
+                echo ""
+                echo "Goodbye."
+                exit 0
+                ;;
+            "")
+                # Enter pressed - just refresh
+                ;;
+            *)
+                echo ""
+                echo -e "${YELLOW}Invalid choice: '$choice'${NC}"
+                sleep 1
+                ;;
+        esac
+    done
+}
+
+# -----------------------------------------------------------------------------
+# Main
+# -----------------------------------------------------------------------------
+
+main() {
+    local command="${1:-}"
+
+    case "$command" in
+        "")
+            interactive_menu
+            ;;
+        start)
+            shift
+            "$SCRIPT_DIR/scripts/start.sh" "$@"
+            ;;
+        stop)
+            shift
+            "$SCRIPT_DIR/scripts/stop.sh" "$@"
+            ;;
+        status)
+            "$SCRIPT_DIR/scripts/stop.sh" --dry-run
+            ;;
+        cleanup)
+            "$SCRIPT_DIR/scripts/cleanup-duplicates.sh"
+            ;;
+        add)
+            shift
+            if [[ "${1:-}" == "user" ]] || [[ -z "${1:-}" ]]; then
+                do_add_user_interactive
+            elif [[ -z "${2:-}" ]]; then
+                echo "Usage: ./menu add <username> <password> [--no-verify]"
+                exit 1
+            else
+                do_add_user "$@"
+            fi
+            ;;
+        verify)
+            shift
+            local username="${1:-}"
+            if [[ -z "$username" ]]; then
+                echo "Usage: ./menu verify <username>"
+                exit 1
+            fi
+            lein with-profile init-db run -m user verify-user "${username}@test.com"
+            ;;
+        delete)
+            shift
+            local username="${1:-}"
+            if [[ -z "$username" ]]; then
+                echo "Usage: ./menu delete <username>"
+                exit 1
+            fi
+            lein with-profile init-db run -m user delete-user "${username}@test.com"
+            ;;
+        user)
+            handle_user_submenu
+            ;;
+        help|--help|-h)
+            show_help
+            ;;
+        *)
+            echo "Unknown command: $command"
+            show_help
+            exit 1
+            ;;
+    esac
+}
+
+main "$@"
diff --git a/project.clj b/project.clj
index c04aeb7ba..30c2d4d11 100644
--- a/project.clj
+++ b/project.clj
@@ -13,9 +13,6 @@
   :min-lein-version "2.7.1"
 
   :repositories [["apache" "http://repository.apache.org/snapshots/"]
-                 ["my.datomic.com" {:url "https://my.datomic.com/repo"
-                                    :username [:gpg :env]
-                                    :password [:gpg :env]}]
                  ; This allows us to seamlessly load jars from local disk.
                  ["local" {:url "file:lib"
                            :checksum :ignore
@@ -23,54 +20,76 @@
                  ]
   :mirrors {"apache" {:url "https://repository.apache.org/snapshots/"}}
 
-  :dependencies [[org.clojure/clojure "1.10.0"]
-                 [org.clojure/test.check "0.9.0"]
-                 [org.clojure/clojurescript "1.10.439"]
-                 [org.clojure/core.async "0.4.490"]
-                 [cljsjs/react "16.6.0-0"]
-                 [cljsjs/react-dom "16.6.0-0"]
+  :dependencies [[org.clojure/clojure "1.12.4"]
+                 [org.clojure/test.check "1.1.1"]
+                 [org.clojure/clojurescript "1.12.134"]
+                 [org.clojure/core.async "1.8.741"]
+                 ;; React 18 + Reagent 2.0 (Concurrent Mode)
+                 [cljsjs/react "18.3.1-1"]
+                 [cljsjs/react-dom "18.3.1-1"]
                  [cljsjs/filesaverjs "1.3.3-0"]
-                 [com.cognitect/transit-cljs "0.8.256"]
-                 [cljs-http "0.1.45"]
+                 [com.cognitect/transit-cljs "0.8.280"]
+                 [cljs-http "0.1.49"]
                  [com.andrewmcveigh/cljs-time "0.5.2"]
-                 [clj-time "0.15.0"]
-                 [clj-http "3.9.1"]
+                 [clojure.java-time "1.4.2"]
+                 [clj-http "3.13.1"]
                  [com.yetanalytics/ring-etag-middleware "0.1.1"]
-                 [org.clojure/test.check "0.9.0"]
-
-                 [org.clojure/core.match "0.3.0-alpha5"]
-                 [re-frame "0.10.9"]
-                 [reagent "0.7.0"]
-                 [garden "1.3.2"]
-                 [org.apache.pdfbox/pdfbox "2.1.0-SNAPSHOT"]
-                 [io.pedestal/pedestal.service "0.5.1"]
-                 [io.pedestal/pedestal.route "0.5.1"]
-                 [io.pedestal/pedestal.jetty "0.5.1"]
-                 [org.clojure/data.json "0.2.6"]
+
+                 [org.clojure/core.match "1.1.1"]
+                 [re-frame "1.4.4"]
+                 [reagent "2.0.1"]
+                 [com.lambdaisland/garden "1.9.606"]
+                 [org.apache.pdfbox/pdfbox "3.0.6"]
+                 ;; Pedestal 0.7.0 uses Jetty 11, which is compatible with figwheel-main's Ring adapter.
+                 ;; Pedestal 0.7.1+ and 0.8.x use Jetty 12, causing NoClassDefFoundError: ScopedHandler
+                 ;; (removed in Jetty 12). Upgrade blocked until figwheel-main supports Jetty 12.
+                 [io.pedestal/pedestal.service "0.7.0"]
+                 [io.pedestal/pedestal.route "0.7.0"]
+                 [io.pedestal/pedestal.jetty "0.7.0"]
+                 [io.pedestal/pedestal.error "0.7.0"]
+                 [org.clojure/data.json "2.5.0"]
                  [org.slf4j/slf4j-simple "1.7.21"]
-                 [buddy/buddy-auth "1.4.1"]
-                 [buddy/buddy-hashers "1.2.0"]
+                 [buddy/buddy-auth "3.0.323"]
+                 [buddy/buddy-hashers "2.0.167"]
                  [reloaded.repl "0.2.3"]
-                 [bidi "2.0.17"]
+                 [bidi "2.1.6"]
+
+                 [com.stuartsierra/component "1.2.0"]
+                 [com.google.guava/guava "32.1.2-jre"]
 
-                 [com.stuartsierra/component "0.3.2"]
-                 [com.google.guava/guava "21.0"]
+                 [com.fasterxml.jackson.core/jackson-databind "2.15.2"]
+                 [com.fasterxml.jackson.core/jackson-core "2.15.2"]
+                 [com.fasterxml.jackson.core/jackson-annotations "2.15.2"]
 
-                 [com.fasterxml.jackson.core/jackson-databind "2.11.1"]
+                 ;; Required for Pedestal 0.7.x ring-middlewares
+                 [commons-io/commons-io "2.15.1"]
 
-                 [hiccup "1.0.5"]
-                 [com.draines/postal "2.0.2"]
-                 [environ "1.1.0"]
+                 [hiccup "2.0.0"]
+                 [com.draines/postal "2.0.5"]
+                 [environ "1.2.0"]
 
                  [pdfkit-clj "0.1.7"]
-                 [vvvvalvalval/datomock "0.2.0"]
-                 [com.datomic/datomic-free "0.9.5697"]
-                 [funcool/cuerdas "2.2.0"]
+                 ;; datomock fork with Datomic Pro 1.0.6527+ compatibility (new transact signature)
+                 ;; Original vvvvalvalval/datomock 0.2.0 causes AbstractMethodError with Datomic Pro
+                 [org.clojars.favila/datomock "0.2.2-favila1"]
+                 ;; Datomic Pro: Free under Apache 2.0, supports Java 11/17/21, actively maintained.
+                 ;; Exclude slf4j-nop to avoid duplicate SLF4J binding warnings.
+                 ;; Installed to lib/com/datomic/datomic-pro/1.0.7482/ during Docker build/postCreateCommand
+                 ;; Uses existing file:lib repository pattern (same as pdfbox)
+                 ;; Latest version: https://docs.datomic.com/releases-pro.html
+                 ;[com.datomic/datomic-pro "1.0.7482" :exclusions [org.slf4j/slf4j-nop]]
+                 [com.datomic/peer "1.0.7482" :exclusions [org.slf4j/slf4j-nop]]
+                 ;; cuerdas 026.415: Latest release on Clojars... does not match GH release versioning.
+                 [funcool/cuerdas "2026.415"]
                  [camel-snake-kebab "0.4.0"]
-                 [org.webjars/font-awesome "5.13.1"]]
-
-  :plugins [[lein-figwheel "0.5.19"]
-            [lein-cljsbuild "1.1.7" :exclusions [[org.clojure/clojure]]]
+                 [org.webjars/font-awesome "5.13.1"]
+                 ;; See docs/UPGRADE_DEPENDENCIES.md for why this is needed on Java 9+/21
+                 [javax.servlet/javax.servlet-api "4.0.1"]
+                 ;; figwheel-main for hot-reload dev (compatible with Pedestal 0.7.0's Jetty 11)
+                 [com.bhauman/figwheel-main "0.2.20"]
+                 [com.bhauman/rebel-readline-cljs "0.1.4"]
+              ]
+  :plugins [[lein-cljsbuild "1.1.7" :exclusions [[org.clojure/clojure]]]
             [lein-localrepo "0.5.4"]
             [lein-garden "0.3.0"]
             [lein-environ "1.1.0"]
@@ -84,7 +103,7 @@
 
   :clean-targets ^{:protect false} ["resources/public/js/compiled" "target"]
 
-  :resource-paths ["resources" "resources/.ebextensions/"]
+  :resource-paths ["resources" "target" "resources/.ebextensions/"]
 
   :uberjar-name "orcpub.jar"
 
@@ -100,7 +119,9 @@
                                 ;; Compress the output?
                                 :pretty-print? false}}]}
 
-  :prep-tasks [["garden" "once"]]
+  ;; NOTE: Garden compilation removed from global :prep-tasks for faster REPL startup.
+  ;; CSS is compiled via: ./menu start garden, lein garden once, or automatically in uberjar build.
+  ;; The compiled CSS is checked into resources/public/css/compiled/styles.css
 
   :cljsbuild {:builds
               {:dev
@@ -123,8 +144,7 @@
                                :source-map-timestamp true
                                :pretty-print         true
                                :closure-defines      {goog.DEBUG true}
-                               :optimizations        :none
-                               }}}}
+                               :optimizations        :none}}}}
 
   :figwheel {;; :http-server-root "public" ;; default and assumes "resources"
              ;; :server-port 3449 ;; default
@@ -175,21 +195,28 @@
   :uberjar-inclusions [#"^\.ebextensions"]
   :jar-inclusions [#"^\.ebextensions"]
 
-  :aliases {"figwheel-native" ["with-profile" "native-dev" "run" "-m" "user" "--figwheel"]
-            ;;"figwheel-web" ["figwheel"]
+  :aliases {"fig:dev" ["trampoline" "run" "-m" "figwheel.main" "--" "--build" "dev" "--repl"]
+            "fig:watch" ["run" "-m" "figwheel.main" "--" "--build" "dev"]
+            "fig:build" ["run" "-m" "figwheel.main" "--" "--build-once" "dev"]
+            "fig:test" ["run" "-m" "figwheel.main" "--" "--build-once" "test"]
+            "figwheel-native" ["with-profile" "native-dev" "run" "-m" "user" "--figwheel"]
             "externs" ["do" "clean"
                        ["run" "-m" "externs"]]
             "rebuild-modules" ["run" "-m" "user" "--rebuild-modules"]
-            "lint" ["with-profile" "lint" "run" "-m" "clj-kondo.main" "--lint" "src"]
+            ;; --fail-level error: exit 0 on warnings, exit 1 only on errors.
+            ;; trampoline re-execs in a fresh JVM so System/exit propagates
+            ;; (without it, lein suppresses the exit code).
+            ;; native/ is excluded — directory only exists for React Native builds.
+            "lint" ["trampoline" "with-profile" "lint" "run" "-m" "clj-kondo.main" "--lint" "src" "test" "web" "--fail-level" "error"]
             "prod-build" ^{:doc "Recompile code with prod profile."}
             ["externs"
              ["with-profile" "prod" "cljsbuild" "once" "main"]]}
-  :profiles {:dev          {:dependencies [[binaryage/devtools "0.9.10"]
-                                           [figwheel-sidecar "0.5.19"]
-                                           [cider/piggieback "0.4.0"]
-                                           [org.clojure/test.check "0.9.0"]
-                                           [day8.re-frame/re-frame-10x "0.3.7"]]
-                            :env       {:dev-mode "true"}
+  :profiles {:dev          {:dependencies [[binaryage/devtools "1.0.7"]
+                                           [cider/piggieback "0.5.3"]
+                                           [day8.re-frame/re-frame-10x "1.11.0" :exclusions [zprint rewrite-clj]]
+                                           ]
+                            :env       {:dev-mode  "true"
+                                        :signature "dev-secret-do-not-use-in-production"}
                             ;; need to add dev source path here to get user.clj loaded
                             :source-paths ["web/cljs" "src/clj" "src/cljc" "src/cljs" "dev"]
                             :cljsbuild    {:builds {:dev {:compiler {:closure-defines {"re_frame.trace.trace_enabled_QMARK_" true
@@ -199,14 +226,13 @@
                                                                      :pretty-print     true
                                                                      ;; To console.log CLJS data-structures make sure you enable devtools in Chrome
                                                                      ;; https://github.com/binaryage/cljs-devtools
-                                                                     :preloads        [devtools.preload day8.re-frame-10x.preload]}}}}
+                                                                     :preloads        [devtools.preload]}}}}
                             ;; for CIDER
                             ;; :plugins [[cider/cider-nrepl "0.12.0"]]
                             :repl-options {:init-ns          user
                                            :nrepl-middleware [cider.piggieback/wrap-cljs-repl]}}
-             :native-dev   {:dependencies [[figwheel-sidecar "0.5.19"]
-                                           [com.cemerick/piggieback "0.2.1"]
-                                           [org.clojure/test.check "0.9.0"]]
+             ;; NOTE: :native-dev was for React Native builds (legacy, may be unused)
+             :native-dev   {:dependencies [[cider/piggieback "0.5.3"]]
                             :source-paths ["src/cljs" "native/cljs" "src/cljc" "env/dev"]
                             :cljsbuild    {:builds [{:id           "main"
                                                      :source-paths ["src/cljs" "native/cljs" "src/cljc" "env/dev"]
@@ -216,6 +242,8 @@
                                                                     :output-dir    "target"
                                                                     :optimizations :none}}]}
                             :repl-options {:nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]}}
+             ;; NOTE: :prod was for React Native builds (legacy, may be unused)
+             ;; datomic-pro dependency removed - peer is already in main deps
              :prod         {:cljsbuild    {:builds [{:id           "main"
                                                      :source-paths ["src/cljs" "native/cljs" "src/cljc" "env/prod"]
                                                      :compiler     {:output-to          "main.js"
@@ -225,9 +253,8 @@
                                                                     :externs            ["js/externs.js"]
                                                                     :parallel-build     true
                                                                     :optimize-constants true
-                                                                    :optimizations      :advanced}}]}
-                            :dependencies [[com.datomic/datomic-free "0.9.5697"]]}
-             :uberjar      {:prep-tasks  ["clean" "compile" ["cljsbuild" "once" "prod"]]
+                                                                    :optimizations      :advanced}}]}}
+             :uberjar      {:prep-tasks  ["clean" ["garden" "once"] "compile" ["cljsbuild" "once" "prod"]]
                             :env         {:production true}
                             :aot         :all
                             :omit-source true
@@ -239,10 +266,17 @@
                                                            :output-to     "resources/public/js/compiled/orcpub.js"
                                                            ;;:output-dir "resources/public/js/compiled/out"
                                                            :optimizations :advanced
+                                                           :infer-externs true
+                                                           :externs       ["externs.js"]
                                                            :pretty-print  false}}}}}
-             :lint         {:dependencies [[clj-kondo "2024.05.22"]]
-                            :clj-kondo {:linters {:shadowed-fn-param {:level :off}
-                                                  :shadowed-var {:level :off}}}}
+             ;; All lint config lives in .clj-kondo/config.edn so IDE and CLI agree.
+             :lint         {:dependencies [[clj-kondo "2026.01.19"]]}
+             ;; Minimal profile for init-db and dev CLI - no ClojureScript, no Garden
+             ;; Use: lein with-profile init-db run -m user <command>
+             ;; dev/ is included so user.clj is on the classpath.
+             ;; This does NOT affect production — uberjar uses :uberjar profile only.
+             :init-db      {:source-paths ["src/clj" "src/cljc" "dev"]
+                            :prep-tasks   ^:replace []}
              ;; Use like: lein with-profile +start-server repl
              :start-server {:repl-options {:init-ns user
                                            :init    (start-server)}}})
diff --git a/resources/simplelogger.properties b/resources/simplelogger.properties
new file mode 100644
index 000000000..066f52fab
--- /dev/null
+++ b/resources/simplelogger.properties
@@ -0,0 +1,7 @@
+# SLF4J Simple Logger configuration
+# https://www.slf4j.org/api/org/slf4j/simple/SimpleLogger.html
+
+# Suppress PDFBox font fallback warnings (cosmetic — OrcPub writes PDFs, never renders to images).
+# PDFBox logs WARN when Helvetica isn't found as a system font and falls back to bundled LiberationSans.
+# Install fonts-liberation in the container to fix the root cause; this config is a safety net.
+org.slf4j.simpleLogger.log.org.apache.pdfbox.pdmodel.font.PDType1Font=error
diff --git a/scripts/common.sh b/scripts/common.sh
new file mode 100755
index 000000000..d96f3f8b6
--- /dev/null
+++ b/scripts/common.sh
@@ -0,0 +1,440 @@
+#!/usr/bin/env bash
+# =============================================================================
+# common.sh - Shared utilities for OrcPub external scripts
+# =============================================================================
+# Source this file in start.sh, stop.sh, and menu:
+#   source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
+# =============================================================================
+
+# Prevent double-sourcing
+[[ -n "${_ORCPUB_COMMON_LOADED:-}" ]] && return
+_ORCPUB_COMMON_LOADED=1
+
+# -----------------------------------------------------------------------------
+# Path Setup
+# -----------------------------------------------------------------------------
+
+# SCRIPT_DIR should be set by the sourcing script, but provide fallback
+COMMON_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="${REPO_ROOT:-$(cd "$COMMON_DIR/.." && pwd)}"
+
+# -----------------------------------------------------------------------------
+# Environment Configuration
+# -----------------------------------------------------------------------------
+
+# Source .env if present (authoritative config)
+if [[ -f "$REPO_ROOT/.env" ]]; then
+    set -a
+    # shellcheck disable=SC1091
+    . "$REPO_ROOT/.env"
+    set +a
+fi
+
+# Defaults (used if not set in .env)
+DATOMIC_VERSION="${DATOMIC_VERSION:-1.0.7482}"
+DATOMIC_TYPE="${DATOMIC_TYPE:-pro}"
+JAVA_MIN_VERSION="${JAVA_MIN_VERSION:-11}"
+LOG_DIR="${LOG_DIR:-$REPO_ROOT/logs}"
+
+# Port configuration
+DATOMIC_PORT="${DATOMIC_PORT:-4334}"
+SERVER_PORT="${SERVER_PORT:-8890}"
+NREPL_PORT="${NREPL_PORT:-7888}"
+FIGWHEEL_PORT="${FIGWHEEL_PORT:-3449}"
+GARDEN_PORT="${GARDEN_PORT:-3000}"
+
+# Derived paths
+DATOMIC_DIR="$REPO_ROOT/lib/com/datomic/datomic-${DATOMIC_TYPE}/${DATOMIC_VERSION}"
+DATOMIC_CONFIG="$DATOMIC_DIR/config/working-transactor.properties"
+DATOMIC_CONFIG_TEMPLATE="$DATOMIC_DIR/config/samples/dev-transactor-template.properties"
+
+# Ensure logs directory exists
+mkdir -p "$LOG_DIR" 2>/dev/null || true
+
+# -----------------------------------------------------------------------------
+# Colors
+# -----------------------------------------------------------------------------
+
+# Disable colors if not a terminal or NO_COLOR is set
+if [[ -t 1 ]] && [[ -z "${NO_COLOR:-}" ]]; then
+    RED='\033[0;31m'
+    GREEN='\033[0;32m'
+    YELLOW='\033[1;33m'
+    CYAN='\033[0;36m'
+    BOLD='\033[1m'
+    NC='\033[0m'
+else
+    RED=''
+    GREEN=''
+    YELLOW=''
+    CYAN=''
+    BOLD=''
+    NC=''
+fi
+
+# -----------------------------------------------------------------------------
+# Exit Codes (standardized across all scripts)
+# -----------------------------------------------------------------------------
+# 0 = Success (or already running in idempotent mode)
+# 1 = Usage / invalid args
+# 2 = Prerequisite / config failure
+# 3 = Runtime failure (process crashed, timeout, port conflict)
+
+EXIT_SUCCESS=0
+EXIT_USAGE=1
+EXIT_PREREQ=2
+EXIT_RUNTIME=3
+
+# -----------------------------------------------------------------------------
+# Configurable Timeouts
+# -----------------------------------------------------------------------------
+
+KILL_WAIT="${KILL_WAIT:-5}"
+PORT_WAIT="${PORT_WAIT:-30}"
+
+# -----------------------------------------------------------------------------
+# Quiet Mode Support
+# -----------------------------------------------------------------------------
+
+# Global quiet mode flag (set by scripts via --quiet)
+QUIET="${QUIET:-false}"
+
+# -----------------------------------------------------------------------------
+# Interactive Detection
+# -----------------------------------------------------------------------------
+
+# Check if running interactively (both stdin and stdout are terminals)
+is_interactive() {
+    [[ -t 0 && -t 1 ]]
+}
+
+# -----------------------------------------------------------------------------
+# Logging
+# -----------------------------------------------------------------------------
+
+# log_info and log_warn respect QUIET mode
+# log_error ALWAYS outputs (to stderr) - errors should never be silenced
+log_info() {
+    [[ "$QUIET" == "true" ]] && return
+    echo -e "${GREEN}[INFO]${NC} $1"
+}
+
+log_warn() {
+    [[ "$QUIET" == "true" ]] && return
+    echo -e "${YELLOW}[WARN]${NC} $1" >&2
+}
+
+log_error() {
+    # Always output errors to stderr, even in quiet mode
+    echo -e "${RED}[ERROR]${NC} $1" >&2
+}
+
+# -----------------------------------------------------------------------------
+# Port Utilities
+# -----------------------------------------------------------------------------
+
+# Check if a port is in use (returns 0 if in use, 1 if free)
+port_in_use() {
+    local port="$1"
+    if command -v lsof >/dev/null 2>&1; then
+        lsof -i ":${port}" >/dev/null 2>&1
+    elif command -v ss >/dev/null 2>&1; then
+        ss -tln 2>/dev/null | grep -q ":${port}\b"
+    elif command -v netstat >/dev/null 2>&1; then
+        netstat -tln 2>/dev/null | grep -q ":${port}\b"
+    else
+        # Fallback: try to connect
+        timeout 1 bash -c "</dev/tcp/localhost/$port" 2>/dev/null
+    fi
+}
+
+# Wait for a port to become available (up to timeout seconds)
+wait_for_port() {
+    local port="$1"
+    local timeout="${2:-30}"
+    local elapsed=0
+
+    while [[ $elapsed -lt $timeout ]]; do
+        if port_in_use "$port"; then
+            return 0
+        fi
+        sleep 1
+        ((elapsed++))
+    done
+    return 1
+}
+
+# Wait for a port to become available, but fail fast if the process dies
+# Usage: wait_for_port_or_die PORT PID [TIMEOUT]
+wait_for_port_or_die() {
+    local port="$1"
+    local pid="$2"
+    local timeout="${3:-60}"
+    local elapsed=0
+
+    while [[ $elapsed -lt $timeout ]]; do
+        # Check if process is still alive
+        if ! kill -0 "$pid" 2>/dev/null; then
+            log_error "Process $pid died while waiting for port $port"
+            return 1
+        fi
+        # Check if port is ready
+        if port_in_use "$port"; then
+            return 0
+        fi
+        sleep 1
+        ((elapsed++))
+    done
+    log_error "Timeout waiting for port $port (process $pid still running)"
+    return 1
+}
+
+# Wait for a port to become free (up to timeout seconds)
+wait_for_port_free() {
+    local port="$1"
+    local timeout="${2:-10}"
+    local elapsed=0
+
+    while [[ $elapsed -lt $timeout ]]; do
+        if ! port_in_use "$port"; then
+            return 0
+        fi
+        sleep 1
+        ((elapsed++))
+    done
+    return 1
+}
+
+# Find PIDs listening on a port (cross-platform)
+find_pids_by_port() {
+    local port="$1"
+    local pids=""
+
+    if command -v lsof >/dev/null 2>&1; then
+        pids=$(lsof -t -i ":${port}" 2>/dev/null || true)
+    elif command -v ss >/dev/null 2>&1; then
+        # Cross-platform: use sed instead of grep -oP
+        pids=$(ss -tlnp 2>/dev/null | grep ":${port}\b" | sed -n 's/.*pid=\([0-9]*\).*/\1/p' || true)
+    elif command -v netstat >/dev/null 2>&1; then
+        pids=$(netstat -tlnp 2>/dev/null | grep ":${port}\b" | awk '{print $7}' | cut -d'/' -f1 | grep -E '^[0-9]+$' || true)
+    fi
+
+    echo "$pids" | tr '\n' ' ' | xargs
+}
+
+# Find PIDs by process name pattern (cross-platform)
+find_pids_by_name() {
+    local pattern="$1"
+    local pids=""
+
+    if command -v pgrep >/dev/null 2>&1; then
+        pids=$(pgrep -f "$pattern" 2>/dev/null || true)
+    else
+        pids=$(ps aux 2>/dev/null | grep -E "$pattern" | grep -v grep | awk '{print $2}' || true)
+    fi
+
+    # Filter out our own PID and parent
+    local self_pid=$$
+    local parent_pid=$PPID
+    local filtered=""
+    for pid in $pids; do
+        [[ "$pid" != "$self_pid" && "$pid" != "$parent_pid" ]] && filtered="$filtered $pid"
+    done
+
+    echo "$filtered" | xargs
+}
+
+# Get process info for display
+get_process_info() {
+    local pid="$1"
+    [[ -z "$pid" ]] && return
+    ps -p "$pid" -o pid=,user=,args= 2>/dev/null | head -c 80 || echo "$pid (info unavailable)"
+}
+
+# Get process uptime
+get_uptime() {
+    local pid="$1"
+    [[ -z "$pid" ]] && echo "-" && return
+    local etime
+    etime=$(ps -p "$pid" -o etime= 2>/dev/null | xargs || true)
+    echo "${etime:-unknown}"
+}
+
+# -----------------------------------------------------------------------------
+# Prerequisite Checks
+# -----------------------------------------------------------------------------
+
+check_java() {
+    local java_version
+    java_version=$(java -version 2>&1 | head -1 | sed -E 's/.*"([0-9]+).*/\1/')
+
+    if [[ -z "$java_version" ]]; then
+        log_error "Java not found. Please install Java $JAVA_MIN_VERSION or higher."
+        return 1
+    fi
+
+    if [[ "$java_version" -lt "$JAVA_MIN_VERSION" ]]; then
+        log_error "Java $JAVA_MIN_VERSION+ required (found Java $java_version)."
+        log_info "Use the devcontainer or install a compatible JDK."
+        return 1
+    fi
+
+    log_info "Java $java_version detected (minimum: $JAVA_MIN_VERSION)"
+    return 0
+}
+
+check_lein() {
+    if ! command -v lein >/dev/null 2>&1; then
+        log_error "Leiningen not found. Please use the devcontainer or install leiningen."
+        return 1
+    fi
+    return 0
+}
+
+check_tmux() {
+    if ! command -v tmux >/dev/null 2>&1; then
+        log_error "tmux not found. Install tmux or run without --tmux."
+        return 1
+    fi
+    return 0
+}
+
+check_datomic_installed() {
+    if [[ ! -d "$DATOMIC_DIR" ]]; then
+        log_error "Datomic ${DATOMIC_TYPE} ${DATOMIC_VERSION} not found."
+        log_error "Expected at: $DATOMIC_DIR"
+        log_info "Run './start.sh --install' to install Datomic."
+        return 1
+    fi
+
+    if [[ ! -f "$DATOMIC_DIR/bin/transactor" ]]; then
+        log_error "Datomic transactor not found. Installation may be incomplete."
+        log_error "Expected at: $DATOMIC_DIR/bin/transactor"
+        log_info "Run './start.sh --install' to reinstall Datomic."
+        return 1
+    fi
+
+    if [[ ! -x "$DATOMIC_DIR/bin/transactor" ]]; then
+        log_error "Datomic transactor exists but is not executable."
+        log_error "Path: $DATOMIC_DIR/bin/transactor"
+        log_info "Try: chmod +x $DATOMIC_DIR/bin/transactor"
+        return 1
+    fi
+
+    return 0
+}
+
+# -----------------------------------------------------------------------------
+# Process Management
+# -----------------------------------------------------------------------------
+
+# Graceful shutdown with SIGKILL fallback
+kill_gracefully() {
+    local pid="$1"
+    local wait_secs="${2:-$KILL_WAIT}"
+
+    # Try SIGTERM first
+    kill -TERM "$pid" 2>/dev/null || return 0
+
+    # Wait for process to exit
+    for ((i=0; i<wait_secs; i++)); do
+        kill -0 "$pid" 2>/dev/null || return 0
+        sleep 1
+    done
+
+    # Process still running - escalate to SIGKILL
+    log_warn "Process $pid didn't stop gracefully, sending SIGKILL"
+    kill -KILL "$pid" 2>/dev/null || true
+}
+
+# Clean up stale PID files
+cleanup_stale_pid() {
+    local name="$1"
+    local pid_file="$LOG_DIR/${name}.pid"
+
+    if [[ -f "$pid_file" ]]; then
+        local old_pid
+        old_pid=$(cat "$pid_file" 2>/dev/null || true)
+        if [[ -n "$old_pid" ]] && ! kill -0 "$old_pid" 2>/dev/null; then
+            rm -f "$pid_file"
+            log_info "Cleaned up stale PID file for $name"
+        fi
+    fi
+}
+
+# Find service PIDs using PID file first, then port/pattern fallback
+find_service_pids() {
+    local name="$1"
+    local port="$2"
+    local pattern="$3"
+    local pids=""
+
+    # 1. Check PID file first (most reliable)
+    local pid_file="$LOG_DIR/${name}.pid"
+    if [[ -f "$pid_file" ]]; then
+        local file_pid
+        file_pid=$(cat "$pid_file" 2>/dev/null || true)
+        if [[ -n "$file_pid" ]] && kill -0 "$file_pid" 2>/dev/null; then
+            pids="$file_pid"
+        fi
+    fi
+
+    # 2. Fall back to port scan + name pattern
+    if [[ -z "$pids" ]]; then
+        pids=$(echo "$(find_pids_by_port "$port") $(find_pids_by_name "$pattern")" | tr ' ' '\n' | sort -u | xargs)
+    fi
+
+    echo "$pids"
+}
+
+# -----------------------------------------------------------------------------
+# Failure Diagnostics
+# -----------------------------------------------------------------------------
+
+# Show detailed diagnostics when a service fails to start
+show_startup_failure() {
+    local name="$1"
+    local log_file="$2"
+    local port="${3:-}"
+
+    log_error "Service '$name' failed to start. Diagnostics:"
+    echo "─────────────────────────────────────────────────────────────"
+
+    if [[ -n "$log_file" && -f "$log_file" ]]; then
+        echo "Last 30 lines of $log_file:"
+        tail -30 "$log_file" 2>/dev/null || echo "(could not read log file)"
+    else
+        echo "Log file: (not available)"
+    fi
+
+    echo "─────────────────────────────────────────────────────────────"
+
+    if [[ -n "$port" ]]; then
+        echo "Processes on port $port:"
+        local pids
+        pids=$(find_pids_by_port "$port")
+        if [[ -n "$pids" ]]; then
+            for pid in $pids; do
+                ps -p "$pid" -o pid,user,args 2>/dev/null || echo "  PID $pid (info unavailable)"
+            done
+        else
+            echo "  (none)"
+        fi
+    fi
+
+    echo "─────────────────────────────────────────────────────────────"
+}
+
+# -----------------------------------------------------------------------------
+# Datomic Config Helpers
+# -----------------------------------------------------------------------------
+
+# Parse port from transactor config file
+get_datomic_port_from_config() {
+    local config="$1"
+    if [[ -f "$config" ]]; then
+        grep -E '^port=' "$config" 2>/dev/null | cut -d= -f2 || echo "$DATOMIC_PORT"
+    else
+        echo "$DATOMIC_PORT"
+    fi
+}
diff --git a/scripts/create_dummy_user.sh b/scripts/create_dummy_user.sh
new file mode 100755
index 000000000..db4f0b3fa
--- /dev/null
+++ b/scripts/create_dummy_user.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Create a user in the database (requires Datomic running).
+# Uses :init-db profile for fast startup (skips ClojureScript/Garden).
+# The CLI entrypoint is dev/user.clj -main with the "create-user" command.
+# Duplicate checking (email/username) happens inside create-user!.
+
+if [ "$#" -lt 3 ]; then
+  echo "Usage: $0 <username> <email> <password> [verify]"
+  echo "Example: $0 testuser test@example.com s3cret verify"
+  echo ""
+  echo "Options:"
+  echo "  verify    Mark user as verified (can log in immediately)"
+  exit 1
+fi
+
+username="$1"
+email="$2"
+password="$3"
+shift 3
+
+override="${1:-}" # optional "verify"
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+
+# Append credentials to .test-users (gitignored) so you can look them up later
+log_test_user() {
+  local file="$REPO_ROOT/.test-users"
+  if [[ ! -f "$file" ]]; then
+    echo "# Test users created by dev tooling (gitignored)" > "$file"
+    echo "# username | email | password | status | created" >> "$file"
+  fi
+  echo "$1 | $2 | $3 | $4 | $(date -u +%Y-%m-%dT%H:%M:%SZ)" >> "$file"
+}
+
+# Log credentials before lein so the entry persists even if the JVM is slow to exit
+if [ "$override" = "verify" ]; then
+  log_test_user "$username" "$email" "$password" "verified"
+  lein with-profile init-db run -m user create-user "$username" "$email" "$password" verify
+else
+  log_test_user "$username" "$email" "$password" "unverified"
+  lein with-profile init-db run -m user create-user "$username" "$email" "$password"
+fi
diff --git a/scripts/dev-setup.sh b/scripts/dev-setup.sh
new file mode 100755
index 000000000..2eb64c536
--- /dev/null
+++ b/scripts/dev-setup.sh
@@ -0,0 +1,102 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# scripts/dev-setup.sh
+# Usage: ./scripts/dev-setup.sh [--no-start] [--skip-datomic] [--start] [--no-test-user]
+#
+# This script orchestrates initial dev environment setup:
+# 1. Start Datomic (if not skipped)
+# 2. Run lein deps
+# 3. Initialize database + apply schema
+# 4. Create a verified test user (unless --no-test-user)
+# 5. Optionally start server/figwheel
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+NO_START=false
+SKIP_DATOMIC=false
+SKIP_TEST_USER=false
+START=0
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --no-start) NO_START=true; shift ;;
+    --skip-datomic) SKIP_DATOMIC=true; shift ;;
+    --no-test-user) SKIP_TEST_USER=true; shift ;;
+    --start) START=1; shift ;;
+    -h|--help)
+      cat <<EOF
+Usage: $0 [--no-start] [--skip-datomic] [--start] [--no-test-user]
+
+Options:
+  --no-start       Only perform setup steps (deps, DB, test user) and do NOT start servers (default)
+  --skip-datomic   Don't attempt to start Datomic
+  --no-test-user   Skip creating the default test user
+  --start          After setup, start the backend and figwheel in background (not recommended in postCreate)
+EOF
+      exit 0 ;;
+    *) echo "Unknown argument: $1"; exit 1 ;;
+  esac
+done
+
+echo "Dev setup: NO_START=$NO_START SKIP_DATOMIC=$SKIP_DATOMIC SKIP_TEST_USER=$SKIP_TEST_USER START=$START"
+
+# Start Datomic transactor if requested
+if [ "$SKIP_DATOMIC" = false ]; then
+  echo "Starting Datomic transactor..."
+  "$SCRIPT_DIR/start.sh" datomic --quiet --idempotent || {
+    echo "Datomic start failed; continuing but DB init may be skipped." >&2
+  }
+else
+  echo "Skipping Datomic startup as requested."
+fi
+
+# Ensure dependencies are downloaded
+echo "Running lein deps..."
+lein deps
+
+# Run idempotent DB initialization via dev/user.clj CLI entrypoint
+echo "Initializing database (idempotent)..."
+# Only attempt DB init if Datomic is reachable on the expected port
+if timeout 1 bash -c '</dev/tcp/localhost/4334' >/dev/null 2>&1; then
+  if lein with-profile init-db run -m user init-db; then
+    echo "DB init succeeded."
+
+    # Create a default test user so you can log in immediately after setup.
+    # Credentials: test / test@example.com / testpass (already verified).
+    # Idempotent: create-user! checks for existing email/username before inserting.
+    if [ "$SKIP_TEST_USER" = false ]; then
+      echo "Creating test user (test / test@test.com / testpass)..."
+      # Log credentials before lein so the entry persists even if the JVM is slow to exit
+      users_file="$SCRIPT_DIR/../.test-users"
+      if [[ ! -f "$users_file" ]]; then
+        echo "# Test users created by dev tooling (gitignored)" > "$users_file"
+        echo "# username | email | password | status | created" >> "$users_file"
+      fi
+      echo "test | test@test.com | testpass | verified | $(date -u +%Y-%m-%dT%H:%M:%SZ)" >> "$users_file"
+      if lein with-profile init-db run -m user create-user test test@test.com testpass verify; then
+        echo "Test user created and verified."
+      else
+        echo "Test user creation failed (may already exist)." >&2
+      fi
+    fi
+  else
+    echo "DB init failed but continuing (non-fatal)." >&2
+  fi
+else
+  echo "Datomic not reachable on localhost:4334; skipping DB init (post-create will not fail)."
+fi
+
+if [ "$START" -eq 1 ] && [ "$NO_START" = false ]; then
+  echo "Starting backend and figwheel in background..."
+  "$SCRIPT_DIR/start.sh" server --background --quiet || true
+  "$SCRIPT_DIR/start.sh" figwheel --background --quiet || true
+  echo "Started server & figwheel (logs in ./logs/)"
+else
+  echo "Setup complete. To start services:"
+  echo "  ./scripts/start.sh server"
+  echo "  ./scripts/start.sh figwheel"
+  echo "Or use the interactive menu:"
+  echo "  ./menu"
+fi
+
+exit 0
diff --git a/scripts/migrate-db.sh b/scripts/migrate-db.sh
new file mode 100755
index 000000000..4ef1ecd72
--- /dev/null
+++ b/scripts/migrate-db.sh
@@ -0,0 +1,509 @@
+#!/usr/bin/env bash
+# =============================================================================
+# migrate-db.sh — Datomic Free → Pro data migration
+# =============================================================================
+# Migrates an existing Datomic Free database to Datomic Pro using the
+# bin/datomic CLI (backup-db / restore-db). Works with any database size.
+#
+# This is the primary migration tool. For Docker deployments, use
+# docker-migrate.sh which wraps this same approach in containers.
+#
+# The Free distribution (lib/datomic-free-0.9.5703.tar.gz) is bundled in the
+# repo because it's no longer publicly distributed. For backup, the script
+# searches lib/ for an extracted Free distribution, prompts the user if not
+# found, and extracts the tarball as a last resort. Restore and verify use
+# the installed Pro distribution.
+#
+# Usage:
+#   ./scripts/migrate-db.sh backup                  Back up the running database
+#   ./scripts/migrate-db.sh restore <target-uri>    Restore into a new database
+#   ./scripts/migrate-db.sh verify                  Verify a backup's integrity
+#   ./scripts/migrate-db.sh list                    List available backup points
+#   ./scripts/migrate-db.sh full                    Guided full migration
+#
+# Prerequisites:
+#   - Source transactor running (for backup)
+#   - Target transactor running (for restore)
+#   - .env file with DATOMIC_URL and DATOMIC_PASSWORD
+#
+# See docs/migration/datomic-data-migration.md for the full guide.
+# =============================================================================
+
+set -euo pipefail
+
+# Interrupt handler — warn about potentially incomplete operations
+trap 'echo ""; log_warn "Interrupted. If a backup or restore was in progress, it may be incomplete."; exit 130' INT TERM
+
+# Source shared utilities (env, logging, Datomic paths)
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/common.sh"
+
+BACKUP_DIR="${BACKUP_DIR:-$REPO_ROOT/backup}"
+
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
+
+usage() {
+  cat <<'USAGE'
+Datomic Free → Pro Migration Tool
+
+Migrates data between Datomic storage protocols using the bin/datomic CLI.
+The backup format is storage-protocol-independent — a Free backup can be
+restored into Pro and vice versa.
+
+The Free distribution tarball (lib/datomic-free-*.tar.gz) is bundled in the
+repo. For backup, the script searches lib/ for an extracted Free distribution,
+prompts you if not found, or extracts the tarball as a fallback. Restore and
+verify use the Pro distribution.
+
+Usage:
+  ./scripts/migrate-db.sh backup                  Back up the current database
+  ./scripts/migrate-db.sh restore <target-uri>    Restore backup into a new database
+  ./scripts/migrate-db.sh verify                  Verify backup integrity
+  ./scripts/migrate-db.sh list                    List available backup points
+  ./scripts/migrate-db.sh full                    Guided full migration
+
+Options (must come BEFORE the command):
+  --backup-dir <path>      Override backup directory (default: ./backup)
+  --source-uri <uri>       Override source database URI (default: DATOMIC_URL from .env)
+  --datomic-dir <path>     Override Datomic distribution path (overrides auto-detection)
+  --help                   Show this help
+
+Examples:
+  # Backup (auto-detects Free distribution in lib/)
+  ./scripts/migrate-db.sh backup
+
+  # Restore into Pro (uses installed Pro distribution)
+  ./scripts/migrate-db.sh restore "datomic:dev://localhost:4334/orcpub?password=secret"
+
+  # Override backup location
+  ./scripts/migrate-db.sh --backup-dir /mnt/backup backup
+USAGE
+}
+
+# Bundled Free distribution tarball — safety net since it's no longer
+# publicly distributed. Users running the old stack already have it
+# extracted somewhere; this is the fallback if we can't find it.
+DATOMIC_FREE_TARBALL="$REPO_ROOT/lib/datomic-free-0.9.5703.tar.gz"
+DATOMIC_FREE_EXTRACT_DIR="$REPO_ROOT/lib/datomic-free-0.9.5703"
+
+# Resolve the bin/datomic path from the active DATOMIC_DIR
+datomic_bin() {
+  echo "${DATOMIC_DIR}/bin/datomic"
+}
+
+# Check that the active Datomic CLI binary is available and executable
+check_datomic_cli() {
+  local bin
+  bin="$(datomic_bin)"
+  if [[ ! -x "$bin" ]]; then
+    log_error "Datomic CLI not found at: $bin"
+    log_error "Override with: --datomic-dir /path/to/datomic-distribution"
+    exit "$EXIT_PREREQ"
+  fi
+}
+
+# Search for an already-extracted Free distribution. Returns the path on
+# stdout if found, nonzero exit otherwise. Does NOT extract — that's
+# handled by use_free_datomic() after the interactive prompt.
+find_free_datomic() {
+  # Check the expected extraction path first
+  if [[ -x "${DATOMIC_FREE_EXTRACT_DIR}/bin/datomic" ]]; then
+    echo "$DATOMIC_FREE_EXTRACT_DIR"
+    return 0
+  fi
+
+  # Search for any extracted Free distribution in lib/
+  local candidate
+  for candidate in "$REPO_ROOT"/lib/datomic-free-*/bin/datomic; do
+    if [[ -x "$candidate" ]]; then
+      echo "$(dirname "$(dirname "$candidate")")"
+      return 0
+    fi
+  done
+
+  return 1
+}
+
+# Switch DATOMIC_DIR to the Free distribution (for backup).
+# The Free peer library is the only thing that can talk to a Free transactor.
+# Resolution order:
+#   1. find_free_datomic() searches lib/ for an extracted distribution
+#   2. If interactive, prompt the user for a custom path
+#   3. Extract the bundled tarball as a last resort
+use_free_datomic() {
+  local free_dir
+  if free_dir=$(find_free_datomic); then
+    DATOMIC_DIR="$free_dir"
+    log_info "Using Free distribution: $DATOMIC_DIR"
+    return 0
+  fi
+
+  # Not found automatically — ask the user if interactive
+  if is_interactive; then
+    log_warn "Datomic Free distribution not found in lib/."
+    echo ""
+    echo "The backup needs the Free distribution's bin/datomic to connect to"
+    echo "your running Free transactor. If you have it extracted somewhere,"
+    echo "enter the path now. Otherwise press Enter to extract the bundled"
+    echo "tarball (lib/datomic-free-0.9.5703.tar.gz)."
+    echo ""
+    read -rp "Datomic Free path (or Enter to extract): " user_path
+    if [[ -n "$user_path" ]]; then
+      if [[ -x "${user_path}/bin/datomic" ]]; then
+        DATOMIC_DIR="$user_path"
+        log_info "Using Free distribution: $DATOMIC_DIR"
+        return 0
+      else
+        log_error "No bin/datomic found at: $user_path"
+        exit "$EXIT_PREREQ"
+      fi
+    fi
+  fi
+
+  # Extract the bundled tarball
+  if [[ -f "$DATOMIC_FREE_TARBALL" ]]; then
+    log_info "Extracting Free distribution from $(basename "$DATOMIC_FREE_TARBALL")..."
+    tar xzf "$DATOMIC_FREE_TARBALL" -C "$REPO_ROOT/lib"
+    chmod +x "${DATOMIC_FREE_EXTRACT_DIR}/bin/datomic" \
+             "${DATOMIC_FREE_EXTRACT_DIR}/bin/run" \
+             "${DATOMIC_FREE_EXTRACT_DIR}/bin/classpath"
+    DATOMIC_DIR="$DATOMIC_FREE_EXTRACT_DIR"
+    log_info "Extracted to: $DATOMIC_DIR"
+    return 0
+  fi
+
+  log_error "Cannot find Datomic Free distribution and no tarball to extract."
+  log_error "Provide one with: --datomic-dir /path/to/datomic-free"
+  exit "$EXIT_PREREQ"
+}
+
+# Switch DATOMIC_DIR to the Pro distribution (for restore/verify/list).
+# verify-backup is Pro-only (not available in the Free CLI).
+use_pro_datomic() {
+  DATOMIC_DIR="$REPO_ROOT/lib/com/datomic/datomic-pro/${DATOMIC_VERSION}"
+  if [[ ! -x "${DATOMIC_DIR}/bin/datomic" ]]; then
+    log_error "Pro distribution not found at: $DATOMIC_DIR"
+    log_error "Run the devcontainer post-create script or install Datomic Pro."
+    exit "$EXIT_PREREQ"
+  fi
+  log_info "Using Pro distribution: $DATOMIC_DIR"
+}
+
+# Build the file: URI for backup operations.
+# Datomic's backup CLI uses file: URIs (not bare paths).
+backup_uri() {
+  echo "file:${BACKUP_DIR}/orcpub"
+}
+
+# ---------------------------------------------------------------------------
+# Commands
+# ---------------------------------------------------------------------------
+
+do_backup() {
+  local source_uri="${SOURCE_URI:-${DATOMIC_URL:-}}"
+  if [[ -z "$source_uri" ]]; then
+    log_error "No source URI. Set DATOMIC_URL in .env or use --source-uri."
+    exit "$EXIT_USAGE"
+  fi
+
+  # Auto-switch to the correct distribution based on URI protocol.
+  # Only auto-switch if the user didn't explicitly set --datomic-dir.
+  if [[ -z "${DATOMIC_DIR_OVERRIDE:-}" ]]; then
+    if [[ "$source_uri" == datomic:free://* ]]; then
+      use_free_datomic
+    fi
+  fi
+
+  check_datomic_cli
+  mkdir -p "$BACKUP_DIR"
+
+  # Warn about existing backup
+  if [[ -d "${BACKUP_DIR}/orcpub" ]]; then
+    log_warn "Existing backup found at ${BACKUP_DIR}/orcpub"
+    if is_interactive; then
+      read -rp "Overwrite existing backup? [y/N] " confirm
+      if [[ "${confirm,,}" != "y" ]]; then
+        echo "Aborted."
+        exit 0
+      fi
+    else
+      log_warn "Non-interactive mode — overwriting existing backup."
+    fi
+  fi
+
+  log_info "Datomic CLI: $(datomic_bin)"
+  log_info "Source URI:  $source_uri"
+  log_info "Backup dir:  $(backup_uri)"
+  log_info "Starting backup (large databases may take 30+ minutes)..."
+  echo ""
+
+  if ! "$(datomic_bin)" backup-db "$source_uri" "$(backup_uri)"; then
+    log_error "backup-db failed. Is the source transactor running?"
+    exit "$EXIT_RUNTIME"
+  fi
+
+  echo ""
+  log_info "Backup complete → ${BACKUP_DIR}/orcpub"
+
+  # Save metadata for the restore phase
+  echo "$source_uri" > "${BACKUP_DIR}/.source-uri"
+  date -u +"%Y-%m-%dT%H:%M:%SZ" > "${BACKUP_DIR}/.backup-timestamp"
+  log_info "Metadata saved to ${BACKUP_DIR}/"
+}
+
+do_restore() {
+  local target_uri="${1:-}"
+  if [[ -z "$target_uri" ]]; then
+    log_error "Usage: migrate-db.sh restore <target-uri>"
+    log_error "Example: migrate-db.sh restore \"datomic:dev://localhost:4334/orcpub?password=secret\""
+    exit "$EXIT_USAGE"
+  fi
+
+  # Restore needs the Pro peer to talk to a Pro transactor.
+  # Only auto-switch if the user didn't explicitly set --datomic-dir.
+  if [[ -z "${DATOMIC_DIR_OVERRIDE:-}" ]]; then
+    if [[ "$target_uri" == datomic:dev://* ]]; then
+      use_pro_datomic
+    fi
+  fi
+
+  check_datomic_cli
+
+  if [[ ! -d "${BACKUP_DIR}/orcpub" ]]; then
+    log_error "No backup found at ${BACKUP_DIR}/orcpub"
+    log_error "Run 'migrate-db.sh backup' first (with the source transactor running)."
+    exit "$EXIT_PREREQ"
+  fi
+
+  if [[ -f "${BACKUP_DIR}/.backup-timestamp" ]]; then
+    log_info "Backup timestamp: $(cat "${BACKUP_DIR}/.backup-timestamp")"
+  fi
+  if [[ -f "${BACKUP_DIR}/.source-uri" ]]; then
+    log_info "Backed up from:   $(cat "${BACKUP_DIR}/.source-uri")"
+  fi
+
+  log_info "Datomic CLI: $(datomic_bin)"
+  log_info "Backup source: $(backup_uri)"
+  log_info "Target URI:    $target_uri"
+  log_info "Starting restore (large databases may take 30+ minutes)..."
+  echo ""
+
+  if ! "$(datomic_bin)" restore-db "$(backup_uri)" "$target_uri"; then
+    log_error "restore-db failed. Is the target transactor running?"
+    log_error "If 'database already exists', clear ./data and restart the transactor."
+    exit "$EXIT_RUNTIME"
+  fi
+
+  echo ""
+  log_info "Restore complete. Log in and verify your data."
+}
+
+do_verify() {
+  # verify-backup is Pro-only (not in the Free CLI)
+  if [[ -z "${DATOMIC_DIR_OVERRIDE:-}" ]]; then
+    use_pro_datomic
+  fi
+  check_datomic_cli
+
+  if [[ ! -d "${BACKUP_DIR}/orcpub" ]]; then
+    log_error "No backup found at ${BACKUP_DIR}/orcpub"
+    exit "$EXIT_PREREQ"
+  fi
+
+  log_info "Verifying backup at $(backup_uri) ..."
+  log_info "(This reads every segment — may take a while for large backups)"
+  echo ""
+
+  # verify-backup positional args: <backup-uri> <read-all> <t>
+  # First get the latest t from list-backups
+  local latest_t
+  latest_t=$("$(datomic_bin)" list-backups "$(backup_uri)" 2>&1 | tail -1 || true)
+
+  if [[ -z "$latest_t" ]]; then
+    log_error "Could not determine latest backup point. Is the backup complete?"
+    exit "$EXIT_RUNTIME"
+  fi
+
+  log_info "Latest backup point: t=$latest_t"
+
+  if ! "$(datomic_bin)" verify-backup "$(backup_uri)" true "$latest_t"; then
+    log_error "Backup verification failed."
+    exit "$EXIT_RUNTIME"
+  fi
+
+  echo ""
+  log_info "Backup verification passed."
+}
+
+do_list() {
+  # list-backups exists in both Free and Pro, but use Pro since it's the
+  # default installed distribution and the Free one may not be extracted.
+  if [[ -z "${DATOMIC_DIR_OVERRIDE:-}" ]]; then
+    use_pro_datomic
+  fi
+  check_datomic_cli
+
+  if [[ ! -d "${BACKUP_DIR}/orcpub" ]]; then
+    log_error "No backup found at ${BACKUP_DIR}/orcpub"
+    exit "$EXIT_PREREQ"
+  fi
+
+  log_info "Backup points at $(backup_uri):"
+  "$(datomic_bin)" list-backups "$(backup_uri)"
+}
+
+do_full() {
+  echo ""
+  echo "=============================================="
+  echo "  Datomic Free → Pro Migration (guided)"
+  echo "=============================================="
+  echo ""
+  echo "This will:"
+  echo "  1. Back up your current (Free) database"
+  echo "  2. Verify the backup"
+  echo "  3. Guide you through the transactor swap"
+  echo "  4. Restore into the new (Pro) database"
+  echo ""
+  echo "The script auto-selects the correct distribution for each phase."
+  echo ""
+
+  if ! is_interactive; then
+    log_error "Full migration requires an interactive terminal."
+    log_error "Run the steps individually — see docs/migration/datomic-data-migration.md"
+    exit "$EXIT_USAGE"
+  fi
+
+  read -rp "Ready to start? [y/N] " confirm
+  if [[ "${confirm,,}" != "y" ]]; then
+    echo "Aborted."
+    exit 0
+  fi
+
+  # Phase 1: Backup (uses Free distribution automatically)
+  echo ""
+  log_info "=== Phase 1: Backup ==="
+  do_backup
+
+  # Phase 2: Verify (uses Pro distribution — verify-backup is Pro-only)
+  echo ""
+  log_info "=== Phase 2: Verify Backup ==="
+  do_verify
+
+  # Phase 3: Transactor swap (manual — we can't automate stopping/starting)
+  echo ""
+  log_info "=== Phase 3: Swap Transactors ==="
+  echo ""
+  echo "Backup complete and verified. Now you need to:"
+  echo ""
+  echo "  1. Stop the Free transactor"
+  echo "  2. Move ./data to ./data.free-backup"
+  echo "  3. Start the Pro transactor (see docs/migration/datomic-pro.md)"
+  echo "  4. Wait for it to become healthy"
+  echo ""
+  echo "To rollback: stop Pro, rm -rf data, mv data.free-backup data, restart Free."
+  echo ""
+  echo "When the Pro transactor is running, press Enter to continue with restore."
+  read -rp "Press Enter when ready (or Ctrl+C to abort)... "
+
+  # Phase 4: Restore (uses Pro distribution automatically)
+  echo ""
+  log_info "=== Phase 4: Restore ==="
+
+  local target_uri
+  if [[ -n "${DATOMIC_PASSWORD:-}" ]]; then
+    target_uri="datomic:dev://localhost:${DATOMIC_PORT}/${DATOMIC_DB_NAME:-orcpub}?password=${DATOMIC_PASSWORD}"
+    log_info "Auto-constructed target URI from .env"
+    log_info "  $target_uri"
+    read -rp "Use this URI? [Y/n] " confirm
+    if [[ "${confirm,,}" == "n" ]]; then
+      read -rp "Enter target Datomic URI: " target_uri
+    fi
+  else
+    read -rp "Enter target Datomic URI: " target_uri
+  fi
+  do_restore "$target_uri"
+
+  echo ""
+  log_info "=== Migration Complete ==="
+  log_info "Log in and verify your data. If everything looks good:"
+  log_info "  rm -rf ./data.free-backup   # remove old Free storage"
+  log_info "  rm -rf ./backup             # remove backup (or keep for safety)"
+  log_info ""
+  log_info "To rollback: stop Pro, rm -rf data, mv data.free-backup data, restart Free."
+}
+
+# ---------------------------------------------------------------------------
+# Argument parsing — options must come BEFORE the command word
+# ---------------------------------------------------------------------------
+
+SOURCE_URI=""
+DATOMIC_DIR_OVERRIDE=""  # set when user passes --datomic-dir (disables auto-switch)
+CMD=""
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --backup-dir)
+      if [[ $# -lt 2 ]]; then
+        log_error "--backup-dir requires a value"
+        exit "$EXIT_USAGE"
+      fi
+      BACKUP_DIR="$2"; shift 2 ;;
+    --source-uri)
+      if [[ $# -lt 2 ]]; then
+        log_error "--source-uri requires a value"
+        exit "$EXIT_USAGE"
+      fi
+      SOURCE_URI="$2"; shift 2 ;;
+    --datomic-dir)
+      if [[ $# -lt 2 ]]; then
+        log_error "--datomic-dir requires a value"
+        exit "$EXIT_USAGE"
+      fi
+      DATOMIC_DIR="$2"
+      DATOMIC_DIR_OVERRIDE="$2"
+      shift 2 ;;
+    --help|-h)
+      usage; exit 0 ;;
+    -*)
+      log_error "Unknown option: $1"
+      log_error "Options must come BEFORE the command. Run with --help for usage."
+      exit "$EXIT_USAGE" ;;
+    backup|restore|verify|list|full)
+      if [[ -n "$CMD" ]]; then
+        log_error "Multiple commands given: '$CMD' and '$1'"
+        exit "$EXIT_USAGE"
+      fi
+      CMD="$1"; shift
+      break ;;  # Remaining args are positional for the command
+    *)
+      log_error "Unknown argument: $1"
+      usage
+      exit "$EXIT_USAGE" ;;
+  esac
+done
+
+if [[ -z "$CMD" ]]; then
+  usage
+  exit "$EXIT_USAGE"
+fi
+
+# Validate no unexpected trailing args for commands that don't take them
+case "$CMD" in
+  backup|verify|list|full)
+    if [[ $# -gt 0 ]]; then
+      log_error "Unexpected arguments after '$CMD': $*"
+      log_error "Options must come BEFORE the command word."
+      exit "$EXIT_USAGE"
+    fi ;;
+esac
+
+case "$CMD" in
+  backup)  do_backup ;;
+  restore) do_restore "$@" ;;
+  verify)  do_verify ;;
+  list)    do_list ;;
+  full)    do_full ;;
+esac
diff --git a/scripts/start.sh b/scripts/start.sh
new file mode 100755
index 000000000..4287afa0e
--- /dev/null
+++ b/scripts/start.sh
@@ -0,0 +1,772 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# =============================================================================
+# start.sh - OrcPub Service Launcher
+# =============================================================================
+# Usage:
+#   ./start.sh              Start Datomic + REPL with server (default)
+#   ./start.sh datomic      Start Datomic transactor only
+#   ./start.sh server       Start REPL with server (requires Datomic running)
+#   ./start.sh figwheel     Start Figwheel for ClojureScript hot-reload
+#   ./start.sh garden       Start Garden for CSS auto-compilation
+#   ./start.sh init-db      Initialize the database
+#
+# Options:
+#   --install, -i      Run Datomic Pro installation (post-create.sh)
+#   --tmux, -t         Run service(s) in tmux session 'orcpub'
+#   --background, -b   Run service(s) in background with nohup
+#   --quiet, -q        Minimal output (for automation)
+#   --check, -c        Validate prerequisites without starting services
+#   --idempotent, -I   Succeed if service is already running
+#   --help, -h         Show this help
+#
+# Exit Codes:
+#   0 - Success (or already running with --idempotent)
+#   1 - Usage error (invalid args)
+#   2 - Prerequisite failure (missing Java, Datomic, etc.)
+#   3 - Runtime failure (port conflict, startup timeout)
+# =============================================================================
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# Source shared utilities
+# shellcheck source=common.sh
+source "$SCRIPT_DIR/common.sh"
+
+# -----------------------------------------------------------------------------
+# Install
+# -----------------------------------------------------------------------------
+
+run_install() {
+    local post_create="$REPO_ROOT/.devcontainer/post-create.sh"
+
+    if [[ ! -x "$post_create" ]]; then
+        log_error "Install script not found or not executable: $post_create"
+        exit 1
+    fi
+
+    log_info "Running Datomic ${DATOMIC_TYPE} ${DATOMIC_VERSION} installation..."
+    "$post_create"
+    log_info "Installation complete."
+}
+
+# -----------------------------------------------------------------------------
+# Port Conflict Detection
+# -----------------------------------------------------------------------------
+
+# Check port availability, respecting --idempotent and non-interactive mode
+# Returns: 0 if available (or idempotent+running), 1 if should abort, 2 if should skip
+# Sets IDEMPOTENT_ALREADY_RUNNING=true if service already running in idempotent mode
+# Sets SKIP_SERVICE=true if user chose to skip this service
+check_port_available() {
+    local port="$1"
+    local service="$2"
+    local idempotent="${3:-false}"
+
+    IDEMPOTENT_ALREADY_RUNNING=false
+    SKIP_SERVICE=false
+
+    if port_in_use "$port"; then
+        local pid
+        pid=$(find_pids_by_port "$port" | awk '{print $1}')
+
+        # Idempotent mode: succeed if already running
+        if [[ "$idempotent" == "true" ]]; then
+            log_info "$service already running on port $port (PID: ${pid:-unknown})"
+            IDEMPOTENT_ALREADY_RUNNING=true
+            return 0
+        fi
+
+        # Non-interactive mode: fail immediately with clear error
+        if ! is_interactive; then
+            log_error "Port $port in use (non-interactive mode, exiting)"
+            log_error "PID: ${pid:-unknown}"
+            return 1
+        fi
+
+        # Interactive mode: offer to stop, skip, or abort (with timeout)
+        log_warn "Port $port is already in use (PID: ${pid:-unknown})"
+        if ! read -t 30 -p "$service: [s]kip, s[t]op existing, or [a]bort? [s/t/a] " -n 1 -r; then
+            echo
+            log_error "Prompt timed out after 30 seconds"
+            return 1
+        fi
+        echo
+        case "$REPLY" in
+            t|T|y|Y)
+                log_info "Stopping existing $service..."
+                "$SCRIPT_DIR/stop.sh" "$service" --yes --quiet
+                sleep 1
+                if port_in_use "$port"; then
+                    log_error "Failed to stop $service on port $port"
+                    return 1
+                fi
+                log_info "Port $port is now available"
+                return 0
+                ;;
+            s|S|"")
+                log_info "Skipping $service (already running)"
+                SKIP_SERVICE=true
+                return 2
+                ;;
+            *)
+                log_error "Aborting."
+                return 1
+                ;;
+        esac
+    fi
+    return 0
+}
+
+# -----------------------------------------------------------------------------
+# Datomic Readiness
+# -----------------------------------------------------------------------------
+
+wait_for_datomic() {
+    local timeout="${1:-$PORT_WAIT}"
+    local log_file="${2:-$LOG_DIR/datomic.log}"
+
+    log_info "Waiting for Datomic to be ready (port $DATOMIC_PORT)..."
+
+    if wait_for_port "$DATOMIC_PORT" "$timeout"; then
+        log_info "Datomic is ready"
+        return 0
+    else
+        # Show diagnostics on failure
+        show_startup_failure "datomic" "$log_file" "$DATOMIC_PORT"
+        return 1
+    fi
+}
+
+prepare_datomic_config() {
+    if [[ ! -f "$DATOMIC_CONFIG" ]]; then
+        if [[ -f "$DATOMIC_CONFIG_TEMPLATE" ]]; then
+            cp "$DATOMIC_CONFIG_TEMPLATE" "$DATOMIC_CONFIG"
+            # Restrict permissions (config may contain secrets)
+            chmod 600 "$DATOMIC_CONFIG"
+            log_info "Created transactor config from template"
+        else
+            log_error "Datomic config template not found."
+            log_error "Expected at: $DATOMIC_CONFIG_TEMPLATE"
+            return 1
+        fi
+    fi
+    return 0
+}
+
+# -----------------------------------------------------------------------------
+# Pre-flight Checks (--check mode)
+# -----------------------------------------------------------------------------
+
+# Run all prerequisite checks for a target without starting services
+# Returns: 0 if all checks pass, 2 (EXIT_PREREQ) otherwise
+run_checks() {
+    local target="$1"
+    local failed=0
+
+    log_info "Running pre-flight checks for target: $target"
+    echo ""
+
+    # Common checks for all targets
+    echo -n "Java ($JAVA_MIN_VERSION+): "
+    if check_java 2>/dev/null; then
+        echo -e "${GREEN}OK${NC}"
+    else
+        echo -e "${RED}FAILED${NC}"
+        ((failed++))
+    fi
+
+    echo -n "Leiningen: "
+    if check_lein 2>/dev/null; then
+        echo -e "${GREEN}OK${NC}"
+    else
+        echo -e "${RED}FAILED${NC}"
+        ((failed++))
+    fi
+
+    # Target-specific checks
+    case "$target" in
+        all|datomic)
+            echo -n "Datomic installed: "
+            if check_datomic_installed 2>/dev/null; then
+                echo -e "${GREEN}OK${NC}"
+            else
+                echo -e "${RED}FAILED${NC}"
+                ((failed++))
+            fi
+
+            echo -n "Datomic config: "
+            if [[ -f "$DATOMIC_CONFIG" ]] || [[ -f "$DATOMIC_CONFIG_TEMPLATE" ]]; then
+                echo -e "${GREEN}OK${NC}"
+                # Check port consistency if config exists
+                if [[ -f "$DATOMIC_CONFIG" ]]; then
+                    local config_port
+                    config_port=$(get_datomic_port_from_config "$DATOMIC_CONFIG")
+                    if [[ "$config_port" != "$DATOMIC_PORT" ]]; then
+                        echo -e "  ${YELLOW}WARNING: Config port ($config_port) differs from DATOMIC_PORT ($DATOMIC_PORT)${NC}"
+                    fi
+                fi
+            else
+                echo -e "${RED}FAILED${NC} (no config or template)"
+                ((failed++))
+            fi
+
+            echo -n "Datomic port ($DATOMIC_PORT): "
+            if port_in_use "$DATOMIC_PORT"; then
+                echo -e "${YELLOW}IN USE${NC} (PID: $(find_pids_by_port "$DATOMIC_PORT" | head -1))"
+            else
+                echo -e "${GREEN}AVAILABLE${NC}"
+            fi
+            ;;
+    esac
+
+    case "$target" in
+        all|server)
+            echo -n "Server port ($SERVER_PORT): "
+            if port_in_use "$SERVER_PORT"; then
+                echo -e "${YELLOW}IN USE${NC} (PID: $(find_pids_by_port "$SERVER_PORT" | head -1))"
+            else
+                echo -e "${GREEN}AVAILABLE${NC}"
+            fi
+
+            if [[ "$target" == "server" ]]; then
+                echo -n "Datomic reachable: "
+                if port_in_use "$DATOMIC_PORT"; then
+                    echo -e "${GREEN}YES${NC}"
+                else
+                    echo -e "${YELLOW}NO${NC} (server requires Datomic)"
+                fi
+            fi
+            ;;
+    esac
+
+    case "$target" in
+        figwheel)
+            echo -n "Figwheel port ($FIGWHEEL_PORT): "
+            if port_in_use "$FIGWHEEL_PORT"; then
+                echo -e "${YELLOW}IN USE${NC}"
+            else
+                echo -e "${GREEN}AVAILABLE${NC}"
+            fi
+            ;;
+    esac
+
+    echo ""
+    if [[ $failed -gt 0 ]]; then
+        log_error "$failed prerequisite check(s) failed"
+        return $EXIT_PREREQ
+    else
+        log_info "All prerequisite checks passed"
+        return $EXIT_SUCCESS
+    fi
+}
+
+# -----------------------------------------------------------------------------
+# Tmux Support
+# -----------------------------------------------------------------------------
+
+TMUX_SESSION="orcpub"
+
+run_in_tmux() {
+    local window_name="$1"
+    shift
+    local cmd_args=("$@")
+
+    check_tmux || exit $EXIT_PREREQ
+
+    # Build a properly quoted command string to avoid argument splitting
+    local quoted_cmd
+    quoted_cmd=$(printf '%q ' "${cmd_args[@]}")
+
+    if tmux has-session -t "$TMUX_SESSION" 2>/dev/null; then
+        # Session exists - add new window
+        # Use -c for working directory (safer than bash -c string building)
+        tmux new-window -t "$TMUX_SESSION" -n "$window_name" -c "$REPO_ROOT"
+        # Set remain-on-exit so window stays open after command finishes
+        tmux set-option -t "$TMUX_SESSION:$window_name" remain-on-exit on
+        # Send the command (properly quoted)
+        tmux send-keys -t "$TMUX_SESSION:$window_name" "$quoted_cmd" C-m
+        log_info "Started '$window_name' in tmux window (session: $TMUX_SESSION)"
+    else
+        # Create new session with this window
+        tmux new-session -d -s "$TMUX_SESSION" -n "$window_name" -c "$REPO_ROOT"
+        tmux set-option -t "$TMUX_SESSION:$window_name" remain-on-exit on
+        tmux send-keys -t "$TMUX_SESSION:$window_name" "$quoted_cmd" C-m
+        log_info "Created tmux session '$TMUX_SESSION' with window '$window_name'"
+    fi
+
+    log_info "Attach with: tmux attach -t $TMUX_SESSION"
+}
+
+# -----------------------------------------------------------------------------
+# Background Support
+# -----------------------------------------------------------------------------
+
+run_in_background() {
+    local name="$1"
+    shift
+    local cmd_args=("$@")
+    local log_file="$LOG_DIR/${name}.log"
+    local pid_file="$LOG_DIR/${name}.pid"
+
+    # Clean up any stale PID file
+    cleanup_stale_pid "$name"
+
+    log_info "Starting $name in background..."
+    log_info "Log file: $log_file"
+
+    # Run command in background from REPO_ROOT
+    # Use pushd/popd instead of bash -c for safer execution
+    (
+        cd "$REPO_ROOT" || exit 1
+        nohup "${cmd_args[@]}" > "$log_file" 2>&1 &
+        echo $! > "$pid_file"
+    )
+
+    local pid
+    pid=$(cat "$pid_file" 2>/dev/null || true)
+
+    log_info "$name started (PID: ${pid:-unknown})"
+    log_info "Tail logs: tail -f $log_file"
+}
+
+# -----------------------------------------------------------------------------
+# Start Targets
+# -----------------------------------------------------------------------------
+
+start_datomic() {
+    local idempotent="${1:-false}"
+    local port_result=0
+
+    check_datomic_installed || exit $EXIT_PREREQ
+
+    # Check port (0=available, 1=abort, 2=skip)
+    check_port_available "$DATOMIC_PORT" "datomic" "$idempotent" || port_result=$?
+    [[ $port_result -eq 1 ]] && exit $EXIT_RUNTIME
+
+    # If already running (idempotent or user chose skip), exit success
+    if [[ "$IDEMPOTENT_ALREADY_RUNNING" == "true" || "$SKIP_SERVICE" == "true" ]]; then
+        exit $EXIT_SUCCESS
+    fi
+
+    prepare_datomic_config || exit $EXIT_PREREQ
+
+    # Clean up stale PID file
+    cleanup_stale_pid "datomic"
+
+    log_info "Starting Datomic transactor (${DATOMIC_TYPE} ${DATOMIC_VERSION})..."
+    nohup "$DATOMIC_DIR/bin/transactor" "$DATOMIC_CONFIG" > "$LOG_DIR/datomic.log" 2>&1 &
+    local datomic_pid=$!
+    echo "$datomic_pid" > "$LOG_DIR/datomic.pid"
+    log_info "Datomic transactor started (PID $datomic_pid)"
+    log_info "Logs: $LOG_DIR/datomic.log"
+
+    # Early verification: ensure process didn't die immediately
+    sleep 0.5
+    if ! kill -0 "$datomic_pid" 2>/dev/null; then
+        log_error "Datomic process died immediately after starting"
+        show_startup_failure "datomic" "$LOG_DIR/datomic.log" "$DATOMIC_PORT"
+        exit $EXIT_RUNTIME
+    fi
+
+    # Wait for Datomic to be ready
+    if ! wait_for_datomic "$PORT_WAIT" "$LOG_DIR/datomic.log"; then
+        log_error "Failed to start Datomic. Check logs: $LOG_DIR/datomic.log"
+        exit $EXIT_RUNTIME
+    fi
+}
+
+start_server() {
+    local idempotent="${1:-false}"
+    local port_result=0
+
+    # Check port (0=available, 1=abort, 2=skip)
+    check_port_available "$SERVER_PORT" "server" "$idempotent" || port_result=$?
+    [[ $port_result -eq 1 ]] && exit $EXIT_RUNTIME
+
+    # If already running (idempotent or user chose skip), exit success
+    if [[ "$IDEMPOTENT_ALREADY_RUNNING" == "true" || "$SKIP_SERVICE" == "true" ]]; then
+        exit $EXIT_SUCCESS
+    fi
+
+    cd "$REPO_ROOT"
+
+    # Use headless mode if not running interactively (background/nohup)
+    if [[ -t 0 ]]; then
+        log_info "Starting REPL with server (profile: +dev,+start-server)..."
+        lein with-profile +dev,+start-server repl
+    else
+        log_info "Starting headless server (profile: +dev,+start-server)..."
+        lein with-profile +dev,+start-server repl :headless
+    fi
+}
+
+start_figwheel() {
+    local idempotent="${1:-false}"
+    local port_result=0
+
+    # Check port (0=available, 1=abort, 2=skip)
+    check_port_available "$FIGWHEEL_PORT" "figwheel" "$idempotent" || port_result=$?
+    [[ $port_result -eq 1 ]] && exit $EXIT_RUNTIME
+
+    # If already running (idempotent or user chose skip), exit success
+    if [[ "$IDEMPOTENT_ALREADY_RUNNING" == "true" || "$SKIP_SERVICE" == "true" ]]; then
+        exit $EXIT_SUCCESS
+    fi
+
+    # Clean up stale PID file
+    cleanup_stale_pid "figwheel"
+
+    log_info "Starting Figwheel (ClojureScript hot-reload)..."
+    cd "$REPO_ROOT"
+    # Use fig:watch alias (headless build + watch, no REPL — works with nohup)
+    # For interactive REPL use: lein fig:dev (needs a terminal)
+    nohup lein fig:watch > "$LOG_DIR/figwheel.log" 2>&1 &
+    local figwheel_pid=$!
+    echo "$figwheel_pid" > "$LOG_DIR/figwheel.pid"
+    log_info "Figwheel started (PID $figwheel_pid)"
+    log_info "Logs: $LOG_DIR/figwheel.log"
+
+    # Early verification: ensure process didn't die immediately
+    sleep 0.5
+    if ! kill -0 "$figwheel_pid" 2>/dev/null; then
+        log_error "Figwheel process died immediately after starting"
+        show_startup_failure "figwheel" "$LOG_DIR/figwheel.log" "$FIGWHEEL_PORT"
+        exit $EXIT_RUNTIME
+    fi
+
+    # Wait for Figwheel to be ready (fail fast if process dies)
+    log_info "Waiting for Figwheel to be ready (port $FIGWHEEL_PORT)..."
+    if wait_for_port_or_die "$FIGWHEEL_PORT" "$figwheel_pid" "$PORT_WAIT"; then
+        log_info "Figwheel is ready"
+    elif kill -0 "$figwheel_pid" 2>/dev/null; then
+        # Process alive but port not ready — likely first-run compile/dep download
+        log_warn "Figwheel still starting (PID $figwheel_pid alive, port $FIGWHEEL_PORT not yet open)"
+        log_warn "First run may take a few minutes for ClojureScript compilation"
+        log_info "Logs: $LOG_DIR/figwheel.log"
+    else
+        show_startup_failure "figwheel" "$LOG_DIR/figwheel.log" "$FIGWHEEL_PORT"
+        exit $EXIT_RUNTIME
+    fi
+}
+
+start_garden() {
+    # Clean up stale PID file
+    cleanup_stale_pid "garden"
+
+    log_info "Starting Garden (CSS auto-compilation)..."
+    cd "$REPO_ROOT"
+    nohup lein garden auto > "$LOG_DIR/garden.log" 2>&1 &
+    local garden_pid=$!
+    echo "$garden_pid" > "$LOG_DIR/garden.pid"
+    log_info "Garden started (PID $garden_pid)"
+    log_info "Logs: $LOG_DIR/garden.log"
+
+    # Garden has no port to check - verify process survives startup
+    # Check multiple times to catch delayed failures (e.g., lein project parsing)
+    local checks=0
+    local max_checks=5
+    while [[ $checks -lt $max_checks ]]; do
+        sleep 1
+        if ! kill -0 "$garden_pid" 2>/dev/null; then
+            log_error "Garden process died during startup"
+            show_startup_failure "garden" "$LOG_DIR/garden.log" ""
+            exit $EXIT_RUNTIME
+        fi
+        ((checks++))
+    done
+    log_info "Garden is running"
+}
+
+init_database() {
+    log_info "Initializing database..."
+
+    # Check if Datomic is running
+    if ! port_in_use "$DATOMIC_PORT"; then
+        log_error "Datomic is not running on port $DATOMIC_PORT"
+        log_info "Start Datomic first: ./start.sh datomic"
+        exit $EXIT_PREREQ
+    fi
+
+    cd "$REPO_ROOT"
+    # Use init-db profile to skip ClojureScript/Garden compilation.
+    # This loads src/clj, src/cljc, and dev/ — much faster than a full dev build.
+    # The CLI entrypoint is dev/user.clj -main, which dispatches by command name.
+    if lein with-profile init-db run -m user init-db; then
+        log_info "Database initialized successfully"
+    else
+        log_error "Database initialization failed"
+        exit $EXIT_RUNTIME
+    fi
+}
+
+start_all() {
+    local idempotent="${1:-false}"
+    local started_datomic="false"
+    local datomic_pid=""
+    local port_result=0
+
+    # Cleanup function for signal handling
+    cleanup_on_exit() {
+        local exit_code=$?
+        if [[ "$started_datomic" == "true" && -n "$datomic_pid" ]]; then
+            log_info "Stopping Datomic (PID $datomic_pid)..."
+            kill "$datomic_pid" 2>/dev/null || true
+            # Wait briefly for graceful shutdown
+            sleep 1
+            kill -0 "$datomic_pid" 2>/dev/null && kill -9 "$datomic_pid" 2>/dev/null || true
+            rm -f "$LOG_DIR/datomic.pid"
+            log_info "Datomic stopped"
+        fi
+        exit "$exit_code"
+    }
+
+    # Set up trap for cleanup on interrupt/termination
+    trap cleanup_on_exit INT TERM
+
+    check_datomic_installed || exit $EXIT_PREREQ
+
+    # Check Datomic port (0=available, 1=abort, 2=skip)
+    port_result=0
+    check_port_available "$DATOMIC_PORT" "datomic" "$idempotent" || port_result=$?
+    if [[ $port_result -eq 1 ]]; then
+        exit $EXIT_RUNTIME
+    fi
+
+    # If Datomic already running (idempotent or skipped), skip starting it
+    if [[ "$IDEMPOTENT_ALREADY_RUNNING" != "true" && "$SKIP_SERVICE" != "true" ]]; then
+        prepare_datomic_config || exit $EXIT_PREREQ
+
+        # Clean up stale PID
+        cleanup_stale_pid "datomic"
+
+        log_info "Starting Datomic transactor (background)..."
+        nohup "$DATOMIC_DIR/bin/transactor" "$DATOMIC_CONFIG" > "$LOG_DIR/datomic.log" 2>&1 &
+        datomic_pid=$!
+        started_datomic="true"
+        echo "$datomic_pid" > "$LOG_DIR/datomic.pid"
+        log_info "Datomic transactor started (PID $datomic_pid)"
+
+        # Early verification: ensure process didn't die immediately
+        sleep 0.5
+        if ! kill -0 "$datomic_pid" 2>/dev/null; then
+            log_error "Datomic process died immediately after starting"
+            show_startup_failure "datomic" "$LOG_DIR/datomic.log" "$DATOMIC_PORT"
+            started_datomic="false"  # Don't try to clean up a dead process
+            exit $EXIT_RUNTIME
+        fi
+
+        # Wait for Datomic to be ready (with proper readiness check)
+        if ! wait_for_datomic "$PORT_WAIT" "$LOG_DIR/datomic.log"; then
+            log_error "Failed to start Datomic. Check logs: $LOG_DIR/datomic.log"
+            exit $EXIT_RUNTIME
+        fi
+    else
+        log_info "Datomic already running, skipping startup"
+    fi
+
+    # Check server port (0=available, 1=abort, 2=skip)
+    port_result=0
+    check_port_available "$SERVER_PORT" "server" "$idempotent" || port_result=$?
+    if [[ $port_result -eq 1 ]]; then
+        exit $EXIT_RUNTIME
+    fi
+
+    if [[ "$IDEMPOTENT_ALREADY_RUNNING" == "true" || "$SKIP_SERVICE" == "true" ]]; then
+        log_info "Server already running on port $SERVER_PORT"
+        # Clear trap since we're not managing Datomic lifecycle
+        trap - INT TERM
+        exit $EXIT_SUCCESS
+    fi
+
+    log_info "Starting REPL with server (profile: +dev,+start-server)..."
+    log_info "Note: Ctrl+C will stop both server and Datomic"
+    cd "$REPO_ROOT"
+    lein with-profile +dev,+start-server repl
+}
+
+# -----------------------------------------------------------------------------
+# Help
+# -----------------------------------------------------------------------------
+
+show_help() {
+    cat << EOF
+OrcPub Service Launcher
+
+Usage:
+  ./start.sh [target] [options]
+
+Targets:
+  (none)      Start Datomic (background) + REPL with server (foreground)
+  datomic     Start Datomic transactor only (foreground)
+  server      Start REPL with server only (foreground, requires Datomic)
+  figwheel    Start Figwheel for ClojureScript hot-reload
+  garden      Start Garden for CSS auto-compilation
+  init-db     Initialize the database (requires Datomic running)
+  help        Show this help
+
+Options:
+  --install, -i              Install/reinstall Datomic Pro (runs post-create.sh)
+  --tmux, -t                 Run in tmux session 'orcpub' (non-blocking)
+  --background, -b           Run in background with nohup (logs to $LOG_DIR/)
+  --quiet, -q                Minimal output (for automation)
+  --check, -c                Validate prerequisites without starting
+  --idempotent, -I           Succeed if service already running
+  --if-not-running           Alias for --idempotent
+
+Exit Codes:
+  0  Success (or already running with --idempotent)
+  1  Usage error (invalid args)
+  2  Prerequisite failure (missing Java, Datomic not installed, etc.)
+  3  Runtime failure (port conflict, startup timeout, process crash)
+
+Environment Variables (via .env or shell):
+  DATOMIC_VERSION   Datomic version (default: 1.0.7482)
+  DATOMIC_TYPE      Datomic type: pro or dev (default: pro)
+  JAVA_MIN_VERSION  Minimum Java version required (default: 11)
+  LOG_DIR           Directory for log files (default: ./logs)
+  DATOMIC_PORT      Datomic port (default: 4334)
+  SERVER_PORT       Server port (default: 8890)
+  PORT_WAIT         Timeout for port readiness (default: 30)
+  KILL_WAIT         Timeout for graceful shutdown (default: 5)
+
+Configuration:
+  Config is loaded from: \$REPO_ROOT/.env
+  Datomic is expected at: lib/com/datomic/datomic-\${TYPE}/\${VERSION}/
+
+Examples:
+  ./start.sh                              # Full dev stack: Datomic + server
+  ./start.sh --install                    # Install Datomic Pro
+  ./start.sh datomic                      # Just Datomic (run in separate terminal)
+  ./start.sh server                       # Just REPL+server (after Datomic is running)
+  ./start.sh init-db                      # Initialize the database
+  ./start.sh --tmux                       # All services in tmux session
+  ./start.sh datomic --tmux               # Datomic in tmux window
+  ./start.sh datomic -b                   # Datomic in background
+
+Automation examples:
+  ./start.sh --check                      # Pre-flight: validate all prerequisites
+  ./start.sh datomic --check              # Pre-flight: validate Datomic only
+  ./start.sh datomic -q --idempotent      # Start or succeed if already running
+  ./start.sh datomic --if-not-running -q  # Same as above
+
+Notes:
+  - For full development, run in separate terminals:
+    1. ./start.sh datomic
+    2. ./start.sh server
+    3. ./start.sh figwheel  (optional)
+    4. ./start.sh garden    (optional)
+  - Or use ./start.sh alone for Datomic + server in one terminal
+  - Or use ./start.sh --tmux to run all in a tmux session
+  - In non-interactive mode (CI/cron), port conflicts fail immediately
+EOF
+}
+
+# -----------------------------------------------------------------------------
+# Main
+# -----------------------------------------------------------------------------
+
+main() {
+    local target=""
+    local do_install="false"
+    local use_tmux="false"
+    local use_background="false"
+    local do_check="false"
+    local idempotent="false"
+    local positional=()
+
+    # Parse arguments
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --install|-i)         do_install="true"; shift ;;
+            --tmux|-t)            use_tmux="true"; shift ;;
+            --background|-b)      use_background="true"; shift ;;
+            --quiet|-q)           QUIET="true"; export QUIET; shift ;;
+            --check|-c)           do_check="true"; shift ;;
+            --idempotent|-I|--if-not-running)
+                                  idempotent="true"; shift ;;
+            --help|-h)            show_help; exit $EXIT_SUCCESS ;;
+            -*)                   log_error "Unknown option: $1"; show_help; exit $EXIT_USAGE ;;
+            *)                    positional+=("$1"); shift ;;
+        esac
+    done
+
+    target="${positional[0]:-all}"
+
+    # Handle install flag (no prereq checks needed)
+    if [[ "$do_install" == "true" ]]; then
+        run_install
+        exit $EXIT_SUCCESS
+    fi
+
+    # Handle help (no prereq checks needed)
+    if [[ "$target" == "help" ]]; then
+        show_help
+        exit $EXIT_SUCCESS
+    fi
+
+    # Handle --check mode (pre-flight validation)
+    if [[ "$do_check" == "true" ]]; then
+        run_checks "$target"
+        exit $?
+    fi
+
+    # Check prerequisites for runtime targets
+    check_java || exit $EXIT_PREREQ
+    check_lein || exit $EXIT_PREREQ
+
+    # If --tmux, delegate to tmux runner
+    if [[ "$use_tmux" == "true" ]]; then
+        case "$target" in
+            all|"")
+                # Start each service in its own tmux window
+                run_in_tmux "datomic" "$SCRIPT_DIR/start.sh" datomic
+                sleep 2
+                run_in_tmux "server" "$SCRIPT_DIR/start.sh" server
+                ;;
+            datomic)   run_in_tmux "datomic" "$SCRIPT_DIR/start.sh" datomic ;;
+            server)    run_in_tmux "server" "$SCRIPT_DIR/start.sh" server ;;
+            figwheel)  run_in_tmux "figwheel" "$SCRIPT_DIR/start.sh" figwheel ;;
+            garden)    run_in_tmux "garden" "$SCRIPT_DIR/start.sh" garden ;;
+            init-db)   run_in_tmux "init-db" "$SCRIPT_DIR/start.sh" init-db ;;
+            *)         log_error "Unknown target: $target"; show_help; exit $EXIT_USAGE ;;
+        esac
+        exit $EXIT_SUCCESS
+    fi
+
+    # If --background, delegate to background runner
+    if [[ "$use_background" == "true" ]]; then
+        case "$target" in
+            all|"")
+                run_in_background "datomic" "$SCRIPT_DIR/start.sh" datomic
+                log_info "Waiting for Datomic..."
+                if wait_for_datomic "$PORT_WAIT" "$LOG_DIR/datomic.log"; then
+                    run_in_background "server" "$SCRIPT_DIR/start.sh" server
+                else
+                    log_error "Datomic failed to start"
+                    exit $EXIT_RUNTIME
+                fi
+                ;;
+            datomic)   run_in_background "datomic" "$SCRIPT_DIR/start.sh" datomic ;;
+            server)    run_in_background "server" "$SCRIPT_DIR/start.sh" server ;;
+            figwheel)  run_in_background "figwheel" "$SCRIPT_DIR/start.sh" figwheel ;;
+            garden)    run_in_background "garden" "$SCRIPT_DIR/start.sh" garden ;;
+            *)         log_error "Cannot run '$target' in background"; exit $EXIT_USAGE ;;
+        esac
+        exit $EXIT_SUCCESS
+    fi
+
+    # Direct execution (foreground)
+    case "$target" in
+        all|"")    start_all "$idempotent" ;;
+        datomic)   start_datomic "$idempotent" ;;
+        server)    start_server "$idempotent" ;;
+        figwheel)  start_figwheel "$idempotent" ;;
+        garden)    start_garden ;;
+        init-db)   init_database ;;
+        *)         log_error "Unknown target: $target"; show_help; exit $EXIT_USAGE ;;
+    esac
+}
+
+main "$@"
diff --git a/scripts/stop.sh b/scripts/stop.sh
new file mode 100755
index 000000000..c5064ea4d
--- /dev/null
+++ b/scripts/stop.sh
@@ -0,0 +1,366 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# =============================================================================
+# stop.sh - OrcPub Process Management (Stop/Kill/Status)
+# =============================================================================
+# Usage:
+#   ./stop.sh                     Stop all OrcPub services (with confirmation)
+#   ./stop.sh --dry-run           Show status without stopping anything
+#   ./stop.sh --yes               Stop without confirmation
+#   ./stop.sh --force             Use SIGKILL if SIGTERM doesn't work
+#   ./stop.sh --quiet             Minimal output (for scripting)
+#   ./stop.sh repl                Stop nREPL only
+#   ./stop.sh server              Stop server only
+#   ./stop.sh datomic             Stop Datomic only
+#   ./stop.sh figwheel            Stop Figwheel only
+#   ./stop.sh port <port>         Stop process on specific port
+#   ./stop.sh name <pattern>      Stop processes matching pattern
+#
+# Exit Codes:
+#   0 - Success (processes stopped or none found)
+#   1 - Usage error (invalid args)
+#   3 - Runtime failure (failed to stop processes)
+# =============================================================================
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# Source shared utilities
+# shellcheck source=common.sh
+source "$SCRIPT_DIR/common.sh"
+
+# -----------------------------------------------------------------------------
+# Status Display (--dry-run)
+# -----------------------------------------------------------------------------
+
+show_status() {
+    local quiet="${1:-false}"
+
+    [[ "$quiet" == "true" ]] && {
+        # Quiet mode: just exit codes
+        local running=0
+        for port in "$DATOMIC_PORT" "$SERVER_PORT" "$NREPL_PORT"; do
+            port_in_use "$port" && ((running++))
+        done
+        echo "$running"
+        return
+    }
+
+    echo ""
+    echo -e "${BOLD}OrcPub Service Status${NC}"
+    echo "───────────────────────────────────────────────────────────────"
+    printf "%-16s %-8s %-10s %-10s %s\n" "Service" "Port" "Status" "PID" "Uptime"
+    echo "───────────────────────────────────────────────────────────────"
+
+    local services=(
+        "Datomic:$DATOMIC_PORT:datomic.*transactor"
+        "Server:$SERVER_PORT:lein.*start-server"
+        "nREPL:$NREPL_PORT:nrepl"
+        "Figwheel:$FIGWHEEL_PORT:figwheel"
+        "Garden:$GARDEN_PORT:garden"
+    )
+
+    for entry in "${services[@]}"; do
+        IFS=':' read -r name port pattern <<< "$entry"
+        local pid
+        pid=$(find_pids_by_port "$port" | awk '{print $1}')
+
+        if [[ -n "$pid" ]]; then
+            local uptime
+            uptime=$(get_uptime "$pid")
+            printf "%-16s %-8s ${GREEN}%-10s${NC} %-10s %s\n" "$name" "$port" "running" "$pid" "$uptime"
+        else
+            printf "%-16s %-8s ${YELLOW}%-10s${NC} %-10s %s\n" "$name" "$port" "stopped" "-" "-"
+        fi
+    done
+
+    echo "───────────────────────────────────────────────────────────────"
+    echo ""
+}
+
+# -----------------------------------------------------------------------------
+# Kill Functions
+# -----------------------------------------------------------------------------
+
+confirm_kill() {
+    local pids="$1"
+    local description="$2"
+    local skip_confirm="${3:-false}"
+    local quiet="${4:-false}"
+
+    if [[ -z "$pids" ]]; then
+        [[ "$quiet" != "true" ]] && log_warn "No processes found for: $description"
+        return 1
+    fi
+
+    if [[ "$quiet" != "true" ]]; then
+        echo ""
+        echo "Found processes to stop ($description):"
+        echo "────────────────────────────────────────"
+        for pid in $pids; do
+            echo "  $(get_process_info "$pid")"
+        done
+        echo "────────────────────────────────────────"
+    fi
+
+    [[ "$skip_confirm" == "true" ]] && return 0
+
+    # Non-interactive protection: fail fast instead of hanging on read
+    if ! is_interactive; then
+        log_error "Cannot prompt for confirmation (non-interactive mode)"
+        log_error "Use --yes to skip confirmation in scripts/CI"
+        return 1
+    fi
+
+    if ! read -t 30 -p "Stop these processes? [y/N] " -n 1 -r; then
+        echo
+        log_error "Prompt timed out after 30 seconds"
+        return 1
+    fi
+    echo
+    [[ $REPLY =~ ^[Yy]$ ]] && return 0
+    [[ "$quiet" != "true" ]] && log_info "Aborted."
+    return 1
+}
+
+kill_pids() {
+    local pids="$1"
+    local use_force="${2:-false}"
+    local quiet="${3:-false}"
+    local wait_time=3
+
+    [[ -z "$pids" ]] && return 0
+
+    [[ "$quiet" != "true" ]] && log_info "Sending SIGTERM to PIDs: $pids"
+    for pid in $pids; do
+        kill -TERM "$pid" 2>/dev/null || true
+    done
+
+    sleep "$wait_time"
+
+    # Check for survivors
+    local remaining=""
+    for pid in $pids; do
+        kill -0 "$pid" 2>/dev/null && remaining="$remaining $pid"
+    done
+    remaining=$(echo "$remaining" | xargs)
+
+    if [[ -n "$remaining" ]]; then
+        if [[ "$use_force" == "true" ]]; then
+            [[ "$quiet" != "true" ]] && log_warn "Processes still running, sending SIGKILL: $remaining"
+            for pid in $remaining; do
+                kill -KILL "$pid" 2>/dev/null || true
+            done
+            sleep 1
+        else
+            [[ "$quiet" != "true" ]] && log_warn "Some processes still running: $remaining"
+            [[ "$quiet" != "true" ]] && log_info "Use --force to send SIGKILL"
+            return 1
+        fi
+    fi
+
+    [[ "$quiet" != "true" ]] && log_info "All processes terminated successfully"
+}
+
+# -----------------------------------------------------------------------------
+# Stop Targets (PID-first, port-fallback approach)
+# -----------------------------------------------------------------------------
+
+stop_repl() {
+    local skip="$1" force="$2" quiet="$3"
+    local pids result=0
+    # Use PID-first lookup from common.sh
+    pids=$(find_service_pids "nrepl" "$NREPL_PORT" 'nrepl')
+    if confirm_kill "$pids" "nREPL (port $NREPL_PORT)" "$skip" "$quiet"; then
+        kill_pids "$pids" "$force" "$quiet" || result=$?
+        # Clean up PID file after stopping
+        rm -f "$LOG_DIR/nrepl.pid" 2>/dev/null || true
+    fi
+    return $result
+}
+
+stop_server() {
+    local skip="$1" force="$2" quiet="$3"
+    local pids result=0
+    pids=$(find_service_pids "server" "$SERVER_PORT" 'lein.*start-server')
+    if confirm_kill "$pids" "Server (port $SERVER_PORT)" "$skip" "$quiet"; then
+        kill_pids "$pids" "$force" "$quiet" || result=$?
+        rm -f "$LOG_DIR/server.pid" 2>/dev/null || true
+    fi
+    return $result
+}
+
+stop_datomic() {
+    local skip="$1" force="$2" quiet="$3"
+    local pids result=0
+    pids=$(find_service_pids "datomic" "$DATOMIC_PORT" 'datomic.*transactor')
+    if confirm_kill "$pids" "Datomic (port $DATOMIC_PORT)" "$skip" "$quiet"; then
+        kill_pids "$pids" "$force" "$quiet" || result=$?
+        rm -f "$LOG_DIR/datomic.pid" 2>/dev/null || true
+    fi
+    return $result
+}
+
+stop_figwheel() {
+    local skip="$1" force="$2" quiet="$3"
+    local pids result=0
+    pids=$(find_service_pids "figwheel" "$FIGWHEEL_PORT" 'figwheel')
+    if confirm_kill "$pids" "Figwheel (port $FIGWHEEL_PORT)" "$skip" "$quiet"; then
+        kill_pids "$pids" "$force" "$quiet" || result=$?
+        rm -f "$LOG_DIR/figwheel.pid" 2>/dev/null || true
+    fi
+    return $result
+}
+
+stop_garden() {
+    local skip="$1" force="$2" quiet="$3"
+    local pids result=0
+    pids=$(find_service_pids "garden" "$GARDEN_PORT" 'garden.*auto')
+    if confirm_kill "$pids" "Garden" "$skip" "$quiet"; then
+        kill_pids "$pids" "$force" "$quiet" || result=$?
+        rm -f "$LOG_DIR/garden.pid" 2>/dev/null || true
+    fi
+    return $result
+}
+
+stop_port() {
+    local port="$1" skip="$2" force="$3" quiet="$4"
+    [[ -z "$port" ]] && { log_error "Usage: $0 port <port>"; exit $EXIT_USAGE; }
+    [[ ! "$port" =~ ^[0-9]+$ ]] && { log_error "Invalid port: $port"; exit $EXIT_USAGE; }
+    local pids
+    pids=$(find_pids_by_port "$port")
+    confirm_kill "$pids" "port $port" "$skip" "$quiet" && kill_pids "$pids" "$force" "$quiet"
+}
+
+stop_name() {
+    local pattern="$1" skip="$2" force="$3" quiet="$4"
+    [[ -z "$pattern" ]] && { log_error "Usage: $0 name <pattern>"; exit $EXIT_USAGE; }
+
+    # Warn about very broad patterns (security/safety measure)
+    if [[ ${#pattern} -lt 4 ]]; then
+        log_warn "Pattern '$pattern' is very broad (${#pattern} chars)"
+        if ! is_interactive; then
+            log_error "Refusing to use broad pattern in non-interactive mode"
+            exit $EXIT_USAGE
+        fi
+        if ! read -t 30 -p "This may match many processes. Continue? [y/N] " -n 1 -r; then
+            echo
+            log_error "Prompt timed out after 30 seconds"
+            exit $EXIT_RUNTIME
+        fi
+        echo
+        [[ ! $REPLY =~ ^[Yy]$ ]] && { log_info "Aborted."; exit $EXIT_SUCCESS; }
+    fi
+
+    local pids
+    pids=$(find_pids_by_name "$pattern")
+    confirm_kill "$pids" "pattern '$pattern'" "$skip" "$quiet" && kill_pids "$pids" "$force" "$quiet"
+}
+
+stop_all() {
+    local skip="$1" force="$2" quiet="$3"
+    local pids="" result=0
+
+    # Collect PIDs from all services using PID-first approach
+    for service in datomic server nrepl figwheel garden; do
+        local service_pids=""
+        case "$service" in
+            datomic)  service_pids=$(find_service_pids "datomic" "$DATOMIC_PORT" 'datomic.*transactor') ;;
+            server)   service_pids=$(find_service_pids "server" "$SERVER_PORT" 'lein.*start-server') ;;
+            nrepl)    service_pids=$(find_service_pids "nrepl" "$NREPL_PORT" 'nrepl') ;;
+            figwheel) service_pids=$(find_service_pids "figwheel" "$FIGWHEEL_PORT" 'figwheel') ;;
+            garden)   service_pids=$(find_service_pids "garden" "$GARDEN_PORT" 'garden.*auto') ;;
+        esac
+        [[ -n "$service_pids" ]] && pids="$pids $service_pids"
+    done
+
+    pids=$(echo "$pids" | tr ' ' '\n' | sort -u | xargs)
+
+    if confirm_kill "$pids" "all OrcPub services" "$skip" "$quiet"; then
+        kill_pids "$pids" "$force" "$quiet" || result=$?
+        # Clean up all PID files
+        rm -f "$LOG_DIR"/*.pid 2>/dev/null || true
+    fi
+    return $result
+}
+
+# -----------------------------------------------------------------------------
+# Help
+# -----------------------------------------------------------------------------
+
+show_help() {
+    cat << 'EOF'
+OrcPub Process Management
+
+Usage:
+  ./stop.sh [target] [options]
+
+Targets:
+  (none)          Stop all OrcPub services
+  repl            Stop nREPL processes
+  server          Stop OrcPub server
+  datomic         Stop Datomic transactor
+  figwheel        Stop Figwheel
+  garden          Stop Garden CSS watcher
+  port <port>     Stop process on specific port
+  name <pattern>  Stop processes matching pattern
+
+Options:
+  --dry-run       Show status without stopping anything
+  --yes, -y       Skip confirmation prompt
+  --force, -f     Use SIGKILL if SIGTERM doesn't stop the process
+  --quiet, -q     Minimal output (for scripting)
+  --help, -h      Show this help
+
+Examples:
+  ./stop.sh                    # Stop all (interactive)
+  ./stop.sh --dry-run          # Show what's running
+  ./stop.sh --yes              # Stop all without prompting
+  ./stop.sh repl --yes         # Stop nREPL only
+  ./stop.sh figwheel --yes     # Stop Figwheel only
+  ./stop.sh port 8890 --force  # Force kill port 8890
+EOF
+}
+
+# -----------------------------------------------------------------------------
+# Main
+# -----------------------------------------------------------------------------
+
+main() {
+    local target=""
+    local skip_confirm="false"
+    local use_force="false"
+    local dry_run="false"
+    local quiet="false"
+    local positional=()
+
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --dry-run|--status) dry_run="true"; shift ;;
+            --yes|-y)           skip_confirm="true"; shift ;;
+            --force|-f)         use_force="true"; shift ;;
+            --quiet|-q)         quiet="true"; QUIET="true"; export QUIET; skip_confirm="true"; shift ;;
+            --help|-h)          show_help; exit $EXIT_SUCCESS ;;
+            -*)                 log_error "Unknown option: $1"; show_help; exit $EXIT_USAGE ;;
+            *)                  positional+=("$1"); shift ;;
+        esac
+    done
+
+    [[ "$dry_run" == "true" ]] && { show_status "$quiet"; exit $EXIT_SUCCESS; }
+
+    target="${positional[0]:-all}"
+
+    case "$target" in
+        all)      stop_all "$skip_confirm" "$use_force" "$quiet" ;;
+        repl)     stop_repl "$skip_confirm" "$use_force" "$quiet" ;;
+        server)   stop_server "$skip_confirm" "$use_force" "$quiet" ;;
+        datomic)  stop_datomic "$skip_confirm" "$use_force" "$quiet" ;;
+        figwheel) stop_figwheel "$skip_confirm" "$use_force" "$quiet" ;;
+        garden)   stop_garden "$skip_confirm" "$use_force" "$quiet" ;;
+        port)     stop_port "${positional[1]:-}" "$skip_confirm" "$use_force" "$quiet" ;;
+        name)     stop_name "${positional[1]:-}" "$skip_confirm" "$use_force" "$quiet" ;;
+        *)        log_error "Unknown target: $target"; show_help; exit $EXIT_USAGE ;;
+    esac
+}
+
+main "$@"
diff --git a/src/clj/orcpub/config.clj b/src/clj/orcpub/config.clj
new file mode 100644
index 000000000..498f418b4
--- /dev/null
+++ b/src/clj/orcpub/config.clj
@@ -0,0 +1,84 @@
+(ns orcpub.config
+  (:require [environ.core :refer [env]]
+            [clojure.string :as str]))
+
+(def default-datomic-uri "datomic:dev://localhost:4334/orcpub")
+
+(defn datomic-env
+  "Return the raw DATOMIC_URL environment value or nil if unset." []
+  (or (env :datomic-url)
+      (some-> (System/getenv "DATOMIC_URL") not-empty)))
+
+(defn get-datomic-uri
+  "Return the Datomic URI from the environment or the default.
+
+  Prefers the raw env value (from `datomic-env`), otherwise returns a safe
+  local development default (datomic:dev://localhost:4334/orcpub)."
+  []
+  (or (datomic-env)
+      default-datomic-uri))
+
+;; Content Security Policy configuration
+;; CSP_POLICY environment variable options:
+;;   - "strict"     : Nonce-based CSP with 'strict-dynamic' (default, maximum security)
+;;   - "permissive" : Allows same-origin scripts without strict-dynamic (legacy fallback)
+;;   - "none"       : Disables CSP entirely (not recommended for production)
+
+(def permissive-csp-settings
+  "CSP that allows same-origin scripts without strict-dynamic.
+   Compatible with traditional <script src> tags. Less secure than strict mode."
+  {:default-src "'self'"
+   :script-src "'self' 'unsafe-inline' 'unsafe-eval' https://fonts.googleapis.com"
+   :style-src "'self' 'unsafe-inline' https://fonts.googleapis.com"
+   :font-src "'self' https://fonts.gstatic.com"
+   :img-src "'self' data: https:"
+   :object-src "'none'"})
+
+(defn get-csp-policy
+  "Return the CSP policy from CSP_POLICY env var. Defaults to 'strict'."
+  []
+  (let [policy (or (env :csp-policy)
+                   (System/getenv "CSP_POLICY")
+                   "strict")]
+    (str/lower-case policy)))
+
+(defn dev-mode?
+  "Returns true when running in dev mode (DEV_MODE env var is truthy).
+   Used by CSP to determine if Figwheel/CLJS dev builds are in use.
+   See also: index.clj which uses the same env var pattern."
+  []
+  (boolean (env :dev-mode)))
+
+(defn strict-csp?
+  "Returns true when CSP_POLICY=strict (regardless of dev mode).
+
+   When true, nonce-interceptor generates per-request nonces and adds them
+   to script tags. The header type depends on mode:
+   - Dev mode: Content-Security-Policy-Report-Only (violations logged, not blocked)
+   - Prod mode: Content-Security-Policy (violations blocked)
+
+   This allows catching CSP issues during development while still allowing
+   Figwheel's document.write() scripts to execute."
+  []
+  (= "strict" (get-csp-policy)))
+
+(defn get-secure-headers-config
+  "Configure Pedestal secure-headers based on CSP_POLICY env var.
+
+   - strict: Disables Pedestal's static CSP (nonce-interceptor handles it dynamically)
+   - permissive: Uses static permissive CSP settings
+   - none: Disables CSP entirely"
+  []
+  (cond
+    ;; Strict mode - nonce-interceptor handles CSP dynamically
+    ;; (uses Report-Only in dev, enforcing in prod)
+    (= "strict" (get-csp-policy))
+    {:content-security-policy-settings nil}
+
+    ;; CSP disabled
+    (= "none" (get-csp-policy))
+    {:content-security-policy-settings nil}
+
+    ;; Default to permissive
+    :else
+    {:content-security-policy-settings permissive-csp-settings}))
diff --git a/src/clj/orcpub/csp.clj b/src/clj/orcpub/csp.clj
new file mode 100644
index 000000000..5ed53758a
--- /dev/null
+++ b/src/clj/orcpub/csp.clj
@@ -0,0 +1,45 @@
+(ns orcpub.csp
+  "Content Security Policy (CSP) utilities for nonce-based strict mode.
+
+   Generates per-request cryptographic nonces and builds CSP headers
+   with 'strict-dynamic' for XSS protection."
+  (:import [java.security SecureRandom]
+           [java.util Base64]))
+
+(def ^:private ^SecureRandom secure-random
+  "Thread-safe cryptographically secure random number generator."
+  (SecureRandom.))
+
+(defn generate-nonce
+  "Generate a 128-bit (16 byte) cryptographically secure nonce, base64-encoded.
+
+   Returns a new unique nonce string for each call. Nonces are used once
+   per request to validate legitimate scripts in the CSP header."
+  []
+  (let [bytes (byte-array 16)]
+    (.nextBytes secure-random bytes)
+    (.encodeToString (Base64/getEncoder) bytes)))
+
+(defn build-csp-header
+  "Build a Content-Security-Policy header string with strict-dynamic and nonce.
+
+   Options:
+     :dev-mode? - When true, adds ws://localhost:3449 to connect-src for
+                  Figwheel hot-reload WebSocket support.
+
+   The resulting CSP:
+     - Uses 'strict-dynamic' for script-src (only nonced scripts execute)
+     - Allows Google Fonts for styles and fonts
+     - Restricts all other sources to 'self'
+     - Blocks object embeds, restricts base-uri, frame-ancestors, and form-action"
+  [nonce & {:keys [dev-mode?]}]
+  (str "default-src 'self'; "
+       "script-src 'strict-dynamic' 'nonce-" nonce "'; "
+       "style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; "
+       "font-src 'self' https://fonts.gstatic.com; "
+       "img-src 'self' data: https:; "
+       "connect-src 'self'" (when dev-mode? " ws://localhost:3449") "; "
+       "object-src 'none'; "
+       "base-uri 'self'; "
+       "frame-ancestors 'self'; "
+       "form-action 'self'"))
diff --git a/src/clj/orcpub/email.clj b/src/clj/orcpub/email.clj
index de6e33331..263ad2d5d 100644
--- a/src/clj/orcpub/email.clj
+++ b/src/clj/orcpub/email.clj
@@ -4,7 +4,7 @@
   Provides functions for sending verification emails, password reset emails,
   and error notification emails. All operations include comprehensive error
   handling to prevent silent failures when the SMTP server is unavailable."
-  (:require [hiccup.core :as hiccup]
+  (:require [hiccup2.core :as hiccup]
             [postal.core :as postal]
             [environ.core :as environ]
             [clojure.pprint :as pprint]
@@ -14,7 +14,7 @@
 
 (defn verification-email-html [first-and-last-name username verification-url]
   [:div
-   (str "Dear Dungeon Master's Vault Patron,")
+   "Dear Dungeon Master's Vault Patron,"
    [:br]
    [:br]
    "Your Dungeon Master's Vault account is almost ready, we just need you to verify your email address going the following URL to confirm that you are authorized to use this email address:"
@@ -30,7 +30,7 @@
 
 (defn verification-email [first-and-last-name username verification-url]
   [{:type "text/html"
-    :content (hiccup/html (verification-email-html first-and-last-name username verification-url))}])
+    :content (str (hiccup/html (verification-email-html first-and-last-name username verification-url)))}])
 
 (defn email-change-verification-html
   "Email body for existing users changing their email (distinct from registration)."
@@ -56,7 +56,7 @@
 
 (defn email-change-verification-email [username verification-url]
   [{:type "text/html"
-    :content (hiccup/html (email-change-verification-html username verification-url))}])
+    :content (str (hiccup/html (email-change-verification-html username verification-url)))}])
 
 (defn email-cfg []
   (try
@@ -125,7 +125,7 @@
 
 (defn reset-password-email-html [first-and-last-name reset-url]
   [:div
-   (str "Dear Dungeon Master's Vault Patron")
+   "Dear Dungeon Master's Vault Patron"
    [:br]
    [:br]
    "We received a request to reset your password, to do so please go to the following URL to complete the reset."
@@ -144,7 +144,7 @@
 
 (defn reset-password-email [first-and-last-name reset-url]
   [{:type "text/html"
-    :content (hiccup/html (reset-password-email-html first-and-last-name reset-url))}])
+    :content (str (hiccup/html (reset-password-email-html first-and-last-name reset-url)))}])
 
 (defn send-reset-email
   "Sends password reset email to a user.
diff --git a/src/clj/orcpub/favicon.clj b/src/clj/orcpub/favicon.clj
index 7bf3a09ac..b22a5c2a9 100644
--- a/src/clj/orcpub/favicon.clj
+++ b/src/clj/orcpub/favicon.clj
@@ -4,11 +4,11 @@
 (defhtml install
          "faviconit.com favicons.
          Filenames default to: icon.ico; browserconfig.xml;
-         png - 16,32,57,64,72,76,96,114,120,144,152,160,196,"
+         png - 16,32,57,64,72,76,96,114,120,144,152,160,192,"
          [& {:keys [img xml png-prefix ver]}]
          [:link {:rel "shortcut icon" :href (str img "/favicon.ico?v=" ver)}]
          [:link {:rel "icon" :sizes "16x16 32x32 64x64" :href (str img "/favicon.ico?v=" ver)}]
-         [:link {:rel "icon" :type "image/png" :sizes "196x196" :href (str img "/" png-prefix "196.png?v=" ver)}]
+         [:link {:rel "icon" :type "image/png" :sizes "192x192" :href (str img "/" png-prefix "192.png?v=" ver)}]
          [:link {:rel "icon" :type "image/png" :sizes "160x160" :href (str img "/" png-prefix "160.png?v=" ver)}]
          [:link {:rel "icon" :type "image/png" :sizes "96x96" :href (str img "/" png-prefix "96.png?v=" ver)}]
          [:link {:rel "icon" :type "image/png" :sizes "64x64" :href (str img "/" png-prefix "64.png?v=" ver)}]
diff --git a/src/clj/orcpub/index.clj b/src/clj/orcpub/index.clj
index c7baa01cb..1926c65cc 100644
--- a/src/clj/orcpub/index.clj
+++ b/src/clj/orcpub/index.clj
@@ -1,10 +1,9 @@
 (ns orcpub.index
-  (:require [hiccup.page :refer [html5 include-css include-js]]
+  (:require [hiccup.page :refer [html5 include-css]]
             [orcpub.oauth :as oauth]
             [orcpub.dnd.e5.views-2 :as views-2]
             [orcpub.favicon :as fi]
-            [environ.core :refer [env]]
-            ))
+            [environ.core :refer [env]]))
 
 (def devmode? (env :dev-mode))
 
@@ -14,11 +13,23 @@
      {:property property
       :content content}]))
 
+(defn script-tag
+  "Generate a script tag with optional nonce for CSP strict mode.
+   For external scripts, pass :src. For inline scripts, pass content as body."
+  [{:keys [src nonce]} & body]
+  (let [attrs (cond-> {}
+                src (assoc :src src)
+                nonce (assoc :nonce nonce))]
+    (if (seq body)
+      (into [:script attrs] body)
+      [:script attrs])))
+
 (defn index-page [{:keys [url
                           title
                           description
                           image
-                          fb-type]}
+                          fb-type
+                          nonce]}
                   & [splash?]]
   (html5
    {:lang :en}
@@ -36,9 +47,9 @@
                 :xml "/favicon"
                 :ver "1")
     (include-css "/css/cookiestyles.css")
-    [:script
+    (script-tag {:nonce nonce}
      "document.documentElement.style.setProperty('--innerHeight', `${window.innerHeight}px`);
-     window.addEventListener('resize', () => document.documentElement.style.setProperty('--innerHeight', `${window.innerHeight}px`));"]
+     window.addEventListener('resize', () => document.documentElement.style.setProperty('--innerHeight', `${window.innerHeight}px`));")
     [:style
      "
 .splash-page-content {}
@@ -124,19 +135,21 @@ html {
         [:img {:src "/image/spiral.gif"
                :style "height:200px;width:200px;margin-top:200px"}]])]
     (include-css "/css/compiled/styles.css")
-    (include-js "/js/compiled/orcpub.js")
-    (include-js "/js/cookies.js")
+    ;; Dev mode uses Report-Only CSP (logs violations but doesn't block)
+    ;; Prod mode uses enforcing CSP with nonces
+    (script-tag {:src "/js/compiled/orcpub.js" :nonce nonce})
+    (script-tag {:src "/js/cookies.js" :nonce nonce})
     (include-css "/assets/font-awesome/5.13.1/css/all.min.css")
     (include-css "https://fonts.googleapis.com/css?family=Open+Sans")
-    [:script " window.start.init({Palette:\"palette7\",Mode:\"banner bottom\",})"]
+    (script-tag {:nonce nonce} " window.start.init({Palette:\"palette7\",Mode:\"banner bottom\",})")
     (if devmode?
       (println "dev mode - no script")
 
-      [:script
+      (script-tag {:nonce nonce}
        "const protocol = window.location.protocol;
-        const apiUrl = `${protocol}//${window.location.host}`;
+        const apiUrl = `${protocol}://${window.location.host}`;
         const pluginUrl = `${apiUrl}/homebrew.orcbrew`;
-        
+
         let plugins = localStorage.getItem('plugins');
         if (plugins === null || plugins === '{}') {
           fetch(pluginUrl)
@@ -157,7 +170,7 @@ html {
               // You can also add a fallback or default behavior here
             });
         }
-      "]
+      ")
     )
    ]))
-  
+  
\ No newline at end of file
diff --git a/src/clj/orcpub/pdf.clj b/src/clj/orcpub/pdf.clj
index 171699102..0f413856e 100644
--- a/src/clj/orcpub/pdf.clj
+++ b/src/clj/orcpub/pdf.clj
@@ -1,4 +1,24 @@
 (ns orcpub.pdf
+  "PDF generation utilities for character sheets, spell cards, and monster stat blocks.
+   
+   ## PDFBox 3.x Migration Notes (January 2026)
+   
+   This namespace was updated from PDFBox 2.x to 3.x. Key API changes:
+   
+   1. **Standard fonts** - In PDFBox 2.x, fonts were static fields like `PDType1Font/HELVETICA`.
+      In PDFBox 3.x, you must create font instances using the `Standard14Fonts$FontName` enum:
+      ```clojure
+      ;; Old (2.x): PDType1Font/HELVETICA
+      ;; New (3.x): (PDType1Font. Standard14Fonts$FontName/HELVETICA)
+      ```
+      We define these as module-level constants (HELVETICA, HELVETICA_BOLD, etc.) for convenience.
+   
+   2. **Loading PDFs** - In PDFBox 2.x, use `PDDocument/load`. In 3.x, use `Loader/loadPDF`.
+      See routes.clj for this change.
+   
+   3. **Java interop syntax** - The `$` in `Standard14Fonts$FontName` is Clojure's way of
+      accessing a Java nested/inner class. `Standard14Fonts.FontName` in Java becomes
+      `Standard14Fonts$FontName` in Clojure imports."
   (:require [clojure.string :as s]
             [clojure.stacktrace :as strace]
             [clojure.java.io :as io]
@@ -8,11 +28,46 @@
             [orcpub.dnd.e5.options :as options])
   (:import (org.apache.pdfbox.pdmodel.interactive.form PDCheckBox PDTextField)
            (org.apache.pdfbox.pdmodel PDPage PDDocument PDPageContentStream PDResources)
+           ;; PDFBox 3.x: AppendMode enum replaces boolean flags in PDPageContentStream constructor
+           ;; Use APPEND when adding content to existing pages (templates)
+           ;; APPEND adds new drawing/text operators to the end of the page’s existing content stream, preserving everything already on the page.
+           (org.apache.pdfbox.pdmodel PDPageContentStream$AppendMode)
            (org.apache.pdfbox.pdmodel.graphics.image JPEGFactory LosslessFactory)
-           (org.apache.pdfbox.pdmodel.font PDType1Font PDFont PDType0Font)
+           ;; PDFBox 3.x: Standard14Fonts$FontName is a nested enum class
+           ;; In Java: org.apache.pdfbox.pdmodel.font.Standard14Fonts.FontName
+           ;; In Clojure: use $ to access nested classes
+           (org.apache.pdfbox.pdmodel.font PDType1Font PDFont PDType0Font Standard14Fonts$FontName)
            (javax.imageio ImageIO)
            (java.net URL)))
 
+;; =============================================================================
+;; Standard PDF Fonts (PDFBox 3.x)
+;; =============================================================================
+;;
+;; PDFBox 3.x changed how standard fonts are accessed:
+;;   - OLD (2.x): PDType1Font/HELVETICA (static field)
+;;   - NEW (3.x): (PDType1Font. Standard14Fonts$FontName/HELVETICA) (constructor + enum)
+;;
+;; We create these constants at load time so the rest of the code can use them
+;; like the old static fields. These are the standard "Base 14" PDF fonts that
+;; are guaranteed to be available in all PDF readers.
+;;
+(def HELVETICA
+  "Standard Helvetica font (regular weight, upright)"
+  (PDType1Font. Standard14Fonts$FontName/HELVETICA))
+
+(def HELVETICA_BOLD
+  "Standard Helvetica font (bold weight, upright)"
+  (PDType1Font. Standard14Fonts$FontName/HELVETICA_BOLD))
+
+(def HELVETICA_OBLIQUE
+  "Standard Helvetica font (regular weight, italic/oblique)"
+  (PDType1Font. Standard14Fonts$FontName/HELVETICA_OBLIQUE))
+
+(def HELVETICA_BOLD_OBLIQUE
+  "Standard Helvetica font (bold weight, italic/oblique)"
+  (PDType1Font. Standard14Fonts$FontName/HELVETICA_BOLD_OBLIQUE))
+
 (defn load-fonts
   "Loads the fonts for the document. Will contain
   :plain, :italic, :bold and :bold-italic fonts."
@@ -40,9 +95,7 @@
           (when field
             
             (when (and flatten (font-sizes k) (instance? PDTextField field))
-              (.setDefaultAppearance field (str "/Helv " " " (font-sizes k) " Tf 0 0 0 rg"))
-              ;; this prints out weird boxes
-              #_(.setDefaultAppearance field (str COSName/DA "/" (.getName font-name) " " (font-sizes k 8) " Tf 0 0 0 rg")))
+              (.setDefaultAppearance field (str "/Helv " " " (font-sizes k) " Tf 0 0 0 rg")))
             (.setValue
              field
              (cond 
@@ -54,8 +107,17 @@
       (.setNeedAppearances form false)
       (.flatten form))))
 
-(defn content-stream [doc page]
-  (PDPageContentStream. doc page true false true))
+(defn content-stream
+  "Create a PDPageContentStream for appending content to an existing page.
+   
+   PDFBox 3.x API: Use AppendMode enum instead of boolean flags.
+   - APPEND: Add content after existing page content (what we want for templates)
+   - OVERWRITE: Replace existing content (triggers warning on non-empty pages)
+   - PREPEND: Add content before existing content
+   
+   The 4th arg (true) enables compression."
+  [doc page]
+  (PDPageContentStream. doc page PDPageContentStream$AppendMode/APPEND true))
 
 (defn in-to-sz [inches]
   (float (* 72 inches)))
@@ -284,7 +346,7 @@
   (.setNonStrokingColor cs 0 0 0)
   (draw-text cs
              value
-             PDType1Font/HELVETICA_BOLD_OBLIQUE
+             HELVETICA_BOLD_OBLIQUE
              8
              x
              (- y 0.07))
@@ -401,7 +463,7 @@
                i (range (dec num-boxes-x) -1 -1)
                :let [spell-index (+ i (* j num-boxes-x))]]
            (when-let [{:keys [class-nm dc attack-bonus spell] :as spell-data}
-                    (get (vec spells) spell-index)]
+                      (get (vec spells) spell-index)]
              (let [{:keys [description
                            casting-time
                            duration
@@ -527,7 +589,15 @@
                {:remaining-lines remaining-desc-lines
                 :spell-name spell-name}))))))))
 
-(defn create-monsters-pdf []
+#_{:clj-kondo/ignore [:unused-private-var]}
+(defn- create-monsters-pdf
+  "Development/testing function that generates a sample monster stat block PDF.
+   
+   This function is not used in production - it's a utility for testing PDF
+   generation during development. The output is saved to a temporary file.
+   
+   Returns: The temp file path where the PDF was saved."
+  []
   (let [page (PDPage.)
         doc (PDDocument.)]
     (.addPage doc page)
@@ -540,13 +610,13 @@
             (let [monster (monsters i)]
               (draw-text-from-top cs
                                   (:name monster)
-                                  PDType1Font/HELVETICA_BOLD
+                                  HELVETICA_BOLD
                                   14
                                   0.1
                                   (+ (* i h) 0.25))
               (draw-text-from-top cs
                                   (monsters/monster-subheader monster)
-                                  PDType1Font/HELVETICA_OBLIQUE
+                                  HELVETICA_OBLIQUE
                                   12
                                   0.1
                                   (+ (* i h) 0.45))
@@ -555,7 +625,7 @@
                       x (+ 0.15 (* 0.65 j))]
                   (draw-text-from-top cs
                                       (name ability)
-                                      PDType1Font/HELVETICA_BOLD
+                                      HELVETICA_BOLD
                                       10
                                       x
                                       (+ (* i h) 0.7))
@@ -564,38 +634,41 @@
                                            " ("
                                            (options/ability-bonus-str (ability monster))
                                            ")")
-                                      PDType1Font/HELVETICA
+                                      HELVETICA
                                       12
                                       x
                                       (+ (* i h) 0.85))))
               (draw-text-from-top cs
                                   "Saving Throws"
-                                  PDType1Font/HELVETICA_BOLD
+                                  HELVETICA_BOLD
                                   10
                                   0.1
                                   (+ (* i h) 1.1))
               (draw-text-from-top cs
                                   (common/print-bonus-map (:saving-throws monster))
-                                  PDType1Font/HELVETICA
+                                  HELVETICA
                                   10
                                   (+ 0.1 (string-width
                                           "Saving Throws "
-                                          PDType1Font/HELVETICA_BOLD
+                                          HELVETICA_BOLD
                                           10))
                                   (+ (* i h) 1.1))
               (draw-text-from-top cs
                                   "Skills"
-                                  PDType1Font/HELVETICA_BOLD
+                                  HELVETICA_BOLD
                                   10
                                   0.1
                                   (+ (* i h) 1.3))
               (draw-text-from-top cs
                                   (common/print-bonus-map (:skills monster))
-                                  PDType1Font/HELVETICA
+                                  HELVETICA
                                   10
                                   (+ 0.1 (string-width
                                           "Skills "
-                                          PDType1Font/HELVETICA_BOLD
+                                          HELVETICA_BOLD
                                           10))
                                   (+ (* i h) 1.3)))))))
-    (.save doc "/home/larry/Documents/test.pdf")))
\ No newline at end of file
+    ;; Save to a cross-platform temp file instead of a hardcoded path.
+    ;; java.io.File/createTempFile creates a file in the system temp directory
+    ;; and returns a File object that PDDocument.save() accepts.
+    (.save doc (java.io.File/createTempFile "monsters" ".pdf"))))
\ No newline at end of file
diff --git a/src/clj/orcpub/pedestal.clj b/src/clj/orcpub/pedestal.clj
index 6461e6483..3ca9276c3 100644
--- a/src/clj/orcpub/pedestal.clj
+++ b/src/clj/orcpub/pedestal.clj
@@ -1,23 +1,27 @@
 (ns orcpub.pedestal
   (:require [com.stuartsierra.component :as component]
             [io.pedestal.http :as http]
+            [io.pedestal.interceptor :as interceptor]
             [pandect.algo.sha1 :refer [sha1]]
             [datomic.api :as d]
             [clojure.string :as s]
-            [clj-time.format :as tf]
-            [clj-time.coerce :as tc])
-  (:import [java.io File]))
+            [java-time.api :as t]
+            [orcpub.csp :as csp]
+            [orcpub.config :as config])
+  (:import [java.io File]
+           [java.time.format DateTimeFormatter]))
 
 (defn test?
   [service-map]
   (= :test (:env service-map)))
 
 (defn db-interceptor [conn]
-  {:name :db-interceptor
-   :enter (fn [context]
-            (let [conn (:conn conn)
-                  db (d/db conn)]
-                (update context :request assoc :db db :conn conn)))})
+  (interceptor/interceptor
+   {:name :db-interceptor
+    :enter (fn [context]
+             (let [conn (:conn conn)
+                   db (d/db conn)]
+               (update context :request assoc :db db :conn conn)))}))
 
 (defmulti calculate-etag class)
 
@@ -30,19 +34,52 @@
 (defmethod calculate-etag :default [x]
   nil)
 
+(def rfc822-formatter
+  (DateTimeFormatter/ofPattern "EEE, dd MMM yyyy HH:mm:ss Z"))
+
 (defn parse-date [date content-length]
   (when date
-    (str (tc/to-long (tf/parse (tf/formatters :rfc822) (s/replace date #"GMT" "+00:00")))
+    (str (.toEpochMilli
+          (t/instant
+           (t/zoned-date-time rfc822-formatter (s/replace date #"GMT" "+0000"))))
          "-"
          content-length)))
 
+(defn make-nonce-interceptor
+  "Creates an interceptor that generates per-request CSP nonces.
+
+   In prod (dev-mode?=false) with CSP_POLICY=strict:
+   - :enter phase generates a nonce and stores it in [:request :csp-nonce]
+   - :leave phase adds enforcing Content-Security-Policy header with the nonce
+
+   In dev mode: CSP is skipped entirely. Pedestal 0.7's default CSP is still
+   active, but the nonce interceptor becomes a no-op. This avoids flooding the
+   browser console with Report-Only violations (inline Figwheel scripts, etc.)
+   that obscure real issues during development."
+  [dev-mode?]
+  (interceptor/interceptor
+   {:name :nonce-interceptor
+    :enter (fn [ctx]
+             (if (and (config/strict-csp?) (not dev-mode?))
+               (assoc-in ctx [:request :csp-nonce] (csp/generate-nonce))
+               ctx))
+    :leave (fn [ctx]
+             (if-let [nonce (get-in ctx [:request :csp-nonce])]
+               (assoc-in ctx [:response :headers "Content-Security-Policy"]
+                         (csp/build-csp-header nonce :dev-mode? false))
+               ctx))}))
+
+;; Create the nonce interceptor with current dev-mode? setting
+(def nonce-interceptor (make-nonce-interceptor (config/dev-mode?)))
+
 (def etag-interceptor
-  {:name :etag-interceptor
-   :leave (fn [{:keys [request response] :as context}]
-            (try
-              (let [{{etag "etag"
-                      if-none-match "if-none-match"
-                      last-modified "Last-Modified"
+  (interceptor/interceptor
+   {:name :etag-interceptor
+    :leave (fn [{:keys [request response] :as context}]
+             (try
+               (let [{{etag "etag"
+                       if-none-match "if-none-match"
+                       last-modified "Last-Modified"
                       :as headers} :headers} request
                     {body :body
                      {last-modified "Last-Modified"
@@ -58,7 +95,7 @@
                   (if new-etag
                     (assoc-in context [:response :headers "etag"] new-etag)
                     context)))
-              (catch Throwable t (prn "T" t ))))})
+              (catch Throwable t (prn "T" t ))))}))
 
 (defrecord Pedestal [service-map conn service]
   component/Lifecycle
@@ -67,7 +104,8 @@
     (if service
       this
       (cond-> service-map
-        true (update ::http/interceptors conj (db-interceptor conn) etag-interceptor)
+        ;; nonce-interceptor first: runs last in :leave phase (sets CSP header after response built)
+        true (update ::http/interceptors conj nonce-interceptor (db-interceptor conn) etag-interceptor)
         true http/create-server
         (not (test? service-map)) http/start
         true ((partial assoc this :service)))))
diff --git a/src/clj/orcpub/routes.clj b/src/clj/orcpub/routes.clj
index 49929d642..c93671c24 100644
--- a/src/clj/orcpub/routes.clj
+++ b/src/clj/orcpub/routes.clj
@@ -6,6 +6,7 @@
             [ring.middleware.resource :as ring-resource]
             [ring.util.response :as ring-resp]
             [io.pedestal.http.body-params :as body-params]
+            [io.pedestal.interceptor :as interceptor]
             [io.pedestal.interceptor.error :as error-int]
             [io.pedestal.interceptor.chain :refer [terminate]]
             #_[com.stuartsierra.component :as component]
@@ -16,8 +17,7 @@
             [buddy.auth.middleware :refer [authentication-request]]
             [clojure.edn :as edn]
             [clojure.java.io :as io]
-            [clj-time.core :as t :refer [hours from-now ago]]
-            [clj-time.coerce :as tc]
+            [orcpub.time :as time :refer [hours ago from-now instant before?]]
             [clojure.string :as s]
             [clojure.spec.alpha :as spec]
             [clojure.pprint]
@@ -48,13 +48,29 @@
             [ring.middleware.head :as head]
             [ring.util.codec :as codec]
             [ring.util.request :as req])
-  (:import (org.apache.pdfbox.pdmodel PDDocument PDPage PDPageContentStream)
+  ;; PDFBox 3.x: Use Loader class instead of PDDocument.load() static method
+  ;; OLD (2.x): (PDDocument/load input-stream)
+  ;; NEW (3.x): (Loader/loadPDF input-stream)
+  ;; 
+  ;; Import syntax notes for Clojure newcomers:
+  ;;   - (org.apache.pdfbox.pdmodel PDDocument PDPage) imports multiple classes from one package
+  ;;   - org.apache.pdfbox.Loader imports a single class (no parens needed)
+  (:import (org.apache.pdfbox.pdmodel PDPage PDPageContentStream)
+           org.apache.pdfbox.Loader
            (java.io ByteArrayOutputStream ByteArrayInputStream))
   (:gen-class))
 
 (deftype FixedBuffer [^long len])
 
-(def backend (backends/jws {:secret (environ/env :signature)}))
+(def ^:private jwt-secret
+  "JWT signing secret from SIGNATURE env var.
+   nil when unset — check-auth returns 500 with a diagnostic message."
+  (environ/env :signature))
+
+(when-not jwt-secret
+  (println "WARNING: SIGNATURE env var is not set — all authenticated API calls will fail"))
+
+(def backend (backends/jws {:secret jwt-secret}))
 
 (defn first-user-by [db query value]
   (let [result (d/q query
@@ -126,15 +142,27 @@
       (assoc :response {:status status :body {:message message}})))
 
 (def check-auth
-  {:name :check-auth
-   :enter (fn [context]
-            (let [request (:request context)
-                  updated-request (authentication-request request backend)
-                  username (get-in updated-request [:identity :user])]
-              (if (and (:identity updated-request)
-                       username)
-                (assoc context :request (assoc updated-request :username username))
-                (terminate-request context 401 "Unauthorized"))))})
+  "Interceptor that verifies the JWT bearer token on authenticated routes.
+   Returns 401 for missing/invalid tokens, 500 with diagnostic if the
+   JWT secret itself is not configured."
+  (interceptor/interceptor
+   {:name :check-auth
+    :enter (fn [context]
+             (if-not jwt-secret
+               (terminate-request context 500
+                                  "Server misconfigured: SIGNATURE env var not set")
+               (try
+                 (let [request (:request context)
+                       updated-request (authentication-request request backend)
+                       username (get-in updated-request [:identity :user])]
+                   (if (and (:identity updated-request)
+                            username)
+                     (assoc context :request (assoc updated-request :username username))
+                     (terminate-request context 401 "Unauthorized")))
+                 (catch Exception e
+                   (terminate-request context 401
+                                      (str "Authentication failed: "
+                                           (.getMessage e)))))))}))
 
 (defn party-owner [db id]
   (d/q '[:find ?owner .
@@ -146,24 +174,26 @@
 (def id-path [:request :path-params :id])
 
 (def parse-id
-  {:name :parse-id
-   :enter (fn [context]
-            (let [id-str (get-in context id-path)]
-              (if (and id-str (re-matches #"\d+" id-str))
-                (assoc-in context
-                          id-path
-                          (Long/parseLong id-str))
-                (terminate-request context 400 "Bad ID"))))})
+  (interceptor/interceptor
+   {:name :parse-id
+    :enter (fn [context]
+             (let [id-str (get-in context id-path)]
+               (if (and id-str (re-matches #"\d+" id-str))
+                 (assoc-in context
+                           id-path
+                           (Long/parseLong id-str))
+                 (terminate-request context 400 "Bad ID"))))}))
 
 
 (def check-party-owner
-  {:name :check-party-owner
-   :enter (fn [context]
-            (let [{:keys [identity db] {:keys [id]} :path-params} (:request context)
-                  party-owner (party-owner db id)]
-              (if (= (:user identity) party-owner)
-                context
-                (terminate-request context 401 "You don't own this party"))))})
+  (interceptor/interceptor
+   {:name :check-party-owner
+    :enter (fn [context]
+             (let [{:keys [identity db] {:keys [id]} :path-params} (:request context)
+                   party-owner (party-owner db id)]
+               (if (= (:user identity) party-owner)
+                 context
+                 (terminate-request context 401 "You don't own this party"))))}))
 
 (defn folder-owner [db id]
   (d/q '[:find ?owner .
@@ -173,20 +203,22 @@
        id))
 
 (def check-folder-owner
-  {:name :check-folder-owner
-   :enter (fn [context]
-            (let [{:keys [identity db] {:keys [id]} :path-params} (:request context)
-                  folder-owner (folder-owner db id)]
-              (if (= (:user identity) folder-owner)
-                context
-                (terminate-request context 401 "You don't own this folder"))))})
+  (interceptor/interceptor
+   {:name :check-folder-owner
+    :enter (fn [context]
+             (let [{:keys [identity db] {:keys [id]} :path-params} (:request context)
+                   owner (folder-owner db id)]
+               (cond
+                 (nil? owner) (terminate-request context 404 "Folder not found")
+                 (= (:user identity) owner) context
+                 :else (terminate-request context 401 "You don't own this folder"))))}))
 
 (defn redirect [route-key]
   (ring-resp/redirect (route-map/path-for route-key)))
 
 
 (defn verification-expired? [verification-sent]
-  (t/before? (tc/from-date verification-sent) (-> 24 hours ago)))
+  (before? (instant verification-sent) (-> 24 hours ago)))
 
 (defn login-error [error-key & [data]]
   {:status 401 :body (merge
@@ -422,10 +454,10 @@
                         e))))))
 
 (defn password-reset-expired? [password-reset-sent]
-  (and password-reset-sent (t/before? (tc/from-date password-reset-sent) (-> 24 hours ago))))
+  (and password-reset-sent (before? (instant password-reset-sent) (-> 24 hours ago))))
 
 (defn password-already-reset? [password-reset password-reset-sent]
-  (and password-reset (t/before? (tc/from-date password-reset-sent) (tc/from-date password-reset))))
+  (and password-reset (before? (instant password-reset-sent) (instant password-reset))))
 
 (defn send-password-reset [{:keys [query-params db conn scheme headers] :as request}]
   (try
@@ -557,27 +589,28 @@
         chrome? (re-matches #".*Chrome.*" user-agent)
         filename (str player-name " - " character-name " - " class-level ".pdf")]
         
-    (with-open [doc (PDDocument/load input)]
+    ;; PDFBox 3.x: Loader/loadPDF replaces the deprecated PDDocument/load
+    (with-open [doc (Loader/loadPDF input)]
       (pdf/write-fields! doc fields (not chrome?) font-sizes)
       (when (and print-spell-cards? (seq spells-known))
         (add-spell-cards! doc spells-known spell-save-dcs spell-attack-mods custom-spells print-spell-card-dc-mod?))
 
       (when (and image-url
-               (re-matches #"^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]" image-url)
-               (not image-url-failed))
+                 (re-matches #"^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]" image-url)
+                 (not image-url-failed))
         (case print-character-sheet-style?
           1 (pdf/draw-image! doc (pdf/get-page doc 1) image-url 0.45 1.75 2.35 3.15)
           2 (pdf/draw-image! doc (pdf/get-page doc 1) image-url 0.45 1.75 2.35 3.15)
           3 (pdf/draw-image! doc (pdf/get-page doc 1) image-url 0.45 1.75 2.35 3.15)
           4 (pdf/draw-image! doc (pdf/get-page doc 0) image-url 0.50 0.85 2.35 3.15)))
       (when (and faction-image-url
-               (re-matches #"^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]" faction-image-url)
-               (not faction-image-url-failed))
+                 (re-matches #"^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]" faction-image-url)
+                 (not faction-image-url-failed))
         (case print-character-sheet-style?
           1 (pdf/draw-image! doc (pdf/get-page doc 1) faction-image-url 5.88 2.4 1.905 1.52)
           2 (pdf/draw-image! doc (pdf/get-page doc 1) faction-image-url 5.88 2.4 1.905 1.52)
           3 (pdf/draw-image! doc (pdf/get-page doc 1) faction-image-url 5.88 2.0 1.905 1.52)
-          4 ()))
+          4 nil))
       (.save doc output))
     (let [a (.toByteArray output)]
       {:status 200
@@ -607,7 +640,7 @@
 (defn default-image-url [host]
   (str "http://" host "/image/dmv-box-logo.png"))
 
-(defn index-page-response [{:keys [headers uri] :as request}
+(defn index-page-response [{:keys [headers uri csp-nonce] :as request}
                            {:keys [title description image-url]}
                            & [response]]
   (let [host (headers "host")]
@@ -620,7 +653,8 @@
        {:url (str "http://" host uri)
         :title (or title default-title)
         :description (or description default-description)
-        :image (or image-url (default-image-url host))}
+        :image (or image-url (default-image-url host))
+        :nonce csp-nonce}
        (= "/" uri))})))
 
 (defn default-index-page [request & [response]]
@@ -1171,7 +1205,7 @@
                                                 verification-key)
                 {:status 200 :body {:pending-email new-email}}
                 (catch Throwable e
-                  (prn "Email send failed, rolling back pending state:" (.getMessage e))
+                  (errors/log-error "ERROR:" (str "Email send failed, rolling back pending state: " (.getMessage e)))
                   ;; Full rollback: retract all attributes set by the failed attempt
                   @(d/transact conn [[:db/retract id :orcpub.user/pending-email new-email]
                                      [:db/retract id :orcpub.user/verification-key verification-key]
diff --git a/src/clj/orcpub/routes/folder.clj b/src/clj/orcpub/routes/folder.clj
index f04f28992..914fd3512 100644
--- a/src/clj/orcpub/routes/folder.clj
+++ b/src/clj/orcpub/routes/folder.clj
@@ -1,17 +1,22 @@
 (ns orcpub.routes.folder
-  (:require [datomic.api :as d]
+  (:require [clojure.string]
+            [datomic.api :as d]
             [orcpub.dnd.e5.folder :as folder]
             [orcpub.entity.strict :as se]))
 
 (def pull-folder
   [:db/id ::folder/name {::folder/character-ids [:db/id ::se/owner ::se/summary]}])
 
-(defn create-folder [{:keys [conn identity] folder-data :transit-params}]
-  ;; Whitelist only ::folder/name from client data; owner is always server-set
+(defn create-folder
+  "Creates a new folder owned by the authenticated user."
+  [{:keys [conn identity] folder-data :transit-params}]
   (let [username (:user identity)
-        result @(d/transact conn [{::folder/name (::folder/name folder-data)
+        folder-name (or (::folder/name folder-data) "New Folder")
+        tempid "new-folder"
+        result @(d/transact conn [{:db/id tempid
+                                   ::folder/name folder-name
                                    ::folder/owner username}])
-        new-id (-> result :tempids first val)]
+        new-id (d/resolve-tempid (d/db conn) (:tempids result) tempid)]
     {:status 200 :body (d/pull (d/db conn) '[*] new-id)}))
 
 (defn folders [{:keys [db identity]}]
@@ -29,11 +34,16 @@
                     result)]
     {:status 200 :body mapped}))
 
-(defn update-folder-name [{:keys [conn]
-                           folder-name :transit-params
-                           {:keys [id]} :path-params}]
-  @(d/transact conn [{:db/id id ::folder/name folder-name}])
-  {:status 200 :body (d/pull (d/db conn) pull-folder id)})
+(defn update-folder-name
+  "Renames a folder. Rejects blank names."
+  [{:keys [conn]
+    folder-name :transit-params
+    {:keys [id]} :path-params}]
+  (let [trimmed (clojure.string/trim (str folder-name))]
+    (if (clojure.string/blank? trimmed)
+      {:status 400 :body {:message "Folder name cannot be blank"}}
+      (do @(d/transact conn [{:db/id id ::folder/name trimmed}])
+          {:status 200 :body (d/pull (d/db conn) pull-folder id)}))))
 
 (defn add-character [{:keys [db conn]
                       character-id :transit-params
diff --git a/src/clj/orcpub/security.clj b/src/clj/orcpub/security.clj
index e1207304a..35b8966cc 100644
--- a/src/clj/orcpub/security.clj
+++ b/src/clj/orcpub/security.clj
@@ -1,5 +1,7 @@
 (ns orcpub.security
-  (:require [clj-time.core :as t :refer [ago minutes]]))
+  "Login attempt tracking and rate limiting.
+   See orcpub.time for date/time utilities."
+  (:require [orcpub.time :as time :refer [minutes ago]]))
 
 (defn compare-dates [attempt-1 attempt-2]
   (compare (:date attempt-1) (:date attempt-2)))
@@ -10,7 +12,7 @@
 (def failed-login-attempts-by-ip
   (atom {}))
 
-(defn threshold  []
+(defn threshold []
   (-> 1 minutes ago))
 
 (defn remove-old [attempts threshold-date]
@@ -31,7 +33,7 @@
 (defn add-failed-login-attempt! [username ip]
   (let [attempt {:user username
                  :ip ip
-                 :date (t/now)}]
+                 :date (time/now)}]
     (swap! failed-login-attempts-by-username
            #(add-and-remove-old username attempt % (threshold)))
     (swap! failed-login-attempts-by-ip
@@ -62,7 +64,9 @@
 (defn multiple-account-access-aux [ip attempts-by-ip]
   (some-> ip
           attempts-by-ip
-          (subseq > (-> 1 minutes ago))
+          ;; Filter attempts newer than 1 minute ago.
+          ;; Uses {:date ...} map because sorted-set compares by :date field.
+          (subseq > {:date (-> 1 minutes ago)})
           usernames-for-attempts
           count
           (>= 5)))
@@ -75,7 +79,9 @@
 (defn multiple-ip-attempts-to-same-account-aux [username attempts-by-username]
   (some-> username
           attempts-by-username
-          (subseq > (-> 1 minutes ago))
+          ;; Filter attempts newer than 1 minute ago.
+          ;; Uses {:date ...} map because sorted-set compares by :date field.
+          (subseq > {:date (-> 1 minutes ago)})
           ips-for-attempts
           count
           (>= 3)))
diff --git a/src/clj/orcpub/styles/core.clj b/src/clj/orcpub/styles/core.clj
index 33af9aa84..5ffbf7cbc 100644
--- a/src/clj/orcpub/styles/core.clj
+++ b/src/clj/orcpub/styles/core.clj
@@ -534,6 +534,13 @@
    [:.bg-green
     {:background-color "#70a800"}]
 
+   [:.message
+    {:padding "10px"
+     :border-radius "5px"
+     :display :flex
+     :justify-content :space-between
+     :color :white}]
+
    ;; Warning/alert styles
    [:.bg-warning
     {:background-color "rgba(240, 161, 0, 0.1)"
@@ -550,7 +557,7 @@
    [:.no-appearance
     (handle-browsers :appearance :none)]])
 
-(def xs-min "0")
+#_(def xs-min "0")
 (def sm-min "768px")
 (def sm-max "991px")
 (def md-max "1199px")
@@ -566,11 +573,8 @@
 (def md-query
   {:min-width md-min :max-width md-max})
 
-(def sm-or-md-query
-  {:min-width sm-min :max-width md-max})
-
-(def xs-or-sm-query
-  {:min-width xs-min :max-width sm-max})
+#_(def ^:private sm-or-md-query
+    {:min-width sm-min :max-width md-max})
 
 
 (def lg-min "1200px")
@@ -895,6 +899,15 @@
      {:width "785px"
       :min-height "600px"}]
 
+    [:.login-form-inputs
+     {:max-width "350px"
+      :margin-left :auto
+      :margin-right :auto
+      :margin-top "50px"}
+     [:input
+      {:width "100%"
+       :box-sizing :border-box}]]
+
     [:.registration-input
      {:min-width "438px"}]
 
@@ -1262,6 +1275,11 @@
       :justify-content :space-between
       :align-items :center}]
 
+    ;; Prevent horizontal scroll caused by fixed-position elements
+    ;; spanning full viewport width when vertical scrollbar is present.
+    [:.app
+     {:overflow-x :hidden}]
+
     [:.app.light-theme
      {:background-image "linear-gradient(182deg, #FFFFFF, #DDDDDD)"}
 
diff --git a/src/clj/orcpub/system.clj b/src/clj/orcpub/system.clj
index 3101128de..d6e121b3e 100644
--- a/src/clj/orcpub/system.clj
+++ b/src/clj/orcpub/system.clj
@@ -5,6 +5,7 @@
             [orcpub.pedestal :as pedestal]                         
             [orcpub.routes :as routes]
             [orcpub.datomic :as datomic]
+            [orcpub.config :as config]
             [environ.core :as environ])
   (:import (org.eclipse.jetty.server.handler.gzip GzipHandler)))
 
@@ -16,11 +17,17 @@
    ;;  we can use this to set the routes to be reloadable
    ::http/routes #(deref #'routes/routes)
    ;; all origins are allowed in dev mode
-   ::http/allowed-origins {:creds true :allowed-origins (constantly true)}})
+   ::http/allowed-origins {:creds true :allowed-origins (constantly true)}
+   ;; CSP now enabled in dev mode too (catches issues early).
+   ;; Uses same config as prod - nonce-interceptor handles strict mode dynamically.
+   ;; See orcpub.config/get-secure-headers-config
+   })
 
 (def prod-service-map
   {::http/routes routes/routes
    ::http/type :jetty
+   ;; Pedestal 0.7+ requires explicit interceptor coercion for maps/functions
+   ::http/enable-session false  ; Disable default session handling if not needed
    ::http/port (let [port-str (System/getenv "PORT")]
                  (when port-str
                    (try
@@ -32,6 +39,9 @@
                                        e))))))
    ::http/join false
    ::http/resource-path "/public"
+   ;; CSP configured via CSP_POLICY env var (strict|permissive|none)
+   ;; See orcpub.config for details
+   ::http/secure-headers (config/get-secure-headers-config)
    ::http/container-options {:context-configurator (fn [c]
                                                      (let [gzip-handler (GzipHandler.)]
                                                        (.setGzipHandler c gzip-handler)
@@ -41,11 +51,7 @@
   (component/system-map
     :conn
     (datomic/new-datomic
-      (if-let [datomic-url (:datomic-url environ/env)]
-        (str datomic-url)
-        (when true #_(= :dev env)
-          (println "WARN: no :datomic-url environment variable set; using local dev")
-          "datomic:free://localhost:4334/orcpub?password=datomic")))
+      (config/get-datomic-uri))
 
     :service-map
     (cond-> (merge
diff --git a/src/clj/orcpub/time.clj b/src/clj/orcpub/time.clj
new file mode 100644
index 000000000..8863dcc05
--- /dev/null
+++ b/src/clj/orcpub/time.clj
@@ -0,0 +1,177 @@
+(ns orcpub.time
+  "Date/Time utilities providing clj-time-compatible readable syntax.
+   
+   =============================================================================
+   MIGRATION NOTES
+   =============================================================================
+   
+   This namespace provides helper functions to preserve clj-time's readable
+   threading syntax after migrating from clj-time 0.15.0 to clojure.java-time
+   1.4.2 (January 2026).
+   
+   clj-time (built on Joda-Time) is no longer maintained. clojure.java-time
+   wraps java.time (JSR-310), the modern Java date/time API.
+   
+   WHAT THIS NAMESPACE PROVIDES:
+   
+   Duration constructors (for use with threading macros):
+     - (seconds n)  → java.time.Duration
+     - (minutes n)  → java.time.Duration  
+     - (hours n)    → java.time.Duration
+     - (millis n)   → java.time.Duration
+     - (days n)     → java.time.Duration
+   
+   Relative time functions:
+     - (ago duration)      → java.time.Instant (past)
+     - (from-now duration) → java.time.Instant (future)
+     - (now)               → java.time.Instant (current)
+   
+   Comparison functions:
+     - (before? a b) → boolean
+     - (after? a b)  → boolean
+   
+   USAGE EXAMPLES:
+   
+     ;; Get an instant 1 minute in the past
+     (-> 1 minutes ago)
+     
+     ;; Get an instant 24 hours in the future
+     (-> 24 hours from-now)
+     
+     ;; Get an instant 30 seconds ago
+     (-> 30 seconds ago)
+     
+     ;; Current instant
+     (now)
+     
+     ;; Check if timestamp is older than 24 hours
+     (before? (instant some-date) (-> 24 hours ago))
+   
+   HOW IT WORKS:
+   
+     1. (minutes 1) returns a java.time.Duration of 1 minute
+     2. (ago duration) subtracts that duration from the current instant
+     3. The threading macro (-> 1 minutes ago) chains: 1 → (minutes 1) → (ago ...)
+   
+   FUTURE CONSIDERATION:
+   
+   If cross-platform (CLJ + CLJS) date/time code is needed, consider migrating
+   to cljc.java-time or juxt/tick, which work in both environments. Currently:
+     - Server (src/clj): Uses this namespace (clojure.java-time)
+     - Client (src/cljs): Uses cljs-time (stale but functional)
+   
+   See UPGRADE_PLAN.md for full migration details.
+   =============================================================================
+   "
+  (:require [java-time.api :as t]))
+
+;; =============================================================================
+;; Duration Constructors
+;; =============================================================================
+;; These return java.time.Duration objects for use with `ago` and `from-now`.
+;; Designed for readable threading: (-> n unit ago)
+
+(defn seconds
+  "Returns a Duration of n seconds.
+   Usage: (-> 30 seconds ago) or (-> 5 seconds from-now)"
+  [n]
+  (t/seconds n))
+
+(defn minutes
+  "Returns a Duration of n minutes.
+   Usage: (-> 5 minutes ago) or (-> 10 minutes from-now)"
+  [n]
+  (t/minutes n))
+
+(defn hours
+  "Returns a Duration of n hours.
+   Usage: (-> 24 hours ago) or (-> 1 hours from-now)"
+  [n]
+  (t/hours n))
+
+(defn millis
+  "Returns a Duration of n milliseconds.
+   Usage: (-> 500 millis ago)"
+  [n]
+  (t/millis n))
+
+(defn days
+  "Returns a Duration of n days.
+   Usage: (-> 7 days ago) or (-> 30 days from-now)"
+  [n]
+  (t/days n))
+
+;; =============================================================================
+;; Relative Time Functions
+;; =============================================================================
+
+(defn now
+  "Returns the current instant (java.time.Instant).
+   Equivalent to clj-time's (t/now)."
+  []
+  (t/instant))
+
+(defn ago
+  "Subtracts a duration from the current instant.
+   Usage: (-> 1 minutes ago) returns an Instant 1 minute in the past.
+   
+   Can also be called directly: (ago (minutes 5))"
+  [duration]
+  (t/minus (t/instant) duration))
+
+(defn from-now
+  "Adds a duration to the current instant.
+   Usage: (-> 1 hours from-now) returns an Instant 1 hour in the future.
+   
+   Can also be called directly: (from-now (hours 24))"
+  [duration]
+  (t/plus (t/instant) duration))
+
+;; =============================================================================
+;; Instant Coercion
+;; =============================================================================
+
+(defn instant
+  "Coerces a value to a java.time.Instant.
+   - If no argument, returns current instant (same as `now`)
+   - If given a java.util.Date, converts it
+   - If given an Instant, returns it unchanged
+   - If given a long (epoch millis), converts it
+   
+   Useful for comparing dates from Datomic (which returns java.util.Date)."
+  ([]
+   (t/instant))
+  ([x]
+   (t/instant x)))
+
+;; =============================================================================
+;; Comparison Functions
+;; =============================================================================
+
+(defn before?
+  "Returns true if instant a is before instant b.
+   Works with any instant-coercible values (Instant, Date, epoch millis)."
+  [a b]
+  (t/before? (t/instant a) (t/instant b)))
+
+(defn after?
+  "Returns true if instant a is after instant b.
+   Works with any instant-coercible values (Instant, Date, epoch millis)."
+  [a b]
+  (t/after? (t/instant a) (t/instant b)))
+
+;; =============================================================================
+;; Duration Arithmetic (for advanced use)
+;; =============================================================================
+
+(defn plus
+  "Adds a duration to an instant.
+   Usage: (plus (now) (hours 24))"
+  [instant duration]
+  (t/plus instant duration))
+
+(defn minus
+  "Subtracts a duration from an instant.
+   Usage: (minus (now) (hours 24))"
+  [instant duration]
+  (t/minus instant duration))
diff --git a/src/cljc/orcpub/common.cljc b/src/cljc/orcpub/common.cljc
index 3f968357d..572a0ff6d 100644
--- a/src/cljc/orcpub/common.cljc
+++ b/src/cljc/orcpub/common.cljc
@@ -36,7 +36,7 @@
 (defn map-by-id [values]
   (map-by :db/id values))
 
-;; dead — zero callers
+;; dead — zero callers (only ref is in #_ discarded views.cljs block)
 #_(defmacro ptime [message body]
   `(do (prn ~message)
        (time ~body)))
@@ -171,7 +171,7 @@
 
 (def rounds-per-minute 10)
 (def minutes-per-hour 60)
-;; dead — redefined in views.cljs, never used from common
+;; dead — redefined in views.cljs (also dead there), never referenced from common
 #_(def hours-per-day 24)
 
 (def rounds-per-hour (* minutes-per-hour rounds-per-minute))
@@ -204,18 +204,11 @@
 
 ;; Case Insensitive `sort-by`
 (defn aloof-sort-by [sorter coll]
-  (sort-by (fn [x]
-             (let [v (sorter x)]
-               (cond
-                 (string? v) (s/lower-case v)
-                 (nil? v) ""
-                 :else (s/lower-case (str v)))))
-           coll)
+  (sort-by (comp s/lower-case sorter) coll)
   )
 
 (defn ->kebab-case [s]
-  (when (string? s)
-    (-> s
-        ;; Insert hyphen before each capital letter, but not at the start.
-        (s/replace #"([A-Z])" "-$1")
-        (s/lower-case))))
+  (-> s
+      ;; Insert hyphen before each capital letter, but not at the start.
+      (s/replace #"([A-Z])" "-$1")
+      .toLowerCase))
diff --git a/src/cljc/orcpub/components.cljc b/src/cljc/orcpub/components.cljc
index d4971590d..eecbb3277 100644
--- a/src/cljc/orcpub/components.cljc
+++ b/src/cljc/orcpub/components.cljc
@@ -4,7 +4,7 @@
 
 (defn checkbox [selected? disable?]
   [:i.fa.fa-check.f-s-14.bg-white.b-color-gray.orange-shadow.pointer.b-1
-   {:class-name (str (if selected? "black slight-text-shadow" "white transparent")
+   {:class (str (if selected? "black slight-text-shadow" "white transparent")
                      " "
                      (when disable?
                        "opacity-5"))}])
@@ -48,28 +48,28 @@
    (for [{:keys [key name]} values]
      ^{:key key} [selection-item key name])])
 
-(defn input-field []
-  (let [state (atom {:timeout nil
-                     :temp-val nil})]
+(defn input-field
+  "Dispatches on-change on every keystroke. Build debounce lives in
+   the :built-character subscription, not here. Local atom buffers the
+   typed value so React doesn't flicker before re-frame catches up."
+  []
+  (let [local-val (atom nil)
+        prev      (atom nil)]
     (fn [type value on-change attrs]
+      ;; Subscription caught up — clear local override
+      (when (not= value @prev)
+        (reset! prev value)
+        (reset! local-val nil))
       [type
        (merge
         attrs
-        {:value (or (:temp-val @state) value "")
+        {:value (or @local-val value "")
          :on-click #(.stopPropagation %)
-         :on-change (fn [e] #?(:cljs
-                               (swap! state
-                                      (fn [{:keys [timeout temp-val] :as s}]
-                                        (when timeout
-                                          (js/clearTimeout timeout))
-                                        (let [v (.. e -target -value)]
-                                          (assoc s
-                                                 :timeout (js/setTimeout
-                                                           (fn []
-                                                             (on-change v)
-                                                             (swap! state dissoc :temp-val))
-                                                           500)
-                                                 :temp-val v))))))})])))
+         :on-change (fn [e]
+                      #?(:cljs
+                         (let [v (.. e -target -value)]
+                           (reset! local-val v)
+                           (on-change v))))})])))
 
 (defn int-field [value on-change attrs]
   [input-field
diff --git a/src/cljc/orcpub/dnd/e5/character.cljc b/src/cljc/orcpub/dnd/e5/character.cljc
index 9605fdd24..f7de74edb 100644
--- a/src/cljc/orcpub/dnd/e5/character.cljc
+++ b/src/cljc/orcpub/dnd/e5/character.cljc
@@ -126,7 +126,7 @@
                      %))
     raw-character))
 
-;; dead — only caller was add-namespaces
+;; dead — only caller (add-namespaces) is #_ discarded
 #_(defn add-equipment-namespaces [raw-character]
   (-> (reduce
        add-equipment-namespace
@@ -146,7 +146,7 @@
                 ::wis (or n-wis wis)
                 ::cha (or n-cha cha)})))
 
-;; dead — only caller was add-namespaces
+;; dead — only caller (add-namespaces) is #_ discarded
 #_(defn add-namespaces-to-values [raw-character]
   (if (seq (::entity/values raw-character))
     (update raw-character
@@ -157,7 +157,7 @@
                values)))
     raw-character))
 
-;; dead — zero live callers (cascade: add-equipment-namespaces, add-namespaces-to-values)
+;; dead — zero callers
 #_(defn add-namespaces [raw-character]
   (-> raw-character
       add-equipment-namespaces
@@ -602,7 +602,7 @@
 (defn save-bonuses [built-char]
   (get-prop built-char :save-bonuses))
 
-;; dead — zero callers
+;; dead — zero callers (views.cljs option-saving-throw-advantages is unrelated)
 #_(defn saving-throw-advantages [built-char]
   (get-prop built-char :saving-throw-advantage))
 
@@ -738,7 +738,7 @@
 (defn dual-wield-weapon-fn [built-char]
   (get-prop built-char :dual-wield-weapon?))
 
-;; dead — zero callers
+;; dead — zero callers (pdf_spec.cljc computes armor class inline)
 #_(defn max-armor-class [unarmored-armor-class
                        ac-with-armor-fn
                        all-armor-inventory
diff --git a/src/cljc/orcpub/dnd/e5/classes.cljc b/src/cljc/orcpub/dnd/e5/classes.cljc
index 614fbfdfa..814712152 100644
--- a/src/cljc/orcpub/dnd/e5/classes.cljc
+++ b/src/cljc/orcpub/dnd/e5/classes.cljc
@@ -13,7 +13,6 @@
             [orcpub.dnd.e5.spells :as spells5e]
             [orcpub.dnd.e5.spell-lists :as sl5e]
             [orcpub.dnd.e5.template-base :as t-base]
-            [re-frame.core :refer [subscribe]]
             [clojure.string :as s]))
 
 (spec/def ::name (spec/and string? common/starts-with-letter?))
@@ -371,7 +370,7 @@
                                                :page 55
                                                :summary "make a weapon attack when you use your action to cast a bard spell"})]}}}]}))
 
-;; dead — only called from #_ discarded block
+;; dead — only called from #_ discarded block at line 527
 #_(defn blessings-of-knowledge-skill [skill-name]
   (let [skill-kw (common/name-to-kw skill-name)]
     (t/option-cfg
@@ -1060,7 +1059,7 @@
             :skill-options {:choose 2 :options {:acrobatics true :animal-handling true :athletics true :history true :insight true :intimidation true :perception true :survival true}}}
     :multiclass-prereqs [(t/option-prereq "Requires Strength 13 or Dexterity 13"
                                           (fn [c]
-                                            (let [abilities @(subscribe [::char5e/abilities nil c])]
+                                            (let [abilities (char5e/ability-values c)]
                                               (or (>= (::char5e/str abilities) 13)
                                                   (>= (::char5e/dex abilities) 13)))))]
     :equipment-choices [{:name "Equipment Pack"
@@ -1239,7 +1238,7 @@
              :skill-options {:choose 2 :options {:acrobatics true :athletics true :history true :insight true :religion true :stealth true}}}
      :multiclass-prereqs [(t/option-prereq "Requires Wisdom 13 and Dexterity 13"
                                            (fn [c]
-                                             (let [abilities @(subscribe [::char5e/abilities nil c])]
+                                             (let [abilities (char5e/ability-values c)]
                                                (and (>= (::char5e/wis abilities) 13)
                                                     (>= (::char5e/dex abilities) 13)))))]
      :equipment-choices [{:name "Equipment Pack"
@@ -1440,7 +1439,7 @@
              :skill-options {:choose 2 :options {:athletics true :insight true :intimidation true :medicine true :persuasion true :religion true}}}
      :multiclass-prereqs [(t/option-prereq "Requires Strength 13 and Charisma 13"
                                            (fn [c]
-                                             (let [abilities @(subscribe [::char5e/abilities nil c])]
+                                             (let [abilities (char5e/ability-values c)]
                                                (and (>= (::char5e/str abilities) 13)
                                                     (>= (::char5e/cha abilities) 13)))))]
      :equipment-choices [{:name "Equipment Pack"
@@ -1781,7 +1780,7 @@
              :multiclass-skill-options {:choose 1 :options opt5e/ranger-skills}}
      :multiclass-prereqs [(t/option-prereq "Requires Wisdom 13 and Dexterity 13"
                                            (fn [c]
-                                             (let [abilities @(subscribe [::char5e/abilities nil c])]
+                                             (let [abilities (char5e/ability-values c)]
                                                (and (>= (::char5e/wis abilities) 13)
                                                     (>= (::char5e/dex abilities) 13)))))]
      :ability-increase-levels [4 8 12 16 19]
@@ -2344,7 +2343,7 @@
                     :prereqs [(t/option-prereq
                                nil
                                (fn [c]
-                                 (let [spells-known @(subscribe [::char5e/spells-known nil c])]
+                                 (let [spells-known (char5e/spells-known c)]
                                    (get-in spells-known [level ["Wizard" spell-kw]])))
                                true)]})))
               (get-in sl5e/spell-lists [:wizard level]))}))
@@ -2365,7 +2364,7 @@
                     :prereqs [(t/option-prereq
                                nil
                                (fn [c]
-                                 (let [spells-known @(subscribe [::char5e/spells-known nil c])]
+                                 (let [spells-known (char5e/spells-known c)]
                                    (get-in spells-known [3 ["Wizard" spell-kw]])))
                                true)]})))
               (get-in sl5e/spell-lists [:wizard 3]))}))
@@ -2541,7 +2540,7 @@
                                    :tags (opt5e/spell-tags :wizard 0)
                                    :options (opt5e/spell-options (get-in sl/spell-lists [:wizard 0]) ::char5e/int "Wizard")
                                    :prereq-fn (fn [c]
-                                                (let [spells-known @(subscribe [::char5e/spells-known nil c])
+                                                (let [spells-known (char5e/spells-known c)
                                                       passes? (or (nil? spells-known)
                                                                   (some
                                                                    (fn [s]
diff --git a/src/cljc/orcpub/dnd/e5/compute.cljc b/src/cljc/orcpub/dnd/e5/compute.cljc
new file mode 100644
index 000000000..7aa8fc083
--- /dev/null
+++ b/src/cljc/orcpub/dnd/e5/compute.cljc
@@ -0,0 +1,84 @@
+(ns ^{:doc "Pure computation helpers that replicate subscription chains for use
+     in event handlers. Avoids @(subscribe ...) outside reactive context.
+     Extracted from events.cljs so they can be tested as .cljc (JVM + CLJS)."}
+  orcpub.dnd.e5.compute
+  (:require [orcpub.common :as common]
+            [orcpub.dnd.e5 :as e5]
+            [orcpub.dnd.e5.spells :as spells]
+            [orcpub.dnd.e5.magic-items :as mi]
+            [clojure.string :as s]))
+
+(defn compute-plugin-vals
+  "Filters out disabled plugins and disabled entries within plugins.
+   Replicates ::e5/plugin-vals subscription."
+  [plugins]
+  (map
+   (fn [p]
+     (into
+      {}
+      (map
+       (fn [[type-k type-m]]
+         [type-k
+          (if (coll? type-m)
+            (into
+             {}
+             (remove
+              (fn [[_k {:keys [disabled?]}]]
+                disabled?)
+              type-m))
+            type-m)])
+       p)))
+   (filter (comp not :disabled?)
+           (vals plugins))))
+
+(defn compute-sorted-spells
+  "Computes sorted spells from db. Replicates the chain:
+   ::e5/plugins -> ::e5/plugin-vals -> ::spells5e/plugin-spells ->
+   ::spells5e/spells -> ::char5e/sorted-spells."
+  [db]
+  (let [plugins (get db :plugins)
+        plugin-vals (compute-plugin-vals plugins)
+        plugin-spells (map
+                       (fn [spell]
+                         (assoc spell :edit-event [::spells/edit-spell spell]))
+                       (mapcat (comp vals ::e5/spells) plugin-vals))
+        all-spells (into
+                    (sorted-set-by (fn [x y] (compare (:key x) (:key y))))
+                    (concat
+                     (reverse plugin-spells)
+                     spells/spells))]
+    (common/aloof-sort-by :name all-spells)))
+
+(def ^:private sorted-static-items
+  "Pre-sorted static magic items. Mirrors equipment_subs/sorted-items delay."
+  (delay (sort-by mi/name-key mi/magic-items)))
+
+(defn compute-sorted-items
+  "Computes sorted items from db. Replicates the chain:
+   ::mi5e/custom-items -> ::mi5e/expanded-custom-items -> ::char5e/sorted-items."
+  [db]
+  (let [custom-items (get db ::mi/custom-items [])
+        expanded (mi/expand-magic-items custom-items)]
+    (concat expanded @sorted-static-items)))
+
+(defn filter-by-name-xform
+  "Returns a transducer that filters items by name matching filter-text."
+  [filter-text name-key]
+  (let [pattern (re-pattern (str ".*" (s/lower-case filter-text) ".*"))]
+    (filter
+     (fn [x]
+       (re-matches pattern (s/lower-case (name-key x)))))))
+
+(defn filter-spells
+  "Filters and sorts spells whose :name matches filter-text."
+  [filter-text sorted-spells]
+  (sort-by
+   :name
+   (sequence (filter-by-name-xform filter-text :name) sorted-spells)))
+
+(defn filter-items
+  "Filters and sorts items whose ::mi/name matches filter-text."
+  [filter-text sorted-items]
+  (sort-by
+   mi/name-key
+   (sequence (filter-by-name-xform filter-text mi/name-key) sorted-items)))
diff --git a/src/cljc/orcpub/dnd/e5/display.cljc b/src/cljc/orcpub/dnd/e5/display.cljc
index 4294ace60..4b58782cb 100644
--- a/src/cljc/orcpub/dnd/e5/display.cljc
+++ b/src/cljc/orcpub/dnd/e5/display.cljc
@@ -71,14 +71,15 @@
         equipment-kw
         (common/kw-to-name equipment-kw true))))
 
-(defn unit-amount-description [{:keys [units amount singular plural] :or {amount 1 plural (plural-map units)}}]
-  (str amount " " (if (not= 1 amount)
-                    (if plural
-                      (common/safe-name plural)
-                      (str (common/safe-name units) "s"))
-                    (if singular
-                      (common/safe-name singular)
-                      (str (common/safe-name units))))))
+(defn unit-amount-description [{:keys [units amount singular plural] :or {amount 1}}]
+  (let [plural (or plural (plural-map units))]
+    (str amount " " (if (not= 1 amount)
+                      (if plural
+                        (common/safe-name plural)
+                        (str (common/safe-name units) "s"))
+                      (if singular
+                        (common/safe-name singular)
+                        (str (common/safe-name units)))))))
 
 (defn duration-description [{:keys [concentration] :as duration}]
   (str (when concentration "conc. ") (unit-amount-description duration)))
diff --git a/src/cljc/orcpub/dnd/e5/event_utils.cljc b/src/cljc/orcpub/dnd/e5/event_utils.cljc
new file mode 100644
index 000000000..e18f80ae3
--- /dev/null
+++ b/src/cljc/orcpub/dnd/e5/event_utils.cljc
@@ -0,0 +1,97 @@
+(ns ^{:doc "Shared utility functions used by both event handlers and subscription
+     files. Extracted from events.cljs to break the circular dependency:
+     subs.cljs -> events.cljs -> (can't import subs.cljs)."}
+  orcpub.dnd.e5.event-utils
+  (:require [orcpub.modifiers :as mod]
+            [orcpub.route-map :as routes]
+            [clojure.string :as s]
+            #?(:cljs [re-frame.core :refer [dispatch]])))
+
+;; -- URL helpers (CLJS-only: depend on js/window.location) --
+
+#?(:cljs
+   (defn backend-url
+     "Rewrites a path to the backend URL in local dev (port 8890)."
+     [path]
+     (if (and js/window.location
+              (s/starts-with? js/window.location.href "http://localhost"))
+       (str "http://localhost:8890" (when (not (s/starts-with? path "/")) "/") path)
+       path)))
+
+#?(:cljs
+   (defn url-for-route
+     "Builds a full backend URL for a bidi route."
+     [route & args]
+     (backend-url (apply routes/path-for route args))))
+
+;; -- Auth --
+
+(defn auth-headers
+  "Returns Authorization header map from db. Handles nil token gracefully."
+  [db]
+  (let [token (-> db :user-data :token)]
+    (if token
+      {"Authorization" (str "Token " token)}
+      {})))
+
+;; -- Error helpers --
+
+(defn show-generic-error
+  "Returns a dispatch vector for the generic error message."
+  []
+  [:show-error-message [:div "There was an error, please refresh your browser and try again."]])
+
+#?(:cljs
+   (defn handle-api-response
+     "Dispatch on HTTP response status with sensible defaults.
+      on-success is called for 200. Options:
+        :on-401  — called on 401 (default: dispatch :route-to-login)
+        :on-500  — called on 500 (default: dispatch show-generic-error)
+        :context — string describing the request, used in console warning for unhandled statuses"
+     [response on-success & {:keys [on-401 on-500 context]}]
+     (case (:status response)
+       200 (on-success)
+       401 (if on-401
+             (on-401)
+             (dispatch [:route-to-login]))
+       500 (if on-500
+             (on-500)
+             (dispatch (show-generic-error)))
+       (js/console.warn "Unhandled HTTP status:" (:status response)
+                        (str "(" (or context "unknown request") ")")))))
+
+;; -- Modifier config --
+
+(defn mod-cfg
+  "Builds a modifier config map."
+  [key & args]
+  {::mod/key key
+   ::mod/args args})
+
+(defmulti mod-key
+  "Extracts a comparison key from a modifier config."
+  (fn [{:keys [::mod/key ::mod/args] :as item}]
+    key))
+
+(defmethod mod-key :ability [{:keys [::mod/key ::mod/args]}]
+  [key (first args)])
+
+(defmethod mod-key :ability-override [{:keys [::mod/key ::mod/args]}]
+  [key (first args)])
+
+(defmethod mod-key :default [{:keys [::mod/key ::mod/args]}]
+  [key args])
+
+(defn compare-mod-keys
+  "Comparator for modifier configs, used by sorted-set."
+  [item-1 item-2]
+  (compare (mod-key item-1)
+           (mod-key item-2)))
+
+(defn default-mod-set
+  "Ensures a modifier set is a sorted-set ordered by compare-mod-keys."
+  [mod-set]
+  (if (and (set? mod-set)
+           (sorted? mod-set))
+    mod-set
+    (into (sorted-set-by compare-mod-keys) mod-set)))
diff --git a/src/cljc/orcpub/dnd/e5/magic_items.cljc b/src/cljc/orcpub/dnd/e5/magic_items.cljc
index 96d321336..4b75e9de5 100644
--- a/src/cljc/orcpub/dnd/e5/magic_items.cljc
+++ b/src/cljc/orcpub/dnd/e5/magic_items.cljc
@@ -3092,10 +3092,22 @@ The boots regain 2 hours of flying capability for every 12 hours they aren’t i
 (def magic-weapon-map
   (common/map-by-key magic-weapons))
 
+(defn compute-all-weapons-map
+  "Compute merged weapons map: static PHB + static magic + custom magic.
+   custom-items are raw user-imported items (pre-expansion).
+   SSOT for weapon lookup — called by both subscriptions and modifier
+   condition code."
+  [custom-items]
+  (let [expanded (expand-magic-items custom-items)
+        all-items (concat expanded magic-items)
+        all-magic-weapons (sequence magic-weapon-xform all-items)
+        magic-weapon-lookup (common/map-by-key all-magic-weapons)]
+    (merge magic-weapon-lookup weapons5e/weapons-map)))
+
 (def all-weapons-map
-  (merge
-   weapons5e/weapons-map
-   magic-weapon-map))
+  "Static weapons map (no custom items). Use compute-all-weapons-map
+   when custom items may be present."
+  (compute-all-weapons-map nil))
 
 (def magic-armor-xform
   (filter
diff --git a/src/cljc/orcpub/dnd/e5/options.cljc b/src/cljc/orcpub/dnd/e5/options.cljc
index 9cb80a18f..6b6c5ef01 100644
--- a/src/cljc/orcpub/dnd/e5/options.cljc
+++ b/src/cljc/orcpub/dnd/e5/options.cljc
@@ -22,7 +22,8 @@
             [orcpub.dnd.e5.magic-items :as mi]
             [orcpub.dnd.e5.event-handlers :as eh]
             [orcpub.components :as comps]
-            [re-frame.core :refer [dispatch subscribe]])
+            [re-frame.core :refer [dispatch subscribe]]
+            [re-frame.db])
   #?(:cljs (:require-macros [orcpub.dnd.e5.modifiers :as modifiers])))
 
 #?(:cljs (enable-console-print!))
@@ -32,8 +33,8 @@
 
 (def xps [0 300 900 2700 6500 14000 23000 34000 48000 64000 85000 100000 120000 140000 165000 195000 225000 265000 305000 355000])
 
-;; unreferenced — xps is used directly elsewhere
-#_(def levels
+#_ ;; unreferenced — xps is used directly elsewhere
+(def levels
   (map-indexed
    (fn [i xp] {:level (inc i) :min-xp xp})
    xps))
@@ -147,7 +148,7 @@
     :prereqs [(t/option-prereq
                "You already have this skill"
                (fn [c]
-                 (let [skill-profs @(subscribe [::character/skill-profs nil c])]
+                 (let [skill-profs (character/skill-proficiencies c)]
                    (not (get skill-profs (:key skill))))))]
     :modifiers [(modifiers/skill-proficiency (:key skill))]}))
 
@@ -259,7 +260,7 @@
     :modifiers [(modifiers/deferred-ability-increases)]}))
 
 (defn min-ability [ability-kw min-value]
-  (fn [c] (>= (ability-kw @(subscribe [::character/abilities nil c])) min-value)))
+  (fn [c] (>= (ability-kw (character/ability-values c)) min-value)))
 
 (defn ability-prereq [ability-kw min-value]
   (t/option-prereq (str "Requires " (s/upper-case (name ability-kw)) " " min-value " or higher")
@@ -267,7 +268,7 @@
 
 (defn armor-prereq [armor-kw]
   (t/option-prereq (str "Requires proficiency with " (name armor-kw) " armor")
-                   (fn [c] (let [prof-keys @(subscribe [::character/armor-profs nil c])]
+                   (fn [c] (let [prof-keys (character/armor-proficiencies c)]
                              (boolean (and prof-keys (prof-keys armor-kw)))))))
 
 (def elemental-disciplines
@@ -391,8 +392,9 @@
     :modifiers [(modifiers/language key)]
     :prereqs [(t/option-prereq
                "You already have this language"
-               (fn [c] (not (get @(subscribe [::character/languages nil c]) key))))]}))
+               (fn [c] (not (get (character/languages c) key))))]}))
 
+#_ ;; unreferenced — common/name-to-kw is used instead
 (defn key-to-name [key]
   (s/join " " (map s/capitalize (s/split (name key) #"-"))))
 
@@ -443,7 +445,7 @@
       :help (spell-help spell)
       :prereqs [(t/option-prereq
                  "You already know this spell"
-                 (fn [c] (let [spells-known @(subscribe [::character/spells-known nil c])]
+                 (fn [c] (let [spells-known (character/spells-known c)]
                            (or (not spells-known)
                                (not-any?
                                 (fn [[[_ kw]]]
@@ -824,12 +826,12 @@
                     (map (fn [k]
                            (or (language-map k)
                                (language-map (language-key-corrections k))
-                               {:name (key-to-name k) :key k}))
+                               {:name (common/kw-to-name k true) :key k}))
                          (keys lang-options)))]
     (language-selection-aux languages lang-num)))
 
-;; unreferenced — language-selection and homebrew-language-selection used instead
-#_(defn any-language-selection [language-map & [num]]
+#_ ;; unreferenced — language-selection and homebrew-language-selection used instead
+(defn any-language-selection [language-map & [num]]
   (language-selection-aux (vals language-map) num))
 
 #_(defn maneuver-option [name & [desc]]
@@ -1050,11 +1052,11 @@
 
 (def can-cast-spell-prereq
   (t/option-prereq "Requires the ability to cast at least one spell."
-                   (fn [c] (some (fn [[k v]] (seq v)) @(subscribe [::character/spells-known nil c])))))
+                   (fn [c] (some (fn [[k v]] (seq v)) (character/spells-known c)))))
 
 (defn does-not-have-feat-prereq [kw]
   {::t/label "You already have this feat."
-   ::t/prereq-fn (fn [c] (let [feats @(subscribe [::character/feats nil c])]
+   ::t/prereq-fn (fn [c] (let [feats (character/feats c)]
                            (not (and feats (feats kw)))))})
 
 (defn feat-option [cfg & [multiselect?]]
@@ -1161,7 +1163,8 @@
                 nil
                 [(let [main-hand-weapon ?orcpub.dnd.e5.character/main-hand-weapon
                        off-hand-weapon ?orcpub.dnd.e5.character/off-hand-weapon
-                       all-weapons-map @(subscribe [::mi/all-weapons-map])]
+                       all-weapons-map (mi/compute-all-weapons-map
+                                        (get @re-frame.db/app-db ::mi/custom-items))]
                    (and main-hand-weapon
                         (-> all-weapons-map
                             main-hand-weapon
@@ -1184,15 +1187,24 @@
                    false
                    (?armor-stealth-disadvantage? armor)))))
 
-(defn custom-option-builder [name-sub name-event]
-  [:div.m-t-10
-   [:span "Name"]
-   [comps/input-field
-    :input
-    @(subscribe name-sub)
-    (fn [value]
-      (dispatch (conj name-event value)))
-    {:class-name "input"}]])
+(defn custom-option-builder
+  "Renders a name input that dispatches name-event with the typed value.
+   When inject-template? is true, also passes the built template via dispatch
+   for handlers that need entity/get-option-value-path (set-custom-subclass,
+   set-custom-feat-name)."
+  ([name-sub name-event] (custom-option-builder name-sub name-event false))
+  ([name-sub name-event inject-template?]
+   (let [built-template (when inject-template? @(subscribe [:built-template]))]
+     [:div.m-t-10
+      [:span "Name"]
+      [comps/input-field
+       :input
+       @(subscribe name-sub)
+       (fn [value]
+         (dispatch (cond-> name-event
+                     built-template (conj built-template)
+                     true (conj value))))
+       {:class "input"}]])))
 
 (defn feat-options [spell-lists spells-map]
   [#_(feat-option
@@ -1456,7 +1468,7 @@
                                 (ritual-caster-option :wizard "Wizard" ::character/int sl/spell-lists)]})]
        :prereqs [(t/option-prereq "Requires Intelligence or Wisdom 13 or higher"
                                   (fn [c]
-                                    (let [{:keys [::character/wis ::character/int] :as abilities} @(subscribe [::character/abilities nil c])]
+                                    (let [{:keys [::character/wis ::character/int] :as abilities} (character/ability-values c)]
                                       (or (and wis (>= wis 13))
                                           (and int (>= int 13))))))]})
    #_(feat-option
@@ -1552,7 +1564,8 @@
          :order (inc i)
          :ui-fn #(custom-option-builder
                   [:custom-feat-name [:feats kw]]
-                  [:set-custom-feat-name [:feats kw]])
+                  [:set-custom-feat-name [:feats kw]]
+                  true)
          :selections [(t/selection-cfg
                        {:name "Feat Modifiers"
                         :min 0
@@ -1729,7 +1742,8 @@
                               nil ;vec-mod value ... maybe?
                               [(let [main-hand-weapon ?orcpub.dnd.e5.character/main-hand-weapon
                                      off-hand-weapon ?orcpub.dnd.e5.character/off-hand-weapon
-                                     all-weapons-map @(subscribe [::mi/all-weapons-map])]
+                                     all-weapons-map (mi/compute-all-weapons-map
+                                                      (get @re-frame.db/app-db ::mi/custom-items))]
                                  (and main-hand-weapon
                                       (-> all-weapons-map
                                           main-hand-weapon
@@ -1819,7 +1833,7 @@
                   :modifiers [(modifiers/skill-expertise key)]
                   :prereqs [(t/option-prereq (str "Requires proficiency in " name)
                                              (fn [built-char]
-                                               (let [skill-profs @(subscribe [::character/skill-profs nil built-char])]
+                                               (let [skill-profs (character/skill-proficiencies built-char)]
                                                  (and skill-profs (skill-profs key)))))]}))
               skills/skills)
     :min num
@@ -1963,6 +1977,7 @@
    weapon-proficiencies))
 
 
+#_:clj-kondo/ignore ;; source param shadows outer source — intentional override
 (defn subrace-option [race
                       spell-lists
                       spells-map
@@ -2015,8 +2030,8 @@
                   (traits-modifiers traits nil source)
                   (when source [(modifiers/used-resource source name)]))})))
 
-;; unreferenced — inline (map modifiers/ability ...) used at call sites
-#_(defn ability-modifiers [abilities]
+#_ ;; unreferenced — inline (map modifiers/ability ...) used at call sites
+(defn ability-modifiers [abilities]
   (map
    (fn [[k v]]
      (modifiers/ability k v))
@@ -2056,7 +2071,11 @@
     :order 1001
     :prereqs [(t/option-prereq
                nil
-               (fn [_] @(subscribe [:homebrew? path]))
+               (fn [_]
+                 ;; Read homebrew flag from raw character in app-db;
+                 ;; built entity doesn't carry ::homebrew-paths.
+                 (get-in (:character @re-frame.db/app-db)
+                         [::entity/homebrew-paths path]))
                true)]}))
 
 
@@ -2321,7 +2340,7 @@
         :tags #{:profs :tool-profs}}))))
 
 (defn first-class? [class-kw & [classes]]
-  (fn [c] (= class-kw (first (or classes @(subscribe [::character/classes nil c]))))))
+  (fn [c] (= class-kw (first (or classes (character/classes c))))))
 
 (defn new-starting-equipment-selection [class-kw {:keys [name options] :as cfg}]
   (t/selection-cfg
@@ -2424,7 +2443,7 @@
                                    0
                                    nil
                                    (fn [c]
-                                     (let [skill-profs @(subscribe [::character/skill-profs nil c])
+                                     (let [skill-profs (character/skill-proficiencies c)
                                            skill-sources (get skill-profs skill-kw)
                                            passes? (and skill-sources
                                                         (not (skill-sources background-nm)))]
@@ -2488,8 +2507,8 @@
 
 (defn total-levels-prereq [level & [class-key]]
   (fn [c] (>= (if class-key
-                (@(subscribe [::character/class-level-fn nil c]) class-key)
-                @(subscribe [::character/total-levels nil c]))
+                ((character/class-level-fn c) class-key)
+                (character/total-levels c))
               level)))
 
 (defn total-levels-prereq-2 [level & [class-key]]
@@ -2563,7 +2582,7 @@
                              (fn [selection]
                                (assoc selection
                                       ::t/prereq-fn
-                                      (fn [c] (let [total-levels @(subscribe [::character/total-levels nil c])]
+                                      (fn [c] (let [total-levels (character/total-levels c)]
                                                 (>= lvl total-levels)))))
                              selections))
                           (:selections spellcasting-template))
@@ -2619,8 +2638,8 @@
 (defn level-name [index]
   (str "Level " index))
 
-;; unreferenced — subclass-option builds level options inline
-#_(defn subclass-level-option [{:keys [name
+#_ ;; unreferenced — subclass-option builds level options inline
+(defn subclass-level-option [{:keys [name
                                      levels] :as subcls}
                              kw
                              spellcasting-template
@@ -2662,10 +2681,14 @@
                   :help (str "This option just gives you the average value (" average ") for the die roll (1D" die ").")
                   :modifiers [(modifiers/max-hit-points average)]}))]}))
 
-(defn custom-subclass-builder [path]
+(defn custom-subclass-builder
+  "Renders custom subclass name input. Passes built-template via dispatch
+   because the handler needs entity/get-option-value-path."
+  [path]
   (custom-option-builder
    [:custom-subclass-name path]
-   [:set-custom-subclass path]))
+   [:set-custom-subclass path]
+   true))
 
 #_(defn custom-subclass-spell-selection [ability-kw level]
   (t/selection-cfg
@@ -2679,7 +2702,7 @@
     :tags #{:spells}
     :order level
     :prereq-fn (fn [c] (or (zero? level)
-                           (-> @(subscribe [::character/total-levels nil c])
+                           (-> (character/total-levels c)
                                (total-slots 3)
                                (get level)
                                pos?)))
@@ -2794,7 +2817,7 @@
                       [(assoc
                         (hit-points-selection hit-die name i)
                         ::t/prereq-fn
-                        (fn [c] (or (not (= kw (first @(subscribe [::character/classes nil c]))))
+                        (fn [c] (or (not (= kw (first (character/classes c))))
                                     (> i 1))))])))
       :modifiers (concat
                   (some-> levels (get i) :modifiers)
@@ -2876,7 +2899,7 @@
                                spells-map
                                (assoc spellcasting :class-key kw)
                                merged-class)
-        first-class? (fn [c] (let [first-class (first @(subscribe [::character/classes nil c]))]
+        first-class? (fn [c] (let [first-class (first (character/classes c))]
                                (= kw first-class)))]
     (t/option-cfg
      {:name name
@@ -3076,7 +3099,7 @@
 (defn has-trait-with-name-prereq [name]
   (t/option-prereq
    (str "You must have " name)
-   (fn [c] (some #(= name (:name %)) @(subscribe [::character/traits nil c])))))
+   (fn [c] (some #(= name (:name %)) (character/traits c)))))
 
 (def pact-of-the-tome-prereq
   (has-trait-with-name-prereq pact-of-the-tome-name))
@@ -3091,7 +3114,7 @@
   (t/option-prereq
    "You must know the edritch blast cantrip"
    (fn [c]
-     (get-in @(subscribe [::character/spells-known nil c])
+     (get-in (character/spells-known c)
              [0 ["Warlock" :eldritch-blast]]))))
 
 ;; dead — only called from #_ discarded blocks in template.cljc
@@ -3135,18 +3158,19 @@
                    (into #{} race-nms))]
     (t/option-prereq
      (str (common/list-print name-set "or") " Only")
-     (fn [c] (name-set @(subscribe [::character/race nil c]))))))
+     (fn [c] (name-set (character/race c))))))
 
-(defn subrace-prereq [race-nm subrace-nm]
+;; dead — only called from deprecated ua_race_feats.cljc
+#_(defn subrace-prereq [race-nm subrace-nm]
   (t/option-prereq
    (str subrace-nm " Only")
-   (fn [c] (and (= race-nm @(subscribe [::character/race nil c]))
-                (= subrace-nm @(subscribe [::character/subrace nil c]))))))
+   (fn [c] (and (= race-nm (character/race c))
+                (= subrace-nm (character/subrace c))))))
 
 #_(def deep-gnome-prereq
   (t/option-prereq
    "Deep Gnome only"
-   (fn [c] (let [subrace @(subscribe [::character/subrace nil c])]
+   (fn [c] (let [subrace (character/subrace c)]
              (or (= "Deep Gnome (EE)" subrace)
                  (= "Deep Gnome (SCAG)" subrace))))))
 
@@ -3163,7 +3187,10 @@
                 (modifiers/spells-known 1 :disguise-self ::character/cha "Deep Gnome" 0 "once per long rest")]}))
 
 
-(defn feat-prereqs [prereqs path-prereqs]
+(defn feat-prereqs
+  "Build prereq list for a feat. race-map is a {key->race} lookup
+   threaded from template-selections so we avoid subscribing."
+  [prereqs path-prereqs race-map]
   (concat
    (map
     (fn [prereq]
@@ -3186,8 +3213,7 @@
                       key))
                     race-prereqs)]
      (when (seq race-keys)
-       (let [race-map @(subscribe [::races/race-map])
-             race-names (map (comp :name race-map) race-keys)]
+       (let [race-names (map (comp :name race-map) race-keys)]
          [(race-prereq race-names)])))))
 
 (def filter-true (filter val))
@@ -3362,19 +3388,22 @@
      props)))
 
 
-(defn feat-option-from-cfg [language-map
-                            spells-map
-                            spell-lists
-                            custom-and-standard-weapons
-                            {:keys [name
-                                    key
-                                    icon
-                                    description
-                                    prereqs
-                                    path-prereqs
-                                    props
-                                    ability-increases
-                                    edit-event]}]
+(defn feat-option-from-cfg
+  "Build a feat option. race-map is threaded from template-selections."
+  [language-map
+   spells-map
+   spell-lists
+   custom-and-standard-weapons
+   race-map
+   {:keys [name
+           key
+           icon
+           description
+           prereqs
+           path-prereqs
+           props
+           ability-increases
+           edit-event]}]
   (let [feat-mods (feat-modifiers key
                                   name
                                   description
@@ -3394,7 +3423,7 @@
       :modifiers feat-mods
       :selections feat-selections
       :summary description
-      :prereqs (feat-prereqs prereqs path-prereqs)})))
+      :prereqs (feat-prereqs prereqs path-prereqs race-map)})))
 
 (def draconic-ancestries
   [{:name "Black"
diff --git a/src/cljc/orcpub/dnd/e5/template.cljc b/src/cljc/orcpub/dnd/e5/template.cljc
index 61ba6a017..d5f9cc617 100644
--- a/src/cljc/orcpub/dnd/e5/template.cljc
+++ b/src/cljc/orcpub/dnd/e5/template.cljc
@@ -68,7 +68,7 @@
    Only used for `ability-icons` -- see body of function below."
   [k size theme]
   (let [light-theme? (= "light-theme" theme)]
-    [:img {:class-name (str "h-" size " w-" size (when light-theme? " opacity-7"))
+    [:img {:class (str "h-" size " w-" size (when light-theme? " opacity-7"))
            :src (str (if light-theme? "/image/black/" "/image/") (ability-icons k) ".svg")}]))
 
 ;; dead — ability roller UI superseded by character_builder.cljs
@@ -151,10 +151,10 @@
             [ability-component k v i app-state
              [:div.f-s-16
               [:i.fa.fa-minus-circle.orange
-               {:class-name (when decrease-disabled? "opacity-5 cursor-disabled")
+               {:class (when decrease-disabled? "opacity-5 cursor-disabled")
                 :on-click (fn [_] (when (not decrease-disabled?) (set-ability! app-state k (dec v))))}]
               [:i.fa.fa-plus-circle.orange.m-l-5
-               {:class-name (when increase-disabled? "opacity-5 cursor-disabled")
+               {:class (when increase-disabled? "opacity-5 cursor-disabled")
                 :on-click (fn [_] (when (not increase-disabled?) (set-ability! app-state k (inc v))))}]]]))
         abilities-vec))]]))
 
@@ -1540,9 +1540,10 @@
    (opt5e/feat-selection-2
     {:options (concat
                (opt5e/feat-options spell-lists spells-map)
-               (map
-                (partial opt5e/feat-option-from-cfg language-map spells-map spell-lists custom-and-standard-weapons)
-                feats))
+               (let [race-map (common/map-by-key races)]
+                 (map
+                  (partial opt5e/feat-option-from-cfg language-map spells-map spell-lists custom-and-standard-weapons race-map)
+                  feats)))
      :show-if-zero? true
      :min 0
      :max 0})
diff --git a/src/cljc/orcpub/entity.cljc b/src/cljc/orcpub/entity.cljc
index 4b3c1abe2..9412a8fa0 100644
--- a/src/cljc/orcpub/entity.cljc
+++ b/src/cljc/orcpub/entity.cljc
@@ -135,10 +135,11 @@
    []
    homebrew-paths))
 
-(defn to-strict [{:keys [:db/id ::options ::values ::homebrew-paths]}]
+(defn to-strict [{:keys [:db/id ::options ::values ::homebrew-paths ::owner]}]
   (cond-> {::strict/selections (to-strict-selections options [] homebrew-paths)}
     values (assoc ::strict/values (into {} (remove (comp nil? val)) values))
     id (assoc :db/id id)
+    owner (assoc ::strict/owner owner)              ;; round-trip ::strict/owner via ::owner
     true remove-empty-fields))
 
 (spec/fdef to-strict
@@ -164,18 +165,19 @@
 (defn from-strict-options [options]
   (mapv from-strict-option options))
 
+;; array-map preserves insertion order at any size. The previous reduce/assoc
+;; approach promoted to PersistentHashMap beyond 8 keys, scrambling selection
+;; order during strict round-trips.
 (defn from-strict-selections [selections]
-  (reduce
-   (fn [s {:keys [:db/id ::strict/key ::strict/option ::strict/options]}]
-     (assoc s
-            key
-            (with-meta
-              (if option
-                (from-strict-option option)
-                (from-strict-options options))
-              {:db/id id})))
-   {}
-   selections))
+  (apply array-map
+         (mapcat
+          (fn [{:keys [:db/id ::strict/key ::strict/option ::strict/options]}]
+            [key (with-meta
+                   (if option
+                     (from-strict-option option)
+                     (from-strict-options options))
+                   {:db/id id})])
+          selections)))
 
 (defn from-strict-homebrew-paths [homebrew-paths]
   (reduce
@@ -477,7 +479,10 @@
                  accum-selections)))
       accum-selections)))
 
-(defn remove-disqualified-selections [selections built-char]
+(defn remove-disqualified-selections
+  "Remove selections whose prereq-fn fails against built-char.
+   Callers must provide a real built entity, never nil."
+  [selections built-char]
   (remove #(or (nil? %)
                (let [prereq-fn (::t/prereq-fn %)]
                  (and prereq-fn (not (prereq-fn built-char)))))
@@ -740,10 +745,14 @@
           :else
           0)))
 
-(defn meets-prereqs? [option & [built-char]]
+(defn meets-prereqs?
+  "Check if option's prereqs are satisfied by built-char.
+   Callers must provide a real built entity (from entity/build or
+   subscribe [:built-character]), never nil."
+  [option & [built-char]]
   (every?
-   (fn [{:keys [::t/prereq-fn] :as prereq}]
-     (when prereq-fn
+   (fn [{:keys [::t/prereq-fn]}]
+     (if prereq-fn
        (prereq-fn built-char)
-       #?(:cljs (js/console.warn "NO PREREQ_FN" (::t/name option) prereq))))
+       true))
    (::t/prereqs option)))
diff --git a/src/cljc/orcpub/errors.cljc b/src/cljc/orcpub/errors.cljc
index bc5b9e6cd..3579d2024 100644
--- a/src/cljc/orcpub/errors.cljc
+++ b/src/cljc/orcpub/errors.cljc
@@ -17,6 +17,12 @@
 
 ;; Error handling utilities
 
+(def ^:dynamic *error-prefix*
+  "Prefix prepended to log-error output. Rebind to \"TEST_ERROR:\" in
+   tests so CI logs can distinguish expected error-path output from
+   real failures."
+  nil)
+
 (defn log-error
   "Logs an error message with optional context data.
 
@@ -25,12 +31,14 @@
     message - The error message
     context - Optional map of context data to log
 
+  When *error-prefix* is bound, it replaces the caller-supplied prefix.
+
   Example:
     (log-error \"ERROR\" \"Failed to save\" {:user-id 123})"
   ([prefix message]
-   (println prefix message))
+   (println (or *error-prefix* prefix) message))
   ([prefix message context]
-   (println prefix message)
+   (println (or *error-prefix* prefix) message)
    (when (seq context)
      (println "  Context:" context))))
 
diff --git a/src/cljc/orcpub/pdf_spec.cljc b/src/cljc/orcpub/pdf_spec.cljc
index 8a0577187..61cf71186 100644
--- a/src/cljc/orcpub/pdf_spec.cljc
+++ b/src/cljc/orcpub/pdf_spec.cljc
@@ -14,7 +14,7 @@
             [orcpub.dnd.e5.equipment :as equip5e]
             [orcpub.dnd.e5.magic-items :as mi5e]
             [orcpub.dnd.e5.skills :as skill5e]
-            [re-frame.core :refer [subscribe]]))
+))
 
 (defn entity-vals [built-char kws]
   (reduce
@@ -163,8 +163,10 @@
 
 (def coin-keys [:cp :sp :ep :gp :pp])
 
-(defn equipment-fields [built-char]
-  (let [equipment-map (merge mi5e/all-equipment-map @(subscribe [::mi5e/all-magic-items-map]))
+(defn equipment-fields
+  "Build PDF equipment field map. all-magic-items-map from plugin-data."
+  [built-char all-magic-items-map]
+  (let [equipment-map (merge mi5e/all-equipment-map all-magic-items-map)
         equipment (es/entity-val built-char :equipment)
         armor (es/entity-val built-char :armor)
         magic-armor (es/entity-val built-char :magic-armor)
@@ -241,7 +243,8 @@
 (defn make-page-map [spells-known
                      print-prepared-spells?
                      prepares-spells
-                     prepared-spells-by-class]
+                     prepared-spells-by-class
+                     spells-map]
   (reduce-kv
    (fn [m k s]
      (let [spell-cfgs (vals s)
@@ -254,7 +257,7 @@
            by-ability (group-by :ability filtered)]
        (reduce-kv
         (fn [am a a-s]
-          (assoc-in am [a k] (sort-by (comp :name @(subscribe [::spells/spells-map]) :key) a-s)))
+          (assoc-in am [a k] (sort-by (comp :name spells-map :key) a-s)))
         m
         by-ability)))
    {}
@@ -263,11 +266,13 @@
 (defn make-pages [spells
                   print-prepared-spells
                   prepares-spells
-                  prepared-spells-by-class]
+                  prepared-spells-by-class
+                  spells-map]
   (let [page-map (make-page-map spells
                                 print-prepared-spells
                                 prepares-spells
-                                prepared-spells-by-class)]
+                                prepared-spells-by-class
+                                spells-map)]
     (mapcat
      (fn [[ability levels]]
        (let [ability-classes (into
@@ -298,11 +303,11 @@
                             attack-mod-fn
                             print-prepared-spells?
                             prepares-spells
-                            prepared-spells-by-class]
-  
+                            prepared-spells-by-class
+                            spells-map
+                            plugin-spells-map]
+
   (let [flat-spells (char5e/flat-spells spells-known)
-        spells-map @(subscribe [::spells/spells-map])
-        plugin-spells-map @(subscribe [::spells/plugin-spells-map])
         filtered-spells-known (reduce
                                (fn [m [k v]]
                                  (assoc m k (if print-prepared-spells?
@@ -345,12 +350,14 @@
                          attack-mod-fn
                          print-prepared-spells?
                          prepares-spells
-                         prepared-spells-by-class]
+                         prepared-spells-by-class
+                         spells-map
+                         plugin-spells-map]
   (let [spell-pages (make-pages spells
                                 print-prepared-spells?
                                 prepares-spells
-                                prepared-spells-by-class)
-        spells-map @(subscribe [::spells/spells-map])]
+                                prepared-spells-by-class
+                                spells-map)]
     (apply
      merge
      (make-spell-card-info spells
@@ -358,7 +365,9 @@
                            attack-mod-fn
                            print-prepared-spells?
                            prepares-spells
-                           prepared-spells-by-class)
+                           prepared-spells-by-class
+                           spells-map
+                           plugin-spells-map)
      (flatten
       (map-indexed
        (fn [i {:keys [ability classes spells]}]
@@ -390,7 +399,7 @@
              spells)]))
        spell-pages)))))
 
-(defn spellcasting-fields [built-char print-prepared-spells?]
+(defn spellcasting-fields [built-char print-prepared-spells? spells-map plugin-spells-map]
   (let [spell-attack-modifier-fn (char5e/spell-attack-modifier-fn built-char)
         spell-save-dc-fn (char5e/spell-save-dc-fn built-char)
         spell-slots (char5e/spell-slots built-char)
@@ -407,7 +416,9 @@
                        spell-attack-modifier-fn
                        print-prepared-spells?
                        prepares-spells
-                       prepared-spells-by-class)))
+                       prepared-spells-by-class
+                       spells-map
+                       plugin-spells-map)))
 
 (defn profs-paragraph [profs prof-map title]
   (when (seq profs)
@@ -423,12 +434,11 @@
                              :else "(unknown)")))
                        (sort (remove nil? profs)))))))
 
-(defn other-profs-field [built-char]
+(defn other-profs-field [built-char language-map]
   (let [tool-profs (char5e/tool-proficiencies built-char)
         weapon-profs (char5e/weapon-proficiencies built-char)
         armor-profs (char5e/armor-proficiencies built-char)
-        languages (char5e/languages built-char)
-        language-map @(subscribe [::langs5e/language-map])]
+        languages (char5e/languages built-char)]
     (s/join
      "\n\n"
      (remove
@@ -453,12 +463,11 @@
   and the attack bonus and damage is calculated for the versatile form of the weapon.
   We then remove any nil maps, and mapcat concatenates all of the maps into a single list.
   The remove function filters out weapons of type 'ammunition'."
-  [built-char]
+  [built-char all-weapons-map]
   (let [all-weapons ; map of all weapons in inventory
         (mi5e/equipped-items-details ; function to filter for equipped weapons
          (char5e/all-weapons-inventory built-char)
-         @(subscribe [::mi5e/all-weapons-map]) ; re-frame subscription for all weapons
-         )
+         all-weapons-map)
         weapon-fields (mapcat
                        (fn [{:keys [name ::weapon5e/damage-die ::weapon5e/damage-die-count ::weapon5e/damage-type] :as weapon}]
                          (let [versatile (:versatile weapon)
@@ -523,14 +532,21 @@
    {}
    vals))
 
-(defn make-spec [built-char
-                 id
-                 {:keys [print-character-sheet?
-                         print-spell-cards?
-                         print-prepared-spells?
-                         print-large-abilities?
-                         print-character-sheet-style?
-                         print-spell-card-dc-mod?] :as options}]
+(defn make-spec
+  "Generate the PDF field spec. plugin-data is a map with keys:
+   :spells-map, :plugin-spells-map, :language-map,
+   :all-weapons-map, :all-magic-items-map, :current-armor-class
+   — all pre-subscribed by the calling component."
+  [built-char
+   id
+   {:keys [print-character-sheet?
+           print-spell-cards?
+           print-prepared-spells?
+           print-large-abilities?
+           print-character-sheet-style?
+           print-spell-card-dc-mod?] :as options}
+   {:keys [spells-map plugin-spells-map language-map
+           all-weapons-map all-magic-items-map current-armor-class]}]
   (let [race (char5e/race built-char)
         subrace (char5e/subrace built-char)
         abilities (abilities-spec
@@ -553,7 +569,6 @@
                                 shield (conj equipped-shields nil)]
                             (ac-with-armor-fn armor shield))
         max-armor-class (apply max all-armor-classes)
-        current-ac @(subscribe [::char5e/current-armor-class id])
         levels (char5e/levels built-char)
         classes (char5e/classes built-char)
         character-name (char5e/character-name built-char)
@@ -574,14 +589,14 @@
       :class-level (class-string classes levels)
       :background (char5e/background built-char)
       :prof-bonus (common/bonus-str (es/entity-val built-char :prof-bonus))
-      :ac current-ac
+      :ac current-armor-class
       :hd total-hit-dice
       :initiative (common/bonus-str (es/entity-val built-char :initiative))
       :speed speed
       :hp-max (es/entity-val built-char :max-hit-points)
       :hp-current (char5e/current-hit-points built-char)
       :passive (es/entity-val built-char :passive-perception)
-      :other-profs (other-profs-field built-char)
+      :other-profs (other-profs-field built-char language-map)
       :personality-traits (s/join "\n\n" [(char5e/personality-trait-1 built-char) (char5e/personality-trait-2 built-char)])
       :ideals (char5e/ideals built-char)
       :bonds (char5e/bonds built-char)
@@ -607,7 +622,7 @@
       :print-character-sheet-style? print-character-sheet-style?
       :print-spell-card-dc-mod? print-spell-card-dc-mod?
       }
-     (attacks-and-spellcasting-fields built-char)
+     (attacks-and-spellcasting-fields built-char all-weapons-map)
      (skill-fields built-char)
      abilities
      ability-bonuses
@@ -618,5 +633,5 @@
       {}
       char5e/ability-keys)
      (traits-fields built-char)
-     (equipment-fields built-char)
-     (spellcasting-fields built-char print-prepared-spells?))))
+     (equipment-fields built-char all-magic-items-map)
+     (spellcasting-fields built-char print-prepared-spells? spells-map plugin-spells-map))))
diff --git a/src/cljc/orcpub/views_aux.cljc b/src/cljc/orcpub/views_aux.cljc
index 26a306214..19168c474 100644
--- a/src/cljc/orcpub/views_aux.cljc
+++ b/src/cljc/orcpub/views_aux.cljc
@@ -14,12 +14,15 @@
    {:keys [::t/key ::t/name ::t/path ::t/help ::t/selections ::t/prereqs
            ::t/modifiers ::t/select-fn ::t/ui-fn ::t/icon] :as option}]
   (let [built-template @(subscribe [:built-template])
+        built-char @(subscribe [:built-character])
         option-paths @(subscribe [:option-paths])
         new-option-path (conj (vec option-path) key)
         selected? (get-in option-paths new-option-path)
+        ;; Pass built-char so prereq-fns can compute from it directly
+        ;; instead of subscribing to character subs internally.
         failed-prereqs (reduce
                         (fn [failures {:keys [::t/prereq-fn ::t/label ::t/hide-if-fail?] :as prereq}]
-                          (if (and prereq-fn (not (prereq-fn)))
+                          (if (and prereq-fn (not (prereq-fn built-char)))
                             (conj failures prereq)
                             failures))
                         []
@@ -49,7 +52,7 @@
      #_:help #_(if (or help has-named-mods?)
                  [:div
                   (if has-named-mods? [:div.i modifiers-str])
-                  [:div {:class-name (if has-named-mods? "m-t-5")} help]])
+                  [:div {:class (if has-named-mods? "m-t-5")} help]])
      :selected? selected?
      :selectable? selectable?
      :option-path new-option-path
diff --git a/src/cljs/orcpub/character_builder.cljs b/src/cljs/orcpub/character_builder.cljs
index c45089859..8a6144183 100644
--- a/src/cljs/orcpub/character_builder.cljs
+++ b/src/cljs/orcpub/character_builder.cljs
@@ -101,7 +101,7 @@
                 (stop-propagation e))}
    [:span.underline.orange.p-0.m-r-2 (if @expanded? expand-text collapse-text)]
    [:i.fa.orange
-    {:class-name (if @expanded? "fa-caret-up" "fa-caret-down")}]])
+    {:class (if @expanded? "fa-caret-up" "fa-caret-down")}]])
 
 (defn show-info-button [expanded?]
   [:div.f-w-n.m-l-5 [expand-button "hide info" "show info" expanded?]])
@@ -129,7 +129,7 @@
    (get entity-values prop-name)
    (update-value-field prop-name)
    {:type input-type
-    :class-name (str "input w-100-p " cls-str)}])
+    :class (str "input w-100-p " cls-str)}])
 
 (defn character-input [entity-values prop-name & [cls-str handler type]]
   [character-field entity-values prop-name :input cls-str handler type])
@@ -188,7 +188,7 @@
             class-template-option (options-map key)
             path [:class-levels key]]
         [:div.m-b-5
-         {:class-name (when @expanded? "b-1 b-rad-5 p-5")}
+         {:class (when @expanded? "b-1 b-rad-5 p-5")}
          [:div.flex.align-items-c
           [:select.builder-option.builder-option-dropdown.flex-grow-1.m-t-0
            {:value key
@@ -255,6 +255,7 @@
 
 (defn class-levels-selector [{:keys [selection]}]
   (let [options (::t/options selection)
+        built-char @(subscribe [:built-character])
         selected-classes @(subscribe [::char5e/levels])
         unselected-classes (remove
                             (set (keys selected-classes))
@@ -264,7 +265,7 @@
                            (fn [option]
                              (and
                               (unselected-classes-set (::t/key option))
-                              (entity/meets-prereqs? option)))
+                              (entity/meets-prereqs? option built-char)))
                            options)]
     [:div
      [:div
@@ -311,13 +312,13 @@
            :input
            item-name
            (set-custom-item-name selection-key i)
-           {:class-name "input m-t-0"}]
+           {:class "input m-t-0"}]
           [:div.flex-grow-1 item-name])
         (when item-description [:div.w-60 [show-info-button expanded?]])
         [comps/int-field
          item-qty
          qty-change-fn
-         {:class-name (str "input m-l-5 m-t-0 w-" (or qty-input-width 60))}]
+         {:class (str "input m-l-5 m-t-0 w-" (or qty-input-width 60))}]
         [:i.fa.fa-minus-circle.orange.f-s-16.m-l-5.pointer
          {:on-click remove-fn}]]
        (when @expanded? [:div.m-t-5 item-description])])))
@@ -472,7 +473,7 @@
   (let [expanded? (r/atom false)]
     (fn [{:keys [name key help selected? selectable? option-path select-fn content explanation-text icon classes multiselect? disable-checkbox? edit-event]}]
       [:div.p-10.b-1.b-rad-5.m-5.b-orange
-       {:class-name (s/join " " (conj
+       {:class (s/join " " (conj
                                  (remove nil? [(when selected? "b-w-5")
                                                (when selectable? "pointer hover-shadow")
                                                (when (not selectable?) "opacity-5")])
@@ -512,7 +513,7 @@
   [:span.bg-red.t-a-c.p-t-4.b-rad-50-p.inline-block.f-w-b.white
    (let [size (or size 18)
          font-size (or font-size 14)]
-     {:class-name (str "h-" size " w-" size " f-s-" font-size)})
+     {:class (str "h-" size " w-" size " f-s-" font-size)})
    remaining])
 
 (defn validate-selections [built-template character selections]
@@ -545,7 +546,7 @@
                                    (when (or help has-named-mods?)
                                         [:div
                                          (when has-named-mods? [:div.i modifiers-str])
-                                         [:div {:class-name (when has-named-mods? "m-t-5")} help]])
+                                         [:div {:class (when has-named-mods? "m-t-5")} help]])
                                    :edit-event (::t/edit-event option))])))
 
 (defn selection-section-title [title]
@@ -614,11 +615,11 @@
                "Locked to prevent changes - click to unlock"
                "Unlocked - click to lock the section to prevent changes")
              [:i.fa.f-s-16.m-l-10.m-r-5.pointer
-              {:class-name (if locked? "fa-lock" "fa-unlock-alt opacity-5 hover-opacity-full")
+              {:class (if locked? "fa-lock" "fa-unlock-alt opacity-5 hover-opacity-full")
                :on-click (toggle-locked path)}]])
           (when (not hide-homebrew?)
             [:span.pointer
-             {:class-name (when (not homebrew?) "opacity-5 hover-opacity-full")
+             {:class (when (not homebrew?) "opacity-5 hover-opacity-full")
               :on-click (toggle-homebrew path)}
              [tooltip
               (if-not homebrew?
@@ -731,7 +732,7 @@
        (fn [i part]
          ^{:key i}
          [:div.flex-grow-1
-          {:class-name (str "w-" (int (/ 100 num-columns)) "-p")}
+          {:class (str "w-" (int (/ 100 num-columns)) "-p")}
           [:div
            (doall
             (map-indexed
@@ -852,21 +853,21 @@
                                               (not (pos? (ability-increases k))))]
                    ^{:key k}
                    [:div.t-a-c
-                    {:class-name (when ability-disabled? "opacity-5 cursor-disabled")}
+                    {:class (when ability-disabled? "opacity-5 cursor-disabled")}
                     [:div
-                     {:class-name (when (and (not ability-disabled?)
+                     {:class (when (and (not ability-disabled?)
                                            (zero? (ability-increases k 0)))
                                     "opacity-5")}
                      (ability-value (ability-increases k 0))] 
                     [:div.f-s-16
                      [:i.fa.fa-minus-circle.orange
-                      {:class-name (when decrease-disabled? "opacity-5 cursor-disabled")
+                      {:class (when decrease-disabled? "opacity-5 cursor-disabled")
                        :on-click (stop-prop-fn
                                   (fn []
                                     (when (not decrease-disabled?)
                                       (dispatch [:decrease-ability-value increases-path k]))))}]
                      [:i.fa.fa-plus-circle.orange.m-l-5
-                      {:class-name (when increase-disabled? "opacity-5 cursor-disabled")
+                      {:class (when increase-disabled? "opacity-5 cursor-disabled")
                        :on-click (stop-prop-fn
                                   (fn []
                                     (when (not increase-disabled?)
@@ -891,7 +892,7 @@
              (ability-subtitle "race")
              (let [race-v (get race-ability-increases k 0)]
                [:div
-                {:class-name (when (zero? race-v)
+                {:class (when (zero? race-v)
                                "opacity-5")}
                 (ability-value race-v)])])
           (when (seq subrace-ability-increases)
@@ -900,7 +901,7 @@
              (ability-subtitle "subrace")
              (let [subrace-v (get subrace-ability-increases k 0)]
                [:div
-                {:class-name (when (zero? subrace-v)
+                {:class (when (zero? subrace-v)
                                "opacity-5")}
                 (ability-value subrace-v)])])
           (when (seq ability-increases)
@@ -911,7 +912,7 @@
                               (get race-ability-increases k 0)
                               (get subrace-ability-increases k 0))]
                [:div
-                {:class-name (when (zero? other-v)
+                {:class (when (zero? other-v)
                                "opacity-5")}
                 (ability-value other-v)])])])
        ability-keys))]))
@@ -995,13 +996,13 @@
               [:div.f-s-11.f-w-b (str "(" (score-costs v) " pts)")]
               [:div.f-s-16
                [:i.fa.fa-minus-circle.orange
-                {:class-name (when decrease-disabled? "opacity-5 cursor-disabled")
+                {:class (when decrease-disabled? "opacity-5 cursor-disabled")
                  :on-click (stop-prop-fn
                             (fn [e]
                               (when (not decrease-disabled?)
                                 (set-abilities! (update abilities k dec)))))}]
                [:i.fa.fa-plus-circle.orange.m-l-5
-                {:class-name (when increase-disabled? "opacity-5 cursor-disabled")
+                {:class (when increase-disabled? "opacity-5 cursor-disabled")
                  :on-click (stop-prop-fn
                             (fn [_]
                               (when (not increase-disabled?) (set-abilities! (update abilities k inc)))))}]]]))
@@ -1337,7 +1338,7 @@
                    [:td.p-5 (:level level-value)]
                    [:td.p-5 [:input.input.m-t-0
                              {:type :number
-                              :class-name (when (or (nil? (:value level-value))
+                              :class (when (or (nil? (:value level-value))
                                                   (not (pos? (:value level-value))))
                                             "b-red b-3")
                               :on-change (fn [e]
@@ -1556,10 +1557,10 @@
                class-name (if (= i page-index) "selected-tab" "opacity-5 hover-opacity-full")]
            ^{:key name}
            [:div.p-5.hover-opacity-full.pointer.flex.flex-column.align-items-c.t-a-c
-            {:class-name (if (= i page-index) "b-b-2 b-orange" "")
+            {:class (if (= i page-index) "b-b-2 b-orange" "")
              :on-click (fn [_] (dispatch [:set-page i]))}
             [:div
-             {:class-name class-name}
+             {:class class-name}
              (when (= :desktop device-type)
                [:div.f-s-10.m-b-2
                 name])
@@ -1745,8 +1746,11 @@
   {:max-height "100px"
    :max-width "200px"})
 
-(defn set-random-name []
-  (dispatch [::char5e/set-random-name]))
+(defn set-random-name
+  "Dispatch random name generation. Passes built-char so the handler can
+   extract race/subrace/sex without subscribing outside reactive context."
+  [built-char]
+  (dispatch [::char5e/set-random-name built-char]))
 
 (defn set-image-url [v]
   (dispatch [:set-image-url v]))
@@ -1767,6 +1771,7 @@
 
 (defn description-fields []
   (let [entity-values @(subscribe [:entity-values])
+        built-char @(subscribe [:built-character])
         image-url @(subscribe [::char5e/image-url])
         image-url-failed @(subscribe [::char5e/image-url-failed])
         faction-image-url @(subscribe [::char5e/faction-image-url])
@@ -1777,7 +1782,7 @@
       [:div.flex.align-items-c
        [character-input entity-values ::char5e/character-name]
        [:button.form-button.p-10.m-t-5.m-l-5
-        {:on-click set-random-name}
+        {:on-click #(set-random-name built-char)}
         [:i.fa.fa-random.main-text-color.f-s-16]]]]
      [:div.flex.justify-cont-s-b
       [:div.field.flex-grow-1.m-r-2
@@ -1859,7 +1864,7 @@
 
 (defn builder-tab [title key current-tab]
   [:span.builder-tab
-   {:class-name (when (= current-tab key) "selected-builder-tab")
+   {:class (when (= current-tab key) "selected-builder-tab")
     :on-click (set-builder-tab key)}
    [:span.builder-tab-text title]])
 
@@ -1926,7 +1931,7 @@
                                                     (:items report))})))
           [:div
            {:id "missing-content-warning"
-            :class-name (if mobile? "m-l-10 m-b-10" "m-l-20 m-b-20")
+            :class (if mobile? "m-l-10 m-b-10" "m-l-20 m-b-20")
             :data-missing-count (:missing-count report)}
            [:div.flex.align-items-c.pointer
             {:on-click #(swap! expanded? not)}
@@ -1935,7 +1940,7 @@
             [:span.m-l-10.orange.f-w-b
              (str "Missing Content (" (:missing-count report) ")")]
             [:i.fa.m-l-5
-             {:class-name (if @expanded? "fa-caret-up" "fa-caret-down")}]]
+             {:class (if @expanded? "fa-caret-up" "fa-caret-down")}]]
            (when @expanded?
              [:div#missing-content-details.bg-warning.p-10.m-t-5
               [:div.f-s-14.m-b-10.main-text-color
@@ -1973,17 +1978,17 @@
                            (not multiple-resources?)
                            (not has-homebrew?))]
         [:div
-         {:class-name (if (not mobile?)
+         {:class (if (not mobile?)
                         "m-l-20 m-b-20"
                         "m-l-10")}
          [:div.flex.align-items-c
           [:div.i
-           {:class-name
+           {:class
             (if al-legal?
               "green"
               "red")}
            [:i.fa.f-s-18
-            {:class-name
+            {:class
              (if al-legal?
                "fa-check"
                "fa-times")}]
@@ -1995,10 +2000,10 @@
                    (if al-legal?
                      "Legal"
                      "Illegal")))]]
-          (if (not al-legal?)
+          (when (not al-legal?)
             [:span.m-l-10.f-s-14
              [expand-button "hide reasons" "show reasons" expanded?]])]
-         (if (and @expanded?
+         (when (and @expanded?
                   (not al-legal?))
            [:div.i.red.m-t-5
             (map-indexed
@@ -2056,8 +2061,11 @@
 (defn set-loading []
   (dispatch-sync [:set-loading true]))
 
-(defn save-character []
-  (dispatch [:save-character]))
+(defn save-character
+  "Dispatch manual save. Passes built-char so the handler can compute
+   the character summary without subscribing outside reactive context."
+  [built-char]
+  (dispatch [:save-character built-char]))
 
 (defn load-character-page-fn [id]
   (fn [_]
@@ -2079,8 +2087,8 @@
         mobile? @(subscribe [:mobile?])
         all-selections (entity/available-selections character built-char built-template)
         selection-validation-messages (validate-selections built-template character all-selections)
-        ;al-illegal-reasons (concat @(subscribe [::char5e/al-illegal-reasons])
-        ;                           selection-validation-messages)
+        al-illegal-reasons (concat @(subscribe [::char5e/al-illegal-reasons])
+                                   selection-validation-messages)
         used-resources @(subscribe [::char5e/used-resources])
         loading @(subscribe [:loading])
         locked-components @(subscribe [:locked-components])
@@ -2129,7 +2137,7 @@
                  "Save New Character")
         :icon "save"
         :style (when character-changed? unsaved-button-style)
-        :on-click save-character}
+        :on-click #(save-character built-char)}
        (when (:db/id character)
          {:title "View"
           :icon "eye"
diff --git a/src/cljs/orcpub/dnd/e5/autosave_fx.cljs b/src/cljs/orcpub/dnd/e5/autosave_fx.cljs
index da3276e59..68966991f 100644
--- a/src/cljs/orcpub/dnd/e5/autosave_fx.cljs
+++ b/src/cljs/orcpub/dnd/e5/autosave_fx.cljs
@@ -1,7 +1,8 @@
 (ns ^{:doc "Effects and utils for handling throttled autosave"}
   orcpub.dnd.e5.autosave-fx
   (:require [orcpub.dnd.e5.character :as char5e]
-            [re-frame.core :refer [reg-fx dispatch]]))
+            [re-frame.core :refer [reg-fx reg-event-db dispatch subscribe]]
+            [reagent.core :as r]))
 
 ;; timeout in ms during which we wait for further changes; if
 ;; none are received, the save will be performed.
@@ -54,3 +55,25 @@
               dispatch-throttled-saves
               throttled-save-timeout))))
 
+;; -- Template cache --
+;; Cache the global template in app-db so the save handler can compute
+;; built-character without subscribing outside a reactive context.
+;; track! creates a proper reactive context — no warnings.
+(reg-event-db
+ ::cache-template
+ (fn [db [_ template]]
+   (assoc db ::cached-template template)))
+
+(defn init-template-cache!
+  "Start reactive watcher that mirrors ::char5e/template into app-db.
+   Called from core.cljs after all subscriptions are registered.
+   Guards the subscribe call itself — if the handler isn't registered yet,
+   subscribe returns nil and we skip (no @nil crash). r/track! re-fires
+   reactively when the subscription value changes."
+  []
+  (r/track!
+    (fn []
+      (when-let [sub (subscribe [::char5e/template])]
+        (when-let [template @sub]
+          (dispatch [::cache-template template]))))))
+
diff --git a/src/cljs/orcpub/dnd/e5/content_reconciliation.cljs b/src/cljs/orcpub/dnd/e5/content_reconciliation.cljs
index 8abb5d649..a798a8e5c 100644
--- a/src/cljs/orcpub/dnd/e5/content_reconciliation.cljs
+++ b/src/cljs/orcpub/dnd/e5/content_reconciliation.cljs
@@ -3,35 +3,28 @@
 
    When a character references homebrew content (classes, races, etc.) that
    isn't currently loaded, this module helps identify what's missing and
-   suggests similar content that might be a match."
+   suggests similar content that might be a match.
+
+   Extracts content keys directly from the entity options structure using
+   the same get-in patterns the rest of the app uses, rather than walking
+   the entire options tree generically."
   (:require [clojure.string :as str]
             [orcpub.entity :as entity]
             [orcpub.common :as common]))
 
-;; =============================================================================
-;; Version: 0.05 - Add built-in content exclusions, fix subclass patterns
-;; =============================================================================
-
 ;; ============================================================================
 ;; Content Type Definitions
 ;; ============================================================================
 
-(def content-type-paths
-  "Maps option paths to their content types for lookup.
-   The path indicates where in the character options the key is stored."
-  {[:race]                    {:type :race      :label "Race"}
-   [:race :subrace]           {:type :subrace   :label "Subrace"}
-   [:class]                   {:type :class     :label "Class"}
-   [:background]              {:type :background :label "Background"}})
-
-(def subclass-path-patterns
-  "Subclass paths vary by class, so we detect them by pattern.
-   Path like [:class 0 :martial-archetype] indicates a subclass."
+(def subclass-selection-keys
+  "Subclass selection keys vary by class. Each class names its archetype
+   selection differently (e.g. Fighter uses :martial-archetype, Rogue uses
+   :roguish-archetype). This set covers all known variants including homebrew."
   #{:martial-archetype :roguish-archetype :sorcerous-origin
     :otherworldly-patron :arcane-tradition :bardic-college
     :divine-domain :druid-circle :monastic-tradition
     :sacred-oath :ranger-archetype :primal-path
-    :artificer-specialist :artificer-specialization  ;; Both variants used
+    :artificer-specialist :artificer-specialization
     :blood-hunter-order})
 
 (def content-type->field
@@ -40,47 +33,76 @@
    :subclass :subclasses
    :race :races
    :subrace :subraces
-   :background :backgrounds})
+   :background :backgrounds
+   :feat :feats})
 
 ;; ============================================================================
-;; Key Extraction from Character
+;; Key Extraction — direct get-in on entity options
 ;; ============================================================================
 
-(defn- extract-keys-from-option
-  "Recursively extract all ::entity/key values from an option tree.
-   Returns a seq of {:path [...] :key :keyword}."
-  [option path]
-  (when (map? option)
-    (let [current-key (::entity/key option)
-          nested-options (::entity/options option)
-          current (when current-key
-                    [{:path path :key current-key}])]
-      (concat
-       current
-       (when (map? nested-options)
-         (common/traverse-nested extract-keys-from-option nested-options path))))))
-
-(defn- annotate-content-type
-  "Add content type info to a key entry based on its path."
-  [{:keys [path] :as entry}]
-  (let [direct-match (get content-type-paths (vec (take 2 path)))
-        is-subclass? (some subclass-path-patterns path)
-        content-type (cond
-                       is-subclass? {:type :subclass :label "Subclass"}
-                       direct-match direct-match
-                       (= :class (first path)) {:type :class :label "Class"}
-                       :else {:type :unknown :label "Content"})]
-    (assoc entry
-           :content-type (:type content-type)
-           :content-label (:label content-type))))
+(defn- extract-race-keys
+  "Extract race and subrace keys from a character."
+  [options]
+  (let [race-opt (get options :race)]
+    (cond-> []
+      (::entity/key race-opt)
+      (conj {:key (::entity/key race-opt) :content-type :race :content-label "Race"})
+
+      (get-in race-opt [::entity/options :subrace ::entity/key])
+      (conj {:key (get-in race-opt [::entity/options :subrace ::entity/key])
+             :content-type :subrace :content-label "Subrace"}))))
+
+(defn- extract-background-key
+  "Extract background key from a character."
+  [options]
+  (when-let [k (get-in options [:background ::entity/key])]
+    [{:key k :content-type :background :content-label "Background"}]))
+
+(defn- extract-class-keys
+  "Extract class and subclass keys from a character.
+   Each class entry may have a subclass under a class-specific selection key
+   (e.g. :martial-archetype for Fighter, :sacred-oath for Paladin)."
+  [options]
+  (let [classes (get options :class)]
+    (when (sequential? classes)
+      (mapcat
+       (fn [class-opt]
+         (let [class-key (::entity/key class-opt)
+               class-opts (::entity/options class-opt)
+               ;; Find the subclass by checking each known archetype selection key
+               subclass-key (some (fn [sel-key]
+                                    (get-in class-opts [sel-key ::entity/key]))
+                                  subclass-selection-keys)]
+           (cond-> []
+             class-key
+             (conj {:key class-key :content-type :class :content-label "Class"})
+
+             subclass-key
+             (conj {:key subclass-key :content-type :subclass :content-label "Subclass"}))))
+       classes))))
+
+(defn- extract-feat-keys
+  "Extract feat keys from the top-level :feats selection.
+   Only extracts direct children — nested sub-selections (ability scores,
+   language choices, etc.) under a feat are not content references."
+  [options]
+  (let [feats (get options :feats)]
+    (when (sequential? feats)
+      (keep (fn [feat-opt]
+              (when-let [k (::entity/key feat-opt)]
+                {:key k :content-type :feat :content-label "Feat"}))
+            feats))))
 
 (defn extract-content-keys
   "Extract all content keys from a character's options.
-   Returns a seq of {:path [...] :key :keyword :content-type :type}."
+   Returns a seq of {:key :keyword :content-type :type :content-label \"Label\"}."
   [character]
-  (let [options (::entity/options character)
-        raw-keys (common/traverse-nested extract-keys-from-option options [])]
-    (map annotate-content-type raw-keys)))
+  (let [options (::entity/options character)]
+    (concat
+     (extract-race-keys options)
+     (extract-background-key options)
+     (extract-class-keys options)
+     (extract-feat-keys options))))
 
 ;; ============================================================================
 ;; Content Availability Checking
@@ -88,32 +110,24 @@
 
 (defn- key-similarity
   "Calculate similarity between two keywords (0-1 scale).
-   Uses simple prefix/suffix matching and common substring detection."
+   Uses prefix matching and common-base comparison."
   [k1 k2]
   (let [s1 (name k1)
         s2 (name k2)
-        ;; Exact match
         exact (if (= s1 s2) 1.0 0.0)
-        ;; One is prefix of other
         prefix (if (or (str/starts-with? s1 s2)
                        (str/starts-with? s2 s1))
                  0.7 0.0)
-        ;; Share common base (before any dash suffix)
         base-match (if (= (common/kw-base k1) (common/kw-base k2)) 0.8 0.0)]
     (max exact prefix base-match)))
 
 (defn- infer-source-from-key
-  "Try to infer the source name from a renamed key.
-   E.g., :artificer-kibbles-tasty -> 'kibbles tasty' or 'Kibbles' Tasty'"
+  "Try to infer the source name from a key's suffix.
+   E.g., :artificer-kibbles-tasty → \"Kibbles Tasty\""
   [key]
-  (let [key-str (name key)
-        ;; Look for pattern: base-source-name
-        parts (str/split key-str #"-")
-        ;; If more than one part, the suffix might be the source
-        source-parts (when (> (count parts) 1)
-                       (rest parts))]
-    (when (seq source-parts)
-      (str/join " " (map str/capitalize source-parts)))))
+  (let [parts (str/split (name key) #"-")]
+    (when (> (count parts) 1)
+      (str/join " " (map str/capitalize (rest parts))))))
 
 (defn find-similar-content
   "Find content similar to a missing key.
@@ -122,7 +136,6 @@
   (let [inferred-source (infer-source-from-key missing-key)
         missing-base (common/kw-base missing-key)]
     (->> available-content
-         ;; Filter to only valid content with keys
          (filter #(and (map? %) (keyword? (:key %))))
          (map (fn [{:keys [key] :as content}]
                 (let [similarity (key-similarity missing-key key)
@@ -141,13 +154,48 @@
          (take 5))))
 
 ;; ============================================================================
-;; Missing Content Detection
+;; Built-in (SRD) Content — excluded from missing-content warnings
 ;; ============================================================================
 
-(defn- get-content-list
-  "Get the content list for a given content type from available-content."
-  [available-content content-type]
-  (get available-content (get content-type->field content-type) []))
+;; Only SRD content belongs here. Non-SRD PHB content (Battle Master,
+;; Folk Hero, etc.) comes from plugins and SHOULD be flagged when removed.
+
+(def ^:private builtin-classes
+  #{:barbarian :bard :cleric :druid :fighter :monk
+    :paladin :ranger :rogue :sorcerer :warlock :wizard})
+
+(def ^:private builtin-races
+  #{:dwarf :elf :halfling :human :dragonborn :gnome
+    :half-elf :half-orc :tiefling :hill-dwarf :mountain-dwarf
+    :high-elf :wood-elf :drow :lightfoot :stout :forest-gnome
+    :rock-gnome})
+
+;; Only Acolyte is hardcoded (spell_subs.cljs:538).
+(def ^:private builtin-backgrounds #{:acolyte})
+
+;; SRD subclasses — one per class, hardcoded in classes.cljc.
+(def ^:private builtin-subclasses
+  #{:champion :berserker :lore :life :land :open-hand
+    :devotion :hunter :thief :draconic :fiend :evocation})
+
+;; Grappler is the only SRD feat (feats5e/feats-plugin, hardcoded).
+(def ^:private builtin-feats #{:grappler})
+
+(defn- builtin?
+  "True if this key is SRD built-in content that won't appear in plugin subs."
+  [k content-type]
+  (case content-type
+    :class (contains? builtin-classes k)
+    :subclass (contains? builtin-subclasses k)
+    :race (contains? builtin-races k)
+    :subrace (contains? builtin-races k)
+    :background (contains? builtin-backgrounds k)
+    :feat (contains? builtin-feats k)
+    false))
+
+;; ============================================================================
+;; Missing Content Detection
+;; ============================================================================
 
 (defn check-content-availability
   "Check which content keys from a character are missing.
@@ -156,71 +204,26 @@
    - character-keys: seq from extract-content-keys
    - available-content: map of {:classes [...] :races [...] :subclasses [...] ...}
 
-   Returns seq of missing content with suggestions:
-   {:path [...] :key :foo :content-type :class :suggestions [...]}"
+   Returns seq of missing content with suggestions."
   [character-keys available-content]
-  (let [;; Build lookup sets for each content type using content-type->field mapping
-        available-keys (into {}
+  (let [available-keys (into {}
                              (map (fn [[ct field]]
                                     [ct (set (map :key (get available-content field)))]))
-                             content-type->field)
-        ;; Internal keys to skip - these are built-in options, not homebrew
-        internal-key-patterns #{"level-" "hit-points-" "ability-scores"}
-        internal-keys #{:standard-scores :point-buy :average :manual-entry
-                        :hit-points :starting-equipment :equipment-pack}
-        ;; Built-in content keys - these are not homebrew, don't flag as missing
-        builtin-classes #{:barbarian :bard :cleric :druid :fighter :monk
-                          :paladin :ranger :rogue :sorcerer :warlock :wizard}
-        builtin-races #{:dwarf :elf :halfling :human :dragonborn :gnome
-                        :half-elf :half-orc :tiefling :hill-dwarf :mountain-dwarf
-                        :high-elf :wood-elf :drow :lightfoot :stout :forest-gnome
-                        :rock-gnome}
-        builtin-backgrounds #{:acolyte :charlatan :criminal :entertainer
-                              :folk-hero :guild-artisan :hermit :noble :outlander
-                              :sage :sailor :soldier :urchin}
-        ;; Built-in subclasses - all PHB subclasses
-        builtin-subclasses #{:champion :battle-master :eldritch-knight  ;; Fighter
-                             :berserker :totem-warrior                   ;; Barbarian
-                             :lore :valor                                ;; Bard
-                             :knowledge :life :light :nature :tempest :trickery :war  ;; Cleric
-                             :land :moon                                 ;; Druid
-                             :open-hand :shadow :four-elements           ;; Monk
-                             :devotion :ancients :vengeance              ;; Paladin
-                             :hunter :beast-master                       ;; Ranger
-                             :thief :assassin :arcane-trickster          ;; Rogue
-                             :draconic :wild-magic                       ;; Sorcerer
-                             :archfey :fiend :great-old-one              ;; Warlock
-                             :abjuration :conjuration :divination :enchantment
-                             :evocation :illusion :necromancy :transmutation}  ;; Wizard
-        is-builtin? (fn [k ct]
-                      (case ct
-                        :class (contains? builtin-classes k)
-                        :subclass (contains? builtin-subclasses k)
-                        :race (contains? builtin-races k)
-                        :subrace (contains? builtin-races k)
-                        :background (contains? builtin-backgrounds k)
-                        false))]
+                             content-type->field)]
     (keep
      (fn [{:keys [key content-type] :as entry}]
-       (when (and (keyword? key)
-                  ;; Only check known content types (skip :unknown)
-                  (contains? content-type->field content-type))
-         (let [key-name (name key)
-               type-keys (get available-keys content-type #{})
-               is-internal? (or (contains? internal-keys key)
-                                (some #(str/starts-with? key-name %) internal-key-patterns))
-               is-missing? (and (not (contains? type-keys key))
-                                (not is-internal?)
-                                (not (is-builtin? key content-type)))]
-           (when is-missing?
-             (let [suggestions (find-similar-content
-                                key
-                                content-type
-                                (get-content-list available-content content-type))]
-               (assoc entry
-                      :missing? true
-                      :suggestions suggestions
-                      :inferred-source (infer-source-from-key key)))))))
+       (let [type-keys (get available-keys content-type #{})
+             missing? (and (not (contains? type-keys key))
+                           (not (builtin? key content-type)))]
+         (when missing?
+           (let [field (get content-type->field content-type)
+                 suggestions (find-similar-content
+                              key content-type
+                              (get available-content field []))]
+             (assoc entry
+                    :missing? true
+                    :suggestions suggestions
+                    :inferred-source (infer-source-from-key key))))))
      character-keys)))
 
 (defn generate-missing-content-report
diff --git a/src/cljs/orcpub/dnd/e5/db.cljs b/src/cljs/orcpub/dnd/e5/db.cljs
index cb6714cda..2d1ad8d4b 100644
--- a/src/cljs/orcpub/dnd/e5/db.cljs
+++ b/src/cljs/orcpub/dnd/e5/db.cljs
@@ -261,7 +261,7 @@
                   (item-fn stored-item)
                   stored-item)
                 (do
-                  (js/console.warn "INVALID ITEM FOUND, IGNORING")
+                  (js/console.warn "INVALID ITEM FOUND, IGNORING" local-storage-key)
                   (pprint (spec/explain-data item-spec stored-item)))))))))
 
 (reg-local-store-cofx
diff --git a/src/cljs/orcpub/dnd/e5/equipment_subs.cljs b/src/cljs/orcpub/dnd/e5/equipment_subs.cljs
index 57608c20d..2933a5f5a 100644
--- a/src/cljs/orcpub/dnd/e5/equipment_subs.cljs
+++ b/src/cljs/orcpub/dnd/e5/equipment_subs.cljs
@@ -1,5 +1,5 @@
 (ns orcpub.dnd.e5.equipment-subs
-  (:require [re-frame.core :refer [reg-sub reg-sub-raw dispatch subscribe]]
+  (:require [re-frame.core :refer [reg-sub reg-sub-raw dispatch #_subscribe]]
             [orcpub.common :as common]
             [orcpub.template :as t]
             [orcpub.dnd.e5.spell-subs]
@@ -17,7 +17,8 @@
             [orcpub.dnd.e5.equipment :as equipment5e]
             [orcpub.dnd.e5.spells :as spells5e]
             [orcpub.route-map :as routes]
-            [orcpub.dnd.e5.events :refer [url-for-route handle-api-response] :as events]
+            [orcpub.dnd.e5.event-utils :as event-utils :refer [url-for-route auth-headers
+                                                                    handle-api-response]]
             [reagent.ratom :as ra]
             [clojure.string :as s]
             [cljs-http.client :as http]
@@ -29,12 +30,6 @@
   (delay (sort-by mi5e/name-key mi5e/magic-items))
   )
 
-(defn auth-headers [db]
-  (let [token (-> db :user-data :token)]
-    (if token
-      {"Authorization" (str "Token " token)}
-      {})))
-
 (if js/window.location
   (reg-sub-raw
    ::mi5e/custom-items
@@ -119,13 +114,14 @@
  (fn [magic-weapons]
    (concat magic-weapons weapon5e/weapons)))
 
-(reg-sub
- ::mi5e/all-melee-weapons
- :<- [::mi5e/all-weapons]
- (fn [all-weapons]
-   (filter
-    ::weapon5e/melee?
-    all-weapons)))
+;; Unused — melee-only filter. UI filters inline. Restore if a melee-only view is added.
+#_(reg-sub
+   ::mi5e/all-melee-weapons
+   :<- [::mi5e/all-weapons]
+   (fn [all-weapons]
+     (filter
+      ::weapon5e/melee?
+      all-weapons)))
 
 (defn map-by-key-or-id [items]
   (reduce
@@ -218,10 +214,15 @@
  (fn [magic-items _]
    (map-by-key-or-id magic-items)))
 
+;; Standard (SRD) equipment lookup maps — used by character_builder's
+;; inventory-selector for the non-magic equipment sections. These are
+;; thin wrappers around static vars, kept as subscriptions because
+;; inventory-selector receives the sub vector dynamically.
 (reg-sub
  ::equipment5e/weapons-map
- (fn [_ _]
-   weapon5e/weapons-map))
+ (fn [_ _] weapon5e/weapons-map))
+
+;; For homebrew-inclusive weapons, use ::mi5e/all-weapons-map instead.
 
 (reg-sub
  ::mi5e/all-weapons-map
@@ -262,27 +263,28 @@
    (ra/make-reaction
     (fn [] (get-in @app-db [::mi5e/remote-items id] {})))))
 
-(reg-sub
- ::mi5e/item
- (fn [item [_ key]]
-   (if (int? key)
-     @(subscribe [::mi5e/remote-item key])
-     (get mi5e/all-equipment-map key))))
+;; Unused — item detail lookup with remote HTTP fetch for int keys.
+;; Groundwork for a magic item detail page. Restore when needed.
+#_(reg-sub-raw
+   ::mi5e/item
+   (fn [_app-db [_ key]]
+     (if (int? key)
+       (subscribe [::mi5e/remote-item key])
+       (ra/make-reaction (fn [] (get mi5e/all-equipment-map key))))))
 
 (reg-sub
  ::equipment5e/armor-map
- (fn [_ _]
-   armor5e/armor-map))
+ (fn [_ _] armor5e/armor-map))
 
 (reg-sub
  ::equipment5e/equipment-map
- (fn [_ _]
-   equipment5e/equipment-map))
+ (fn [_ _] equipment5e/equipment-map))
 
 (reg-sub
  ::equipment5e/treasure-map
- (fn [_ _]
-   equipment5e/treasure-map))
+ (fn [_ _] equipment5e/treasure-map))
+
+;; For homebrew-inclusive armor, use ::mi5e/all-armor-map instead.
 
 (reg-sub
  ::char5e/template-selections
diff --git a/src/cljs/orcpub/dnd/e5/events.cljs b/src/cljs/orcpub/dnd/e5/events.cljs
index b472e6fe6..a26bfab43 100644
--- a/src/cljs/orcpub/dnd/e5/events.cljs
+++ b/src/cljs/orcpub/dnd/e5/events.cljs
@@ -63,9 +63,11 @@
                                       default-subrace
                                       default-class
                                       default-subclass]]
-            [orcpub.dnd.e5.autosave-fx]
+            [orcpub.dnd.e5.autosave-fx :as autosave-fx]
+            [orcpub.dnd.e5.event-utils :as event-utils]
+            [orcpub.dnd.e5.compute :as compute]
             [re-frame.core :refer [reg-event-db reg-event-fx reg-fx inject-cofx path
-                                   after dispatch subscribe ->interceptor]]
+                                   after dispatch ->interceptor]]
             [cljs.spec.alpha :as spec]
             [cljs-http.client :as http]
             [cljs.core.async :refer [<! timeout]]
@@ -84,6 +86,10 @@
 ;; Version: 1.06 - Add export warning modal events, required field validation
 ;; =============================================================================
 
+;; Forward declaration — defined below :update-value-field (line ~1226).
+;; Used in :save-character to auto-generate names for unnamed characters.
+(declare generate-random-name)
+
 (defn check-and-throw
   "throw an exception if db doesn't match the spec"
   [a-spec db]
@@ -192,11 +198,8 @@
 
 ;; -- Event Handlers --------------------------------------------------
 
-(defn backend-url [path]
-  (if (and js/window.location
-           (s/starts-with? js/window.location.href "http://localhost"))
-    (str "http://localhost:8890" (when (not (s/starts-with? path "/")) "/") path)
-    path))
+;; Delegated to event-utils to break circular dep with subs files.
+(def backend-url event-utils/backend-url)
 
 (reg-event-fx
  :initialize-db
@@ -288,8 +291,8 @@
                  (fn [_]
                    (random-hit-points-option (char5e/levels built-char) class-kw)))})
 
-;; unreferenced — random-character loop hardcodes 10
-#_(def max-iterations 100)
+#_ ;; unreferenced — random-character loop hardcodes 10
+(def max-iterations 100)
 
 (defn keep-options [built-template entity option-paths]
   (reduce
@@ -348,8 +351,8 @@
  (fn [_ [_ character built-template locked-components]]
    {:dispatch [:set-random-character character built-template locked-components]}))
 
-;; unreferenced — character path is constructed inline
-#_(def dnd-5e-characters-path [:dnd :e5 :characters])
+#_ ;; unreferenced — character path is constructed inline
+(def dnd-5e-characters-path [:dnd :e5 :characters])
 
 (reg-event-fx
  :character-save-success
@@ -361,6 +364,23 @@
                    [:set-character character]
                    [::char5e/set-character id character]]})))
 
+(defn descriptive-character-label
+  "Build a descriptive label like 'High Elf Ranger 3' from character properties.
+   Used as the summary name when the user hasn't set a character name."
+  [race subrace classes levels]
+  (let [race-part (or subrace race)
+        class-parts (when (seq classes)
+                      (s/join "/"
+                              (map (fn [cls]
+                                     (let [{:keys [class-name class-level]} (levels cls)]
+                                       (str class-name " " class-level)))
+                                   classes)))]
+    (cond
+      (and race-part class-parts) (str race-part " " class-parts)
+      race-part race-part
+      class-parts class-parts
+      :else "Adventurer")))
+
 (defn make-summary [built-char]
   (let [classes (char5e/classes built-char)
         levels (char5e/levels built-char)
@@ -376,10 +396,12 @@
         hair (char5e/hair built-char)
         eyes (char5e/eyes built-char)
         skin (char5e/skin built-char)
-        ;alignment (char5e/get-prop built-char ::alignment)  ;This is not available?
-        ;background (char5e/get-prop built-char ::background)  ;This is not available?
-        ]
-    (cond-> {::char5e/character-name (or character-name "")}
+        ;; When user hasn't set a name, auto-generate a descriptive label
+        ;; for the summary (what lists/parties display).
+        display-name (if (s/blank? character-name)
+                       (descriptive-character-label race subrace classes levels)
+                       character-name)]
+    (cond-> {::char5e/character-name display-name}
       image-url (assoc ::char5e/image-url image-url)
       faction-image-url (assoc ::char5e/faction-image-url faction-image-url)
       race (assoc ::char5e/race-name race)
@@ -403,43 +425,62 @@
                                                    class-level (assoc ::char5e/level class-level))))
                                              classes)))))
 
-(defn authorization-headers [db]
-  {"Authorization" (str "Token " (-> db :user-data :token))})
-
-(defn url-for-route [route & args]
-  (backend-url (apply routes/path-for route args)))
+(def authorization-headers event-utils/auth-headers)
+(def url-for-route event-utils/url-for-route)
 
+;; Autosave handler — dispatched from autosave_fx.cljs throttle timer.
+;; Posts character + summary to server.
 (reg-event-fx
  ::char5e/save-character
  (fn [{:keys [db]} [_ id]]
-   (let [{:keys [:db/id] :as strict} (char5e/to-strict @(subscribe [::char5e/character id]))
-         built-character @(subscribe [::char5e/built-character id])
-         summary (make-summary built-character)]
-     (if (every?
-          (fn [ability-kw]
-            (nat-int? (get-in built-character [:base-abilities ability-kw])))
-          char5e/ability-keys)
-       {:dispatch [:set-loading true]
-        :http {:method :post
-               :headers (authorization-headers db)
-               :url (url-for-route routes/dnd-e5-char-list-route)
-               :transit-params (assoc strict :orcpub.entity.strict/summary summary)
-               :on-success [:character-save-success]}}
-       {:dispatch [:show-error-message "You must provide values for all ability scores"]}))))
-
+   (let [character (get-in db [::char5e/character-map (js/parseInt id)] {})
+         ;; Template is cached in app-db by autosave_fx's track! watcher.
+         ;; Since built-template is a no-op (plugin merging commented out),
+         ;; we use the cached template directly with entity/build.
+         cached-template (get db ::autosave-fx/cached-template)]
+     (if-not cached-template
+       {} ;; template not cached yet — skip this cycle, next autosave will retry
+       (let [{:keys [:db/id] :as strict} (char5e/to-strict character)
+             built-character (entity/build character cached-template)
+             summary (make-summary built-character)]
+         (if (every?
+              (fn [ability-kw]
+                (nat-int? (get-in built-character [:base-abilities ability-kw])))
+              char5e/ability-keys)
+           {:dispatch [:set-loading true]
+            :http {:method :post
+                   :headers (authorization-headers db)
+                   :url (url-for-route routes/dnd-e5-char-list-route)
+                   :transit-params (assoc strict :orcpub.entity.strict/summary summary)
+                   :on-success [:character-save-success]}}
+           {:dispatch [:show-error-message "You must provide values for all ability scores"]}))))))
+
+;; Manual save — dispatched from character builder UI with built-char in scope.
+;; If the user hasn't set a name, generates a random one and persists it.
 (reg-event-fx
  :save-character
- (fn [{:keys [db]} _]
-   (let [{:keys [:db/id] :as strict} (char5e/to-strict (:character db))
-         built-character @(subscribe [:built-character])
-         summary (make-summary built-character)]
+ (fn [{:keys [db]} [_ built-character]]
+   (let [character-name (char5e/character-name built-character)
+         needs-name? (s/blank? character-name)
+         ;; Generate a random name for unnamed characters on manual save
+         rand-name (when needs-name? (generate-random-name built-character))
+         ;; Update entity in db so the name persists across future edits
+         db' (if needs-name?
+               (assoc-in db [:character ::entity/values ::char5e/character-name] rand-name)
+               db)
+         {:keys [:db/id] :as strict} (char5e/to-strict (:character db'))
+         summary (cond-> (make-summary built-character)
+                   ;; Override summary name with the generated name
+                   ;; (make-summary produced a descriptive label since entity was blank)
+                   needs-name? (assoc ::char5e/character-name rand-name))]
      (if (every?
           (fn [ability-kw]
             (nat-int? (get-in built-character [:base-abilities ability-kw])))
           char5e/ability-keys)
-       {:dispatch [:set-loading true]
+       {:db db'
+        :dispatch [:set-loading true]
         :http {:method :post
-               :headers (authorization-headers db)
+               :headers (authorization-headers db')
                :url (url-for-route routes/dnd-e5-char-list-route)
                :transit-params (assoc strict :orcpub.entity.strict/summary summary)
                :on-success [:character-save-success]}}
@@ -575,13 +616,63 @@
  ::e5/boons
  "You must specify 'Name', 'Option Source Name'")
 
-(reg-save-homebrew
- "Selection"
+;; Selection save handler — standalone instead of reg-save-homebrew to add
+;; duplicate option name validation. Mirrors reg-save-homebrew logic plus
+;; checks for empty names and duplicate option names within :options.
+(reg-event-fx
  ::selections5e/save-selection
- ::selections5e/builder-item
- ::selections5e/homebrew-selection
- ::e5/selections
- "You must specify 'Name', 'Option Source Name'")
+ (fn [{:keys [db]} _]
+   (let [{:keys [name option-pack] :as item} (::selections5e/builder-item db)
+         key (common/name-to-kw name)
+         normalized-item (import-val/normalize-text-in-data item)
+         {filled-item :item} (import-val/fill-all-missing-fields normalized-item ::e5/selections)
+         item-with-key (assoc filled-item :key key)
+         plugins (:plugins db)
+         explanation (spec/explain-data ::selections5e/homebrew-selection item-with-key)
+         ;; Check for empty option names
+         option-names (map :name (:options item))
+         empty-names? (some s/blank? option-names)
+         ;; Check for duplicate option names (case-insensitive via key derivation)
+         option-keys (map #(when-not (s/blank? %) (common/name-to-kw %))
+                          option-names)
+         key-freqs (frequencies (remove nil? option-keys))
+         dupe-keys (set (map first (filter #(> (val %) 1) key-freqs)))
+         dupe-names (when (seq dupe-keys)
+                      (->> option-names
+                           (filter #(and (not (s/blank? %))
+                                         (contains? dupe-keys (common/name-to-kw %))))
+                           distinct
+                           sort))]
+     (cond
+       ;; Reject empty option names
+       empty-names?
+       {:dispatch [:show-error-message
+                   "Cannot save: all options must have names"]}
+       ;; Reject duplicate option names
+       (seq dupe-names)
+       {:dispatch [:show-error-message
+                   (str "Cannot save: duplicate option names: "
+                        (s/join ", " dupe-names)
+                        ". Each option must have a unique name.")]}
+       ;; Spec validation
+       (some? explanation)
+       {:dispatch [:show-error-message
+                   (spec-error-message "Selection" explanation
+                                       "You must specify 'Name', 'Option Source Name'")]}
+       ;; All good — save
+       :else
+       (let [new-plugins (assoc-in plugins
+                                   [option-pack ::e5/selections key]
+                                   item-with-key)]
+         {:dispatch-n [[::e5/set-plugins new-plugins]
+                       [:show-warning-message
+                        [:div [:span.f-w-b.f-s-18.red "IMPORTANT!: "]
+                         [:span.text-shadow
+                          "Selection saved to your browser which could be lost if you clear your browser history or your browser storage fill up, you MUST export and save the content source by clicking "]
+                         [:span.pointer.underline.black
+                          {:on-click #(dispatch [::e5/export-plugin option-pack (str (new-plugins option-pack))])}
+                          "here"]]
+                        60000]]})))))
 
 (reg-save-homebrew
  "Feat"
@@ -701,6 +792,15 @@
                             ::party5e/character-ids character-ids}
            :on-success [::party5e/make-party-success]}}))
 
+(reg-event-fx
+ ::party5e/make-empty-party-success
+ (fn [{:keys [db]} [_ response]]
+   (let [new-party (:body response)
+         parties (conj (vec (::char5e/parties db)) new-party)]
+     {:db (assoc db
+                 ::char5e/parties parties
+                 ::char5e/parties-map (common/map-by-id parties))})))
+
 (reg-event-fx
   ::party5e/make-empty-party
   (fn [{:keys [db]} [_]]
@@ -709,8 +809,7 @@
             :headers (authorization-headers db)
             :url (url-for-route routes/dnd-e5-char-parties-route)
             :transit-params {::party5e/name "A New Party"}
-            :on-success (.reload js/window.location true)
-            }}))
+            :on-success [::party5e/make-empty-party-success]}}))
 
 (reg-event-fx
  ::party5e/rename-party
@@ -835,6 +934,21 @@
  (fn [db [_ folders]]
    (assoc db ::folder5e/folders folders)))
 
+(reg-event-fx
+ ::folder5e/on-folder-failure
+ ;; Re-fetches folders from server to reconcile optimistic UI on HTTP failure.
+ (fn [{:keys [db]} [_ _response]]
+   {:http {:method :get
+           :headers (authorization-headers db)
+           :url (url-for-route routes/dnd-e5-char-folders-route)
+           :on-success [::folder5e/set-folders-from-response]}
+    :dispatch (event-utils/show-generic-error)}))
+
+(reg-event-db
+ ::folder5e/set-folders-from-response
+ (fn [db [_ response]]
+   (assoc db ::folder5e/folders (:body response))))
+
 (reg-event-fx
  ::folder5e/create-folder
  (fn [{:keys [db]} [_]]
@@ -842,7 +956,8 @@
            :headers (authorization-headers db)
            :transit-params {::folder5e/name "New Folder"}
            :url (url-for-route routes/dnd-e5-char-folders-route)
-           :on-success [::folder5e/create-folder-success]}}))
+           :on-success [::folder5e/create-folder-success]
+           :on-failure [::folder5e/on-folder-failure]}}))
 
 (reg-event-fx
  ::folder5e/create-folder-success
@@ -854,17 +969,20 @@
 (reg-event-fx
  ::folder5e/rename-folder
  (fn [{:keys [db]} [_ id new-name]]
-   {:db (update db ::folder5e/folders
-                (fn [folders]
-                  (map (fn [f]
-                         (if (= id (:db/id f))
-                           (assoc f ::folder5e/name new-name)
-                           f))
-                       folders)))
-    :http {:method :put
-           :headers (authorization-headers db)
-           :transit-params new-name
-           :url (url-for-route routes/dnd-e5-char-folder-name-route :id id)}}))
+   (let [trimmed (clojure.string/trim (str new-name))]
+     (when-not (clojure.string/blank? trimmed)
+       {:db (update db ::folder5e/folders
+                    (fn [folders]
+                      (map (fn [f]
+                             (if (= id (:db/id f))
+                               (assoc f ::folder5e/name trimmed)
+                               f))
+                           folders)))
+        :http {:method :put
+               :headers (authorization-headers db)
+               :transit-params trimmed
+               :url (url-for-route routes/dnd-e5-char-folder-name-route :id id)
+               :on-failure [::folder5e/on-folder-failure]}}))))
 
 (reg-event-fx
  ::folder5e/delete-folder
@@ -874,7 +992,8 @@
                   (remove #(= id (:db/id %)) folders)))
     :http {:method :delete
            :headers (authorization-headers db)
-           :url (url-for-route routes/dnd-e5-char-folder-route :id id)}}))
+           :url (url-for-route routes/dnd-e5-char-folder-route :id id)
+           :on-failure [::folder5e/on-folder-failure]}}))
 
 (reg-event-fx
  ::folder5e/add-character
@@ -894,7 +1013,8 @@
     :http {:method :post
            :headers (authorization-headers db)
            :transit-params character-id
-           :url (url-for-route routes/dnd-e5-char-folder-characters-route :id folder-id)}}))
+           :url (url-for-route routes/dnd-e5-char-folder-characters-route :id folder-id)
+           :on-failure [::folder5e/on-folder-failure]}}))
 
 (reg-event-fx
  ::folder5e/remove-character
@@ -912,7 +1032,8 @@
            :headers (authorization-headers db)
            :url (url-for-route routes/dnd-e5-char-folder-character-route
                                :id folder-id
-                               :character-id character-id)}}))
+                               :character-id character-id)
+           :on-failure [::folder5e/on-folder-failure]}}))
 
 ;; When expanding a folder, collapse its characters so they start closed
 (reg-event-db
@@ -1106,20 +1227,25 @@
  character-interceptors
  update-value-field)
 
+(defn generate-random-name
+  "Generate a random name from the built character's race/subrace/sex.
+   Falls back to a random human name for unsupported or custom races."
+  [built-char]
+  (let [race-kw (common/name-to-kw (char5e/race built-char) "orcpub.dnd.e5.character.random")
+        subrace-kw (common/name-to-kw (char5e/subrace built-char) "orcpub.dnd.e5.character.random")
+        sex-kw (common/name-to-kw (char5e/sex built-char) "orcpub.dnd.e5.character.random")]
+    (:name (char-rand5e/random-name-result
+            {:race race-kw
+             :subrace (when (= ::char-rand5e/human race-kw) subrace-kw)
+             :sex sex-kw}))))
+
+;; Generate a random name based on character's race/subrace/sex.
+;; built-char passed from component (description-fields).
 (reg-event-fx
  ::char5e/set-random-name
- (fn [_ _]
-   (let [race-name @(subscribe [::char5e/race])
-         race-kw (common/name-to-kw race-name "orcpub.dnd.e5.character.random")
-         subrace-name @(subscribe [::char5e/subrace])
-         subrace-kw (common/name-to-kw subrace-name "orcpub.dnd.e5.character.random")
-         sex @(subscribe [::char5e/sex])
-         sex-kw (common/name-to-kw sex "orcpub.dnd.e5.character.random")]
-     {:dispatch [:update-value-field ::char5e/character-name (:name
-                                                              (char-rand5e/random-name-result
-                                                               {:race race-kw
-                                                                :subrace (when (= ::char-rand5e/human race-kw) subrace-kw)
-                                                                :sex sex-kw}))]})))
+ (fn [_ [_ built-char]]
+   {:dispatch [:update-value-field ::char5e/character-name
+               (generate-random-name built-char)]}))
 (reg-event-db
  :select-option
  character-interceptors
@@ -1149,8 +1275,8 @@
            ::char5e/image-url-failed
            nil)))
 
-;; never dispatched from UI
-#_(reg-event-db
+#_ ;; never dispatched from UI
+(reg-event-db
  :toggle-public
  character-interceptors
  (fn [character _]
@@ -1395,6 +1521,7 @@
  character-interceptors
  set-hit-points-to-average)
 
+#_:clj-kondo/ignore
 (defn set-level-hit-points [character [_ built-template character level-value value]]
   (assoc-in
    character
@@ -1450,17 +1577,33 @@
  (fn [db [_ user-data]]
    (update db :user-data dissoc :user-data :token)))
 
+;; Replaces top-level @(subscribe [:user false]) in core.cljs — that was a
+;; Replaces top-level @(subscribe [:user false]) in core.cljs — that was a
+;; side-effect-only subscribe used to trigger an HTTP auth check on app startup.
+(reg-event-fx
+ :verify-user-session
+ (fn [{:keys [db]} _]
+   (if (and (:user db) (:token (:user db)))
+     (do (go (let [response (<! (http/get (url-for-route routes/user-route)
+                                           {:headers (authorization-headers db)}))]
+               (case (:status response)
+                 200 nil
+                 401 (dispatch [:clear-login])
+                 nil)))
+         {})
+     {})))
+
 (reg-event-db
  :set-user
  (fn [db [_ user-data]]
    (assoc db :user user-data)))
 
-;; never dispatched from UI
-#_(defn set-active-tabs [db [_ active-tabs]]
+#_ ;; never dispatched from UI
+(defn set-active-tabs [db [_ active-tabs]]
   (assoc-in db tab-path active-tabs))
 
-;; never dispatched from UI
-#_(reg-event-db
+#_ ;; never dispatched from UI
+(reg-event-db
  :set-active-tabs
  set-active-tabs)
 
@@ -1547,24 +1690,26 @@
               ::entity/value]
              name)))
 
+;; Set homebrew subclass name. built-template passed from custom-option-builder.
 (reg-event-db
  :set-custom-subclass
  character-interceptors
- (fn [character [_ path name]]
+ (fn [character [_ path built-template name]]
    (let [entity-path (entity/get-option-value-path
-                      @(subscribe [:built-template])
+                      built-template
                       character
                       path)]
      (assoc-in character
                entity-path
                name))))
 
+;; Set homebrew feat name. built-template passed from custom-option-builder.
 (reg-event-db
  :set-custom-feat-name
  character-interceptors
- (fn [character [_ path name]]
+ (fn [character [_ path built-template name]]
    (let [entity-path (entity/get-option-value-path
-                      @(subscribe [:built-template])
+                      built-template
                       character
                       path)]
      (assoc-in character
@@ -1587,26 +1732,7 @@
           (map #(s/split % "="))
           (s/split cookie "; "))))
 
-(defn show-generic-error []
-  [:show-error-message [:div "There was an error, please refresh your browser and try again."]])
-
-(defn handle-api-response
-  "Dispatch on HTTP response status with sensible defaults.
-   on-success is called for 200. Options:
-     :on-401  — called on 401 (default: dispatch :route-to-login)
-     :on-500  — called on 500 (default: dispatch show-generic-error)
-     :context — string describing the request, used in console warning for unhandled statuses"
-  [response on-success & {:keys [on-401 on-500 context]}]
-  (case (:status response)
-    200 (on-success)
-    401 (if on-401
-          (on-401)
-          (dispatch [:route-to-login]))
-    500 (if on-500
-          (on-500)
-          (dispatch (show-generic-error)))
-    (js/console.warn "Unhandled HTTP status:" (:status response)
-                     (str "(" (or context "unknown request") ")"))))
+(def show-generic-error event-utils/show-generic-error)
 
 (reg-fx
  :http
@@ -1703,8 +1829,8 @@
  (fn [cofx [_ response]]
    {:dispatch [:clear-login]}))
 
-;; dead stub — real impl is orcpub.registration/validate-registration
-#_(defn validate-registration [])
+#_ ;; dead stub — real impl is orcpub.registration/validate-registration
+(defn validate-registration [])
 
 (reg-event-db
  :email-taken
@@ -1716,8 +1842,8 @@
  (fn [db [_ response]]
    (assoc db :username-taken? (-> response :body (= "true")))))
 
-;; never dispatched — registration form uses :register-first-and-last-name
-#_(reg-event-db
+#_ ;; never dispatched — registration form uses :register-first-and-last-name
+(reg-event-db
  :registration-first-and-last-name
  (fn [db [_ first-and-last-name]]
    (assoc-in db [:registration-form :first-and-last-name] first-and-last-name)))
@@ -1749,8 +1875,8 @@
  (fn [db [_ send-updates?]]
    (assoc-in db [:registration-form :send-updates?] send-updates?)))
 
-;; never dispatched from UI
-#_(reg-event-db
+#_ ;; never dispatched from UI
+(reg-event-db
  :register-first-and-last-name
  (fn [db [_ first-and-last-name]]
    (assoc-in db [:registration-form :first-and-last-name] first-and-last-name)))
@@ -1828,6 +1954,7 @@
 (defn get-auth-token [db]
   (-> db :user-data :token))
 
+#_ ;; never dispatched — character loading uses :load-user-data flow
 (reg-event-fx
  :load-characters
  (fn [{:keys [db]} [_ params]]
@@ -2067,8 +2194,8 @@
           :login-message-shown? true
           :login-message message)))
 
-;; never dispatched from UI
-#_(reg-event-db
+#_ ;; never dispatched from UI
+(reg-event-db
  :hide-warning
  (fn [db _]
    (assoc db :warning-hidden true)))
@@ -2100,26 +2227,18 @@
                  :subrace subrace
                  :sex sex})})))
 
-;; unreferenced
-#_(defn remove-subtypes [subtypes hidden-subtypes]
+#_ ;; unreferenced
+(defn remove-subtypes [subtypes hidden-subtypes]
   (let [result (sets/difference subtypes hidden-subtypes)]
     result))
 
-(defn filter-by-name-xform [filter-text name-key]
-  (let [pattern (re-pattern (str ".*" (s/lower-case filter-text) ".*"))]
-    (filter
-     (fn [x]
-       (re-matches pattern (s/lower-case (name-key x)))))))
-
-(defn filter-spells [filter-text]
-  (sort-by
-   :name
-   (sequence (filter-by-name-xform filter-text :name) @(subscribe [::char5e/sorted-spells]))))
-
-(defn filter-items [filter-text]
-  (sort-by
-   mi/name-key
-   (sequence (filter-by-name-xform filter-text mi/name-key) @(subscribe [::char5e/sorted-items]))))
+#_ ;; orphaned re-export alias — callers use compute/compute-plugin-vals directly
+(def compute-plugin-vals compute/compute-plugin-vals)
+(def compute-sorted-spells compute/compute-sorted-spells)
+(def compute-sorted-items compute/compute-sorted-items)
+(def filter-by-name-xform compute/filter-by-name-xform)
+(def filter-spells compute/filter-spells)
+(def filter-items compute/filter-items)
 
 (defn search-results [text]
   (let [search-text (s/lower-case text)
@@ -2171,8 +2290,8 @@
        (assoc :orcacle-clicked? false)
        (dissoc :search-text))))
 
-;; never dispatched from UI (note: "orcacle" typo)
-#_(reg-event-fx
+#_ ;; never dispatched from UI (note: "orcacle" typo)
+(reg-event-fx
  :open-orcacle-over-character-builder
  (fn []
    {:dispatch-n [[:route routes/dnd-e5-char-builder-route]
@@ -2206,23 +2325,28 @@
  (fn [db [_ filter-text]]
    (assoc db ::char5e/monster-text-filter filter-text)))
 
+;; Filter spell list by name. Computes sorted spells from db directly
+;; (avoids subscribe outside reactive context).
 (reg-event-db
  ::char5e/filter-spells
  (fn [db [_ filter-text]]
-   (assoc db
-          ::char5e/spell-text-filter filter-text
-          ::char5e/filtered-spells (if (>= (count filter-text) 3)
-                                     (filter-spells filter-text)
-                                     @(subscribe [::char5e/sorted-spells])))))
+   (let [sorted (compute-sorted-spells db)]
+     (assoc db
+            ::char5e/spell-text-filter filter-text
+            ::char5e/filtered-spells (if (>= (count filter-text) 3)
+                                       (filter-spells filter-text sorted)
+                                       sorted)))))
 
+;; Filter magic item list by name. Computes sorted items from db directly.
 (reg-event-db
  ::char5e/filter-items
  (fn [db [_ filter-text]]
-   (assoc db
-          ::char5e/item-text-filter filter-text
-          ::char5e/filtered-items (if (>= (count filter-text) 3)
-                                     (filter-items filter-text)
-                                     @(subscribe [::char5e/sorted-items])))))
+   (let [sorted (compute-sorted-items db)]
+     (assoc db
+            ::char5e/item-text-filter filter-text
+            ::char5e/filtered-items (if (>= (count filter-text) 3)
+                                       (filter-items filter-text sorted)
+                                       sorted)))))
 
 (reg-event-db
  ::char5e/toggle-selected
@@ -2358,11 +2482,12 @@
  (fn [{:keys [db]} [_ id]]
    (update-character-fx db id add-level)))
 
+;; Level up a character by id — adds a level and opens the builder.
 (reg-event-fx
  ::char5e/level-up
- (fn [_ [_ character-id]]
+ (fn [{:keys [db]} [_ character-id]]
    {:dispatch-n [[::char5e/add-level character-id]
-                 [:set-character @(subscribe [::char5e/character character-id])]
+                 [:set-character (get-in db [::char5e/character-map (js/parseInt character-id)] {})]
                  [:route routes/dnd-e5-char-builder-route]]}))
 
 (reg-event-fx
@@ -2477,8 +2602,8 @@
                   "dark-theme"
                   "light-theme")))))
 
-;; never dispatched from UI
-#_(reg-event-db
+#_ ;; never dispatched from UI
+(reg-event-db
  ::mi/set-builder-item
  [magic-item->local-store-interceptor]
  (fn [db [_ magic-item]]
@@ -2753,7 +2878,11 @@
  ::combat/set-combat-path-prop
  combat-interceptors
  (fn [combat [_ path-prop prop-value]]
-   (assoc-in combat path-prop prop-value)))
+   ;; Guard: ensure combat is a valid map with vector collections.
+   ;; If the path interceptor extracts nil (key missing from db), bare
+   ;; assoc-in creates maps for integer keys instead of vectors,
+   ;; corrupting localStorage and failing the spec on next load.
+   (assoc-in (or combat default-combat) path-prop prop-value)))
 
 (reg-event-db
  ::encounters/delete-creature
@@ -2918,8 +3047,8 @@
  (fn [subclass [_ class-spells-key level index spell-kw]]
    (assoc-in subclass [class-spells-key level index] spell-kw)))
 
-;; never dispatched from UI
-#_(reg-event-db
+#_ ;; never dispatched from UI
+(reg-event-db
  ::class5e/set-spell-list
  subclass-interceptors
  (fn [subclass [_ class-kw]]
@@ -2931,8 +3060,8 @@
  (fn [feat [_ prop-key prop-value]]
    (assoc feat prop-key prop-value)))
 
-;; never dispatched from UI
-#_(reg-event-db
+#_ ;; never dispatched from UI
+(reg-event-db
  ::bg5e/set-feature-prop
  background-interceptors
  (fn [background [_ prop-key prop-value]]
@@ -2944,8 +3073,8 @@
  (fn [feat [_ key]]
    (update-in feat [:props key] not)))
 
-;; never dispatched from UI — feat builder uses toggle-feat-prop instead
-#_(reg-event-db
+#_ ;; never dispatched from UI — feat builder uses toggle-feat-prop instead
+(reg-event-db
  ::feats5e/toggle-feat-selection
  feat-interceptors
  (fn [feat [_ key]]
@@ -2975,8 +3104,8 @@
                            (dissoc m key)
                            (assoc m key num))))))
 
-;; never dispatched — class/subclass builder UI not wired for value-prop toggles
-#_(reg-event-db
+#_ ;; never dispatched — class/subclass builder UI not wired for value-prop toggles
+(reg-event-db
  ::class5e/toggle-subclass-value-prop
  subclass-interceptors
  (fn [subclass [_ key num]]
@@ -2985,8 +3114,8 @@
                            (dissoc m key)
                            (assoc m key num))))))
 
-;; never dispatched — class builder UI not wired for value-prop toggles
-#_(reg-event-db
+#_ ;; never dispatched — class builder UI not wired for value-prop toggles
+(reg-event-db
  ::class5e/toggle-class-value-prop
  class-interceptors
  (fn [class [_ key num]]
@@ -3019,8 +3148,8 @@
  (fn [class [_ prop-path prop-value]]
    (update-in class prop-path not)))
 
-;; never dispatched — class builder UI not wired for prof toggles
-#_(reg-event-db
+#_ ;; never dispatched — class builder UI not wired for prof toggles
+(reg-event-db
  ::class5e/toggle-class-prof
  class-interceptors
  (fn [class [_ prop-path]]
@@ -3055,22 +3184,22 @@
  (fn [race [_ key value]]
    (update-in race [:props key value] not)))
 
-;; never dispatched — class builder UI not wired for subclass map-prop toggles
-#_(reg-event-db
+#_ ;; never dispatched — class builder UI not wired for subclass map-prop toggles
+(reg-event-db
  ::class5e/toggle-subclass-map-prop
  subclass-interceptors
  (fn [subclass [_ key value]]
    (update-in subclass [:props key value] not)))
 
-;; never dispatched — class builder UI not wired for class map-prop toggles
-#_(reg-event-db
+#_ ;; never dispatched — class builder UI not wired for class map-prop toggles
+(reg-event-db
  ::class5e/toggle-class-map-prop
  class-interceptors
  (fn [class [_ key value]]
    (update-in class [:props key value] not)))
 
-;; never dispatched — background builder UI not wired for map-prop toggles
-#_(reg-event-db
+#_ ;; never dispatched — background builder UI not wired for map-prop toggles
+(reg-event-db
  ::bg5e/toggle-background-map-prop
  background-interceptors
  (fn [background [_ key value]]
@@ -3399,31 +3528,11 @@
  (fn [item [_ bonus]]
    (set-value item ::mi/magical-ac-bonus bonus)))
 
-(defn mod-cfg [key & args]
-  {::mod/key key
-   ::mod/args args})
-
-(defmulti mod-key (fn [{:keys [::mod/key ::mod/args] :as item}]
-                    key))
-
-(defmethod mod-key :ability [{:keys [::mod/key ::mod/args]}]
-  [key (first args)])
-
-(defmethod mod-key :ability-override [{:keys [::mod/key ::mod/args]}]
-  [key (first args)])
-
-(defmethod mod-key :default [{:keys [::mod/key ::mod/args]}]
-  [key args])
-
-(defn compare-mod-keys [item-1 item-2]
-  (compare (mod-key item-1)
-           (mod-key item-2)))
-
-(defn default-mod-set [mod-set]
-  (if (and (set? mod-set)
-           (sorted? mod-set))
-    mod-set
-    (into (sorted-set-by compare-mod-keys) mod-set)))
+#_ ;; orphaned re-export aliases — all callers use event-utils/ directly now
+(def mod-cfg event-utils/mod-cfg)
+#_(def mod-key event-utils/mod-key)
+#_(def compare-mod-keys event-utils/compare-mod-keys)
+#_(def default-mod-set event-utils/default-mod-set)
 
 (doseq [toggle-mod [:damage-resistance :damage-vulnerability :damage-immunity :condition-immunity]]
   (reg-event-db
@@ -3522,6 +3631,7 @@
       :dispatch [:show-warning-message
                  (str "Plugin '" name "' exported with placeholder data for missing fields.")]})))
 
+;; Export all homebrew plugins as .orcbrew file.
 (reg-event-fx
  ::e5/export-all-plugins
  (fn [{:keys [db]} _]
@@ -3563,6 +3673,7 @@
                  (clj->js {:type "text/plain;charset=utf-8"}))]
       (js/saveAs blob (str name ".orcbrew"))
       {})))
+;; Export all homebrew plugins as pretty-printed .orcbrew file.
 (reg-event-fx
   ::e5/export-all-plugins-pretty-print
   (fn [{:keys [db]} _]
@@ -4425,6 +4536,7 @@
  (fn [db _]
    (assoc db ::char5e/options-shown? false)))
 
+#_ ;; never dispatched — print UI not wired
 (reg-event-db
  ::char5e/toggle-character-sheet-print
  (fn [db _]
@@ -4435,6 +4547,7 @@
  (fn [db _]
    (update db ::char5e/exclude-spell-cards-print? not)))
 
+#_ ;; never dispatched — print UI not wired
 (reg-event-db
  ::char5e/toggle-spell-cards-by-level
  (fn [db _]
@@ -4562,6 +4675,7 @@
                                  ::char5e/off-hand-weapon]
                                 weapon-kw))))
 
+#_ ;; never dispatched — attunement UI not wired
 (reg-event-fx
  ::char5e/attune-magic-item
  (fn [{:keys [db]} [_ id i weapon-kw]]
diff --git a/src/cljs/orcpub/dnd/e5/import_validation.cljs b/src/cljs/orcpub/dnd/e5/import_validation.cljs
index f5812bc1b..e664b367e 100644
--- a/src/cljs/orcpub/dnd/e5/import_validation.cljs
+++ b/src/cljs/orcpub/dnd/e5/import_validation.cljs
@@ -352,6 +352,141 @@
         {:data plugin
          :changes (or change-descriptions [])}))))
 
+;; ============================================================================
+;; Selection Option Deduplication - Remove/rename duplicate options on import
+;; ============================================================================
+
+(defn dedup-options-in-selection
+  "Dedup options within a single selection by derived key (common/name-to-kw).
+   - Identical content (same description, modifiers, etc.): keep first, drop rest
+   - Different content but same name: append numbering ('Bonus', 'Bonus 2', etc.)
+   Returns [deduped-options changes] where changes is a vector of log entries."
+  [options]
+  (if (or (not (sequential? options)) (< (count options) 2))
+    [options []]
+    (let [;; Group by derived key
+          grouped (group-by #(when-let [n (:name %)]
+                               (when-not (str/blank? n)
+                                 (common/name-to-kw n)))
+                            options)
+          changes (atom [])]
+      [(vec
+        (mapcat
+         (fn [[k opts]]
+           (if (or (nil? k) (<= (count opts) 1))
+             ;; No duplication or unnamed — pass through
+             opts
+             ;; Multiple options with the same derived key
+             (let [;; Compare content (strip :key and :name for content comparison)
+                   content-fn #(dissoc % :key :name)
+                   distinct-contents (distinct (map content-fn opts))
+                   all-identical? (= 1 (count distinct-contents))]
+               (if all-identical?
+                 ;; True duplicates — keep first, log the drop
+                 (do
+                   (swap! changes conj
+                          {:type :dedup-identical
+                           :description (str "Removed " (dec (count opts))
+                                             " duplicate option(s) named '"
+                                             (:name (first opts)) "'")})
+                   [(first opts)])
+                 ;; Same name, different content — rename with numbers
+                 (do
+                   (swap! changes conj
+                          {:type :dedup-renamed
+                           :description (str "Renamed " (count opts)
+                                             " options with duplicate name '"
+                                             (:name (first opts))
+                                             "' to unique names")})
+                   (map-indexed
+                    (fn [i opt]
+                      (if (zero? i)
+                        opt ;; first keeps original name
+                        (let [new-name (str (:name opt) " " (inc i))]
+                          (assoc opt
+                                 :name new-name
+                                 :key (common/name-to-kw new-name)))))
+                    opts))))))
+         grouped))
+       @changes])))
+
+(defn dedup-options-in-item
+  "Dedup options within all selections of a content item.
+   Returns [updated-item changes]."
+  [item]
+  (if-let [selections (:selections item)]
+    (if (map? selections)
+      (let [result (reduce-kv
+                    (fn [acc sel-key sel-data]
+                      (if-let [options (:options sel-data)]
+                        (let [[deduped changes] (dedup-options-in-selection options)]
+                          {:selections (assoc (:selections acc) sel-key
+                                              (assoc sel-data :options deduped))
+                           :changes (into (:changes acc) changes)})
+                        {:selections (assoc (:selections acc) sel-key sel-data)
+                         :changes (:changes acc)}))
+                    {:selections {} :changes []}
+                    selections)]
+        [(assoc item :selections (:selections result)) (:changes result)])
+      [item []])
+    [item []]))
+
+(defn dedup-options-in-plugin
+  "Dedup options in all selections across all content types in a plugin.
+   Returns {:plugin updated-plugin :changes [change-descriptions]}."
+  [plugin]
+  (reduce-kv
+   (fn [acc content-type content]
+     (if (and (qualified-keyword? content-type)
+              (= (namespace content-type) "orcpub.dnd.e5")
+              (map? content))
+       (let [result (reduce-kv
+                     (fn [inner-acc item-key item]
+                       (let [[updated-item changes] (dedup-options-in-item item)]
+                         {:items (assoc (:items inner-acc) item-key updated-item)
+                          :changes (into (:changes inner-acc)
+                                         (map #(assoc % :item-key item-key
+                                                        :content-type content-type)
+                                              changes))}))
+                     {:items {} :changes []}
+                     content)]
+         {:plugin (assoc (:plugin acc) content-type (:items result))
+          :changes (into (:changes acc) (:changes result))})
+       {:plugin (assoc (:plugin acc) content-type content)
+        :changes (:changes acc)}))
+   {:plugin {} :changes []}
+   plugin))
+
+(defn dedup-options-in-import
+  "Dedup selection options during import. Handles single and multi-plugin formats.
+   Returns {:data updated-data :changes [change-descriptions]}."
+  [data]
+  (let [is-multi (is-multi-plugin? data)]
+    (if is-multi
+      (let [results (reduce-kv
+                     (fn [acc plugin-name plugin]
+                       (let [{:keys [plugin changes]} (dedup-options-in-plugin plugin)]
+                         {:data (assoc (:data acc) plugin-name plugin)
+                          :changes (into (:changes acc)
+                                         (map #(assoc % :plugin plugin-name) changes))}))
+                     {:data {} :changes []}
+                     data)
+            change-descriptions (when (seq (:changes results))
+                                  [{:type :dedup-selection-options
+                                    :description (str "Deduplicated " (count (:changes results))
+                                                      " selection option(s) with duplicate names")
+                                    :details (:changes results)}])]
+        {:data (:data results)
+         :changes (or change-descriptions [])})
+      (let [{:keys [plugin changes]} (dedup-options-in-plugin data)
+            change-descriptions (when (seq changes)
+                                  [{:type :dedup-selection-options
+                                    :description (str "Deduplicated " (count changes)
+                                                      " selection option(s) with duplicate names")
+                                    :details changes}])]
+        {:data plugin
+         :changes (or change-descriptions [])}))))
+
 ;; ============================================================================
 ;; Export Validation - Check for missing required fields before export
 ;; ============================================================================
@@ -1202,23 +1337,29 @@
                             (fill-missing-in-import (:data clean-result))
                             {:data (:data clean-result) :changes []})
 
+              ;; Step 3.75: Dedup selection options (same-name options within selections)
+              dedup-result (if auto-clean
+                             (dedup-options-in-import (:data fill-result))
+                             {:data (:data fill-result) :changes []})
+
               all-changes (vec (concat @string-changes
                                        (when text-normalized?
                                          [{:type :text-normalization
                                            :description "Normalized Unicode characters (smart quotes, dashes, etc.) to ASCII"}])
                                        (:changes clean-result)
-                                       (:changes fill-result)))
+                                       (:changes fill-result)
+                                       (:changes dedup-result)))
 
-              ;; Step 4: Detect duplicate keys
-              key-conflicts (detect-duplicate-keys (:data fill-result)
+              ;; Step 4: Detect duplicate keys (uses deduped data)
+              key-conflicts (detect-duplicate-keys (:data dedup-result)
                                                    existing-plugins
                                                    import-source-name)
               key-warnings (format-duplicate-key-warnings key-conflicts)
 
-              ;; Step 5: Validate structure based on strategy
+              ;; Step 5: Validate structure based on strategy (uses deduped data)
               validation-result (if (= strategy :strict)
-                                  (import-all-or-nothing (:data fill-result))
-                                  (import-progressive (:data fill-result)))]
+                                  (import-all-or-nothing (:data dedup-result))
+                                  (import-progressive (:data dedup-result)))]
 
           ;; Add changes and key conflict info to result
           (assoc validation-result
diff --git a/src/cljs/orcpub/dnd/e5/spell_subs.cljs b/src/cljs/orcpub/dnd/e5/spell_subs.cljs
index 5987c3f2f..8d6b530bf 100644
--- a/src/cljs/orcpub/dnd/e5/spell_subs.cljs
+++ b/src/cljs/orcpub/dnd/e5/spell_subs.cljs
@@ -25,7 +25,7 @@
             [orcpub.dnd.e5.equipment :as equipment5e]
             [orcpub.dnd.e5.options :as opt5e]
             [orcpub.route-map :as routes]
-            [orcpub.dnd.e5.events :as events]
+            [orcpub.dnd.e5.event-utils]
             [orcpub.dnd.e5.template-base :as t-base]
             [reagent.ratom :as ra]
             [clojure.string :as s]
@@ -1163,22 +1163,24 @@
  (fn [[sorted-monsters filter-text monster-filters]]
    (filter-monsters sorted-monsters (or filter-text "") monster-filters)))
 
-(reg-sub
-  ::monsters5e/filtered-monster-names
-  :<- [::monsters5e/filtered-monsters]
-  (fn [filtered-monsters]
-    (set (map :name filtered-monsters))))
+;; Unused — pre-derived name set from filtered monsters. Useful for autocomplete/search.
+#_(reg-sub
+   ::monsters5e/filtered-monster-names
+   :<- [::monsters5e/filtered-monsters]
+   (fn [filtered-monsters]
+     (set (map :name filtered-monsters))))
 
 (reg-sub
  ::spells5e/base-spells
  (fn [_]
    spells5e/spells))
 
-(reg-sub
- ::spells5e/base-spells-map
- :<- [::spells5e/base-spells]
- (fn [spells]
-   (common/map-by-key spells)))
+;; Unused — superseded by ::spells5e/spells-map which includes plugin spells.
+#_(reg-sub
+   ::spells5e/base-spells-map
+   :<- [::spells5e/base-spells]
+   (fn [spells]
+     (common/map-by-key spells)))
 
 (reg-sub
  ::spells5e/spells
@@ -1260,23 +1262,24 @@
                     ability-key
                     class-name)]})))
 
-(reg-sub
- ::spells5e/spell-option
- :<- [::spells5e/spells-map]
- spell-option)
-
-(reg-sub
- ::spells5e/spell-options
- :<- [::spells5e/spells-map]
- :<- [::spells5e/spell-lists]
- (fn [[spells-map spell-lists] [_ ability-key class-name levels]]
-   (apply concat
-          (sequence
-           (comp
-            (map spell-lists)
-            (map (fn [spell-key]
-                   (spell-option spells-map [nil spell-key ability-key class-name]))))
-           levels))))
+;; Unused — spell-option fn is called directly; these sub wrappers were never wired up.
+#_(reg-sub
+   ::spells5e/spell-option
+   :<- [::spells5e/spells-map]
+   spell-option)
+
+#_(reg-sub
+   ::spells5e/spell-options
+   :<- [::spells5e/spells-map]
+   :<- [::spells5e/spell-lists]
+   (fn [[spells-map spell-lists] [_ ability-key class-name levels]]
+     (apply concat
+            (sequence
+             (comp
+              (map spell-lists)
+              (map (fn [spell-key]
+                     (spell-option spells-map [nil spell-key ability-key class-name]))))
+             levels))))
 
 (reg-sub
  ::spells5e/builder-item
@@ -1364,8 +1367,9 @@
             (first pair)))
             monsters5e/challenge-ratings))))
 
-(reg-sub
- ::classes5e/has-prof?
- :<- [::classes5e/builder-item]
- (fn [class [_ prof-type prof-key]]
-   (some? (get-in class [:profs prof-type prof-key]))))
+;; Unused — proficiency predicate on builder-item graph. Useful for conditional UI.
+#_(reg-sub
+   ::classes5e/has-prof?
+   :<- [::classes5e/builder-item]
+   (fn [class [_ prof-type prof-key]]
+     (some? (get-in class [:profs prof-type prof-key]))))
diff --git a/src/cljs/orcpub/dnd/e5/subs.cljs b/src/cljs/orcpub/dnd/e5/subs.cljs
index 75695300d..ad15636e0 100644
--- a/src/cljs/orcpub/dnd/e5/subs.cljs
+++ b/src/cljs/orcpub/dnd/e5/subs.cljs
@@ -9,7 +9,10 @@
             [orcpub.dnd.e5.template :as t5e]
             [orcpub.dnd.e5.common :as common5e]
             [orcpub.dnd.e5.db :refer [tab-path]]
-            [orcpub.dnd.e5.events :refer [url-for-route handle-api-response] :as events]
+            [orcpub.dnd.e5.event-utils :as event-utils :refer [url-for-route auth-headers
+                                                                    show-generic-error mod-cfg
+                                                                    default-mod-set
+                                                                    handle-api-response]]
             [orcpub.dnd.e5.character :as char5e]
             [orcpub.dnd.e5.char-decision-tree :as char-dec5e]
             [orcpub.dnd.e5.char-filter :as char-filter]
@@ -299,12 +302,44 @@
 (defn built-character [character built-template]
   (entity/build character built-template))
 
-(reg-sub
+(def ^:private build-debounce-ms
+  "Leading+trailing debounce for entity/build. First change fires
+   immediately; rapid changes batch until quiet for this many ms."
+  500)
+
+(defn- debounced-build-sub
+  "reg-sub-raw handler: wraps entity/build with leading+trailing edge
+   debounce. Dropdown changes compute instantly; rapid keystrokes batch."
+  [char-sub tmpl-sub]
+  (let [timeout-id (atom nil)
+        last-run   (atom 0)
+        result     (ra/atom (built-character @char-sub @tmpl-sub))
+        wk         (gensym "build-")
+        do-build   (fn []
+                     (reset! last-run (.now js/Date))
+                     (reset! result (built-character @char-sub @tmpl-sub)))
+        on-change  (fn [_ _ _ _]
+                     (when-let [tid @timeout-id] (js/clearTimeout tid))
+                     (if (>= (- (.now js/Date) @last-run) build-debounce-ms)
+                       (do-build)
+                       (reset! timeout-id
+                               (js/setTimeout do-build build-debounce-ms))))]
+    (add-watch char-sub wk on-change)
+    (add-watch tmpl-sub wk on-change)
+    (ra/make-reaction
+     (fn [] @result)
+     :on-dispose (fn []
+                   (remove-watch char-sub wk)
+                   (remove-watch tmpl-sub wk)
+                   (when-let [tid @timeout-id]
+                     (js/clearTimeout tid))))))
+
+(reg-sub-raw
  :built-character
- :<- [:character]
- :<- [:built-template]
- (fn [[character built-template] _]
-   (built-character character built-template)))
+ (fn [_ _]
+   (debounced-build-sub
+    (subscribe [:character])
+    (subscribe [:built-template]))))
 
 (reg-sub
  :expanded-characters
@@ -341,12 +376,6 @@
  (fn [db [_ name]]
    (get-in db [:expanded-items name])))
 
-(defn auth-headers [db]
-  (let [token (-> db :user-data :token)]
-    (if token
-      {"Authorization" (str "Token " token)}
-      {})))
-
 ;; API-backed subscriptions — use handle-api-response for consistent
 ;; status handling with sensible 401/500 defaults and catch-all logging.
 (reg-sub-raw
@@ -387,7 +416,7 @@
             (fn [])
             :on-401 #(do (dispatch [:set-user-data (dissoc (:user-data @app-db) :user-data :token)])
                          (when required? (dispatch [:route-to-login])))
-            :on-500 #(when required? (dispatch (events/show-generic-error)))
+            :on-500 #(when required? (dispatch (show-generic-error)))
             :context "fetch user"))))
     (ra/make-reaction
      (fn [] (get @app-db :user [])))))
@@ -451,14 +480,15 @@
            {}
            folders)))
 
-;; dead — never subscribed to; events.cljs accesses ::char5e/summary-map directly
-#_(reg-sub
+;; Used by combat_tracker (views.cljs) and as input signal for ::char5e/summary
+(reg-sub
  ::char5e/summary-map
  (fn [[_ login-optional?]]
    (subscribe [::char5e/characters login-optional?]))
  (fn [characters _]
    (common/map-by :db/id characters)))
 
+;; Used by combat_tracker (views.cljs)
 (reg-sub
  ::char5e/summary
  :<- [::char5e/summary-map]
@@ -518,10 +548,8 @@
  (fn [character _ _]
    (selected-plugin-options character)))
 
-#_(reg-sub
- ::char5e/template
- (fn [db _]
-   (:template db)))
+;; ::char5e/template is registered in equipment_subs.cljs (derives from template-selections).
+;; Used by autosave_fx.cljs and as input signal for ::char5e/built-template.
 
 (reg-sub
  ::char5e/built-template
@@ -531,13 +559,12 @@
  (fn [[selected-plugin-options template] _]
    (built-template template selected-plugin-options)))
 
-(reg-sub
+(reg-sub-raw
  ::char5e/built-character
- (fn [[_ id] _]
-   [(subscribe [::char5e/character id])
-    (subscribe [::char5e/built-template id])])
- (fn [[character built-template] _ _]
-   (built-character character built-template)))
+ (fn [_ [_ id]]
+   (debounced-build-sub
+    (subscribe [::char5e/character id])
+    (subscribe [::char5e/built-template id]))))
 
 (reg-sub
  :message-shown?
@@ -1069,11 +1096,11 @@
  ::mi5e/item-ability-bonus
  :<- [::mi5e/builder-item]
  (fn [item [_ type ability]]
-   (let [mod-cfg (events/mod-cfg (if (= type :becomes-at-least)
+   (let [mod-cfg (mod-cfg (if (= type :becomes-at-least)
                                    :ability-override
                                    :ability)
                                  ability)
-         modifiers (events/default-mod-set (::mi5e/internal-modifiers item))
+         modifiers (default-mod-set (::mi5e/internal-modifiers item))
          modifier (get modifiers mod-cfg)
          args (::mod/args modifier)]
      (second args))))
@@ -1082,11 +1109,11 @@
  ::mi5e/item-ability-mod-type
  :<- [::mi5e/builder-item]
  (fn [item [_ type ability]]
-   (let [mod-cfg (events/mod-cfg (if (= type :becomes-at-least)
+   (let [mod-cfg (mod-cfg (if (= type :becomes-at-least)
                                    :ability-override
                                    :ability)
                                  ability)
-         modifiers (events/default-mod-set (::mi5e/internal-modifiers item))
+         modifiers (default-mod-set (::mi5e/internal-modifiers item))
          modifier (get modifiers mod-cfg)
          args (::mod/args modifier)]
      (second args))))
@@ -1396,19 +1423,22 @@
 (reg-sub
  ::char5e/available-content
  (fn [_]
-   ;; Subscribe to all content types we need to check against
-   ;; These are defined in spell_subs.cljs with namespaced keys
+   ;; Subscribe to all content types we need to check against.
+   ;; Uses plugin-* subs (not the full subs) because SRD content is
+   ;; hardcoded and handled by builtin-* sets in content_reconciliation.
    [(subscribe [:orcpub.dnd.e5.classes/plugin-classes])
     (subscribe [:orcpub.dnd.e5.classes/plugin-subclasses])
     (subscribe [:orcpub.dnd.e5.races/plugin-races])
     (subscribe [:orcpub.dnd.e5.races/plugin-subraces])
-    (subscribe [:orcpub.dnd.e5.backgrounds/plugin-backgrounds])])
- (fn [[classes subclasses races subraces backgrounds]]
+    (subscribe [:orcpub.dnd.e5.backgrounds/plugin-backgrounds])
+    (subscribe [:orcpub.dnd.e5.feats/plugin-feats])])
+ (fn [[classes subclasses races subraces backgrounds feats]]
    {:classes classes
     :subclasses subclasses
     :races races
     :subraces subraces
-    :backgrounds backgrounds}))
+    :backgrounds backgrounds
+    :feats feats}))
 
 (reg-sub
  ::char5e/missing-content-report
diff --git a/src/cljs/orcpub/dnd/e5/views.cljs b/src/cljs/orcpub/dnd/e5/views.cljs
index adbac91f0..81a4dc9d0 100644
--- a/src/cljs/orcpub/dnd/e5/views.cljs
+++ b/src/cljs/orcpub/dnd/e5/views.cljs
@@ -106,7 +106,7 @@
          :value value
          :placeholder title
          :style input-style
-         :class-name (if (and @blurred? (seq messages))
+         :class (if (and @blurred? (seq messages))
                        "b-red"
                        "b-gray")
          :on-focus (fn [_] (reset! blurred? false))
@@ -114,10 +114,13 @@
          :on-blur (fn [e] (reset! blurred? true))}]
        (when @blurred? (validation-messages messages))])))
 
-(defn export-pdf [built-char id & [options]]
+(defn export-pdf
+  "Returns an onClick handler that generates and submits the PDF.
+   plugin-data map is pre-subscribed by the calling component."
+  [built-char id plugin-data & [options]]
   (fn [_]
     (let [field (.getElementById js/document "fields-input")]
-      (aset field "value" (str (pdf-spec/make-spec built-char id options)))
+      (aset field "value" (str (pdf-spec/make-spec built-char id options plugin-data)))
       (.submit (.getElementById js/document "download-form")))))
 
 (defn download-form [built-char]
@@ -139,7 +142,7 @@
     [:img.svg-icon
      {:style {:height (str size "px")
               :width (str size "px")}
-      :class-name (when light-theme? " opacity-7")
+      :class (when light-theme? " opacity-7")
       :src (str (if light-theme? "/image/black/" "/image/") icon-name ".svg")}]))
 
 (def login-style
@@ -258,14 +261,14 @@
          {:on-click (fn [e] (if (seq buttons)
                               #(swap! hovered? not)
                               (on-click e)))
-          :on-mouse-over #(reset! hovered? true)
-          :on-mouse-out #(reset! hovered? false)
+          :on-mouse-enter #(reset! hovered? true)
+          :on-mouse-leave #(reset! hovered? false)
           :style (when active active-style)
-          :class-name (str (if disabled "disabled" "pointer")
+          :class (str (if disabled "disabled" "pointer")
                            " "
                            (when (not mobile?) " w-110"))}
          [:div.p-10
-          {:class-name (when (not active) (if disabled "opacity-2" "opacity-6 hover-opacity-full"))}
+          {:class (when (not active) (if disabled "opacity-2" "opacity-6 hover-opacity-full"))}
           (let [size (if mobile? 24 48)] (svg-icon icon size ""))
           (when (not mobile?)
             [:div.title.uppercase title])]
@@ -295,7 +298,7 @@
    {:style social-icon-style
     :href link :target :_blank}
    [:i.fab
-    {:class-name (str "fa-" icon)}]])
+    {:class (str "fa-" icon)}]])
 
 (def search-input-style
   {:height "60px"
@@ -321,7 +324,7 @@
   (dispatch [:route routes/default-route]))
 
 (defn search-input-keypress [e]
-  (when (= "Enter" (.-key e)) (dispatch [:set-search-text @(subscribe [:search-text])])))
+  (when (= "Enter" (.-key e)) (dispatch [:set-search-text (.. e -target -value)])))
 
 (defn set-search-text [e]
   (dispatch [:set-search-text (event-value e)]))
@@ -367,7 +370,7 @@
            (let [search-text @(subscribe [:search-text])
                  search-text? @(subscribe [:search-text?])]
              [:div
-              {:class-name (if mobile? "p-l-10 p-r-10" "p-l-20 p-r-20 flex-grow-1")}
+              {:class (if mobile? "p-l-10 p-r-10" "p-l-20 p-r-20 flex-grow-1")}
               [:div.b-rad-5.flex.align-items-c
                {:style search-input-parent-style}
                (when (not mobile?)
@@ -385,7 +388,7 @@
        [:div.container
         [:div.content
          [:div.flex.w-100-p.align-items-end
-          {:class-name (if mobile? "justify-cont-s-b" "justify-cont-s-b")}
+          {:class (if mobile? "justify-cont-s-b" "justify-cont-s-b")}
           [:div
            {:style {:min-width "53px"}}
            [:a {:href "https://www.patreon.com/DungeonMastersVault" :target :_blank}
@@ -570,21 +573,14 @@
            :on-click (make-event-handler :re-verify @params)}
           "RESEND"]]]))))
 
-(def message-style
-  {:padding "10px"
-   :border-radius "5px"
-   :display :flex
-   :justify-content :space-between})
-
 (defn message [message-type message-text close-handler]
   [:div.pointer.f-w-b ;;.h-0.opacity-0.fade-out
    {:on-click close-handler}
-   [:div.white
-    {:style message-style
-     :class-name (case message-type
-                   :error "bg-red"
-                   :warning "bg-orange"
-                   "bg-green")}
+   [:div.message
+    {:class (case message-type
+              :error "bg-red"
+              :warning "bg-orange"
+              "bg-green")}
     [:span message-text]
     [:i.fa.fa-times]]])
 
@@ -625,7 +621,7 @@
                      :width "174px"
                      :font-size "16px"
                      :font-weight "600"}
-             :class-name (when bad-email? "disabled opacity-5 hover-no-shadow")
+             :class (when bad-email? "disabled opacity-5 hover-no-shadow")
              :on-click (when (not bad-email?) (make-event-handler :send-password-reset @params))}
             "SUBMIT"]]])))))
 
@@ -678,7 +674,7 @@
                      :width "174px"
                      :font-size "16px"
                      :font-weight "600"}
-             :class-name (when invalid? "opacity-5 hover-no-shadow cursor-disabled")
+             :class (when invalid? "opacity-5 hover-no-shadow cursor-disabled")
              :on-click (when (not invalid?) (make-event-handler :password-reset @params))}
             "SUBMIT"]]])))))
 
@@ -795,7 +791,7 @@
                      :opacity "0.7"
                      :width "100%"
                      :position :absolute}
-             :class-name color}]
+             :class color}]
            [:div.b-rad-5.password-strength-meter
             {:style {:top 0
                      :left 0
@@ -803,7 +799,7 @@
                      :height "30px"
                      :transition "width 1s"
                      :width (str (* 100 (float (/ password-strength 5))) "%")}
-             :class-name color}]
+             :class color}]
            [:div.main-text-color.p-l-10.b-rad-5
             {:style {:position :absolute
                      :padding-top "6px"}}
@@ -813,7 +809,7 @@
         {:style {:text-align :left
                  :margin-left "15px"}}
         [:i.fa.fa-check.f-s-14.pointer
-         {:class-name (if send-updates? "orange" "white")
+         {:class (if send-updates? "orange" "white")
           :style {:margin-top "-3px"
                   :border-color "#f0a100"
                   :border-style :solid
@@ -830,7 +826,7 @@
                   :width "174px"
                   :font-size "16px"
                   :font-weight "600"}
-          :class-name (when (seq registration-validation) "opacity-5 hover-no-shadow cursor-disabled")
+          :class (when (seq registration-validation) "opacity-5 hover-no-shadow cursor-disabled")
           :on-click #(when (empty? registration-validation)
                        (dispatch [:register]))}
          "JOIN"]]]
@@ -865,8 +861,7 @@
            "LOGIN"]
           ;[:div.m-t-10
           ; [facebook-login-button]]
-          [:div
-           {:style {:margin-top "50px"}}
+          [:div.login-form-inputs
            [form-input {:title "Username or Email"
                         :key :username
                         :value (:username @params)
@@ -932,7 +927,7 @@
      [:div.flex.align-items-c.justify-cont-s-b.flex-wrap
       [:div.flex
        [:h1.f-s-36.f-w-b.m-t-5.m-l-10
-        {:class-name (when (not= :mobile device-type) "m-t-21 m-b-20")}
+        {:class (when (not= :mobile device-type) "m-t-21 m-b-20")}
         title]
        (when frame?
          logo)]
@@ -946,11 +941,11 @@
             ^{:key i}
             [:button.form-button.h-40.m-l-5.m-t-5.m-b-5
              {:on-click on-click
-              :class-name class-name
+              :class class-name
               :style style}
              [:span
               [:i.fa.f-s-18
-               (when icon {:class-name (str "fa-" icon)})]]
+               (when icon {:class (str "fa-" icon)})]]
              [:span.m-l-5.header-button-text title]]
               ))
         button-cfgs)]]
@@ -992,7 +987,7 @@
        [:div.orange.pointer.underline
         {:on-click #(swap! expanded? not)
          :title "Development - Debug Info" }
-        [:i.fa.fa-bug {:class-name (when @expanded? "white")}]]
+        [:i.fa.fa-bug {:class (when @expanded? "white")}]]
        (when @expanded?
          [:textarea.m-t-5
           {:read-only true
@@ -1125,11 +1120,11 @@
   [:div.p-b-20
    (when include-name? [:span.f-s-24.f-w-b name])
    [:div.i.f-w-b.opacity-5
-    {:class-name (str "f-s-" (or subheader-size 18))}
+    {:class (str "f-s-" (or subheader-size 18))}
     (str (when (pos? level)
            (str (common/ordinal level) "-level"))
          " "
-         (str (common/safe-capitalize school) (when ritual " (can be cast as ritual)"))
+         (common/safe-capitalize school) (if ritual " (can be cast as ritual)" "")
          (when (zero? level)
            " cantrip"))]])
 
@@ -1360,6 +1355,7 @@
 (defn close-orcacle []
   (dispatch [:close-orcacle]))
 
+;; Used in legal footer below. template.cljc has a separate srd-link for character_builder.
 (def srd-link
   [:a.orange {:href "/SRD-OGL_V5.1.pdf" :target "_blank"} "the 5e SRD"])
 
@@ -1392,8 +1388,12 @@
        [search-results]]]]))
 
 (defn content-page [title button-cfgs content & {:keys [hide-header-message? frame?]}]
-  (let [on-scroll (fn [e]
-                    (when-not @(subscribe [:orcacle-open?])
+  ;; Plain atom (not r/atom) mirrors the :orcacle-open? subscription value
+  ;; for the scroll handler, which runs as a DOM event listener outside
+  ;; Reagent's reactive context. Synced from the render fn below.
+  (let [orcacle-open?* (atom false)
+        on-scroll (fn [e]
+                    (when-not @orcacle-open?*
                       (let [app-header (js/document.getElementById "app-header")
                             header-height (.-offsetHeight app-header)
                             scroll-top (.-scrollTop (.-documentElement (.-target e)))
@@ -1415,8 +1415,9 @@
               orcacle-open? @(subscribe [:orcacle-open?])
               theme @(subscribe [:theme])
               mobile? @(subscribe [:mobile?])]
+          (reset! orcacle-open?* orcacle-open?)
           [:div.app.min-h-full
-           {:class-name theme
+           {:class theme
             :on-scroll (when-not frame?
                          (fn [e]))}
            (when-not frame?
@@ -1468,19 +1469,15 @@
                   [:p "Version " (v/version) " (" (v/date) ") " (v/description) " edition"]]]
                 [debug-data]]]])]))})))
 
-;; dead — zero callers
+;; dead — zero callers (4 style defs)
 #_(def row-style
   {:border-bottom "1px solid rgba(255,255,255,0.5)"})
 
-;; dead — zero callers
 #_(def light-row-style
   {:border-bottom "1px solid rgba(0,0,0,0.5)"})
 
-;; dead — zero callers
 #_(def list-style
   {:border-top "2px solid rgba(255,255,255,0.5)"})
-
-;; dead — zero callers
 #_(def thumbnail-style
   {:height "100px"
    :max-width "200px"})
@@ -1492,7 +1489,7 @@
     [:div.flex.m-l-10.align-items-c
      (svg-icon "orc-head" 32)
      [:div.f-s-18.m-l-5
-      {:class-name text-classes}
+      {:class text-classes}
       owner]
      (when (and show-follow? username (not= username owner))
        [:button.form-button.m-l-10.p-6
@@ -1504,6 +1501,24 @@
           "unfollow"
           "follow")])]))
 
+(defn character-display-name
+  "Return the character's name, or a descriptive fallback like 'High Elf Ranger 3'
+   built from race/class/level when the name is blank. Works on summary maps."
+  [{:keys [::char/character-name ::char/race-name ::char/subrace-name ::char/classes]}]
+  (if (s/blank? character-name)
+    (let [race-part (or subrace-name race-name)
+          class-str (when (seq classes)
+                      (s/join "/"
+                              (map (fn [{:keys [::char/class-name ::char/level]}]
+                                     (str class-name " " level))
+                                   classes)))]
+      (cond
+        (and race-part class-str) (str race-part " " class-str)
+        race-part race-part
+        class-str class-str
+        :else "New Character"))
+    character-name))
+
 (defn character-summary-2 [{:keys [::char/character-name
                                    ::char/image-url
                                    ::char/race-name
@@ -1517,19 +1532,21 @@
                                    ::char/skin
                                    ::char/classes
                                    ::char/alignment
-                                   ::char/background]}
+                                   ::char/background]
+                            :as summary}
                            include-name?
                            owner
                            show-owner?
                            show-follow?]
-  (let [username @(subscribe [:username])]
+  (let [username @(subscribe [:username])
+        display-name (when include-name? (character-display-name summary))]
     [:div.flex.justify-cont-s-b.w-100-p.align-items-c
      [:div.flex.align-items-c.align-items-t
       (when image-url
         [:img.m-r-20.m-t-10.m-b-10.image-character-thumbnail {:src image-url }])
       [:div.flex.character-summary.m-t-20.m-b-20
-       (when (and character-name include-name?) [:span.m-r-20.m-b-5
-                                               [:span.character-name character-name]
+       (when display-name [:span.m-r-20.m-b-5
+                                               [:span.character-name display-name]
                                                [:div.f-s-12.m-t-5.opacity-6.character-background background]
                                                [:div.f-s-12.m-t-5.opacity-6.character-alignment alignment]
                                                (when (not (s/blank? age)) [:div.f-s-12.m-t-5.opacity-6.character-age "Age: " age])
@@ -1632,7 +1649,7 @@
        conj
        [:div]
        buttons))]
-   [:div {:class-name (if list? "m-t-0" "m-t-4")}
+   [:div {:class (if list? "m-t-0" "m-t-4")}
     [:span.f-s-24.f-w-600
      value]]])
 
@@ -1672,7 +1689,7 @@
    {:on-click on-click}
    [:span (if expanded? "hide" "details")]
    [:i.fa.m-l-5
-    {:class-name (if expanded? "fa-caret-up" "fa-caret-down")}]])
+    {:class (if expanded? "fa-caret-up" "fa-caret-down")}]])
 
 
 (defn spellcaster-levels-table []
@@ -1757,7 +1774,7 @@
                                             (= first-class-level lvl)))]
                     ^{:key lvl}
                     [:tr
-                     {:class-name (when highlight?
+                     {:class (when highlight?
                                     "f-w-b")
                       :style (when highlight?
                                highlight-spell-slot-row-style)}
@@ -1783,7 +1800,7 @@
                  (range (apply max (keys spell-slots)))))
                [:td.p-r-5
                 [:i.fa.orange
-                 {:class-name (if @checkboxes-expanded? "fa-caret-up" "fa-caret-down")}]]])]]]
+                 {:class (if @checkboxes-expanded? "fa-caret-up" "fa-caret-down")}]]])]]]
          (when @checkboxes-expanded?
            [:div.bg-light.p-5
             (doall
@@ -1802,18 +1819,28 @@
               spell-slots))])]))))
 
 (defn dropdown [{:keys [items value on-change]}]
-  [:select.builder-option.builder-option-dropdown.m-t-0
-   {:value (or value "")
-    :on-change #(on-change (event-value %))}
-   (doall
-    (map
-     (fn [{:keys [value title disabled?]}]
-       ^{:key (or value title)}
-       [:option.builder-dropdown-item
-        (cond-> {:value value}
-          disabled? (assoc :disabled true))
-        title])
-     items))])
+  ;; Dedup items by :value as a safety net — duplicate option values from
+  ;; homebrew plugins can slip through if imported before dedup was added.
+  (let [unique-items (->> items
+                          (reduce (fn [{:keys [seen result]} item]
+                                    (let [v (:value item)]
+                                      (if (contains? seen v)
+                                        {:seen seen :result result}
+                                        {:seen (conj seen v) :result (conj result item)})))
+                                  {:seen #{} :result []})
+                          :result)]
+    [:select.builder-option.builder-option-dropdown.m-t-0
+     {:value (or value "")
+      :on-change #(on-change (event-value %))}
+     (doall
+      (map-indexed
+       (fn [i {:keys [value title disabled?]}]
+         ^{:key (str i "-" (or value title))}
+         [:option.builder-dropdown-item
+          (cond-> {:value value}
+            disabled? (assoc :disabled true))
+          title])
+       unique-items))]))
 
 (defn labeled-dropdown [label cfg]
   [:div
@@ -1864,7 +1891,7 @@
             :on-change #(reset! selected-level (js/parseInt %))}]]
          [:div.m-l-5
           [:button.form-button.p-10
-           {:class-name (when (empty? usable-slot-levels) "disabled")
+           {:class (when (empty? usable-slot-levels) "disabled")
             :on-click #(when (seq usable-slot-levels)
                          (dispatch [::char/use-spell-slot id (or @selected-level (first usable-slot-levels))]))}
            "cast spell"]]]))))
@@ -1885,7 +1912,7 @@
        (when (and (pos? lvl)
                 (get prepares-spells class))
          [:span.m-r-5
-          {:class-name (when always-prepared?
+          {:class (when always-prepared?
                          "cursor-disabled")
            :on-click (fn [e]
                        (when (not always-prepared?)
@@ -1910,7 +1937,7 @@
         :text (str "1d20" (common/mod-str (get cls-mods :spell-attack-modifier))))]
       [:td.p-l-10.p-b-5.p-t-5.pointer.orange
        [:i.fa
-        {:class-name (if expanded? "fa-caret-up" "fa-caret-down")}]]]
+        {:class (if expanded? "fa-caret-up" "fa-caret-down")}]]]
      (when expanded?
        [:tr {:style expanded-spell-background-style}
         [:td {:col-span 7}
@@ -1951,7 +1978,7 @@
             [:th.p-l-10.p-b-5.p-t-5 (if mobile? "Aby" "Ability")]
             [:th.p-l-10.p-b-5.p-t-5 "DC"]
             [:th
-             {:class-name (when (not mobile?) "p-b-10 p-t-10")}
+             {:class (when (not mobile?) "p-b-10 p-t-10")}
              "Mod."]
             [:th.p-l-10.p-b-5.p-t-5 "Attack"]
             [:th.p-l-10.p-b-5.p-t-5]]
@@ -2335,7 +2362,7 @@
           (fn [{skill-name :name skill-key :key icon :icon :as skill}]
             ^{:key skill-key}
             [:tr.t-a-l
-             {:class-name (if (skill-profs skill-key) "f-w-b" "opacity-7")}
+             {:class (if (skill-profs skill-key) "f-w-b" "opacity-7")}
              [:td [:div.skill-name
                    (svg-icon icon 18)
                    [:span.m-l-5 skill-name]]]
@@ -2381,7 +2408,7 @@
          (fn [k]
            ^{:key k}
             [:tr.t-a-l
-             {:class-name (if (saving-throws k) "f-w-b" "opacity-7")}
+             {:class (if (saving-throws k) "f-w-b" "opacity-7")}
              [:td [:div
                    (t/ability-icon k 18 theme)
                    [:span.m-l-5.saving-throw-name (s/upper-case (name k))]]]
@@ -2533,7 +2560,7 @@
              :input
              xps
              #(dispatch [::char/set-current-xps id (js/parseInt %)])
-             {:class-name "input"
+             {:class "input"
               :type :number}]]
            [:div.p-5
             [:div
@@ -2617,7 +2644,7 @@
            @(subscribe [::char/notes id])
            (set-notes-handler id)
            {:style notes-style
-            :class-name "input"}]]]]]]]))
+            :class "input"}]]]]]]]))
 
 (defn weapon-details-field [nm value]
   [:div.p-2
@@ -2710,7 +2737,7 @@
          [:div.m-t-10 (str "Shield: " (:description shield))])]])])
 
 (defn boolean-icon [v]
-  [:i.fa {:class-name (if v "fa-check green" "fa-times red")}])
+  [:i.fa {:class (if v "fa-check green" "fa-times red")}])
 
 (defn toggle-details-expanded-fn [expanded-details k]
   #(swap! expanded-details (fn [d] (update d k not))))
@@ -2737,7 +2764,7 @@
           [:table.w-100-p.t-a-l.striped
            [:tbody.armor
             [:tr.f-w-b
-             {:class-name (when mobile? "f-s-12")}
+             {:class (when mobile? "f-s-12")}
              [:th.p-10 "Name"]
              (when (not mobile?) [:th.p-10 "Proficient?"])
              [:th.p-10 "Details"]
@@ -2772,7 +2799,7 @@
                     #_(if (not mobile?)
                         [:span.underline (if expanded? "less" "more")])
                     [:i.fa.m-l-5
-                     {:class-name (if expanded? "fa-caret-up" "fa-caret-down")}]]]])))]]]]))))
+                     {:class (if expanded? "fa-caret-up" "fa-caret-down")}]]]])))]]]]))))
 
 (defn section-header [icon title]
   [:div.flex.align-items-c
@@ -2797,7 +2824,7 @@
           [:table.w-100-p.t-a-l.striped
            [:tbody.weapons
             [:tr.f-w-b
-             {:class-name (when mobile? "f-s-12")}
+             {:class (when mobile? "f-s-12")}
              [:th.p-10 "Name"]
              (when (not mobile?) [:th.p-10 "Proficient?"])
              [:th.p-10 "Details"]
@@ -2847,7 +2874,7 @@
                        #_(if (not mobile?)
                            [:span.underline (if expanded? "less" "more")])
                        [:i.fa.m-l-5
-                        {:class-name (if expanded? "fa-caret-up" "fa-caret-down")}]]]])))
+                        {:class (if expanded? "fa-caret-up" "fa-caret-down")}]]]])))
               all-weapons))]]]]))))
 
 (defn magic-item-rows [expanded-details magic-item-cfgs magic-weapon-cfgs magic-armor-cfgs]
@@ -2868,7 +2895,7 @@
              #_(if (not mobile?)
                  [:span.underline (if expanded? "less" "more")])
              [:i.fa.m-l-5
-              {:class-name (if expanded? "fa-caret-up" "fa-caret-down")}]]]]
+              {:class (if expanded? "fa-caret-up" "fa-caret-down")}]]]]
           (when expanded?
             [:tr
              [:td.p-10
@@ -2894,7 +2921,7 @@
           [:table.w-100-p.t-a-l.striped
            [:tbody.other-magic-items
             [:tr.f-w-b
-             {:class-name (when mobile? "f-s-12")}
+             {:class (when mobile? "f-s-12")}
              [:th.p-10 "Name"]
              [:th.p-10 "Details"]
              [:th]]
@@ -2924,7 +2951,7 @@
           [:table.w-100-p.t-a-l.striped
            [:tbody.equipment
             [:tr.f-w-b
-             {:class-name (when mobile? "f-s-12")}
+             {:class (when mobile? "f-s-12")}
              [:th.p-10 "Name"]
              [:th.p-10 "Qty."]
              [:th.p-10 "Details"]
@@ -2966,7 +2993,7 @@
           [:table.w-100-p.t-a-l.striped
            [:tbody
             [:tr.f-w-b
-             {:class-name (when mobile? "f-s-12")}
+             {:class (when mobile? "f-s-12")}
              [:th.p-10 "Name"]
              [:th.p-10 "Qty."]
              [:th]]
@@ -2998,7 +3025,7 @@
           [:table.w-100-p.t-a-l.striped
            [:tbody
             [:tr.f-w-b
-             {:class-name (when mobile? "f-s-12")}
+             {:class (when mobile? "f-s-12")}
              [:th.p-5 "Name"]
              [:th.p-5 (if mobile? "Prof?" "Proficient?")]
              (when skill-expertise
@@ -3038,7 +3065,7 @@
             [:table.w-100-p.t-a-l.striped
              [:tbody
               [:tr.f-w-b
-               {:class-name (when mobile? "f-s-12")}
+               {:class (when mobile? "f-s-12")}
                [:th.p-10 "Name"]
                [:th.p-10 (if mobile? "Prof?" "Proficient?")]
                (when tool-expertise
@@ -3065,9 +3092,9 @@
   (let [ability-bonuses @(subscribe [::char/ability-bonuses id])
         language-map @(subscribe [::langs/language-map])]
     [:div.details-columns
-     {:class-name (when (= 2 num-columns) "flex")}
+     {:class (when (= 2 num-columns) "flex")}
      [:div.flex-grow-1.details-column-2
-      {:class-name (when (= 2 num-columns) "w-50-p m-l-20")}
+      {:class (when (= 2 num-columns) "w-50-p m-l-20")}
       [skill-details-section-2 id]
       [:div.m-t-20
        [tool-prof-details-section-2 id]]
@@ -3239,7 +3266,7 @@
      [:div.m-t-30
       [armor-section-2 id]]
      [:div
-      {:class-name (when (= 2 num-columns) "w-50-p m-l-20")}
+      {:class (when (= 2 num-columns) "w-50-p m-l-20")}
       [list-item-section "Weapon Proficiencies" "bowman" weapon-profs (partial prof-name @(subscribe [::mi/custom-and-standard-weapons-map]))]
       [list-item-section "Armor Proficiencies" "mailed-fist" armor-profs (partial prof-name armor/armor-map)]]]))
 
@@ -3265,10 +3292,10 @@
         all-traits (concat actions bonus-actions reactions traits attacks)
         freqs (set (map has-frequency-units? all-traits))]
     [:div.details-columns
-     {:class-name (when (= 2 num-columns) "flex")}
+     {:class (when (= 2 num-columns) "flex")}
 
      [:div.flex-grow-1.details-column-2
-      {:class-name (when (= 2 num-columns) "w-50-p m-l-20")}
+      {:class (when (= 2 num-columns) "w-50-p m-l-20")}
       [list-item-section "Damage Resistances" "surrounded-shield" resistances resistance-str]
       [list-item-section "Damage Vulnerabilities" nil damage-vulnerabilities resistance-str]
       [list-item-section "Damage Immunities" nil damage-immunities resistance-str]
@@ -3303,9 +3330,9 @@
         total-spellcaster-levels @(subscribe [::char/total-spellcaster-levels id])
         levels @(subscribe [::char/levels id])]
     [:div.details-columns
-     {:class-name (when (= 2 num-columns) "flex")}
+     {:class (when (= 2 num-columns) "flex")}
      [:div.flex-grow-1.details-column-2
-      {:class-name (when (= 2 num-columns) "w-50-p m-l-20")}
+      {:class (when (= 2 num-columns) "w-50-p m-l-20")}
       (when (seq spells-known) [spells-known-section
                               id
                               spells-known
@@ -3332,10 +3359,10 @@
 
 (defn details-tab [title icon device-type selected? on-select]
   [:div.b-b-2.f-w-b.pointer.p-10.hover-opacity-full
-   {:class-name (if selected? "b-orange" "b-gray")
+   {:class (if selected? "b-orange" "b-gray")
     :on-click on-select}
    [:div.hover-opacity-full
-    {:class-name (when (not selected?) "opacity-5")}
+    {:class (when (not selected?) "opacity-5")}
     [:div (svg-icon icon 24)]
     (when (= device-type :desktop)
       [:div.uppercase.f-s-10
@@ -3414,7 +3441,7 @@
              [:div.w-50-p
               [summary-details num-columns id]])
            [:div
-            {:class-name (if two-columns? "w-50-p" "w-100-p")}
+            {:class (if two-columns? "w-50-p" "w-100-p")}
             [:div.flex.p-l-10.m-b-10.m-r-10
              (doall
               (map
@@ -3438,7 +3465,7 @@
                      "hide selections"
                      "show selections")]
             [:i.fa.m-l-5
-             {:class-name (if @show-selections? "fa-caret-up" "fa-caret-down")}]]
+             {:class (if @show-selections? "fa-caret-up" "fa-caret-down")}]]
            (when @show-selections?
              [character-selections id])]]]))))
 
@@ -3491,6 +3518,7 @@
 
 (defn export-pdf-fn [built-char
                      id
+                     plugin-data
                      print-character-sheet?
                      print-spell-cards?
                      print-prepared-spells?
@@ -3499,6 +3527,7 @@
                      print-spell-card-dc-mod?]
   #(let [export-fn (export-pdf built-char
                                id
+                               plugin-data
                                {:print-character-sheet? print-character-sheet?
                                 :print-spell-cards? print-spell-cards?
                                 :print-prepared-spells? print-prepared-spells?
@@ -3536,6 +3565,12 @@
         print-large-abilities? @(subscribe [::char/print-large-abilities?])
         print-character-sheet-style? @(subscribe [::char/print-character-sheet-style?])
         print-spell-card-dc-mod? @(subscribe [::char/print-spell-card-dc-mod?])
+        plugin-data {:spells-map @(subscribe [::spells/spells-map])
+                     :plugin-spells-map @(subscribe [::spells/plugin-spells-map])
+                     :language-map @(subscribe [::langs/language-map])
+                     :all-weapons-map @(subscribe [::mi/all-weapons-map])
+                     :all-magic-items-map @(subscribe [::mi/all-magic-items-map])
+                     :current-armor-class @(subscribe [::char/current-armor-class id])}
         has-spells? (seq (char/spells-known built-char))
         print-button-enabled (if (or (= print-character-sheet-style? nil)
                                      (= (str print-character-sheet-style?) "NaN"))
@@ -3599,6 +3634,7 @@
        {:style (print-button-style print-button-enabled)
         :on-click (export-pdf-handler built-char
                                       id
+                                      plugin-data
                                       print-character-sheet?
                                       print-spell-cards?
                                       print-prepared-spells?
@@ -3731,14 +3767,14 @@
    :input
    value
    on-change
-   {:class-name "input"}])
+   {:class "input"}])
 
 (defn textarea-field [{:keys [value on-change]}]
   [comps/input-field
    :textarea
    value
    on-change
-   {:class-name "input"}])
+   {:class "input"}])
 
 (defn number-field [{:keys [value on-change]}]
   [comps/input-field
@@ -3747,7 +3783,7 @@
    (fn [v]
      (on-change
       (when (re-matches #"\d+" v) (js/parseInt v))))
-   {:class-name "input"
+   {:class "input"
     :type :number}])
 
 (defn attunement-value [attunement key name]
@@ -4141,13 +4177,13 @@
 
 (defn builder-input-field [title prop item prop-event & [class-names type]]
   [:div.flex-grow-1
-   {:class-name class-names
+   {:class class-names
     :name prop}
    [input-builder-field
     [:span.f-w-b title]
     (prop item)
     #(dispatch [prop-event prop %])
-    {:class-name "input h-40"
+    {:class "input h-40"
      :type type}]])
 
 #_(defn item-input-field [title prop item & [class-names]]
@@ -4345,11 +4381,16 @@
            :skill-expertise-options
            skills/skills))
 
-(def option-language-proficiency-choice
-  (partial option-proficiency-choice
-           "Language Proficiency Choice"
-           :language-options
-           @(subscribe [::langs/languages])))
+(defn option-language-proficiency-choice
+  "Wraps option-proficiency-choice; subscribes inside render context."
+  [option set-path-prop-event toggle-path-prop-event]
+  (option-proficiency-choice
+   "Language Proficiency Choice"
+   :language-options
+   @(subscribe [::langs/languages])
+   option
+   set-path-prop-event
+   toggle-path-prop-event))
 
 (def option-skill-proficiency-choice
   (partial option-proficiency-choice
@@ -4498,7 +4539,7 @@
      [:span.f-w-b "Gold"]
      (get-in background [:treasure :gp])
      #(dispatch [::bg/set-background-gold %])
-     {:class-name "input h-40"
+     {:class "input h-40"
       :type :number}]]
    [:div.m-b-10
     [:div.f-s-18.f-w-b.m-b-10 "Clothing"]
@@ -4891,7 +4932,7 @@
               [:span.f-w-b "Name"]
               name
               #(dispatch [edit-trait-name-event i %])
-              {:class-name "input h-40"}]]
+              {:class "input h-40"}]]
             (when types
               [:div.flex-grow-1.m-l-5
                [labeled-dropdown
@@ -5025,7 +5066,7 @@
 
 ;; dead — zero callers
 #_(def option-pack-styles
-  {:class-name "flex-grow-1 m-l-5 m-b-20"
+  {:class "flex-grow-1 m-l-5 m-b-20"
    :name "option-pack"})
 
 (defn get-plugin-names []
@@ -5041,7 +5082,7 @@
         ]
     (fn []
       [:div.flex-grow-1
-       {:class-name "m-l-5 m-b-20"
+       {:class "m-l-5 m-b-20"
         :name "option-pack"}
        [:div.f-w-b.m-b-5 label]
        [:input {:type "text"
@@ -5388,7 +5429,7 @@
         [:span.orange.pointer.f-s-18.m-l-5
          {:on-click #(swap! expanded? not)}
          [:i.fa.fa-question-circle.m-r-2]
-         [:i.fa {:class-name (if @expanded? "fa-caret-up" "fa-caret-down")}]]]
+         [:i.fa {:class (if @expanded? "fa-caret-up" "fa-caret-down")}]]]
        (when @expanded?
          [:div.bg-light.f-s-18
           help])])))
@@ -6205,8 +6246,32 @@
        ::e5/edit-background-trait-description
        ::e5/delete-background-trait]]]))
 
+(defn- find-duplicate-option-names
+  "Returns a set of option names (lowercased via name-to-kw) that appear more than once.
+   Used by selection-builder to highlight duplicate names inline."
+  [options]
+  (let [keys (map #(when-let [n (:name %)]
+                     (when-not (s/blank? n)
+                       (common/name-to-kw n)))
+                  options)
+        freqs (frequencies (remove nil? keys))]
+    (set (map first (filter #(> (val %) 1) freqs)))))
+
 (defn selection-builder []
-  (let [selection @(subscribe [::selections/builder-item])]
+  (let [selection @(subscribe [::selections/builder-item])
+        options (:options selection)
+        dupe-keys (find-duplicate-option-names options)
+        has-dupes? (seq dupe-keys)
+        ;; Collect the display names of duplicate options for the summary
+        dupe-names (when has-dupes?
+                     (->> options
+                          (filter #(and (not (s/blank? (:name %)))
+                                        (contains? dupe-keys (common/name-to-kw (:name %)))))
+                          (map :name)
+                          distinct
+                          sort))
+        ;; Check for empty/blank option names
+        has-empty? (some #(s/blank? (:name %)) options)]
     [:div.p-20.main-text-color
      [:div.flex.w-100-p.flex-wrap
       [selection-input-field
@@ -6225,31 +6290,58 @@
        [:button.form-button
         {:on-click #(dispatch [::selections/add-option])}
         "Add Option"]]
+      ;; Summary warning for duplicate names
+      (when has-dupes?
+        [:div.p-10.m-b-10.red
+         {:style {:background-color "rgba(255,0,0,0.1)"
+                  :border "1px solid red"
+                  :border-radius "4px"}}
+         [:span.f-w-b "Duplicate names found: "]
+         [:span (s/join ", " dupe-names)]
+         [:div.f-s-12 "Each option must have a unique name. Rename duplicates before saving."]])
+      ;; Warning for empty option names
+      (when has-empty?
+        [:div.p-10.m-b-10.red
+         {:style {:background-color "rgba(255,0,0,0.1)"
+                  :border "1px solid red"
+                  :border-radius "4px"}}
+         "One or more options have no name. All options must be named."])
       [:div
        (doall
         (map-indexed
          (fn [i {:keys [name description]}]
-           ^{:key i}
-           [:div.m-b-30
-            [:div.flex.align-items-end.m-b-10
-             [:div.f-w-b.f-s-24.m-r-10 (str (inc i) ".")]
-             [:div.flex-grow-1
-              [input-builder-field
-               [:span.f-w-b "Name"]
-               name
-               #(dispatch [::selections/set-selection-path-prop [:options i :name] %])
-               {:class-name "input h-40"}]]
-             [:div
-              [:button.form-button.m-l-5
-               {:on-click #(dispatch [::selections/delete-option i])}
-               "delete"]]]
-            [:div.w-100-p
-             [:div.f-w-b
-              "Description"]
-             [textarea-field
-              {:value description
-               :on-change #(dispatch [::selections/set-selection-path-prop [:options i :description] %])}]]])
-         (:options selection)))]]]))
+           (let [is-dupe? (and (not (s/blank? name))
+                               (contains? dupe-keys (common/name-to-kw name)))
+                 is-empty? (s/blank? name)]
+             ^{:key i}
+             [:div.m-b-30
+              [:div.flex.align-items-end.m-b-10
+               [:div.f-w-b.f-s-24.m-r-10 (str (inc i) ".")]
+               [:div.flex-grow-1
+                [input-builder-field
+                 [:span.f-w-b "Name"]
+                 name
+                 #(dispatch [::selections/set-selection-path-prop [:options i :name] %])
+                 {:class "input h-40"
+                  :style (when (or is-dupe? is-empty?)
+                           {:border "2px solid red"})}]
+                (when is-dupe?
+                  [:div.red.f-s-12.m-t-2
+                   "Duplicate name \u2014 rename to a unique name before saving"])
+                (when is-empty?
+                  [:div.red.f-s-12.m-t-2
+                   "Option name is required"])]
+               [:div
+                [:button.form-button.m-l-5
+                 {:on-click #(dispatch [::selections/delete-option i])}
+                 "delete"]]]
+              [:div.w-100-p
+               [:div.f-w-b
+                "Description"]
+               [textarea-field
+                {:value description
+                 :on-change #(dispatch [::selections/set-selection-path-prop [:options i :description] %])}]]]))
+         options))]]]))
 
 (defn language-builder []
   (let [language @(subscribe [::langs/builder-item])]
@@ -6425,7 +6517,7 @@
          (get hit-points :modifier 0)
          #(let [v (js/parseInt %)]
             (dispatch [::monsters/set-monster-path-prop [:hit-points :modifier] (when (not (js/isNaN v)) v)]))
-         {:class-name "input h-40"}]]
+         {:class "input h-40"}]]
       [monster-input-field
        "Speed"
        :speed
@@ -6571,10 +6663,9 @@
        {:items (cons
                 {:title "<select character>"}
                 (map
-                 (fn [{:keys [::char/character-name
-                              ::char/race-name
+                 (fn [{:keys [::char/race-name
                               ::char/classes] :as character-summary}]
-                   {:title (str character-name
+                   {:title (str (character-display-name character-summary)
                                 " - "
                                 race-name
                                 " "
@@ -6668,9 +6759,7 @@
 
 ;; dead — duplicates of common.cljc defs, never referenced from views
 #_(def rounds-per-minute 10)
-;; dead — duplicates of common.cljc defs, never referenced from views
 #_(def minutes-per-hour 60)
-;; dead — duplicates of common.cljc defs, never referenced from views
 #_(def hours-per-day 24)
 
 (def w-155 {:style {:width "155px"}})
@@ -6920,7 +7009,7 @@
                        [:span.f-w-b.f-s-12 "Initiative"]
                        initiative
                        #(dispatch [::combat/set-combat-path-prop path (js/parseInt %)])
-                       {:class-name "input h-40 w-80 f-s-24 f-w-b m-r-10 m-t-10 m-b-10"
+                       {:class "input h-40 w-80 f-s-24 f-w-b m-r-10 m-t-10 m-b-10"
                         :type :number}]
                       [:div.m-r-10
                        [svg-icon
@@ -6960,7 +7049,7 @@
                                        [svg-icon (get-in opt/conditions-map [type :icon]) 36]])
                                     conditions))]]))
                             (range num)))]])]
-                     [:i.fa {:class-name (if (get @expanded-rows path)
+                     [:i.fa {:class (if (get @expanded-rows path)
                                            "fa-caret-up"
                                            "fa-caret-down")}]]
                     (when (get @expanded-rows path)
@@ -6988,7 +7077,7 @@
                                           (get-in monster [:hit-points :mean]))
                                   #(dispatch [::combat/set-monster-hit-points combatant x (js/parseInt %)])
                                   {:type :number
-                                   :class-name "input w-80"}]]
+                                   :class "input w-80"}]]
                                 (let [current-round (dec (get tracker-item :round 1))
                                       conditions (get-in monster-data [(:key monster) x :conditions])
                                       used-conditions (into #{} (map :type) conditions)]
@@ -7179,7 +7268,7 @@
           "Item Name" ;:name
           name
           #(dispatch [::mi/set-item-name %])
-          {:class-name "input h-40"}]
+          {:class "input h-40"}]
        (when (seq name) 
          (valid-wel name))
        #_(when-let [messages (validate-name name)]
@@ -7263,7 +7352,7 @@
                                   (str num " " (capitalize-words final-type-name)))]]
           [:div.orange.pointer
            [:i.fa.m-r-5
-            {:class-name (if @expanded? "fa-caret-up" "fa-caret-down")}]
+            {:class (if @expanded? "fa-caret-up" "fa-caret-down")}]
            [:span.underline (if @expanded? "collapse" "expand")]]]
          (when @expanded?
            [:div.bg-lighter.p-10
@@ -7457,7 +7546,7 @@
         [:span.f-s-24.flex-grow-1 name]
         [:div.orange
          [:i.fa.m-r-5
-          {:class-name (if @expanded? "fa-caret-up" "fa-caret-down")}]
+          {:class (if @expanded? "fa-caret-up" "fa-caret-down")}]
          [:span.pointer.underline (if @expanded? "collapse" "expand")]]]
        (when @expanded?
          [:div.bg-lighter.p-10
@@ -7543,7 +7632,7 @@
                              (= @new-email @confirm-email))]
         [content-page
          "My Account"
-         [{:title (str "Delete Account")
+         [{:title "Delete Account"
            :icon "trash"
            :on-click #(dispatch
                       [:show-confirmation
@@ -7620,6 +7709,7 @@
                                (dispatch [:change-email-clear]))}
                "Change"]])]]])))
 
+
 (defn newb-character-builder-page []
   [content-page
    "Character Builder for Newbs"
@@ -7653,12 +7743,12 @@
           "View Character"]])
       [:div.m-t-20
        [:button.link-button
-        {:class-name (when (not has-history?) "disabled")
+        {:class (when (not has-history?) "disabled")
          :on-click #(when has-history? (dispatch [::char/previous-question]))}
         "Back"]
        [:button.form-button
         {:on-click #(when current-answer (dispatch [::char/next-question]))
-         :class-name (when (nil? current-answer) "disabled")}
+         :class (when (nil? current-answer) "disabled")}
         "Next"]]])
    :hide-header-message? true])
 
@@ -7804,7 +7894,15 @@
   (builder-page "Feat" ::feats/reset-feat ::feats/save-feat feat-builder))
 
 (defn expanded-character-list-item [id owner username char-page-route]
-  (let [folders @(subscribe [::folder/folders])
+  (let [built-char @(subscribe [::char/built-character id])
+        character @(subscribe [::char/character id])
+        plugin-data {:spells-map @(subscribe [::spells/spells-map])
+                     :plugin-spells-map @(subscribe [::spells/plugin-spells-map])
+                     :language-map @(subscribe [::langs/language-map])
+                     :all-weapons-map @(subscribe [::mi/all-weapons-map])
+                     :all-magic-items-map @(subscribe [::mi/all-magic-items-map])
+                     :current-armor-class @(subscribe [::char/current-armor-class id])}
+        folders @(subscribe [::folder/folders])
         char-folder-map @(subscribe [::folder/character-folder-map])
         current-folder-id (get char-folder-map id)]
     [:div
@@ -7813,7 +7911,7 @@
       [share-link id]
       (when (= username owner)
         [:button.form-button
-         {:on-click (make-event-handler :edit-character @(subscribe [::char/character id]))}
+         {:on-click (make-event-handler :edit-character character)}
          "edit"])
       (when (= username owner)
         [:button.form-button.m-l-5
@@ -7824,8 +7922,9 @@
        "view"]
       [:button.form-button.m-l-5
        {:on-click (export-pdf
-                   @(subscribe [::char/built-character id])
+                   built-char
                    id
+                   plugin-data
                    {:print-character-sheet? true
                     :print-spell-cards? true
                     :print-prepared-spells? false
@@ -7833,7 +7932,7 @@
                     :print-spell-card-dc-mod? true})}
        "print"]
       (when (and (= username owner) (seq folders))
-        [:select.form-button.m-l-5.builder-dropdown
+        [:select.form-button.m-l-5.builder-option-dropdown
          {:value (or current-folder-id "")
           :on-change (fn [e]
                        (let [val (.-value (.-target e))]
@@ -7891,7 +7990,7 @@
                                                             "collapse"
                                                             "open")])
         [:i.fa.m-l-5
-         {:class-name (if expanded? "fa-caret-up" "fa-caret-down")}]]]
+         {:class (if expanded? "fa-caret-up" "fa-caret-down")}]]]
       (when expanded?
         [expanded-character-list-item id owner username char-page-route])]]))
 
@@ -7920,7 +8019,7 @@
        [:div.flex.align-items-c.m-l-10
         (when (not folder-renaming?)
           [:i.fa.m-r-10.orange
-           {:class-name (if folder-expanded? "fa-folder-open" "fa-folder")}])
+           {:class (if folder-expanded? "fa-folder-open" "fa-folder")}])
         (if folder-renaming?
           [:div.flex.align-items-c
            [:input.input
@@ -7955,7 +8054,7 @@
                         (reset! confirm-delete? true))}
            "delete"]
           [:i.fa.m-l-10.orange
-           {:class-name (if folder-expanded? "fa-caret-up" "fa-caret-down")}]])]
+           {:class (if folder-expanded? "fa-caret-up" "fa-caret-down")}]])]
       (when @confirm-delete?
         [:div.p-20.flex.justify-cont-end
          [:div
@@ -8036,7 +8135,7 @@
            [:button.form-button
             {:on-click (fn [e] (.stopPropagation e) (swap! classes-open? not))}
             (str "Classes" (when (seq class-filters) (str " (" (count class-filters) ")")))
-            [:i.fa.m-l-5 {:class-name (if @classes-open? "fa-caret-up" "fa-caret-down")}]]
+            [:i.fa.m-l-5 {:class (if @classes-open? "fa-caret-up" "fa-caret-down")}]]
            (when @classes-open?
              [:div.filter-dropdown.main-text-color
               {:style {:min-width "160px"}}
@@ -8056,7 +8155,7 @@
            [:button.form-button
             {:on-click (fn [e] (.stopPropagation e) (swap! levels-open? not))}
             (str "Levels" (when (seq level-filters) (str " (" (count level-filters) ")")))
-            [:i.fa.m-l-5 {:class-name (if @levels-open? "fa-caret-up" "fa-caret-down")}]]
+            [:i.fa.m-l-5 {:class (if @levels-open? "fa-caret-up" "fa-caret-down")}]]
            (when @levels-open?
              [:div.filter-dropdown.main-text-color
               {:style {:min-width "120px"}}
@@ -8108,7 +8207,7 @@
        :on-click #(dispatch [:new-character])}
       {:title "Make Party"
        :icon "users"
-       :class-name (when (not has-selected?) "opacity-5 cursor-disabled")
+       :class (when (not has-selected?) "opacity-5 cursor-disabled")
        :on-click (when has-selected? (make-event-handler ::party/make-party selected-ids))}
       {:title "New Folder"
        :icon "folder"
@@ -8218,8 +8317,8 @@
                             (fn [{:keys [:db/id]}]
                               (character-ids id)))
                            (map
-                            (fn [{:keys [:db/id ::char/character-name]}]
-                              {:name character-name
+                            (fn [{:keys [:db/id] :as char-summary}]
+                              {:name (character-display-name char-summary)
                                :key id})))
                           @(subscribe [::char/characters]))
                          (fn [e]
@@ -8245,6 +8344,7 @@
                     (map
                      (fn [{:keys [::se/owner] :as summary}]
                        (let [character-id (:db/id summary)
+                             character @(subscribe [::char/character character-id])
                              expanded? (get-in @expanded-characters [id character-id])
                              char-page-path (routes/path-for routes/dnd-e5-char-page-route :id character-id)
                              char-page-route (routes/match-route char-page-path)]
@@ -8262,14 +8362,14 @@
                                                                                "collapse"
                                                                                "open")])
                              [:i.fa.m-l-5
-                              {:class-name (if expanded? "fa-caret-up" "fa-caret-down")}]]]
+                              {:class (if expanded? "fa-caret-up" "fa-caret-down")}]]]
                            (when expanded?
                              [:div
                               {:style character-display-style}
                               [:div.flex.justify-cont-end.uppercase.align-items-c
                                (when (= username owner)
                                  [:button.form-button
-                                  {:on-click #(dispatch [:edit-character @(subscribe [::char/character character-id])])}
+                                  {:on-click #(dispatch [:edit-character character])}
                                   "edit"])
                                [:button.form-button.m-l-5
                                 {:on-click #(dispatch [:route char-page-route])}
@@ -8300,7 +8400,7 @@
                                "collapse"
                                "open")])
           [:i.fa.m-l-5
-           {:class-name (if expanded? "fa-caret-up" "fa-caret-down")}]]]
+           {:class (if expanded? "fa-caret-up" "fa-caret-down")}]]]
         (when expanded?
           [:div.p-10
            {:style character-display-style}
@@ -8402,7 +8502,7 @@
                         "hide"
                         "filters")])
    [:i.fa.m-l-5
-    {:class-name (if @filters-expanded? "fa-caret-up" "fa-caret-down")}]])
+    {:class (if @filters-expanded? "fa-caret-up" "fa-caret-down")}]])
 
 (defn monster-list []
   (r/with-let [filters-expanded? (r/atom false)
@@ -8451,7 +8551,7 @@
                                                           "collapse"
                                                           "open")])
         [:i.fa.m-l-5
-         {:class-name (if expanded? "fa-caret-up" "fa-caret-down")}]]]
+         {:class (if expanded? "fa-caret-up" "fa-caret-down")}]]]
       (when expanded?
         [:div.p-10
          {:style character-display-style}
@@ -8514,7 +8614,7 @@
                                                           "collapse"
                                                           "open")])
         [:i.fa.m-l-5
-         {:class-name (if expanded? "fa-caret-up" "fa-caret-down")}]]]
+         {:class (if expanded? "fa-caret-up" "fa-caret-down")}]]]
       (when expanded?
         [:div.p-10
          {:style character-display-style}
diff --git a/src/cljs/orcpub/user_agent.cljs b/src/cljs/orcpub/user_agent.cljs
index be6ae55c2..9a292da71 100644
--- a/src/cljs/orcpub/user_agent.cljs
+++ b/src/cljs/orcpub/user_agent.cljs
@@ -1,19 +1,30 @@
 (ns orcpub.user-agent
-  (:require [goog.labs.userAgent.browser :as g-browser]
-            [goog.labs.userAgent.device :as g-device]
-            [goog.labs.userAgent.platform :as g-platform]))
+  "Browser, device, and platform detection utilities.
+   Uses native JS navigator.userAgent for compatibility across Closure Library versions."
+  (:require [goog.labs.userAgent.device :as g-device]
+            [goog.labs.userAgent.platform :as g-platform]
+            [clojure.string :as str]))
 
-(defn browser []
-  (cond
-    (g-browser/isChrome) :chrome
-    (g-browser/isEdge) :edge
-    (g-browser/isFirefox) :firefox
-    (g-browser/isIE) :ie
-    (g-browser/isSafari) :safari
-    :else :not-found))
+(defn- user-agent-string []
+  (when (exists? js/navigator)
+    (.-userAgent js/navigator)))
+
+(defn browser
+  "Detects the current browser. Returns a keyword like :chrome, :firefox, :safari, etc."
+  []
+  (let [ua (str/lower-case (or (user-agent-string) ""))]
+    (cond
+      (str/includes? ua "edg") :edge        ; Edge uses "Edg" in UA
+      (str/includes? ua "chrome") :chrome   ; Must check after Edge
+      (str/includes? ua "firefox") :firefox
+      (str/includes? ua "safari") :safari   ; Must check after Chrome
+      (str/includes? ua "opera") :opera
+      (or (str/includes? ua "msie") (str/includes? ua "trident")) :ie
+      :else :not-found)))
 
 (defn browser-version []
-  (g-browser/getVersion))
+  ;; Return empty string - version detection is complex and rarely needed
+  "")
 
 (defn device-type []
   (cond
diff --git a/test.cljs.edn b/test.cljs.edn
new file mode 100644
index 000000000..71b71f165
--- /dev/null
+++ b/test.cljs.edn
@@ -0,0 +1,8 @@
+^{:watch-dirs   ["test/cljc" "test/cljs" "src/cljc" "src/cljs"]
+  :css-dirs     []
+  :auto-testing true}
+{:main          orcpub.test-runner
+ :output-to     "target/test/js/test.js"
+ :output-dir    "target/test/js/out"
+ :asset-path    "js/out"
+ :optimizations :none}
diff --git a/test/clj/orcpub/csp_test.clj b/test/clj/orcpub/csp_test.clj
new file mode 100644
index 000000000..357ad2f17
--- /dev/null
+++ b/test/clj/orcpub/csp_test.clj
@@ -0,0 +1,92 @@
+(ns orcpub.csp-test
+  "Tests for CSP (Content Security Policy) nonce generation and header building."
+  ;; explicit :refer to avoid namespace pollution from :refer :all
+  (:require [clojure.test :refer [deftest testing is]]
+            [clojure.string :as str]
+            [orcpub.csp :as csp]
+            [orcpub.pedestal :as pedestal]))
+
+(deftest nonce-generation
+  (testing "Nonces are unique per call"
+    (let [nonces (repeatedly 100 csp/generate-nonce)]
+      (is (= 100 (count (set nonces)))
+          "100 nonces should all be unique")))
+
+  (testing "Nonces are 128-bit base64 encoded"
+    (let [nonce (csp/generate-nonce)]
+      ;; 16 bytes base64 encoded = 24 chars (with padding) or 22 (without)
+      (is (<= 22 (count nonce) 24)
+          (str "Nonce length should be 22-24 chars, got " (count nonce)))
+      ;; Should be valid base64 characters
+      (is (re-matches #"[A-Za-z0-9+/=]+" nonce)
+          "Nonce should contain only base64 characters"))))
+
+(deftest csp-header-format
+  (testing "Header contains nonce"
+    (let [nonce "abc123XYZ"
+          header (csp/build-csp-header nonce)]
+      (is (str/includes? header (str "'nonce-" nonce "'"))
+          "Header should contain nonce in 'nonce-xxx' format")
+      (is (str/includes? header "'strict-dynamic'")
+          "Header should contain 'strict-dynamic'")))
+
+  (testing "Header contains required security directives"
+    (let [header (csp/build-csp-header "test-nonce")]
+      (is (str/includes? header "default-src 'self'")
+          "Should have default-src directive")
+      (is (str/includes? header "object-src 'none'")
+          "Should block object embeds")
+      (is (str/includes? header "base-uri 'self'")
+          "Should restrict base-uri")
+      (is (str/includes? header "frame-ancestors 'self'")
+          "Should restrict frame-ancestors")
+      (is (str/includes? header "form-action 'self'")
+          "Should restrict form-action")))
+
+  (testing "Production mode does not include WebSocket"
+    (let [header (csp/build-csp-header "test")]
+      (is (not (str/includes? header "ws://"))
+          "Production header should not include WebSocket")))
+
+  (testing "Dev mode adds Figwheel WebSocket"
+    (let [header (csp/build-csp-header "test" :dev-mode? true)]
+      (is (str/includes? header "ws://localhost:3449")
+          "Dev mode header should include Figwheel WebSocket"))))
+
+(deftest csp-header-does-not-have-unsafe-inline-for-scripts
+  (testing "Strict mode should NOT have unsafe-inline in script-src"
+    (let [header (csp/build-csp-header "test-nonce")
+          ;; Extract just the script-src directive
+          script-src-match (re-find #"script-src[^;]+" header)]
+      (is (not (str/includes? (or script-src-match "") "'unsafe-inline'"))
+          "script-src should NOT contain 'unsafe-inline' in strict mode"))))
+
+(deftest nonce-interceptor-header-type
+  (testing "Dev mode interceptor is a no-op (no CSP header added)"
+    (let [interceptor (pedestal/make-nonce-interceptor true)
+          ctx {:request {}
+               :response {:status 200 :body "test"}}
+          ;; Run :enter phase — should NOT add a nonce in dev mode
+          enter-fn (get-in interceptor [:enter])
+          after-enter (enter-fn ctx)]
+      (is (nil? (get-in after-enter [:request :csp-nonce]))
+          "Dev mode :enter should not generate a nonce")
+      ;; Run :leave phase — without a nonce, should not add any header
+      (let [leave-fn (get-in interceptor [:leave])
+            result (leave-fn after-enter)]
+        (is (not (contains? (get-in result [:response :headers]) "Content-Security-Policy"))
+            "Dev mode should NOT add Content-Security-Policy header")
+        (is (not (contains? (get-in result [:response :headers]) "Content-Security-Policy-Report-Only"))
+            "Dev mode should NOT add Content-Security-Policy-Report-Only header"))))
+
+  (testing "Prod mode interceptor uses enforcing header"
+    (let [interceptor (pedestal/make-nonce-interceptor false)
+          ctx {:request {}
+               :response {:status 200 :body "test"}}
+          ctx-with-nonce (assoc-in ctx [:request :csp-nonce] "test-nonce")
+          leave-fn (get-in interceptor [:leave])
+          result (leave-fn ctx-with-nonce)]
+      (is (contains? (get-in result [:response :headers]) "Content-Security-Policy")
+          "Prod mode should use Content-Security-Policy header")
+      (is (not (contains? (get-in result [:response :headers]) "Content-Security-Policy-Report-Only"))
+          "Prod mode should NOT use Content-Security-Policy-Report-Only header"))))
diff --git a/test/clj/orcpub/dependencies/integration_test.clj b/test/clj/orcpub/dependencies/integration_test.clj
new file mode 100644
index 000000000..4925972c8
--- /dev/null
+++ b/test/clj/orcpub/dependencies/integration_test.clj
@@ -0,0 +1,148 @@
+(ns orcpub.dependencies.integration-test
+  "Integration tests to validate Jackson 2.15.2 and Guava 32.1.2-jre upgrades.
+   Tests actual runtime behavior of upgraded dependencies."
+  ;; explicit :refer to avoid namespace pollution from :refer :all
+  (:require [clojure.test :refer [deftest testing is]]
+            [cheshire.core :as json]
+            [datomic.api :as d])
+  (:import [com.google.common.collect ImmutableList ImmutableMap]
+           [com.google.common.base Strings]
+           [com.fasterxml.jackson.databind ObjectMapper]
+           [java.util UUID]))
+
+(deftest test-jackson-json-serialization
+  (testing "Jackson can serialize complex Clojure data structures"
+    (let [data {:name "Test Character"
+                :level 5
+                :abilities {:str 18 :dex 14 :con 16}
+                :skills ["athletics" "perception"]
+                :nested {:deep {:value 42}}}
+          json-str (json/generate-string data)
+          parsed (json/parse-string json-str true)]
+      (is (string? json-str))
+      (is (= "Test Character" (:name parsed)))
+      (is (= 5 (:level parsed)))
+      (is (= 18 (get-in parsed [:abilities :str])))
+      (is (= ["athletics" "perception"] (:skills parsed)))
+      (is (= 42 (get-in parsed [:nested :deep :value]))))))
+
+(deftest test-jackson-handles-edge-cases
+  (testing "Jackson 2.15.2 handles edge cases that had CVEs in 2.11.x"
+    ;; Test deeply nested objects (related to CVE-2020-36518)
+    (let [deeply-nested (reduce (fn [acc _] {:nested acc})
+                                {:value "deep"}
+                                (range 50))
+          json-str (json/generate-string deeply-nested)
+          parsed (json/parse-string json-str true)]
+      (is (map? parsed))
+      (is (contains? parsed :nested)))
+    
+    ;; Test with nil values
+    (let [data {:key nil :other "value"}
+          json-str (json/generate-string data)
+          parsed (json/parse-string json-str true)]
+      (is (nil? (:key parsed)))
+      (is (= "value" (:other parsed))))))
+
+(deftest test-jackson-object-mapper-direct
+  (testing "Jackson ObjectMapper works directly (used by Pedestal)"
+    (let [mapper (ObjectMapper.)
+          data {"name" "Direct Test" "value" 123}
+          json-str (.writeValueAsString mapper data)
+          parsed (.readValue mapper json-str java.util.Map)]
+      (is (string? json-str))
+      (is (= "Direct Test" (.get parsed "name")))
+      (is (= 123 (.get parsed "value"))))))
+
+(deftest test-guava-immutable-collections
+  (testing "Guava 32.1.2-jre ImmutableList works correctly"
+    (let [list (ImmutableList/of "a" "b" "c")]
+      (is (= 3 (.size list)))
+      (is (= "a" (.get list 0)))
+      (is (= "c" (.get list 2)))
+      (is (thrown? UnsupportedOperationException
+                   (.add list "d")))))
+  
+  (testing "Guava ImmutableMap works correctly"
+    (let [map (ImmutableMap/of "key1" "value1" "key2" "value2")]
+      (is (= 2 (.size map)))
+      (is (= "value1" (.get map "key1")))
+      (is (thrown? UnsupportedOperationException
+                   (.put map "key3" "value3"))))))
+
+(deftest test-guava-strings-utility
+  (testing "Guava Strings utility class works"
+    (is (true? (Strings/isNullOrEmpty nil)))
+    (is (true? (Strings/isNullOrEmpty "")))
+    (is (false? (Strings/isNullOrEmpty "test")))
+    (is (= "test" (Strings/nullToEmpty "test")))
+    (is (= "" (Strings/nullToEmpty nil)))
+    (is (= "aaa" (Strings/repeat "a" 3)))))
+
+(deftest test-json-round-trip-with-character-data
+  (testing "JSON round-trip with realistic D&D character data"
+    (let [character {:name "Thorin Oakenshield"
+                     :race "Dwarf"
+                     :class "Fighter"
+                     :level 10
+                     :hp 95
+                     :ac 18
+                     :abilities {:str 18 :dex 12 :con 16 :int 10 :wis 14 :cha 8}
+                     :proficiencies ["athletics" "intimidation" "perception"]
+                     :equipment [{:name "Battleaxe" :damage "1d8" :type "slashing"}
+                                 {:name "Shield" :ac-bonus 2}]
+                     :features ["Action Surge" "Second Wind" "Extra Attack"]}
+          json-str (json/generate-string character)
+          parsed (json/parse-string json-str true)]
+      ;; Verify all fields round-trip correctly
+      (is (= (:name character) (:name parsed)))
+      (is (= (:class character) (:class parsed)))
+      (is (= (:level character) (:level parsed)))
+      (is (= (get-in character [:abilities :str]) 
+             (get-in parsed [:abilities :str])))
+      (is (= (count (:proficiencies character))
+             (count (:proficiencies parsed))))
+      (is (= (count (:equipment character))
+             (count (:equipment parsed))))
+      (is (= "Battleaxe" (get-in parsed [:equipment 0 :name]))))))
+
+(deftest test-compatibility-with-existing-code
+  (testing "Upgraded dependencies don't break existing json-params usage"
+    ;; Simulate what happens in routes when processing JSON request bodies
+    (let [simulated-json-params {:username "testuser"
+                                 :email "test@example.com"
+                                 :password "secret123"
+                                 :send-updates? true}
+          ;; Convert to JSON and back (simulating HTTP request/response)
+          json-str (json/generate-string simulated-json-params)
+          parsed (json/parse-string json-str true)]
+      (is (= "testuser" (:username parsed)))
+      (is (= "test@example.com" (:email parsed)))
+      (is (= true (:send-updates? parsed))))))
+
+(deftest test-datomic-pro-basic-connectivity
+  (testing "Datomic Pro can create in-memory database and perform basic operations"
+    (let [uri (str "datomic:mem://test-db-" (UUID/randomUUID))]
+      ;; Test database creation
+      (is (true? (d/create-database uri)) "Database creation succeeds")
+
+      ;; Test connection
+      (let [conn (d/connect uri)]
+        (is (some? conn) "Connection created successfully")
+
+        ;; Test schema transaction
+        (let [schema [{:db/ident :person/name
+                       :db/valueType :db.type/string
+                       :db/cardinality :db.cardinality/one
+                       :db/doc "A person's name"}]]
+          (is (some? @(d/transact conn schema)) "Schema transaction succeeds"))
+
+        ;; Test data insertion and query
+        (is (some? @(d/transact conn [{:person/name "Test User"}])) "Data insertion succeeds")
+
+        (let [db (d/db conn)
+              result (d/q '[:find ?name :where [_ :person/name ?name]] db)]
+          (is (= #{["Test User"]} result) "Query returns expected result"))
+
+        ;; Test database deletion
+        (is (true? (d/delete-database uri)) "Database deletion succeeds")))))
diff --git a/test/clj/orcpub/dnd/e5_test.clj b/test/clj/orcpub/dnd/e5_test.clj
index 66626f55d..894ec7c9b 100644
--- a/test/clj/orcpub/dnd/e5_test.clj
+++ b/test/clj/orcpub/dnd/e5_test.clj
@@ -1,4 +1,5 @@
 (ns orcpub.dnd.e5-test
+  ;; explicit :refer to avoid namespace pollution from :refer :all
   (:require [clojure.test :refer [deftest is]]
             [orcpub.dnd.e5 :as e5]
             [clojure.spec.alpha :as spec]))
diff --git a/test/clj/orcpub/email_change_test.clj b/test/clj/orcpub/email_change_test.clj
index 37d7ff3d4..16e18affd 100644
--- a/test/clj/orcpub/email_change_test.clj
+++ b/test/clj/orcpub/email_change_test.clj
@@ -2,15 +2,22 @@
   "Tests for the email change flow (PR #644).
    Uses datomock for in-memory Datomic and with-redefs to stub email sending."
   (:require
-   [clojure.test :refer [deftest is testing]]
+   [clojure.test :refer [deftest is testing use-fixtures]]
    [datomic.api :as d]
    [datomock.core :as dm]
    [buddy.hashers :as hashers]
+   [orcpub.errors :as errors]
    [orcpub.routes :as routes]
    [orcpub.route-map :as route-map]
    [orcpub.db.schema :as schema])
   (:import [java.util UUID]))
 
+;; Prefix error output so CI logs distinguish test-expected errors.
+(use-fixtures :each
+  (fn [f]
+    (binding [errors/*error-prefix* "TEST_ERROR:"]
+      (f))))
+
 (defmacro with-conn [conn-binding & body]
   `(let [uri# (str "datomic:mem:email-change-test-" (UUID/randomUUID))
          ~conn-binding (do
diff --git a/test/clj/orcpub/entity_spec_test.clj b/test/clj/orcpub/entity_spec_test.clj
index dfd335ec0..c08ca59c5 100644
--- a/test/clj/orcpub/entity_spec_test.clj
+++ b/test/clj/orcpub/entity_spec_test.clj
@@ -47,8 +47,8 @@
    (modifiers/modifier ?skill-expertise (conj (or ?skill-expertise #{}) :perception))
    (modifiers/modifier ?skill-prof-bonuses (reduce-kv
                          (fn [m k v]
+                           (assoc m k (if (?skill-expertise k)
                                         (* 2 v)
-                           (assoc m k (when (?skill-expertise k)
                                         v)))
                          {}
                          ?skill-prof-bonuses))
diff --git a/test/clj/orcpub/errors_test.clj b/test/clj/orcpub/errors_test.clj
index 2f40c9be9..a08aedf17 100644
--- a/test/clj/orcpub/errors_test.clj
+++ b/test/clj/orcpub/errors_test.clj
@@ -1,9 +1,16 @@
 (ns orcpub.errors-test
   "Tests for error handling utilities."
   (:require
-   [clojure.test :refer [deftest is testing]]
+   [clojure.test :refer [deftest is testing use-fixtures]]
    [orcpub.errors :as errors]))
 
+;; Prefix all error output with TEST_ERROR so CI logs can distinguish
+;; expected error-path output from real failures.
+(use-fixtures :each
+  (fn [f]
+    (binding [errors/*error-prefix* "TEST_ERROR:"]
+      (f))))
+
 (deftest test-log-error
   (testing "log-error logs message without context"
     (is (nil? (errors/log-error "ERROR:" "Test message"))))
diff --git a/test/clj/orcpub/pdf_test.clj b/test/clj/orcpub/pdf_test.clj
index 0a23eb76a..9487c924b 100644
--- a/test/clj/orcpub/pdf_test.clj
+++ b/test/clj/orcpub/pdf_test.clj
@@ -1,21 +1,25 @@
 (ns orcpub.pdf-test
-  (:require [clojure.test :refer [deftest is]]
+  ;; explicit :refer to avoid namespace pollution from :refer :all
+  (:require [clojure.test :refer [deftest is testing]]
             [orcpub.pdf :as pdf])
   (:import (org.apache.pdfbox.pdmodel PDDocument PDPage PDPageContentStream)))
 
 (deftest fonts-test
-  (let [^PDDocument doc (PDDocument.)
-        ^PDPage page (PDPage.)
-        fonts (pdf/load-fonts doc)
-        required-keys [:plain :bold :italic :bold-italic]]
-    (is (every? some? (map fonts required-keys)))
-    (is (do (.addPage doc page)
+  (testing "Font creation and ability to print latin and cyrillic characters"
+    (let [^PDDocument doc (PDDocument.)
+          ^PDPage page (PDPage.)
+          fonts (pdf/load-fonts doc)
+          required-keys [:plain :bold :italic :bold-italic]]
+      (is (every? some? (map fonts required-keys)))
+      (.addPage doc page)
+      ;; Single content stream tests all fonts - more efficient than 4 separate streams
+      (is (with-open [cs (PDPageContentStream. doc page)]
             (doseq [font-type required-keys]
-              (doto (PDPageContentStream. doc page)
+              (doto cs
                 (.beginText)
                 (.setFont (font-type fonts) 14)
-                (.newLine)
-                (.showText "abcABC012_?%абвАБВ")
+                (.newLineAtOffset (float 72) (float 700))
+                (.showText (str (name font-type) ": abcABC012_?%абвАБВ"))
                 (.endText)))
             true))
-    (.close doc)))
+      (.close doc))))
diff --git a/test/clj/orcpub/routes/folder_test.clj b/test/clj/orcpub/routes/folder_test.clj
index 7ab4005d7..297b24008 100644
--- a/test/clj/orcpub/routes/folder_test.clj
+++ b/test/clj/orcpub/routes/folder_test.clj
@@ -78,6 +78,18 @@
       (testing "body has a db/id"
         (is (int? (:db/id (:body result))))))))
 
+(deftest test-create-folder--nil-name-defaults
+  (with-conn conn
+    (setup-db! conn)
+    (let [mocked-conn (dm/fork-conn conn)
+          result      (folder/create-folder {:conn           mocked-conn
+                                             :identity       {:user "alice"}
+                                             :transit-params {}})]
+      (testing "returns HTTP 200"
+        (is (= 200 (:status result))))
+      (testing "name defaults to New Folder"
+        (is (= "New Folder" (::folder5e/name (:body result))))))))
+
 ;; ---------------------------------------------------------------------------
 ;; folders (list)
 
@@ -117,6 +129,49 @@
       (testing "folder name is updated"
         (is (= "New Name" (::folder5e/name (:body result))))))))
 
+;; ---------------------------------------------------------------------------
+;; update-folder-name — validation
+
+(deftest test-update-folder-name--blank-rejected
+  (with-conn conn
+    (setup-db! conn)
+    (let [mocked-conn (dm/fork-conn conn)
+          created     (create-folder! mocked-conn "alice" "Original")
+          folder-id   (:db/id created)]
+      (testing "empty string returns 400"
+        (is (= 400 (:status (folder/update-folder-name
+                              {:conn mocked-conn
+                               :transit-params ""
+                               :path-params {:id folder-id}})))))
+      (testing "whitespace-only returns 400"
+        (is (= 400 (:status (folder/update-folder-name
+                              {:conn mocked-conn
+                               :transit-params "   "
+                               :path-params {:id folder-id}})))))
+      (testing "nil coerced to blank returns 400"
+        (is (= 400 (:status (folder/update-folder-name
+                              {:conn mocked-conn
+                               :transit-params nil
+                               :path-params {:id folder-id}})))))
+      (testing "name is unchanged after rejected renames"
+        (let [db-name (::folder5e/name (d/pull (d/db mocked-conn)
+                                               [::folder5e/name] folder-id))]
+          (is (= "Original" db-name)))))))
+
+(deftest test-update-folder-name--trims-whitespace
+  (with-conn conn
+    (setup-db! conn)
+    (let [mocked-conn (dm/fork-conn conn)
+          created     (create-folder! mocked-conn "alice" "Old")
+          folder-id   (:db/id created)
+          result      (folder/update-folder-name {:conn mocked-conn
+                                                  :transit-params "  Trimmed  "
+                                                  :path-params {:id folder-id}})]
+      (testing "returns 200"
+        (is (= 200 (:status result))))
+      (testing "name is trimmed"
+        (is (= "Trimmed" (::folder5e/name (:body result))))))))
+
 ;; ---------------------------------------------------------------------------
 ;; add-character
 
diff --git a/test/clj/orcpub/security_test.clj b/test/clj/orcpub/security_test.clj
index 642e27246..049be1ec5 100644
--- a/test/clj/orcpub/security_test.clj
+++ b/test/clj/orcpub/security_test.clj
@@ -1,9 +1,15 @@
 (ns orcpub.security-test
   (:require [clojure.test :refer [deftest is]]
-            [clj-time.core :as t :refer [hours minutes seconds ago now]]
+            [orcpub.time :as time :refer [seconds minutes hours millis ago now]]
             [orcpub.security :as s]
             [clojure.set :as sets]))
 
+;; Convenience wrappers for tests - these take n and return an Instant n units ago
+(defn seconds-ago [n] (-> n seconds ago))
+(defn minutes-ago [n] (-> n minutes ago))
+(defn hours-ago [n] (-> n hours ago))
+(defn millis-ago [n] (-> n millis ago))
+
 (defn attempts-set [attempts]
   (into
    (sorted-set-by s/compare-dates)
@@ -19,30 +25,30 @@
 
 (deftest test-compare-dates
   (is (= 1 (s/compare-dates
-            {:date (-> 10 seconds ago)}
-            {:date (-> 11 seconds ago)})))
+            {:date (seconds-ago 10)}
+            {:date (seconds-ago 11)})))
   (is (= 1 (s/compare-dates
-            {:date (-> 10 seconds ago)}
-            {:date (-> 11 minutes ago)})))
+            {:date (seconds-ago 10)}
+            {:date (minutes-ago 11)})))
   (is (= -1 (s/compare-dates
-            {:date (-> 10 seconds ago)}
-            {:date (-> 9 seconds ago)})))
+            {:date (seconds-ago 10)}
+            {:date (seconds-ago 9)})))
   (is (= -1 (s/compare-dates
-            {:date (-> 10 minutes ago)}
-            {:date (-> 9 seconds ago)}))))
+            {:date (minutes-ago 10)}
+            {:date (seconds-ago 9)}))))
 
 (deftest test-too-many-attempts-for-username?
-  (let [attempts {"larry" (attempts-for-dates (map #(-> % seconds ago) (range 5)))
-                  "larry-2" (attempts-for-dates (map #(-> % seconds ago) (range 6)))
-                  "redorc" (attempts-for-dates (map #(-> % seconds ago) (range 4)))
+  (let [attempts {"larry" (attempts-for-dates (map seconds-ago (range 5)))
+                  "larry-2" (attempts-for-dates (map seconds-ago (range 6)))
+                  "redorc" (attempts-for-dates (map seconds-ago (range 4)))
                   "redorc-2" (sets/union
-                              (attempts-for-dates (map #(-> % seconds ago) (range 1 5)))
-                              (attempts-for-dates (map #(-> % hours ago) (range 1 6))))}]
+                              (attempts-for-dates (map seconds-ago (range 1 5)))
+                              (attempts-for-dates (map hours-ago (range 1 6))))}]
     (is (s/too-many-attempts-for-username-aux "larry" attempts))
     (is (s/too-many-attempts-for-username-aux "larry-2" attempts))
     (is (not (s/too-many-attempts-for-username-aux "redorc" attempts)))
-    (is (= 5 (-> "redorc-2" attempts (subseq < {:date (-> 1 minutes ago)}) count)))
-    (is (= 4 (-> "redorc-2" attempts (subseq > {:date (-> 1 minutes ago)}) count)))
+    (is (= 5 (-> "redorc-2" attempts (subseq < {:date (minutes-ago 1)}) count)))
+    (is (= 4 (-> "redorc-2" attempts (subseq > {:date (minutes-ago 1)}) count)))
     (is (not (s/too-many-attempts-for-username-aux "redorc-2" attempts)))
     (is (not (s/too-many-attempts-for-username-aux "larry-3" attempts)))))
 
@@ -50,19 +56,19 @@
   (let [attempts {"1.2.3.4" (attempts-set
                              (map
                               (fn [i]
-                                {:date (-> i seconds ago)
+                                {:date (seconds-ago i)
                                  :user (str "user-" i)})
                               (range 5)))
                   "1.2.3.5" (attempts-set
                              (map
                               (fn [i]
-                                {:date (-> i seconds ago)
+                                {:date (seconds-ago i)
                                  :user (str "user-" i)})
                               (range 6)))
                   "1.2.3.6" (attempts-set
                              (map
                               (fn [i]
-                                {:date (-> i seconds ago)
+                                {:date (seconds-ago i)
                                  :user (str "user-" i)})
                               (range 4)))}
         attempts-2 (update
@@ -72,7 +78,7 @@
                     (attempts-set
                      (map
                       (fn [i]
-                        {:date (-> i hours ago)
+                        {:date (hours-ago i)
                          :user (str "user-" i)})
                       (range 1 10))))]
     (is (s/multiple-account-access-aux "1.2.3.4" attempts))
@@ -86,19 +92,19 @@
   (let [attempts {"user-1" (attempts-set
                             (map
                              (fn [i]
-                               {:date (-> i millis ago)
+                               {:date (millis-ago i)
                                 :ip (str i)})
                              (range 3)))
                   "user-2" (attempts-set
                             (map
                              (fn [i]
-                               {:date (-> i millis ago)
+                               {:date (millis-ago i)
                                 :ip (str i)})
                              (range 4)))
                   "user-3" (attempts-set
                             (map
                              (fn [i]
-                               {:date (-> i millis ago)
+                               {:date (millis-ago i)
                                 :ip (str i)})
                              (range 2)))}]
     (is (s/multiple-ip-attempts-to-same-account-aux
@@ -147,21 +153,21 @@
                              (fn [i]
                                {:ip (str i)
                                 :user "user-1"
-                                :date (-> i minutes ago)})
+                                :date (minutes-ago i)})
                              (range 1 10)))
                   "user-2" (attempts-set
                             (map
                              (fn [i]
                                {:ip (str i)
                                 :user "user-2"
-                                :date (-> (+ i 10) minutes ago)})
+                                :date (minutes-ago (+ i 10))})
                              (range 1 10)))
                   "user-3" (attempts-set
                             (map
                              (fn [i]
                                {:ip (str i)
                                 :user "user-3"
-                                :date (-> i minutes ago)})
+                                :date (minutes-ago i)})
                              (range 1 20)))}
         result (s/add-and-remove-old
                 "user-1"
@@ -169,7 +175,7 @@
                  :user "user-1"
                  :date (now)}
                 attempts
-                (-> 10 minutes ago))]
+                (minutes-ago 10))]
     (is (-> "user-2" result nil?))
     (is (= 10 (-> "user-1" result count)))
     (is (= 9 (-> "user-3" result count)))))
diff --git a/test/clj/orcpub/tools/orcbrew_test.clj b/test/clj/orcpub/tools/orcbrew_test.clj
index 3cf092f4c..92df998a1 100644
--- a/test/clj/orcpub/tools/orcbrew_test.clj
+++ b/test/clj/orcpub/tools/orcbrew_test.clj
@@ -1,13 +1,14 @@
 (ns orcpub.tools.orcbrew-test
   "Tests for the orcbrew CLI tool error handling.
-   Verifies that bad args throw ex-info instead of System/exit (REPL-safe)."
+   Verifies that bad args throw ex-info instead of System/exit (REPL-safe).
+   Test bodies capture stdout so CLI error/usage output doesn't pollute CI logs."
   (:require [clojure.test :refer [deftest testing is]]
             [orcpub.tools.orcbrew :as orcbrew]))
 
 (deftest test-main-no-args-throws-not-exits
   (testing "-main with no args throws ex-info instead of killing the JVM"
     (try
-      (orcbrew/-main)
+      (with-out-str (orcbrew/-main))
       (is false "Should have thrown ex-info")
       (catch clojure.lang.ExceptionInfo e
         (is (= :usage-error (:type (ex-data e))))))))
@@ -15,7 +16,7 @@
 (deftest test-main-missing-file-throws-not-exits
   (testing "-main with nonexistent file throws with file info"
     (try
-      (orcbrew/-main "totally-nonexistent-file.orcbrew")
+      (with-out-str (orcbrew/-main "totally-nonexistent-file.orcbrew"))
       (is false "Should have thrown ex-info")
       (catch clojure.lang.ExceptionInfo e
         (is (= :file-not-found (:type (ex-data e))))
diff --git a/test/cljc/orcpub/dnd/e5/character_test.clj b/test/cljc/orcpub/dnd/e5/character_test.clj
index 232ef3c65..d84916a0e 100644
--- a/test/cljc/orcpub/dnd/e5/character_test.clj
+++ b/test/cljc/orcpub/dnd/e5/character_test.clj
@@ -1,5 +1,5 @@
 (ns orcpub.dnd.e5.character-test
-  (:require [clojure.test :refer [deftest is]]
+  (:require [clojure.test :refer [is deftest]]
             [clojure.spec.alpha :as spec]
             [orcpub.dnd.e5.character :as char]
             [orcpub.dnd.e5.character.equipment :as equip]
@@ -105,9 +105,7 @@
 (deftest strict-round-trip-2
   (let [strict {:db/id 17592186056344, :orcpub.entity.strict/owner "larry", :orcpub.entity.strict/values {:db/id 17592186056463, :orcpub.dnd.e5.character/custom-equipment [{:db/id 17592186056464, :orcpub.dnd.e5.character.equipment/name "Scroll of Pedigree", :orcpub.dnd.e5.character.equipment/quantity 1, :orcpub.dnd.e5.character.equipment/equipped? true, :orcpub.dnd.e5.character.equipment/background-starting-equipment? true}]}, :orcpub.entity.strict/selections [{:db/id 17592186056345, :orcpub.entity.strict/key :magic-armor, :orcpub.entity.strict/options [{:db/id 17592186056346, :orcpub.entity.strict/key :armor-of-resistance-half-plate, :orcpub.entity.strict/map-value {:db/id 17592186056347, :orcpub.dnd.e5.character.equipment/quantity 1, :orcpub.dnd.e5.character.equipment/equipped? true}}]} {:db/id 17592186056348, :orcpub.entity.strict/key :weapons, :orcpub.entity.strict/options [{:db/id 17592186056349, :orcpub.entity.strict/key :halberd, :orcpub.entity.strict/map-value {:db/id 17592186056350, :orcpub.dnd.e5.character.equipment/quantity 1, :orcpub.dnd.e5.character.equipment/equipped? true}} {:db/id 17592186056351, :orcpub.entity.strict/key :greataxe, :orcpub.entity.strict/map-value {:db/id 17592186056352, :orcpub.dnd.e5.character.equipment/quantity 1, :orcpub.dnd.e5.character.equipment/equipped? true}}]} {:db/id 17592186056353, :orcpub.entity.strict/key :race, :orcpub.entity.strict/option {:db/id 17592186056354, :orcpub.entity.strict/key :human, :orcpub.entity.strict/selections [{:db/id 17592186056355, :orcpub.entity.strict/key :subrace, :orcpub.entity.strict/option {:db/id 17592186056356, :orcpub.entity.strict/key :damaran}} {:db/id 17592186056357, :orcpub.entity.strict/key :variant, :orcpub.entity.strict/option {:db/id 17592186056358, :orcpub.entity.strict/key :standard-human}}]}} {:db/id 17592186056359, :orcpub.entity.strict/key :ability-scores, :orcpub.entity.strict/option {:db/id 17592186056360, :orcpub.entity.strict/key :standard-roll, :orcpub.entity.strict/map-value {:db/id 17592186056361, :orcpub.dnd.e5.character/str 18, :orcpub.dnd.e5.character/dex 7, :orcpub.dnd.e5.character/con 13, :orcpub.dnd.e5.character/int 12, :orcpub.dnd.e5.character/wis 8, :orcpub.dnd.e5.character/cha 9}}} {:db/id 17592186056362, :orcpub.entity.strict/key :alignment, :orcpub.entity.strict/option {:db/id 17592186056363, :orcpub.entity.strict/key :lawful-evil}} {:db/id 17592186056364, :orcpub.entity.strict/key :other-magic-items, :orcpub.entity.strict/options [{:db/id 17592186056365, :orcpub.entity.strict/key :amulet-of-the-planes, :orcpub.entity.strict/map-value {:db/id 17592186056366, :orcpub.dnd.e5.character.equipment/quantity 1, :orcpub.dnd.e5.character.equipment/equipped? true}}]} {:db/id 17592186056367, :orcpub.entity.strict/key :background, :orcpub.entity.strict/option {:db/id 17592186056368, :orcpub.entity.strict/key :noble, :orcpub.entity.strict/selections [{:db/id 17592186056369, :orcpub.entity.strict/key :noble-feature, :orcpub.entity.strict/option {:db/id 17592186056370, :orcpub.entity.strict/key :retainers}}]}} {:db/id 17592186056371, :orcpub.entity.strict/key :equipment, :orcpub.entity.strict/options [{:db/id 17592186056372, :orcpub.entity.strict/key :clothes-fine, :orcpub.entity.strict/map-value {:db/id 17592186056373, :orcpub.dnd.e5.character.equipment/quantity 1, :orcpub.dnd.e5.character.equipment/equipped? true, :orcpub.dnd.e5.character.equipment/background-starting-equipment? true}} {:db/id 17592186056374, :orcpub.entity.strict/key :signet-ring, :orcpub.entity.strict/map-value {:db/id 17592186056375, :orcpub.dnd.e5.character.equipment/quantity 1, :orcpub.dnd.e5.character.equipment/equipped? true, :orcpub.dnd.e5.character.equipment/background-starting-equipment? true}} {:db/id 17592186056376, :orcpub.entity.strict/key :purse, :orcpub.entity.strict/map-value {:db/id 17592186056377, :orcpub.dnd.e5.character.equipment/quantity 1, :orcpub.dnd.e5.character.equipment/equipped? true, :orcpub.dnd.e5.character.equipment/background-starting-equipment? true}}]} {:db/id 17592186056378, :orcpub.entity.strict/key :treasure, :orcpub.entity.strict/options [{:db/id 17592186056379, :orcpub.entity.strict/key :gp, :orcpub.entity.strict/map-value {:db/id 17592186056380, :orcpub.dnd.e5.character.equipment/quantity 25, :orcpub.dnd.e5.character.equipment/equipped? true, :orcpub.dnd.e5.character.equipment/background-starting-equipment? true}}]} {:db/id 17592186056381, :orcpub.entity.strict/key :feats, :orcpub.entity.strict/options [{:db/id 17592186056382, :orcpub.entity.strict/key :ritual-caster, :orcpub.entity.strict/selections [{:db/id 17592186056383, :orcpub.entity.strict/key :ritual-caster-spell-class, :orcpub.entity.strict/option {:db/id 17592186056384, :orcpub.entity.strict/key :druid, :orcpub.entity.strict/selections [{:db/id 17592186056385, :orcpub.entity.strict/key :level-1-ritual, :orcpub.entity.strict/options [{:db/id 17592186056386, :orcpub.entity.strict/key :purify-food-and-drink} {:db/id 17592186056387, :orcpub.entity.strict/key :detect-magic}]}]}}]}]} {:db/id 17592186056388, :orcpub.entity.strict/key :class, :orcpub.entity.strict/options [{:db/id 17592186056389, :orcpub.entity.strict/key :fighter, :orcpub.entity.strict/selections [{:db/id 17592186056390, :orcpub.entity.strict/key :starting-equipment-armor, :orcpub.entity.strict/option {:db/id 17592186056391, :orcpub.entity.strict/key :leather-armor-longbow-20-arrows}} {:db/id 17592186056392, :orcpub.entity.strict/key :starting-equipment-weapons, :orcpub.entity.strict/option {:db/id 17592186056393, :orcpub.entity.strict/key :martial-weapon-and-shield, :orcpub.entity.strict/selections [{:db/id 17592186056394, :orcpub.entity.strict/key :starting-equipment-martial-weapon, :orcpub.entity.strict/option {:db/id 17592186056395, :orcpub.entity.strict/key :longbow}}]}} {:db/id 17592186056396, :orcpub.entity.strict/key :levels, :orcpub.entity.strict/options [{:db/id 17592186056397, :orcpub.entity.strict/key :level-1} {:db/id 17592186056398, :orcpub.entity.strict/key :level-2, :orcpub.entity.strict/selections [{:db/id 17592186056399, :orcpub.entity.strict/key :hit-points, :orcpub.entity.strict/option {:db/id 17592186056400, :orcpub.entity.strict/key :roll, :orcpub.entity.strict/int-value 1}}]} {:db/id 17592186056401, :orcpub.entity.strict/key :level-3, :orcpub.entity.strict/selections [{:db/id 17592186056402, :orcpub.entity.strict/key :hit-points, :orcpub.entity.strict/option {:db/id 17592186056403, :orcpub.entity.strict/key :roll, :orcpub.entity.strict/int-value 6}} {:db/id 17592186056404, :orcpub.entity.strict/key :martial-archetype, :orcpub.entity.strict/option {:db/id 17592186056405, :orcpub.entity.strict/key :eldritch-knight, :orcpub.entity.strict/selections [{:db/id 17592186056406, :orcpub.entity.strict/key :abjuration-or-evocation-spells-known, :orcpub.entity.strict/options [{:db/id 17592186056407, :orcpub.entity.strict/key :acid-arrow} {:db/id 17592186056408, :orcpub.entity.strict/key :magic-missile} {:db/id 17592186056409, :orcpub.entity.strict/key :witch-bolt} {:db/id 17592186056410, :orcpub.entity.strict/key :burning-hands}]} {:db/id 17592186056411, :orcpub.entity.strict/key :spells-known-any-school, :orcpub.entity.strict/options [{:db/id 17592186056412, :orcpub.entity.strict/key :jump} {:db/id 17592186056413, :orcpub.entity.strict/key :rope-trick}]} {:db/id 17592186056414, :orcpub.entity.strict/key :cantrips-known, :orcpub.entity.strict/options [{:db/id 17592186056415, :orcpub.entity.strict/key :message} {:db/id 17592186056416, :orcpub.entity.strict/key :shocking-grasp}]}]}}]} {:db/id 17592186056417, :orcpub.entity.strict/key :level-4, :orcpub.entity.strict/selections [{:db/id 17592186056418, :orcpub.entity.strict/key :hit-points, :orcpub.entity.strict/option {:db/id 17592186056419, :orcpub.entity.strict/key :roll, :orcpub.entity.strict/int-value 5}} {:db/id 17592186056420, :orcpub.entity.strict/key :asi-or-feat, :orcpub.entity.strict/option {:db/id 17592186056421, :orcpub.entity.strict/key :ability-score-improvement, :orcpub.entity.strict/selections [{:db/id 17592186056422, :orcpub.entity.strict/key :asi, :orcpub.entity.strict/options [{:db/id 17592186056423, :orcpub.entity.strict/key :orcpub.dnd.e5.character/cha} {:db/id 17592186056424, :orcpub.entity.strict/key :orcpub.dnd.e5.character/wis}]}]}}]} {:db/id 17592186056425, :orcpub.entity.strict/key :level-5, :orcpub.entity.strict/selections [{:db/id 17592186056426, :orcpub.entity.strict/key :hit-points, :orcpub.entity.strict/option {:db/id 17592186056427, :orcpub.entity.strict/key :roll, :orcpub.entity.strict/int-value 2}}]} {:db/id 17592186056428, :orcpub.entity.strict/key :level-6, :orcpub.entity.strict/selections [{:db/id 17592186056429, :orcpub.entity.strict/key :hit-points, :orcpub.entity.strict/option {:db/id 17592186056430, :orcpub.entity.strict/key :roll, :orcpub.entity.strict/int-value 9}} {:db/id 17592186056431, :orcpub.entity.strict/key :asi-or-feat, :orcpub.entity.strict/option {:db/id 17592186056432, :orcpub.entity.strict/key :feat}}]} {:db/id 17592186056433, :orcpub.entity.strict/key :level-7, :orcpub.entity.strict/selections [{:db/id 17592186056434, :orcpub.entity.strict/key :hit-points, :orcpub.entity.strict/option {:db/id 17592186056435, :orcpub.entity.strict/key :roll, :orcpub.entity.strict/int-value 2}}]} {:db/id 17592186056436, :orcpub.entity.strict/key :level-8, :orcpub.entity.strict/selections [{:db/id 17592186056437, :orcpub.entity.strict/key :hit-points, :orcpub.entity.strict/option {:db/id 17592186056438, :orcpub.entity.strict/key :roll, :orcpub.entity.strict/int-value 2}} {:db/id 17592186056439, :orcpub.entity.strict/key :asi-or-feat, :orcpub.entity.strict/option {:db/id 17592186056440, :orcpub.entity.strict/key :ability-score-improvement, :orcpub.entity.strict/selections [{:db/id 17592186056441, :orcpub.entity.strict/key :asi, :orcpub.entity.strict/options [{:db/id 17592186056442, :orcpub.entity.strict/key :orcpub.dnd.e5.character/wis} {:db/id 17592186056443, :orcpub.entity.strict/key :orcpub.dnd.e5.character/cha}]}]}}]}]} {:db/id 17592186056444, :orcpub.entity.strict/key :starting-equipment-equipment-pack, :orcpub.entity.strict/option {:db/id 17592186056445, :orcpub.entity.strict/key :dungeoneers-pack}} {:db/id 17592186056446, :orcpub.entity.strict/key :starting-equipment-additional-weapons, :orcpub.entity.strict/option {:db/id 17592186056447, :orcpub.entity.strict/key :two-handaxes}} {:db/id 17592186056448, :orcpub.entity.strict/key :fighting-style, :orcpub.entity.strict/options [{:db/id 17592186056449, :orcpub.entity.strict/key :protection}]}]}]} {:db/id 17592186056450, :orcpub.entity.strict/key :skill-profs, :orcpub.entity.strict/options [{:db/id 17592186056451, :orcpub.entity.strict/key :animal-handling} {:db/id 17592186056452, :orcpub.entity.strict/key :intimidation}]} {:db/id 17592186056453, :orcpub.entity.strict/key :armor, :orcpub.entity.strict/options [{:db/id 17592186056454, :orcpub.entity.strict/key :leather, :orcpub.entity.strict/map-value {:db/id 17592186056455, :orcpub.dnd.e5.character.equipment/quantity 1, :orcpub.dnd.e5.character.equipment/equipped? true}}]} {:db/id 17592186056456, :orcpub.entity.strict/key :languages, :orcpub.entity.strict/options [{:db/id 17592186056457, :orcpub.entity.strict/key :primordial} {:db/id 17592186056458, :orcpub.entity.strict/key :dwarvish}]} {:db/id 17592186056459, :orcpub.entity.strict/key :optional-content} {:db/id 17592186056460, :orcpub.entity.strict/key :magic-weapons, :orcpub.entity.strict/options [{:db/id 17592186056461, :orcpub.entity.strict/key :club-1, :orcpub.entity.strict/map-value {:db/id 17592186056462, :orcpub.dnd.e5.character.equipment/quantity 1, :orcpub.dnd.e5.character.equipment/equipped? true}}]}]}
         round-trip (-> strict char/from-strict char/to-strict)]
-    ;; TODO: Pre-existing upstream bug — round-trip loses :orcpub.entity.strict/owner.
-    ;; This assertion was silently not testing (missing `is`). Enable once fixed.
-    #_(is (= strict round-trip))))
+    (is (= strict round-trip))))
 
 (deftest strict-round-trip-3
   (let [strict {:db/id 17592186549033, :orcpub.entity.strict/selections [{:db/id 17592186549034, :orcpub.entity.strict/key :ability-scores, :orcpub.entity.strict/option {:db/id 17592186549035, :orcpub.entity.strict/key :standard-roll, :orcpub.entity.strict/map-value {:db/id 17592186549036, :orcpub.dnd.e5.character/str 14, :orcpub.dnd.e5.character/dex 10, :orcpub.dnd.e5.character/con 13, :orcpub.dnd.e5.character/int 10, :orcpub.dnd.e5.character/wis 17, :orcpub.dnd.e5.character/cha 17}}} {:db/id 17592186549037, :orcpub.entity.strict/key :class, :orcpub.entity.strict/options [{:db/id 17592186549038, :orcpub.entity.strict/key :warlock, :orcpub.entity.strict/selections [{:db/id 17592186549039, :orcpub.entity.strict/key :levels, :orcpub.entity.strict/options [{:db/id 17592186549040, :orcpub.entity.strict/key :level-1}]}]} {:db/id 17592186549041, :orcpub.entity.strict/key :druid, :orcpub.entity.strict/selections [{:db/id 17592186549042, :orcpub.entity.strict/key :levels, :orcpub.entity.strict/options [{:db/id 17592186549043, :orcpub.entity.strict/key :level-1}]}]}]} {:db/id 17592186549044, :orcpub.entity.strict/key :equipment, :orcpub.entity.strict/options [{:db/id 17592186549045, :orcpub.entity.strict/key :crowbar, :orcpub.entity.strict/map-value {:db/id 17592186549046, :orcpub.dnd.e5.character.equipment/quantity 1, :orcpub.dnd.e5.character.equipment/equipped? true, :orcpub.dnd.e5.character.equipment/background-starting-equipment? true}} {:db/id 17592186549047, :orcpub.entity.strict/key :clothes-common, :orcpub.entity.strict/map-value {:db/id 17592186549048, :orcpub.dnd.e5.character.equipment/quantity 1, :orcpub.dnd.e5.character.equipment/equipped? true, :orcpub.dnd.e5.character.equipment/background-starting-equipment? true}} {:db/id 17592186549049, :orcpub.entity.strict/key :pouch, :orcpub.entity.strict/map-value {:db/id 17592186549050, :orcpub.dnd.e5.character.equipment/quantity 1, :orcpub.dnd.e5.character.equipment/equipped? true, :orcpub.dnd.e5.character.equipment/background-starting-equipment? true}}]} {:db/id 17592186549051, :orcpub.entity.strict/key :background, :orcpub.entity.strict/option {:db/id 17592186549052, :orcpub.entity.strict/key :spy}} {:db/id 17592186549053, :orcpub.entity.strict/key :treasure, :orcpub.entity.strict/options [{:db/id 17592186549054, :orcpub.entity.strict/key :gp, :orcpub.entity.strict/map-value {:db/id 17592186549055, :orcpub.dnd.e5.character.equipment/quantity 15, :orcpub.dnd.e5.character.equipment/equipped? true, :orcpub.dnd.e5.character.equipment/background-starting-equipment? true}}]} {:db/id 17592186549056, :orcpub.entity.strict/key :weapons, :orcpub.entity.strict/options [{:db/id 17592186549057, :orcpub.entity.strict/key :dagger, :orcpub.entity.strict/map-value {:db/id 17592186549058, :orcpub.dnd.e5.character.equipment/quantity 2, :orcpub.dnd.e5.character.equipment/equipped? true, :orcpub.dnd.e5.character.equipment/class-starting-equipment? true}}]} {:db/id 17592186549059, :orcpub.entity.strict/key :armor, :orcpub.entity.strict/options [{:db/id 17592186549060, :orcpub.entity.strict/key :leather, :orcpub.entity.strict/map-value {:db/id 17592186549061, :orcpub.dnd.e5.character.equipment/quantity 1, :orcpub.dnd.e5.character.equipment/equipped? true, :orcpub.dnd.e5.character.equipment/class-starting-equipment? true}}]}]}
diff --git a/test/cljc/orcpub/dnd/e5/character_test.cljc b/test/cljc/orcpub/dnd/e5/character_test.cljc
index f8a652c0d..abe68ec26 100644
--- a/test/cljc/orcpub/dnd/e5/character_test.cljc
+++ b/test/cljc/orcpub/dnd/e5/character_test.cljc
@@ -1,11 +1,11 @@
 (ns orcpub.dnd.e5.character-test
   (:require [clojure.spec.alpha :as spec]
-            [clojure.spec.alpha.test :as stest]
+            #?(:clj [clojure.spec.alpha.test :as stest])
             [clojure.test :refer [deftest testing is]]
             [clojure.test.check :as tc]
             [clojure.test.check.generators :as gen]
             [clojure.test.check.properties :as prop]
-            [clojure.test.check.clojure-test :refer [defspec]]
+            #?(:clj [clojure.test.check.clojure-test :refer [defspec]])
             [orcpub.dnd.e5.character :as char5e]))
 
 (def valid-char
@@ -21,13 +21,14 @@
   (testing "missing ability"
     (is (spec/explain-data ::char5e/character (update valid-char ::char5e/abilities dissoc ::char5e/dex)))))
 
-(defspec non-negative-speeds-are-valid
-  100
-  (prop/for-all [speed gen/int]
-                (let [updated-char (assoc valid-char ::char5e/speed speed)]
-                  (= (not (neg? speed))
-                     (spec/valid? ::char5e/character updated-char)))))
+#?(:clj
+   (defspec non-negative-speeds-are-valid
+     100
+     (prop/for-all [speed gen/small-integer]
+                   (let [updated-char (assoc valid-char ::char5e/speed speed)]
+                     (= (not (neg? speed))
+                        (spec/valid? ::char5e/character updated-char))))))
 
-(stest/instrument `char5e/standard-ability-rolls)
-(char5e/standard-ability-rolls)
-(stest/summarize-results (stest/check `char5e/standard-ability-rolls))
+#?(:clj (stest/instrument `char5e/standard-ability-rolls))
+#?(:clj (char5e/standard-ability-rolls))
+#?(:clj (stest/summarize-results (stest/check `char5e/standard-ability-rolls)))
diff --git a/test/cljc/orcpub/dnd/e5/compute_test.cljc b/test/cljc/orcpub/dnd/e5/compute_test.cljc
new file mode 100644
index 000000000..6aa1280b5
--- /dev/null
+++ b/test/cljc/orcpub/dnd/e5/compute_test.cljc
@@ -0,0 +1,195 @@
+(ns orcpub.dnd.e5.compute-test
+  (:require [clojure.test :refer [deftest testing is]]
+            [clojure.string :as s]
+            [orcpub.dnd.e5 :as e5]
+            [orcpub.dnd.e5.spells :as spells]
+            [orcpub.dnd.e5.magic-items :as mi]
+            [orcpub.dnd.e5.compute :as compute]))
+
+;; -- compute-plugin-vals --
+
+(deftest compute-plugin-vals-empty-input
+  (testing "empty map returns empty seq"
+    (is (empty? (compute/compute-plugin-vals {}))))
+  (testing "nil returns empty seq"
+    (is (empty? (compute/compute-plugin-vals nil)))))
+
+(deftest compute-plugin-vals-filters-disabled-plugins
+  (let [plugins {:p1 {:name "Active"}
+                 :p2 {:name "Disabled" :disabled? true}
+                 :p3 {:name "Also Active"}}
+        result (compute/compute-plugin-vals plugins)
+        names (set (map :name result))]
+    (is (= 2 (count result)))
+    (is (contains? names "Active"))
+    (is (contains? names "Also Active"))
+    (is (not (contains? names "Disabled")))))
+
+(deftest compute-plugin-vals-filters-disabled-entries
+  (let [plugins {:p1 {::e5/spells {:fireball {:name "Fireball"}
+                                    :sleep {:name "Sleep" :disabled? true}
+                                    :shield {:name "Shield"}}}}
+        result (compute/compute-plugin-vals plugins)
+        spells (::e5/spells (first result))]
+    (is (= #{:fireball :shield} (set (keys spells))))
+    (is (= "Fireball" (get-in spells [:fireball :name])))
+    (is (= "Shield" (get-in spells [:shield :name])))))
+
+(deftest compute-plugin-vals-preserves-non-collection-values
+  ;; Non-map values like strings, numbers, booleans should pass through unchanged
+  (let [plugins {:p1 {:name "Plugin" :version 2 :active true}}
+        result (first (compute/compute-plugin-vals plugins))]
+    (is (= "Plugin" (:name result)))
+    (is (= 2 (:version result)))
+    (is (true? (:active result)))))
+
+(deftest compute-plugin-vals-multiple-plugins-with-mixed-entries
+  ;; Two plugins, each with some disabled entries — verify cross-plugin isolation
+  (let [plugins {:p1 {::e5/spells {:a {:name "A"} :b {:name "B" :disabled? true}}}
+                 :p2 {::e5/spells {:c {:name "C" :disabled? true} :d {:name "D"}}}}
+        result (compute/compute-plugin-vals plugins)
+        all-spell-keys (set (mapcat (comp keys ::e5/spells) result))]
+    (is (= #{:a :d} all-spell-keys))))
+
+;; -- filter-spells --
+
+(def sample-spells
+  [{:name "Fireball" :key :fireball}
+   {:name "Fire Bolt" :key :fire-bolt}
+   {:name "Shield" :key :shield}
+   {:name "Magic Missile" :key :magic-missile}
+   {:name "Cure Wounds" :key :cure-wounds}])
+
+(deftest filter-spells-partial-match
+  (let [result (compute/filter-spells "fire" sample-spells)]
+    (is (= #{"Fireball" "Fire Bolt"} (set (map :name result))))))
+
+(deftest filter-spells-case-insensitive
+  ;; Uppercase input should still match lowercase names
+  (is (= #{"Fireball" "Fire Bolt"}
+         (set (map :name (compute/filter-spells "FIRE" sample-spells))))))
+
+(deftest filter-spells-sorts-alphabetically
+  (let [result (compute/filter-spells "fire" sample-spells)]
+    (is (= ["Fire Bolt" "Fireball"] (mapv :name result)))))
+
+(deftest filter-spells-all-match-on-empty-text
+  (is (= 5 (count (compute/filter-spells "" sample-spells)))))
+
+(deftest filter-spells-no-match
+  (is (empty? (compute/filter-spells "nonexistent" sample-spells))))
+
+(deftest filter-spells-single-char-still-matches
+  ;; Even a single character should filter
+  (let [result (compute/filter-spells "s" sample-spells)]
+    ;; "Shield", "Magic Missile", "Cure Wounds" all contain 's'
+    (is (= #{"Shield" "Magic Missile" "Cure Wounds"}
+           (set (map :name result))))))
+
+;; -- filter-items --
+
+(def sample-items
+  [{::mi/name "Bag of Holding" :key :bag-of-holding}
+   {::mi/name "Bag of Tricks" :key :bag-of-tricks}
+   {::mi/name "Cloak of Protection" :key :cloak-of-protection}
+   {::mi/name "Deck of Many Things" :key :deck-of-many-things}])
+
+(deftest filter-items-partial-match
+  (let [result (compute/filter-items "bag" sample-items)]
+    (is (= #{"Bag of Holding" "Bag of Tricks"}
+           (set (map mi/name-key result))))))
+
+(deftest filter-items-case-insensitive
+  (is (= 2 (count (compute/filter-items "BAG" sample-items)))))
+
+(deftest filter-items-sorts-by-name-key
+  (let [result (compute/filter-items "bag" sample-items)]
+    (is (= ["Bag of Holding" "Bag of Tricks"]
+           (mapv mi/name-key result)))))
+
+(deftest filter-items-no-match
+  (is (empty? (compute/filter-items "vorpal" sample-items))))
+
+;; -- compute-sorted-spells --
+
+(deftest compute-sorted-spells-includes-known-static-spells
+  ;; "Acid Splash" and "Bane" are in the static spells data.
+  ;; If this fails, the static data loading or merge is broken.
+  (let [result (compute/compute-sorted-spells {:plugins {}})
+        names (set (map :name result))]
+    (is (contains? names "Acid Splash"))
+    (is (contains? names "Bane"))
+    (is (contains? names "Fireball"))))
+
+(deftest compute-sorted-spells-alphabetical-order
+  ;; Verify case-insensitive alphabetical sort by checking known relative positions
+  (let [result (compute/compute-sorted-spells {:plugins {}})
+        names (vec (map :name result))
+        idx-of (fn [n] (.indexOf names n))]
+    ;; "Acid Splash" should come before "Bane" which should come before "Fireball"
+    (is (< (idx-of "Acid Splash") (idx-of "Bane")))
+    (is (< (idx-of "Bane") (idx-of "Fireball")))))
+
+(deftest compute-sorted-spells-static-spells-have-no-edit-event
+  ;; Static (non-plugin) spells should NOT have :edit-event
+  (let [result (compute/compute-sorted-spells {:plugins {}})
+        fireball (first (filter #(= "Fireball" (:name %)) result))]
+    (is (some? fireball))
+    (is (not (contains? fireball :edit-event)))))
+
+(deftest compute-sorted-spells-plugin-spells-get-edit-event
+  (let [db {:plugins {:test {::e5/spells {:zap {:name "Zap" :key :zap}}}}}
+        result (compute/compute-sorted-spells db)
+        zap (first (filter #(= "Zap" (:name %)) result))]
+    (is (some? zap) "Plugin spell should appear in result")
+    (is (vector? (:edit-event zap)) "Plugin spells must have :edit-event vector")
+    (is (= :orcpub.dnd.e5.spells/edit-spell (first (:edit-event zap))))))
+
+(deftest compute-sorted-spells-plugin-spells-sorted-among-static
+  ;; A plugin spell named "Aaa" should appear before "Acid Splash"
+  (let [db {:plugins {:test {::e5/spells {:aaa {:name "Aaa" :key :aaa}}}}}
+        result (compute/compute-sorted-spells db)
+        names (vec (map :name result))]
+    (is (= "Aaa" (first names))
+        "Plugin spell 'Aaa' should sort first alphabetically")))
+
+(deftest compute-sorted-spells-disabled-plugin-excluded
+  (let [db {:plugins {:test {:disabled? true
+                              ::e5/spells {:zap {:name "Zap" :key :zap}}}}}
+        result (compute/compute-sorted-spells db)
+        names (set (map :name result))]
+    (is (not (contains? names "Zap"))
+        "Spells from disabled plugins must not appear")))
+
+;; -- compute-sorted-items --
+
+(deftest compute-sorted-items-includes-known-static-items
+  ;; "Alchemy Jug" is a wondrous item in static data.
+  (let [result (compute/compute-sorted-items {})
+        names (set (map mi/name-key result))]
+    (is (contains? names "Alchemy Jug"))
+    (is (contains? names "Amulet of Health"))))
+
+(deftest compute-sorted-items-count-increases-with-custom
+  ;; Adding a custom item should increase the total count
+  (let [base-count (count (compute/compute-sorted-items {}))
+        with-custom (count (compute/compute-sorted-items
+                            {::mi/custom-items [{::mi/name "Test Ring"
+                                                  ::mi/type :wondrous-item}]}))]
+    (is (> with-custom base-count)
+        "Custom items should increase total item count")))
+
+(deftest compute-sorted-items-custom-items-present-in-output
+  (let [result (compute/compute-sorted-items
+                {::mi/custom-items [{::mi/name "Custom Sword"
+                                      ::mi/type :wondrous-item}]})
+        names (set (map mi/name-key result))]
+    (is (contains? names "Custom Sword")
+        "Custom items should appear by name in the output")))
+
+(deftest compute-sorted-items-empty-custom-returns-static-only
+  ;; With no custom items, result should equal the static items
+  (let [result-nil (compute/compute-sorted-items {})
+        result-empty (compute/compute-sorted-items {::mi/custom-items []})]
+    (is (= (count result-nil) (count result-empty))
+        "Empty custom items should produce same count as nil")))
diff --git a/test/cljc/orcpub/dnd/e5/event_handlers_test.clj b/test/cljc/orcpub/dnd/e5/event_handlers_test.clj
index 29156fa72..a334ae55c 100644
--- a/test/cljc/orcpub/dnd/e5/event_handlers_test.clj
+++ b/test/cljc/orcpub/dnd/e5/event_handlers_test.clj
@@ -1,5 +1,6 @@
 (ns orcpub.dnd.e5.event-handlers-test
   (:require [clojure.test :refer [deftest is testing]]
+            [clojure.data]
             [orcpub.entity :as entity]
             [orcpub.template :as t]
             [orcpub.entity.strict :as se]
@@ -123,7 +124,7 @@
         non-strict (entity/from-strict strict)
         template (t5e/template
                    (t5e/template-selections nil nil nil nil nil nil nil nil nil nil nil nil))
-        class-selection (some (fn [s] (if (= :class (::t/key s)) s))
+        class-selection (some (fn [s] (when (= :class (::t/key s)) s))
                               (template ::t/selections))
         class-options (::t/options class-selection)
         class-option-map (zipmap (map ::t/key class-options) class-options)
diff --git a/test/cljc/orcpub/dnd/e5/event_utils_test.cljc b/test/cljc/orcpub/dnd/e5/event_utils_test.cljc
new file mode 100644
index 000000000..82e82181b
--- /dev/null
+++ b/test/cljc/orcpub/dnd/e5/event_utils_test.cljc
@@ -0,0 +1,101 @@
+(ns orcpub.dnd.e5.event-utils-test
+  (:require [clojure.test :refer [deftest testing is]]
+            [orcpub.modifiers :as mod]
+            [orcpub.dnd.e5.event-utils :as eu]))
+
+;; -- auth-headers --
+
+(deftest auth-headers-test
+  (testing "returns Authorization header when token present"
+    (is (= {"Authorization" "Token abc123"}
+           (eu/auth-headers {:user-data {:token "abc123"}}))))
+
+  (testing "returns empty map when token is nil"
+    (is (= {} (eu/auth-headers {:user-data {:token nil}}))))
+
+  (testing "returns empty map when user-data is missing"
+    (is (= {} (eu/auth-headers {}))))
+
+  (testing "returns empty map for empty db"
+    (is (= {} (eu/auth-headers nil)))))
+
+;; -- show-generic-error --
+
+(deftest show-generic-error-test
+  (testing "returns dispatch vector"
+    (let [[event-kw body] (eu/show-generic-error)]
+      (is (= :show-error-message event-kw))
+      (is (vector? body))
+      (is (= :div (first body))))))
+
+;; -- mod-cfg --
+
+(deftest mod-cfg-test
+  (testing "builds modifier config map"
+    (is (= {::mod/key :ability ::mod/args '(:str)}
+           (eu/mod-cfg :ability :str))))
+
+  (testing "supports multiple args"
+    (is (= {::mod/key :skill ::mod/args '(:athletics :proficiency)}
+           (eu/mod-cfg :skill :athletics :proficiency))))
+
+  (testing "no args produces nil args"
+    (is (= {::mod/key :speed ::mod/args nil}
+           (eu/mod-cfg :speed)))))
+
+;; -- mod-key --
+
+(deftest mod-key-test
+  (testing "ability modifier key includes first arg"
+    (is (= [:ability :str]
+           (eu/mod-key (eu/mod-cfg :ability :str)))))
+
+  (testing "ability-override modifier key includes first arg"
+    (is (= [:ability-override :dex]
+           (eu/mod-key (eu/mod-cfg :ability-override :dex)))))
+
+  (testing "default modifier key uses all args"
+    (is (= [:speed '(30)]
+           (eu/mod-key (eu/mod-cfg :speed 30))))))
+
+;; -- compare-mod-keys --
+
+(deftest compare-mod-keys-test
+  (testing "same keys are equal"
+    (is (zero? (eu/compare-mod-keys
+                (eu/mod-cfg :ability :str)
+                (eu/mod-cfg :ability :str)))))
+
+  (testing "different ability args sort correctly"
+    (is (neg? (eu/compare-mod-keys
+               (eu/mod-cfg :ability :con)
+               (eu/mod-cfg :ability :str)))))
+
+  (testing "different key types sort correctly"
+    (is (neg? (eu/compare-mod-keys
+               (eu/mod-cfg :ability :str)
+               (eu/mod-cfg :speed 30))))))
+
+;; -- default-mod-set --
+
+(deftest default-mod-set-test
+  (testing "converts plain set to sorted-set"
+    (let [items #{(eu/mod-cfg :ability :str)
+                  (eu/mod-cfg :ability :dex)}
+          result (eu/default-mod-set items)]
+      (is (sorted? result))
+      (is (set? result))
+      (is (= 2 (count result)))))
+
+  (testing "preserves existing sorted-set"
+    (let [sorted (into (sorted-set-by eu/compare-mod-keys)
+                       [(eu/mod-cfg :ability :str)])]
+      (is (identical? sorted (eu/default-mod-set sorted)))))
+
+  (testing "converts vector to sorted-set"
+    (let [items [(eu/mod-cfg :ability :str)
+                 (eu/mod-cfg :ability :dex)]
+          result (eu/default-mod-set items)]
+      (is (sorted? result))
+      (is (set? result))
+      (is (= 2 (count result))))))
diff --git a/test/cljc/orcpub/dnd/e5/favored_enemy_language_test.cljc b/test/cljc/orcpub/dnd/e5/favored_enemy_language_test.cljc
index b8c0ada4d..f07b4a52b 100644
--- a/test/cljc/orcpub/dnd/e5/favored_enemy_language_test.cljc
+++ b/test/cljc/orcpub/dnd/e5/favored_enemy_language_test.cljc
@@ -55,7 +55,7 @@
   [lang-map k]
   (or (lang-map k)
       (lang-map (known-corrections k))
-      {:name (opt5e/key-to-name k) :key k}))
+      {:name (common/kw-to-name k true) :key k}))
 
 ;; ============================================================================
 ;; Tests
@@ -144,10 +144,10 @@
       (is (= "Giant Elk" (:name elk-result))
           "Non-homebrew key should still get fallback name"))))
 
-(deftest test-key-to-name-generates-readable-names
-  (testing "key-to-name converts keyword keys to human-readable names"
-    (is (= "Giant Elk" (opt5e/key-to-name :giant-elk)))
-    (is (= "Deep Speech" (opt5e/key-to-name :deep-speech)))
-    (is (= "Thri Kreen" (opt5e/key-to-name :thri-kreen)))
-    (is (= "Aquan" (opt5e/key-to-name :aquan)))
-    (is (= "Hook Horror" (opt5e/key-to-name :hook-horror)))))
+(deftest test-kw-to-name-generates-readable-names
+  (testing "common/kw-to-name converts keyword keys to human-readable names"
+    (is (= "Giant Elk" (common/kw-to-name :giant-elk true)))
+    (is (= "Deep Speech" (common/kw-to-name :deep-speech true)))
+    (is (= "Thri Kreen" (common/kw-to-name :thri-kreen true)))
+    (is (= "Aquan" (common/kw-to-name :aquan true)))
+    (is (= "Hook Horror" (common/kw-to-name :hook-horror true)))))
diff --git a/test/cljc/orcpub/dnd/e5/magic_items_test.clj b/test/cljc/orcpub/dnd/e5/magic_items_test.clj
index 419478099..653d25cd8 100644
--- a/test/cljc/orcpub/dnd/e5/magic_items_test.clj
+++ b/test/cljc/orcpub/dnd/e5/magic_items_test.clj
@@ -121,7 +121,6 @@
                 ::mi/subtypes [:plate :chain-mail]}
           expansion (mi/expand-armor item)
           names (set (map :name expansion))]
-      (prn "NAMES" names)
       (is (= 2 (count expansion)))
       (is (names "My Item, Plate"))
       (is (names "My Item, Chain mail"))))
@@ -142,6 +141,62 @@
                 ::mi/item-subtype (constantly false)}]
       (is (thrown? IllegalArgumentException (mi/expand-armor item))))))
 
+;; -- compute-all-weapons-map --
+
+(deftest compute-all-weapons-map-includes-phb-weapons
+  (testing "static PHB weapons are always present"
+    (let [result (mi/compute-all-weapons-map nil)]
+      (is (contains? result :longsword))
+      (is (contains? result :dagger))
+      (is (contains? result :handaxe)))))
+
+(deftest compute-all-weapons-map-includes-magic-weapons
+  (testing "static magic weapons from raw-magic-items are merged in"
+    (let [result (mi/compute-all-weapons-map nil)]
+      ;; magic-weapon-map has specific keys; verify they survive the merge
+      (doseq [k (take 3 (keys mi/magic-weapon-map))]
+        (is (contains? result k)
+            (str "magic weapon " k " missing from all-weapons-map"))))))
+
+(deftest compute-all-weapons-map-nil-equals-empty
+  (testing "nil custom items and empty vector produce same result"
+    (is (= (mi/compute-all-weapons-map nil)
+           (mi/compute-all-weapons-map [])))))
+
+(deftest compute-all-weapons-map-custom-weapon-appears
+  (testing "custom weapon items get expanded and merged"
+    (let [custom [{mi/name-key "Homebrew Blade"
+                   ::mi/type :weapon
+                   ::mi/item-subtype :longsword
+                   ::mi/rarity :rare
+                   ::mi/magical-attack-bonus 2
+                   ::mi/magical-damage-bonus 2}]
+          result (mi/compute-all-weapons-map custom)
+          custom-keys (set (keys result))
+          ;; expand-weapon generates keys like :homebrew-blade-longsword
+          has-custom? (some #(re-matches #".*homebrew-blade.*" (name %))
+                           custom-keys)]
+      (is has-custom?
+          "custom weapon should appear after expansion"))))
+
+(deftest compute-all-weapons-map-custom-overrides-base
+  (testing "custom magic longsword has higher attack bonus than base longsword"
+    (let [custom [{mi/name-key "Vorpal Sword"
+                   ::mi/type :weapon
+                   ::mi/item-subtype :longsword
+                   ::mi/rarity :legendary
+                   ::mi/magical-attack-bonus 3
+                   ::mi/magical-damage-bonus 3}]
+          result (mi/compute-all-weapons-map custom)
+          base-longsword (get result :longsword)]
+      ;; base longsword still present (custom gets a different key)
+      (is (some? base-longsword) "base longsword should survive custom additions")
+      ;; custom weapon gets its own key, doesn't clobber base
+      (is (> (count result) (count (mi/compute-all-weapons-map nil)))
+          "adding custom items should increase total weapon count"))))
+
+;; -- weapon property tests (from develop) --
+
 (deftest test-remove-custom-weapon-fields
   (testing "strips all weapon-specific keys"
     (let [item {::mi/name "Test Weapon"
diff --git a/test/cljc/orcpub/dnd/e5/options_test.clj b/test/cljc/orcpub/dnd/e5/options_test.clj
index e96787eac..174ba42fa 100644
--- a/test/cljc/orcpub/dnd/e5/options_test.clj
+++ b/test/cljc/orcpub/dnd/e5/options_test.clj
@@ -1,6 +1,10 @@
 (ns orcpub.dnd.e5.options-test
-  (:require [clojure.test :refer [deftest is]]
-            [orcpub.dnd.e5.options :as opt]))
+  (:require [clojure.test :refer [is deftest testing]]
+            [clojure.spec.alpha :as spec]
+            [orcpub.dnd.e5.options :as opt]
+            [orcpub.dnd.e5.character :as char5e]
+            [orcpub.template :as t]
+            [orcpub.entity :as entity]))
 
 (deftest test-total-slots
   (is (= {1 2} (opt/total-slots 3 3)))
@@ -9,3 +13,51 @@
           3 3
           4 1}
          (opt/total-slots 20 3))))
+
+;; -- feat-prereqs --
+
+(deftest feat-prereqs-ability-prereq
+  (testing "ability key produces ability prereq with min 13"
+    (let [result (opt/feat-prereqs [::char5e/str] nil {})]
+      (is (= 1 (count result)))
+      (is (= "Requires STR 13 or higher" (::t/label (first result))))
+      (is (fn? (::t/prereq-fn (first result)))))))
+
+(deftest feat-prereqs-spellcasting-prereq
+  (testing ":spellcasting produces can-cast-spell prereq"
+    (let [result (opt/feat-prereqs [:spellcasting] nil {})]
+      (is (= 1 (count result)))
+      (is (= "Requires the ability to cast at least one spell."
+             (::t/label (first result)))))))
+
+(deftest feat-prereqs-armor-prereq
+  (testing "non-ability non-spellcasting key produces armor prereq"
+    (let [result (opt/feat-prereqs [:heavy] nil {})]
+      (is (= 1 (count result)))
+      (is (re-find #"(?i)heavy" (::t/label (first result)))))))
+
+(deftest feat-prereqs-race-prereq-from-map
+  (testing "race prereq resolves names from race-map parameter"
+    (let [race-map {:elf {:name "Elf"} :dwarf {:name "Dwarf"}}
+          path-prereqs {:race {:elf true :dwarf false}}
+          result (opt/feat-prereqs [] path-prereqs race-map)
+          labels (map ::t/label result)]
+      ;; Only :elf has truthy value, :dwarf is false
+      (is (= 1 (count result)))
+      (is (some #(re-find #"Elf" %) labels)))))
+
+(deftest feat-prereqs-no-race-prereq-when-empty
+  (testing "no race prereqs when path-prereqs has no :race key"
+    (let [result (opt/feat-prereqs [] {} {:elf {:name "Elf"}})]
+      (is (empty? result))))
+  (testing "no race prereqs when race map values are all false"
+    (let [result (opt/feat-prereqs [] {:race {:elf false}} {:elf {:name "Elf"}})]
+      (is (empty? result)))))
+
+(deftest feat-prereqs-mixed-ability-and-race
+  (testing "both ability and race prereqs combine"
+    (let [race-map {:human {:name "Human"}}
+          path-prereqs {:race {:human true}}
+          result (opt/feat-prereqs [::char5e/str] path-prereqs race-map)]
+      ;; 1 ability + 1 race
+      (is (= 2 (count result))))))
diff --git a/test/cljc/orcpub/dnd/e5/warlock_test.clj b/test/cljc/orcpub/dnd/e5/warlock_test.clj
index 80876c8ab..125b67d90 100644
--- a/test/cljc/orcpub/dnd/e5/warlock_test.clj
+++ b/test/cljc/orcpub/dnd/e5/warlock_test.clj
@@ -1,99 +1,193 @@
 (ns orcpub.dnd.e5.warlock-test
-  (:require [clojure.test :refer :all]
+  (:require [clojure.test :refer [deftest is testing]]
             [orcpub.entity :as entity]
-            [orcpub.entity-spec :as es]
-            [orcpub.template :as t]
             [orcpub.dnd.e5.template :as t5e]
             [orcpub.dnd.e5.character :as char5e]
-            [clojure.set :refer [union]]))
+            [orcpub.dnd.e5.classes :as classes5e]
+            [orcpub.dnd.e5.modifiers :as mod5e]
+            [orcpub.dnd.e5.spell-lists :as sl5e]
+            [orcpub.dnd.e5.spells :as spells5e]
+            [orcpub.dnd.e5.weapons :as weapons5e]
+            [orcpub.common :as common]))
+
+;;; ---------------------------------------------------------------------------
+;;; Inline configs for data that lives in .cljs or is #_ commented in prod.
+;;; See docs/ENTITY-BUILD.md for format reference.
+;;; ---------------------------------------------------------------------------
+
+(def test-languages
+  [{:name "Common" :key :common}
+   {:name "Elvish" :key :elvish}
+   {:name "Dwarvish" :key :dwarvish}
+   {:name "Giant" :key :giant}
+   {:name "Gnomish" :key :gnomish}
+   {:name "Goblin" :key :goblin}
+   {:name "Halfling" :key :halfling}
+   {:name "Orc" :key :orc}
+   {:name "Abyssal" :key :abyssal}
+   {:name "Celestial" :key :celestial}
+   {:name "Draconic" :key :draconic}
+   {:name "Deep Speech" :key :deep-speech}
+   {:name "Infernal" :key :infernal}
+   {:name "Primordial" :key :primordial}
+   {:name "Sylvan" :key :sylvan}
+   {:name "Undercommon" :key :undercommon}])
+
+(def language-map (common/map-by-key test-languages))
+
+;; Elf race config (from spell_subs.cljs elf-option-cfg, Drow subrace uncommented)
+(def elf-race-cfg
+  {:name "Elf"
+   :key :elf
+   :abilities {:orcpub.dnd.e5.character/dex 2}
+   :size :medium
+   :speed 30
+   :languages ["Elvish" "Common"]
+   :darkvision 60
+   :modifiers [(mod5e/saving-throw-advantage [:charmed])
+               (mod5e/immunity :magical-sleep)
+               (mod5e/skill-proficiency :perception)]
+   :subraces
+   [{:name "Dark Elf (Drow)"
+     :abilities {:orcpub.dnd.e5.character/cha 1}
+     :darkvision 120
+     :modifiers [(mod5e/weapon-proficiency :rapier)
+                 (mod5e/weapon-proficiency :shortsword)
+                 (mod5e/weapon-proficiency :crossbow-hand)]
+     :traits [{:name "Sunlight Sensitivity"
+               :summary "Disadvantage on attack and perception rolls in direct sunlight"}]}]
+   :traits [{:name "Fey Ancestry" :summary "advantage on charmed saves; immune to sleep magic"}
+            {:name "Trance" :summary "Trance 4 hrs. instead of sleep 8"}]})
+
+;; Spy background (Criminal variant, from spell_subs.cljs)
+(def spy-bg-cfg
+  {:name "Spy"
+   :key :spy
+   :profs {:skill {:deception true :stealth true}}
+   :traits [{:name "Criminal Contact"
+             :summary "reliable criminal underworld contact"}]})
+
+;; Keen Mind feat (from options.cljc:1311, #_ commented in prod)
+;; Uses feat-option-from-cfg format: :ability-increases is a SET of ability keys
+(def keen-mind-cfg
+  {:name "Keen Mind"
+   :key :keen-mind
+   :description "increase INT by 1; always know north; recall anything within a month"
+   :ability-increases #{:orcpub.dnd.e5.character/int}})
+
+;;; ---------------------------------------------------------------------------
+;;; Template — real cljc data + inline configs
+;;; ---------------------------------------------------------------------------
+
+(def test-template
+  (t5e/template
+   (t5e/template-selections
+    nil                                   ; magic-weapon-options
+    nil                                   ; magic-armor-options
+    nil                                   ; other-magic-item-options
+    weapons5e/weapons-map                 ; weapon-map
+    weapons5e/weapons                     ; custom-and-standard-weapons
+    sl5e/spell-lists                      ; spell-lists (real PHB data)
+    spells5e/spell-map                    ; spells-map (real spell definitions)
+    [spy-bg-cfg]                          ; backgrounds
+    [elf-race-cfg]                        ; races
+    [(classes5e/warlock-option            ; classes (pre-built option)
+      sl5e/spell-lists
+      spells5e/spell-map
+      {}                                  ; no plugin subclasses
+      language-map
+      weapons5e/weapons-map
+      []                                  ; no plugin invocations
+      [])]                                ; no plugin boons
+    [keen-mind-cfg]                        ; feats
+    language-map)))                        ; language-map
+
+;;; ---------------------------------------------------------------------------
+;;; Raw entity — a level-10 Drow Elf Warlock / Spy / Keen Mind
+;;; ---------------------------------------------------------------------------
 
 (def base-abilities
-  {:orcpub.dnd.e5.character/str 10,
-   :orcpub.dnd.e5.character/dex 11,
-   :orcpub.dnd.e5.character/con 11,
-   :orcpub.dnd.e5.character/int 15,
-   :orcpub.dnd.e5.character/wis 14,
+  {:orcpub.dnd.e5.character/str 10
+   :orcpub.dnd.e5.character/dex 11
+   :orcpub.dnd.e5.character/con 11
+   :orcpub.dnd.e5.character/int 15
+   :orcpub.dnd.e5.character/wis 14
    :orcpub.dnd.e5.character/cha 15})
 
-(def selected-skill-profs
-  #{:intimidation :history})
+(def selected-skill-profs #{:intimidation :history})
 
-(def warlock-with-book-of-ancient-secrets
+(def warlock-entity
   {:orcpub.entity/options
    {:race
-    {:orcpub.entity/key :elf,
+    {:orcpub.entity/key :elf
      :orcpub.entity/options
-     {:subrace {:orcpub.entity/key :dark-elf-drow-}}},
+     {:subrace {:orcpub.entity/key :dark-elf-drow-}}}
     :ability-scores
-    {:orcpub.entity/key :standard-roll,
-     :orcpub.entity/value
-     base-abilities},
-    :alignment {:orcpub.entity/key :chaotic-neutral},
+    {:orcpub.entity/key :standard-roll
+     :orcpub.entity/value base-abilities}
+    :alignment {:orcpub.entity/key :chaotic-neutral}
     :background
-    {:orcpub.entity/key :spy,
-     :orcpub.entity/options
-     {:tool-proficiency-gaming-set {:orcpub.entity/key :dice-set}}},
+    {:orcpub.entity/key :spy}
     :feats
-    [{:orcpub.entity/key :great-weapon-master}
-     {:orcpub.entity/key :keen-mind}],
+    [{:orcpub.entity/key :keen-mind}]
     :class
-    [{:orcpub.entity/key :warlock,
+    [{:orcpub.entity/key :warlock
       :orcpub.entity/options
       {:skill-proficiency
        (mapv
         (fn [kw] {:orcpub.entity/key kw})
         selected-skill-profs)
        :levels
-       [{:orcpub.entity/key :level-1,
+       [{:orcpub.entity/key :level-1
          :orcpub.entity/options
          {:otherworldly-patron {:orcpub.entity/key :the-archfey}}}
-        {:orcpub.entity/key :level-2,
+        {:orcpub.entity/key :level-2
          :orcpub.entity/options
          {:hit-points
-          {:orcpub.entity/key :average, :orcpub.entity/value 5}}}
-        {:orcpub.entity/key :level-3,
+          {:orcpub.entity/key :average :orcpub.entity/value 5}}}
+        {:orcpub.entity/key :level-3
          :orcpub.entity/options
          {:pact-boon
-          {:orcpub.entity/key :pact-of-the-tome,
+          {:orcpub.entity/key :pact-of-the-tome
            :orcpub.entity/options
            {:book-of-shadows-cantrips
             [{:orcpub.entity/key :blade-ward}
              {:orcpub.entity/key :spare-the-dying}
-             {:orcpub.entity/key :thorn-whip}]}},
+             {:orcpub.entity/key :thorn-whip}]}}
           :hit-points
-          {:orcpub.entity/key :average, :orcpub.entity/value 5}}}
-        {:orcpub.entity/key :level-4,
+          {:orcpub.entity/key :average :orcpub.entity/value 5}}}
+        {:orcpub.entity/key :level-4
          :orcpub.entity/options
-         {:asi-or-feat {:orcpub.entity/key :feat},
+         {:asi-or-feat {:orcpub.entity/key :feat}
           :hit-points
-          {:orcpub.entity/key :average, :orcpub.entity/value 5}}}
-        {:orcpub.entity/key :level-5,
+          {:orcpub.entity/key :average :orcpub.entity/value 5}}}
+        {:orcpub.entity/key :level-5
          :orcpub.entity/options
          {:hit-points
-          {:orcpub.entity/key :average, :orcpub.entity/value 5}}}
-        {:orcpub.entity/key :level-6,
+          {:orcpub.entity/key :average :orcpub.entity/value 5}}}
+        {:orcpub.entity/key :level-6
          :orcpub.entity/options
          {:hit-points
-          {:orcpub.entity/key :average, :orcpub.entity/value 5}}}
-        {:orcpub.entity/key :level-7,
+          {:orcpub.entity/key :average :orcpub.entity/value 5}}}
+        {:orcpub.entity/key :level-7
          :orcpub.entity/options
          {:hit-points
-          {:orcpub.entity/key :average, :orcpub.entity/value 5}}}
-        {:orcpub.entity/key :level-8,
+          {:orcpub.entity/key :average :orcpub.entity/value 5}}}
+        {:orcpub.entity/key :level-8
          :orcpub.entity/options
-         {:asi-or-feat {:orcpub.entity/key :feat},
+         {:asi-or-feat {:orcpub.entity/key :feat}
           :hit-points
-          {:orcpub.entity/key :average, :orcpub.entity/value 5}}}
-        {:orcpub.entity/key :level-9,
+          {:orcpub.entity/key :average :orcpub.entity/value 5}}}
+        {:orcpub.entity/key :level-9
          :orcpub.entity/options
          {:hit-points
-          {:orcpub.entity/key :average, :orcpub.entity/value 5}}}
-        {:orcpub.entity/key :level-10,
+          {:orcpub.entity/key :average :orcpub.entity/value 5}}}
+        {:orcpub.entity/key :level-10
          :orcpub.entity/options
          {:hit-points
-          {:orcpub.entity/key :average, :orcpub.entity/value 5}}}],
+          {:orcpub.entity/key :average :orcpub.entity/value 5}}}]
        :eldritch-invocations
-       [{:orcpub.entity/key :book-of-ancient-secrets,
+       [{:orcpub.entity/key :book-of-ancient-secrets
          :orcpub.entity/options
          {:book-of-ancient-secrets-rituals
           [{:orcpub.entity/key :detect-poison-and-disease}
@@ -101,12 +195,12 @@
         {:orcpub.entity/key :agonizing-blast}
         {:orcpub.entity/key :beast-speech}
         {:orcpub.entity/key :eyes-of-the-rune-keeper}
-        {:orcpub.entity/key :mire-the-mind}],
+        {:orcpub.entity/key :mire-the-mind}]
        :warlock-cantrips-known
        [{:orcpub.entity/key :friends}
         {:orcpub.entity/key :minor-illusion}
         {:orcpub.entity/key :prestidigitation}
-        {:orcpub.entity/key :eldritch-blast}],
+        {:orcpub.entity/key :eldritch-blast}]
        :warlock-spells-known
        [{:orcpub.entity/key :charm-person}
         {:orcpub.entity/key :hellish-rebuke}
@@ -117,50 +211,86 @@
         {:orcpub.entity/key :dominate-person}
         {:orcpub.entity/key :crown-of-madness}
         {:orcpub.entity/key :fear}
-        {:orcpub.entity/key :faerie-fire}],
+        {:orcpub.entity/key :faerie-fire}]
        :starting-equipment-equipment-pack
-       {:orcpub.entity/key :dungeoneers-pack},
-       :starting-equipment-simple-weapon {:orcpub.entity/key :dagger},
+       {:orcpub.entity/key :dungeoneers-pack}
+       :starting-equipment-simple-weapon {:orcpub.entity/key :dagger}
        :starting-equipment-spellcasting-equipment
-       {:orcpub.entity/key :component-pouch},
+       {:orcpub.entity/key :component-pouch}
        :starting-equipment-weapon
-       {:orcpub.entity/key :any-simple-weapon,
+       {:orcpub.entity/key :any-simple-weapon
         :orcpub.entity/options
         {:starting-equipment-simple-weapon
-         {:orcpub.entity/key :shortbow}}}}}], 
-    :optional-content nil}})
+         {:orcpub.entity/key :shortbow}}}}}]}})
+
+;;; ---------------------------------------------------------------------------
+;;; Tests
+;;; ---------------------------------------------------------------------------
 
 (defn has-spell? [built-char level class-nm spell-key]
   (let [spells-known (char5e/spells-known built-char)]
     (get-in spells-known [level [class-nm spell-key]])))
 
-(def elf-dex-bonus 2)
-(def drow-cha-bonus 1)
-(def keen-mind-int-bonus 1)
-(def elf-skill-profs #{:perception})
-(def spy-skill-profs #{:deception :stealth})
-
-;; TODO: Fix / remove test
-#_(deftest book-of-ancient-secrets
-  (let [built-char (entity/build
-                    warlock-with-book-of-ancient-secrets
-                    (t5e/template
-                      (t5e/template-selections nil nil nil nil nil nil nil nil nil nil nil nil)))
-        {:keys [::char5e/str
-                ::char5e/dex
-                ::char5e/con
-                ::char5e/int
-                ::char5e/wis
-                ::char5e/cha]} (char5e/ability-values built-char)
-        skill-profs (char5e/skill-proficiencies built-char)]
-    (is (has-spell? built-char
-                    1
-                    "Warlock"
-                    :illusory-script))
-    (is (= str (base-abilities ::char5e/str)))
-    (is (= dex (+ elf-dex-bonus (base-abilities ::char5e/dex))))
-    (is (= con (base-abilities ::char5e/con)))
-    (is (= int (+ keen-mind-int-bonus (base-abilities ::char5e/int))))
-    (is (= wis (base-abilities ::char5e/wis)))
-    (is (= cha (+ drow-cha-bonus (base-abilities ::char5e/cha))))
-    (is (= (set (keys skill-profs)) (union elf-skill-profs spy-skill-profs selected-skill-profs)))))
+(deftest build-smoke-test
+  (testing "entity/build doesn't throw with a real template"
+    (let [built (entity/build warlock-entity test-template)]
+      (is (some? built) "build should return a non-nil result"))))
+
+(deftest warlock-ability-scores
+  (testing "ability scores include racial and feat bonuses"
+    (let [built (entity/build warlock-entity test-template)
+          abilities (char5e/ability-values built)]
+      ;; STR: 10 base, no bonuses
+      (is (= 10 (:orcpub.dnd.e5.character/str abilities)))
+      ;; DEX: 11 base + 2 elf racial
+      (is (= 13 (:orcpub.dnd.e5.character/dex abilities)))
+      ;; CON: 11 base, no bonuses
+      (is (= 11 (:orcpub.dnd.e5.character/con abilities)))
+      ;; INT: 15 base + 1 keen mind feat
+      (is (= 16 (:orcpub.dnd.e5.character/int abilities)))
+      ;; WIS: 14 base, no bonuses
+      (is (= 14 (:orcpub.dnd.e5.character/wis abilities)))
+      ;; CHA: 15 base + 1 drow subrace
+      (is (= 16 (:orcpub.dnd.e5.character/cha abilities))))))
+
+(deftest warlock-race-and-subrace
+  (testing "race and subrace names are set correctly"
+    (let [built (entity/build warlock-entity test-template)]
+      (is (= "Elf" (char5e/race built)))
+      (is (= "Dark Elf (Drow)" (char5e/subrace built))))))
+
+(deftest warlock-skill-proficiencies
+  (testing "skill profs from elf, spy background, and warlock class"
+    (let [built (entity/build warlock-entity test-template)
+          skill-profs (char5e/skill-proficiencies built)]
+      ;; elf: perception
+      (is (get skill-profs :perception) "elf should grant perception")
+      ;; spy background: deception, stealth
+      (is (get skill-profs :deception) "spy should grant deception")
+      (is (get skill-profs :stealth) "spy should grant stealth")
+      ;; warlock class selection: intimidation, history
+      (is (get skill-profs :intimidation) "warlock should grant intimidation")
+      (is (get skill-profs :history) "warlock should grant history")
+      ;; 5 total
+      (is (= 5 (count skill-profs))))))
+
+(deftest warlock-class-levels
+  (testing "warlock has 10 levels"
+    (let [built (entity/build warlock-entity test-template)
+          levels (char5e/levels built)]
+      (is (= 10 (get-in levels [:warlock :class-level]))))))
+
+(deftest warlock-speed
+  (testing "elf base speed is 30"
+    (let [built (entity/build warlock-entity test-template)]
+      (is (= 30 (char5e/base-land-speed built))))))
+
+(deftest warlock-spells
+  (testing "special spells from invocations and pacts appear in spells-known"
+    (let [built (entity/build warlock-entity test-template)]
+      ;; Book of Ancient Secrets ritual (the original test's assertion)
+      (is (has-spell? built 1 "Warlock" :illusory-script))
+      ;; Book of Shadows cantrip
+      (is (has-spell? built 0 "Warlock" :spare-the-dying))
+      ;; Beast Speech invocation grants speak-with-animals at will
+      (is (has-spell? built 1 "Warlock" :speak-with-animals)))))
diff --git a/test/cljc/orcpub/entity_test.clj b/test/cljc/orcpub/entity_test.clj
index 998243e62..40f7cef06 100644
--- a/test/cljc/orcpub/entity_test.clj
+++ b/test/cljc/orcpub/entity_test.clj
@@ -1,5 +1,5 @@
 (ns orcpub.entity-test
-  (:require [clojure.test :refer [deftest is testing]]
+  (:require [clojure.test :refer [deftest testing is]]
             [clojure.spec.alpha :as spec]
             [clojure.spec.test.alpha :as stest]
             [orcpub.entity.strict :as e]
diff --git a/test/cljc/orcpub/pdf_spec_test.clj b/test/cljc/orcpub/pdf_spec_test.clj
index a6f8bec10..cc42784d5 100644
--- a/test/cljc/orcpub/pdf_spec_test.clj
+++ b/test/cljc/orcpub/pdf_spec_test.clj
@@ -1,48 +1,109 @@
 (ns orcpub.pdf-spec-test
-  "Tests for PDF spec utilities — specifically trait-string nil/blank handling.
-   Homebrew content frequently has nil or missing descriptions; these tests
-   verify PDF export won't crash on that data."
+  "Tests for pure PDF spec helper functions.
+   pdf_spec.cljc no longer has any re-frame subscribes,
+   so all helpers are testable on JVM."
   (:require [clojure.test :refer [deftest testing is]]
-            [orcpub.pdf-spec :as pdf-spec]))
+            [orcpub.pdf-spec :as pdf]))
 
-(deftest test-trait-string-normal
+;; -- class-string --
+
+(deftest class-string-single-class
+  (testing "single class without subclass"
+    (is (= "Fighter (5)"
+           (pdf/class-string
+            [:fighter]
+            {:fighter {:class-name "Fighter"
+                       :class-level 5
+                       :subclass-name ""}})))))
+
+(deftest class-string-single-class-with-subclass
+  (testing "single class with subclass shows brackets"
+    (is (= "Wizard [Evocation] (10)"
+           (pdf/class-string
+            [:wizard]
+            {:wizard {:class-name "Wizard"
+                      :class-level 10
+                      :subclass-name "Evocation"}})))))
+
+(deftest class-string-multiclass
+  (testing "multiclass joins with slash"
+    (is (= "Fighter (5) / Wizard [Evocation] (3)"
+           (pdf/class-string
+            [:fighter :wizard]
+            {:fighter {:class-name "Fighter"
+                       :class-level 5
+                       :subclass-name ""}
+             :wizard {:class-name "Wizard"
+                      :class-level 3
+                      :subclass-name "Evocation"}})))))
+
+(deftest class-string-empty-classes
+  (testing "empty class list returns empty string"
+    (is (= "" (pdf/class-string [] {})))))
+
+;; -- entity-vals --
+
+(deftest entity-vals-keyword-keys
+  (testing "keyword keys use same key for to and from"
+    ;; entity-val does (entity k), so built-char is a flat map
+    (let [built-char {:str 18 :dex 14}
+          result (pdf/entity-vals built-char [:str :dex])]
+      (is (= 18 (:str result)))
+      (is (= 14 (:dex result))))))
+
+(deftest entity-vals-vector-keys
+  (testing "vector [to from] renames the output key"
+    (let [built-char {:strength 16}
+          result (pdf/entity-vals built-char [[:str :strength]])]
+      (is (= 16 (:str result)))
+      (is (nil? (:strength result))))))
+
+(deftest entity-vals-missing-key
+  (testing "missing keys return nil"
+    (let [built-char {}
+          result (pdf/entity-vals built-char [:nonexistent])]
+      (is (nil? (:nonexistent result))))))
+
+;; -- trait-string nil/blank handling (homebrew data hardening) --
+
+(deftest trait-string-normal
   (testing "Normal case: name and description both present"
-    (let [result (pdf-spec/trait-string "Darkvision" "you can see in the dark.")]
+    (let [result (pdf/trait-string "Darkvision" "you can see in the dark.")]
       (is (string? result))
       (is (.contains result "Darkvision"))
       ;; sentensize capitalizes first char and ensures trailing period
       (is (.contains result "You can see in the dark.")))))
 
-(deftest test-trait-string-nil-desc
+(deftest trait-string-nil-desc
   (testing "Nil description doesn't crash (was NPE on subs/count before fix)"
-    (let [result (pdf-spec/trait-string "Darkvision" nil)]
+    (let [result (pdf/trait-string "Darkvision" nil)]
       (is (string? result))
       (is (.contains result "Darkvision")))))
 
-(deftest test-trait-string-nil-name-and-desc
+(deftest trait-string-nil-name-and-desc
   (testing "Both nil — worst case from totally empty homebrew trait"
-    (let [result (pdf-spec/trait-string nil nil)]
+    (let [result (pdf/trait-string nil nil)]
       (is (string? result))
       (is (.contains result "(Unnamed Trait)")))))
 
-(deftest test-trait-string-nil-name-falls-back-to-desc
+(deftest trait-string-nil-name-falls-back-to-desc
   (testing "Nil name uses first 30 chars of description as display name"
     (let [desc "You can see in the dark up to 60 feet including dim light"
-          result (pdf-spec/trait-string nil desc)]
+          result (pdf/trait-string nil desc)]
       (is (string? result))
       ;; Should truncate to 30 chars + "..."
       (is (.contains result "...")))))
 
-(deftest test-trait-string-blank-and-whitespace-desc
+(deftest trait-string-blank-and-whitespace-desc
   (testing "Blank and whitespace-only descriptions treated as absent"
-    (let [blank-result (pdf-spec/trait-string "Darkvision" "")
-          ws-result (pdf-spec/trait-string "Darkvision" "   ")]
+    (let [blank-result (pdf/trait-string "Darkvision" "")
+          ws-result (pdf/trait-string "Darkvision" "   ")]
       ;; Neither should crash, both should use the name
       (is (.contains blank-result "Darkvision"))
       (is (.contains ws-result "Darkvision")))))
 
-(deftest test-trait-string-wrong-type-desc
+(deftest trait-string-wrong-type-desc
   (testing "Non-string description from corrupted data doesn't crash"
-    (let [result (pdf-spec/trait-string "Darkvision" 42)]
+    (let [result (pdf/trait-string "Darkvision" 42)]
       (is (string? result))
       (is (.contains result "Darkvision")))))
diff --git a/test/cljc/orcpub/template_test.clj b/test/cljc/orcpub/template_test.clj
index 33e91ea90..297ad1a2a 100644
--- a/test/cljc/orcpub/template_test.clj
+++ b/test/cljc/orcpub/template_test.clj
@@ -6,7 +6,6 @@
             [clojure.test.check :as tc]
             [clojure.test.check.generators :as gen]
             [clojure.test.check.properties :as prop]
-            [clojure.test.check.clojure-test]
             [orcpub.template :as template]
             [orcpub.modifiers :as modifiers]))
 
diff --git a/test/cljs/orcpub/dnd/e5/content_reconciliation_test.cljs b/test/cljs/orcpub/dnd/e5/content_reconciliation_test.cljs
index f14c4dda5..f6bfa3f7e 100644
--- a/test/cljs/orcpub/dnd/e5/content_reconciliation_test.cljs
+++ b/test/cljs/orcpub/dnd/e5/content_reconciliation_test.cljs
@@ -50,17 +50,20 @@
 (deftest test-extract-content-keys
   (testing "Extracts all content keys with correct content types"
     (let [keys (reconcile/extract-content-keys test-character)
-          key-set (set (map :key keys))]
-      ;; Should find all the keys from our character
-      (is (contains? key-set :tiefling))
-      (is (contains? key-set :artificer-kibbles-tasty))
-      (is (contains? key-set :wizard))
-      (is (contains? key-set :sage))))
+          by-key (zipmap (map :key keys) keys)]
+      (is (contains? by-key :tiefling))
+      (is (contains? by-key :artificer-kibbles-tasty))
+      (is (contains? by-key :wizard))
+      (is (contains? by-key :sage))))
   (testing "Annotates content types correctly"
     (let [keys (reconcile/extract-content-keys test-character)
           by-key (zipmap (map :key keys) keys)]
       (is (= :race (:content-type (get by-key :tiefling))))
+      (is (= :subrace (:content-type (get by-key :winged-tiefling))))
       (is (= :class (:content-type (get by-key :wizard))))
+      (is (= :class (:content-type (get by-key :artificer-kibbles-tasty))))
+      (is (= :subclass (:content-type (get by-key :alchemist-kibbles))))
+      (is (= :subclass (:content-type (get by-key :school-of-chronurgy))))
       (is (= :background (:content-type (get by-key :sage)))))))
 
 (deftest test-extract-empty-character
@@ -77,21 +80,18 @@
     (let [char-keys (reconcile/extract-content-keys test-character)
           missing (reconcile/check-content-availability char-keys available-content)
           missing-keys (set (map :key missing))]
-      ;; :artificer-kibbles-tasty is not in available classes → missing
       (is (contains? missing-keys :artificer-kibbles-tasty))
-      ;; :wizard IS in available classes → not missing
       (is (not (contains? missing-keys :wizard)))
-      ;; :sage IS in available backgrounds → not missing
       (is (not (contains? missing-keys :sage))))))
 
 (deftest test-builtin-content-not-flagged
-  (testing "Built-in PHB content is never flagged as missing"
+  (testing "Built-in SRD content is never flagged as missing"
     (let [character {::entity/options
                      {:class [{::entity/key :fighter}]
                       :race {::entity/key :elf}
                       :background {::entity/key :acolyte}}}
           char-keys (reconcile/extract-content-keys character)
-          ;; Pass empty available content — builtins should still not be flagged
+          ;; Empty available content — builtins should still not be flagged
           missing (reconcile/check-content-availability char-keys {})]
       (is (empty? missing)))))
 
@@ -105,13 +105,11 @@
                       {:key :wizard :name "Wizard"}
                       {:key :bard :name "Bard"}]
           results (reconcile/find-similar-content :artificer-kibbles-tasty :class candidates)]
-      ;; Should suggest :artificer as similar (prefix match)
       (is (seq results))
       (is (= :artificer (-> results first :key)))))
   (testing "No suggestions for completely unrelated keys"
     (let [candidates [{:key :wizard :name "Wizard"}]
           results (reconcile/find-similar-content :blood-hunter-order-of-the-lycan :class candidates)]
-      ;; :wizard has no similarity to :blood-hunter-order-of-the-lycan
       (is (empty? results)))))
 
 ;; ============================================================================
@@ -123,11 +121,9 @@
     (let [report (reconcile/generate-missing-content-report test-character available-content)]
       (is (:has-missing? report))
       (is (pos? (:missing-count report)))
-      ;; Should have suggestions for the missing homebrew class
       (let [missing-artificer (first (filter #(= :artificer-kibbles-tasty (:key %))
                                              (:items report)))]
         (is (some? missing-artificer))
-        ;; Should suggest the base :artificer as a match
         (is (seq (:suggestions missing-artificer)))))))
 
 (deftest test-report-no-missing-content
@@ -146,6 +142,67 @@
     (let [report (reconcile/generate-missing-content-report test-character available-content)
           missing-artificer (first (filter #(= :artificer-kibbles-tasty (:key %))
                                            (:items report)))]
-      ;; :artificer-kibbles-tasty → should infer something like "Kibbles Tasty"
       (is (some? (:inferred-source missing-artificer)))
       (is (string? (:inferred-source missing-artificer))))))
+
+;; ============================================================================
+;; Feat Detection
+;; ============================================================================
+
+(def feat-test-character
+  "Character with top-level feats (some with nested ability score selections)
+   and class-level ASI-or-feat choices. Mimics the Datomic entity structure
+   for a Dragon Knight character using the exported.orcbrew test data."
+  {::entity/options
+   {:race {::entity/key :tegokka}
+    :class [{::entity/key :dragon-knight
+             ::entity/options
+             {:levels [{::entity/key :level-1}
+                       {::entity/key :level-2}
+                       {::entity/key :level-3}
+                       {::entity/key :level-4
+                        ::entity/options
+                        {:asi-or-feat {::entity/key :feat}}}]}}]
+    :background {::entity/key :folk-hero}
+    ;; Top-level feat selection: multi-select vector of chosen feats.
+    ;; Metabolic Control has a nested :asi sub-selection for ability score.
+    :feats [{::entity/key :blade-mastery}
+            {::entity/key :brawny}
+            {::entity/key :metabolic-control
+             ::entity/options
+             {:asi [{::entity/key :orcpub.dnd.e5.character/con}]}}]}})
+
+(deftest test-feat-detection-top-level
+  (testing "Top-level feats are detected as :feat content type"
+    (let [keys (reconcile/extract-content-keys feat-test-character)
+          by-key (zipmap (map :key keys) keys)]
+      (is (= :feat (:content-type (get by-key :blade-mastery))))
+      (is (= :feat (:content-type (get by-key :brawny))))
+      (is (= :feat (:content-type (get by-key :metabolic-control)))))))
+
+(deftest test-ability-score-under-feat-not-extracted
+  (testing "Ability score nested under a feat is NOT extracted at all"
+    (let [keys (reconcile/extract-content-keys feat-test-character)
+          key-set (set (map :key keys))]
+      ;; Direct extraction only gets feat keys, not their sub-selections
+      (is (not (contains? key-set :orcpub.dnd.e5.character/con))
+          "ability score under a feat must not be extracted as content"))))
+
+(deftest test-feat-not-flagged-when-loaded
+  (testing "Feats present in available content are not flagged as missing"
+    (let [content (assoc available-content
+                         :feats [{:key :blade-mastery :name "Blade Mastery"}
+                                 {:key :brawny :name "Brawny"}
+                                 {:key :metabolic-control :name "Metabolic Control"}])
+          report (reconcile/generate-missing-content-report feat-test-character content)]
+      (is (not (some #(= :feat (:content-type %)) (:items report)))
+          "no feats should be missing when all are in available content"))))
+
+(deftest test-feat-flagged-when-missing
+  (testing "Feats absent from available content ARE flagged as missing"
+    (let [report (reconcile/generate-missing-content-report feat-test-character {})
+          missing-feats (filter #(= :feat (:content-type %)) (:items report))]
+      (is (= 3 (count missing-feats))
+          "all 3 feats should be flagged as missing")
+      (is (= #{:blade-mastery :brawny :metabolic-control}
+             (set (map :key missing-feats)))))))
diff --git a/test/cljs/orcpub/dnd/e5/events_test.cljs b/test/cljs/orcpub/dnd/e5/events_test.cljs
new file mode 100644
index 000000000..8f979f0ee
--- /dev/null
+++ b/test/cljs/orcpub/dnd/e5/events_test.cljs
@@ -0,0 +1,190 @@
+(ns orcpub.dnd.e5.events-test
+  "Integration tests for re-frame event handlers refactored during the
+   subscribe-outside-reactive-context fix. These tests verify that
+   dispatching an event produces the expected db state or effects.
+
+   PATTERN — testing a reg-event-db handler:
+     1. Reset app-db to a known state
+     2. dispatch-sync the event
+     3. Assert on @app-db
+
+   PATTERN — testing a reg-event-fx handler:
+     For handlers that return {:http ...} or {:dispatch ...}, we can't
+     easily capture effects without day8.re-frame/re-frame-test. Instead:
+     - Test the db-only portions via dispatch-sync
+     - For effects, test indirectly (e.g. verify db guard logic)
+     - Or register a stub :http fx handler before the test
+
+   NOTE: These tests require all event handlers to be registered. We do
+   this by requiring orcpub.dnd.e5.events, which has side effects
+   (reg-event-db, reg-event-fx calls at load time)."
+  (:require [cljs.test :refer-macros [deftest testing is use-fixtures]]
+            [re-frame.core :as rf]
+            [re-frame.db :refer [app-db]]
+            [orcpub.dnd.e5 :as e5]
+            [orcpub.dnd.e5.character :as char5e]
+            [orcpub.dnd.e5.magic-items :as mi]
+            [orcpub.dnd.e5.spells :as spells]
+            [orcpub.dnd.e5.autosave-fx :as autosave-fx]
+            ;; Side effect: registers all event handlers
+            [orcpub.dnd.e5.events :as events]))
+
+;; ---------------------------------------------------------------------------
+;; Fixtures
+;; ---------------------------------------------------------------------------
+
+(def pristine-db
+  "Minimal app-db state. Extend per-test as needed."
+  {})
+
+(defn reset-db!
+  "Reset app-db before each test to prevent state leakage."
+  []
+  (reset! app-db pristine-db))
+
+(use-fixtures :each {:before reset-db!})
+
+;; ---------------------------------------------------------------------------
+;; ::char5e/filter-spells  (reg-event-db)
+;;
+;; This handler was refactored to call compute-sorted-spells on db
+;; instead of @(subscribe [::char5e/sorted-spells]).
+;; ---------------------------------------------------------------------------
+
+(deftest filter-spells-short-text-returns-all-sorted
+  (testing "filter text under 3 chars → all spells returned (no filtering)"
+    (reset! app-db {:plugins {}})
+    (rf/dispatch-sync [::char5e/filter-spells "fi"])
+    (let [db @app-db]
+      ;; Text stored for the UI input
+      (is (= "fi" (::char5e/spell-text-filter db)))
+      ;; All sorted spells returned (not filtered) because "fi" < 3 chars
+      (let [result (::char5e/filtered-spells db)
+            names (set (map :name result))]
+        ;; Should contain known static spells
+        (is (contains? names "Fireball"))
+        (is (contains? names "Shield"))))))
+
+(deftest filter-spells-long-text-filters
+  (testing "filter text >= 3 chars → only matching spells returned"
+    (reset! app-db {:plugins {}})
+    (rf/dispatch-sync [::char5e/filter-spells "fire"])
+    (let [result (::char5e/filtered-spells @app-db)
+          names (set (map :name result))]
+      ;; Only spells containing "fire" (case-insensitive)
+      (is (contains? names "Fireball"))
+      (is (contains? names "Fire Bolt"))
+      (is (not (contains? names "Shield"))))))
+
+(deftest filter-spells-includes-plugin-spells
+  (testing "plugin spells are merged into the result"
+    (reset! app-db {:plugins {:test-plugin
+                              {::e5/spells
+                               {:zap {:name "Zap" :key :zap}}}}})
+    (rf/dispatch-sync [::char5e/filter-spells "zap"])
+    (let [result (::char5e/filtered-spells @app-db)
+          names (set (map :name result))]
+      (is (contains? names "Zap")))))
+
+;; ---------------------------------------------------------------------------
+;; ::char5e/filter-items  (reg-event-db)
+;;
+;; Same pattern as filter-spells but for magic items.
+;; Uses compute-sorted-items instead of subscribe.
+;; ---------------------------------------------------------------------------
+
+(deftest filter-items-short-text-returns-all
+  (testing "filter text under 3 chars → all items returned"
+    (reset! app-db {})
+    (rf/dispatch-sync [::char5e/filter-items "ba"])
+    (let [result (::char5e/filtered-items @app-db)
+          names (set (map mi/name-key result))]
+      ;; Known static item should be present
+      (is (contains? names "Alchemy Jug")))))
+
+(deftest filter-items-long-text-filters
+  (testing "filter text >= 3 chars → only matching items returned"
+    (reset! app-db {})
+    (rf/dispatch-sync [::char5e/filter-items "alchemy"])
+    (let [result (::char5e/filtered-items @app-db)
+          names (set (map mi/name-key result))]
+      (is (contains? names "Alchemy Jug"))
+      ;; Something unrelated should NOT be present
+      (is (not (contains? names "Animated Shield"))))))
+
+;; ---------------------------------------------------------------------------
+;; ::char5e/save-character  (reg-event-fx)
+;;
+;; Autosave handler. Was refactored to read cached template from app-db
+;; (via track! watcher) instead of @(subscribe [:built-character]).
+;;
+;; Testing an fx handler without day8.re-frame/re-frame-test:
+;; We can't easily intercept the :http effect, but we CAN test the
+;; guard logic (cached-template nil → no-op) by checking that the
+;; handler doesn't crash and doesn't produce unwanted side effects.
+;; ---------------------------------------------------------------------------
+
+(deftest save-character-skips-when-no-cached-template
+  (testing "without cached template, handler is a no-op (returns {})"
+    ;; Set up db with a character but no cached template
+    (reset! app-db {::char5e/character-map {42 {:orcpub.entity/options {}}}})
+    ;; This should NOT throw or dispatch error — it should silently skip
+    ;; We verify by checking no error dispatch happened
+    (rf/dispatch-sync [::char5e/save-character "42"])
+    ;; If we got here without exception, the nil guard works.
+    ;; The db should not have :loading set to true (no save attempted)
+    (is (nil? (:loading @app-db))
+        "No save should be attempted without cached template")))
+
+(deftest save-character-rejects-missing-abilities
+  (testing "with cached template but no ability scores → error dispatch"
+    ;; Minimal character with no abilities
+    (let [template {} ;; empty template → entity/build returns bare character
+          character {:orcpub.entity/options {}}]
+      (reset! app-db {::char5e/character-map {42 character}
+                      ::autosave-fx/cached-template template})
+      ;; This will try to build the character and check abilities.
+      ;; With an empty template, built-character won't have :base-abilities,
+      ;; so the ability check fails → dispatches error message.
+      ;; We can't intercept the :dispatch effect, but we can verify it
+      ;; doesn't crash and the handler runs to completion.
+      (rf/dispatch-sync [::char5e/save-character "42"]))))
+
+;; ---------------------------------------------------------------------------
+;; :save-character  (reg-event-fx)
+;;
+;; Manual save. Was refactored to receive built-character as a parameter
+;; from the component instead of @(subscribe [:built-character]).
+;; ---------------------------------------------------------------------------
+
+(deftest save-character-manual-rejects-missing-abilities
+  (testing "built-character without abilities → error dispatch"
+    (reset! app-db {:character {:orcpub.entity/options {}}})
+    ;; Pass a built-character with no :base-abilities
+    (rf/dispatch-sync [:save-character {}])
+    ;; Handler should not crash. The ability check will fail,
+    ;; resulting in a :show-error-message dispatch.
+    ;; Without intercepting effects, we verify no exception.
+    (is true "Handler completed without exception")))
+
+;; ---------------------------------------------------------------------------
+;; :verify-user-session  (reg-event-fx)
+;;
+;; Replaced @(subscribe [:user false]) in core.cljs.
+;; Tests that the guard logic works: no user → no HTTP call.
+;; ---------------------------------------------------------------------------
+
+(deftest verify-user-session-no-user
+  (testing "without user in db, handler is a no-op"
+    (reset! app-db {})
+    ;; Should not attempt HTTP call
+    (rf/dispatch-sync [:verify-user-session])
+    ;; If we got here, the guard check passed. No exception = success.
+    (is (= {} (select-keys @app-db [:loading]))
+        "No loading state should be set without user")))
+
+(deftest verify-user-session-no-token
+  (testing "user without token → no HTTP call"
+    (reset! app-db {:user {:name "test"}})
+    (rf/dispatch-sync [:verify-user-session])
+    (is true "Handler completed without exception")))
diff --git a/test/cljs/orcpub/dnd/e5/import_validation_test.cljs b/test/cljs/orcpub/dnd/e5/import_validation_test.cljs
index 735aa5354..2c17223e1 100644
--- a/test/cljs/orcpub/dnd/e5/import_validation_test.cljs
+++ b/test/cljs/orcpub/dnd/e5/import_validation_test.cljs
@@ -755,4 +755,85 @@
         (is (nil? (get-in wizard [:spellcasting :spell-list-kw])))
         ;; :str nil → removed, :int 16 → kept
         (is (not (contains? (:abilities wizard) :str)))
-        (is (= 16 (get-in wizard [:abilities :int])))))))
\ No newline at end of file
+        (is (= 16 (get-in wizard [:abilities :int])))))))
+
+;; ============================================================================
+;; Selection Option Deduplication Tests
+;; ============================================================================
+
+(deftest test-dedup-options-identical-content
+  (testing "True duplicates (same name + same content) are collapsed to first"
+    (let [options [{:name "Alchemical Homunculus" :description "A tiny construct"}
+                   {:name "Alchemical Homunculus" :description "A tiny construct"}]
+          [deduped changes] (import-val/dedup-options-in-selection options)]
+      (is (= 1 (count deduped)))
+      (is (= "Alchemical Homunculus" (:name (first deduped))))
+      (is (= 1 (count changes)))
+      (is (= :dedup-identical (:type (first changes)))))))
+
+(deftest test-dedup-options-different-content-renamed
+  (testing "Same name but different content gets numbered"
+    (let [options [{:name "Bonus" :description "Extra attack"}
+                   {:name "Bonus" :description "Extra damage"}]
+          [deduped changes] (import-val/dedup-options-in-selection options)]
+      (is (= 2 (count deduped)))
+      (is (= "Bonus" (:name (first deduped))))
+      (is (= "Bonus 2" (:name (second deduped))))
+      (is (= 1 (count changes)))
+      (is (= :dedup-renamed (:type (first changes)))))))
+
+(deftest test-dedup-options-no-duplicates
+  (testing "Unique options pass through unchanged"
+    (let [options [{:name "Option A" :description "Desc A"}
+                   {:name "Option B" :description "Desc B"}]
+          [deduped changes] (import-val/dedup-options-in-selection options)]
+      (is (= 2 (count deduped)))
+      (is (empty? changes)))))
+
+(deftest test-dedup-options-empty-or-short
+  (testing "Empty and single-element option lists pass through"
+    (let [[d1 c1] (import-val/dedup-options-in-selection [])
+          [d2 c2] (import-val/dedup-options-in-selection [{:name "Solo"}])]
+      (is (= 0 (count d1)))
+      (is (empty? c1))
+      (is (= 1 (count d2)))
+      (is (empty? c2)))))
+
+(deftest test-dedup-options-case-insensitive
+  (testing "Names differing only by case are treated as duplicates"
+    (let [options [{:name "Bonus Attack" :description "Same"}
+                   {:name "bonus attack" :description "Same"}]
+          [deduped changes] (import-val/dedup-options-in-selection options)]
+      (is (= 1 (count deduped)))
+      (is (= 1 (count changes))))))
+
+(deftest test-dedup-options-in-item-nested
+  (testing "Dedup works on selections nested within an item"
+    (let [item {:name "My Selection"
+                :selections {:companion-choice
+                             {:name "Beast Companion"
+                              :options [{:name "Homunculus" :description "A tiny construct"}
+                                        {:name "Homunculus" :description "A tiny construct"}
+                                        {:name "Defender" :description "A medium construct"}]}}}
+          [updated changes] (import-val/dedup-options-in-item item)]
+      (is (= 2 (count (get-in updated [:selections :companion-choice :options]))))
+      (is (= 1 (count changes))))))
+
+(deftest test-dedup-options-in-import-full-pipeline
+  (testing "Full import pipeline deduplicates selection options"
+    (let [plugin-edn (str "{:orcpub.dnd.e5/selections"
+                          " {:test-sel {:option-pack \"Test\""
+                          "             :name \"Test Selection\""
+                          "             :options [{:name \"Alpha\" :description \"A\"}"
+                          "                       {:name \"Alpha\" :description \"A\"}"
+                          "                       {:name \"Beta\" :description \"B\"}]}}}")
+          result (import-val/validate-import plugin-edn
+                                             {:strategy :progressive
+                                              :auto-clean true})]
+      (is (:success result))
+      ;; Should have deduped Alpha (identical content)
+      (let [options (get-in result [:data :orcpub.dnd.e5/selections :test-sel :options])]
+        (is (= 2 (count options)))
+        (is (= #{"Alpha" "Beta"} (set (map :name options)))))
+      ;; Should have a dedup change logged
+      (is (some #(= :dedup-selection-options (:type %)) (:changes result))))))
\ No newline at end of file
diff --git a/test/cljs/orcpub/test_runner.cljs b/test/cljs/orcpub/test_runner.cljs
new file mode 100644
index 000000000..e6ec3ec98
--- /dev/null
+++ b/test/cljs/orcpub/test_runner.cljs
@@ -0,0 +1,18 @@
+(ns orcpub.test-runner
+  (:require [cljs.test :refer-macros [run-tests]]
+            ;; .cljc tests (run on both JVM and CLJS)
+            [orcpub.dnd.e5.event-utils-test]
+            [orcpub.dnd.e5.compute-test]
+            ;; CLJS-only re-frame integration tests
+            [orcpub.dnd.e5.events-test]))
+
+(defn -main []
+  (run-tests 'orcpub.dnd.e5.event-utils-test
+             'orcpub.dnd.e5.compute-test
+             'orcpub.dnd.e5.events-test))
+
+;; Auto-run when figwheel reloads
+(defn ^:after-load on-reload []
+  (-main))
+
+(-main)
diff --git a/web/cljs/orcpub/core.cljs b/web/cljs/orcpub/core.cljs
index 862b7abff..ae023d307 100644
--- a/web/cljs/orcpub/core.cljs
+++ b/web/cljs/orcpub/core.cljs
@@ -3,6 +3,7 @@
             [orcpub.dnd.e5.subs]
             [orcpub.dnd.e5.equipment-subs]
             [orcpub.dnd.e5.events :as events]
+            [orcpub.dnd.e5.autosave-fx :as autosave-fx]
             [orcpub.dnd.e5.views :as views]
             [orcpub.dnd.e5.views-2 :as views-2]
             [orcpub.dnd.e5.views.conflict-resolution :as conflict-views]
@@ -11,25 +12,37 @@
             [clojure.string :as s]
             [re-frame.core :refer [dispatch dispatch-sync subscribe]]
             [reagent.core :as r]
+            [reagent.ratom :as ratom]
+            [reagent.dom.client :as rdc]
             [goog.events])
   (:import
    [goog.history Html5History EventType]))
 
 (enable-console-print!)
 
-;; =============================================================================
-;; Dev Version: 0.0.19 - Fix missing content detection (built-in exclusions)
-;; =============================================================================
-(def dev-version "0.0.19")
-(js/console.log (str "OrcPub Dev Version: " dev-version))
-
-(if (and js/window.location
-         (not (or (s/starts-with? js/window.location.href "https")
-                  (s/starts-with? js/window.location.href "http://localhost"))))
+(when (and js/window.location
+           (not (or (s/starts-with? js/window.location.href "https")
+                    (s/starts-with? js/window.location.href "http://localhost"))))
   (set! js/window.location.protocol "https"))
 
 (dispatch-sync [:initialize-db])
 
+;; Init template cache after all subscription handlers are registered.
+;; Must be called here (not self-initializing) so equipment-subs has loaded.
+(autosave-fx/init-template-cache!)
+
+;; DEBUG: trace subscribe calls outside reactive context.
+;; Prints a full stack trace so we can find the call site.
+;; REMOVE after fixing the warnings.
+(let [original-subscribe re-frame.core/subscribe]
+  (set! re-frame.core/subscribe
+        (fn [query-v & args]
+          (when-not (ratom/reactive?)
+            (js/console.warn "[TRACE] subscribe outside reactive context:"
+                             (pr-str query-v))
+            (js/console.trace))
+          (apply original-subscribe query-v args))))
+
 (def pages
   {nil views-2/splash-page
    routes/default-route views-2/splash-page
@@ -75,7 +88,7 @@
    routes/password-reset-used-route views/password-reset-used-page})
 
 (defn handle-url-change [_]
-  (let [route (if js/window.location
+  (let [route (when js/window.location
                 (routes/match-route js/window.location.pathname))
         config {:skip-path? true}]
     (dispatch [:route route (if (events/login-routes (:handler route))
@@ -113,18 +126,22 @@
      [view (assoc route-params :query query-map)]
      [conflict-views/import-log-overlay]]))
 
-@(subscribe [:user false])
+;; Verify auth token on startup (replaces @(subscribe [:user false]) side-effect)
+(dispatch-sync [:verify-user-session])
+
+;; React 18 createRoot API (Reagent 2.0)
+(defonce root (rdc/create-root (js/document.getElementById "app")))
 
-(r/render (if (let [doc-style js/document.documentElement.style]
-                (and js/window.localStorage
-                     (or (aget doc-style "flexWrap")
-                         (aget doc-style "WebkitFlexWrap")
-                         (aget doc-style "msFlexWrap"))))
-            [main-view]
-            [:div
-             [views/app-header]
-             [:div.f-s-24.main-text-color.sans
-              {:style {:padding "200px"}}
-              "Sorry, we are unable to support your browser since it does not support important HTML5 features. Please try a modern browser such as " [:a {:href "https://www.google.com/chrome/browser/desktop/index.html"} "Google Chrome"] " or " [:a {:href "https://www.mozilla.org/en-US/firefox/products/?v=a"} "Mozilla Firefox"]]])
-          (js/document.getElementById "app"))
+(rdc/render root
+            (if (let [doc-style js/document.documentElement.style]
+                  (and js/window.localStorage
+                       (or (aget doc-style "flexWrap")
+                           (aget doc-style "WebkitFlexWrap")
+                           (aget doc-style "msFlexWrap"))))
+              [main-view]
+              [:div
+               [views/app-header]
+               [:div.f-s-24.main-text-color.sans
+                {:style {:padding "200px"}}
+                "Sorry, we are unable to support your browser since it does not support important HTML5 features. Please try a modern browser such as " [:a {:href "https://www.google.com/chrome/browser/desktop/index.html"} "Google Chrome"] " or " [:a {:href "https://www.mozilla.org/en-US/firefox/products/?v=a"} "Mozilla Firefox"]]]))