diff --git a/docs/design-system/DECISIONS.md b/docs/design-system/DECISIONS.md
index cc54d8b8af..cf628fe78a 100644
--- a/docs/design-system/DECISIONS.md
+++ b/docs/design-system/DECISIONS.md
@@ -242,3 +242,21 @@ Found while verifying, fixed in the same pass: `answer-card.tsx` used arbitrary
 `leading-[var(--leading-prose,1.65)]` — a restated token value that failed the
 design-token contract's no-arbitrary-leading rule on the branch tip. Now the named
 `leading-prose` step. Both token-contract test files: **47 passed (47)**.
+
+6. **Dark-ink cascade bug — found by adversarial self-review, fixed pre-merge.** The
+   cascade port made the light `.ckb-v2` block match inside dark subtrees, silently breaking
+   the documented fall-through: `--text`, `--text-heading`, `--disabled`, glows, backdrop and
+   the accent-soft trio resolved to their **light** values on the dark ramp. Fixed on the
+   PR #1538 head by re-declaring every light-declared colour role in the dark block
+   (mirroring the live `.dark` values previously inherited) plus a contract regression: dark
+   `--text`/`--text-heading` ≥4.5:1 on the dark surface. New standing rule: a colour role
+   added to the light block is added to the dark block in the same commit.
+7. **Post-merge hygiene pass (this PR).** PR #1538 merged; single follow-up bundling: the
+   stale-state sweep (SHAs now pinned only in this log; all other docs state rolling
+   status) · literal `var()` fallback values stripped from the v2 components (the last
+   value-restatement channel; the one surviving fallback is role→role,
+   `var(--e2, var(--shadow-soft))`, which restates no value) · the contract test parses the
+   structural and light blocks separately · HCM `--overlay-backdrop` is transparent, not
+   opaque Canvas · the six now-landed paths removed from the docs-link allowlist per their
+   own remove-after-merge note. Remaining design-app step unchanged: one real
+   `/design-sync` run (guidelines index + `_ds_needs_recompile`).
diff --git a/docs/design-system/GATES.md b/docs/design-system/GATES.md
index b5f3556a5a..3bd7636ec3 100644
--- a/docs/design-system/GATES.md
+++ b/docs/design-system/GATES.md
@@ -68,33 +68,33 @@ as design tokens · export/preview parity.
 
 ## 3 · The prohibition table
 
-| Never do this                                                        | Gate                                                                                            | Status                                                                          |
-| -------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- |
-| Reintroduce `.ckb-v2:not(.dark)`                                     | Cascade computed-style test (PR 1) + contract-test selector filter update                       | planned (port not landed; branch still ships the old form)                      |
-| Add `prefers-color-scheme` rules to the v2 layer                     | — (users pin a theme against OS preference)                                                     | **manual**                                                                      |
-| Paint a numeral with a status colour; use amber/red decoratively     | Colour-boundary lint                                                                            | planned                                                                         |
-| Put `--decoration-soft`/`--text-soft` on a text node                 | Tier pinned both sides in the token contract; text-node AST check                               | implemented-partial                                                             |
-| Uppercase a dose unit                                                | `Quantity` pins `normal-case` + unit test                                                       | implemented-blocking (branch)                                                   |
-| Invert a PDF, diagram or clinical image in any theme                 | `DocumentFrame` refuses transforms; CSS check                                                   | planned                                                                         |
-| Border **and** ring on one surface, or a 1px spread in a drop shadow | Gate 8                                                                                          | implemented-partial                                                             |
-| A child shadow heavier than its parent's                             | Gate 7                                                                                          | implemented-partial                                                             |
-| Use `--shadow-tight`/any alias in new code                           | PR 9 recipe cleanup, then lint                                                                  | planned                                                                         |
-| Raw pixel size, padding, radius or line-height in markup             | Contract ratchet                                                                                | implemented-partial (colour/shadow/tap literals only)                           |
-| Animate `width`, `height`, `grid-template-*`, `top`, `left`, `gap`   | Gate 9                                                                                          | planned                                                                         |
-| Hardcode a transition duration                                       | Gate 9                                                                                          | planned                                                                         |
-| A `z-` value outside the named rungs                                 | `require-z-index-ladder` (ESLint)                                                               | implemented-blocking                                                            |
-| Ship a registered component without a direct test                    | Gate 12                                                                                         | implemented-partial                                                             |
-| Lower a production tap target below 48px                             | Gate 2 + `ui-smoke` flake history + held visual probe                                           | implemented-partial                                                             |
-| Construct an enabled control with no action, destination or name     | PR 4 discriminated unions + contract tests; `require-button-wiring` covers raw `<button>` today | implemented-partial                                                             |
-| Render `AnswerCard` without a verification and answer state          | PR 6 required props (type-level)                                                                | planned                                                                         |
-| Use a bare dash for a missing clinical value                         | `MissingValue` + review                                                                         | planned                                                                         |
-| Render "0 matches" after a failed request                            | `ErrorState` adoption + check                                                                   | planned                                                                         |
-| Hand-rolled rows replacing `AccessibleTable` without declaring it    | —                                                                                               | **manual** (declaration convention)                                             |
-| Drop the AI verification disclaimer                                  | PR 6 required prop                                                                              | planned                                                                         |
-| Fix a collapsed column by nudging pixels                             | 320px snapshot                                                                                  | planned (held harness)                                                          |
-| `dark:` colour override                                              | Lint                                                                                            | planned (3 live instances to burn down)                                         |
-| Truncate a page title, dialog title, drug name or review warning     | —                                                                                               | **manual**                                                                      |
-| Restate a token value in prose                                       | —                                                                                               | **manual** (eleven divergences came from this; TOKENS.md is the only inventory) |
+| Never do this                                                        | Gate                                                                                            | Status                                                                           |
+| -------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------- |
+| Reintroduce `.ckb-v2:not(.dark)`                                     | Cascade computed-style test (PR 1) + contract-test selector filter update                       | implemented-blocking — landed #1538; contract parser + dark-ink regression guard |
+| Add `prefers-color-scheme` rules to the v2 layer                     | — (users pin a theme against OS preference)                                                     | **manual**                                                                       |
+| Paint a numeral with a status colour; use amber/red decoratively     | Colour-boundary lint                                                                            | planned                                                                          |
+| Put `--decoration-soft`/`--text-soft` on a text node                 | Tier pinned both sides in the token contract; text-node AST check                               | implemented-partial                                                              |
+| Uppercase a dose unit                                                | `Quantity` pins `normal-case` + unit test                                                       | implemented-blocking (branch)                                                    |
+| Invert a PDF, diagram or clinical image in any theme                 | `DocumentFrame` refuses transforms; CSS check                                                   | planned                                                                          |
+| Border **and** ring on one surface, or a 1px spread in a drop shadow | Gate 8                                                                                          | implemented-partial                                                              |
+| A child shadow heavier than its parent's                             | Gate 7                                                                                          | implemented-partial                                                              |
+| Use `--shadow-tight`/any alias in new code                           | PR 9 recipe cleanup, then lint                                                                  | planned                                                                          |
+| Raw pixel size, padding, radius or line-height in markup             | Contract ratchet                                                                                | implemented-partial (colour/shadow/tap literals only)                            |
+| Animate `width`, `height`, `grid-template-*`, `top`, `left`, `gap`   | Gate 9                                                                                          | planned                                                                          |
+| Hardcode a transition duration                                       | Gate 9                                                                                          | planned                                                                          |
+| A `z-` value outside the named rungs                                 | `require-z-index-ladder` (ESLint)                                                               | implemented-blocking                                                             |
+| Ship a registered component without a direct test                    | Gate 12                                                                                         | implemented-partial                                                              |
+| Lower a production tap target below 48px                             | Gate 2 + `ui-smoke` flake history + held visual probe                                           | implemented-partial                                                              |
+| Construct an enabled control with no action, destination or name     | PR 4 discriminated unions + contract tests; `require-button-wiring` covers raw `<button>` today | implemented-partial                                                              |
+| Render `AnswerCard` without a verification and answer state          | PR 6 required props (type-level)                                                                | planned                                                                          |
+| Use a bare dash for a missing clinical value                         | `MissingValue` + review                                                                         | planned                                                                          |
+| Render "0 matches" after a failed request                            | `ErrorState` adoption + check                                                                   | planned                                                                          |
+| Hand-rolled rows replacing `AccessibleTable` without declaring it    | —                                                                                               | **manual** (declaration convention)                                              |
+| Drop the AI verification disclaimer                                  | PR 6 required prop                                                                              | planned                                                                          |
+| Fix a collapsed column by nudging pixels                             | 320px snapshot                                                                                  | planned (held harness)                                                           |
+| `dark:` colour override                                              | Lint                                                                                            | planned (3 live instances to burn down)                                          |
+| Truncate a page title, dialog title, drug name or review warning     | —                                                                                               | **manual**                                                                       |
+| Restate a token value in prose                                       | —                                                                                               | **manual** (eleven divergences came from this; TOKENS.md is the only inventory)  |
 
 ## 3a · Rules added by the perfection pass (31 July, second half)
 
diff --git a/docs/design-system/README.md b/docs/design-system/README.md
index 0a72440f16..e8c558c3c1 100644
--- a/docs/design-system/README.md
+++ b/docs/design-system/README.md
@@ -18,7 +18,6 @@ Reading order:
 5. [GATES.md](GATES.md) — every rule paired with its enforcement status. A prohibition
    with no row there is a suggestion.
 
-Canonical code: branch `claude/clinical-kb-design-system-333a69` at `59e4c3dfc`
-(`src/app/ckb-v2-tokens.css` is the single token file; nothing is adopted by product
-surfaces yet). Design project `08d6f126-3fd0-4764-aedf-0062a467280a` conforms to the repo
+Canonical code: `src/app/ckb-v2-tokens.css` on `main` (the single token file, merged via
+PR #1538; nothing is adopted by product surfaces yet). Design project `08d6f126-3fd0-4764-aedf-0062a467280a` conforms to the repo
 file. No visual change ships from this document set — it is the system and its rules.
diff --git a/docs/design-system/SPEC.md b/docs/design-system/SPEC.md
index 77d6eb755e..b22bf6b425 100644
--- a/docs/design-system/SPEC.md
+++ b/docs/design-system/SPEC.md
@@ -5,8 +5,10 @@
 restated in prose here is a defect in this document.
 
 - **Date:** 31 July 2026
-- **Applies to:** branch `claude/clinical-kb-design-system-333a69` at `ef13a072a`
-  (committed, **local-only**, base `cf7728ca2`) · design project `08d6f126-3fd0-4764-aedf-0062a467280a`
+- **Applies to:** the v2 layer and components as merged to `main` (PR #1538; canonical
+  token file `src/app/ckb-v2-tokens.css`) · design project `08d6f126-3fd0-4764-aedf-0062a467280a`.
+  Commit SHAs are pinned only in DECISIONS' resolution log — everywhere else this set
+  states rolling status, so the docs cannot silently age against the repo.
 - **Replaces:** `01-MASTER-SPEC-AND-HANDOVER.md`, `HANDOVER_TO_CLAUDE_DESIGN.md`,
   `01-DESIGN-SYSTEM-SPEC-CORRECTED.md`, and the export's `DESIGN_GUIDE.md` as spec documents.
   Where any of them disagrees with this set, this set wins; where this set disagrees with the
@@ -18,8 +20,8 @@ restated in prose here is a defect in this document.
 
 **Source of truth, ranked.** 1. `AGENTS.md` · 2. `ckb-v2-tokens.css` · 3. committed tests · 4. `.design-sync/conventions.md` · 5. this document set.
 
-**Status keys** used throughout: `main` (in production code) · `branch` (committed at
-`ef13a072a`, local-only, **nothing adopted by product surfaces**) · `design` (landed only in the
+**Status keys** used throughout: `main` (in production code) · `branch` (historic tier —
+merged to `main` via PR #1538, still **nothing adopted by product surfaces**) · `design` (landed only in the
 claude.ai/design project) · `spec` (specified, not built) · `planned` (rule stated, gate not
 built). Claims are marked **[verified: evidence]** or **[assumed: assumption]** where the
 distinction is load-bearing.
@@ -109,7 +111,7 @@ Rules:
 
 ## 4 · Foundations
 
-### 4.1 Theme cascade — `design` landed, `branch` still carries the old form
+### 4.1 Theme cascade — landed (`main`, PR #1538)
 
 ```css
 .ckb-v2 {
@@ -125,11 +127,11 @@ Rules:
 `<html class="dark">`, so v2 light values override the inherited dark values — v2 dark never
 worked outside same-node demos, and every dark capture from before the fix is void.
 
-**[verified:** the branch copy at `ef13a072a` still ships `.ckb-v2:not(.dark)`
-(`src/app/ckb-v2-tokens.css:162`); the fix exists design-side only. Porting it breaks
-`tests/ckb-v2-token-contract.test.ts` twice — the opt-in scope filter accepts only selectors
-starting `.ckb-v2` (test line 70) and the theme blocks are read by their exact selector names
-(test lines 39–41) — so the test updates in the same commit, or the PR lands red.**]**
+**[verified:** ported in PR #1538 with the contract test's block parser updated in the same
+commit. One consequence the port created and the same PR fixed: the light `.ckb-v2` block now
+matches inside dark subtrees, so **every colour role the light block declares must be
+re-declared in the dark block** — otherwise it resolves to its light value (the dark-ink bug,
+DECISIONS §Resolution log). Ink is contract-enforced at ≥4.5:1 on the dark surface.**]**
 
 Constraints that survive the port:
 
@@ -627,13 +629,13 @@ and adoption.** Status keys as in the header; "done" entries cite their commit.
 
 ### Phase 1 — correctness
 
-| PR                             | Contents                                                                                                                                                                                                                                      | Status                       |
-| ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------- |
-| PR 0 · Truth correction        | Retractions, gate labelling, accurate packaging contract — zero code change                                                                                                                                                                   | **done** — this document set |
-| PR 1 · Theme cascade           | Port `.ckb-v2` / `.dark .ckb-v2, .ckb-v2.dark`; update the contract test's selector filter and block names in the same commit; computed-style tests, ancestor **and** same-node                                                               | open                         |
-| PR 2 · Forced colours          | v2 HCM block over the three selectors (§4.2); computed assertions: filled command, filled danger, status marks, disabled, focus, flattened elevation                                                                                          | open                         |
-| PR 3 · Contrast and text roles | `--danger-solid-contrast` on danger · eyebrows and placeholders off the decoration tier · `--text-placeholder` role · finish the disabled encoding across the 10 remaining `disabled:opacity` sites · extend the contrast gate to live tokens | open                         |
-| PR 4 · Interaction contracts   | Discriminated unions for `Citation`, `Chip`, `ToggleSwitch`; `RadioGroup` controlled-or-uncontrolled; `AsyncButton` `type="button"` or retirement                                                                                             | open                         |
+| PR                             | Contents                                                                                                                                                                                                                                      | Status                                                                                                             |
+| ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |
+| PR 0 · Truth correction        | Retractions, gate labelling, accurate packaging contract — zero code change                                                                                                                                                                   | **done** — this document set                                                                                       |
+| PR 1 · Theme cascade           | Port `.ckb-v2` / `.dark .ckb-v2, .ckb-v2.dark`; update the contract test's selector filter and block names in the same commit; computed-style tests, ancestor **and** same-node                                                               | **done** — landed #1538 (cascade port + contract parser + dark-ink regression)                                     |
+| PR 2 · Forced colours          | v2 HCM block over the three selectors (§4.2); computed assertions: filled command, filled danger, status marks, disabled, focus, flattened elevation                                                                                          | partial — HCM block + three selectors landed (#1538); transparent backdrop this PR; computed assertions still open |
+| PR 3 · Contrast and text roles | `--danger-solid-contrast` on danger · eyebrows and placeholders off the decoration tier · `--text-placeholder` role · finish the disabled encoding across the 10 remaining `disabled:opacity` sites · extend the contrast gate to live tokens | partial — danger contrast landed (#1538); rest open                                                                |
+| PR 4 · Interaction contracts   | Discriminated unions for `Citation`, `Chip`, `ToggleSwitch`; `RadioGroup` controlled-or-uncontrolled; `AsyncButton` `type="button"` or retirement                                                                                             | open                                                                                                               |
 
 ### Phase 2 — values, split three ways
 
diff --git a/docs/design-system/TOKENS.md b/docs/design-system/TOKENS.md
index 32673ed912..68d2ac0c32 100644
--- a/docs/design-system/TOKENS.md
+++ b/docs/design-system/TOKENS.md
@@ -6,9 +6,9 @@ row. A value restated here is a defect in this document.
 
 - **Date:** 31 July 2026 · companions: [SPEC.md](SPEC.md) · [DECISIONS.md](DECISIONS.md) ·
   [GATES.md](GATES.md)
-- **Canonical file:** `src/app/ckb-v2-tokens.css` at commit `59e4c3dfc` (branch
-  `claude/clinical-kb-design-system-333a69`) — the **single reconciled copy**, also written
-  to design project `08d6f126…` root. The design side conforms to it.
+- **Canonical file:** `src/app/ckb-v2-tokens.css` on `main` (merged via PR #1538) — the
+  **single reconciled copy**, also written to design project `08d6f126…` root. The design
+  side conforms to it. SHAs are pinned only in DECISIONS' resolution log.
 - **History:** the design side's divergent 31 July copy proved unrecoverable (the design
   project was last updated 2026-07-13; that copy was never written to it), so the
   divergences below were resolved by reconciling the repo file and authoring the missing
@@ -74,15 +74,13 @@ Light block roles **[verified]**: `--background` · `--surface` · `--surface-ch
 `--shadow-well` (recessed well, per §1) · `--glow-primary` · `--glow-soft` ·
 `--overlay-backdrop`.
 
-Dark block overrides a subset **[verified]** and **deliberately falls through to the live
-dark layer for the rest** — the v2 dark shell is _not_ self-contained:
-
-| Fall-through role (not redeclared in v2 dark)         | Consequence                                                                                                                                                                                                                                           |
-| ----------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `--text`, `--text-heading`                            | Dark body/heading ink comes from `live` `.dark`. Acceptable during opt-in; must be revisited at `:root` promotion (C3).                                                                                                                               |
-| `--disabled`                                          | Same. **Confirmed acceptable (`59e4c3dfc` review):** the live dark value on the v2 dark surface computes ≈3.4:1, stronger than the v2 light disabled tier (≈2.5:1).                                                                                   |
-| `--glow-primary`, `--glow-soft`, `--overlay-backdrop` | Same fall-through.                                                                                                                                                                                                                                    |
-| `--clinical-chat-document`                            | **Was a real omission, fixed in `59e4c3dfc`:** now declared in the v2 dark block so it resolves against the v2 dark inset (custom properties inherit computed values, so the live `.dark` `var()` reference could not re-resolve inside the subtree). |
+Since the cascade port (PR #1538), the dark block **re-declares every colour role the light
+block declares** — required because the light `.ckb-v2` block matches inside dark subtrees,
+so any light-declared role left undeclared in dark resolves to its light value (the dark-ink
+bug, DECISIONS §Resolution log 6). Standing rule: **a colour role added to the light block is
+added to the dark block in the same commit.** Ink is contract-enforced (dark `--text` /
+`--text-heading` ≥4.5:1 on the dark surface); the remaining roles are review-guarded until
+the full pair-matrix gate lands (GATES §2, gate 1).
 
 ## 4 · Identity and category tokens
 
diff --git a/scripts/check-docs-links.mjs b/scripts/check-docs-links.mjs
index c0ea395bf6..23bd96468e 100644
--- a/scripts/check-docs-links.mjs
+++ b/scripts/check-docs-links.mjs
@@ -53,15 +53,6 @@ const ALLOWLIST = new Set([
   "src/app/(search-app)/tools/page.tsx",
   "src/lib/tools.ts",
   "src/components/ServiceDetailPage.tsx",
-  // Design-system branch (claude/clinical-kb-design-system-333a69 @ ef13a072a) paths
-  // cited by docs/design-system/*.md; the files land when that branch merges —
-  // remove these entries afterwards so the checker guards them again:
-  "src/app/ckb-v2-tokens.css",
-  "tests/ckb-v2-token-contract.test.ts",
-  "tests/source-badges-off-vocab.dom.test.tsx",
-  "tests/source-metadata-browser-safety.test.ts",
-  "tests/accessible-table-alignment.dom.test.tsx",
-  "tests/ui-v2-components.dom.test.tsx",
 ]);
 
 const DATED_DOC = /\b20\d{2}-\d{2}(-\d{2})?\b/;
diff --git a/src/app/ckb-v2-tokens.css b/src/app/ckb-v2-tokens.css
index 8e834a3141..ab99c92772 100644
--- a/src/app/ckb-v2-tokens.css
+++ b/src/app/ckb-v2-tokens.css
@@ -323,7 +323,9 @@
     --shadow-well: none;
     --glow-primary: none;
     --glow-soft: none;
-    --overlay-backdrop: Canvas;
+    /* Transparent, not Canvas: forced-colours users rely on borders for layer
+       separation, and an opaque backdrop would hide the context behind a modal. */
+    --overlay-backdrop: transparent;
     --rule-accent: inset var(--rule-w) 0 0 LinkText;
     --rule-warning: inset var(--rule-w) 0 0 CanvasText;
     --spine-current: LinkText;
diff --git a/src/components/AccessibleTable.tsx b/src/components/AccessibleTable.tsx
index c7818e9291..7664130c67 100644
--- a/src/components/AccessibleTable.tsx
+++ b/src/components/AccessibleTable.tsx
@@ -345,7 +345,7 @@ function UnverifiedExtractionNotice({ showingFallback }: { showingFallback: bool
       role="status"
       className={cn(
         "mb-2 flex items-start gap-2 rounded-md border border-[color:var(--warning-border)] bg-[color:var(--warning-soft)]",
-        "px-3 py-2 text-xs text-[color:var(--warning-text)] shadow-[var(--rule-warning,inset_3px_0_0_var(--warning))]",
+        "px-3 py-2 text-xs text-[color:var(--warning-text)] shadow-[var(--rule-warning)]",
       )}
     >
       <TriangleAlert className="mt-0.5 h-3.5 w-3.5 shrink-0" aria-hidden />
diff --git a/src/components/ui/answer-card.tsx b/src/components/ui/answer-card.tsx
index 6328a97bce..014109b0ed 100644
--- a/src/components/ui/answer-card.tsx
+++ b/src/components/ui/answer-card.tsx
@@ -28,21 +28,19 @@ export function AnswerCard({ children, header, footer, className }: AnswerCardPr
     <article
       data-testid="answer-card"
       className={cn(
-        "overflow-hidden rounded-[var(--radius-xl,1rem)] border border-[color:var(--border-lux)] bg-[color:var(--surface-raised)] shadow-[var(--e2,var(--shadow-soft))]",
+        "overflow-hidden rounded-[var(--radius-xl)] border border-[color:var(--border-lux)] bg-[color:var(--surface-raised)] shadow-[var(--e2,var(--shadow-soft))]",
         className,
       )}
     >
       {header ? (
-        <div className="border-b border-[color:var(--border)] p-[var(--pad-panel,1.5rem)] pb-[var(--gap-stack,1rem)]">
-          {header}
-        </div>
+        <div className="border-b border-[color:var(--border)] p-[var(--pad-panel)] pb-[var(--gap-stack)]">{header}</div>
       ) : null}
       <div
         className={cn(
-          "p-[var(--pad-panel,1.5rem)]",
+          "p-[var(--pad-panel)]",
           // Prose measure is a hard ceiling: an answer that runs the full width of a
           // desktop viewport is unreadable regardless of type size.
-          "max-w-[var(--measure,68ch)] text-[length:var(--text-md,1.0625rem)] leading-prose text-[color:var(--text)]",
+          "max-w-[var(--measure)] text-[length:var(--text-md)] leading-prose text-[color:var(--text)]",
         )}
       >
         {children}
@@ -93,12 +91,12 @@ export function DoseLine({ rows, caption, className }: DoseLineProps) {
   return (
     <div
       className={cn(
-        "overflow-hidden rounded-[var(--radius-lg,0.75rem)] border border-[color:var(--border)] bg-[color:var(--surface)]",
+        "overflow-hidden rounded-[var(--radius-lg)] border border-[color:var(--border)] bg-[color:var(--surface)]",
         className,
       )}
     >
       {caption ? (
-        <p className="border-b border-[color:var(--border)] bg-[color:var(--surface-subtle)] px-[var(--pad-card,1.25rem)] py-2 text-xs font-semibold text-[color:var(--text-muted)]">
+        <p className="border-b border-[color:var(--border)] bg-[color:var(--surface-subtle)] px-[var(--pad-card)] py-2 text-xs font-semibold text-[color:var(--text-muted)]">
           {caption}
         </p>
       ) : null}
@@ -112,11 +110,9 @@ export function DoseLine({ rows, caption, className }: DoseLineProps) {
             // width; the left padding compensates for it explicitly rather than
             // letting the rule eat the card inset.
             className={cn(
-              "flex items-baseline justify-between gap-4 py-3 pr-[var(--pad-card,1.25rem)]",
-              "pl-[calc(var(--pad-card,1.25rem)_+_var(--rule-w,3px))]",
-              row.overdue
-                ? "shadow-[var(--rule-warning,inset_3px_0_0_var(--warning))]"
-                : "shadow-[var(--rule-accent,inset_3px_0_0_var(--clinical-accent))]",
+              "flex items-baseline justify-between gap-4 py-3 pr-[var(--pad-card)]",
+              "pl-[calc(var(--pad-card)_+_var(--rule-w))]",
+              row.overdue ? "shadow-[var(--rule-warning)]" : "shadow-[var(--rule-accent)]",
             )}
           >
             <span className="min-w-0">
@@ -126,11 +122,11 @@ export function DoseLine({ rows, caption, className }: DoseLineProps) {
               ) : null}
             </span>
             <span className="shrink-0 whitespace-nowrap text-right">
-              <span className="font-mono text-sm tabular-nums text-[color:var(--text-heading)] [font-weight:var(--font-weight-value,650)]">
+              <span className="font-mono text-sm tabular-nums text-[color:var(--text-heading)] [font-weight:var(--font-weight-value)]">
                 {row.value}
               </span>
               {row.unit ? (
-                <span className="ml-1 text-sm-minus normal-case text-[color:var(--text-muted)] [font-weight:var(--font-weight-label,500)]">
+                <span className="ml-1 text-sm-minus normal-case text-[color:var(--text-muted)] [font-weight:var(--font-weight-label)]">
                   {row.unit}
                 </span>
               ) : null}
@@ -173,7 +169,7 @@ export function AnswerFooter({ publisher, version, reviewDate, generatedAt, clas
       data-testid="answer-footer"
       className={cn(
         "flex flex-wrap items-center gap-x-2 gap-y-1 border-t border-[color:var(--border)] bg-[color:var(--surface-wash)]",
-        "px-[var(--pad-panel,1.5rem)] py-[var(--gap-inline,0.75rem)] text-xs tabular-nums text-[color:var(--text-muted)]",
+        "px-[var(--pad-panel)] py-[var(--gap-inline)] text-xs tabular-nums text-[color:var(--text-muted)]",
         className,
       )}
     >
diff --git a/src/components/ui/disclosure.tsx b/src/components/ui/disclosure.tsx
index f1b07ccfa2..7cc5c80e0e 100644
--- a/src/components/ui/disclosure.tsx
+++ b/src/components/ui/disclosure.tsx
@@ -75,7 +75,7 @@ export function Disclosure({
           <ChevronRight
             aria-hidden="true"
             className={cn(
-              "size-icon-sm shrink-0 text-[color:var(--text-muted)] transition-transform duration-[var(--duration-fast,120ms)]",
+              "size-icon-sm shrink-0 text-[color:var(--text-muted)] transition-transform duration-[var(--duration-fast)]",
               "motion-reduce:transition-none",
               open && "rotate-90",
             )}
diff --git a/src/components/ui/progress.tsx b/src/components/ui/progress.tsx
index 2154242b1c..b011c4052c 100644
--- a/src/components/ui/progress.tsx
+++ b/src/components/ui/progress.tsx
@@ -44,7 +44,7 @@ export function Progress({ value, label, detail, className }: ProgressProps) {
           className={cn(
             "h-full rounded-full bg-[color:var(--command)]",
             determinate
-              ? "transition-[width] duration-[var(--duration-base,180ms)] motion-reduce:transition-none"
+              ? "transition-[width] duration-[var(--duration-base)] motion-reduce:transition-none"
               : "w-1/3 animate-[shimmer_1.4s_ease-in-out_infinite] motion-reduce:w-full motion-reduce:animate-none",
           )}
           style={determinate ? { width: `${clamped}%` } : undefined}
@@ -107,12 +107,12 @@ export function StageList({
               <span
                 aria-hidden
                 className={cn(
-                  "absolute left-[calc(var(--gutter-col,1.25rem)/2)] top-4 h-[calc(100%-0.5rem)] w-px -translate-x-1/2",
+                  "absolute left-[calc(var(--gutter-col)/2)] top-4 h-[calc(100%-0.5rem)] w-px -translate-x-1/2",
                   stage.state === "done" ? "bg-[color:var(--success)]" : "bg-[color:var(--border)]",
                 )}
               />
             ) : null}
-            <span className="relative z-5 grid w-[var(--gutter-col,1.25rem)] shrink-0 place-items-center pt-0.5">
+            <span className="relative z-5 grid w-[var(--gutter-col)] shrink-0 place-items-center pt-0.5">
               {stage.state === "done" ? (
                 <Check aria-hidden="true" className="size-icon-sm text-[color:var(--success)]" strokeWidth={3} />
               ) : stage.state === "active" ? (
diff --git a/src/components/ui/quantity.tsx b/src/components/ui/quantity.tsx
index d9d03e8d4e..65ec715e78 100644
--- a/src/components/ui/quantity.tsx
+++ b/src/components/ui/quantity.tsx
@@ -51,8 +51,8 @@ export function Quantity({ value, unit, demoted = false, size = "md", className
           "font-mono tabular-nums",
           step.value,
           demoted
-            ? "text-[color:var(--text-muted)] [font-weight:var(--font-weight-label,500)]"
-            : "text-[color:var(--text-heading)] [font-weight:var(--font-weight-value,650)]",
+            ? "text-[color:var(--text-muted)] [font-weight:var(--font-weight-label)]"
+            : "text-[color:var(--text-heading)] [font-weight:var(--font-weight-value)]",
         )}
       >
         {value}
@@ -63,8 +63,8 @@ export function Quantity({ value, unit, demoted = false, size = "md", className
           // `normal-case` is load-bearing: it blocks an inherited uppercase
           // transform from silently rewriting the unit.
           className={cn(
-            "normal-case text-[color:var(--text-muted)] [font-weight:var(--font-weight-label,500)]",
-            "ml-[var(--quantity-unit-gap,0.15em)] tracking-[var(--quantity-unit-tracking,0.01em)]",
+            "normal-case text-[color:var(--text-muted)] [font-weight:var(--font-weight-label)]",
+            "ml-[var(--quantity-unit-gap)] tracking-[var(--quantity-unit-tracking)]",
             step.unit,
           )}
         >
diff --git a/tests/ckb-v2-token-contract.test.ts b/tests/ckb-v2-token-contract.test.ts
index 74e3bb2c63..9ceb6090eb 100644
--- a/tests/ckb-v2-token-contract.test.ts
+++ b/tests/ckb-v2-token-contract.test.ts
@@ -27,16 +27,16 @@ function block(selector: string) {
   // every top-level block whose selector line starts with the given selector.
   const opener = `\n${selector} {`;
   const grouped = `\n${selector},`;
+  const found: string[] = [];
   let start = stylesheet.indexOf(opener);
   if (start === -1) start = stylesheet.indexOf(grouped);
-  expect(start, `${selector} block is missing from ckb-v2-tokens.css`).toBeGreaterThan(-1);
-  let combined = "";
   while (start > -1) {
     const end = stylesheet.indexOf("\n}", start);
-    combined += stylesheet.slice(start, end);
+    found.push(stylesheet.slice(start, end));
     start = stylesheet.indexOf(opener, end);
   }
-  return combined;
+  expect(found.length, `${selector} block is missing from ckb-v2-tokens.css`).toBeGreaterThan(0);
+  return found;
 }
 
 function declarations(source: string) {
@@ -47,9 +47,13 @@ function declarations(source: string) {
   return map;
 }
 
-const structural = declarations(block(".ckb-v2"));
-const lightShell = structural; // structural + light now share the .ckb-v2 selector
-const darkShell = declarations(block(".dark .ckb-v2"));
+const ckbBlocks = block(".ckb-v2");
+expect(ckbBlocks.length, "expected distinct structural and light .ckb-v2 blocks").toBe(2);
+const structural = declarations(ckbBlocks[0]);
+// Parsed separately so a light-only token accidentally declared structural (or
+// vice versa) fails here instead of passing through a merged map.
+const lightShell = declarations(ckbBlocks[1]);
+const darkShell = declarations(block(".dark .ckb-v2").join("\n"));
 
 function hexOf(tokens: Map<string, string>, name: string) {
   const value = tokens.get(name);