diff --git a/CLAUDE.md b/CLAUDE.md
index 8196ed4e..646bd6ec 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -20,7 +20,7 @@ file below is imported into context automatically.
     nothing.
   - **The offline guarantee, the renderer/main split and the crypto
     invariants are non-negotiable.** See the hard security rules.
-  - **A UI change is checked against all 14 themes** before it is proposed,
+  - **A UI change is checked against all 20 themes** before it is proposed,
     not after it is built.
   - prose / overly verbose comments must be removed / trimmed before stating feature is done. Code must be self describing.
 
diff --git a/README.md b/README.md
index 5a461934..696a65ca 100644
--- a/README.md
+++ b/README.md
@@ -48,9 +48,9 @@ Builds are **unsigned**, so SmartScreen and Gatekeeper warn on first launch (the
 | ------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **Compare**              | Two files or pasted text, split or inline, word-level highlights, in-view search, and a live re-diff when a file changes on disk.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | **Understand structure** | JSON, YAML and XML compared as _data_: reordering keys or reformatting stops counting, and unchanged keys collapse away.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| **Excel**                | `.xlsx` workbooks as aligned grids — sheet tabs and cell-level highlights, with inserted rows and columns that don't cascade into false changes. Dates read as dates, hidden sheets and rows are marked, and formulas are compared as well as their results, so a total pasted over the formula behind it is caught rather than shown as unchanged. Headers are found under a title row rather than assumed to be row 1, and rows can be paired by the columns that name them — one column or several — so the same export sorted differently reads as the one figure that moved instead of as a rewrite. Set a tolerance — one of the presets or a threshold of your own, percentage or raw — and rounding noise stops counting; export the whole change list as a CSV.                                                                                                                                                                                                                                                                                                                                                                     |
+| **Excel**                | `.xlsx` workbooks as aligned grids — sheet tabs and cell-level highlights, with inserted rows and columns that don't cascade into false changes. Dates read as dates, hidden sheets and rows are marked, and formulas are compared as well as their results, so a total pasted over the formula behind it is caught rather than shown as unchanged. Headers are found under a title row rather than assumed to be row 1, and rows can be paired by the columns that name them — one column or several — so the same export sorted differently reads as the one figure that moved instead of as a rewrite. Set a tolerance — one of the presets or a threshold of your own, percentage or raw — and rounding noise stops counting; export the whole change list as a CSV.                                                                                                               |
 | **CSV**                  | `.csv` and `.tsv` compare as text or, one toggle away, as the same grid — rows aligned by their first column, quoted fields kept whole.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-| **Dependencies**         | A lockfile pair reads as the dependency moves it describes, not as the four thousand lines it is written in: which packages were added, removed, bumped or downgraded, the semver step of each, and — the part that matters — which of them you actually asked for rather than got carried along. `package-lock.json`, `pnpm-lock.yaml`, `yarn.lock`, `go.sum` and `composer.lock`. Nothing is fetched; every fact comes out of the file in front of you.                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+| **Dependencies**         | A lockfile pair reads as the dependency moves it describes, not as the four thousand lines it is written in: which packages were added, removed, bumped or downgraded, the semver step of each, and — the part that matters — which of them you actually asked for rather than got carried along. `package-lock.json`, `pnpm-lock.yaml`, `yarn.lock`, `go.sum` and `composer.lock`. Nothing is fetched; every fact comes out of the file in front of you.                                                                                                                                                                                                                                                                                                                                                                                                                              |
 | **Huge files**           | Past 32 MB a file is indexed by line instead of loaded, and the rows you're looking at are read from disk as you scroll — a multi-gigabyte log opens in seconds. Marked as streamed, with the few actions that need the whole text saying so rather than half-working.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | **Keep**                 | Saved diffs: encrypted, tagged, optionally auto-expiring. Drag a row onto another to arrange the list yourself; starred rows stay above the rest. Your open tabs come back on the next launch, and the strip can be told to close the oldest comparison to make room for a new one.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 | **Share**                | One signed file only the recipients you ticked can open, carrying the expiry you chose so every copy dies at the same moment. Give a trusted key an email address and Diff Bro opens an addressed message in your own mail app with the sealed file on the clipboard — it never sends anything itself. The key swap rides the same rails: email your key from the My key dialog, and a key copied out of any chat app is offered — fingerprint first — when you press + Trusted key.                                                                                                                                                                                                                                                                                                                                                                                                   |
@@ -62,9 +62,9 @@ Builds are **unsigned**, so SmartScreen and Gatekeeper warn on first launch (the
 | **Guided first run**     | Six coach marks over the real controls on a first launch — comparing, sealing, the library, then the way into Settings and around it — with four more if you want them. Each step points at a control and its button performs the action, so nothing opens unannounced. Back revisits a step, and everything it put on screen — the demo files, the example snippet — leaves when it does. Escape or Skip ends it for good; Help ▸ Show Tour brings it back.                                                                                                                                                                                                                                                                                                                                                                                                                           |
 | **Diagrams**             | Two Mermaid files compare as a picture, not as text — one diagram carrying both revisions, so an inserted node reads as one change instead of a rewrite.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | **Tools**                | JSON, Base64, UUID, JWT, Epoch, URL, Lines, XML, checksums, a regex tester, find & replace, text encryption — rich panels, not blank text boxes. All of them live in their own sidebar section; star the ones you reach for and they stay at the top.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| **Merge conflicts**      | Registered as git's `difftool` **and** `mergetool`: `git mergetool` opens the two conflicting versions and takes a choice per conflict — ours, theirs, both or neither — then writes the merged file back and tells git it is done. This is the one file Diff Bro writes over; everything else it produces is a new file you picked the place for. |
-| **Terminal**             | `diffbro compare a.json b.json` opens a comparison in the running app, and either side can name a git revision instead of a file — `diffbro compare HEAD~1:src/app.js src/app.js` reads the old copy straight out of the repository, so you never have to produce one first. `diffbro open` raises the app, `diffbro backup <path>` writes an encrypted archive. No port, no daemon.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| **Yours to arrange**     | Fourteen themes (Nord, Sepia, Solar, Nyan, Matrix, plus accessibility-grade Contrast and Beacon), shared tags, adjustable limits.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| **Merge conflicts**      | Registered as git's `difftool` **and** `mergetool`: `git mergetool` opens a real three-way view — the two branches either side, the file you are producing in the middle, and that middle one is a full editor. Each side is labelled with the branch it came from and read out of git's index, so no `<<<<<<<` ever reaches the screen; the chevrons in the gutters move a side across, F7 walks the conflicts, and where neither side is right you just type the answer. Thirty conflicted files are thirty stops, counted in the header. It writes the merged file back and tells git it is done — the one file Diff Bro writes over; everything else it produces is a new file you picked the place for.                                                                                                                                                                           |
+| **Terminal**             | `diffbro compare a.json b.json` opens a comparison in the running app, and either side can name a git revision instead of a file — `diffbro compare HEAD~1:src/app.js src/app.js` reads the old copy straight out of the repository, so you never have to produce one first. `diffbro open` raises the app, `diffbro backup <path>` writes an encrypted archive. No port, no daemon.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+| **Yours to arrange**     | Twenty themes (Nord, Sepia, Solar, Nyan, Matrix, Volcano, Tide, Graphite, plus accessibility-grade Contrast and Beacon), shared tags, adjustable limits.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 
 <details>
 <summary>The smaller things</summary>
@@ -112,7 +112,7 @@ flowchart LR
     </td>
     <td width="50%" valign="top">
       <img src="docs/screenshots/diff-light.png" alt="The same JSON diff in the light theme — floating cards on a tinted ground">
-      <p align="center"><em>Fourteen themes, GitHub-style rendering.</em></p>
+      <p align="center"><em>Twenty themes, GitHub-style rendering.</em></p>
     </td>
   </tr>
   <tr>
diff --git a/docs/brand/roadmap.svg b/docs/brand/roadmap.svg
index 2dafede9..a185c5aa 100644
--- a/docs/brand/roadmap.svg
+++ b/docs/brand/roadmap.svg
@@ -5,7 +5,7 @@
      sidebar. Track hues are real theme accents from src/renderer/src/utils/themes.js
      (Dim, Bloom, Neon, Beacon) — colour depth encodes sequence: solid now, faded
      later. Keep this in step with the items in docs/roadmap.md. -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1200 700" width="1200" height="700" role="img" aria-label="Diff Bro roadmap — five tracks: developer workflow (dependencies, compare a git revision, resolve a merge) shipped, spreadsheet · finance (amounts read as amounts, delta and net variance, reading a big diff, caps that announce themselves), diagrams, comparing more, signing">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1200 700" width="1200" height="700" role="img" aria-label="Diff Bro roadmap — five tracks: developer workflow (dependencies, compare a git revision, a three-way merge view) shipped, spreadsheet · finance (amounts read as amounts, delta and net variance, reading a big diff, caps that announce themselves), diagrams, comparing more, signing">
   <defs>
     <linearGradient id="field" x1="0" y1="0" x2="0.55" y2="1">
       <stop offset="0" stop-color="#2f2a1c"/>
@@ -117,7 +117,7 @@
     <text x="344" y="479" font-size="12.5" fill="#1c1710">Compare a git revision</text>
 
     <rect x="334" y="497" width="243" height="30" rx="5" fill="#6ed2c0"/>
-    <text x="344" y="516" font-size="12.5" fill="#1c1710">Resolve a merge</text>
+    <text x="344" y="516" font-size="12.5" fill="#1c1710">Three-way merge view</text>
 
     <line x1="334" y1="545" x2="577" y2="545" stroke="#ddd0b6" stroke-dasharray="3 3"/>
     <text x="334" y="564" font-size="11" font-family="ui-monospace, SFMono-Regular, Menlo, monospace" fill="#8d8168">utils/lockfile/</text>
diff --git a/docs/roadmap.md b/docs/roadmap.md
index cd258e7b..c0d5023f 100644
--- a/docs/roadmap.md
+++ b/docs/roadmap.md
@@ -1,7 +1,7 @@
 # Roadmap
 
 <img src="brand/roadmap.svg" width="100%"
-     alt="Roadmap board — five tracks. Developer workflow, shipped: dependencies as lockfiles, compare a git revision, resolve a merge. Spreadsheet · finance: amounts read as amounts, delta and net variance, reading a big diff, caps that announce themselves. Diagrams: sequence · gantt · pie, click a change to pan to it. Comparing more: folder compare, image pairs, three-way merge — a decision first. Signing: macOS Developer ID, Windows deferred.">
+     alt="Roadmap board — five tracks. Developer workflow, shipped: dependencies as lockfiles, compare a git revision, a three-way merge view. Spreadsheet · finance: amounts read as amounts, delta and net variance, reading a big diff, caps that announce themselves. Diagrams: sequence · gantt · pie, click a change to pan to it. Comparing more: folder compare, image pairs — a decision first. Signing: macOS Developer ID, Windows deferred.">
 
 <sup>Board is `docs/brand/roadmap.svg` — hand-authored, edit it alongside the
 sections below.</sup>
@@ -171,7 +171,7 @@ flowchart LR
   extractor. They keep the text diff and the toggle stays hidden
 - **the register is read-only** — a row names a change you then hunt for by eye;
   clicking one should pan the diagram to it
-- Still out of scope: editing a diagram from the diff view, three-way merge
+- Still out of scope: editing a diagram from the diff view
 
 ---
 
@@ -192,10 +192,11 @@ flowchart LR
     c["compare HEAD~1:path"]
     g --> c
   end
-  subgraph merge["merge"]
-    m["mergeConflicts.js — regions + four resolutions"]
+  subgraph merge["three-way merge"]
+    m["index :1: :2: :3: — no markers on screen"]
+    v["MergeView — ours │ result │ theirs, middle editable"]
     w["mergeSession.js — the one write"]
-    m --> w
+    m --> v --> w
   end
 ```
 
@@ -204,10 +205,14 @@ flowchart LR
 - **Revisions** — `diffbro compare HEAD~1:src/app.js src/app.js`. `git show`
   behind a fence: fixed argv, no shell, the repo root computed in main, hooks
   and the fsmonitor disabled, every inherited `GIT_*` dropped
-- **Merge** — `git mergetool` now finishes. This CROSSES "Diff Bro never writes
-  files", deliberately: the app had already registered for the job. Main writes
-  only the `$MERGED` path it was launched with, the renderer sends text and
-  never a path, and the launcher waits so `trustExitCode` is honest
+- **Merge** — `git mergetool` now finishes, in a three-pane view: the two
+  branches either side, named by branch, and the file you are producing in the
+  middle as a real editor. Sides come from the index, so no `<<<<<<<` reaches
+  the screen; gutter chevrons move a side across, F7 walks the conflicts, and
+  typing IS the answer where neither side was right. This CROSSES "Diff Bro
+  never writes files", deliberately: the app had already registered for the job.
+  Main writes only the `$MERGED` path it was launched with, the renderer sends
+  text and never a path, and the launcher waits so `trustExitCode` is honest
 
 **Open.** TOML lockfiles (`Cargo.lock`, `poetry.lock`) need a parser this repo
 does not have. A revision PICKER — the app takes a revision, it is not a git
diff --git a/docs/screenshots/themes/deps-diff-amber.png b/docs/screenshots/themes/deps-diff-amber.png
new file mode 100644
index 00000000..50f9c6da
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-amber.png differ
diff --git a/docs/screenshots/themes/deps-diff-beacon.png b/docs/screenshots/themes/deps-diff-beacon.png
new file mode 100644
index 00000000..bbde8bce
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-beacon.png differ
diff --git a/docs/screenshots/themes/deps-diff-bloom.png b/docs/screenshots/themes/deps-diff-bloom.png
new file mode 100644
index 00000000..6d44bf5b
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-bloom.png differ
diff --git a/docs/screenshots/themes/deps-diff-contrast.png b/docs/screenshots/themes/deps-diff-contrast.png
new file mode 100644
index 00000000..5910b5ea
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-contrast.png differ
diff --git a/docs/screenshots/themes/deps-diff-dark.png b/docs/screenshots/themes/deps-diff-dark.png
new file mode 100644
index 00000000..ec8cc9a0
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-dark.png differ
diff --git a/docs/screenshots/themes/deps-diff-dim.png b/docs/screenshots/themes/deps-diff-dim.png
new file mode 100644
index 00000000..62f2d7bb
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-dim.png differ
diff --git a/docs/screenshots/themes/deps-diff-ember.png b/docs/screenshots/themes/deps-diff-ember.png
new file mode 100644
index 00000000..03a319c1
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-ember.png differ
diff --git a/docs/screenshots/themes/deps-diff-graphite.png b/docs/screenshots/themes/deps-diff-graphite.png
new file mode 100644
index 00000000..4b41b32a
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-graphite.png differ
diff --git a/docs/screenshots/themes/deps-diff-light.png b/docs/screenshots/themes/deps-diff-light.png
new file mode 100644
index 00000000..e4d5eec8
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-light.png differ
diff --git a/docs/screenshots/themes/deps-diff-linen.png b/docs/screenshots/themes/deps-diff-linen.png
new file mode 100644
index 00000000..797db45d
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-linen.png differ
diff --git a/docs/screenshots/themes/deps-diff-matrix.png b/docs/screenshots/themes/deps-diff-matrix.png
new file mode 100644
index 00000000..4a53ab37
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-matrix.png differ
diff --git a/docs/screenshots/themes/deps-diff-meridian.png b/docs/screenshots/themes/deps-diff-meridian.png
new file mode 100644
index 00000000..621048c4
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-meridian.png differ
diff --git a/docs/screenshots/themes/deps-diff-neon.png b/docs/screenshots/themes/deps-diff-neon.png
new file mode 100644
index 00000000..ab3de85b
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-neon.png differ
diff --git a/docs/screenshots/themes/deps-diff-nord.png b/docs/screenshots/themes/deps-diff-nord.png
new file mode 100644
index 00000000..847ad273
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-nord.png differ
diff --git a/docs/screenshots/themes/deps-diff-nyan.png b/docs/screenshots/themes/deps-diff-nyan.png
new file mode 100644
index 00000000..d8ed139d
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-nyan.png differ
diff --git a/docs/screenshots/themes/deps-diff-sepia.png b/docs/screenshots/themes/deps-diff-sepia.png
new file mode 100644
index 00000000..b9e512c7
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-sepia.png differ
diff --git a/docs/screenshots/themes/deps-diff-solar.png b/docs/screenshots/themes/deps-diff-solar.png
new file mode 100644
index 00000000..e0145783
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-solar.png differ
diff --git a/docs/screenshots/themes/deps-diff-tide.png b/docs/screenshots/themes/deps-diff-tide.png
new file mode 100644
index 00000000..64283568
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-tide.png differ
diff --git a/docs/screenshots/themes/deps-diff-vector.png b/docs/screenshots/themes/deps-diff-vector.png
new file mode 100644
index 00000000..9d64b3da
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-vector.png differ
diff --git a/docs/screenshots/themes/deps-diff-volcano.png b/docs/screenshots/themes/deps-diff-volcano.png
new file mode 100644
index 00000000..7bb7167c
Binary files /dev/null and b/docs/screenshots/themes/deps-diff-volcano.png differ
diff --git a/docs/screenshots/themes/launcher-compose-amber.png b/docs/screenshots/themes/launcher-compose-amber.png
new file mode 100644
index 00000000..ee58b453
Binary files /dev/null and b/docs/screenshots/themes/launcher-compose-amber.png differ
diff --git a/docs/screenshots/themes/launcher-compose-beacon.png b/docs/screenshots/themes/launcher-compose-beacon.png
index ad411ec0..af5de639 100644
Binary files a/docs/screenshots/themes/launcher-compose-beacon.png and b/docs/screenshots/themes/launcher-compose-beacon.png differ
diff --git a/docs/screenshots/themes/launcher-compose-bloom.png b/docs/screenshots/themes/launcher-compose-bloom.png
index ad411ec0..9379fc3e 100644
Binary files a/docs/screenshots/themes/launcher-compose-bloom.png and b/docs/screenshots/themes/launcher-compose-bloom.png differ
diff --git a/docs/screenshots/themes/launcher-compose-contrast.png b/docs/screenshots/themes/launcher-compose-contrast.png
index ad411ec0..40c33e46 100644
Binary files a/docs/screenshots/themes/launcher-compose-contrast.png and b/docs/screenshots/themes/launcher-compose-contrast.png differ
diff --git a/docs/screenshots/themes/launcher-compose-dark.png b/docs/screenshots/themes/launcher-compose-dark.png
index ad411ec0..a10fb60f 100644
Binary files a/docs/screenshots/themes/launcher-compose-dark.png and b/docs/screenshots/themes/launcher-compose-dark.png differ
diff --git a/docs/screenshots/themes/launcher-compose-dim.png b/docs/screenshots/themes/launcher-compose-dim.png
index ad411ec0..b6474a13 100644
Binary files a/docs/screenshots/themes/launcher-compose-dim.png and b/docs/screenshots/themes/launcher-compose-dim.png differ
diff --git a/docs/screenshots/themes/launcher-compose-ember.png b/docs/screenshots/themes/launcher-compose-ember.png
new file mode 100644
index 00000000..8e884da9
Binary files /dev/null and b/docs/screenshots/themes/launcher-compose-ember.png differ
diff --git a/docs/screenshots/themes/launcher-compose-graphite.png b/docs/screenshots/themes/launcher-compose-graphite.png
new file mode 100644
index 00000000..6fe64e55
Binary files /dev/null and b/docs/screenshots/themes/launcher-compose-graphite.png differ
diff --git a/docs/screenshots/themes/launcher-compose-light.png b/docs/screenshots/themes/launcher-compose-light.png
index ad411ec0..cd904ec8 100644
Binary files a/docs/screenshots/themes/launcher-compose-light.png and b/docs/screenshots/themes/launcher-compose-light.png differ
diff --git a/docs/screenshots/themes/launcher-compose-linen.png b/docs/screenshots/themes/launcher-compose-linen.png
index ad411ec0..b4af44d0 100644
Binary files a/docs/screenshots/themes/launcher-compose-linen.png and b/docs/screenshots/themes/launcher-compose-linen.png differ
diff --git a/docs/screenshots/themes/launcher-compose-matrix.png b/docs/screenshots/themes/launcher-compose-matrix.png
index ad411ec0..a1cb2cbf 100644
Binary files a/docs/screenshots/themes/launcher-compose-matrix.png and b/docs/screenshots/themes/launcher-compose-matrix.png differ
diff --git a/docs/screenshots/themes/launcher-compose-meridian.png b/docs/screenshots/themes/launcher-compose-meridian.png
index ad411ec0..f113dbaf 100644
Binary files a/docs/screenshots/themes/launcher-compose-meridian.png and b/docs/screenshots/themes/launcher-compose-meridian.png differ
diff --git a/docs/screenshots/themes/launcher-compose-neon.png b/docs/screenshots/themes/launcher-compose-neon.png
index ad411ec0..ce30c063 100644
Binary files a/docs/screenshots/themes/launcher-compose-neon.png and b/docs/screenshots/themes/launcher-compose-neon.png differ
diff --git a/docs/screenshots/themes/launcher-compose-nord.png b/docs/screenshots/themes/launcher-compose-nord.png
index ad411ec0..1b95e9cb 100644
Binary files a/docs/screenshots/themes/launcher-compose-nord.png and b/docs/screenshots/themes/launcher-compose-nord.png differ
diff --git a/docs/screenshots/themes/launcher-compose-nyan.png b/docs/screenshots/themes/launcher-compose-nyan.png
index ad411ec0..e13482dc 100644
Binary files a/docs/screenshots/themes/launcher-compose-nyan.png and b/docs/screenshots/themes/launcher-compose-nyan.png differ
diff --git a/docs/screenshots/themes/launcher-compose-sepia.png b/docs/screenshots/themes/launcher-compose-sepia.png
index ad411ec0..e5c7f949 100644
Binary files a/docs/screenshots/themes/launcher-compose-sepia.png and b/docs/screenshots/themes/launcher-compose-sepia.png differ
diff --git a/docs/screenshots/themes/launcher-compose-solar.png b/docs/screenshots/themes/launcher-compose-solar.png
index ad411ec0..4ca634ff 100644
Binary files a/docs/screenshots/themes/launcher-compose-solar.png and b/docs/screenshots/themes/launcher-compose-solar.png differ
diff --git a/docs/screenshots/themes/launcher-compose-tide.png b/docs/screenshots/themes/launcher-compose-tide.png
new file mode 100644
index 00000000..34e70de9
Binary files /dev/null and b/docs/screenshots/themes/launcher-compose-tide.png differ
diff --git a/docs/screenshots/themes/launcher-compose-vector.png b/docs/screenshots/themes/launcher-compose-vector.png
new file mode 100644
index 00000000..53124057
Binary files /dev/null and b/docs/screenshots/themes/launcher-compose-vector.png differ
diff --git a/docs/screenshots/themes/launcher-compose-volcano.png b/docs/screenshots/themes/launcher-compose-volcano.png
new file mode 100644
index 00000000..850e948d
Binary files /dev/null and b/docs/screenshots/themes/launcher-compose-volcano.png differ
diff --git a/docs/screenshots/themes/merge-view-amber.png b/docs/screenshots/themes/merge-view-amber.png
new file mode 100644
index 00000000..c4a5b07d
Binary files /dev/null and b/docs/screenshots/themes/merge-view-amber.png differ
diff --git a/docs/screenshots/themes/merge-view-beacon.png b/docs/screenshots/themes/merge-view-beacon.png
new file mode 100644
index 00000000..0d728be5
Binary files /dev/null and b/docs/screenshots/themes/merge-view-beacon.png differ
diff --git a/docs/screenshots/themes/merge-view-bloom.png b/docs/screenshots/themes/merge-view-bloom.png
new file mode 100644
index 00000000..3b2b33e1
Binary files /dev/null and b/docs/screenshots/themes/merge-view-bloom.png differ
diff --git a/docs/screenshots/themes/merge-view-contrast.png b/docs/screenshots/themes/merge-view-contrast.png
new file mode 100644
index 00000000..14533f0a
Binary files /dev/null and b/docs/screenshots/themes/merge-view-contrast.png differ
diff --git a/docs/screenshots/themes/merge-view-dark.png b/docs/screenshots/themes/merge-view-dark.png
new file mode 100644
index 00000000..fb2ea4b4
Binary files /dev/null and b/docs/screenshots/themes/merge-view-dark.png differ
diff --git a/docs/screenshots/themes/merge-view-dim.png b/docs/screenshots/themes/merge-view-dim.png
new file mode 100644
index 00000000..ac74e86c
Binary files /dev/null and b/docs/screenshots/themes/merge-view-dim.png differ
diff --git a/docs/screenshots/themes/merge-view-ember.png b/docs/screenshots/themes/merge-view-ember.png
new file mode 100644
index 00000000..66a803ce
Binary files /dev/null and b/docs/screenshots/themes/merge-view-ember.png differ
diff --git a/docs/screenshots/themes/merge-view-graphite.png b/docs/screenshots/themes/merge-view-graphite.png
new file mode 100644
index 00000000..c02329de
Binary files /dev/null and b/docs/screenshots/themes/merge-view-graphite.png differ
diff --git a/docs/screenshots/themes/merge-view-light.png b/docs/screenshots/themes/merge-view-light.png
new file mode 100644
index 00000000..431ac27b
Binary files /dev/null and b/docs/screenshots/themes/merge-view-light.png differ
diff --git a/docs/screenshots/themes/merge-view-linen.png b/docs/screenshots/themes/merge-view-linen.png
new file mode 100644
index 00000000..f9f28f80
Binary files /dev/null and b/docs/screenshots/themes/merge-view-linen.png differ
diff --git a/docs/screenshots/themes/merge-view-matrix.png b/docs/screenshots/themes/merge-view-matrix.png
new file mode 100644
index 00000000..49945c2a
Binary files /dev/null and b/docs/screenshots/themes/merge-view-matrix.png differ
diff --git a/docs/screenshots/themes/merge-view-meridian.png b/docs/screenshots/themes/merge-view-meridian.png
new file mode 100644
index 00000000..b2e012b4
Binary files /dev/null and b/docs/screenshots/themes/merge-view-meridian.png differ
diff --git a/docs/screenshots/themes/merge-view-neon.png b/docs/screenshots/themes/merge-view-neon.png
new file mode 100644
index 00000000..ef83e9ee
Binary files /dev/null and b/docs/screenshots/themes/merge-view-neon.png differ
diff --git a/docs/screenshots/themes/merge-view-nord.png b/docs/screenshots/themes/merge-view-nord.png
new file mode 100644
index 00000000..6ef61682
Binary files /dev/null and b/docs/screenshots/themes/merge-view-nord.png differ
diff --git a/docs/screenshots/themes/merge-view-nyan.png b/docs/screenshots/themes/merge-view-nyan.png
new file mode 100644
index 00000000..6b623f0a
Binary files /dev/null and b/docs/screenshots/themes/merge-view-nyan.png differ
diff --git a/docs/screenshots/themes/merge-view-sepia.png b/docs/screenshots/themes/merge-view-sepia.png
new file mode 100644
index 00000000..3aab3c16
Binary files /dev/null and b/docs/screenshots/themes/merge-view-sepia.png differ
diff --git a/docs/screenshots/themes/merge-view-solar.png b/docs/screenshots/themes/merge-view-solar.png
new file mode 100644
index 00000000..8d98842c
Binary files /dev/null and b/docs/screenshots/themes/merge-view-solar.png differ
diff --git a/docs/screenshots/themes/merge-view-tide.png b/docs/screenshots/themes/merge-view-tide.png
new file mode 100644
index 00000000..2cf21036
Binary files /dev/null and b/docs/screenshots/themes/merge-view-tide.png differ
diff --git a/docs/screenshots/themes/merge-view-vector.png b/docs/screenshots/themes/merge-view-vector.png
new file mode 100644
index 00000000..f50971c7
Binary files /dev/null and b/docs/screenshots/themes/merge-view-vector.png differ
diff --git a/docs/screenshots/themes/merge-view-volcano.png b/docs/screenshots/themes/merge-view-volcano.png
new file mode 100644
index 00000000..ca992e67
Binary files /dev/null and b/docs/screenshots/themes/merge-view-volcano.png differ
diff --git a/docs/screenshots/themes/new-row-amber.png b/docs/screenshots/themes/new-row-amber.png
new file mode 100644
index 00000000..3db7a342
Binary files /dev/null and b/docs/screenshots/themes/new-row-amber.png differ
diff --git a/docs/screenshots/themes/new-row-beacon.png b/docs/screenshots/themes/new-row-beacon.png
index 432e401a..234bcaa1 100644
Binary files a/docs/screenshots/themes/new-row-beacon.png and b/docs/screenshots/themes/new-row-beacon.png differ
diff --git a/docs/screenshots/themes/new-row-bloom.png b/docs/screenshots/themes/new-row-bloom.png
index a3fdfcd5..59bcc85e 100644
Binary files a/docs/screenshots/themes/new-row-bloom.png and b/docs/screenshots/themes/new-row-bloom.png differ
diff --git a/docs/screenshots/themes/new-row-contrast.png b/docs/screenshots/themes/new-row-contrast.png
index afad2792..dfb934dd 100644
Binary files a/docs/screenshots/themes/new-row-contrast.png and b/docs/screenshots/themes/new-row-contrast.png differ
diff --git a/docs/screenshots/themes/new-row-dark.png b/docs/screenshots/themes/new-row-dark.png
index da49c17b..b47b319e 100644
Binary files a/docs/screenshots/themes/new-row-dark.png and b/docs/screenshots/themes/new-row-dark.png differ
diff --git a/docs/screenshots/themes/new-row-dim.png b/docs/screenshots/themes/new-row-dim.png
index 215e8564..10ab70fe 100644
Binary files a/docs/screenshots/themes/new-row-dim.png and b/docs/screenshots/themes/new-row-dim.png differ
diff --git a/docs/screenshots/themes/new-row-ember.png b/docs/screenshots/themes/new-row-ember.png
new file mode 100644
index 00000000..fea449eb
Binary files /dev/null and b/docs/screenshots/themes/new-row-ember.png differ
diff --git a/docs/screenshots/themes/new-row-graphite.png b/docs/screenshots/themes/new-row-graphite.png
new file mode 100644
index 00000000..d0b1d695
Binary files /dev/null and b/docs/screenshots/themes/new-row-graphite.png differ
diff --git a/docs/screenshots/themes/new-row-light.png b/docs/screenshots/themes/new-row-light.png
index 66fcef5b..d0bc0d0f 100644
Binary files a/docs/screenshots/themes/new-row-light.png and b/docs/screenshots/themes/new-row-light.png differ
diff --git a/docs/screenshots/themes/new-row-linen.png b/docs/screenshots/themes/new-row-linen.png
index 7f279541..bf559b43 100644
Binary files a/docs/screenshots/themes/new-row-linen.png and b/docs/screenshots/themes/new-row-linen.png differ
diff --git a/docs/screenshots/themes/new-row-matrix.png b/docs/screenshots/themes/new-row-matrix.png
index 66cfac5e..2d5d07bd 100644
Binary files a/docs/screenshots/themes/new-row-matrix.png and b/docs/screenshots/themes/new-row-matrix.png differ
diff --git a/docs/screenshots/themes/new-row-meridian.png b/docs/screenshots/themes/new-row-meridian.png
index b1b39c16..f3277d52 100644
Binary files a/docs/screenshots/themes/new-row-meridian.png and b/docs/screenshots/themes/new-row-meridian.png differ
diff --git a/docs/screenshots/themes/new-row-neon.png b/docs/screenshots/themes/new-row-neon.png
index 61246440..8ef66793 100644
Binary files a/docs/screenshots/themes/new-row-neon.png and b/docs/screenshots/themes/new-row-neon.png differ
diff --git a/docs/screenshots/themes/new-row-nord.png b/docs/screenshots/themes/new-row-nord.png
index 12cb4201..b6ceca58 100644
Binary files a/docs/screenshots/themes/new-row-nord.png and b/docs/screenshots/themes/new-row-nord.png differ
diff --git a/docs/screenshots/themes/new-row-nyan.png b/docs/screenshots/themes/new-row-nyan.png
index bd80cce0..a27c719a 100644
Binary files a/docs/screenshots/themes/new-row-nyan.png and b/docs/screenshots/themes/new-row-nyan.png differ
diff --git a/docs/screenshots/themes/new-row-sepia.png b/docs/screenshots/themes/new-row-sepia.png
index ee81b5ee..7cae1e0c 100644
Binary files a/docs/screenshots/themes/new-row-sepia.png and b/docs/screenshots/themes/new-row-sepia.png differ
diff --git a/docs/screenshots/themes/new-row-solar.png b/docs/screenshots/themes/new-row-solar.png
index aaa94fd4..7e419956 100644
Binary files a/docs/screenshots/themes/new-row-solar.png and b/docs/screenshots/themes/new-row-solar.png differ
diff --git a/docs/screenshots/themes/new-row-tide.png b/docs/screenshots/themes/new-row-tide.png
new file mode 100644
index 00000000..9f1e636f
Binary files /dev/null and b/docs/screenshots/themes/new-row-tide.png differ
diff --git a/docs/screenshots/themes/new-row-vector.png b/docs/screenshots/themes/new-row-vector.png
new file mode 100644
index 00000000..ea9c67a8
Binary files /dev/null and b/docs/screenshots/themes/new-row-vector.png differ
diff --git a/docs/screenshots/themes/new-row-volcano.png b/docs/screenshots/themes/new-row-volcano.png
new file mode 100644
index 00000000..e0373780
Binary files /dev/null and b/docs/screenshots/themes/new-row-volcano.png differ
diff --git a/docs/screenshots/themes/settings-appearance-amber.png b/docs/screenshots/themes/settings-appearance-amber.png
new file mode 100644
index 00000000..e58c6819
Binary files /dev/null and b/docs/screenshots/themes/settings-appearance-amber.png differ
diff --git a/docs/screenshots/themes/settings-appearance-beacon.png b/docs/screenshots/themes/settings-appearance-beacon.png
index 290b8a88..5c71cbf0 100644
Binary files a/docs/screenshots/themes/settings-appearance-beacon.png and b/docs/screenshots/themes/settings-appearance-beacon.png differ
diff --git a/docs/screenshots/themes/settings-appearance-bloom.png b/docs/screenshots/themes/settings-appearance-bloom.png
index c2898cc1..45726856 100644
Binary files a/docs/screenshots/themes/settings-appearance-bloom.png and b/docs/screenshots/themes/settings-appearance-bloom.png differ
diff --git a/docs/screenshots/themes/settings-appearance-contrast.png b/docs/screenshots/themes/settings-appearance-contrast.png
index 9e087113..5cad1f7f 100644
Binary files a/docs/screenshots/themes/settings-appearance-contrast.png and b/docs/screenshots/themes/settings-appearance-contrast.png differ
diff --git a/docs/screenshots/themes/settings-appearance-dark.png b/docs/screenshots/themes/settings-appearance-dark.png
index e79235c6..50d94170 100644
Binary files a/docs/screenshots/themes/settings-appearance-dark.png and b/docs/screenshots/themes/settings-appearance-dark.png differ
diff --git a/docs/screenshots/themes/settings-appearance-dim.png b/docs/screenshots/themes/settings-appearance-dim.png
index 0561ecac..a2db4538 100644
Binary files a/docs/screenshots/themes/settings-appearance-dim.png and b/docs/screenshots/themes/settings-appearance-dim.png differ
diff --git a/docs/screenshots/themes/settings-appearance-ember.png b/docs/screenshots/themes/settings-appearance-ember.png
new file mode 100644
index 00000000..f43d3e79
Binary files /dev/null and b/docs/screenshots/themes/settings-appearance-ember.png differ
diff --git a/docs/screenshots/themes/settings-appearance-graphite.png b/docs/screenshots/themes/settings-appearance-graphite.png
new file mode 100644
index 00000000..5212f2b3
Binary files /dev/null and b/docs/screenshots/themes/settings-appearance-graphite.png differ
diff --git a/docs/screenshots/themes/settings-appearance-light.png b/docs/screenshots/themes/settings-appearance-light.png
index e629804d..99fd2edd 100644
Binary files a/docs/screenshots/themes/settings-appearance-light.png and b/docs/screenshots/themes/settings-appearance-light.png differ
diff --git a/docs/screenshots/themes/settings-appearance-linen.png b/docs/screenshots/themes/settings-appearance-linen.png
index 1a130977..75d35d9e 100644
Binary files a/docs/screenshots/themes/settings-appearance-linen.png and b/docs/screenshots/themes/settings-appearance-linen.png differ
diff --git a/docs/screenshots/themes/settings-appearance-matrix.png b/docs/screenshots/themes/settings-appearance-matrix.png
index c4d0ef72..8589b5f3 100644
Binary files a/docs/screenshots/themes/settings-appearance-matrix.png and b/docs/screenshots/themes/settings-appearance-matrix.png differ
diff --git a/docs/screenshots/themes/settings-appearance-meridian.png b/docs/screenshots/themes/settings-appearance-meridian.png
index a74a4d3e..56cfb9ab 100644
Binary files a/docs/screenshots/themes/settings-appearance-meridian.png and b/docs/screenshots/themes/settings-appearance-meridian.png differ
diff --git a/docs/screenshots/themes/settings-appearance-neon.png b/docs/screenshots/themes/settings-appearance-neon.png
index 02173191..fb6ac9cf 100644
Binary files a/docs/screenshots/themes/settings-appearance-neon.png and b/docs/screenshots/themes/settings-appearance-neon.png differ
diff --git a/docs/screenshots/themes/settings-appearance-nord.png b/docs/screenshots/themes/settings-appearance-nord.png
index 4a326c7e..4a574eb5 100644
Binary files a/docs/screenshots/themes/settings-appearance-nord.png and b/docs/screenshots/themes/settings-appearance-nord.png differ
diff --git a/docs/screenshots/themes/settings-appearance-nyan.png b/docs/screenshots/themes/settings-appearance-nyan.png
index 5cc7c75b..47860357 100644
Binary files a/docs/screenshots/themes/settings-appearance-nyan.png and b/docs/screenshots/themes/settings-appearance-nyan.png differ
diff --git a/docs/screenshots/themes/settings-appearance-sepia.png b/docs/screenshots/themes/settings-appearance-sepia.png
index bcf61e0b..c39ac2c1 100644
Binary files a/docs/screenshots/themes/settings-appearance-sepia.png and b/docs/screenshots/themes/settings-appearance-sepia.png differ
diff --git a/docs/screenshots/themes/settings-appearance-solar.png b/docs/screenshots/themes/settings-appearance-solar.png
index b1de43b1..79247012 100644
Binary files a/docs/screenshots/themes/settings-appearance-solar.png and b/docs/screenshots/themes/settings-appearance-solar.png differ
diff --git a/docs/screenshots/themes/settings-appearance-tide.png b/docs/screenshots/themes/settings-appearance-tide.png
new file mode 100644
index 00000000..10bf4d4f
Binary files /dev/null and b/docs/screenshots/themes/settings-appearance-tide.png differ
diff --git a/docs/screenshots/themes/settings-appearance-vector.png b/docs/screenshots/themes/settings-appearance-vector.png
new file mode 100644
index 00000000..ae0a8867
Binary files /dev/null and b/docs/screenshots/themes/settings-appearance-vector.png differ
diff --git a/docs/screenshots/themes/settings-appearance-volcano.png b/docs/screenshots/themes/settings-appearance-volcano.png
new file mode 100644
index 00000000..f78a61dc
Binary files /dev/null and b/docs/screenshots/themes/settings-appearance-volcano.png differ
diff --git a/docs/screenshots/themes/settings-email-amber.png b/docs/screenshots/themes/settings-email-amber.png
new file mode 100644
index 00000000..20ae2024
Binary files /dev/null and b/docs/screenshots/themes/settings-email-amber.png differ
diff --git a/docs/screenshots/themes/settings-email-beacon.png b/docs/screenshots/themes/settings-email-beacon.png
index 87486860..59ba9c3b 100644
Binary files a/docs/screenshots/themes/settings-email-beacon.png and b/docs/screenshots/themes/settings-email-beacon.png differ
diff --git a/docs/screenshots/themes/settings-email-bloom.png b/docs/screenshots/themes/settings-email-bloom.png
index d72924bb..d4be1b05 100644
Binary files a/docs/screenshots/themes/settings-email-bloom.png and b/docs/screenshots/themes/settings-email-bloom.png differ
diff --git a/docs/screenshots/themes/settings-email-contrast.png b/docs/screenshots/themes/settings-email-contrast.png
index 3a2351d4..061b50b2 100644
Binary files a/docs/screenshots/themes/settings-email-contrast.png and b/docs/screenshots/themes/settings-email-contrast.png differ
diff --git a/docs/screenshots/themes/settings-email-dark.png b/docs/screenshots/themes/settings-email-dark.png
index 3d0b68b1..95db286d 100644
Binary files a/docs/screenshots/themes/settings-email-dark.png and b/docs/screenshots/themes/settings-email-dark.png differ
diff --git a/docs/screenshots/themes/settings-email-dim.png b/docs/screenshots/themes/settings-email-dim.png
index 23949568..909abc76 100644
Binary files a/docs/screenshots/themes/settings-email-dim.png and b/docs/screenshots/themes/settings-email-dim.png differ
diff --git a/docs/screenshots/themes/settings-email-ember.png b/docs/screenshots/themes/settings-email-ember.png
new file mode 100644
index 00000000..12b3755d
Binary files /dev/null and b/docs/screenshots/themes/settings-email-ember.png differ
diff --git a/docs/screenshots/themes/settings-email-graphite.png b/docs/screenshots/themes/settings-email-graphite.png
new file mode 100644
index 00000000..a089de95
Binary files /dev/null and b/docs/screenshots/themes/settings-email-graphite.png differ
diff --git a/docs/screenshots/themes/settings-email-light.png b/docs/screenshots/themes/settings-email-light.png
index 9c3ceb23..9c8fe0b1 100644
Binary files a/docs/screenshots/themes/settings-email-light.png and b/docs/screenshots/themes/settings-email-light.png differ
diff --git a/docs/screenshots/themes/settings-email-linen.png b/docs/screenshots/themes/settings-email-linen.png
index 29bed608..9e1386c6 100644
Binary files a/docs/screenshots/themes/settings-email-linen.png and b/docs/screenshots/themes/settings-email-linen.png differ
diff --git a/docs/screenshots/themes/settings-email-matrix.png b/docs/screenshots/themes/settings-email-matrix.png
index 49b402db..c70d5c8a 100644
Binary files a/docs/screenshots/themes/settings-email-matrix.png and b/docs/screenshots/themes/settings-email-matrix.png differ
diff --git a/docs/screenshots/themes/settings-email-meridian.png b/docs/screenshots/themes/settings-email-meridian.png
index 636f3bc3..2511f2da 100644
Binary files a/docs/screenshots/themes/settings-email-meridian.png and b/docs/screenshots/themes/settings-email-meridian.png differ
diff --git a/docs/screenshots/themes/settings-email-neon.png b/docs/screenshots/themes/settings-email-neon.png
index 16476956..cab06656 100644
Binary files a/docs/screenshots/themes/settings-email-neon.png and b/docs/screenshots/themes/settings-email-neon.png differ
diff --git a/docs/screenshots/themes/settings-email-nord.png b/docs/screenshots/themes/settings-email-nord.png
index 1b9e7523..333848ab 100644
Binary files a/docs/screenshots/themes/settings-email-nord.png and b/docs/screenshots/themes/settings-email-nord.png differ
diff --git a/docs/screenshots/themes/settings-email-nyan.png b/docs/screenshots/themes/settings-email-nyan.png
index 32e8a575..6e428b4d 100644
Binary files a/docs/screenshots/themes/settings-email-nyan.png and b/docs/screenshots/themes/settings-email-nyan.png differ
diff --git a/docs/screenshots/themes/settings-email-sepia.png b/docs/screenshots/themes/settings-email-sepia.png
index ca86745f..26195f08 100644
Binary files a/docs/screenshots/themes/settings-email-sepia.png and b/docs/screenshots/themes/settings-email-sepia.png differ
diff --git a/docs/screenshots/themes/settings-email-solar.png b/docs/screenshots/themes/settings-email-solar.png
index 16a65c3f..809d8f92 100644
Binary files a/docs/screenshots/themes/settings-email-solar.png and b/docs/screenshots/themes/settings-email-solar.png differ
diff --git a/docs/screenshots/themes/settings-email-tide.png b/docs/screenshots/themes/settings-email-tide.png
new file mode 100644
index 00000000..d4ea08b7
Binary files /dev/null and b/docs/screenshots/themes/settings-email-tide.png differ
diff --git a/docs/screenshots/themes/settings-email-vector.png b/docs/screenshots/themes/settings-email-vector.png
new file mode 100644
index 00000000..05e3a48f
Binary files /dev/null and b/docs/screenshots/themes/settings-email-vector.png differ
diff --git a/docs/screenshots/themes/settings-email-volcano.png b/docs/screenshots/themes/settings-email-volcano.png
new file mode 100644
index 00000000..b904acff
Binary files /dev/null and b/docs/screenshots/themes/settings-email-volcano.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-amber.png b/docs/screenshots/themes/sidebar-affordances-amber.png
new file mode 100644
index 00000000..dab3cf25
Binary files /dev/null and b/docs/screenshots/themes/sidebar-affordances-amber.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-beacon.png b/docs/screenshots/themes/sidebar-affordances-beacon.png
index b52ef8de..89a27302 100644
Binary files a/docs/screenshots/themes/sidebar-affordances-beacon.png and b/docs/screenshots/themes/sidebar-affordances-beacon.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-bloom.png b/docs/screenshots/themes/sidebar-affordances-bloom.png
index 9ddab3a1..d9c871cc 100644
Binary files a/docs/screenshots/themes/sidebar-affordances-bloom.png and b/docs/screenshots/themes/sidebar-affordances-bloom.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-contrast.png b/docs/screenshots/themes/sidebar-affordances-contrast.png
index 18b0ed88..2e6ba1b1 100644
Binary files a/docs/screenshots/themes/sidebar-affordances-contrast.png and b/docs/screenshots/themes/sidebar-affordances-contrast.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-dark.png b/docs/screenshots/themes/sidebar-affordances-dark.png
index 0150135f..804de891 100644
Binary files a/docs/screenshots/themes/sidebar-affordances-dark.png and b/docs/screenshots/themes/sidebar-affordances-dark.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-dim.png b/docs/screenshots/themes/sidebar-affordances-dim.png
index ff651f36..4e38f988 100644
Binary files a/docs/screenshots/themes/sidebar-affordances-dim.png and b/docs/screenshots/themes/sidebar-affordances-dim.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-ember.png b/docs/screenshots/themes/sidebar-affordances-ember.png
new file mode 100644
index 00000000..0bb9c7a7
Binary files /dev/null and b/docs/screenshots/themes/sidebar-affordances-ember.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-graphite.png b/docs/screenshots/themes/sidebar-affordances-graphite.png
new file mode 100644
index 00000000..066aa53f
Binary files /dev/null and b/docs/screenshots/themes/sidebar-affordances-graphite.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-light.png b/docs/screenshots/themes/sidebar-affordances-light.png
index 124d1244..f5fb90aa 100644
Binary files a/docs/screenshots/themes/sidebar-affordances-light.png and b/docs/screenshots/themes/sidebar-affordances-light.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-linen.png b/docs/screenshots/themes/sidebar-affordances-linen.png
index c8d11b86..e27ecbd7 100644
Binary files a/docs/screenshots/themes/sidebar-affordances-linen.png and b/docs/screenshots/themes/sidebar-affordances-linen.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-matrix.png b/docs/screenshots/themes/sidebar-affordances-matrix.png
index 7521a4d0..c947f0cb 100644
Binary files a/docs/screenshots/themes/sidebar-affordances-matrix.png and b/docs/screenshots/themes/sidebar-affordances-matrix.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-meridian.png b/docs/screenshots/themes/sidebar-affordances-meridian.png
index 9edf771a..f6677d2d 100644
Binary files a/docs/screenshots/themes/sidebar-affordances-meridian.png and b/docs/screenshots/themes/sidebar-affordances-meridian.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-neon.png b/docs/screenshots/themes/sidebar-affordances-neon.png
index 9725ccff..a776830d 100644
Binary files a/docs/screenshots/themes/sidebar-affordances-neon.png and b/docs/screenshots/themes/sidebar-affordances-neon.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-nord.png b/docs/screenshots/themes/sidebar-affordances-nord.png
index 26b6bd3b..120e5f5a 100644
Binary files a/docs/screenshots/themes/sidebar-affordances-nord.png and b/docs/screenshots/themes/sidebar-affordances-nord.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-nyan.png b/docs/screenshots/themes/sidebar-affordances-nyan.png
index 8ae8f7a0..34e426b2 100644
Binary files a/docs/screenshots/themes/sidebar-affordances-nyan.png and b/docs/screenshots/themes/sidebar-affordances-nyan.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-sepia.png b/docs/screenshots/themes/sidebar-affordances-sepia.png
index f0ee720c..5591b73d 100644
Binary files a/docs/screenshots/themes/sidebar-affordances-sepia.png and b/docs/screenshots/themes/sidebar-affordances-sepia.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-solar.png b/docs/screenshots/themes/sidebar-affordances-solar.png
index bd93e88b..2d0d6aa3 100644
Binary files a/docs/screenshots/themes/sidebar-affordances-solar.png and b/docs/screenshots/themes/sidebar-affordances-solar.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-tide.png b/docs/screenshots/themes/sidebar-affordances-tide.png
new file mode 100644
index 00000000..0fbcb5e2
Binary files /dev/null and b/docs/screenshots/themes/sidebar-affordances-tide.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-vector.png b/docs/screenshots/themes/sidebar-affordances-vector.png
new file mode 100644
index 00000000..e6a53469
Binary files /dev/null and b/docs/screenshots/themes/sidebar-affordances-vector.png differ
diff --git a/docs/screenshots/themes/sidebar-affordances-volcano.png b/docs/screenshots/themes/sidebar-affordances-volcano.png
new file mode 100644
index 00000000..436bc0eb
Binary files /dev/null and b/docs/screenshots/themes/sidebar-affordances-volcano.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-amber.png b/docs/screenshots/themes/snippet-name-ghost-amber.png
new file mode 100644
index 00000000..3b171263
Binary files /dev/null and b/docs/screenshots/themes/snippet-name-ghost-amber.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-beacon.png b/docs/screenshots/themes/snippet-name-ghost-beacon.png
index 1351c719..015f80d6 100644
Binary files a/docs/screenshots/themes/snippet-name-ghost-beacon.png and b/docs/screenshots/themes/snippet-name-ghost-beacon.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-bloom.png b/docs/screenshots/themes/snippet-name-ghost-bloom.png
index 2f0aa28c..cd4e71ec 100644
Binary files a/docs/screenshots/themes/snippet-name-ghost-bloom.png and b/docs/screenshots/themes/snippet-name-ghost-bloom.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-contrast.png b/docs/screenshots/themes/snippet-name-ghost-contrast.png
index bb1f4b9a..4411cfe9 100644
Binary files a/docs/screenshots/themes/snippet-name-ghost-contrast.png and b/docs/screenshots/themes/snippet-name-ghost-contrast.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-dark.png b/docs/screenshots/themes/snippet-name-ghost-dark.png
index 45aadcd4..a514d9f0 100644
Binary files a/docs/screenshots/themes/snippet-name-ghost-dark.png and b/docs/screenshots/themes/snippet-name-ghost-dark.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-dim.png b/docs/screenshots/themes/snippet-name-ghost-dim.png
index aaeb683c..f1ae4c95 100644
Binary files a/docs/screenshots/themes/snippet-name-ghost-dim.png and b/docs/screenshots/themes/snippet-name-ghost-dim.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-ember.png b/docs/screenshots/themes/snippet-name-ghost-ember.png
new file mode 100644
index 00000000..1b305dd1
Binary files /dev/null and b/docs/screenshots/themes/snippet-name-ghost-ember.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-graphite.png b/docs/screenshots/themes/snippet-name-ghost-graphite.png
new file mode 100644
index 00000000..eb24df86
Binary files /dev/null and b/docs/screenshots/themes/snippet-name-ghost-graphite.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-light.png b/docs/screenshots/themes/snippet-name-ghost-light.png
index ae7e8840..5077d9e2 100644
Binary files a/docs/screenshots/themes/snippet-name-ghost-light.png and b/docs/screenshots/themes/snippet-name-ghost-light.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-linen.png b/docs/screenshots/themes/snippet-name-ghost-linen.png
index a0828116..0f72d70e 100644
Binary files a/docs/screenshots/themes/snippet-name-ghost-linen.png and b/docs/screenshots/themes/snippet-name-ghost-linen.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-matrix.png b/docs/screenshots/themes/snippet-name-ghost-matrix.png
index 9d0fdc5f..9e512259 100644
Binary files a/docs/screenshots/themes/snippet-name-ghost-matrix.png and b/docs/screenshots/themes/snippet-name-ghost-matrix.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-meridian.png b/docs/screenshots/themes/snippet-name-ghost-meridian.png
index a25e646e..9bedd31f 100644
Binary files a/docs/screenshots/themes/snippet-name-ghost-meridian.png and b/docs/screenshots/themes/snippet-name-ghost-meridian.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-neon.png b/docs/screenshots/themes/snippet-name-ghost-neon.png
index f442761a..9235bec4 100644
Binary files a/docs/screenshots/themes/snippet-name-ghost-neon.png and b/docs/screenshots/themes/snippet-name-ghost-neon.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-nord.png b/docs/screenshots/themes/snippet-name-ghost-nord.png
index 0a77a126..fca5969e 100644
Binary files a/docs/screenshots/themes/snippet-name-ghost-nord.png and b/docs/screenshots/themes/snippet-name-ghost-nord.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-nyan.png b/docs/screenshots/themes/snippet-name-ghost-nyan.png
index 3aa0fe03..574c615e 100644
Binary files a/docs/screenshots/themes/snippet-name-ghost-nyan.png and b/docs/screenshots/themes/snippet-name-ghost-nyan.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-sepia.png b/docs/screenshots/themes/snippet-name-ghost-sepia.png
index b1f831ae..0c039b7d 100644
Binary files a/docs/screenshots/themes/snippet-name-ghost-sepia.png and b/docs/screenshots/themes/snippet-name-ghost-sepia.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-solar.png b/docs/screenshots/themes/snippet-name-ghost-solar.png
index 49c38818..25800173 100644
Binary files a/docs/screenshots/themes/snippet-name-ghost-solar.png and b/docs/screenshots/themes/snippet-name-ghost-solar.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-tide.png b/docs/screenshots/themes/snippet-name-ghost-tide.png
new file mode 100644
index 00000000..30bfbd17
Binary files /dev/null and b/docs/screenshots/themes/snippet-name-ghost-tide.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-vector.png b/docs/screenshots/themes/snippet-name-ghost-vector.png
new file mode 100644
index 00000000..c191c73f
Binary files /dev/null and b/docs/screenshots/themes/snippet-name-ghost-vector.png differ
diff --git a/docs/screenshots/themes/snippet-name-ghost-volcano.png b/docs/screenshots/themes/snippet-name-ghost-volcano.png
new file mode 100644
index 00000000..480b084e
Binary files /dev/null and b/docs/screenshots/themes/snippet-name-ghost-volcano.png differ
diff --git a/docs/screenshots/themes/status-band-amber.png b/docs/screenshots/themes/status-band-amber.png
new file mode 100644
index 00000000..011738a1
Binary files /dev/null and b/docs/screenshots/themes/status-band-amber.png differ
diff --git a/docs/screenshots/themes/status-band-beacon.png b/docs/screenshots/themes/status-band-beacon.png
index 51344eb1..0d728a1a 100644
Binary files a/docs/screenshots/themes/status-band-beacon.png and b/docs/screenshots/themes/status-band-beacon.png differ
diff --git a/docs/screenshots/themes/status-band-bloom.png b/docs/screenshots/themes/status-band-bloom.png
index 15c1b096..4c01238b 100644
Binary files a/docs/screenshots/themes/status-band-bloom.png and b/docs/screenshots/themes/status-band-bloom.png differ
diff --git a/docs/screenshots/themes/status-band-contrast.png b/docs/screenshots/themes/status-band-contrast.png
index 72714fd3..3f190543 100644
Binary files a/docs/screenshots/themes/status-band-contrast.png and b/docs/screenshots/themes/status-band-contrast.png differ
diff --git a/docs/screenshots/themes/status-band-dark.png b/docs/screenshots/themes/status-band-dark.png
index d8ddcdce..9d926db1 100644
Binary files a/docs/screenshots/themes/status-band-dark.png and b/docs/screenshots/themes/status-band-dark.png differ
diff --git a/docs/screenshots/themes/status-band-dim.png b/docs/screenshots/themes/status-band-dim.png
index 22a30c14..a7d88a01 100644
Binary files a/docs/screenshots/themes/status-band-dim.png and b/docs/screenshots/themes/status-band-dim.png differ
diff --git a/docs/screenshots/themes/status-band-ember.png b/docs/screenshots/themes/status-band-ember.png
new file mode 100644
index 00000000..8a337e51
Binary files /dev/null and b/docs/screenshots/themes/status-band-ember.png differ
diff --git a/docs/screenshots/themes/status-band-graphite.png b/docs/screenshots/themes/status-band-graphite.png
new file mode 100644
index 00000000..3ef9953b
Binary files /dev/null and b/docs/screenshots/themes/status-band-graphite.png differ
diff --git a/docs/screenshots/themes/status-band-light.png b/docs/screenshots/themes/status-band-light.png
index 22b0b0aa..8659417e 100644
Binary files a/docs/screenshots/themes/status-band-light.png and b/docs/screenshots/themes/status-band-light.png differ
diff --git a/docs/screenshots/themes/status-band-linen.png b/docs/screenshots/themes/status-band-linen.png
index e7516bc7..0f8d8a57 100644
Binary files a/docs/screenshots/themes/status-band-linen.png and b/docs/screenshots/themes/status-band-linen.png differ
diff --git a/docs/screenshots/themes/status-band-matrix.png b/docs/screenshots/themes/status-band-matrix.png
index 38c34362..360c43c7 100644
Binary files a/docs/screenshots/themes/status-band-matrix.png and b/docs/screenshots/themes/status-band-matrix.png differ
diff --git a/docs/screenshots/themes/status-band-meridian.png b/docs/screenshots/themes/status-band-meridian.png
index 152a9832..26cc46f3 100644
Binary files a/docs/screenshots/themes/status-band-meridian.png and b/docs/screenshots/themes/status-band-meridian.png differ
diff --git a/docs/screenshots/themes/status-band-neon.png b/docs/screenshots/themes/status-band-neon.png
index 1e63a0b1..3edef966 100644
Binary files a/docs/screenshots/themes/status-band-neon.png and b/docs/screenshots/themes/status-band-neon.png differ
diff --git a/docs/screenshots/themes/status-band-nord.png b/docs/screenshots/themes/status-band-nord.png
index ae371b4a..09f60acb 100644
Binary files a/docs/screenshots/themes/status-band-nord.png and b/docs/screenshots/themes/status-band-nord.png differ
diff --git a/docs/screenshots/themes/status-band-nyan.png b/docs/screenshots/themes/status-band-nyan.png
index 26488aca..97fd7f04 100644
Binary files a/docs/screenshots/themes/status-band-nyan.png and b/docs/screenshots/themes/status-band-nyan.png differ
diff --git a/docs/screenshots/themes/status-band-sepia.png b/docs/screenshots/themes/status-band-sepia.png
index dd66b0bc..b3feaf5f 100644
Binary files a/docs/screenshots/themes/status-band-sepia.png and b/docs/screenshots/themes/status-band-sepia.png differ
diff --git a/docs/screenshots/themes/status-band-solar.png b/docs/screenshots/themes/status-band-solar.png
index 5ac4d1eb..aed81720 100644
Binary files a/docs/screenshots/themes/status-band-solar.png and b/docs/screenshots/themes/status-band-solar.png differ
diff --git a/docs/screenshots/themes/status-band-tide.png b/docs/screenshots/themes/status-band-tide.png
new file mode 100644
index 00000000..8fa9d83c
Binary files /dev/null and b/docs/screenshots/themes/status-band-tide.png differ
diff --git a/docs/screenshots/themes/status-band-vector.png b/docs/screenshots/themes/status-band-vector.png
new file mode 100644
index 00000000..60130299
Binary files /dev/null and b/docs/screenshots/themes/status-band-vector.png differ
diff --git a/docs/screenshots/themes/status-band-volcano.png b/docs/screenshots/themes/status-band-volcano.png
new file mode 100644
index 00000000..72e371b3
Binary files /dev/null and b/docs/screenshots/themes/status-band-volcano.png differ
diff --git a/docs/screenshots/themes/tool-dialog-amber.png b/docs/screenshots/themes/tool-dialog-amber.png
new file mode 100644
index 00000000..3dc50f5e
Binary files /dev/null and b/docs/screenshots/themes/tool-dialog-amber.png differ
diff --git a/docs/screenshots/themes/tool-dialog-beacon.png b/docs/screenshots/themes/tool-dialog-beacon.png
index 1d18aa38..a6bcbfb7 100644
Binary files a/docs/screenshots/themes/tool-dialog-beacon.png and b/docs/screenshots/themes/tool-dialog-beacon.png differ
diff --git a/docs/screenshots/themes/tool-dialog-bloom.png b/docs/screenshots/themes/tool-dialog-bloom.png
index 5ca6d381..d7a8c629 100644
Binary files a/docs/screenshots/themes/tool-dialog-bloom.png and b/docs/screenshots/themes/tool-dialog-bloom.png differ
diff --git a/docs/screenshots/themes/tool-dialog-contrast.png b/docs/screenshots/themes/tool-dialog-contrast.png
index e4fa64f9..f1719c0d 100644
Binary files a/docs/screenshots/themes/tool-dialog-contrast.png and b/docs/screenshots/themes/tool-dialog-contrast.png differ
diff --git a/docs/screenshots/themes/tool-dialog-dark.png b/docs/screenshots/themes/tool-dialog-dark.png
index 542c87a0..3f9862cd 100644
Binary files a/docs/screenshots/themes/tool-dialog-dark.png and b/docs/screenshots/themes/tool-dialog-dark.png differ
diff --git a/docs/screenshots/themes/tool-dialog-dim.png b/docs/screenshots/themes/tool-dialog-dim.png
index c2823bf7..82b8abde 100644
Binary files a/docs/screenshots/themes/tool-dialog-dim.png and b/docs/screenshots/themes/tool-dialog-dim.png differ
diff --git a/docs/screenshots/themes/tool-dialog-ember.png b/docs/screenshots/themes/tool-dialog-ember.png
new file mode 100644
index 00000000..9e084ad5
Binary files /dev/null and b/docs/screenshots/themes/tool-dialog-ember.png differ
diff --git a/docs/screenshots/themes/tool-dialog-graphite.png b/docs/screenshots/themes/tool-dialog-graphite.png
new file mode 100644
index 00000000..b905e4e2
Binary files /dev/null and b/docs/screenshots/themes/tool-dialog-graphite.png differ
diff --git a/docs/screenshots/themes/tool-dialog-light.png b/docs/screenshots/themes/tool-dialog-light.png
index 9a9e22fe..17a3f866 100644
Binary files a/docs/screenshots/themes/tool-dialog-light.png and b/docs/screenshots/themes/tool-dialog-light.png differ
diff --git a/docs/screenshots/themes/tool-dialog-linen.png b/docs/screenshots/themes/tool-dialog-linen.png
index b466855b..255270bb 100644
Binary files a/docs/screenshots/themes/tool-dialog-linen.png and b/docs/screenshots/themes/tool-dialog-linen.png differ
diff --git a/docs/screenshots/themes/tool-dialog-matrix.png b/docs/screenshots/themes/tool-dialog-matrix.png
index 6fd0710d..70f3df01 100644
Binary files a/docs/screenshots/themes/tool-dialog-matrix.png and b/docs/screenshots/themes/tool-dialog-matrix.png differ
diff --git a/docs/screenshots/themes/tool-dialog-meridian.png b/docs/screenshots/themes/tool-dialog-meridian.png
index affc41da..1a2ae4cf 100644
Binary files a/docs/screenshots/themes/tool-dialog-meridian.png and b/docs/screenshots/themes/tool-dialog-meridian.png differ
diff --git a/docs/screenshots/themes/tool-dialog-neon.png b/docs/screenshots/themes/tool-dialog-neon.png
index 5f5f7645..1c995fa2 100644
Binary files a/docs/screenshots/themes/tool-dialog-neon.png and b/docs/screenshots/themes/tool-dialog-neon.png differ
diff --git a/docs/screenshots/themes/tool-dialog-nord.png b/docs/screenshots/themes/tool-dialog-nord.png
index 7f2dcc19..7837e006 100644
Binary files a/docs/screenshots/themes/tool-dialog-nord.png and b/docs/screenshots/themes/tool-dialog-nord.png differ
diff --git a/docs/screenshots/themes/tool-dialog-nyan.png b/docs/screenshots/themes/tool-dialog-nyan.png
index f63d3f78..0f627eb5 100644
Binary files a/docs/screenshots/themes/tool-dialog-nyan.png and b/docs/screenshots/themes/tool-dialog-nyan.png differ
diff --git a/docs/screenshots/themes/tool-dialog-sepia.png b/docs/screenshots/themes/tool-dialog-sepia.png
index 7fe8bfa8..75914897 100644
Binary files a/docs/screenshots/themes/tool-dialog-sepia.png and b/docs/screenshots/themes/tool-dialog-sepia.png differ
diff --git a/docs/screenshots/themes/tool-dialog-solar.png b/docs/screenshots/themes/tool-dialog-solar.png
index bea1883a..0e4892a6 100644
Binary files a/docs/screenshots/themes/tool-dialog-solar.png and b/docs/screenshots/themes/tool-dialog-solar.png differ
diff --git a/docs/screenshots/themes/tool-dialog-tide.png b/docs/screenshots/themes/tool-dialog-tide.png
new file mode 100644
index 00000000..f8e2955f
Binary files /dev/null and b/docs/screenshots/themes/tool-dialog-tide.png differ
diff --git a/docs/screenshots/themes/tool-dialog-vector.png b/docs/screenshots/themes/tool-dialog-vector.png
new file mode 100644
index 00000000..c3ce4686
Binary files /dev/null and b/docs/screenshots/themes/tool-dialog-vector.png differ
diff --git a/docs/screenshots/themes/tool-dialog-volcano.png b/docs/screenshots/themes/tool-dialog-volcano.png
new file mode 100644
index 00000000..3386d182
Binary files /dev/null and b/docs/screenshots/themes/tool-dialog-volcano.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-amber.png b/docs/screenshots/themes/toolbar-actions-amber.png
new file mode 100644
index 00000000..011738a1
Binary files /dev/null and b/docs/screenshots/themes/toolbar-actions-amber.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-beacon.png b/docs/screenshots/themes/toolbar-actions-beacon.png
index 4432145b..0d728a1a 100644
Binary files a/docs/screenshots/themes/toolbar-actions-beacon.png and b/docs/screenshots/themes/toolbar-actions-beacon.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-bloom.png b/docs/screenshots/themes/toolbar-actions-bloom.png
index 09066256..4c01238b 100644
Binary files a/docs/screenshots/themes/toolbar-actions-bloom.png and b/docs/screenshots/themes/toolbar-actions-bloom.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-contrast.png b/docs/screenshots/themes/toolbar-actions-contrast.png
index a18b284e..3f190543 100644
Binary files a/docs/screenshots/themes/toolbar-actions-contrast.png and b/docs/screenshots/themes/toolbar-actions-contrast.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-dark.png b/docs/screenshots/themes/toolbar-actions-dark.png
index 4e47c0ad..9d926db1 100644
Binary files a/docs/screenshots/themes/toolbar-actions-dark.png and b/docs/screenshots/themes/toolbar-actions-dark.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-dim.png b/docs/screenshots/themes/toolbar-actions-dim.png
index 85c8246f..a7d88a01 100644
Binary files a/docs/screenshots/themes/toolbar-actions-dim.png and b/docs/screenshots/themes/toolbar-actions-dim.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-ember.png b/docs/screenshots/themes/toolbar-actions-ember.png
new file mode 100644
index 00000000..8a337e51
Binary files /dev/null and b/docs/screenshots/themes/toolbar-actions-ember.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-graphite.png b/docs/screenshots/themes/toolbar-actions-graphite.png
new file mode 100644
index 00000000..3ef9953b
Binary files /dev/null and b/docs/screenshots/themes/toolbar-actions-graphite.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-light.png b/docs/screenshots/themes/toolbar-actions-light.png
index 7973b090..958141ce 100644
Binary files a/docs/screenshots/themes/toolbar-actions-light.png and b/docs/screenshots/themes/toolbar-actions-light.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-linen.png b/docs/screenshots/themes/toolbar-actions-linen.png
index 0b41ce82..0f8d8a57 100644
Binary files a/docs/screenshots/themes/toolbar-actions-linen.png and b/docs/screenshots/themes/toolbar-actions-linen.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-matrix.png b/docs/screenshots/themes/toolbar-actions-matrix.png
index 81865909..360c43c7 100644
Binary files a/docs/screenshots/themes/toolbar-actions-matrix.png and b/docs/screenshots/themes/toolbar-actions-matrix.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-meridian.png b/docs/screenshots/themes/toolbar-actions-meridian.png
index d073bc32..26cc46f3 100644
Binary files a/docs/screenshots/themes/toolbar-actions-meridian.png and b/docs/screenshots/themes/toolbar-actions-meridian.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-neon.png b/docs/screenshots/themes/toolbar-actions-neon.png
index 3a8d3a91..3edef966 100644
Binary files a/docs/screenshots/themes/toolbar-actions-neon.png and b/docs/screenshots/themes/toolbar-actions-neon.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-nord.png b/docs/screenshots/themes/toolbar-actions-nord.png
index 14feef8f..09f60acb 100644
Binary files a/docs/screenshots/themes/toolbar-actions-nord.png and b/docs/screenshots/themes/toolbar-actions-nord.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-nyan.png b/docs/screenshots/themes/toolbar-actions-nyan.png
index 2db332b1..306edd77 100644
Binary files a/docs/screenshots/themes/toolbar-actions-nyan.png and b/docs/screenshots/themes/toolbar-actions-nyan.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-sepia.png b/docs/screenshots/themes/toolbar-actions-sepia.png
index f6d7fe11..b3feaf5f 100644
Binary files a/docs/screenshots/themes/toolbar-actions-sepia.png and b/docs/screenshots/themes/toolbar-actions-sepia.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-solar.png b/docs/screenshots/themes/toolbar-actions-solar.png
index c4b99ad9..aed81720 100644
Binary files a/docs/screenshots/themes/toolbar-actions-solar.png and b/docs/screenshots/themes/toolbar-actions-solar.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-tide.png b/docs/screenshots/themes/toolbar-actions-tide.png
new file mode 100644
index 00000000..8fa9d83c
Binary files /dev/null and b/docs/screenshots/themes/toolbar-actions-tide.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-vector.png b/docs/screenshots/themes/toolbar-actions-vector.png
new file mode 100644
index 00000000..60130299
Binary files /dev/null and b/docs/screenshots/themes/toolbar-actions-vector.png differ
diff --git a/docs/screenshots/themes/toolbar-actions-volcano.png b/docs/screenshots/themes/toolbar-actions-volcano.png
new file mode 100644
index 00000000..72e371b3
Binary files /dev/null and b/docs/screenshots/themes/toolbar-actions-volcano.png differ
diff --git a/docs/screenshots/themes/tools-section-amber.png b/docs/screenshots/themes/tools-section-amber.png
new file mode 100644
index 00000000..25d84380
Binary files /dev/null and b/docs/screenshots/themes/tools-section-amber.png differ
diff --git a/docs/screenshots/themes/tools-section-beacon.png b/docs/screenshots/themes/tools-section-beacon.png
index a1241412..eec8436c 100644
Binary files a/docs/screenshots/themes/tools-section-beacon.png and b/docs/screenshots/themes/tools-section-beacon.png differ
diff --git a/docs/screenshots/themes/tools-section-bloom.png b/docs/screenshots/themes/tools-section-bloom.png
index 0d995bb7..9454f53d 100644
Binary files a/docs/screenshots/themes/tools-section-bloom.png and b/docs/screenshots/themes/tools-section-bloom.png differ
diff --git a/docs/screenshots/themes/tools-section-contrast.png b/docs/screenshots/themes/tools-section-contrast.png
index c7d21158..92b65646 100644
Binary files a/docs/screenshots/themes/tools-section-contrast.png and b/docs/screenshots/themes/tools-section-contrast.png differ
diff --git a/docs/screenshots/themes/tools-section-dark.png b/docs/screenshots/themes/tools-section-dark.png
index fb042dd9..f40af62a 100644
Binary files a/docs/screenshots/themes/tools-section-dark.png and b/docs/screenshots/themes/tools-section-dark.png differ
diff --git a/docs/screenshots/themes/tools-section-dim.png b/docs/screenshots/themes/tools-section-dim.png
index b5acd8c4..2fe7e89a 100644
Binary files a/docs/screenshots/themes/tools-section-dim.png and b/docs/screenshots/themes/tools-section-dim.png differ
diff --git a/docs/screenshots/themes/tools-section-ember.png b/docs/screenshots/themes/tools-section-ember.png
new file mode 100644
index 00000000..ac887dd7
Binary files /dev/null and b/docs/screenshots/themes/tools-section-ember.png differ
diff --git a/docs/screenshots/themes/tools-section-graphite.png b/docs/screenshots/themes/tools-section-graphite.png
new file mode 100644
index 00000000..5a087c2f
Binary files /dev/null and b/docs/screenshots/themes/tools-section-graphite.png differ
diff --git a/docs/screenshots/themes/tools-section-light.png b/docs/screenshots/themes/tools-section-light.png
index 670f37d9..53c98c9e 100644
Binary files a/docs/screenshots/themes/tools-section-light.png and b/docs/screenshots/themes/tools-section-light.png differ
diff --git a/docs/screenshots/themes/tools-section-linen.png b/docs/screenshots/themes/tools-section-linen.png
index bb712c72..03388124 100644
Binary files a/docs/screenshots/themes/tools-section-linen.png and b/docs/screenshots/themes/tools-section-linen.png differ
diff --git a/docs/screenshots/themes/tools-section-matrix.png b/docs/screenshots/themes/tools-section-matrix.png
index 106a747c..69ae893a 100644
Binary files a/docs/screenshots/themes/tools-section-matrix.png and b/docs/screenshots/themes/tools-section-matrix.png differ
diff --git a/docs/screenshots/themes/tools-section-meridian.png b/docs/screenshots/themes/tools-section-meridian.png
index 7864fb49..6a3fe500 100644
Binary files a/docs/screenshots/themes/tools-section-meridian.png and b/docs/screenshots/themes/tools-section-meridian.png differ
diff --git a/docs/screenshots/themes/tools-section-neon.png b/docs/screenshots/themes/tools-section-neon.png
index 025d7194..fc9e3b79 100644
Binary files a/docs/screenshots/themes/tools-section-neon.png and b/docs/screenshots/themes/tools-section-neon.png differ
diff --git a/docs/screenshots/themes/tools-section-nord.png b/docs/screenshots/themes/tools-section-nord.png
index 436d70a1..6c2657a7 100644
Binary files a/docs/screenshots/themes/tools-section-nord.png and b/docs/screenshots/themes/tools-section-nord.png differ
diff --git a/docs/screenshots/themes/tools-section-nyan.png b/docs/screenshots/themes/tools-section-nyan.png
index b620546f..efea83c9 100644
Binary files a/docs/screenshots/themes/tools-section-nyan.png and b/docs/screenshots/themes/tools-section-nyan.png differ
diff --git a/docs/screenshots/themes/tools-section-sepia.png b/docs/screenshots/themes/tools-section-sepia.png
index 439ec93a..89e24543 100644
Binary files a/docs/screenshots/themes/tools-section-sepia.png and b/docs/screenshots/themes/tools-section-sepia.png differ
diff --git a/docs/screenshots/themes/tools-section-solar.png b/docs/screenshots/themes/tools-section-solar.png
index 8c57261a..777ca0f3 100644
Binary files a/docs/screenshots/themes/tools-section-solar.png and b/docs/screenshots/themes/tools-section-solar.png differ
diff --git a/docs/screenshots/themes/tools-section-tide.png b/docs/screenshots/themes/tools-section-tide.png
new file mode 100644
index 00000000..0e120802
Binary files /dev/null and b/docs/screenshots/themes/tools-section-tide.png differ
diff --git a/docs/screenshots/themes/tools-section-vector.png b/docs/screenshots/themes/tools-section-vector.png
new file mode 100644
index 00000000..fcd6ecef
Binary files /dev/null and b/docs/screenshots/themes/tools-section-vector.png differ
diff --git a/docs/screenshots/themes/tools-section-volcano.png b/docs/screenshots/themes/tools-section-volcano.png
new file mode 100644
index 00000000..b5fb0713
Binary files /dev/null and b/docs/screenshots/themes/tools-section-volcano.png differ
diff --git a/docs/screenshots/themes/tour-callout-amber.png b/docs/screenshots/themes/tour-callout-amber.png
new file mode 100644
index 00000000..dda1502f
Binary files /dev/null and b/docs/screenshots/themes/tour-callout-amber.png differ
diff --git a/docs/screenshots/themes/tour-callout-beacon.png b/docs/screenshots/themes/tour-callout-beacon.png
index 3c49cad1..24723b3d 100644
Binary files a/docs/screenshots/themes/tour-callout-beacon.png and b/docs/screenshots/themes/tour-callout-beacon.png differ
diff --git a/docs/screenshots/themes/tour-callout-bloom.png b/docs/screenshots/themes/tour-callout-bloom.png
index 5cb03a68..11909465 100644
Binary files a/docs/screenshots/themes/tour-callout-bloom.png and b/docs/screenshots/themes/tour-callout-bloom.png differ
diff --git a/docs/screenshots/themes/tour-callout-contrast.png b/docs/screenshots/themes/tour-callout-contrast.png
index 4fc4f1d2..fe3c55dd 100644
Binary files a/docs/screenshots/themes/tour-callout-contrast.png and b/docs/screenshots/themes/tour-callout-contrast.png differ
diff --git a/docs/screenshots/themes/tour-callout-dark.png b/docs/screenshots/themes/tour-callout-dark.png
index cd5ef3bc..5413e6df 100644
Binary files a/docs/screenshots/themes/tour-callout-dark.png and b/docs/screenshots/themes/tour-callout-dark.png differ
diff --git a/docs/screenshots/themes/tour-callout-dim.png b/docs/screenshots/themes/tour-callout-dim.png
index a340ce48..4e56d2b4 100644
Binary files a/docs/screenshots/themes/tour-callout-dim.png and b/docs/screenshots/themes/tour-callout-dim.png differ
diff --git a/docs/screenshots/themes/tour-callout-ember.png b/docs/screenshots/themes/tour-callout-ember.png
new file mode 100644
index 00000000..a4040109
Binary files /dev/null and b/docs/screenshots/themes/tour-callout-ember.png differ
diff --git a/docs/screenshots/themes/tour-callout-graphite.png b/docs/screenshots/themes/tour-callout-graphite.png
new file mode 100644
index 00000000..2ed1c8bd
Binary files /dev/null and b/docs/screenshots/themes/tour-callout-graphite.png differ
diff --git a/docs/screenshots/themes/tour-callout-light.png b/docs/screenshots/themes/tour-callout-light.png
index 89a3e97e..c724226b 100644
Binary files a/docs/screenshots/themes/tour-callout-light.png and b/docs/screenshots/themes/tour-callout-light.png differ
diff --git a/docs/screenshots/themes/tour-callout-linen.png b/docs/screenshots/themes/tour-callout-linen.png
index 27e216e9..ce974f93 100644
Binary files a/docs/screenshots/themes/tour-callout-linen.png and b/docs/screenshots/themes/tour-callout-linen.png differ
diff --git a/docs/screenshots/themes/tour-callout-matrix.png b/docs/screenshots/themes/tour-callout-matrix.png
index 1786197a..060b8c9a 100644
Binary files a/docs/screenshots/themes/tour-callout-matrix.png and b/docs/screenshots/themes/tour-callout-matrix.png differ
diff --git a/docs/screenshots/themes/tour-callout-meridian.png b/docs/screenshots/themes/tour-callout-meridian.png
index f8f2ed60..fe456ee2 100644
Binary files a/docs/screenshots/themes/tour-callout-meridian.png and b/docs/screenshots/themes/tour-callout-meridian.png differ
diff --git a/docs/screenshots/themes/tour-callout-neon.png b/docs/screenshots/themes/tour-callout-neon.png
index 2edaa534..b865a8a4 100644
Binary files a/docs/screenshots/themes/tour-callout-neon.png and b/docs/screenshots/themes/tour-callout-neon.png differ
diff --git a/docs/screenshots/themes/tour-callout-nord.png b/docs/screenshots/themes/tour-callout-nord.png
index 6a5b2df1..df7a063e 100644
Binary files a/docs/screenshots/themes/tour-callout-nord.png and b/docs/screenshots/themes/tour-callout-nord.png differ
diff --git a/docs/screenshots/themes/tour-callout-nyan.png b/docs/screenshots/themes/tour-callout-nyan.png
index b7a3aecf..f59cfba2 100644
Binary files a/docs/screenshots/themes/tour-callout-nyan.png and b/docs/screenshots/themes/tour-callout-nyan.png differ
diff --git a/docs/screenshots/themes/tour-callout-sepia.png b/docs/screenshots/themes/tour-callout-sepia.png
index 3c06d59e..55399d38 100644
Binary files a/docs/screenshots/themes/tour-callout-sepia.png and b/docs/screenshots/themes/tour-callout-sepia.png differ
diff --git a/docs/screenshots/themes/tour-callout-solar.png b/docs/screenshots/themes/tour-callout-solar.png
index ea6edc91..03173697 100644
Binary files a/docs/screenshots/themes/tour-callout-solar.png and b/docs/screenshots/themes/tour-callout-solar.png differ
diff --git a/docs/screenshots/themes/tour-callout-tide.png b/docs/screenshots/themes/tour-callout-tide.png
new file mode 100644
index 00000000..b8cd426c
Binary files /dev/null and b/docs/screenshots/themes/tour-callout-tide.png differ
diff --git a/docs/screenshots/themes/tour-callout-vector.png b/docs/screenshots/themes/tour-callout-vector.png
new file mode 100644
index 00000000..24335628
Binary files /dev/null and b/docs/screenshots/themes/tour-callout-vector.png differ
diff --git a/docs/screenshots/themes/tour-callout-volcano.png b/docs/screenshots/themes/tour-callout-volcano.png
new file mode 100644
index 00000000..f740e75d
Binary files /dev/null and b/docs/screenshots/themes/tour-callout-volcano.png differ
diff --git a/docs/screenshots/themes/trusted-keys-amber.png b/docs/screenshots/themes/trusted-keys-amber.png
new file mode 100644
index 00000000..6a8939dc
Binary files /dev/null and b/docs/screenshots/themes/trusted-keys-amber.png differ
diff --git a/docs/screenshots/themes/trusted-keys-beacon.png b/docs/screenshots/themes/trusted-keys-beacon.png
index 5bb2e76e..75de81e3 100644
Binary files a/docs/screenshots/themes/trusted-keys-beacon.png and b/docs/screenshots/themes/trusted-keys-beacon.png differ
diff --git a/docs/screenshots/themes/trusted-keys-bloom.png b/docs/screenshots/themes/trusted-keys-bloom.png
index 5666e371..e245c094 100644
Binary files a/docs/screenshots/themes/trusted-keys-bloom.png and b/docs/screenshots/themes/trusted-keys-bloom.png differ
diff --git a/docs/screenshots/themes/trusted-keys-contrast.png b/docs/screenshots/themes/trusted-keys-contrast.png
index d93a60be..c36445f0 100644
Binary files a/docs/screenshots/themes/trusted-keys-contrast.png and b/docs/screenshots/themes/trusted-keys-contrast.png differ
diff --git a/docs/screenshots/themes/trusted-keys-dark.png b/docs/screenshots/themes/trusted-keys-dark.png
index 2aac779d..86a3b861 100644
Binary files a/docs/screenshots/themes/trusted-keys-dark.png and b/docs/screenshots/themes/trusted-keys-dark.png differ
diff --git a/docs/screenshots/themes/trusted-keys-dim.png b/docs/screenshots/themes/trusted-keys-dim.png
index 16d10f0b..61f69e81 100644
Binary files a/docs/screenshots/themes/trusted-keys-dim.png and b/docs/screenshots/themes/trusted-keys-dim.png differ
diff --git a/docs/screenshots/themes/trusted-keys-ember.png b/docs/screenshots/themes/trusted-keys-ember.png
new file mode 100644
index 00000000..c54595e0
Binary files /dev/null and b/docs/screenshots/themes/trusted-keys-ember.png differ
diff --git a/docs/screenshots/themes/trusted-keys-graphite.png b/docs/screenshots/themes/trusted-keys-graphite.png
new file mode 100644
index 00000000..b57d5a27
Binary files /dev/null and b/docs/screenshots/themes/trusted-keys-graphite.png differ
diff --git a/docs/screenshots/themes/trusted-keys-light.png b/docs/screenshots/themes/trusted-keys-light.png
index 6abfb5eb..a94ce278 100644
Binary files a/docs/screenshots/themes/trusted-keys-light.png and b/docs/screenshots/themes/trusted-keys-light.png differ
diff --git a/docs/screenshots/themes/trusted-keys-linen.png b/docs/screenshots/themes/trusted-keys-linen.png
index 39cc1545..df7813a3 100644
Binary files a/docs/screenshots/themes/trusted-keys-linen.png and b/docs/screenshots/themes/trusted-keys-linen.png differ
diff --git a/docs/screenshots/themes/trusted-keys-matrix.png b/docs/screenshots/themes/trusted-keys-matrix.png
index ccced059..bf27601c 100644
Binary files a/docs/screenshots/themes/trusted-keys-matrix.png and b/docs/screenshots/themes/trusted-keys-matrix.png differ
diff --git a/docs/screenshots/themes/trusted-keys-meridian.png b/docs/screenshots/themes/trusted-keys-meridian.png
index 6b8baad8..ef383731 100644
Binary files a/docs/screenshots/themes/trusted-keys-meridian.png and b/docs/screenshots/themes/trusted-keys-meridian.png differ
diff --git a/docs/screenshots/themes/trusted-keys-neon.png b/docs/screenshots/themes/trusted-keys-neon.png
index 8aa38f5c..5912dfea 100644
Binary files a/docs/screenshots/themes/trusted-keys-neon.png and b/docs/screenshots/themes/trusted-keys-neon.png differ
diff --git a/docs/screenshots/themes/trusted-keys-nord.png b/docs/screenshots/themes/trusted-keys-nord.png
index e5fad090..0b72f8ee 100644
Binary files a/docs/screenshots/themes/trusted-keys-nord.png and b/docs/screenshots/themes/trusted-keys-nord.png differ
diff --git a/docs/screenshots/themes/trusted-keys-nyan.png b/docs/screenshots/themes/trusted-keys-nyan.png
index c7189e34..b1b05668 100644
Binary files a/docs/screenshots/themes/trusted-keys-nyan.png and b/docs/screenshots/themes/trusted-keys-nyan.png differ
diff --git a/docs/screenshots/themes/trusted-keys-sepia.png b/docs/screenshots/themes/trusted-keys-sepia.png
index 61a77263..446f6a62 100644
Binary files a/docs/screenshots/themes/trusted-keys-sepia.png and b/docs/screenshots/themes/trusted-keys-sepia.png differ
diff --git a/docs/screenshots/themes/trusted-keys-solar.png b/docs/screenshots/themes/trusted-keys-solar.png
index 5b364aa0..587ec166 100644
Binary files a/docs/screenshots/themes/trusted-keys-solar.png and b/docs/screenshots/themes/trusted-keys-solar.png differ
diff --git a/docs/screenshots/themes/trusted-keys-tide.png b/docs/screenshots/themes/trusted-keys-tide.png
new file mode 100644
index 00000000..e1e79e7c
Binary files /dev/null and b/docs/screenshots/themes/trusted-keys-tide.png differ
diff --git a/docs/screenshots/themes/trusted-keys-vector.png b/docs/screenshots/themes/trusted-keys-vector.png
new file mode 100644
index 00000000..a521fbc7
Binary files /dev/null and b/docs/screenshots/themes/trusted-keys-vector.png differ
diff --git a/docs/screenshots/themes/trusted-keys-volcano.png b/docs/screenshots/themes/trusted-keys-volcano.png
new file mode 100644
index 00000000..e1115487
Binary files /dev/null and b/docs/screenshots/themes/trusted-keys-volcano.png differ
diff --git a/docs/screenshots/themes/view-menu-amber.png b/docs/screenshots/themes/view-menu-amber.png
new file mode 100644
index 00000000..9d5db242
Binary files /dev/null and b/docs/screenshots/themes/view-menu-amber.png differ
diff --git a/docs/screenshots/themes/view-menu-beacon.png b/docs/screenshots/themes/view-menu-beacon.png
index fc32d412..19625269 100644
Binary files a/docs/screenshots/themes/view-menu-beacon.png and b/docs/screenshots/themes/view-menu-beacon.png differ
diff --git a/docs/screenshots/themes/view-menu-bloom.png b/docs/screenshots/themes/view-menu-bloom.png
index b4cb82cf..8e6145bc 100644
Binary files a/docs/screenshots/themes/view-menu-bloom.png and b/docs/screenshots/themes/view-menu-bloom.png differ
diff --git a/docs/screenshots/themes/view-menu-contrast.png b/docs/screenshots/themes/view-menu-contrast.png
index 87b837e2..f9928d9d 100644
Binary files a/docs/screenshots/themes/view-menu-contrast.png and b/docs/screenshots/themes/view-menu-contrast.png differ
diff --git a/docs/screenshots/themes/view-menu-dark.png b/docs/screenshots/themes/view-menu-dark.png
index fd2c3f0e..b0da50ee 100644
Binary files a/docs/screenshots/themes/view-menu-dark.png and b/docs/screenshots/themes/view-menu-dark.png differ
diff --git a/docs/screenshots/themes/view-menu-dim.png b/docs/screenshots/themes/view-menu-dim.png
index 87a2d297..5375749c 100644
Binary files a/docs/screenshots/themes/view-menu-dim.png and b/docs/screenshots/themes/view-menu-dim.png differ
diff --git a/docs/screenshots/themes/view-menu-ember.png b/docs/screenshots/themes/view-menu-ember.png
new file mode 100644
index 00000000..2ee51b64
Binary files /dev/null and b/docs/screenshots/themes/view-menu-ember.png differ
diff --git a/docs/screenshots/themes/view-menu-graphite.png b/docs/screenshots/themes/view-menu-graphite.png
new file mode 100644
index 00000000..2ec50838
Binary files /dev/null and b/docs/screenshots/themes/view-menu-graphite.png differ
diff --git a/docs/screenshots/themes/view-menu-light.png b/docs/screenshots/themes/view-menu-light.png
index c085cdb7..db95fa4a 100644
Binary files a/docs/screenshots/themes/view-menu-light.png and b/docs/screenshots/themes/view-menu-light.png differ
diff --git a/docs/screenshots/themes/view-menu-linen.png b/docs/screenshots/themes/view-menu-linen.png
index 9cb79dab..eca598a2 100644
Binary files a/docs/screenshots/themes/view-menu-linen.png and b/docs/screenshots/themes/view-menu-linen.png differ
diff --git a/docs/screenshots/themes/view-menu-matrix.png b/docs/screenshots/themes/view-menu-matrix.png
index d9ba2799..5afffed3 100644
Binary files a/docs/screenshots/themes/view-menu-matrix.png and b/docs/screenshots/themes/view-menu-matrix.png differ
diff --git a/docs/screenshots/themes/view-menu-meridian.png b/docs/screenshots/themes/view-menu-meridian.png
index 566bab23..8a18f3e1 100644
Binary files a/docs/screenshots/themes/view-menu-meridian.png and b/docs/screenshots/themes/view-menu-meridian.png differ
diff --git a/docs/screenshots/themes/view-menu-neon.png b/docs/screenshots/themes/view-menu-neon.png
index 5fa55145..3301e47a 100644
Binary files a/docs/screenshots/themes/view-menu-neon.png and b/docs/screenshots/themes/view-menu-neon.png differ
diff --git a/docs/screenshots/themes/view-menu-nord.png b/docs/screenshots/themes/view-menu-nord.png
index 65f99425..e8b3a1dd 100644
Binary files a/docs/screenshots/themes/view-menu-nord.png and b/docs/screenshots/themes/view-menu-nord.png differ
diff --git a/docs/screenshots/themes/view-menu-nyan.png b/docs/screenshots/themes/view-menu-nyan.png
index 409c9f76..91a1525c 100644
Binary files a/docs/screenshots/themes/view-menu-nyan.png and b/docs/screenshots/themes/view-menu-nyan.png differ
diff --git a/docs/screenshots/themes/view-menu-sepia.png b/docs/screenshots/themes/view-menu-sepia.png
index b5a1a5d4..a63006a9 100644
Binary files a/docs/screenshots/themes/view-menu-sepia.png and b/docs/screenshots/themes/view-menu-sepia.png differ
diff --git a/docs/screenshots/themes/view-menu-solar.png b/docs/screenshots/themes/view-menu-solar.png
index 2c916142..a84372c6 100644
Binary files a/docs/screenshots/themes/view-menu-solar.png and b/docs/screenshots/themes/view-menu-solar.png differ
diff --git a/docs/screenshots/themes/view-menu-tide.png b/docs/screenshots/themes/view-menu-tide.png
new file mode 100644
index 00000000..61e94c0e
Binary files /dev/null and b/docs/screenshots/themes/view-menu-tide.png differ
diff --git a/docs/screenshots/themes/view-menu-vector.png b/docs/screenshots/themes/view-menu-vector.png
new file mode 100644
index 00000000..b0d3cc60
Binary files /dev/null and b/docs/screenshots/themes/view-menu-vector.png differ
diff --git a/docs/screenshots/themes/view-menu-volcano.png b/docs/screenshots/themes/view-menu-volcano.png
new file mode 100644
index 00000000..e8a18df1
Binary files /dev/null and b/docs/screenshots/themes/view-menu-volcano.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-amber.png b/docs/screenshots/themes/waiting-for-second-amber.png
new file mode 100644
index 00000000..03345bb2
Binary files /dev/null and b/docs/screenshots/themes/waiting-for-second-amber.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-beacon.png b/docs/screenshots/themes/waiting-for-second-beacon.png
index c8504728..b174b90d 100644
Binary files a/docs/screenshots/themes/waiting-for-second-beacon.png and b/docs/screenshots/themes/waiting-for-second-beacon.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-bloom.png b/docs/screenshots/themes/waiting-for-second-bloom.png
index 56d220d3..ba60ea99 100644
Binary files a/docs/screenshots/themes/waiting-for-second-bloom.png and b/docs/screenshots/themes/waiting-for-second-bloom.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-contrast.png b/docs/screenshots/themes/waiting-for-second-contrast.png
index 83c5ff3e..73367536 100644
Binary files a/docs/screenshots/themes/waiting-for-second-contrast.png and b/docs/screenshots/themes/waiting-for-second-contrast.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-dark.png b/docs/screenshots/themes/waiting-for-second-dark.png
index c94b2ee5..1684160e 100644
Binary files a/docs/screenshots/themes/waiting-for-second-dark.png and b/docs/screenshots/themes/waiting-for-second-dark.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-dim.png b/docs/screenshots/themes/waiting-for-second-dim.png
index 23d6ee24..4d706d22 100644
Binary files a/docs/screenshots/themes/waiting-for-second-dim.png and b/docs/screenshots/themes/waiting-for-second-dim.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-ember.png b/docs/screenshots/themes/waiting-for-second-ember.png
new file mode 100644
index 00000000..3215ed59
Binary files /dev/null and b/docs/screenshots/themes/waiting-for-second-ember.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-graphite.png b/docs/screenshots/themes/waiting-for-second-graphite.png
new file mode 100644
index 00000000..8f68d056
Binary files /dev/null and b/docs/screenshots/themes/waiting-for-second-graphite.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-light.png b/docs/screenshots/themes/waiting-for-second-light.png
index f08ec00f..364f0db2 100644
Binary files a/docs/screenshots/themes/waiting-for-second-light.png and b/docs/screenshots/themes/waiting-for-second-light.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-linen.png b/docs/screenshots/themes/waiting-for-second-linen.png
index f438eb89..d68c28da 100644
Binary files a/docs/screenshots/themes/waiting-for-second-linen.png and b/docs/screenshots/themes/waiting-for-second-linen.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-matrix.png b/docs/screenshots/themes/waiting-for-second-matrix.png
index ee3ec159..f92143ad 100644
Binary files a/docs/screenshots/themes/waiting-for-second-matrix.png and b/docs/screenshots/themes/waiting-for-second-matrix.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-meridian.png b/docs/screenshots/themes/waiting-for-second-meridian.png
index 52ceb071..b9bfc2b0 100644
Binary files a/docs/screenshots/themes/waiting-for-second-meridian.png and b/docs/screenshots/themes/waiting-for-second-meridian.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-neon.png b/docs/screenshots/themes/waiting-for-second-neon.png
index b0267fef..f677dfa4 100644
Binary files a/docs/screenshots/themes/waiting-for-second-neon.png and b/docs/screenshots/themes/waiting-for-second-neon.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-nord.png b/docs/screenshots/themes/waiting-for-second-nord.png
index 427867e1..74f21653 100644
Binary files a/docs/screenshots/themes/waiting-for-second-nord.png and b/docs/screenshots/themes/waiting-for-second-nord.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-nyan.png b/docs/screenshots/themes/waiting-for-second-nyan.png
index 81afc295..b95008ab 100644
Binary files a/docs/screenshots/themes/waiting-for-second-nyan.png and b/docs/screenshots/themes/waiting-for-second-nyan.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-sepia.png b/docs/screenshots/themes/waiting-for-second-sepia.png
index 6ad58118..7f898ac7 100644
Binary files a/docs/screenshots/themes/waiting-for-second-sepia.png and b/docs/screenshots/themes/waiting-for-second-sepia.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-solar.png b/docs/screenshots/themes/waiting-for-second-solar.png
index f7a02967..de278673 100644
Binary files a/docs/screenshots/themes/waiting-for-second-solar.png and b/docs/screenshots/themes/waiting-for-second-solar.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-tide.png b/docs/screenshots/themes/waiting-for-second-tide.png
new file mode 100644
index 00000000..59a568d3
Binary files /dev/null and b/docs/screenshots/themes/waiting-for-second-tide.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-vector.png b/docs/screenshots/themes/waiting-for-second-vector.png
new file mode 100644
index 00000000..c80493f1
Binary files /dev/null and b/docs/screenshots/themes/waiting-for-second-vector.png differ
diff --git a/docs/screenshots/themes/waiting-for-second-volcano.png b/docs/screenshots/themes/waiting-for-second-volcano.png
new file mode 100644
index 00000000..fee6a624
Binary files /dev/null and b/docs/screenshots/themes/waiting-for-second-volcano.png differ
diff --git a/docs/security.md b/docs/security.md
index 6731bbde..58655c05 100644
--- a/docs/security.md
+++ b/docs/security.md
@@ -64,6 +64,18 @@ takes bytes and a display name. With no mergetool launch there is no path held,
 so the handler writes nothing at all whatever arrives, and a session is spent
 once used.
 
+The middle pane is a full editor, and that costs nothing here: `merge:write`
+already took arbitrary text, so a renderer that wanted to write something
+neither side said could always do it. Editing widens what the READER can
+express, not what the surface accepts.
+
+The three inputs are read out of git's index (`:1:`/`:2:`/`:3:`) through the
+same argv fence as any other git call — fixed vectors, `--end-of-options`, the
+path checked as `readBlobArgs` checks it, and the stage one of three integers
+the app chooses. `name-rev` labels the panes with the branches, and takes only
+`HEAD` or `MERGE_HEAD`: literals, never a string from anywhere. All of it is
+still untrusted input, so the binary refusal applies to each.
+
 `mergetool.diffbro.trustExitCode` is `true`, which is only honest because the
 merge launcher WAITS for `$MERGED` to change before it exits. The app is
 single-instance, so the launch itself returns immediately; a script that exited
diff --git a/docs/standards.md b/docs/standards.md
index b4cfb37a..efb15834 100644
--- a/docs/standards.md
+++ b/docs/standards.md
@@ -298,7 +298,7 @@ directory move passes CI while silently removing enforcement.
   genuinely right. New UI must be checked in EVERY theme — see the
   design-proposal rule below, not just the two you happen to have open.
   `make theme-sweep` (scripts/theme-sweep.mjs) is how a NEW surface is checked:
-  it drives the app through all 14, reads the COMPUTED colours off the live DOM
+  it drives the app through all 20, reads the COMPUTED colours off the live DOM
   and holds each pair to a floor declared per probe. `check:themes` holds the
   tokens; this holds what they compose into — a label on a `color-mix` chip, a
   control in its unset state. Add a surface to `SURFACES` when you build one.
@@ -315,16 +315,16 @@ directory move passes CI while silently removing enforcement.
   keyline and NEVER on the label, which scores below 4.5:1 on five themes. Off
   is the opposite language — flat, no lift, weak keyline — never the same
   properties at a lower opacity. `npm run check:themes` holds the resting face,
-  its label and its edge to floors on all 14; that check exists because nothing
+  its label and its edge to floors on all 20; that check exists because nothing
   measured the affordance the first time and a whole toolbar shipped looking
   disabled.
 - **A UI/UX proposal is not a proposal until it has been checked against every
-  supported theme.** `themes.css` ships 14 — light, dark, solar, neon, nord,
-  sepia, dim, beacon, meridian, linen, bloom, nyan, matrix, contrast — and seven
-  are light-ground. A design validated on one or two is a redesign waiting to
+  supported theme.** `themes.css` ships 20 — light, dark, solar, neon, nord,
+  sepia, dim, beacon, meridian, linen, bloom, nyan, matrix, contrast, volcano,
+  amber, tide, ember, graphite, vector — and eight are light-ground. A design validated on one or two is a redesign waiting to
   happen, and redoing it costs far more than checking it would have. Before
   proposing OR building any visual change: read the real token values out of
-  `themes.css` (parse them, never guess), render the idea against all 14, and
+  `themes.css` (parse them, never guess), render the idea against all 20, and
   say per theme where it breaks and why. Hardcoded colour is the usual culprit —
   a black rim plus a white top highlight is a dark-panel idiom that dies on
   every light theme; express it through `--border` / `--text` / `--shadow-rgb` /
diff --git a/e2e/merge-many.spec.mjs b/e2e/merge-many.spec.mjs
new file mode 100644
index 00000000..585c3d56
--- /dev/null
+++ b/e2e/merge-many.spec.mjs
@@ -0,0 +1,108 @@
+import { test, expect, launchApp, freshUserDataDir, firstReadyPage } from './fixtures.mjs'
+import { workerEnv } from './workerEnv.mjs'
+import { execFileSync, spawn } from 'node:child_process'
+import { mkdtempSync, readFileSync, writeFileSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { createRequire } from 'node:module'
+import { fileURLToPath } from 'node:url'
+
+const ROOT = fileURLToPath(new URL('..', import.meta.url))
+const MAIN = join(ROOT, 'build', 'main', 'index.js')
+const ELECTRON = createRequire(import.meta.url)('electron')
+
+// Thirty conflicted files is an ordinary rebase, not an edge case. git calls the
+// tool once per file and waits for each, so the app sees thirty launches in a
+// row — and the tab cap is sixteen.
+const FILES = 30
+
+function bigConflict() {
+  const dir = mkdtempSync(join(tmpdir(), 'diffbro-many-'))
+  const env = {
+    ...process.env,
+    GIT_AUTHOR_NAME: 'T',
+    GIT_AUTHOR_EMAIL: 't@e',
+    GIT_COMMITTER_NAME: 'T',
+    GIT_COMMITTER_EMAIL: 't@e'
+  }
+  const git = (...args) => execFileSync('git', args, { cwd: dir, env })
+  const names = Array.from({ length: FILES }, (_, i) => `file-${String(i).padStart(2, '0')}.txt`)
+  git('init', '-q', '-b', 'main')
+  for (const name of names) writeFileSync(join(dir, name), `one\nbase\nthree\n`)
+  git('add', '.')
+  git('commit', '-qm', 'base')
+  git('checkout', '-qb', 'feature')
+  for (const name of names) writeFileSync(join(dir, name), `one\ntheirs ${name}\nthree\n`)
+  git('commit', '-qam', 'theirs')
+  git('checkout', '-q', 'main')
+  for (const name of names) writeFileSync(join(dir, name), `one\nours ${name}\nthree\n`)
+  git('commit', '-qam', 'ours')
+  try {
+    git('merge', 'feature')
+  } catch {
+    // Expected: thirty conflicts.
+  }
+  return { dir, names, git }
+}
+
+function mergetool(userDataDir, dir, file) {
+  const env = { ...workerEnv(userDataDir) }
+  delete env.ELECTRON_RUN_AS_NODE
+  return new Promise((resolve) => {
+    const p = spawn(
+      ELECTRON,
+      [MAIN, `--user-data-dir=${userDataDir}`, 'mergetool', file, file, file],
+      { cwd: dir, env, stdio: 'ignore' }
+    )
+    p.on('exit', resolve)
+    setTimeout(resolve, 8000)
+  })
+}
+
+test('walks thirty conflicted files without running out of room', async () => {
+  // Thirty Electron launches, one after another, because that is what git does.
+  // The default 30s is a per-test budget written for a test that drives one.
+  test.setTimeout(180_000)
+  const { dir, names, git } = bigConflict()
+  const userDataDir = freshUserDataDir()
+  const app = await launchApp(userDataDir)
+  const page = await firstReadyPage(app)
+  try {
+    // Whatever the strip holds before the walk is the baseline; the walk must
+    // not add to it.
+    const tabsBefore = await page.locator('.tab').count()
+    for (const [i, name] of names.entries()) {
+      await mergetool(userDataDir, dir, join(dir, name))
+      const view = page.locator('.merge-view')
+      await expect(view, `file ${i} (${name}) never opened`).toBeVisible({ timeout: 20000 })
+      await expect(page.locator('.merge-file')).toHaveText(name)
+      // git walks one launch at a time, so the band has to say where you are.
+      await expect(page.getByTestId('merge-walk')).toHaveText(`${i + 1} of ${FILES}`)
+
+      // Alternate, so the walk proves both directions and every file gets the
+      // answer it was given rather than a lucky default.
+      await page.getByTestId(i % 2 ? 'merge-take-theirs' : 'merge-take-ours').click()
+      await page.getByTestId('merge-save').click()
+      await expect(view).toHaveCount(0, { timeout: 10000 })
+    }
+
+    // Every file resolved, with the side it was told, and nothing left unmerged.
+    for (const [i, name] of names.entries()) {
+      const want = i % 2 ? `theirs ${name}` : `ours ${name}`
+      expect(readFileSync(join(dir, name), 'utf8'), name).toBe(`one\n${want}\nthree\n`)
+    }
+    // The index is NOT checked here: this drives `diffbro mergetool` directly,
+    // and it is `git mergetool` that stages a file once the tool exits 0. That
+    // half is covered by the host run recorded in the spec; what this proves is
+    // that the app survives thirty launches back to back.
+    void git
+
+    // The merge is self-contained, so the walk must not have filled the
+    // comparison strip — the cap is sixteen and the tool would have jammed.
+    expect(await page.locator('.tab').count(), 'the walk opened tabs').toBe(tabsBefore)
+    expect(await page.locator('.notice').count(), 'a notice appeared').toBe(0)
+  } finally {
+    await app.close().catch(() => {})
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
diff --git a/e2e/merge-resolve.spec.mjs b/e2e/merge-resolve.spec.mjs
index d0cb70bb..3348a549 100644
--- a/e2e/merge-resolve.spec.mjs
+++ b/e2e/merge-resolve.spec.mjs
@@ -67,23 +67,19 @@ test('resolves a real conflict and writes the merged file back', async () => {
   try {
     await runMergetool(userDataDir, dir, file)
 
-    const dialog = page.getByRole('dialog', { name: 'Resolve merge conflicts' })
-    await expect(dialog).toBeVisible({ timeout: 20000 })
+    const view = page.locator('.merge-view')
+    await expect(view).toBeVisible({ timeout: 20000 })
+    // Three panes: the two commits either side of the file being produced.
+    await expect(page.locator('.merge-pane')).toHaveCount(3)
 
-    // The two conflicting versions are what the README promises and what the
-    // dialog sits over — they used to open EMPTY, because the merge route
-    // returned before vouching for either path.
-    await expect(page.locator('.slot[data-side="left"] .name')).toContainText('app.txt')
-    await expect(page.locator('.slot[data-side="right"] .name')).toContainText('app.txt')
-
-    // Nothing may be written while a conflict is undecided.
+    // Nothing may be written while a region is still undecided.
     const save = page.getByTestId('merge-save')
     await expect(save).toBeDisabled()
 
-    await page.getByTestId('merge-theirs-0').click()
+    await page.getByTestId('merge-take-theirs').click()
     await expect(save).toBeEnabled()
     await save.click()
-    await expect(dialog).toHaveCount(0, { timeout: 10000 })
+    await expect(view).toHaveCount(0, { timeout: 10000 })
 
     // The file git is left holding: their side, no markers.
     const merged = readFileSync(file, 'utf8')
@@ -103,10 +99,9 @@ test('declining leaves the file exactly as git left it', async () => {
   const page = await firstReadyPage(app)
   try {
     await runMergetool(userDataDir, dir, file)
-    const dialog = page.getByRole('dialog', { name: 'Resolve merge conflicts' })
-    await expect(dialog).toBeVisible({ timeout: 20000 })
+    await expect(page.locator('.merge-view')).toBeVisible({ timeout: 20000 })
     await page.getByRole('button', { name: 'Cancel' }).click()
-    await expect(dialog).toHaveCount(0)
+    await expect(page.locator('.merge-view')).toHaveCount(0)
 
     // Untouched, markers and all — the reader said no.
     expect(readFileSync(file).equals(before)).toBe(true)
@@ -130,7 +125,7 @@ test('refuses a binary conflict instead of destroying it', async () => {
   try {
     await runMergetool(userDataDir, dir, file)
     await page.waitForTimeout(1500)
-    await expect(page.getByRole('dialog', { name: 'Resolve merge conflicts' })).toHaveCount(0)
+    await expect(page.locator('.merge-view')).toHaveCount(0)
     expect(readFileSync(file).equals(bytes)).toBe(true)
   } finally {
     await app.close().catch(() => {})
@@ -150,10 +145,508 @@ test('refuses a file with no conflict markers', async () => {
   try {
     await runMergetool(userDataDir, dir, file)
     await page.waitForTimeout(1500)
-    await expect(page.getByRole('dialog', { name: 'Resolve merge conflicts' })).toHaveCount(0)
+    await expect(page.locator('.merge-view')).toHaveCount(0)
     expect(readFileSync(file, 'utf8')).toBe('nothing to resolve\n')
   } finally {
     await app.close().catch(() => {})
     rmSync(dir, { recursive: true, force: true })
   }
 })
+
+// The whole reason for the rebuild: neither side is always right, and the
+// result is a real editor.
+test('takes a side, then lets the reader type the answer neither side had', async () => {
+  const { dir, file } = conflictedRepo()
+  const userDataDir = freshUserDataDir()
+  const app = await launchApp(userDataDir)
+  const page = await firstReadyPage(app)
+  try {
+    await runMergetool(userDataDir, dir, file)
+    await expect(page.locator('.merge-view')).toBeVisible({ timeout: 20000 })
+
+    // The sides come out of git's index, so they are whole files with no
+    // markers in them — not the fragments the old dialog showed.
+    const ours = page.locator('.merge-pane').first()
+    await expect(ours).toContainText('ours')
+    await expect(ours).not.toContainText('<<<<<<<')
+
+    await page.getByTestId('merge-take-ours').click()
+    await expect(page.getByTestId('merge-save')).toBeEnabled()
+
+    // Now edit the result by hand, which the resolver could not express.
+    const result = page.locator('.merge-pane.result .merge-editor')
+    await result.click()
+    await page.locator('.merge-pane.result textarea').waitFor()
+    await page.keyboard.press('ControlOrMeta+a')
+    await page.keyboard.type('one\nhand written\nthree\n')
+    await page.getByTestId('merge-save').click()
+    await expect(page.locator('.merge-view')).toHaveCount(0, { timeout: 10000 })
+
+    expect(readFileSync(file, 'utf8')).toBe('one\nhand written\nthree\n')
+  } finally {
+    await app.close().catch(() => {})
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+// The gutter chevrons are the interaction a merge tool is judged on: the side
+// you want, moved into the result from where it sits.
+test('a gutter chevron moves that side into the result', async () => {
+  const { dir, file } = conflictedRepo()
+  const userDataDir = freshUserDataDir()
+  const app = await launchApp(userDataDir)
+  const page = await firstReadyPage(app)
+  try {
+    await runMergetool(userDataDir, dir, file)
+    await expect(page.locator('.merge-view')).toBeVisible({ timeout: 20000 })
+
+    // The result opens as a valid FILE — no markers anywhere in the view.
+    const result = page.locator('.merge-pane.result')
+    await expect(result).not.toContainText('<<<<<<<')
+    await expect(result).not.toContainText('=======')
+
+    const theirChevron = page.locator('.merge-pane').last().locator('.merge-take-theirs')
+    await expect(theirChevron).toHaveCount(1)
+    await theirChevron.click()
+
+    await expect(page.getByTestId('merge-save')).toBeEnabled()
+    await page.getByTestId('merge-save').click()
+    await expect(page.locator('.merge-view')).toHaveCount(0, { timeout: 10000 })
+    expect(readFileSync(file, 'utf8')).toBe('one\ntheirs\nthree\n')
+  } finally {
+    await app.close().catch(() => {})
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+// The sides come out of git's INDEX, not from re-reading the markers. The
+// difference shows where git auto-merged a hunk: the reconstruction carries the
+// merged line into both sides, the index does not. This was silently falling
+// back on macOS, where git reports /private/var for a repo under /var and the
+// relative path came out full of `..`.
+test('reads both sides from the index, not from the markers', async () => {
+  const dir = mkdtempSync(join(tmpdir(), 'diffbro-merge-idx-'))
+  const env = {
+    ...process.env,
+    GIT_AUTHOR_NAME: 'T',
+    GIT_AUTHOR_EMAIL: 't@e',
+    GIT_COMMITTER_NAME: 'T',
+    GIT_COMMITTER_EMAIL: 't@e'
+  }
+  const git = (...args) => execFileSync('git', args, { cwd: dir, env })
+  const file = join(dir, 'app.txt')
+  git('init', '-q', '-b', 'main')
+  // `mode` is changed by THEM alone and git merges it without asking; `value`
+  // is changed by both and conflicts. The unchanged lines between them matter:
+  // git folds ADJACENT changes into one hunk, and then nothing is auto-merged.
+  writeFileSync(file, 'value: base\nkeep one\nkeep two\nkeep three\nmode: fast\n')
+  git('add', '.')
+  git('commit', '-qm', 'base')
+  git('checkout', '-qb', 'feature')
+  writeFileSync(file, 'value: theirs\nkeep one\nkeep two\nkeep three\nmode: safe\n')
+  git('commit', '-qam', 'theirs')
+  git('checkout', '-q', 'main')
+  writeFileSync(file, 'value: ours\nkeep one\nkeep two\nkeep three\nmode: fast\n')
+  git('commit', '-qam', 'ours')
+  try {
+    git('merge', 'feature')
+  } catch {
+    // Expected.
+  }
+
+  const userDataDir = freshUserDataDir()
+  const app = await launchApp(userDataDir)
+  const page = await firstReadyPage(app)
+  try {
+    await runMergetool(userDataDir, dir, file)
+    await expect(page.locator('.merge-view')).toBeVisible({ timeout: 20000 })
+
+    // Our side still says `fast`; only the auto-merged RESULT says `safe`.
+    await expect(page.locator('.merge-pane').first()).toContainText('mode: fast')
+    await expect(page.locator('.merge-pane').last()).toContainText('mode: safe')
+    await expect(page.locator('.merge-pane.result')).toContainText('mode: safe')
+  } finally {
+    await app.close().catch(() => {})
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+// The answer neither side had, typed straight in — with no button pressed after
+// it. A resolver that still demands a click has not accepted the edit.
+test('typing in a conflict is itself the answer to it', async () => {
+  const { dir, file } = conflictedRepo()
+  const userDataDir = freshUserDataDir()
+  const app = await launchApp(userDataDir)
+  const page = await firstReadyPage(app)
+  try {
+    await runMergetool(userDataDir, dir, file)
+    await expect(page.locator('.merge-view')).toBeVisible({ timeout: 20000 })
+
+    const save = page.getByTestId('merge-save')
+    await expect(save).toBeDisabled()
+
+    const result = page.locator('.merge-pane.result .merge-editor')
+    await result.click()
+    await page.locator('.merge-pane.result textarea').waitFor()
+    await page.keyboard.press('ControlOrMeta+a')
+    await page.keyboard.type('one\nboth of us were wrong\nthree\n')
+
+    await expect(save).toBeEnabled()
+    await save.click()
+    await expect(page.locator('.merge-view')).toHaveCount(0, { timeout: 10000 })
+    expect(readFileSync(file, 'utf8')).toBe('one\nboth of us were wrong\nthree\n')
+  } finally {
+    await app.close().catch(() => {})
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+// Which branch a side IS, read out of git rather than guessed. The panes said
+// only "Ours" and "Theirs", which names neither commit.
+test('names the branches the two sides come from', async () => {
+  const { dir, file } = conflictedRepo()
+  const userDataDir = freshUserDataDir()
+  const app = await launchApp(userDataDir)
+  const page = await firstReadyPage(app)
+  try {
+    await runMergetool(userDataDir, dir, file)
+    await expect(page.locator('.merge-view')).toBeVisible({ timeout: 20000 })
+    await expect(page.locator('.merge-pane').first()).toContainText('main')
+    await expect(page.locator('.merge-pane').last()).toContainText('feature')
+  } finally {
+    await app.close().catch(() => {})
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+// The grips are grid children too. Left to take column tracks of their own they
+// wrapped Theirs onto a second row and cut the result pane to half the height.
+test('the three panes fill one full-height row', async () => {
+  const { dir, file } = conflictedRepo()
+  const userDataDir = freshUserDataDir()
+  const app = await launchApp(userDataDir)
+  const page = await firstReadyPage(app)
+  try {
+    await runMergetool(userDataDir, dir, file)
+    await expect(page.locator('.merge-view')).toBeVisible({ timeout: 20000 })
+
+    const row = await page.locator('.merge-panes').boundingBox()
+    const panes = await page.locator('.merge-pane').all()
+    let spanned = 0
+    for (const pane of panes) {
+      const box = await pane.boundingBox()
+      expect(Math.abs(box.y - row.y)).toBeLessThan(2)
+      expect(Math.abs(box.height - row.height)).toBeLessThan(2)
+      spanned += box.width
+    }
+    // Side by side across the whole row, with no track spent on a grip.
+    expect(Math.abs(spanned - row.width)).toBeLessThan(4)
+  } finally {
+    await app.close().catch(() => {})
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+// Three fixed thirds is not enough to read a wide file in; the dividers move.
+test('the panes can be widened, and the split is remembered', async () => {
+  const { dir, file } = conflictedRepo()
+  const userDataDir = freshUserDataDir()
+  let app = await launchApp(userDataDir)
+  let page = await firstReadyPage(app)
+  try {
+    await runMergetool(userDataDir, dir, file)
+    await expect(page.locator('.merge-view')).toBeVisible({ timeout: 20000 })
+
+    const ours = page.locator('.merge-pane').first()
+    const before = (await ours.boundingBox()).width
+    const grip = page.locator('.merge-grip').first()
+    const box = await grip.boundingBox()
+    await page.mouse.move(box.x, box.y + box.height / 2)
+    await page.mouse.down()
+    await page.mouse.move(box.x + 220, box.y + box.height / 2, { steps: 8 })
+    await page.mouse.up()
+
+    const after = (await ours.boundingBox()).width
+    expect(after).toBeGreaterThan(before + 100)
+
+    // A drag is a decision, so it outlives the window it was made in.
+    await app.close()
+    app = await launchApp(userDataDir)
+    page = await firstReadyPage(app)
+    await runMergetool(userDataDir, dir, file)
+    await expect(page.locator('.merge-view')).toBeVisible({ timeout: 20000 })
+    const restored = (await page.locator('.merge-pane').first().boundingBox()).width
+    expect(Math.abs(restored - after)).toBeLessThan(24)
+  } finally {
+    await app.close().catch(() => {})
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+// A conflict where OUR side DELETED the lines is an insertion point, not a
+// one-line region — and Monaco cannot tell the two ranges apart. Read as a line,
+// taking theirs wrote over the first stable line after the conflict and that
+// line was gone from the file git was handed.
+function deletedSideRepo() {
+  const dir = mkdtempSync(join(tmpdir(), 'diffbro-merge-del-'))
+  const env = {
+    ...process.env,
+    GIT_AUTHOR_NAME: 'T',
+    GIT_AUTHOR_EMAIL: 't@e',
+    GIT_COMMITTER_NAME: 'T',
+    GIT_COMMITTER_EMAIL: 't@e'
+  }
+  const git = (...args) => execFileSync('git', args, { cwd: dir, env })
+  const file = join(dir, 'app.txt')
+  git('init', '-q', '-b', 'main')
+  writeFileSync(file, 'head\nmiddle\ntail\n')
+  git('add', '.')
+  git('commit', '-qm', 'base')
+  git('checkout', '-qb', 'feature')
+  writeFileSync(file, 'head\nthey rewrote it\ntail\n')
+  git('commit', '-qam', 'theirs')
+  git('checkout', '-q', 'main')
+  // We DELETED the line they rewrote: our side of the conflict is empty.
+  writeFileSync(file, 'head\ntail\n')
+  git('commit', '-qam', 'ours')
+  try {
+    git('merge', 'feature')
+  } catch {
+    // Expected.
+  }
+  return { dir, file }
+}
+
+test('takes their side into a region ours emptied without eating the next line', async () => {
+  const { dir, file } = deletedSideRepo()
+  const userDataDir = freshUserDataDir()
+  const app = await launchApp(userDataDir)
+  const page = await firstReadyPage(app)
+  try {
+    await runMergetool(userDataDir, dir, file)
+    await expect(page.locator('.merge-view')).toBeVisible({ timeout: 20000 })
+
+    await page.getByTestId('merge-take-theirs').click()
+    await page.getByTestId('merge-save').click()
+    await expect(page.locator('.merge-view')).toHaveCount(0, { timeout: 10000 })
+
+    expect(readFileSync(file, 'utf8')).toBe('head\nthey rewrote it\ntail\n')
+  } finally {
+    await app.close().catch(() => {})
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+// Answered once it is no longer an insertion point, so changing your mind must
+// REPLACE what the first answer wrote rather than leave both in the file.
+test('lets the reader change their mind about a region ours emptied', async () => {
+  const { dir, file } = deletedSideRepo()
+  const userDataDir = freshUserDataDir()
+  const app = await launchApp(userDataDir)
+  const page = await firstReadyPage(app)
+  try {
+    await runMergetool(userDataDir, dir, file)
+    await expect(page.locator('.merge-view')).toBeVisible({ timeout: 20000 })
+
+    await page.getByTestId('merge-take-theirs').click()
+    await page.getByTestId('merge-take-ours').click()
+    await page.getByTestId('merge-save').click()
+    await expect(page.locator('.merge-view')).toHaveCount(0, { timeout: 10000 })
+
+    expect(readFileSync(file, 'utf8')).toBe('head\ntail\n')
+  } finally {
+    await app.close().catch(() => {})
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+// Enough unchanged lines between the two changes that git keeps them as SEPARATE
+// conflicts: with only three it folds them into one hunk and the test proves
+// nothing about ordering.
+const KEEP = Array.from({ length: 9 }, (_, i) => `keep ${i + 1}`).join('\n')
+
+// Resolving the SECOND conflict first is the ordinary way a reader works, and it
+// is where a stale line number would show: the earlier region must still be
+// where it was, and answering it must not disturb the one already settled.
+test('resolves two conflicts out of order without disturbing either', async () => {
+  const dir = mkdtempSync(join(tmpdir(), 'diffbro-merge-two-'))
+  const env = {
+    ...process.env,
+    GIT_AUTHOR_NAME: 'T',
+    GIT_AUTHOR_EMAIL: 't@e',
+    GIT_COMMITTER_NAME: 'T',
+    GIT_COMMITTER_EMAIL: 't@e'
+  }
+  const git = (...args) => execFileSync('git', args, { cwd: dir, env })
+  const file = join(dir, 'app.txt')
+  git('init', '-q', '-b', 'main')
+  writeFileSync(file, `top\nA base\n${KEEP}\nB base\nbottom\n`)
+  git('add', '.')
+  git('commit', '-qm', 'base')
+  git('checkout', '-qb', 'feature')
+  writeFileSync(file, `top\nA theirs\n${KEEP}\nB theirs\nbottom\n`)
+  git('commit', '-qam', 'theirs')
+  git('checkout', '-q', 'main')
+  writeFileSync(file, `top\nA ours\n${KEEP}\nB ours\nbottom\n`)
+  git('commit', '-qam', 'ours')
+  try {
+    git('merge', 'feature')
+  } catch {
+    // Expected.
+  }
+
+  const userDataDir = freshUserDataDir()
+  const app = await launchApp(userDataDir)
+  const page = await firstReadyPage(app)
+  try {
+    await runMergetool(userDataDir, dir, file)
+    await expect(page.locator('.merge-view')).toBeVisible({ timeout: 20000 })
+
+    // Second conflict first: step to it, take theirs, then come back for the first.
+    await page.getByTestId('merge-next').click()
+    await page.getByTestId('merge-take-theirs').click()
+    await page.getByTestId('merge-prev').click()
+    await page.getByTestId('merge-take-ours').click()
+
+    await page.getByTestId('merge-save').click()
+    await expect(page.locator('.merge-view')).toHaveCount(0, { timeout: 10000 })
+    expect(readFileSync(file, 'utf8')).toBe(`top\nA ours\n${KEEP}\nB theirs\nbottom\n`)
+  } finally {
+    await app.close().catch(() => {})
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+// A merge tool that reformats the file it resolves is one nobody trusts twice.
+// Both of these are invisible on screen and only the bytes can say.
+function endingsRepo(body) {
+  const dir = mkdtempSync(join(tmpdir(), 'diffbro-merge-eol-'))
+  const env = {
+    ...process.env,
+    GIT_AUTHOR_NAME: 'T',
+    GIT_AUTHOR_EMAIL: 't@e',
+    GIT_COMMITTER_NAME: 'T',
+    GIT_COMMITTER_EMAIL: 't@e'
+  }
+  const git = (...args) => execFileSync('git', args, { cwd: dir, env })
+  const file = join(dir, 'app.txt')
+  git('init', '-q', '-b', 'main')
+  // core.autocrlf off, so what is written is what git stores and hands back.
+  git('config', 'core.autocrlf', 'false')
+  writeFileSync(file, body('base'))
+  git('add', '.')
+  git('commit', '-qm', 'base')
+  git('checkout', '-qb', 'feature')
+  writeFileSync(file, body('theirs'))
+  git('commit', '-qam', 'theirs')
+  git('checkout', '-q', 'main')
+  writeFileSync(file, body('ours'))
+  git('commit', '-qam', 'ours')
+  try {
+    git('merge', 'feature')
+  } catch {
+    // Expected.
+  }
+  return { dir, file }
+}
+
+test('writes a CRLF file back with CRLF', async () => {
+  const { dir, file } = endingsRepo((v) => `one\r\n${v}\r\nthree\r\n`)
+  const userDataDir = freshUserDataDir()
+  const app = await launchApp(userDataDir)
+  const page = await firstReadyPage(app)
+  try {
+    await runMergetool(userDataDir, dir, file)
+    await expect(page.locator('.merge-view')).toBeVisible({ timeout: 20000 })
+    await page.getByTestId('merge-take-theirs').click()
+    await page.getByTestId('merge-save').click()
+    await expect(page.locator('.merge-view')).toHaveCount(0, { timeout: 10000 })
+
+    const merged = readFileSync(file, 'utf8')
+    expect(merged).toBe('one\r\ntheirs\r\nthree\r\n')
+    expect(merged).not.toMatch(/[^\r]\n/)
+  } finally {
+    await app.close().catch(() => {})
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+test('leaves a file that ended without a newline ending without one', async () => {
+  const { dir, file } = endingsRepo((v) => `one\n${v}\nthree`)
+  const userDataDir = freshUserDataDir()
+  const app = await launchApp(userDataDir)
+  const page = await firstReadyPage(app)
+  try {
+    await runMergetool(userDataDir, dir, file)
+    await expect(page.locator('.merge-view')).toBeVisible({ timeout: 20000 })
+    await page.getByTestId('merge-take-theirs').click()
+    await page.getByTestId('merge-save').click()
+    await expect(page.locator('.merge-view')).toHaveCount(0, { timeout: 10000 })
+
+    expect(readFileSync(file, 'utf8')).toBe('one\ntheirs\nthree')
+  } finally {
+    await app.close().catch(() => {})
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+// The headline promise, on the region that could not keep it: our side deleted
+// the lines, so there is no chevron to click and the reader types the answer.
+// It stayed unresolved and Save stayed locked with the conflict visibly answered.
+test('takes a typed answer in a region ours emptied', async () => {
+  const { dir, file } = deletedSideRepo()
+  const userDataDir = freshUserDataDir()
+  const app = await launchApp(userDataDir)
+  const page = await firstReadyPage(app)
+  try {
+    await runMergetool(userDataDir, dir, file)
+    await expect(page.locator('.merge-view')).toBeVisible({ timeout: 20000 })
+
+    const save = page.getByTestId('merge-save')
+    await expect(save).toBeDisabled()
+
+    const result = page.locator('.merge-pane.result .merge-editor')
+    await result.click()
+    await page.locator('.merge-pane.result textarea').waitFor()
+    await page.keyboard.press('ControlOrMeta+a')
+    await page.keyboard.type('head\nneither of you\ntail\n')
+
+    await expect(save).toBeEnabled()
+    await save.click()
+    await expect(page.locator('.merge-view')).toHaveCount(0, { timeout: 10000 })
+    expect(readFileSync(file, 'utf8')).toBe('head\nneither of you\ntail\n')
+  } finally {
+    await app.close().catch(() => {})
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+// Undo puts back the lines "Neither" removed, so the region holds them again.
+// Left cached as an insertion point, the next answer was INSERTED above them and
+// the file went out holding both sides.
+test('answers a region again after undoing a Neither', async () => {
+  const { dir, file } = deletedSideRepo()
+  const userDataDir = freshUserDataDir()
+  const app = await launchApp(userDataDir)
+  const page = await firstReadyPage(app)
+  try {
+    await runMergetool(userDataDir, dir, file)
+    await expect(page.locator('.merge-view')).toBeVisible({ timeout: 20000 })
+
+    await page.getByTestId('merge-take-theirs').click()
+    const result = page.locator('.merge-pane.result .merge-editor')
+    await result.click()
+    await page.locator('.merge-pane.result textarea').waitFor()
+    await page.keyboard.press('ControlOrMeta+z')
+    await page.getByTestId('merge-take-theirs').click()
+
+    await page.getByTestId('merge-save').click()
+    await expect(page.locator('.merge-view')).toHaveCount(0, { timeout: 10000 })
+
+    const merged = readFileSync(file, 'utf8')
+    expect(merged).toBe('head\nthey rewrote it\ntail\n')
+  } finally {
+    await app.close().catch(() => {})
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
diff --git a/scripts/theme-sweep.mjs b/scripts/theme-sweep.mjs
index d5c42b34..0eb5208a 100644
--- a/scripts/theme-sweep.mjs
+++ b/scripts/theme-sweep.mjs
@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// Walks a surface through all 14 themes and MEASURES it, rather than leaving a
+// Walks a surface through every theme and MEASURES it, rather than leaving a
 // reviewer to eyeball fourteen pictures. For every theme it reads the COMPUTED
 // colours off the live DOM and reports the contrast of each pair that carries
 // meaning — which is the check docs/standards.md asks for ("assert the
@@ -17,10 +17,12 @@
 // still look; the exit code is what gates.
 
 import { mkdtempSync, mkdirSync, existsSync, writeFileSync } from 'node:fs'
+import { execFileSync, spawn } from 'node:child_process'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { fileURLToPath, pathToFileURL } from 'node:url'
 import { generateKeyPairSync } from 'node:crypto'
+import { createRequire } from 'node:module'
 import { _electron as electron } from '@playwright/test'
 
 /* global document, getComputedStyle -- inside page.evaluate only */
@@ -28,6 +30,9 @@ import { _electron as electron } from '@playwright/test'
 const ROOT = fileURLToPath(new URL('..', import.meta.url))
 const MAIN = join(ROOT, 'build', 'main', 'index.js')
 const OUT = join(ROOT, 'docs/screenshots/themes')
+// The app's OWN Electron, the way the launcher would reach it — process.execPath
+// here is node, which would run the main bundle as a plain script.
+const ELECTRON = createRequire(import.meta.url)('electron')
 
 const THEMES = [
   'Light',
@@ -43,7 +48,13 @@ const THEMES = [
   'Bloom',
   'Nyan',
   'Matrix',
-  'Contrast'
+  'Contrast',
+  'Volcano',
+  'Amber',
+  'Tide',
+  'Ember',
+  'Graphite',
+  'Vector'
 ]
 
 // The floors the repo already runs on. Declared PER PROBE rather than guessed
@@ -184,7 +195,88 @@ const LOCKFILE = (version) =>
     2
   )
 
+// The merge view has no entry point inside the app: it exists because git
+// launched the tool. So the sweep makes a real conflict once and drives a real
+// `git mergetool` at it for each theme, cancelling out again so the file — and
+// the repo — are left exactly as git wrote them.
+let conflicted = null
+
+function mergeConflictRepo() {
+  if (conflicted) return conflicted
+  const dir = mkdtempSync(join(tmpdir(), 'diffbro-sweep-merge-'))
+  const env = {
+    ...process.env,
+    GIT_AUTHOR_NAME: 'T',
+    GIT_AUTHOR_EMAIL: 't@e',
+    GIT_COMMITTER_NAME: 'T',
+    GIT_COMMITTER_EMAIL: 't@e'
+  }
+  const git = (...args) => execFileSync('git', args, { cwd: dir, env })
+  const file = join(dir, 'config.yml')
+  git('init', '-q', '-b', 'main')
+  writeFileSync(file, 'service: diff-engine\nreplicas: 3\nregion: eu-west-1\nkeep: yes\n')
+  git('add', '.')
+  git('commit', '-qm', 'base')
+  git('checkout', '-qb', 'feature')
+  writeFileSync(file, 'service: diff-engine\nreplicas: 9\nregion: eu-west-1\nkeep: yes\n')
+  git('commit', '-qam', 'theirs')
+  git('checkout', '-q', 'main')
+  writeFileSync(file, 'service: diff-engine\nreplicas: 5\nregion: us-east-1\nkeep: yes\n')
+  git('commit', '-qam', 'ours')
+  try {
+    git('merge', 'feature')
+  } catch {
+    // Expected: this is the conflict the surface is for.
+  }
+  conflicted = { dir, file }
+  return conflicted
+}
+
+async function openMerge(page, userDataDir) {
+  const { dir, file } = mergeConflictRepo()
+  const env = { ...process.env }
+  delete env.ELECTRON_RUN_AS_NODE
+  await new Promise((resolve) => {
+    const child = spawn(
+      ELECTRON,
+      [MAIN, `--user-data-dir=${userDataDir}`, 'mergetool', file, file, file],
+      { cwd: dir, env, stdio: 'ignore' }
+    )
+    child.on('exit', resolve)
+    setTimeout(resolve, 8000)
+  })
+  // The launcher window has been up by now, and the merge arrives through a
+  // SECOND process whose focus() does not reliably raise the main window under
+  // the container's window manager — leaving it occluded, producing no frames,
+  // and hanging the screenshot rather than failing it.
+  await page.bringToFront()
+  await page.locator('.merge-view').waitFor({ timeout: 20000 })
+  await page.locator('.merge-word-theirs').first().waitFor({ timeout: 10000 })
+}
+
 const SURFACES = [
+  {
+    name: 'merge-view',
+    // The chrome only. The bands and the intra-line tints inside the panes are
+    // Monaco decorations built from --dg-add / --dg-del / --dg-chg alone, and
+    // check-theme-depth already holds those three to a contrast floor AND a
+    // pairwise deltaE floor on every theme — measuring an overlay div that
+    // carries no text of its own would report a number nothing depends on.
+    open: (page, { userDataDir }) => openMerge(page, userDataDir),
+    close: async (page) => {
+      await page.getByRole('button', { name: 'Cancel' }).click()
+      await page.locator('.merge-view').waitFor({ state: 'detached' })
+    },
+    probes: {
+      'pane label': ['.merge-pane.result .merge-head', TEXT],
+      // The branch a side comes from: words a reader reads, so the reading floor
+      // and not the hint one.
+      'branch name': ['.merge-rev', TEXT],
+      'conflicts left': ['.merge-count', TEXT],
+      'file name': ['.merge-file', TEXT],
+      "result pane's own head": ['.merge-pane.result .merge-hint', TEXT]
+    }
+  },
   {
     name: 'deps-diff',
     // Reached through PASTE mode, because a lockfile is recognised by its NAME
@@ -309,8 +401,13 @@ const SURFACES = [
   },
   {
     name: 'status-band',
-    // Already on screen — the sweep leaves a structure diff loaded.
-    open: async (page) => page.locator('.status-band').waitFor(),
+    // The startup diff is gone by now: deps-diff runs first and its close is a
+    // Clear. Reload rather than assume — assuming is what left this surface
+    // timing out on every run since deps-diff was added.
+    open: async (page) => {
+      if (!(await page.locator('.status-band').count())) await loadStructureDiff(page)
+      await page.locator('.status-band').waitFor()
+    },
     close: async () => {},
     probes: {
       // These carry the numbers a reader reads, so they take the reading floor —
@@ -549,8 +646,24 @@ const SURFACES = [
 // The launcher is a SECOND BrowserWindow with its own card surface, and no
 // surface here ever opened it — so its compose panel, body overlay and name
 // ghost were only ever measured against the main window's ground.
+// Asked of MAIN, not of the page: a hidden BrowserWindow keeps reporting its
+// document as visible, so only the window itself knows.
+const launcherShown = (app) =>
+  app.evaluate(({ BrowserWindow }) =>
+    BrowserWindow.getAllWindows().some(
+      (w) => w.webContents.getURL().includes('quicklook') && w.isVisible()
+    )
+  )
+
 async function launcherPage(app, page) {
   const open = app.windows().find((w) => w.url().includes('quicklook'))
+  // The launcher hides itself whenever something else takes focus — which the
+  // merge does, arriving in the main window from a second process. A hidden
+  // window produces no frames, so screenshotting it HANGS rather than fails.
+  if (open && !(await launcherShown(app))) {
+    await page.evaluate(() => globalThis.api.quickLookToggle())
+    for (let i = 0; i < 50 && !(await launcherShown(app)); i++) await page.waitForTimeout(100)
+  }
   if (open) return open
   const [ql] = await Promise.all([
     app.waitForEvent('window'),
@@ -561,9 +674,16 @@ async function launcherPage(app, page) {
   return ql
 }
 
-async function sweepSurface({ app, main, surface, theme, findings }) {
+// A named subset while a new surface is being built: the full walk is 20 themes
+// across every surface, which is a slow way to find out a selector moved.
+const chosenSurfaces = () => {
+  const only = process.env.SWEEP_ONLY?.split(',').filter(Boolean)
+  return only?.length ? SURFACES.filter((s) => only.includes(s.name)) : SURFACES
+}
+
+async function sweepSurface({ app, main, surface, theme, findings, userDataDir }) {
   const page = surface.window === 'launcher' ? await launcherPage(app, main) : main
-  await surface.open(page)
+  await surface.open(page, { userDataDir })
   await page.waitForTimeout(120)
   await page.screenshot({ path: join(OUT, `${surface.name}-${theme.toLowerCase()}.png`) })
 
@@ -619,8 +739,8 @@ async function main() {
 
     for (const theme of THEMES) {
       await setTheme(page, theme)
-      for (const surface of SURFACES) {
-        await sweepSurface({ app, main: page, surface, theme, findings })
+      for (const surface of chosenSurfaces()) {
+        await sweepSurface({ app, main: page, surface, theme, findings, userDataDir })
       }
       process.stdout.write(`  ${theme.padEnd(9)} ✓\n`)
     }
diff --git a/specs/2026-08-10-three-way-merge-view/plan.md b/specs/2026-08-10-three-way-merge-view/plan.md
new file mode 100644
index 00000000..f710bac5
--- /dev/null
+++ b/specs/2026-08-10-three-way-merge-view/plan.md
@@ -0,0 +1,245 @@
+# A real three-way merge view
+
+|                                         |                             |
+| --------------------------------------- | --------------------------- |
+| **Status**                              | in-progress                 |
+| **Progress**                            | 9 / 9 steps                 |
+| **Branch**                              | `feat/three-way-merge-view` |
+| **Started**                             | 2026-08-10                  |
+| **Finished**                            | —                           |
+| **Bugs found and fixed this iteration** | 0                           |
+| **Token baseline**                      | —                           |
+| **Claude tokens used**                  | —                           |
+
+## Problem
+
+v0.4.29 shipped a merge **resolver**, not a merge **view**. One card per conflict
+with four buttons, no line-level context, no navigation, no editing. Asked to
+resolve `config.yml`, it shows two blocks of three lines and offers Ours /
+Theirs / Both / Neither.
+
+That was my scoping call — `specs/2026-08-09-developer-workflow/plan.md` records
+"three-way merge as a full editor | out" as a decision — and it is the wrong one.
+The reference every developer has is JetBrains: three panes, the result in the
+middle, per-hunk chevrons in the gutters, and the result editable by hand when
+neither side is right. A merge tool that cannot express "take theirs, then fix
+the indentation" sends you to another editor at exactly the moment it promised
+not to.
+
+Two smaller failures fall out of the same design:
+
+- **The ancestor is thrown away.** `mergeConflicts.js` parses a diff3 base when
+  git happens to write one, and nothing renders it. Which side _changed_ is the
+  first question in a merge and the view cannot answer it.
+- **Markers are the wrong source.** Parsing `<<<<<<<` out of `$MERGED` is
+  reconstructing what git already holds. The index carries the three inputs
+  cleanly, verified on a real conflict:
+
+  ```
+  $ git show :1:config.yml   # base    → replicas: 3, region: eu-west-1, timeout: 30
+  $ git show :2:config.yml   # ours    → replicas: 5, region: us-east-1, timeout: 30
+  $ git show :3:config.yml   # theirs  → replicas: 9, region: eu-west-1, timeout: 90
+  ```
+
+## Solution
+
+**Three Monaco panes: Ours │ Result │ Theirs, with the result editable.**
+
+Inputs come from the index (`:1:`, `:2:`, `:3:`), so all three texts arrive
+without a marker in them. Conflict regions are computed from those three rather
+than scraped, which is also what makes the ancestor available.
+
+Monaco ships **no three-way merge editor** — VS Code's is internal and not part
+of `monaco-editor` — so it is composed from three ordinary editors plus
+decorations. That is the central cost of this proposal and the main risk.
+
+| option                                                   | why not                                                                                                                                             |
+| -------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
+| keep the dialog, add a diff pane inside it               | the dialog is the wrong container: a merge needs the window, and `BaseDialog` is capped for a reason                                                |
+| two stacked `createDiffEditor`s sharing the centre model | Monaco's revert arrow reverts _modified → original_, so "accept theirs" would need Theirs on the left of its own pane. The layout fights the widget |
+| VS Code's merge editor                                   | not exposed by `monaco-editor`. Vendoring it is a fork, not a dependency                                                                            |
+| keep parsing markers                                     | the index is the source of truth, and markers cannot give the ancestor unless the user set `merge.conflictStyle=diff3`                              |
+| a new dependency for three-way merge                     | rule 2. The algorithm is already in `mergeConflicts.js`; what is missing is a view                                                                  |
+
+## Scope
+
+**In:**
+
+- `readStageArgs(stage, path)` in `gitRepo.js` — `:1:`/`:2:`/`:3:` from the
+  index. `stage` is a literal the app chooses, never renderer input
+- three-way region model from three texts (extends `mergeConflicts.js`, keeps
+  the marker parser as the fallback)
+- `MergeView.vue` — full-area, replacing the dialog: three panes, scroll-synced
+- glyph-margin actions per region: take ours · take theirs · both · neither
+- an EDITABLE result pane (`useMonacoInput` already does this)
+- next/previous conflict, and a status band counting what is left
+- the save guard changes — see Decisions
+
+**Out:**
+
+- word-level merge within a line — hunk granularity, as JetBrains defaults to
+- editing Ours or Theirs; they are what the two commits said
+- resolving a binary conflict, which stays refused
+- a merge that is not a `git mergetool` launch; nothing gains a "merge two
+  arbitrary files" entry point
+
+## Design
+
+Chrome is tokens; the panes are Monaco, themed through `applyMonacoTheme` as the
+diff view already is. Region tints use `--dg-add` / `--dg-del` / `--dg-chg`,
+which `check-theme-depth` already holds to a contrast floor **and** a pairwise
+ΔE floor across all 20 themes — the same three the diagram view leans on.
+
+```
+┌ band ──────────────────────────────────────────────────────────────┐
+│ config.yml            ‹ prev   next ›        2 of 3 resolved   Save │
+├──────────────────┬──────────────────────────┬──────────────────────┤
+│ Ours (read-only) │ Result (EDITABLE)        │ Theirs (read-only)   │
+│                  │                          │                      │
+│ replicas: 5    » │ replicas: 5              │ «  replicas: 9       │
+│ region: us-east» │ region: us-east-1        │ «  region: eu-west-1 │
+│ timeout: 30    » │ timeout: 90              │ «  timeout: 90       │
+│                  │ ^ hand-edited            │                      │
+└──────────────────┴──────────────────────────┴──────────────────────┘
+```
+
+`»` and `«` are glyph-margin actions, not text — `<AppIcon>` geometry rendered
+into Monaco's glyph margin, so nothing tofus.
+
+### Theme verdict — all 20
+
+The panes are Monaco surfaces, so the question is what the DECORATIONS compose
+against Monaco's themed ground, not what a `.css` background does. Values parsed
+from `styles/themes.css` + `tokens.css`.
+
+`--dg-add` is `--success-text`; `--dg-del` is `color-mix(--danger-border 70%,
+--text)` — that mix exists because nord's raw danger token scored 2.24; `--dg-chg`
+is `--warning-border`, overridden on nord, contrast and vector.
+
+| theme    | ground    | verdict | note                                                    |
+| -------- | --------- | ------- | ------------------------------------------------------- |
+| light    | `#ffffff` | ok      | region tints at 14%, the step the grid already uses     |
+| dark     | `#0d1117` | ok      |                                                         |
+| solar    | `#fffdf6` | ok      |                                                         |
+| neon     | `#090d18` | ok      | accent only on the focus ring                           |
+| nord     | `#2e3440` | ok      | `--dg-del`'s mix is why this passes at all              |
+| sepia    | `#e9dcbe` | ok      |                                                         |
+| dim      | `#1b1917` | ok      |                                                         |
+| beacon   | `#000000` | ok      | hard keyline `#e0e0e0` — pane dividers keep `--border`  |
+| meridian | `#f5f7f4` | ok      |                                                         |
+| linen    | `#faf7f0` | ok      |                                                         |
+| bloom    | `#f9f4f5` | ok      |                                                         |
+| nyan     | `#160a20` | ok      | accent `#ff2ecb`, no glow, no accent fill under a label |
+| matrix   | `#020a04` | ok      | accent `#00ff41`, same                                  |
+| contrast | `#ffffff` | ok      | hard keyline `#111111`; `--dg-chg` overridden here      |
+| volcano  | `#000000` | ok      |                                                         |
+| amber    | `#0f0a02` | ok      |                                                         |
+| tide     | `#0b1a1e` | ok      |                                                         |
+| ember    | `#1a1013` | ok      |                                                         |
+| graphite | `#161616` | ok      | achromatic ground, semantic tints carry the meaning     |
+| vector   | `#ffffff` | ok      | `--dg-chg` overridden here                              |
+
+**This table is not the check.** The new surface goes into `theme-sweep`'s
+`SURFACES` and is read off real frames, because the audit found the last two new
+surfaces failing the reading floor on 14 of 20 themes with a table just like this
+one saying "ok".
+
+## Security rules touched
+
+Nothing new is opened.
+
+- **The write is unchanged.** `merge:write` already takes TEXT and main already
+  holds `$MERGED` from launch, so an editable pane needs no new IPC and no new
+  argument. This is why "freely editable" costs nothing here: the renderer could
+  already send arbitrary text.
+- **Rule 7.** `readStageArgs` is one more argv builder inside the existing fence:
+  fixed argv, no shell, `--end-of-options`, the same hardening. `stage` is one of
+  three integers chosen by the app — it is never a string from anywhere.
+- **Rule 6.** Three texts from the index are still untrusted input; the existing
+  binary refusal applies to each, and the region model is capped.
+
+## Test plan
+
+- **unit** — `mergeThreeWay.test.js`: regions from three texts; a region only one
+  side changed (auto-mergeable, not a conflict); both sides identical; one side
+  deleted; CRLF preserved; the marker parser still used when stages are absent
+- **unit** — `gitRepo.test.js`: `readStageArgs` refuses a stage outside 1–3 and
+  builds `:2:path` with the path fenced as before
+- **unit** — `useMergeRegions` composable: next/prev wrapping, region → line
+  range after an edit shifts the text
+- **e2e** — `merge-resolve.spec.mjs` (11): a real conflict through
+  `git mergetool`; take a side, take from a gutter chevron, TYPE the answer,
+  save, assert the bytes on disk. Plus: the sides come from the index and not the
+  markers · the branches are named · the three panes fill one full-height row ·
+  the split is draggable and remembered · declining leaves the file untouched ·
+  a binary or marker-free file is refused
+- **e2e** — `merge-many.spec.mjs`: a 30-file conflict walked to the end
+- **theme-sweep** — a `merge-view` entry in `SURFACES`
+
+## Docs impact
+
+| surface                                 | needed? | what changes                                             |
+| --------------------------------------- | ------- | -------------------------------------------------------- |
+| `README.md`                             | **yes** | the Merge conflicts row describes a dialog               |
+| `docs/screenshots/*.png`                | **yes** | a new full-area view is a new frame                      |
+| `docs/roadmap.md` + `brand/roadmap.svg` | **yes** | Developer workflow gains a row                           |
+| `docs/security.md`                      | **yes** | one line: the result is editable, the write is not wider |
+| `docs/standards.md`                     | **no**  | no new convention                                        |
+
+## Implementation plan
+
+- [x] 1. `readStageArgs` + the index reader, with the marker parser as fallback
+- [x] 2. Regions from the markers, both SIDES from the index — see Decisions
+- [x] 3. Region ↔ line mapping under edits, via Monaco's own decoration ranges
+- [x] 4. `MergeView.vue` shell: three panes, scroll sync, status band, walk counter
+- [x] 5. Glyph-margin chevrons, region decorations, intra-line word tints, ruler marks
+- [x] 6. The editable result; typing inside a region answers it
+- [x] 7. Retire `MergeDialog`; route the merge session to the view
+- [x] 8. `SURFACES` entry + measured on all 20 (1260 measurements, green)
+- [x] 9. e2e, docs, roadmap + SVG
+
+## Decisions
+
+| date       | decision                                                                  | why                                                                                                                                                                                                                                                                                                                                                           | rejected                                                                       |
+| ---------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------ |
+| 2026-08-10 | the result pane is freely editable                                        | the user's call, asked and answered. "Take theirs, then fix the indentation" is the case a resolver cannot express                                                                                                                                                                                                                                            | read-only result composed from choices                                         |
+| 2026-08-10 | **the save guard changes meaning**                                        | with free editing, "every region answered" is no longer the truth — a hand-edited result can be complete with regions never touched, and a fully-answered one can still have markers typed back in. Save blocks on MARKERS PRESENT in the result, and warns (does not block) on untouched regions                                                             | keeping `unresolvedCount` as the gate, which would be wrong in both directions |
+| 2026-08-10 | inputs come from the index, markers are the fallback                      | the index is what git actually holds, and it is the only way to get the ancestor without the user having set `merge.conflictStyle=diff3`                                                                                                                                                                                                                      | marker parsing only                                                            |
+| 2026-08-10 | compose three editors rather than adopt a merge widget                    | Monaco exposes none; VS Code's is internal                                                                                                                                                                                                                                                                                                                    | vendoring VS Code's merge editor                                               |
+| 2026-08-11 | **regions come from the MARKERS; only the two SIDES come from the index** | a deviation from "regions computed from three texts". git already decided where the conflicts are — recomputing them from three texts would be a second, disagreeing opinion, and where it disagreed the view would offer a choice git will not accept. The index still supplies both sides as whole marker-free files, which is what the panes needed it for | a three-way region model recomputed in the renderer                            |
+| 2026-08-11 | **the save guard is explicit region state, not a marker scan**            | with no markers anywhere in the result there is nothing left to scan for. A region is unresolved until it is answered — by a button, a chevron, or an edit landing inside it                                                                                                                                                                                  | blocking on `<<<<<<<` present in the result                                    |
+| 2026-08-11 | typing inside a region resolves it                                        | JetBrains' model, and the hole the button-only guard left: a reader who typed the whole answer still had to press something before Save unlocked                                                                                                                                                                                                              | requiring an explicit "keep this" action                                       |
+| 2026-08-11 | the ancestor is read but not shown                                        | `:1:` arrives in the payload and the store holds it; a fourth pane is a different design question and three panes is what JetBrains defaults to                                                                                                                                                                                                               | a base pane in this change                                                     |
+| 2026-08-11 | pane widths are FRACTIONS with five grid tracks                           | the grips are grid children as much as the panes are; three tracks for five children wrapped the last pane onto a row of its own, which is what "the result pane is glued to the bottom" was                                                                                                                                                                  | pixel widths, or absolutely-positioned grips                                   |
+
+## Validation
+
+- [x] `/validate` — folded into `/audit` below
+- [x] `npm run check` — green, with the coverage floors RAISED (94/87/95/95 →
+      95/88/95/96) rather than met: `useMergePanes.js` was 4.85% covered, so its
+      testable core moved to `mergePaneOps.js` and is now driven by fakes
+- [x] `/audit` — two agents. Between them and a read of my own, **nine** defects,
+      four of them data loss. Every one is fixed and guarded except the last: 1. an empty region read as a one-line one, so taking a side ate the stable
+      line after it — found by reading, e2e-guarded 2. the same region answered twice ate the line below, because Monaco grows
+      a decoration around inserted text differently from this convention.
+      The unit test passed the first fix; only real Monaco caught it 3. undo left the cached emptiness disagreeing with the text, so the next
+      answer went in ABOVE the restored lines. Emptiness is no longer cached 4. typing into an emptied region never unlocked Save, and that region has
+      no chevron to click instead 5. F7/Shift+F7 never reached the view — Monaco owns both keys 6. no chevrons, bands or word tints at all in a CRLF repository 7. the index stage reads had no size cap and no binary sniff 8. `mergeInputsFor` had no `.catch()`, leaving `git mergetool` blocked 9. **still open, pre-existing**: a file whose ordinary text contains
+      marker-shaped lines (a doc about conflicts) has them parsed as real
+      conflicts, and answering them drops one side. Inherent to every
+      marker-based merge tool, and true on `main` today — filed, not fixed
+      here
+- [x] read on all 20 themes off real frames — `make theme-sweep`, 1260
+      measurements, green. Getting there fixed two pre-existing breaks in the
+      sweep itself: `status-band` had been timing out since `deps-diff` was added
+      ahead of it and cleared the comparison, and a launcher hidden by something
+      else taking focus HANGS the screenshot rather than failing it
+- [x] Windows still unverified — no host. Said, not implied. E2E ran on macOS
+      only; `e2e/quick-look-window-recovery.spec.mjs` is darwin-gated and was not
+      exercised this round
+
+**Outcome:** shipped. The merge is a view rather than a resolver: three panes,
+the middle one a real editor, sides named by branch and read from the index.
+Two known limitations, both stated in the UI or here rather than hidden — a
+mixed-ending file is normalised on save (Monaco keeps one EOL per model, and the
+band says so before anything is written), and item 9 above.
diff --git a/src/main/cliRoute.js b/src/main/cliRoute.js
index 38adf941..6d376caa 100644
--- a/src/main/cliRoute.js
+++ b/src/main/cliRoute.js
@@ -12,7 +12,9 @@ import { ensureMainWindow } from './quickLook'
 import { allowCliPath } from './files'
 import { fileAtRevision, isRevisionSide, REVISION_ERROR_KEYS } from './gitCliFiles'
 import { beginMerge, cancelMerge, writeMerged } from './mergeSession'
+import { mergeInputsFor } from './mergeInputs'
 import { readFileSync } from 'node:fs'
+import { basename } from 'node:path'
 import { hasConflictMarkers, isBinaryBuffer } from './mergeGuards'
 import { t } from './i18n'
 
@@ -109,11 +111,15 @@ function routeMerge(command) {
     return
   }
   beginMerge(command)
-  // Both sides are files main just vouched for; without this file:read refuses
-  // them and the two panes open empty.
-  allowCliPath(command.local)
-  allowCliPath(command.remote)
-  deliver({ name: 'merge', local: command.local, remote: command.remote, content })
+  // A NAME for the band, never a path: the renderer must not be able to learn,
+  // or name, the file main is going to write.
+  const base = { name: 'merge', fileName: basename(command.merged), content }
+  mergeInputsFor(command.merged)
+    .then((inputs) => deliver({ ...base, ...inputs }))
+    // Without this the renderer is never told, no sentinel is written, and the
+    // terminal that ran `git mergetool` waits forever on a decision nobody was
+    // asked for. The markers alone are enough to resolve it.
+    .catch(() => deliver(base))
 }
 
 // The verbs that need something done before the renderer hears about them.
diff --git a/src/main/dataFiles.js b/src/main/dataFiles.js
index 66892eee..cc5590c6 100644
--- a/src/main/dataFiles.js
+++ b/src/main/dataFiles.js
@@ -17,6 +17,7 @@ export const STORE_NAMES = [
   'email', // mail hand-off defaults — features/email/emailStore.js
   'onboarding', // tour progress — features/onboarding/onboardingStore.js
   'sidebar', // sidebar width — composables/useSidebarResize.js
+  'mergePanes', // merge pane split — features/merge/useMergePaneSizes.js
   'tools' // pinned tools — features/tools/toolsStore.js
 ]
 
diff --git a/src/main/gitRepo.js b/src/main/gitRepo.js
index 0e484fdc..9b2b3308 100644
--- a/src/main/gitRepo.js
+++ b/src/main/gitRepo.js
@@ -64,6 +64,45 @@ export function resolveRevisionArgs(rev) {
   ]
 }
 
+// A conflicted file is in the index three times. The stage is one of three
+// integers the app chooses — never a string from anywhere — so it needs no
+// pattern, only a range.
+const STAGES = [1, 2, 3]
+
+/** Every file still conflicted, in git's own order. */
+export function unmergedArgs() {
+  return [...HARDENING, 'diff', '--name-only', '--diff-filter=U', '--no-color']
+}
+
+/**
+ * Read one stage of a conflicted file out of the index: 1 ancestor, 2 ours,
+ * 3 theirs. Cleaner than scraping markers, and the only way to the ancestor.
+ */
+export function readStageArgs(stage, path) {
+  if (!STAGES.includes(stage)) throw new Error('unsafe-stage')
+  const safe = repoPath(path)
+  if (!safe) throw new Error('unsafe-path')
+  return [...HARDENING, 'show', '--end-of-options', `:${stage}:${safe}`]
+}
+
+// The two refs a merge in progress puts on disk. Literals the app chooses, so
+// the allowlist is the whole check.
+const MERGE_REFS = ['HEAD', 'MERGE_HEAD']
+
+/** What branch a ref names, so a pane can say `Ours · main` rather than `Ours`. */
+export function revisionNameArgs(ref) {
+  if (!MERGE_REFS.includes(ref)) throw new Error('unsafe-ref')
+  return [
+    ...HARDENING,
+    'name-rev',
+    '--name-only',
+    '--refs=refs/heads/*',
+    '--no-undefined',
+    '--end-of-options',
+    ref
+  ]
+}
+
 /** Read one file as it stood at a revision. */
 export function readBlobArgs(rev, path) {
   const safe = repoPath(path)
diff --git a/src/main/mergeInputs.js b/src/main/mergeInputs.js
new file mode 100644
index 00000000..25132eec
--- /dev/null
+++ b/src/main/mergeInputs.js
@@ -0,0 +1,85 @@
+// What the view needs about a conflict, read out of git rather than out of the
+// working copy's markers: the three stages the index already holds, the names
+// the two sides go by, and where this file sits in the walk.
+import { realpathSync } from 'node:fs'
+import { dirname, relative } from 'node:path'
+import { readStageArgs, repoRootArgs, revisionNameArgs, runGitIn, unmergedArgs } from './gitRepo'
+import { walkPosition } from './mergeSession'
+import { isBinaryBuffer } from './mergeGuards'
+
+// The same ceiling an opened file gets. A stage read has no other bound —
+// execFile's maxBuffer is 64 MB — and three of them are decoded, sent over IPC
+// and set as Monaco models, with the launcher already waiting on a decision.
+const MAX_STAGE_BYTES = 32 * 1024 * 1024
+
+// A stage that is too big, or not text, sends the view back to reconstructing
+// the sides from the markers — which is the designed fallback, not a failure.
+const usableStage = (res) =>
+  res.ok &&
+  Buffer.byteLength(res.stdout, 'utf8') <= MAX_STAGE_BYTES &&
+  !isBinaryBuffer(Buffer.from(res.stdout, 'utf8'))
+
+// A branch name and nothing else: `name-rev` answers `main~2` for a commit that
+// is not a branch tip, which names no side and is worse than saying nothing.
+const BRANCH = /^[A-Za-z0-9][A-Za-z0-9._/-]*$/
+
+const real = (path) => {
+  try {
+    return realpathSync(path)
+  } catch {
+    return path
+  }
+}
+
+async function branchName(ref, dir) {
+  const res = await runGitIn(revisionNameArgs(ref), dir)
+  const name = res.ok ? res.stdout.trim() : ''
+  return BRANCH.test(name) ? name : ''
+}
+
+/**
+ * `Ours · main` beside `Theirs · feature`, when git can say. A rebase or a
+ * cherry-pick writes no MERGE_HEAD, so both come back empty and the panes keep
+ * their plain labels rather than claiming a branch that is not the one.
+ */
+async function revisionNames(dir) {
+  const [oursName, theirsName] = await Promise.all([
+    branchName('HEAD', dir),
+    branchName('MERGE_HEAD', dir)
+  ])
+  return { oursName, theirsName }
+}
+
+/**
+ * The three inputs git already holds. Absent — a mergetool invoked by hand, a
+ * file with no index entry — the view falls back to reconstructing the sides
+ * from the markers themselves.
+ * @returns {Promise<object>} merged into the renderer's payload
+ */
+export async function mergeInputsFor(merged) {
+  const root = await runGitIn(repoRootArgs(), dirname(merged))
+  if (!root.ok || !root.stdout.trim()) return {}
+  const dir = root.stdout.trim()
+  // Through realpath first: on macOS a repo under /var is reported by git as
+  // /private/var, and relative() between the two forms yields a path full of
+  // `..` that the fence then rejects — the index read failed silently and the
+  // view fell back to reconstructing the sides from the markers.
+  const rel = relative(real(dir), real(merged))
+  try {
+    const [base, ours, theirs] = await Promise.all(
+      [1, 2, 3].map((stage) => runGitIn(readStageArgs(stage, rel), dir))
+    )
+    if (!usableStage(ours) || !usableStage(theirs)) return {}
+    const [unmerged, names] = await Promise.all([runGitIn(unmergedArgs(), dir), revisionNames(dir)])
+    const files = unmerged.ok ? unmerged.stdout.split('\n').filter(Boolean).length : 0
+    return {
+      ours: ours.stdout,
+      theirs: theirs.stdout,
+      base: usableStage(base) ? base.stdout : null,
+      ...names,
+      ...walkPosition(files, merged)
+    }
+  } catch {
+    return {}
+  }
+}
diff --git a/src/main/mergeSession.js b/src/main/mergeSession.js
index 48f69afb..d4a4ac79 100644
--- a/src/main/mergeSession.js
+++ b/src/main/mergeSession.js
@@ -5,6 +5,31 @@ import { writeFileSync } from 'node:fs'
 
 let pending = null
 
+// `git mergetool` walks the conflicted files one at a time, in separate
+// launches. Only main survives between them, so the walk is remembered here.
+//
+// Counting the files main has SEEN, rather than what git still calls
+// unmerged: a file the reader declined stays unmerged, and a tool invoked
+// directly never stages anything, so the remaining count is not a position.
+let walk = { total: 0, seen: new Set() }
+
+/**
+ * Where this file sits in the walk. A file arriving twice means a new walk over
+ * the same conflicts.
+ * @param {number} unmerged how many files git still calls conflicted
+ * @param {string} merged the file this launch is for
+ */
+export function walkPosition(unmerged, merged) {
+  if (!walk.total || walk.seen.has(merged)) walk = { total: unmerged || 1, seen: new Set() }
+  walk.seen.add(merged)
+  return { position: walk.seen.size, total: Math.max(walk.total, walk.seen.size) }
+}
+
+/** A fresh walk next time — used when a run ends. */
+export function walkReset() {
+  walk = { total: 0, seen: new Set() }
+}
+
 /**
  * The file the launcher watches. Comparing $MERGED's own size and timestamp was
  * not enough: a resolution that writes the same bytes back changes neither, and
diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue
index 5c653775..168e9463 100644
--- a/src/renderer/src/App.vue
+++ b/src/renderer/src/App.vue
@@ -11,11 +11,12 @@ import { useSnippetDiffSync } from './composables/useSnippetDiffSync'
 import { usePasteShortcut } from './composables/usePasteShortcut'
 import { useSessionPersistence } from './composables/useSessionPersistence'
 import { useTourCommands } from './composables/useTourCommands'
-import FileSlot from './components/FileSlot.vue'
+import FileSlotsRow from './components/FileSlotsRow.vue'
 import DiffViewer from './components/DiffViewer.vue'
 import SpreadsheetDiffViewer from './components/SpreadsheetDiffViewer.vue'
 import DiagramDiffViewer from './components/DiagramDiffViewer.vue'
 import DepsDiffViewer from './components/DepsDiffViewer.vue'
+import { MergeView, useMergeStore } from './features/merge'
 import StructureDiffViewer from './components/StructureDiffViewer.vue'
 import StreamedDiffViewer from './components/StreamedDiffViewer.vue'
 import SupportedFormats from './components/SupportedFormats.vue'
@@ -33,15 +34,15 @@ import SavedDiffs from './components/SavedDiffs.vue'
 import DiffTabBar from './components/DiffTabBar.vue'
 import { useTabsStore } from './stores/tabsStore'
 import FormatHintBanner from './components/FormatHintBanner.vue'
-import AppIcon from './components/AppIcon.vue'
 import DiskChangeNotice from './components/DiskChangeNotice.vue'
 import { useSnippetStore } from './stores/snippetStore'
 import { useDiagramWarmup } from './composables/useDiagramWarmup'
-import { MOD, isMac } from './keys'
+import { isMac } from './keys'
 import { useUiStore } from './stores/uiStore'
 import { hasStatusBand } from './utils/viewChrome'
 
 const store = useDiffStore()
+const merge = useMergeStore()
 const ui = useUiStore()
 const imageExport = useImageExportStore()
 const tabs = useTabsStore()
@@ -137,35 +138,14 @@ useSnippetDiffSync()
             v-if="settings.theme === 'matrix' && !store.ready && store.mode !== 'paste'"
             fill
           />
-          <div v-if="store.mode !== 'paste'" class="file-slots-row band band-row" data-tour="slots">
-            <div class="slot-half">
-              <FileSlot
-                side="left"
-                :file="store.left"
-                :awaiting="!store.left && !!store.right"
-                @pick="store.pick('left')"
-              />
-            </div>
-            <button
-              class="btn swap"
-              :data-tip="$t('app.swapTip', { mod: MOD })"
-              :aria-label="$t('app.swapSides')"
-              :disabled="!store.ready"
-              @click="store.swap"
-            >
-              <AppIcon name="swap" />
-            </button>
-            <div class="slot-half">
-              <FileSlot
-                side="right"
-                :file="store.right"
-                :awaiting="!store.right && !!store.left"
-                @pick="store.pick('right')"
-              />
-            </div>
-          </div>
-
-          <PasteInput v-if="store.mode === 'paste'" />
+          <!-- A merge produces a file rather than comparing two, so the slots
+               have nothing to name and every control above them is disabled. -->
+          <FileSlotsRow v-if="store.mode !== 'paste' && !merge.open" />
+
+          <!-- Keyed by file: a second launch arriving while this is open must
+               re-seed, not set new text under decorations anchored to the old. -->
+          <MergeView v-if="merge.open" :key="merge.fileName" />
+          <PasteInput v-else-if="store.mode === 'paste'" />
           <!-- Content router: pick the viewer by comparable kind. -->
           <template v-else-if="store.ready">
             <template v-if="store.comparableKind === 'text'">
@@ -197,7 +177,7 @@ useSnippetDiffSync()
 
           <DiskChangeNotice />
 
-          <ShortcutBar />
+          <ShortcutBar v-if="!merge.open" />
 
           <!-- The photo studio: covers this column while a snippet is shot. -->
           <SnippetShot v-if="imageExport.snippetShot" :shot="imageExport.snippetShot" />
diff --git a/src/renderer/src/components/AppDialogs.vue b/src/renderer/src/components/AppDialogs.vue
index d3142a21..fd0a5dbd 100644
--- a/src/renderer/src/components/AppDialogs.vue
+++ b/src/renderer/src/components/AppDialogs.vue
@@ -51,7 +51,6 @@ const paste = usePasteToCompareStore()
 const snippets = useSnippetStore()
 const vault = useVaultStore()
 const errors = useErrorStore()
-import { MergeDialog } from '../features/merge'
 </script>
 
 <template>
@@ -84,5 +83,4 @@ import { MergeDialog } from '../features/merge'
   <ErrorReportDialog v-if="errors.visible" />
   <PasteConfirmDialog v-if="paste.prompt" />
   <CliBlockedDialog v-if="store.cliBlocked" />
-  <MergeDialog />
 </template>
diff --git a/src/renderer/src/components/FileSlotsRow.vue b/src/renderer/src/components/FileSlotsRow.vue
new file mode 100644
index 00000000..a473c342
--- /dev/null
+++ b/src/renderer/src/components/FileSlotsRow.vue
@@ -0,0 +1,41 @@
+<script setup>
+// The two files being compared, and the swap between them.
+import { useDiffStore } from '../stores/diffStore'
+import FileSlot from './FileSlot.vue'
+import AppIcon from './AppIcon.vue'
+import { MOD } from '../keys'
+
+const store = useDiffStore()
+</script>
+
+<template>
+  <div class="file-slots-row band band-row" data-tour="slots">
+    <div class="slot-half">
+      <FileSlot
+        side="left"
+        :file="store.left"
+        :awaiting="!store.left && !!store.right"
+        @pick="store.pick('left')"
+      />
+    </div>
+    <button
+      class="btn swap"
+      :data-tip="$t('app.swapTip', { mod: MOD })"
+      :aria-label="$t('app.swapSides')"
+      :disabled="!store.ready"
+      @click="store.swap"
+    >
+      <AppIcon name="swap" />
+    </button>
+    <div class="slot-half">
+      <FileSlot
+        side="right"
+        :file="store.right"
+        :awaiting="!store.right && !!store.left"
+        @pick="store.pick('right')"
+      />
+    </div>
+  </div>
+</template>
+
+<style scoped src="./styles/FileSlotsRow.css"></style>
diff --git a/src/renderer/src/components/styles/App.css b/src/renderer/src/components/styles/App.css
index cc7827b8..46a92420 100644
--- a/src/renderer/src/components/styles/App.css
+++ b/src/renderer/src/components/styles/App.css
@@ -3,27 +3,6 @@
   flex-direction: column;
   height: 100vh;
 }
-/* Layout + skin only — display/align/height come from .band .band-row so this
-   row and the first sidebar header stay the same height (see ui.css). Vertical
-   padding is deliberately absent: the band height centers the slots. */
-.file-slots-row {
-  gap: 12px;
-  padding: 0 12px;
-  background: var(--bg-panel);
-  border-bottom: 1px solid var(--border);
-  /* A resting lift over the diff body, so the toolbar reads as chrome sitting
-     above the content rather than a flat strip sharing its plane. Above the
-     content in z-order so the drop lands on it. */
-  position: relative;
-  z-index: 1;
-  box-shadow: var(--shadow-1);
-}
-.slot-half {
-  flex: 1;
-  min-width: 0;
-  display: flex;
-  justify-content: center;
-}
 .body {
   flex: 1;
   min-height: 0;
diff --git a/src/renderer/src/components/styles/FileSlotsRow.css b/src/renderer/src/components/styles/FileSlotsRow.css
new file mode 100644
index 00000000..4f81b54f
--- /dev/null
+++ b/src/renderer/src/components/styles/FileSlotsRow.css
@@ -0,0 +1,21 @@
+/* Layout + skin only — display/align/height come from .band .band-row so this
+   row and the first sidebar header stay the same height (see ui.css). Vertical
+   padding is deliberately absent: the band height centers the slots. */
+.file-slots-row {
+  gap: 12px;
+  padding: 0 12px;
+  background: var(--bg-panel);
+  border-bottom: 1px solid var(--border);
+  /* A resting lift over the diff body, so the toolbar reads as chrome sitting
+     above the content rather than a flat strip sharing its plane. Above the
+     content in z-order so the drop lands on it. */
+  position: relative;
+  z-index: 1;
+  box-shadow: var(--shadow-1);
+}
+.slot-half {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  justify-content: center;
+}
diff --git a/src/renderer/src/features/merge/components/MergeActions.vue b/src/renderer/src/features/merge/components/MergeActions.vue
new file mode 100644
index 00000000..5049d4c6
--- /dev/null
+++ b/src/renderer/src/features/merge/components/MergeActions.vue
@@ -0,0 +1,69 @@
+<script setup>
+// Navigation and the four answers, for the region the reader is on.
+import AppIcon from '../../../components/AppIcon.vue'
+
+defineProps({
+  remaining: { type: Number, required: true },
+  disabled: { type: Boolean, default: false }
+})
+defineEmits(['step', 'take', 'all'])
+
+const TAKE = [
+  { value: 'ours', labelKey: 'merge.takeOurs' },
+  { value: 'theirs', labelKey: 'merge.takeTheirs' },
+  { value: 'both', labelKey: 'merge.takeBoth' },
+  { value: 'neither', labelKey: 'merge.takeNeither' }
+]
+</script>
+
+<template>
+  <span class="merge-actions">
+    <button
+      class="btn btn-sm"
+      :disabled="disabled"
+      :data-tip="$t('merge.prevTip')"
+      :aria-label="$t('merge.prevTip')"
+      data-testid="merge-prev"
+      @click="$emit('step', -1)"
+    >
+      <AppIcon name="chevron-up" />
+    </button>
+    <button
+      class="btn btn-sm"
+      :disabled="disabled"
+      :data-tip="$t('merge.nextTip')"
+      :aria-label="$t('merge.nextTip')"
+      data-testid="merge-next"
+      @click="$emit('step', 1)"
+    >
+      <AppIcon name="chevron-down" />
+    </button>
+    <span class="merge-count">{{ $t('merge.remaining', remaining) }}</span>
+    <button
+      v-for="t in TAKE"
+      :key="t.value"
+      class="btn btn-sm"
+      :disabled="disabled"
+      :data-testid="`merge-take-${t.value}`"
+      @click="$emit('take', t.value)"
+    >
+      {{ $t(t.labelKey) }}
+    </button>
+    <button
+      class="btn btn-sm"
+      :disabled="disabled"
+      data-testid="merge-all-ours"
+      @click="$emit('all', 'ours')"
+    >
+      {{ $t('merge.allOurs') }}
+    </button>
+    <button
+      class="btn btn-sm"
+      :disabled="disabled"
+      data-testid="merge-all-theirs"
+      @click="$emit('all', 'theirs')"
+    >
+      {{ $t('merge.allTheirs') }}
+    </button>
+  </span>
+</template>
diff --git a/src/renderer/src/features/merge/components/MergeDialog.vue b/src/renderer/src/features/merge/components/MergeDialog.vue
deleted file mode 100644
index 419c45f8..00000000
--- a/src/renderer/src/features/merge/components/MergeDialog.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<script setup>
-// Resolving what git could not: one choice per conflict, and the merged file
-// goes back only when every one of them has an answer.
-import { useMergeStore } from '../mergeStore'
-import BaseDialog from '../../../components/BaseDialog.vue'
-import AppIcon from '../../../components/AppIcon.vue'
-
-const merge = useMergeStore()
-
-const CHOICES = [
-  { value: 'ours', labelKey: 'merge.takeOurs' },
-  { value: 'theirs', labelKey: 'merge.takeTheirs' },
-  { value: 'both', labelKey: 'merge.takeBoth' },
-  { value: 'neither', labelKey: 'merge.takeNeither' }
-]
-
-const preview = (lines) => lines.join('\n')
-</script>
-
-<template>
-  <BaseDialog
-    v-if="merge.open"
-    :title="$t('merge.title')"
-    :width="{ width: 760, height: 620 }"
-    :escape-closes="false"
-    @close="merge.close()"
-  >
-    <p v-if="merge.error === 'unreadable'" class="dialog-note">
-      {{ $t('merge.unreadable') }}
-    </p>
-    <template v-else>
-      <p class="dialog-note">{{ $t('merge.remaining', merge.remaining) }}</p>
-
-      <div class="merge-bulk">
-        <button
-          v-for="c in CHOICES.slice(0, 2)"
-          :key="c.value"
-          class="btn btn-sm"
-          @click="merge.takeAll(c.value)"
-        >
-          {{ $t('merge.allOf', { side: $t(c.labelKey) }) }}
-        </button>
-      </div>
-
-      <div class="merge-list">
-        <section
-          v-for="(conflict, i) in merge.conflicts"
-          :key="i"
-          class="merge-conflict"
-          :class="{ done: merge.choices[i] }"
-        >
-          <header class="merge-head band">
-            <AppIcon :name="merge.choices[i] ? 'check' : 'minus'" />
-            <span>{{ $t('merge.conflictN', { n: i + 1 }) }}</span>
-            <span class="merge-choices">
-              <button
-                v-for="c in CHOICES"
-                :key="c.value"
-                class="btn btn-sm"
-                :class="{ active: merge.choices[i] === c.value }"
-                :data-testid="`merge-${c.value}-${i}`"
-                @click="merge.choose(i, c.value)"
-              >
-                {{ $t(c.labelKey) }}
-              </button>
-            </span>
-          </header>
-          <div class="merge-sides">
-            <pre class="merge-side ours">{{ preview(conflict.ours) }}</pre>
-            <pre class="merge-side theirs">{{ preview(conflict.theirs) }}</pre>
-          </div>
-        </section>
-      </div>
-    </template>
-
-    <template #actions>
-      <button class="btn btn-ghost" @click="merge.close()">{{ $t('common.cancel') }}</button>
-      <button
-        class="btn btn-primary"
-        data-testid="merge-save"
-        :disabled="!merge.canSave"
-        @click="merge.save()"
-      >
-        {{ $t('merge.save') }}
-      </button>
-    </template>
-  </BaseDialog>
-</template>
-
-<style scoped src="./styles/MergeDialog.css"></style>
diff --git a/src/renderer/src/features/merge/components/MergeView.vue b/src/renderer/src/features/merge/components/MergeView.vue
new file mode 100644
index 00000000..6ef962e4
--- /dev/null
+++ b/src/renderer/src/features/merge/components/MergeView.vue
@@ -0,0 +1,109 @@
+<script setup>
+// Resolving a merge the way a merge is read: the two commits either side, the
+// file you are producing in the middle, and that middle one is yours to type in.
+import { onMounted, ref } from 'vue'
+import { useMergeStore } from '../mergeStore'
+import { useMergePanes } from '../useMergePanes'
+import { useMergePaneSizes } from '../useMergePaneSizes'
+import { useMergeKeys } from '../useMergeKeys'
+import MergeActions from './MergeActions.vue'
+import AppIcon from '../../../components/AppIcon.vue'
+
+const merge = useMergeStore()
+const sizes = useMergePaneSizes()
+const oursEl = ref(null)
+const resultEl = ref(null)
+const theirsEl = ref(null)
+const { create, reveal, take, takeAll } = useMergePanes(
+  { ours: oursEl, result: resultEl, theirs: theirsEl },
+  merge
+)
+
+onMounted(create)
+
+const go = (delta) => {
+  merge.step(delta)
+  reveal(merge.at)
+}
+const answer = (choice) => {
+  take(merge.at, choice)
+  reveal(merge.at)
+}
+useMergeKeys(go)
+</script>
+
+<template>
+  <div class="merge-view">
+    <div class="merge-bar band">
+      <AppIcon name="git-merge" />
+      <span class="merge-file">{{ merge.fileName }}</span>
+      <!-- git walks the conflicted files one launch at a time, so without this
+           there is no telling the third of thirty from the last. -->
+      <span v-if="merge.showsWalk" class="merge-walk" data-testid="merge-walk">
+        {{ $t('merge.fileOf', { n: merge.position, total: merge.total }) }}
+      </span>
+      <MergeActions
+        :remaining="merge.remaining"
+        :disabled="!merge.regions.length"
+        @step="go"
+        @take="answer"
+        @all="takeAll"
+      />
+      <span class="merge-end">
+        <button class="btn btn-sm" @click="merge.close()">{{ $t('common.cancel') }}</button>
+        <button
+          class="btn btn-sm btn-primary"
+          data-testid="merge-save"
+          :disabled="!merge.canSave"
+          @click="merge.save()"
+        >
+          {{ $t('merge.save') }}
+        </button>
+      </span>
+    </div>
+
+    <p v-if="merge.error" class="merge-note">{{ $t('merge.unreadable') }}</p>
+    <p v-else-if="merge.mixedEndings" class="merge-note" data-testid="merge-endings">
+      {{ $t('merge.mixedEndings') }}
+    </p>
+
+    <div
+      class="merge-panes"
+      :class="{ resizing: sizes.resizing.value }"
+      :style="{ gridTemplateColumns: sizes.columns.value }"
+    >
+      <section class="merge-pane">
+        <header class="merge-head band">
+          {{ $t('merge.ours') }}
+          <!-- Which commit a side IS, when git can say. A rebase writes no
+               MERGE_HEAD, so both come back empty rather than naming the wrong
+               branch. -->
+          <span v-if="merge.oursName" class="merge-rev">
+            {{ $t('merge.fromBranch', { name: merge.oursName }) }}
+          </span>
+        </header>
+        <div ref="oursEl" class="merge-editor"></div>
+      </section>
+      <div class="merge-grip" @pointerdown="sizes.start('ours', $event)"></div>
+      <section class="merge-pane result">
+        <header class="merge-head band">
+          {{ $t('merge.result') }}
+          <span class="merge-hint">{{ $t('merge.editable') }}</span>
+        </header>
+        <div ref="resultEl" class="merge-editor"></div>
+      </section>
+      <div class="merge-grip" @pointerdown="sizes.start('result', $event)"></div>
+      <section class="merge-pane">
+        <header class="merge-head band">
+          {{ $t('merge.theirs') }}
+          <span v-if="merge.theirsName" class="merge-rev">
+            {{ $t('merge.fromBranch', { name: merge.theirsName }) }}
+          </span>
+        </header>
+        <div ref="theirsEl" class="merge-editor"></div>
+      </section>
+    </div>
+  </div>
+</template>
+
+<style scoped src="./styles/MergeView.css"></style>
diff --git a/src/renderer/src/features/merge/components/styles/MergeDialog.css b/src/renderer/src/features/merge/components/styles/MergeDialog.css
deleted file mode 100644
index 7b681d29..00000000
--- a/src/renderer/src/features/merge/components/styles/MergeDialog.css
+++ /dev/null
@@ -1,58 +0,0 @@
-/* One conflict per card, both sides side by side. Colour is the add/del roles
-   the diff panes already use, so it reads the same on every theme. */
-.merge-bulk {
-  display: flex;
-  gap: var(--space-2);
-  margin-bottom: var(--space-2);
-}
-.merge-list {
-  display: flex;
-  flex-direction: column;
-  gap: var(--space-3);
-}
-.merge-conflict {
-  border: 1px solid var(--border);
-  border-radius: var(--radius-lg);
-  background: var(--bg-elevated);
-  overflow: hidden;
-}
-/* Answered: a keyline down the edge rather than a wash, so the two coloured
-   sides inside keep their own meaning. */
-.merge-conflict.done {
-  box-shadow: inset 3px 0 0 var(--dg-add);
-}
-.merge-head {
-  gap: var(--space-2);
-  min-height: var(--control-h);
-  padding: 0 var(--space-3);
-  border-bottom: 1px solid var(--border);
-  /* --text-hint, not --text-dim: this carries words a reader reads, and dim's
-     3.0 floor is held against --bg-panel while this sits on --bg-elevated. */
-  color: var(--text-hint);
-  font-size: var(--font-sm);
-}
-.merge-choices {
-  display: flex;
-  gap: var(--space-1);
-  margin-left: auto;
-}
-.merge-sides {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-}
-.merge-side {
-  margin: 0;
-  padding: var(--space-2) var(--space-3);
-  font-family: var(--font-mono);
-  font-size: var(--font-sm);
-  white-space: pre-wrap;
-  overflow-x: auto;
-  color: var(--text);
-}
-.merge-side.ours {
-  background: color-mix(in srgb, var(--dg-del) 14%, transparent);
-  border-right: 1px solid var(--border);
-}
-.merge-side.theirs {
-  background: color-mix(in srgb, var(--dg-add) 14%, transparent);
-}
diff --git a/src/renderer/src/features/merge/components/styles/MergeView.css b/src/renderer/src/features/merge/components/styles/MergeView.css
new file mode 100644
index 00000000..bb02d2d1
--- /dev/null
+++ b/src/renderer/src/features/merge/components/styles/MergeView.css
@@ -0,0 +1,143 @@
+/* Three panes: the two commits either side, the file being produced in the
+   middle. The panes are Monaco surfaces, themed through applyMonacoTheme like
+   the diff view, so only the chrome is tokens here. */
+.merge-view {
+  flex: 1;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+}
+.merge-bar {
+  flex: none;
+  gap: var(--space-2);
+  padding: 0 var(--space-3);
+  min-height: var(--band-row);
+  background: var(--bg-panel);
+  border-bottom: 1px solid var(--border);
+}
+.merge-file {
+  font-family: var(--font-mono);
+  font-size: var(--font-sm);
+  color: var(--text);
+  white-space: nowrap;
+}
+/* Height from --chip-h, never from padding. */
+.merge-walk {
+  height: var(--chip-h);
+  padding: 0 var(--space-2);
+  display: inline-flex;
+  align-items: center;
+  border-radius: var(--radius-pill);
+  background: var(--btn-face);
+  color: var(--text);
+  font-size: var(--font-xs);
+  font-variant-numeric: tabular-nums;
+  white-space: nowrap;
+}
+.merge-actions {
+  display: flex;
+  align-items: center;
+  gap: var(--space-1);
+  margin-left: var(--space-3);
+}
+.merge-count {
+  padding: 0 var(--space-2);
+  color: var(--text-hint);
+  font-size: var(--font-sm);
+  white-space: nowrap;
+}
+.merge-end {
+  display: flex;
+  align-items: center;
+  gap: var(--space-2);
+  margin-left: auto;
+}
+.merge-note {
+  margin: 0;
+  padding: var(--space-2) var(--space-3);
+  background: var(--bg-panel);
+  border-bottom: 1px solid var(--border);
+  color: var(--text-hint);
+  font-size: var(--font-sm);
+}
+.merge-panes {
+  flex: 1;
+  min-height: 0;
+  display: grid;
+  /* Columns come from the drag, as fractions, so the split survives a window
+     resize. Five tracks: the grips are grid children and need one each, or the
+     last pane wraps onto a row of its own. */
+  grid-template-columns: 1fr 0 1fr 0 1fr;
+  position: relative;
+}
+/* While dragging, the editors must not eat the pointer. */
+.merge-panes.resizing .merge-editor {
+  pointer-events: none;
+}
+/* Sits ON the divider the panes already draw, so widening it does not move
+   anything: the hit area is wider than the line. */
+.merge-grip {
+  position: relative;
+  width: 0;
+  z-index: 2;
+  cursor: col-resize;
+}
+.merge-grip::after {
+  content: '';
+  position: absolute;
+  inset-block: 0;
+  inset-inline-start: -3px;
+  width: 7px;
+}
+.merge-grip:hover::after,
+.merge-panes.resizing .merge-grip::after {
+  background: var(--accent);
+  opacity: 0.35;
+}
+.merge-pane {
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  border-right: 1px solid var(--border);
+}
+.merge-pane:last-child {
+  border-right: 0;
+}
+/* The middle pane is the one being produced, so it is the raised surface and
+   the two sources sit either side of it. */
+.merge-pane.result .merge-head {
+  background: var(--bg-elevated);
+  color: var(--text);
+}
+.merge-head {
+  flex: none;
+  gap: var(--space-2);
+  min-height: var(--control-h);
+  padding: 0 var(--space-3);
+  background: var(--bg-panel);
+  border-bottom: 1px solid var(--border);
+  /* --text-hint, not --text-dim: these are words a reader reads, and dim's 3.0
+     floor is held against --bg-panel with no margin left over. */
+  color: var(--text-hint);
+  font-size: var(--font-sm);
+  font-weight: 600;
+}
+.merge-hint {
+  margin-left: auto;
+  font-weight: 400;
+}
+/* The branch a side comes from. Same ink as the label it follows — a quieter
+   one would fall through the reading floor on the light-ground themes. */
+.merge-rev {
+  margin-left: auto;
+  font-family: var(--font-mono);
+  font-weight: 400;
+  font-size: var(--font-xs);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.merge-editor {
+  flex: 1;
+  min-height: 0;
+}
diff --git a/src/renderer/src/features/merge/index.js b/src/renderer/src/features/merge/index.js
index 02bdd4ba..3cebed8c 100644
--- a/src/renderer/src/features/merge/index.js
+++ b/src/renderer/src/features/merge/index.js
@@ -1,2 +1,2 @@
 export { useMergeStore } from './mergeStore'
-export { default as MergeDialog } from './components/MergeDialog.vue'
+export { default as MergeView } from './components/MergeView.vue'
diff --git a/src/renderer/src/features/merge/mergeDecorations.js b/src/renderer/src/features/merge/mergeDecorations.js
new file mode 100644
index 00000000..9fe72f21
--- /dev/null
+++ b/src/renderer/src/features/merge/mergeDecorations.js
@@ -0,0 +1,86 @@
+// What the three panes draw: the region bands, the gutter chevrons, the marks
+// in the scrollbar that say where the rest of the conflicts are, and the
+// intra-line tint that narrows a whole band down to the words that differ.
+//
+// Pure builders — they take positions and colours and give back decorations.
+import * as monaco from 'monaco-editor'
+import { t } from '../../i18n'
+import { wordSpans } from './mergeWords'
+
+const FULL = monaco.editor.OverviewRulerLane.Full
+
+const ruler = (color) => ({ color, position: FULL })
+
+/**
+ * The scrollbar marks are painted on a canvas, so they take a colour and not a
+ * token. Resolved through a probe rather than read off the root: several --dg-*
+ * are `color-mix()`, which getPropertyValue hands back unevaluated.
+ */
+export function rulerColors() {
+  const probe = document.createElement('span')
+  probe.style.cssText = 'display:none'
+  document.body.appendChild(probe)
+  const of = (token, fallback) => {
+    probe.style.color = `var(${token})`
+    return getComputedStyle(probe).color || fallback
+  }
+  const colors = {
+    open: of('--dg-chg', '#c08a2e'),
+    done: of('--dg-add', '#2e8b57'),
+    ours: of('--dg-del', '#b3402f'),
+    theirs: of('--dg-add', '#2e8b57')
+  }
+  probe.remove()
+  return colors
+}
+
+/** A region in the result: still to decide, settled, or the one being worked on. */
+export const regionOptions = (region, isCurrent, colors) => ({
+  isWholeLine: true,
+  className: region.resolved
+    ? 'merge-region resolved'
+    : isCurrent
+      ? 'merge-region current'
+      : 'merge-region',
+  linesDecorationsClassName: region.resolved ? 'merge-region-done' : 'merge-region-edge',
+  overviewRuler: ruler(region.resolved ? colors.done : colors.open)
+})
+
+// Each side keeps its own colour rather than borrowing the middle's: three tints
+// of the same one would have to be told apart, and the middle's is about state.
+const bandOptions = (key, colors) => ({
+  isWholeLine: true,
+  className: `merge-side-${key}`,
+  linesDecorationsClassName: `merge-edge-${key}`,
+  // Pointing INWARD, so the direction of the chevron is the direction of the move.
+  glyphMarginClassName: `merge-take merge-take-${key}`,
+  glyphMarginHoverMessage: {
+    value: t(key === 'ours' ? 'merge.takeOursTip' : 'merge.takeTheirsTip')
+  },
+  overviewRuler: ruler(colors[key])
+})
+
+const wordOptions = (key) => ({ className: `merge-word merge-word-${key}`, stickiness: 1 })
+
+/**
+ * A side pane's decorations: the band beside each region it contains, and inside
+ * it the columns that differ from the other side.
+ * @param {Array<{line: number, count: number}|null>} anchors from mergeGutter
+ */
+export function sideDecorations(anchors, regions, key, colors) {
+  const out = []
+  anchors.forEach((anchor, i) => {
+    if (!anchor) return
+    out.push({
+      range: new monaco.Range(anchor.line, 1, anchor.line + anchor.count - 1, 1),
+      options: bandOptions(key, colors)
+    })
+    for (const { row, span } of wordSpans(regions[i])[key]) {
+      out.push({
+        range: new monaco.Range(anchor.line + row, span[0], anchor.line + row, span[1]),
+        options: wordOptions(key)
+      })
+    }
+  })
+  return out
+}
diff --git a/src/renderer/src/features/merge/mergeEdits.js b/src/renderer/src/features/merge/mergeEdits.js
new file mode 100644
index 00000000..e4d8a872
--- /dev/null
+++ b/src/renderer/src/features/merge/mergeEdits.js
@@ -0,0 +1,58 @@
+// Replacing a conflicted region in the result. The region's CURRENT position
+// comes from its Monaco decoration, which the editor keeps correct through the
+// reader's own edits — a remembered line number would be stale the moment
+// anything above it changed.
+import * as monaco from 'monaco-editor'
+import { linesFor } from './threeWay'
+
+/**
+ * The range covering whole lines, so a replacement never leaves half of one.
+ *
+ * @param {boolean} isEmpty the region holds NO lines — our side deleted them, so
+ *   it is a place to insert. A Monaco range cannot say this on its own: an empty
+ *   region and a one-line one are both `(n,1)-(n,1)`, and treating the first as
+ *   the second overwrote the stable line that happened to sit there.
+ */
+export function wholeLines(model, range, isEmpty = false) {
+  const last = model.getLineCount()
+  if (isEmpty) {
+    return new monaco.Range(range.startLineNumber, 1, range.startLineNumber, 1)
+  }
+  return range.endLineNumber >= last
+    ? new monaco.Range(range.startLineNumber, 1, last, model.getLineMaxColumn(last))
+    : new monaco.Range(range.startLineNumber, 1, range.endLineNumber + 1, 1)
+}
+
+/**
+ * Which regions no longer read as they did when they were last settled.
+ *
+ * Typing inside a conflict IS an answer — the case a resolver could not express
+ * — so it counts as one rather than leaving Save disabled until a button is
+ * pressed as well.
+ * @returns {number[]} indexes, in order
+ */
+export function touchedIndexes(regions, current, settled) {
+  const out = []
+  regions.forEach((region, i) => {
+    if (!region.resolved && current[i] !== settled[i]) out.push(i)
+  })
+  return out
+}
+
+/**
+ * Put one answer into the result.
+ * @returns {number|null} lines written — 0 leaves the region an insertion point
+ *   again — or null for an answer that is not one of the four
+ */
+export function applyChoice({ editor, model, range, region, choice, isEmpty }) {
+  const lines = linesFor(region, choice)
+  if (!lines || !range) return null
+  const target = wholeLines(model, range, isEmpty)
+  const atEnd = target.endLineNumber >= model.getLineCount() && target.endColumn > 1
+  // The model's OWN ending, so resolving a region in a CRLF file does not write
+  // LF into the middle of it.
+  const eol = model.getEOL()
+  const text = lines.length ? lines.join(eol) + (atEnd ? '' : eol) : ''
+  editor.executeEdits('merge', [{ range: target, text, forceMoveMarkers: false }])
+  return lines.length
+}
diff --git a/src/renderer/src/features/merge/mergeGutter.js b/src/renderer/src/features/merge/mergeGutter.js
new file mode 100644
index 00000000..010b1430
--- /dev/null
+++ b/src/renderer/src/features/merge/mergeGutter.js
@@ -0,0 +1,42 @@
+// Where a conflict region's lines sit in the SIDE panes, so the chevron that
+// moves that side into the result can be put beside them. Pure.
+//
+// The sides are whole files out of git's index, so a region's lines appear in
+// them verbatim — but not at the result's line numbers, because resolving a
+// region shifts everything below it.
+
+/**
+ * The 1-based line where `lines` next occur in `haystack`, at or after `from`.
+ * Searching forward from the previous region keeps two identical hunks in one
+ * file from both matching the first occurrence.
+ * @returns {number|null}
+ */
+export function findLines(haystack, lines, from = 1) {
+  if (!lines.length) return null
+  // The side text is the file as git stores it; a region's lines came through a
+  // parser that stripped the ending. Splitting on \n alone leaves a \r on every
+  // line of a CRLF file, and nothing ever matches.
+  const hay = haystack.split(/\r?\n/)
+  for (let i = Math.max(from - 1, 0); i <= hay.length - lines.length; i++) {
+    if (lines.every((line, k) => hay[i + k] === line)) return i + 1
+  }
+  return null
+}
+
+/**
+ * One entry per region: where it starts in that side's pane, and how many lines
+ * it covers. A region the side does not contain (it deleted those lines) gets
+ * null and no chevron.
+ * @returns {Array<{line: number, count: number}|null>}
+ */
+export function gutterAnchors(sideText, regions, key) {
+  const out = []
+  let cursor = 1
+  for (const region of regions) {
+    const lines = region[key]
+    const line = findLines(sideText, lines, cursor)
+    out.push(line ? { line, count: lines.length } : null)
+    if (line) cursor = line + lines.length
+  }
+  return out
+}
diff --git a/src/renderer/src/features/merge/mergePaneOps.js b/src/renderer/src/features/merge/mergePaneOps.js
new file mode 100644
index 00000000..d64cde80
--- /dev/null
+++ b/src/renderer/src/features/merge/mergePaneOps.js
@@ -0,0 +1,171 @@
+// Everything the three panes DO, over editors handed in rather than created
+// here: the decorations, the answers, the scroll sync. Split out of the
+// composable so the logic that decides what gets written to a merged file is
+// unit-tested instead of only reachable through a launched Electron.
+import * as monaco from 'monaco-editor'
+import { gutterAnchors } from './mergeGutter'
+import { applyChoice, touchedIndexes, wholeLines } from './mergeEdits'
+import { regionOptions, rulerColors, sideDecorations } from './mergeDecorations'
+import { initialRanges } from './threeWay'
+import { parseConflicts } from '../../utils/mergeConflicts'
+
+export const SIDES = ['ours', 'result', 'theirs']
+
+const rangeOf = (model, id) => (id ? model.getDecorationRange(id) : null)
+
+/**
+ * Where a region sits. A region that holds lines is anchored to the END of its
+ * last line; one our side emptied is anchored to a POINT — which is the whole
+ * difference, and why it is read back off the anchor rather than remembered
+ * beside it. Monaco moves the anchor through every edit, undo included, so
+ * nothing here can go stale against the text.
+ */
+const anchorFor = (line, count, model) =>
+  count
+    ? new monaco.Range(line, 1, line + count - 1, model.getLineMaxColumn(line + count - 1))
+    : new monaco.Range(line, 1, line, 1)
+
+const isPoint = (r) => r.startLineNumber === r.endLineNumber && r.startColumn === r.endColumn
+
+/** Our side deleted these lines, so this is a place to insert rather than replace. */
+const isInsertionPoint = (model, id) => {
+  const range = rangeOf(model, id)
+  return !!range && isPoint(range)
+}
+
+// An insertion point holds none of the file, so it reads as nothing — asking the
+// model for "its" line would hand back the stable line sitting there.
+const regionText = (model, id) => {
+  const range = rangeOf(model, id)
+  return range && !isPoint(range) ? model.getValueInRange(wholeLines(model, range)) : ''
+}
+
+export function repaint({ editors, merge, ids, anchors }) {
+  if (!editors.result) return
+  const model = editors.result.getModel()
+  const colors = rulerColors()
+  // Ranges come back OUT of the decorations: the editor has been keeping them
+  // right through every edit the reader made.
+  const ranges = (ids.result ?? []).map((id) => rangeOf(model, id))
+  // The fallback is only reachable if an anchor is destroyed under us, which
+  // setValue does. MergeView is keyed by file name so a second launch remounts
+  // and re-seeds instead of reaching here.
+  ids.result = editors.result.deltaDecorations(
+    ids.result ?? [],
+    merge.regions.map((region, i) => ({
+      range: ranges[i] ?? new monaco.Range(1, 1, 1, 1),
+      options: regionOptions(region, i === merge.at, colors)
+    }))
+  )
+  for (const key of ['ours', 'theirs']) {
+    anchors[key] = gutterAnchors(merge[key], merge.regions, key)
+    ids[key] = editors[key].deltaDecorations(
+      ids[key] ?? [],
+      sideDecorations(anchors[key], merge.regions, key, colors)
+    )
+  }
+}
+
+// The regions start where our side put them; from here the editor keeps the
+// ranges right and nothing re-parses the text.
+export function seedRegions({ editors, merge, ids, settled }) {
+  const ranges = initialRanges(parseConflicts(merge.rawContent))
+  const colors = rulerColors()
+  const model = editors.result.getModel()
+  ids.result = editors.result.deltaDecorations(
+    [],
+    ranges.map(({ line, count }, i) => ({
+      range: anchorFor(line, count, model),
+      options: regionOptions(merge.regions[i] ?? {}, i === 0, colors)
+    }))
+  )
+  remember({ editors, ids, settled })
+}
+
+// What each region reads as while it is settled, so a later edit to one is
+// something to compare against rather than something to guess at.
+export function remember({ editors, ids, settled }) {
+  const model = editors.result?.getModel()
+  if (!model) return
+  const now = (ids.result ?? []).map((id) => regionText(model, id))
+  settled.splice(0, settled.length, ...now)
+}
+
+// Hand-editing a conflict answers it. Without this a reader who typed the
+// resolution still had to press a button before Save would unlock.
+export function resolveTouched({ editors, merge, ids, settled }) {
+  const model = editors.result?.getModel()
+  if (!model) return
+  const current = (ids.result ?? []).map((id) => regionText(model, id))
+  const touched = touchedIndexes(merge.regions, current, settled)
+  for (const index of touched) merge.markResolved(index)
+  if (touched.length) remember({ editors, ids, settled })
+}
+
+/** One answer, written where the region currently sits. */
+export function writeChoice({ editors, merge, ids, index, choice }) {
+  const model = editors.result?.getModel()
+  const id = ids.result?.[index]
+  const range = id && model?.getDecorationRange(id)
+  if (!range) return
+  const written = applyChoice({
+    editor: editors.result,
+    model,
+    range,
+    region: merge.regions[index],
+    choice,
+    isEmpty: isInsertionPoint(model, id)
+  })
+  if (written === null) return
+  reanchor({ editors, merge, ids, index, start: range.startLineNumber, written })
+  merge.markResolved(index)
+}
+
+/**
+ * Put the region's decoration back over exactly the lines just written.
+ *
+ * Monaco grows a decoration around inserted text by its own rule, and the result
+ * does not mean what these ranges mean — an insert at a zero-length region came
+ * back as `(n,1)-(n+1,1)`, which this code reads as TWO lines. Left alone, the
+ * next answer to that region deleted the line after it.
+ */
+function reanchor({ editors, merge, ids, index, start, written }) {
+  ids.result[index] = editors.result.deltaDecorations(
+    [ids.result[index]],
+    [
+      {
+        range: anchorFor(start, written, editors.result.getModel()),
+        options: regionOptions(merge.regions[index], index === merge.at, rulerColors())
+      }
+    ]
+  )[0]
+}
+
+// A click in a side's glyph margin answers the region that sits there.
+export function takeFromGutter({ anchors, key, event, take }) {
+  if (event.target?.type !== monaco.editor.MouseTargetType.GUTTER_GLYPH_MARGIN) return
+  const line = event.target.position?.lineNumber
+  const index = anchors[key].findIndex((a) => a && line >= a.line && line <= a.line + a.count - 1)
+  if (index >= 0) take(index, key)
+}
+
+/** Bring a region into view and put the caret on it. */
+export function reveal({ editors, ids, index }) {
+  const model = editors.result?.getModel()
+  const range = ids.result?.[index] && model?.getDecorationRange(ids.result[index])
+  if (!range) return
+  editors.result.revealLineInCenter(range.startLineNumber)
+  editors.result.setPosition({ lineNumber: range.startLineNumber, column: 1 })
+  editors.result.focus()
+}
+
+// One pane scrolled; the others follow. The flag stops the echo.
+export function syncScroll(editors, from, sync) {
+  if (sync.busy || !editors[from]) return
+  sync.busy = true
+  const top = editors[from].getScrollTop()
+  for (const side of SIDES) {
+    if (side !== from) editors[side]?.setScrollTop(top)
+  }
+  sync.busy = false
+}
diff --git a/src/renderer/src/features/merge/mergeStore.js b/src/renderer/src/features/merge/mergeStore.js
index 89acc37b..99251519 100644
--- a/src/renderer/src/features/merge/mergeStore.js
+++ b/src/renderer/src/features/merge/mergeStore.js
@@ -1,57 +1,85 @@
 import { defineStore } from 'pinia'
-import {
-  composeMerge,
-  conflictCount,
-  parseConflicts,
-  unresolvedCount
-} from '../../utils/mergeConflicts'
+import { parseConflicts } from '../../utils/mergeConflicts'
+import { sidesFromConflicts } from './threeWay'
+
+// With no markers left in the result there is nothing for a parser to count, so
+// resolution is state rather than something re-derived from the text.
+
+// Monaco keeps ONE ending per model, so a file that mixes them comes back out of
+// the editor normalised — including on lines the reader never touched. It cannot
+// be prevented here, so it is said out loud before anything is written.
+const hasMixedEndings = (text) => /\r\n/.test(text) && /(^|[^\r])\n/.test(text)
+
+// Defaulted so a single-file merge needs no special case.
+const walkOf = (payload) => ({
+  fileName: payload.fileName ?? '',
+  position: payload.position ?? 1,
+  total: payload.total ?? 1,
+  oursName: payload.oursName ?? '',
+  theirsName: payload.theirsName ?? ''
+})
 
-/**
- * A `git mergetool` run, from the moment main hands over the conflicted text to
- * the moment the resolved file goes back. The renderer never learns the path it
- * is resolving — main has held that since the launch.
- */
 export const useMergeStore = defineStore('merge', {
   state: () => ({
     open: false,
-    parsed: null,
-    /** @type {Array<'ours'|'theirs'|'both'|'neither'|null>} */
-    choices: [],
+    fileName: '',
+    position: 1,
+    total: 1,
+    /** The branches the two sides come from, empty when git cannot name them. */
+    oursName: '',
+    theirsName: '',
+    /** The editable middle pane, marker-free from the moment it opens. */
+    result: '',
+    /** What git left, kept only to seed the regions' first positions. */
+    rawContent: '',
+    ours: '',
+    theirs: '',
+    base: null,
+    /** @type {Array<{ours: string[], theirs: string[], resolved: boolean}>} */
+    regions: [],
     error: '',
-    saved: false
+    mixedEndings: false,
+    saved: false,
+    at: 0
   }),
   getters: {
-    conflicts: (s) => (s.parsed?.segments ?? []).filter((seg) => seg.type === 'conflict'),
-    total: (s) => conflictCount(s.parsed),
-    remaining: (s) => unresolvedCount(s.parsed, s.choices),
-    resolvedText: (s) => composeMerge(s.parsed, s.choices),
-    // Nothing to decide is not the same as resolved: a file with no conflicts
-    // is one this tool has no business writing back.
-    canSave: (s) =>
-      !s.error && conflictCount(s.parsed) > 0 && unresolvedCount(s.parsed, s.choices) === 0
+    remaining: (s) => s.regions.filter((r) => !r.resolved).length,
+    canSave: (s) => !s.error && s.regions.every((r) => r.resolved),
+    // Worth showing only when there is a walk to be part of.
+    showsWalk: (s) => s.total > 1
   },
   actions: {
-    /** @param {string} content  the file as git left it, markers and all */
-    begin(content) {
-      this.parsed = parseConflicts(content)
-      this.choices = new Array(conflictCount(this.parsed)).fill(null)
-      this.error = this.parsed ? '' : 'unreadable'
+    /** @param {object} payload from main: the conflicted text and both sides */
+    begin(payload) {
+      const parsed = parseConflicts(payload.content)
+      this.error = parsed ? '' : 'unreadable'
+      this.regions = (parsed?.segments ?? [])
+        .filter((seg) => seg.type === 'conflict')
+        .map((seg) => ({ ours: seg.ours, theirs: seg.theirs, resolved: false }))
+      // Our side stands in each conflicted place so the file is valid from the
+      // start; the region is tinted unresolved until the reader confirms it.
+      this.result = parsed ? sidesFromConflicts(parsed).ours : payload.content
+      this.rawContent = payload.content
+      this.mixedEndings = hasMixedEndings(payload.content)
+      const fallback = sidesFromConflicts(parsed)
+      this.ours = payload.ours ?? fallback.ours
+      this.theirs = payload.theirs ?? fallback.theirs
+      this.base = payload.base ?? null
+      Object.assign(this, walkOf(payload))
       this.saved = false
+      this.at = 0
       this.open = true
     },
-    choose(index, choice) {
-      if (index < 0 || index >= this.choices.length) return
-      this.choices[index] = this.choices[index] === choice ? null : choice
+    markResolved(index) {
+      if (this.regions[index]) this.regions[index].resolved = true
     },
-    takeAll(choice) {
-      this.choices = this.choices.map(() => choice)
+    step(delta) {
+      const total = this.regions.length
+      if (total) this.at = (this.at + delta + total) % total
     },
     async save() {
-      const text = this.resolvedText
-      // composeMerge already refuses a half-resolved file; this is the guard
-      // that keeps a UI mistake from reaching the write.
-      if (text === null) return false
-      const res = await window.api.writeMerged(text)
+      if (!this.canSave) return false
+      const res = await window.api.writeMerged(this.result)
       if (!res?.ok) {
         this.error = 'write-failed'
         return false
diff --git a/src/renderer/src/features/merge/mergeWords.js b/src/renderer/src/features/merge/mergeWords.js
new file mode 100644
index 00000000..9395e529
--- /dev/null
+++ b/src/renderer/src/features/merge/mergeWords.js
@@ -0,0 +1,43 @@
+// What actually differs INSIDE a conflicted line. A region tinted whole tells
+// the reader two versions exist; this tells them the change is one digit.
+// Pure — columns only, no editor.
+
+/**
+ * Where two lines stop agreeing, as 1-based column pairs on each. The shared
+ * head and tail are peeled off, which is what leaves the words that changed.
+ * @returns {{ours: number[], theirs: number[]}|null} null when they agree
+ */
+export function lineSpans(a, b) {
+  if (a === b) return null
+  let head = 0
+  while (head < a.length && head < b.length && a[head] === b[head]) head++
+  let tail = 0
+  const room = (s) => s.length - head
+  while (tail < room(a) && tail < room(b) && a[a.length - 1 - tail] === b[b.length - 1 - tail]) {
+    tail++
+  }
+  return { ours: [head + 1, a.length - tail + 1], theirs: [head + 1, b.length - tail + 1] }
+}
+
+/**
+ * One entry per line of the region, for each side.
+ *
+ * Only when the two sides have the SAME number of lines: pairing line 3 against
+ * line 3 says nothing once a side has added or removed one, and hunk granularity
+ * is the stated limit — an intra-region line diff is a different feature.
+ * @returns {{ours: Array<{row: number, span: number[]}>, theirs: Array<...>}}
+ */
+export function wordSpans(region) {
+  const empty = { ours: [], theirs: [] }
+  const ours = region?.ours ?? []
+  const theirs = region?.theirs ?? []
+  if (!ours.length || ours.length !== theirs.length) return empty
+  return ours.reduce((out, line, row) => {
+    const spans = lineSpans(line, theirs[row])
+    if (spans) {
+      out.ours.push({ row, span: spans.ours })
+      out.theirs.push({ row, span: spans.theirs })
+    }
+    return out
+  }, empty)
+}
diff --git a/src/renderer/src/features/merge/threeWay.js b/src/renderer/src/features/merge/threeWay.js
new file mode 100644
index 00000000..794ba405
--- /dev/null
+++ b/src/renderer/src/features/merge/threeWay.js
@@ -0,0 +1,53 @@
+// The two sides, reconstructed from a file's own conflict markers. Only used
+// when git's index cannot supply them — a mergetool invoked by hand, or a file
+// with no index entry. Pure.
+
+/**
+ * Each side as it would read with every conflict resolved that way, so the
+ * panes show whole files rather than fragments.
+ * @param {object} parsed  from utils/mergeConflicts
+ * @returns {{ours: string, theirs: string}}
+ */
+export function sidesFromConflicts(parsed) {
+  if (!parsed) return { ours: '', theirs: '' }
+  // RAW lines, each carrying the ending it arrived with, concatenated rather
+  // than re-joined: joining trimmed lines drops the file's trailing newline and
+  // rewrites CRLF as LF, and a merge tool that reformats the file it resolves
+  // is one nobody trusts twice.
+  const pick = (key) =>
+    parsed.segments.flatMap((seg) => (seg.type === 'stable' ? seg.raw : seg[key])).join('')
+  return { ours: pick('oursRaw'), theirs: pick('theirsRaw') }
+}
+
+/**
+ * Where each conflict sits in the result the view OPENS with — stable text plus
+ * our side in every conflicted place. 1-based, and `count: 0` where our side
+ * deleted the lines, which still needs somewhere to put the marker.
+ * @returns {Array<{line: number, count: number}>}
+ */
+export function initialRanges(parsed) {
+  const out = []
+  let line = 1
+  for (const seg of parsed?.segments ?? []) {
+    if (seg.type === 'stable') {
+      line += seg.lines.length
+      continue
+    }
+    out.push({ line, count: seg.ours.length })
+    line += seg.ours.length
+  }
+  return out
+}
+
+/**
+ * What each answer puts in a region's place. Both keeps the file's own order —
+ * ours came first in it.
+ * @returns {string[]|null} null for an answer that is not one of the four
+ */
+export const linesFor = (region, choice) =>
+  ({
+    ours: region.ours,
+    theirs: region.theirs,
+    both: [...region.ours, ...region.theirs],
+    neither: []
+  })[choice] ?? null
diff --git a/src/renderer/src/features/merge/useMergeKeys.js b/src/renderer/src/features/merge/useMergeKeys.js
new file mode 100644
index 00000000..39cd9342
--- /dev/null
+++ b/src/renderer/src/features/merge/useMergeKeys.js
@@ -0,0 +1,36 @@
+import { onBeforeUnmount, onMounted } from 'vue'
+
+/**
+ * Which way F7 moves. The key every JetBrains user already has in their fingers
+ * for next/previous difference, and the reason a merge can be worked through
+ * without leaving the keyboard.
+ * @returns {number} 0 when the event is not that key
+ */
+export function stepFromKey(event) {
+  if (event.key !== 'F7' || event.ctrlKey || event.metaKey || event.altKey) return 0
+  return event.shiftKey ? -1 : 1
+}
+
+/**
+ * @param {(delta: number) => void} step
+ * @returns {() => void} unbind
+ */
+export function bindMergeKeys(step) {
+  const onKey = (event) => {
+    const delta = stepFromKey(event)
+    // The view is full-area, so a dialog over it owns the keyboard: stepping the
+    // merge underneath would also pull focus back out of the dialog.
+    if (!delta || event.target?.closest?.('[role="dialog"]')) return
+    event.preventDefault()
+    step(delta)
+  }
+  window.addEventListener('keydown', onKey)
+  return () => window.removeEventListener('keydown', onKey)
+}
+
+/** @param {(delta: number) => void} step */
+export function useMergeKeys(step) {
+  let unbind = null
+  onMounted(() => (unbind = bindMergeKeys(step)))
+  onBeforeUnmount(() => unbind?.())
+}
diff --git a/src/renderer/src/features/merge/useMergePaneSizes.js b/src/renderer/src/features/merge/useMergePaneSizes.js
new file mode 100644
index 00000000..3790196b
--- /dev/null
+++ b/src/renderer/src/features/merge/useMergePaneSizes.js
@@ -0,0 +1,91 @@
+import { computed, onBeforeUnmount, ref } from 'vue'
+import { loadPersisted, savePersisted } from '../../persist'
+
+// Its own persisted key, like the sidebar's: settingsStore is at its size cap.
+const KEY = 'mergePanes'
+// A pane narrower than this cannot show a line of code, so the drag stops there
+// rather than letting one collapse to nothing.
+const MIN = 0.12
+
+/** A divider moves inside the pair it separates; the third pane keeps its width. */
+export const splitAt = (pair, n) => Math.min(Math.max(n, MIN), pair - MIN)
+
+/** Three readable panes out of any two fractions, however they were saved. */
+export function normalise(ours, result) {
+  const a = Math.min(Math.max(ours, MIN), 1 - 2 * MIN)
+  return { ours: a, result: splitAt(1 - a, result) }
+}
+
+const track = (n) => `${n.toFixed(4)}fr`
+
+/**
+ * The row template. Five tracks, not three: the two grips are grid children as
+ * much as the panes are, and a grip left to take a column track of its own
+ * wraps the last pane onto a row below.
+ */
+export const paneColumns = (ours, result) =>
+  `${track(ours)} 0 ${track(result)} 0 ${track(1 - ours - result)}`
+
+function read(raw) {
+  try {
+    const { ours, result } = JSON.parse(raw) ?? {}
+    return Number.isFinite(ours) && Number.isFinite(result) ? normalise(ours, result) : null
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Drag-to-widen for the three panes, as FRACTIONS of the row so the split
+ * survives a window resize. Listeners go on the WINDOW, the way
+ * useSidebarResize does: the grip is a few pixels wide and the drag moves the
+ * edge it sits on, so a listener bound to the grip loses the pointer.
+ */
+export function useMergePaneSizes() {
+  const saved = read(loadPersisted(KEY))
+  const ours = ref(saved?.ours ?? 1 / 3)
+  const result = ref(saved?.result ?? 1 / 3)
+  const resizing = ref(false)
+  const columns = computed(() => paneColumns(ours.value, result.value))
+  let which = 'ours'
+  let startX = 0
+  let from = 0
+  let pair = 1
+  let rowWidth = 1
+
+  function drag(e) {
+    const moved = splitAt(pair, from + (e.clientX - startX) / rowWidth)
+    if (which === 'ours') {
+      ours.value = moved
+      result.value = pair - moved
+    } else {
+      result.value = moved
+    }
+  }
+
+  // Written on release, not per frame: a drag is one decision and persisting
+  // goes through an IPC round trip.
+  function end() {
+    if (!resizing.value) return
+    resizing.value = false
+    window.removeEventListener('pointermove', drag)
+    window.removeEventListener('pointerup', end)
+    savePersisted(KEY, JSON.stringify({ ours: ours.value, result: result.value }))
+  }
+
+  function start(edge, e) {
+    e.preventDefault?.()
+    which = edge
+    resizing.value = true
+    startX = e.clientX
+    from = edge === 'ours' ? ours.value : result.value
+    pair = edge === 'ours' ? ours.value + result.value : 1 - ours.value
+    rowWidth = e.currentTarget?.parentElement?.clientWidth || window.innerWidth
+    window.addEventListener('pointermove', drag)
+    window.addEventListener('pointerup', end)
+  }
+
+  onBeforeUnmount(end)
+
+  return { columns, resizing, start }
+}
diff --git a/src/renderer/src/features/merge/useMergePanes.js b/src/renderer/src/features/merge/useMergePanes.js
new file mode 100644
index 00000000..602e5479
--- /dev/null
+++ b/src/renderer/src/features/merge/useMergePanes.js
@@ -0,0 +1,136 @@
+import { onBeforeUnmount, watch } from 'vue'
+import * as monaco from 'monaco-editor'
+import { applyMonacoTheme, MONACO_THEME } from '../../composables/useMonacoTheme'
+import { useSettingsStore } from '../../stores/settingsStore'
+import {
+  remember,
+  repaint,
+  resolveTouched,
+  reveal as revealRegion,
+  seedRegions,
+  SIDES,
+  syncScroll,
+  takeFromGutter,
+  writeChoice
+} from './mergePaneOps'
+
+const BASE_OPTIONS = {
+  theme: MONACO_THEME,
+  automaticLayout: true,
+  minimap: { enabled: false },
+  overviewRulerBorder: false,
+  hideCursorInOverviewRuler: true,
+  scrollbar: { useShadows: false },
+  scrollBeyondLastLine: false,
+  contextmenu: false,
+  fontSize: 12.5,
+  glyphMargin: true,
+  // No completions while resolving a merge: the suggest widget offers words from
+  // the file itself, which is noise here — and it swallows the Enter that was
+  // meant to be a newline.
+  quickSuggestions: false,
+  suggestOnTriggerCharacters: false,
+  wordBasedSuggestions: 'off',
+  acceptSuggestionOnEnter: 'off',
+  parameterHints: { enabled: false }
+}
+
+const makeEditor = (el, value, readOnly) =>
+  monaco.editor.create(el, { ...BASE_OPTIONS, value, readOnly })
+
+function build({ containers, merge, editors, sync, onGlyph, onEdit }) {
+  for (const side of SIDES) {
+    const isResult = side === 'result'
+    editors[side] = makeEditor(
+      containers[side].value,
+      isResult ? merge.result : merge[side],
+      !isResult
+    )
+    editors[side].onDidScrollChange(() => syncScroll(editors, side, sync))
+    if (!isResult) editors[side].onMouseDown((e) => onGlyph(side, e))
+  }
+  // The reader typing IS the answer where neither side got it right.
+  editors.result.onDidChangeModelContent(() => {
+    const text = editors.result.getValue()
+    if (text !== merge.result) merge.result = text
+    onEdit()
+  })
+}
+
+/**
+ * The three editors, their scroll sync and the conflict decorations.
+ *
+ * Panes align by SCROLL POSITION, not line for line: the sides are whole files
+ * whose lines stop corresponding to the result's the moment a region is
+ * resolved, and pretending otherwise would drift as the reader works.
+ *
+ * @param {{ours: object, result: object, theirs: object}} containers template refs
+ * @param {object} merge the merge store
+ */
+export function useMergePanes(containers, merge) {
+  const settings = useSettingsStore()
+  const editors = { ours: null, result: null, theirs: null }
+  const sync = { busy: false }
+  const anchors = { ours: [], theirs: [] }
+  const settled = []
+  let ids = {}
+
+  function create() {
+    if (editors.result || !containers.result.value) return
+    applyMonacoTheme(settings.theme)
+    build({ containers, merge, editors, sync, onGlyph, onEdit })
+    seedRegions({ editors, merge, ids, settled })
+    paint()
+  }
+
+  const paint = () => repaint({ editors, merge, ids, anchors })
+  const onGlyph = (key, event) => takeFromGutter({ anchors, key, event, take })
+  const onEdit = () => resolveTouched({ editors, merge, ids, settled })
+  const reveal = (index) => revealRegion({ editors, ids, index })
+
+  const take = (index, choice) => {
+    writeChoice({ editors, merge, ids, index, choice })
+    remember({ editors, ids, settled })
+    paint()
+  }
+
+  const takeAll = (choice) => merge.regions.forEach((_, i) => take(i, choice))
+
+  function destroy() {
+    for (const side of SIDES) {
+      editors[side]?.dispose()
+      editors[side] = null
+    }
+    ids = {}
+  }
+
+  bind({ containers, merge, settings, editors, paint, create, destroy })
+  onBeforeUnmount(destroy)
+
+  return { create, reveal, take, takeAll }
+}
+
+// The watchers, out of the factory so it stays inside the size cap.
+function bind({ containers, merge, settings, editors, paint, create, destroy }) {
+  watch(
+    () => merge.result,
+    (text) => {
+      if (editors.result && editors.result.getValue() !== text) editors.result.setValue(text)
+      paint()
+    }
+  )
+  watch([() => merge.ours, () => merge.theirs], () => {
+    editors.ours?.setValue(merge.ours)
+    editors.theirs?.setValue(merge.theirs)
+  })
+  watch(() => merge.at, paint)
+  watch(
+    () => settings.theme,
+    (theme) => {
+      applyMonacoTheme(theme)
+      // The scrollbar marks are baked colours, so they do not re-tint themselves.
+      paint()
+    }
+  )
+  watch(containers.result, (el) => (el ? create() : destroy()))
+}
diff --git a/src/renderer/src/icons.js b/src/renderer/src/icons.js
index 896b168a..5305432c 100644
--- a/src/renderer/src/icons.js
+++ b/src/renderer/src/icons.js
@@ -74,6 +74,11 @@ export const ICONS = {
   'chevron-right': [{ t: 'path', d: 'm9 6 6 6-6 6' }],
   'chevron-left': [{ t: 'path', d: 'm15 6-6 6 6 6' }],
   'chevron-up': [{ t: 'path', d: 'm6 15 6-6 6 6' }],
+  'git-merge': [
+    { t: 'circle', cx: '18', cy: '18', r: '3' },
+    { t: 'circle', cx: '6', cy: '6', r: '3' },
+    { t: 'path', d: 'M6 21V9a9 9 0 0 0 9 9' }
+  ],
   'chevron-down': [{ t: 'path', d: 'm6 9 6 6 6-6' }],
   'arrow-up': [
     { t: 'path', d: 'M12 19V5' },
diff --git a/src/renderer/src/monaco-setup.js b/src/renderer/src/monaco-setup.js
index 6269e4de..9d8766ee 100644
--- a/src/renderer/src/monaco-setup.js
+++ b/src/renderer/src/monaco-setup.js
@@ -19,9 +19,14 @@ registerJiraLanguage(monaco)
 // never uses it and it exposes internal editor commands we don't want reachable
 // in the packaged build. Unbinding globally is simpler and safer than doing it
 // per editor. (contextmenu is also turned off where editors are created.)
+// F7 is the merge view's next/previous conflict. Monaco binds the same pair to
+// wordHighlight.next/prev and stops propagation when it wins, so the window
+// listener never sees them once the caret is in the result pane.
 monaco.editor.addKeybindingRules?.([
   { keybinding: monaco.KeyCode.F1, command: null },
-  { keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyMod.Shift | monaco.KeyCode.KeyP, command: null }
+  { keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyMod.Shift | monaco.KeyCode.KeyP, command: null },
+  { keybinding: monaco.KeyCode.F7, command: null },
+  { keybinding: monaco.KeyMod.Shift | monaco.KeyCode.F7, command: null }
 ])
 
 self.MonacoEnvironment = {
diff --git a/src/renderer/src/styles/ui.css b/src/renderer/src/styles/ui.css
index 342f7260..2f95f804 100644
--- a/src/renderer/src/styles/ui.css
+++ b/src/renderer/src/styles/ui.css
@@ -1065,3 +1065,83 @@ button.tag-chip:hover .usb-tct {
   pointer-events: none;
   animation: new-wash 4s ease-in;
 }
+
+/* --- Merge regions ------------------------------------------------------
+   Painted INTO Monaco, so these are global: a scoped stylesheet cannot reach
+   the editor's own DOM.
+
+   Each pane carries its OWN role, so three tints of one colour never have to be
+   told apart. The sides say which side they are; the middle says whether the
+   place still needs an answer. Every colour is a --dg-* role, which
+   check-theme-depth holds to a contrast floor and a pairwise ΔE floor on all
+   twenty themes. */
+.merge-side-ours {
+  background: color-mix(in srgb, var(--dg-del) 13%, transparent);
+}
+.merge-edge-ours {
+  box-shadow: inset 3px 0 0 var(--dg-del);
+}
+.merge-side-theirs {
+  background: color-mix(in srgb, var(--dg-add) 13%, transparent);
+}
+.merge-edge-theirs {
+  box-shadow: inset 3px 0 0 var(--dg-add);
+}
+/* Inside a conflicted line, the characters that actually differ. A band tinted
+   whole says two versions exist; this says the change is one digit. Stronger
+   than the band it sits in, so the band stays context. */
+.merge-word {
+  border-radius: var(--radius-sm);
+}
+.merge-word-ours {
+  background: color-mix(in srgb, var(--dg-del) 34%, transparent);
+}
+.merge-word-theirs {
+  background: color-mix(in srgb, var(--dg-add) 34%, transparent);
+}
+/* Still to decide. The one being worked on is stronger, so next/previous has
+   somewhere visible to land. */
+.merge-region {
+  background: color-mix(in srgb, var(--dg-chg) 16%, transparent);
+}
+.merge-region.current {
+  background: color-mix(in srgb, var(--dg-chg) 30%, transparent);
+}
+.merge-region-edge {
+  box-shadow: inset 3px 0 0 var(--dg-chg);
+}
+/* Settled: it reads as done rather than still asking, and quieter than either
+   side so the eye goes to what is left. */
+.merge-region.resolved {
+  background: color-mix(in srgb, var(--dg-add) 10%, transparent);
+}
+.merge-region-done {
+  box-shadow: inset 3px 0 0 color-mix(in srgb, var(--dg-add) 60%, transparent);
+}
+
+/* The chevron in a side pane's glyph margin: click it and that side moves into
+   the result. An SVG mask, never a glyph character — a » or « tofus on any font
+   that lacks it, which is the rule icons.js exists to enforce. The mask takes
+   its colour from the side it belongs to. */
+.merge-take {
+  cursor: pointer;
+  -webkit-mask-repeat: no-repeat;
+  -webkit-mask-position: center;
+  -webkit-mask-size: 13px 13px;
+  mask-repeat: no-repeat;
+  mask-position: center;
+  mask-size: 13px 13px;
+}
+.merge-take:hover {
+  background-color: var(--accent);
+}
+.merge-take-ours {
+  background-color: var(--dg-del);
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%23000' stroke-width='2.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='m9 18 6-6-6-6'/%3E%3C/svg%3E");
+  mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%23000' stroke-width='2.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='m9 18 6-6-6-6'/%3E%3C/svg%3E");
+}
+.merge-take-theirs {
+  background-color: var(--dg-add);
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%23000' stroke-width='2.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='m15 18-6-6 6-6'/%3E%3C/svg%3E");
+  mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%23000' stroke-width='2.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='m15 18-6-6 6-6'/%3E%3C/svg%3E");
+}
diff --git a/src/renderer/src/utils/commands.js b/src/renderer/src/utils/commands.js
index 15792e21..ac22321d 100644
--- a/src/renderer/src/utils/commands.js
+++ b/src/renderer/src/utils/commands.js
@@ -142,12 +142,7 @@ export const CLI_COMMANDS = {
   // Typed in the terminal, so it is saved outright rather than opened in the
   // editor — the reader has already answered every question the editor asks.
   'new-snippet': ({ snippets }, command) => snippets.add(command.draft),
-  // git hands over the two conflicting versions AND the file it wants written;
-  // the sides open as an ordinary comparison, the conflicts open over them.
-  merge: async ({ diff, tabs, merge }, command) => {
-    await compareFromCli({ diff, tabs }, [command.local, command.remote], true)
-    merge.begin(command.content)
-  },
+  merge: ({ merge }, command) => merge.begin(command),
   compare: ({ diff, tabs }, command) =>
     compareFromCli({ diff, tabs }, command.files, command.transient === true),
   // The passphrase is asked for here, not in the terminal: the bundle is
diff --git a/src/renderer/src/utils/mergeConflicts.js b/src/renderer/src/utils/mergeConflicts.js
index 15d1c6f2..57ffa695 100644
--- a/src/renderer/src/utils/mergeConflicts.js
+++ b/src/renderer/src/utils/mergeConflicts.js
@@ -31,6 +31,10 @@ function conflictAt(raw, start) {
       return {
         conflict: {
           type: 'conflict',
+          // 1-based and inclusive of both markers — the range an edit replaces
+          // and a decoration paints.
+          startLine: start + 1,
+          endLine: i + 1,
           oursLabel: label(OURS.exec(textOf(raw[start]))),
           theirsLabel: label(closing),
           ours: sides.ours.map(textOf),
diff --git a/src/shared/i18n/en-XA.json b/src/shared/i18n/en-XA.json
index 93fefe82..d3779a8e 100644
--- a/src/shared/i18n/en-XA.json
+++ b/src/shared/i18n/en-XA.json
@@ -17,16 +17,26 @@
     }
   },
   "merge": {
-    "title": "[Řéşōłṽé ɱéřğé çōńƒłĩçţş ·øé·øé·øé]",
-    "remaining": "[Ńōţĥĩńğ łéƒţ ţō đéçĩđé | {n} çōńƒłĩçţ şţĩłł ţō đéçĩđé | {n} çōńƒłĩçţş şţĩłł ţō đéçĩđé ·øé·øé·øé·øé·øé·øé·øé·øé·ø]",
-    "conflictN": "[Çōńƒłĩçţ {n} ·øé·]",
+    "remaining": "[Ńōţĥĩńğ łéƒţ ţō řéşōłṽé | {n} çōńƒłĩçţ łéƒţ | {n} çōńƒłĩçţş łéƒţ ·øé·øé·øé·øé·øé·øé·]",
     "takeOurs": "[Ōūřş ·ø]",
     "takeTheirs": "[Ţĥéĩřş ·øé]",
     "takeBoth": "[Ɓōţĥ ·ø]",
     "takeNeither": "[Ńéĩţĥéř ·øé]",
-    "allOf": "[{side} éṽéřŷŵĥéřé ·øé·øé]",
     "save": "[Šàṽé ţĥé ɱéřğé ·øé·ø]",
-    "unreadable": "[Ţĥàţ ƒĩłé’ş çōńƒłĩçţ ɱàřķéřş đō ńōţ çłōşé, şō ţĥéřé ĩş ńōţĥĩńğ şàƒé ţō řéşōłṽé. Ƒĩńĩşĥ ĩţ ƀŷ ĥàńđ. ·øé·øé·øé·øé·øé·øé·øé·øé·øé·øé·]"
+    "unreadable": "[Ţĥàţ ƒĩłé’ş çōńƒłĩçţ ɱàřķéřş đō ńōţ çłōşé, şō ţĥéřé ĩş ńōţĥĩńğ şàƒé ţō řéşōłṽé. Ƒĩńĩşĥ ĩţ ƀŷ ĥàńđ. ·øé·øé·øé·øé·øé·øé·øé·øé·øé·øé·]",
+    "ours": "[Ōūřş ·ø]",
+    "theirs": "[Ţĥéĩřş ·øé]",
+    "result": "[Řéşūłţ ·øé]",
+    "editable": "[ŷōūřş ţō éđĩţ ·øé·ø]",
+    "allOurs": "[Àłł ōūřş ·øé]",
+    "allTheirs": "[Àłł ţĥéĩřş ·øé·]",
+    "fileOf": "[{n} ōƒ {total} ·øé·]",
+    "takeOursTip": "[Ţàķé ōūřş ·øé·]",
+    "takeTheirsTip": "[Ţàķé ţĥéĩřş ·øé·]",
+    "prevTip": "[Ƥřéṽĩōūş çōńƒłĩçţ · Šĥĩƒţ+Ƒ7 ·øé·øé·øé]",
+    "nextTip": "[Ńéẋţ çōńƒłĩçţ · Ƒ7 ·øé·øé]",
+    "fromBranch": "[ƒřōɱ {name} ·øé·]",
+    "mixedEndings": "[Ţĥĩş ƒĩłé ɱĩẋéş ÇŘŁƑ àńđ ŁƑ łĩńé éńđĩńğş. Šàṽĩńğ ŵřĩţéş éṽéřŷ łĩńé ŵĩţĥ ţĥé şàɱé ōńé. ·øé·øé·øé·øé·øé·øé·øé·øé·øé·]"
   },
   "menu": {
     "file": {
diff --git a/src/shared/i18n/en.json b/src/shared/i18n/en.json
index 085f9e7e..03a08a87 100644
--- a/src/shared/i18n/en.json
+++ b/src/shared/i18n/en.json
@@ -17,16 +17,26 @@
     }
   },
   "merge": {
-    "title": "Resolve merge conflicts",
-    "remaining": "Nothing left to decide | {n} conflict still to decide | {n} conflicts still to decide",
-    "conflictN": "Conflict {n}",
+    "remaining": "Nothing left to resolve | {n} conflict left | {n} conflicts left",
     "takeOurs": "Ours",
     "takeTheirs": "Theirs",
     "takeBoth": "Both",
     "takeNeither": "Neither",
-    "allOf": "{side} everywhere",
     "save": "Save the merge",
-    "unreadable": "That file’s conflict markers do not close, so there is nothing safe to resolve. Finish it by hand."
+    "unreadable": "That file’s conflict markers do not close, so there is nothing safe to resolve. Finish it by hand.",
+    "ours": "Ours",
+    "theirs": "Theirs",
+    "result": "Result",
+    "editable": "yours to edit",
+    "allOurs": "All ours",
+    "allTheirs": "All theirs",
+    "fileOf": "{n} of {total}",
+    "takeOursTip": "Take ours",
+    "takeTheirsTip": "Take theirs",
+    "prevTip": "Previous conflict · Shift+F7",
+    "nextTip": "Next conflict · F7",
+    "fromBranch": "from {name}",
+    "mixedEndings": "This file mixes CRLF and LF line endings. Saving writes every line with the same one."
   },
   "menu": {
     "file": {
diff --git a/tests/main/gitRepo.test.js b/tests/main/gitRepo.test.js
index 3ea4a7c9..a2de5a9e 100644
--- a/tests/main/gitRepo.test.js
+++ b/tests/main/gitRepo.test.js
@@ -2,6 +2,8 @@ import { describe, expect, it } from 'vitest'
 import {
   gitEnv,
   HARDENING,
+  readStageArgs,
+  revisionNameArgs,
   isSafeRevision,
   readBlobArgs,
   repoRootArgs,
@@ -125,3 +127,47 @@ describe('the environment a git invocation inherits', () => {
     expect(env.GIT_TERMINAL_PROMPT).toBe('0')
   })
 })
+
+// A conflicted file sits in the index three times: stage 1 is the ancestor,
+// 2 is ours, 3 is theirs. Reading those beats scraping markers out of the
+// working copy, and it is the only way to get the ancestor at all.
+describe('readStageArgs', () => {
+  it('reads a stage out of the index, hardened and fenced', () => {
+    expect(readStageArgs(2, 'src/app.js')).toEqual([
+      ...HARDENING,
+      'show',
+      '--end-of-options',
+      ':2:src/app.js'
+    ])
+  })
+
+  it('takes all three stages and nothing else', () => {
+    for (const stage of [1, 2, 3]) expect(readStageArgs(stage, 'a.js')).toContain(`:${stage}:a.js`)
+    for (const bad of [0, 4, -1, 1.5, '2', null, undefined]) {
+      expect(() => readStageArgs(bad, 'a.js'), String(bad)).toThrow()
+    }
+  })
+
+  it('fences the path exactly as reading a revision does', () => {
+    expect(() => readStageArgs(2, '../../etc/passwd')).toThrow()
+    expect(() => readStageArgs(2, '/etc/passwd')).toThrow()
+    expect(readStageArgs(2, 'src\\app.js')).toContain(':2:src/app.js')
+  })
+})
+
+describe('revisionNameArgs', () => {
+  it('names only the two refs a merge in progress puts on disk', () => {
+    expect(revisionNameArgs('MERGE_HEAD')).toEqual([
+      ...HARDENING,
+      'name-rev',
+      '--name-only',
+      '--refs=refs/heads/*',
+      '--no-undefined',
+      '--end-of-options',
+      'MERGE_HEAD'
+    ])
+    for (const bad of ['origin/main', '--upload-pack=x', 'HEAD^', '', null]) {
+      expect(() => revisionNameArgs(bad), String(bad)).toThrow()
+    }
+  })
+})
diff --git a/tests/renderer/features/merge/fakeEditor.js b/tests/renderer/features/merge/fakeEditor.js
new file mode 100644
index 00000000..23688a19
--- /dev/null
+++ b/tests/renderer/features/merge/fakeEditor.js
@@ -0,0 +1,51 @@
+import { vi } from 'vitest'
+
+/**
+ * An editor small enough to reason about and real enough to catch the bugs that
+ * matter: decoration ranges that move with the text, and edits that land on
+ * whole lines. Shared by the ops and composable tests so both drive one model.
+ */
+export function fakeEditor(text = '') {
+  let lines = text.length ? text.split('\n') : ['']
+  const ranges = new Map()
+  const handlers = {}
+  let next = 0
+  const model = {
+    getEOL: () => '\n',
+    getLineCount: () => lines.length,
+    getLineMaxColumn: (n) => (lines[n - 1] ?? '').length + 1,
+    getDecorationRange: (id) => ranges.get(id) ?? null,
+    getValueInRange: (r) => lines.slice(r.startLineNumber - 1, r.endLineNumber).join('\n')
+  }
+  const on = (name) => (cb) => (handlers[name] = cb)
+  return {
+    getModel: () => model,
+    getValue: () => lines.join('\n'),
+    setValue: (v) => (lines = v.split('\n')),
+    deltaDecorations: (old, added) => {
+      old.forEach((id) => ranges.delete(id))
+      return added.map((d) => {
+        const id = `d${next++}`
+        ranges.set(id, d.range)
+        return id
+      })
+    },
+    executeEdits: vi.fn((_, [edit]) => {
+      const before = lines.slice(0, edit.range.startLineNumber - 1)
+      const after = lines.slice(edit.range.endLineNumber - (edit.range.endColumn === 1 ? 1 : 0))
+      const written = edit.text ? edit.text.replace(/\n$/, '').split('\n') : []
+      lines = [...before, ...written, ...after]
+    }),
+    onDidScrollChange: on('scroll'),
+    onMouseDown: on('mouse'),
+    onDidChangeModelContent: on('change'),
+    getScrollTop: () => 120,
+    setScrollTop: vi.fn(),
+    revealLineInCenter: vi.fn(),
+    setPosition: vi.fn(),
+    focus: vi.fn(),
+    dispose: vi.fn(),
+    fire: (name, arg) => handlers[name]?.(arg),
+    __lines: () => lines
+  }
+}
diff --git a/tests/renderer/features/merge/mergeDecorations.test.js b/tests/renderer/features/merge/mergeDecorations.test.js
new file mode 100644
index 00000000..f6623ec4
--- /dev/null
+++ b/tests/renderer/features/merge/mergeDecorations.test.js
@@ -0,0 +1,59 @@
+import { describe, expect, it } from 'vitest'
+import {
+  regionOptions,
+  rulerColors,
+  sideDecorations
+} from '../../../../src/renderer/src/features/merge/mergeDecorations'
+
+const COLORS = { open: '#c80', done: '#0a0', ours: '#b42', theirs: '#0a0' }
+
+describe('regionOptions', () => {
+  it('marks the region being worked on, and the ones already settled', () => {
+    expect(regionOptions({ resolved: false }, true, COLORS).className).toContain('current')
+    expect(regionOptions({ resolved: true }, false, COLORS).className).toContain('resolved')
+    expect(regionOptions({ resolved: false }, false, COLORS).className).toBe('merge-region')
+  })
+
+  // In a long file the scrollbar is the only place the conflicts you have not
+  // reached are visible at all.
+  it('puts every region in the scrollbar, coloured by whether it is settled', () => {
+    expect(regionOptions({ resolved: false }, false, COLORS).overviewRuler.color).toBe(COLORS.open)
+    expect(regionOptions({ resolved: true }, false, COLORS).overviewRuler.color).toBe(COLORS.done)
+  })
+})
+
+describe('sideDecorations', () => {
+  const regions = [{ ours: ['replicas: 5'], theirs: ['replicas: 9'] }]
+
+  it('bands the region and hangs the chevron in the glyph margin', () => {
+    const [band] = sideDecorations([{ line: 4, count: 1 }], regions, 'ours', COLORS)
+    expect(band.range.startLineNumber).toBe(4)
+    expect(band.options.glyphMarginClassName).toContain('merge-take-ours')
+    // Its own colour, not the middle pane's: that one is about state.
+    expect(band.options.className).toBe('merge-side-ours')
+    expect(band.options.overviewRuler.color).toBe(COLORS.ours)
+  })
+
+  it('tints only the columns that differ, at the side pane’s own line numbers', () => {
+    const decorations = sideDecorations([{ line: 4, count: 1 }], regions, 'theirs', COLORS)
+    const word = decorations.find((d) => d.options.className?.includes('merge-word'))
+    expect(word.options.className).toContain('merge-word-theirs')
+    expect(word.range).toMatchObject({ startLineNumber: 4, startColumn: 11, endColumn: 12 })
+  })
+
+  it('draws nothing for a region the side does not contain', () => {
+    expect(sideDecorations([null], regions, 'ours', COLORS)).toEqual([])
+  })
+})
+
+// jsdom resolves no custom property, so this exercises the fallback — which is
+// the branch that matters: a ruler with no colour paints nothing at all.
+describe('rulerColors', () => {
+  it('always answers with four colours, whatever the document resolves', () => {
+    const colors = rulerColors()
+    for (const key of ['open', 'done', 'ours', 'theirs']) {
+      expect(colors[key], key).toMatch(/\S/)
+    }
+    expect(document.querySelectorAll('span')).toHaveLength(0)
+  })
+})
diff --git a/tests/renderer/features/merge/mergeEdits.test.js b/tests/renderer/features/merge/mergeEdits.test.js
new file mode 100644
index 00000000..df43a11c
--- /dev/null
+++ b/tests/renderer/features/merge/mergeEdits.test.js
@@ -0,0 +1,59 @@
+import { describe, expect, it } from 'vitest'
+import { touchedIndexes, wholeLines } from '../../../../src/renderer/src/features/merge/mergeEdits'
+
+const model = (lines) => ({
+  getLineCount: () => lines.length,
+  getLineMaxColumn: (n) => lines[n - 1].length + 1
+})
+
+describe('wholeLines', () => {
+  it('reaches the start of the following line, so no half line survives', () => {
+    const range = wholeLines(model(['a', 'b', 'c', 'd']), {
+      startLineNumber: 2,
+      endLineNumber: 3
+    })
+    expect(range).toMatchObject({
+      startLineNumber: 2,
+      startColumn: 1,
+      endLineNumber: 4,
+      endColumn: 1
+    })
+  })
+
+  // There is no line after the last one to reach into.
+  it('stops at the end of the file', () => {
+    const range = wholeLines(model(['a', 'bb']), { startLineNumber: 1, endLineNumber: 2 })
+    expect(range).toMatchObject({ endLineNumber: 2, endColumn: 3 })
+  })
+
+  // A side that deleted the lines has nothing to cover: it is a place to insert.
+  // Its range is indistinguishable from a one-line region's, so only the flag
+  // can say — and reading it as a line overwrote the stable line sitting there.
+  it('collapses an emptied region to an insertion point', () => {
+    const at = { startLineNumber: 2, endLineNumber: 2 }
+    expect(wholeLines(model(['a', 'b', 'c']), at, true)).toMatchObject({
+      startLineNumber: 2,
+      endLineNumber: 2,
+      endColumn: 1
+    })
+    expect(wholeLines(model(['a', 'b', 'c']), at, false)).toMatchObject({ endLineNumber: 3 })
+  })
+})
+
+// Typing inside a conflict IS an answer. Without this the reader who typed the
+// resolution still had to press a button before Save would unlock.
+describe('touchedIndexes', () => {
+  const regions = [{ resolved: false }, { resolved: false }, { resolved: true }]
+
+  it('names the regions whose text has moved off what they last settled at', () => {
+    expect(touchedIndexes(regions, ['a', 'CHANGED', 'z'], ['a', 'b', 'c'])).toEqual([1])
+  })
+
+  it('leaves an already-settled region alone, however it now reads', () => {
+    expect(touchedIndexes(regions, ['a', 'b', 'CHANGED'], ['a', 'b', 'c'])).toEqual([])
+  })
+
+  it('says nothing when an edit landed outside every region', () => {
+    expect(touchedIndexes(regions, ['a', 'b', 'c'], ['a', 'b', 'c'])).toEqual([])
+  })
+})
diff --git a/tests/renderer/features/merge/mergeGutter.test.js b/tests/renderer/features/merge/mergeGutter.test.js
new file mode 100644
index 00000000..94c7633b
--- /dev/null
+++ b/tests/renderer/features/merge/mergeGutter.test.js
@@ -0,0 +1,61 @@
+import { describe, expect, it } from 'vitest'
+import { findLines, gutterAnchors } from '../../../../src/renderer/src/features/merge/mergeGutter'
+
+describe('findLines', () => {
+  const hay = 'a\nb\nc\nb\nc\nd'
+
+  it('finds a run of lines and reports it 1-based', () => {
+    expect(findLines(hay, ['b', 'c'])).toBe(2)
+  })
+
+  // Two identical hunks in one file must not both point at the first.
+  it('searches forward from where the last region ended', () => {
+    expect(findLines(hay, ['b', 'c'], 3)).toBe(4)
+  })
+
+  it('says nothing when the lines are not there', () => {
+    expect(findLines(hay, ['zzz'])).toBeNull()
+    expect(findLines(hay, [])).toBeNull()
+  })
+})
+
+describe('gutterAnchors', () => {
+  const regions = [
+    { ours: ['x'], theirs: ['y'] },
+    { ours: ['x'], theirs: ['z'] }
+  ]
+
+  it('anchors each region where its own lines sit', () => {
+    expect(gutterAnchors('top\nx\nmid\nx\nend', regions, 'ours')).toEqual([
+      { line: 2, count: 1 },
+      { line: 4, count: 1 }
+    ])
+  })
+
+  // A side that deleted those lines has nothing to offer, so it gets no chevron
+  // rather than one pointing at the wrong place.
+  it('gives no anchor for a region the side does not contain', () => {
+    expect(gutterAnchors('nothing here', regions, 'ours')).toEqual([null, null])
+  })
+})
+
+// The side texts arrive from git exactly as the file is stored, but a region's
+// lines came through a parser that stripped the ending. Splitting the haystack
+// on \n alone leaves a \r on every line of a CRLF file, so nothing ever matched
+// and a Windows repo got no chevrons and no word tints at all.
+describe('a CRLF side text', () => {
+  const crlf = 'one\r\nreplicas: 5\r\nthree\r\n'
+
+  it('finds a region whose lines were parsed without the ending', () => {
+    expect(findLines(crlf, ['replicas: 5'])).toBe(2)
+  })
+
+  it('anchors the region so the chevron has somewhere to hang', () => {
+    const anchors = gutterAnchors(
+      crlf,
+      [{ ours: ['replicas: 5'], theirs: ['replicas: 9'] }],
+      'ours'
+    )
+    expect(anchors[0]).toEqual({ line: 2, count: 1 })
+  })
+})
diff --git a/tests/renderer/features/merge/mergePaneOps.test.js b/tests/renderer/features/merge/mergePaneOps.test.js
new file mode 100644
index 00000000..61a80e46
--- /dev/null
+++ b/tests/renderer/features/merge/mergePaneOps.test.js
@@ -0,0 +1,202 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { fakeEditor } from './fakeEditor'
+import {
+  remember,
+  repaint,
+  resolveTouched,
+  reveal,
+  seedRegions,
+  syncScroll,
+  takeFromGutter,
+  writeChoice
+} from '../../../../src/renderer/src/features/merge/mergePaneOps'
+
+const RAW = `head\n<<<<<<< HEAD\nreplicas: 5\n=======\nreplicas: 9\n>>>>>>> feature\ntail\n`
+
+function scene() {
+  const merge = {
+    at: 0,
+    ours: 'head\nreplicas: 5\ntail\n',
+    theirs: 'head\nreplicas: 9\ntail\n',
+    rawContent: RAW,
+    result: 'head\nreplicas: 5\ntail\n',
+    regions: [{ ours: ['replicas: 5'], theirs: ['replicas: 9'], resolved: false }],
+    markResolved(i) {
+      this.regions[i].resolved = true
+    }
+  }
+  const editors = {
+    ours: fakeEditor(merge.ours),
+    result: fakeEditor(merge.result),
+    theirs: fakeEditor(merge.theirs)
+  }
+  const ids = {}
+  const settled = []
+  seedRegions({ editors, merge, ids, settled })
+  return { merge, editors, ids, settled, anchors: { ours: [], theirs: [] } }
+}
+
+describe('seedRegions', () => {
+  it('puts the region where our side left it, and remembers how it reads', () => {
+    const { ids, settled, editors } = scene()
+    expect(ids.result).toHaveLength(1)
+    expect(editors.result.getModel().getDecorationRange(ids.result[0]).startLineNumber).toBe(2)
+    expect(settled).toHaveLength(1)
+  })
+})
+
+describe('repaint', () => {
+  let s
+  beforeEach(() => (s = scene()))
+
+  it('bands the region in all three panes and finds it in both sides', () => {
+    repaint(s)
+    expect(s.anchors.ours[0]).toEqual({ line: 2, count: 1 })
+    expect(s.anchors.theirs[0]).toEqual({ line: 2, count: 1 })
+    expect(s.ids.ours).toHaveLength(2)
+  })
+
+  it('does nothing at all before the editors exist', () => {
+    expect(() => repaint({ ...s, editors: { result: null } })).not.toThrow()
+  })
+})
+
+describe('writeChoice', () => {
+  it('puts the chosen side in the result and marks the region settled', () => {
+    const s = scene()
+    writeChoice({ ...s, index: 0, choice: 'theirs' })
+    expect(s.editors.result.__lines()).toEqual(['head', 'replicas: 9', 'tail', ''])
+    expect(s.merge.regions[0].resolved).toBe(true)
+  })
+
+  // An answer that is not one of the four writes nothing rather than emptying
+  // the region — this is the file git is about to be handed.
+  it('writes nothing for an answer it does not know', () => {
+    const s = scene()
+    writeChoice({ ...s, index: 0, choice: 'sideways' })
+    expect(s.editors.result.executeEdits).not.toHaveBeenCalled()
+    expect(s.merge.regions[0].resolved).toBe(false)
+  })
+
+  it('ignores an index that has no region', () => {
+    const s = scene()
+    writeChoice({ ...s, index: 9, choice: 'ours' })
+    expect(s.editors.result.executeEdits).not.toHaveBeenCalled()
+  })
+})
+
+// The case the old resolver could not express: the answer neither side had.
+describe('resolveTouched', () => {
+  it('counts a hand edit inside a region as the answer to it', () => {
+    const s = scene()
+    s.editors.result.setValue('head\nreplicas: 7\ntail\n')
+    resolveTouched(s)
+    expect(s.merge.regions[0].resolved).toBe(true)
+  })
+
+  it('leaves a region alone when the edit landed outside it', () => {
+    const s = scene()
+    s.editors.result.setValue('HEAD\nreplicas: 5\ntail\n')
+    resolveTouched(s)
+    expect(s.merge.regions[0].resolved).toBe(false)
+  })
+
+  it('stands down when there is no editor', () => {
+    expect(() => resolveTouched({ editors: {}, merge: {}, ids: {}, settled: [] })).not.toThrow()
+    expect(() => remember({ editors: {}, ids: {}, settled: [] })).not.toThrow()
+  })
+})
+
+describe('takeFromGutter', () => {
+  const anchors = { ours: [{ line: 2, count: 1 }] }
+  const glyph = (lineNumber) => ({
+    target: { type: 2, position: { lineNumber } }
+  })
+
+  it('answers the region the click sits on', () => {
+    const take = vi.fn()
+    takeFromGutter({ anchors, key: 'ours', event: glyph(2), take })
+    expect(take).toHaveBeenCalledWith(0, 'ours')
+  })
+
+  it('ignores a click on a line no region covers, and one outside the margin', () => {
+    const take = vi.fn()
+    takeFromGutter({ anchors, key: 'ours', event: glyph(9), take })
+    takeFromGutter({ anchors, key: 'ours', event: { target: { type: 6 } }, take })
+    expect(take).not.toHaveBeenCalled()
+  })
+})
+
+describe('syncScroll', () => {
+  it('moves the other two panes and does not echo back', () => {
+    const s = scene()
+    const sync = { busy: false }
+    syncScroll(s.editors, 'result', sync)
+    expect(s.editors.ours.setScrollTop).toHaveBeenCalledWith(120)
+    expect(s.editors.theirs.setScrollTop).toHaveBeenCalledWith(120)
+    syncScroll(s.editors, 'result', { busy: true })
+    expect(s.editors.ours.setScrollTop).toHaveBeenCalledTimes(1)
+    expect(() => syncScroll(s.editors, 'nowhere', sync)).not.toThrow()
+  })
+})
+
+describe('reveal', () => {
+  it('brings the region into view and puts the caret on it', () => {
+    const s = scene()
+    reveal({ editors: s.editors, ids: s.ids, index: 0 })
+    expect(s.editors.result.revealLineInCenter).toHaveBeenCalledWith(2)
+    expect(s.editors.result.focus).toHaveBeenCalled()
+  })
+
+  it('does nothing for a region that is not there', () => {
+    const s = scene()
+    reveal({ editors: s.editors, ids: s.ids, index: 4 })
+    expect(s.editors.result.revealLineInCenter).not.toHaveBeenCalled()
+  })
+})
+
+// A conflict where OUR side deleted the lines is an INSERTION POINT, not a
+// one-line region — and the two produced the same Monaco range, so taking
+// theirs replaced the first stable line after the conflict with it. The line
+// was gone from the file git was then handed.
+describe('a region one side emptied', () => {
+  const RAW_EMPTY = `head\n<<<<<<< HEAD\n=======\nthey added this\n>>>>>>> feature\ntail\n`
+
+  function emptyScene() {
+    const merge = {
+      at: 0,
+      ours: 'head\ntail\n',
+      theirs: 'head\nthey added this\ntail\n',
+      rawContent: RAW_EMPTY,
+      result: 'head\ntail\n',
+      regions: [{ ours: [], theirs: ['they added this'], resolved: false }],
+      markResolved(i) {
+        this.regions[i].resolved = true
+      }
+    }
+    const editors = {
+      ours: fakeEditor(merge.ours),
+      result: fakeEditor(merge.result),
+      theirs: fakeEditor(merge.theirs)
+    }
+    const ids = {}
+    const settled = []
+    seedRegions({ editors, merge, ids, settled })
+    return { merge, editors, ids, settled, anchors: { ours: [], theirs: [] } }
+  }
+
+  it('inserts their side instead of overwriting the line after it', () => {
+    const s = emptyScene()
+    writeChoice({ ...s, index: 0, choice: 'theirs' })
+    expect(s.editors.result.__lines()).toEqual(['head', 'they added this', 'tail', ''])
+  })
+
+  // Answered once, it is no longer an insertion point: taking the other side
+  // must REPLACE what the first answer wrote, not sit beside it.
+  it('replaces its own first answer when the reader changes their mind', () => {
+    const s = emptyScene()
+    writeChoice({ ...s, index: 0, choice: 'theirs' })
+    writeChoice({ ...s, index: 0, choice: 'ours' })
+    expect(s.editors.result.__lines()).toEqual(['head', 'tail', ''])
+  })
+})
diff --git a/tests/renderer/features/merge/mergeStore.test.js b/tests/renderer/features/merge/mergeStore.test.js
new file mode 100644
index 00000000..2f67649b
--- /dev/null
+++ b/tests/renderer/features/merge/mergeStore.test.js
@@ -0,0 +1,154 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createPinia, setActivePinia } from 'pinia'
+import { useMergeStore } from '../../../../src/renderer/src/features/merge/mergeStore'
+
+const conflict = (i) =>
+  ['<<<<<<< HEAD', `ours ${i}`, '=======', `theirs ${i}`, '>>>>>>> feature'].join('\n')
+const conflicted = (n = 1) => Array.from({ length: n }, (_, i) => conflict(i)).join('\ntween\n')
+
+beforeEach(() => {
+  setActivePinia(createPinia())
+  window.api = {
+    writeMerged: vi.fn(async () => ({ ok: true })),
+    cancelMerge: vi.fn(async () => ({ ok: true }))
+  }
+})
+
+const begin = (content, extra = {}) => {
+  const merge = useMergeStore()
+  merge.begin({ content, fileName: 'app.txt', ...extra })
+  return merge
+}
+
+describe('mergeStore — the result never shows a marker', () => {
+  // `<<<<<<<` is a file format, not a user interface. The result opens as a
+  // valid file with our side standing in each conflicted place.
+  it('opens marker-free, with our side in place', () => {
+    const merge = begin('a\n' + conflicted() + '\nb')
+    expect(merge.result).toBe('a\nours 0\nb')
+    expect(merge.result).not.toContain('>>>>>>>')
+    expect(merge.result).not.toContain('<<<<<<<')
+    expect(merge.result).not.toContain('=======')
+  })
+
+  it('still knows both sides of every conflicted place', () => {
+    const merge = begin(conflicted(2))
+    expect(merge.regions).toHaveLength(2)
+    expect(merge.regions[0]).toEqual({ ours: ['ours 0'], theirs: ['theirs 0'], resolved: false })
+  })
+
+  // Nothing in the text says a region is settled once the markers are gone, so
+  // resolution is state rather than something re-parsed.
+  it('counts what is left from the regions, not from the text', () => {
+    const merge = begin(conflicted(3))
+    expect(merge.remaining).toBe(3)
+    expect(merge.canSave).toBe(false)
+    merge.markResolved(0)
+    merge.markResolved(1)
+    expect(merge.remaining).toBe(1)
+    expect(merge.canSave).toBe(false)
+    merge.markResolved(2)
+    expect(merge.canSave).toBe(true)
+  })
+
+  it('has nothing to resolve in a file with no conflicts', () => {
+    const merge = begin('plain\ntext\n')
+    expect(merge.regions).toHaveLength(0)
+    expect(merge.canSave).toBe(true)
+  })
+
+  it('refuses a file whose markers do not close', () => {
+    const merge = begin('<<<<<<< HEAD\nunfinished\n')
+    expect(merge.error).toBe('unreadable')
+    expect(merge.canSave).toBe(false)
+  })
+
+  it('walks the regions, wrapping at either end', () => {
+    const merge = begin(conflicted(3))
+    merge.step(1)
+    expect(merge.at).toBe(1)
+    merge.step(-2)
+    expect(merge.at).toBe(2)
+    merge.step(1)
+    expect(merge.at).toBe(0)
+  })
+})
+
+describe('mergeStore — the sides and the walk', () => {
+  it('prefers the clean texts git’s index handed over', () => {
+    const merge = begin(conflicted(), { ours: 'OURS FILE', theirs: 'THEIRS FILE', base: 'BASE' })
+    expect(merge.ours).toBe('OURS FILE')
+    expect(merge.theirs).toBe('THEIRS FILE')
+    expect(merge.base).toBe('BASE')
+  })
+
+  it('reconstructs them from the markers when the index had none', () => {
+    const merge = begin('top\n' + conflicted() + '\nend')
+    expect(merge.ours).toBe('top\nours 0\nend')
+    expect(merge.theirs).toBe('top\ntheirs 0\nend')
+  })
+
+  // The file's own shape survives: a trailing newline is part of the file.
+  it('keeps the trailing newline the file arrived with', () => {
+    expect(begin('a\n' + conflicted() + '\nb\n').result).toBe('a\nours 0\nb\n')
+  })
+
+  // git calls the tool once per file, so without this the third of thirty looks
+  // exactly like the last.
+  it('carries the file’s place in the walk, and hides it for a lone file', () => {
+    expect(begin(conflicted(), { position: 3, total: 30 }).showsWalk).toBe(true)
+    expect(begin(conflicted(), { position: 3, total: 30 }).position).toBe(3)
+    expect(begin(conflicted()).showsWalk).toBe(false)
+  })
+})
+
+describe('mergeStore — saving', () => {
+  it('sends the text and nothing else', async () => {
+    const merge = begin(conflicted())
+    merge.markResolved(0)
+    expect(await merge.save()).toBe(true)
+    // The line keeps the ending it had: a merge tool that strips a trailing
+    // newline has rewritten the file it was asked to resolve.
+    expect(window.api.writeMerged).toHaveBeenCalledWith('ours 0\n')
+  })
+
+  it('will not send a file with a region still undecided', async () => {
+    const merge = begin(conflicted())
+    expect(await merge.save()).toBe(false)
+    expect(window.api.writeMerged).not.toHaveBeenCalled()
+  })
+
+  it('tells main when the reader declines, so the launcher is released', async () => {
+    await begin(conflicted()).close()
+    expect(window.api.cancelMerge).toHaveBeenCalled()
+  })
+
+  it('does not cancel after a successful save', async () => {
+    const merge = begin(conflicted())
+    merge.markResolved(0)
+    await merge.save()
+    await merge.close()
+    expect(window.api.cancelMerge).not.toHaveBeenCalled()
+  })
+})
+
+// Monaco keeps one ending per model, so a mixed file comes back out normalised —
+// including on lines nobody touched. The tool cannot stop that, so it says so.
+describe('a file that mixes line endings', () => {
+  const begin = (content) => {
+    const merge = useMergeStore()
+    merge.begin({ content })
+    return merge
+  }
+  const joined = (eol) =>
+    ['a', '<<<<<<< HEAD', 'ours', '=======', 'theirs', '>>>>>>> f', 'b'].join(eol) + eol
+
+  it('says so before anything is written', () => {
+    expect(begin(joined('\r\n').replace('a\r\n', 'a\n')).mixedEndings).toBe(true)
+  })
+
+  it('stays quiet for a file that is consistent either way', () => {
+    expect(begin(joined('\n')).mixedEndings).toBe(false)
+    expect(begin(joined('\r\n')).mixedEndings).toBe(false)
+  })
+})
diff --git a/tests/renderer/features/merge/mergeWords.test.js b/tests/renderer/features/merge/mergeWords.test.js
new file mode 100644
index 00000000..5c098868
--- /dev/null
+++ b/tests/renderer/features/merge/mergeWords.test.js
@@ -0,0 +1,49 @@
+import { describe, expect, it } from 'vitest'
+import { lineSpans, wordSpans } from '../../../../src/renderer/src/features/merge/mergeWords'
+
+describe('lineSpans', () => {
+  it('narrows to the part that changed', () => {
+    expect(lineSpans('replicas: 5', 'replicas: 9')).toEqual({ ours: [11, 12], theirs: [11, 12] })
+  })
+
+  it('says nothing about two lines that agree', () => {
+    expect(lineSpans('keep: yes', 'keep: yes')).toBeNull()
+  })
+
+  it('handles one side being longer at the tail', () => {
+    const { ours, theirs } = lineSpans('mode: fast', 'mode: fastest')
+    expect('mode: fast'.slice(ours[0] - 1, ours[1] - 1)).toBe('')
+    expect('mode: fastest'.slice(theirs[0] - 1, theirs[1] - 1)).toBe('est')
+  })
+
+  // A shared head AND tail, with the change in the middle: peeling only one end
+  // would paint the rest of the line as changed.
+  it('peels both ends', () => {
+    const { ours } = lineSpans('a = compute(1) + b', 'a = compute(2) + b')
+    expect('a = compute(1) + b'.slice(ours[0] - 1, ours[1] - 1)).toBe('1')
+  })
+
+  it('marks the whole of two lines that share nothing', () => {
+    expect(lineSpans('abc', 'xyz')).toEqual({ ours: [1, 4], theirs: [1, 4] })
+  })
+})
+
+describe('wordSpans', () => {
+  it('pairs the lines of a region and skips the ones that match', () => {
+    const region = {
+      ours: ['replicas: 5', 'keep: yes', 'region: us-east-1'],
+      theirs: ['replicas: 9', 'keep: yes', 'region: eu-west-1']
+    }
+    const { ours, theirs } = wordSpans(region)
+    expect(ours.map((s) => s.row)).toEqual([0, 2])
+    expect(theirs.map((s) => s.row)).toEqual([0, 2])
+  })
+
+  // Pairing by index says nothing once a side has added or removed a line, and
+  // a confident-looking wrong highlight is worse than none.
+  it('stays out of it when the two sides are different lengths', () => {
+    expect(wordSpans({ ours: ['a'], theirs: ['a', 'b'] })).toEqual({ ours: [], theirs: [] })
+    expect(wordSpans({ ours: [], theirs: [] })).toEqual({ ours: [], theirs: [] })
+    expect(wordSpans(null)).toEqual({ ours: [], theirs: [] })
+  })
+})
diff --git a/tests/renderer/features/merge/threeWay.test.js b/tests/renderer/features/merge/threeWay.test.js
new file mode 100644
index 00000000..bff328e8
--- /dev/null
+++ b/tests/renderer/features/merge/threeWay.test.js
@@ -0,0 +1,75 @@
+import { describe, expect, it } from 'vitest'
+import {
+  initialRanges,
+  linesFor,
+  sidesFromConflicts
+} from '../../../../src/renderer/src/features/merge/threeWay'
+import { parseConflicts } from '../../../../src/renderer/src/utils/mergeConflicts'
+
+const FILE = [
+  'top',
+  '<<<<<<< HEAD',
+  'ours one',
+  '=======',
+  'theirs one',
+  '>>>>>>> feature',
+  'bottom'
+].join('\n')
+
+describe('sidesFromConflicts', () => {
+  // The panes show whole files, not fragments: a reader compares the two
+  // versions, and a three-line excerpt is what the old dialog got wrong.
+  it('reads each side as a whole file, stable text included', () => {
+    const { ours, theirs } = sidesFromConflicts(parseConflicts(FILE))
+    expect(ours).toBe('top\nours one\nbottom')
+    expect(theirs).toBe('top\ntheirs one\nbottom')
+  })
+
+  it('handles a file with no conflicts at all', () => {
+    const { ours, theirs } = sidesFromConflicts(parseConflicts('just\ntext'))
+    expect(ours).toBe('just\ntext')
+    expect(theirs).toBe('just\ntext')
+  })
+
+  it('says nothing rather than throwing on an unreadable file', () => {
+    expect(sidesFromConflicts(null)).toEqual({ ours: '', theirs: '' })
+  })
+})
+
+// The result opens with our side standing in each conflicted place, so the
+// decorations that mark those places need to know where they landed.
+describe('initialRanges', () => {
+  it('places each conflict where our side put it', () => {
+    // top(1) · ours one(2) · bottom(3)
+    expect(initialRanges(parseConflicts(FILE))).toEqual([{ line: 2, count: 1 }])
+  })
+
+  it('counts a second conflict after the first side’s lines', () => {
+    const two = parseConflicts([FILE, FILE].join('\n'))
+    expect(initialRanges(two)).toEqual([
+      { line: 2, count: 1 },
+      { line: 5, count: 1 }
+    ])
+  })
+
+  // Our side deleting the lines still needs a place to mark.
+  it('gives a zero-length range where our side has nothing', () => {
+    const gone = ['<<<<<<< HEAD', '=======', 'theirs', '>>>>>>> f'].join('\n')
+    expect(initialRanges(parseConflicts(gone))).toEqual([{ line: 1, count: 0 }])
+  })
+})
+
+describe('linesFor', () => {
+  const region = { ours: ['a'], theirs: ['b'] }
+
+  it('gives each answer its lines, both in the file’s own order', () => {
+    expect(linesFor(region, 'ours')).toEqual(['a'])
+    expect(linesFor(region, 'theirs')).toEqual(['b'])
+    expect(linesFor(region, 'both')).toEqual(['a', 'b'])
+    expect(linesFor(region, 'neither')).toEqual([])
+  })
+
+  it('refuses an answer that is not one of the four', () => {
+    expect(linesFor(region, 'whatever')).toBeNull()
+  })
+})
diff --git a/tests/renderer/features/merge/useMergeKeys.test.js b/tests/renderer/features/merge/useMergeKeys.test.js
new file mode 100644
index 00000000..dc135242
--- /dev/null
+++ b/tests/renderer/features/merge/useMergeKeys.test.js
@@ -0,0 +1,46 @@
+import { describe, expect, it, vi } from 'vitest'
+import {
+  bindMergeKeys,
+  stepFromKey
+} from '../../../../src/renderer/src/features/merge/useMergeKeys'
+
+describe('stepFromKey', () => {
+  it('walks the conflicts the way every JetBrains user already types it', () => {
+    expect(stepFromKey({ key: 'F7' })).toBe(1)
+    expect(stepFromKey({ key: 'F7', shiftKey: true })).toBe(-1)
+  })
+
+  it('keeps out of the way of anything with a modifier on it', () => {
+    expect(stepFromKey({ key: 'F7', metaKey: true })).toBe(0)
+    expect(stepFromKey({ key: 'F7', ctrlKey: true })).toBe(0)
+    expect(stepFromKey({ key: 'F7', altKey: true })).toBe(0)
+    expect(stepFromKey({ key: 'a' })).toBe(0)
+  })
+})
+
+describe('bindMergeKeys', () => {
+  const press = (init) =>
+    window.dispatchEvent(new KeyboardEvent('keydown', { ...init, cancelable: true }))
+
+  it('walks the conflicts while it is bound, and stops the moment it is not', () => {
+    const step = vi.fn()
+    const unbind = bindMergeKeys(step)
+    press({ key: 'F7' })
+    press({ key: 'F7', shiftKey: true })
+    expect(step.mock.calls).toEqual([[1], [-1]])
+    unbind()
+    press({ key: 'F7' })
+    expect(step).toHaveBeenCalledTimes(2)
+  })
+
+  // A key it does not own must reach whatever does.
+  it('leaves any other key alone', () => {
+    const step = vi.fn()
+    const unbind = bindMergeKeys(step)
+    const event = new KeyboardEvent('keydown', { key: 'a', cancelable: true })
+    window.dispatchEvent(event)
+    expect(step).not.toHaveBeenCalled()
+    expect(event.defaultPrevented).toBe(false)
+    unbind()
+  })
+})
diff --git a/tests/renderer/features/merge/useMergePaneSizes.test.js b/tests/renderer/features/merge/useMergePaneSizes.test.js
new file mode 100644
index 00000000..b043a6ce
--- /dev/null
+++ b/tests/renderer/features/merge/useMergePaneSizes.test.js
@@ -0,0 +1,124 @@
+import { beforeEach, describe, expect, it } from 'vitest'
+import {
+  normalise,
+  paneColumns,
+  splitAt,
+  useMergePaneSizes
+} from '../../../../src/renderer/src/features/merge/useMergePaneSizes'
+
+const tracks = (s) => s.split(' ')
+
+describe('paneColumns', () => {
+  // Three panes and two grips are FIVE grid children. A three-track row leaves
+  // the grips holding columns of their own and wraps Theirs onto a second row,
+  // which is how the result pane ended up half height.
+  it('gives every child a track, grips included', () => {
+    expect(tracks(paneColumns(1 / 3, 1 / 3))).toHaveLength(5)
+    expect(tracks(paneColumns(1 / 3, 1 / 3))[1]).toBe('0')
+    expect(tracks(paneColumns(1 / 3, 1 / 3))[3]).toBe('0')
+  })
+
+  it('never emits a negative track', () => {
+    for (const [ours, result] of [
+      [0.5, 0.5],
+      [0.8, 0.8],
+      [0.12, 0.76]
+    ]) {
+      const safe = normalise(ours, result)
+      const [a, , b, , c] = tracks(paneColumns(safe.ours, safe.result))
+      for (const t of [a, b, c]) expect(parseFloat(t)).toBeGreaterThan(0)
+    }
+  })
+})
+
+describe('normalise', () => {
+  it('keeps all three panes above the readable floor', () => {
+    const { ours, result } = normalise(0.9, 0.9)
+    expect(ours).toBeGreaterThanOrEqual(0.12)
+    expect(result).toBeGreaterThanOrEqual(0.12)
+    expect(1 - ours - result).toBeGreaterThanOrEqual(0.12 - 1e-9)
+  })
+
+  it('leaves a sane split alone', () => {
+    expect(normalise(0.25, 0.5)).toEqual({ ours: 0.25, result: 0.5 })
+  })
+})
+
+describe('splitAt', () => {
+  // A divider moves between the two panes it touches; the third keeps its width.
+  it('holds the moving edge inside the pair it divides', () => {
+    expect(splitAt(0.6, 0.3)).toBeCloseTo(0.3)
+    expect(splitAt(0.6, 0.9)).toBeCloseTo(0.48)
+    expect(splitAt(0.6, -1)).toBeCloseTo(0.12)
+  })
+})
+
+// The drag itself, without a pointer. What makes this worth a unit is the state
+// BETWEEN the events, and the invariant a fr-track grid cannot express: three
+// panes whose widths always sum to the row.
+describe('the drag', () => {
+  const grip = (x) => ({
+    clientX: x,
+    preventDefault: () => {},
+    currentTarget: { parentElement: { clientWidth: 1000 } }
+  })
+  const widths = (s) =>
+    s.columns.value
+      .split(' ')
+      .filter((t) => t !== '0')
+      .map(parseFloat)
+
+  beforeEach(() => {
+    localStorage.clear()
+    window.api = {}
+  })
+
+  it('moves the divider between the two panes it touches, leaving the third', () => {
+    const s = useMergePaneSizes()
+    const [, , theirsBefore] = widths(s)
+    s.start('ours', grip(400))
+    expect(s.resizing.value).toBe(true)
+    window.dispatchEvent(new window.PointerEvent('pointermove', { clientX: 600 }))
+
+    const [ours, result, theirs] = widths(s)
+    expect(ours).toBeCloseTo(1 / 3 + 0.2, 3)
+    expect(result).toBeCloseTo(1 / 3 - 0.2, 3)
+    expect(theirs).toBeCloseTo(theirsBefore, 3)
+  })
+
+  // Dragged past the far pane, the fractions went negative and the grid dropped
+  // a track — which is what put the result pane on a row of its own.
+  it('never lets a pane fall below the readable floor, however far it is dragged', () => {
+    const s = useMergePaneSizes()
+    s.start('result', grip(400))
+    window.dispatchEvent(new window.PointerEvent('pointermove', { clientX: 4000 }))
+    for (const w of widths(s)) expect(w).toBeGreaterThanOrEqual(0.12 - 1e-9)
+    expect(widths(s).reduce((a, b) => a + b, 0)).toBeCloseTo(1, 3)
+  })
+
+  // A drag is one decision, so it is written on release and not per frame.
+  it('persists on release, and stops listening', () => {
+    const s = useMergePaneSizes()
+    s.start('ours', grip(400))
+    window.dispatchEvent(new window.PointerEvent('pointermove', { clientX: 500 }))
+    window.dispatchEvent(new window.PointerEvent('pointerup'))
+    expect(s.resizing.value).toBe(false)
+    expect(JSON.parse(localStorage.getItem('diffbro.mergePanes')).ours).toBeCloseTo(1 / 3 + 0.1, 3)
+
+    const settled = s.columns.value
+    window.dispatchEvent(new window.PointerEvent('pointermove', { clientX: 900 }))
+    expect(s.columns.value).toBe(settled)
+  })
+
+  it('opens where the last drag left it', () => {
+    localStorage.setItem('diffbro.mergePanes', JSON.stringify({ ours: 0.5, result: 0.25 }))
+    expect(widths(useMergePaneSizes())).toEqual([0.5, 0.25, 0.25])
+  })
+
+  it('falls back to thirds on anything it cannot read', () => {
+    localStorage.setItem('diffbro.mergePanes', 'not json')
+    expect(widths(useMergePaneSizes())[0]).toBeCloseTo(1 / 3, 3)
+    localStorage.setItem('diffbro.mergePanes', JSON.stringify({ ours: 'wide' }))
+    expect(widths(useMergePaneSizes())[0]).toBeCloseTo(1 / 3, 3)
+  })
+})
diff --git a/tests/renderer/features/merge/useMergePanes.test.js b/tests/renderer/features/merge/useMergePanes.test.js
new file mode 100644
index 00000000..95cb5627
--- /dev/null
+++ b/tests/renderer/features/merge/useMergePanes.test.js
@@ -0,0 +1,121 @@
+// The wiring between the three editors and the store: which callback the view
+// hangs on which editor, and what a theme change or a torn-down container does
+// to them. Driven through fakes rather than a real Monaco.
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createPinia, setActivePinia } from 'pinia'
+import { nextTick, ref } from 'vue'
+import * as monaco from 'monaco-editor'
+import { fakeEditor } from './fakeEditor'
+import { useMergePanes } from '../../../../src/renderer/src/features/merge/useMergePanes'
+import { useMergeStore } from '../../../../src/renderer/src/features/merge/mergeStore'
+import { useSettingsStore } from '../../../../src/renderer/src/stores/settingsStore'
+
+const RAW = `head\n<<<<<<< HEAD\nreplicas: 5\n=======\nreplicas: 9\n>>>>>>> feature\ntail\n`
+
+function scene() {
+  const made = []
+  vi.spyOn(monaco.editor, 'create').mockImplementation((_, options) => {
+    const editor = fakeEditor(options.value)
+    made.push(editor)
+    return editor
+  })
+  const merge = useMergeStore()
+  merge.begin({
+    content: RAW,
+    ours: 'head\nreplicas: 5\ntail\n',
+    theirs: 'head\nreplicas: 9\ntail\n'
+  })
+  const el = document.createElement('div')
+  const containers = { ours: ref(el), result: ref(el), theirs: ref(el) }
+  const panes = useMergePanes(containers, merge)
+  panes.create()
+  const [ours, result, theirs] = made
+  return { panes, merge, containers, ours, result, theirs }
+}
+
+beforeEach(() => {
+  setActivePinia(createPinia())
+  window.api = {}
+  vi.restoreAllMocks()
+})
+
+describe('useMergePanes', () => {
+  it('opens three editors with only the middle one writable', () => {
+    scene()
+    const [ours, result, theirs] = monaco.editor.create.mock.calls.map(([, o]) => o)
+    expect([ours.readOnly, result.readOnly, theirs.readOnly]).toEqual([true, false, true])
+    // The suggest widget would otherwise eat the Enter meant to be a newline.
+    expect(result.acceptSuggestionOnEnter).toBe('off')
+  })
+
+  it('creates the editors once, however many times it is asked', () => {
+    const { panes } = scene()
+    panes.create()
+    expect(monaco.editor.create).toHaveBeenCalledTimes(3)
+  })
+
+  it('takes a side into the result and settles that region', () => {
+    const { panes, merge, result } = scene()
+    panes.take(0, 'theirs')
+    expect(result.__lines().join('\n')).toContain('replicas: 9')
+    expect(merge.regions[0].resolved).toBe(true)
+    expect(merge.canSave).toBe(true)
+  })
+
+  it('answers every region at once', () => {
+    const { panes, merge } = scene()
+    panes.takeAll('ours')
+    expect(merge.remaining).toBe(0)
+  })
+
+  it('follows a chevron clicked in a side pane', () => {
+    const { merge, ours } = scene()
+    ours.fire('mouse', { target: { type: 2, position: { lineNumber: 2 } } })
+    expect(merge.regions[0].resolved).toBe(true)
+  })
+
+  it('carries a scroll in one pane to the other two', () => {
+    const { ours, result, theirs } = scene()
+    ours.fire('scroll')
+    expect(result.setScrollTop).toHaveBeenCalledWith(120)
+    expect(theirs.setScrollTop).toHaveBeenCalledWith(120)
+  })
+
+  // Typing IS the answer where neither side got it right.
+  it('takes a hand edit in the result as the answer to the region it lands in', () => {
+    const { merge, result } = scene()
+    result.setValue('head\nreplicas: 7\ntail\n')
+    result.fire('change')
+    expect(merge.result).toContain('replicas: 7')
+    expect(merge.regions[0].resolved).toBe(true)
+  })
+
+  it('reveals a region and puts the caret on it', () => {
+    const { panes, result } = scene()
+    panes.reveal(0)
+    expect(result.revealLineInCenter).toHaveBeenCalledWith(2)
+  })
+
+  it('writes a side back into its pane when the store replaces it', async () => {
+    const { merge, ours } = scene()
+    merge.ours = 'rewritten\n'
+    await nextTick()
+    expect(ours.getValue()).toBe('rewritten\n')
+  })
+
+  // The scrollbar marks are baked colours, so a theme change has to repaint.
+  it('re-applies the theme and repaints', async () => {
+    scene()
+    const setTheme = vi.spyOn(monaco.editor, 'setTheme')
+    useSettingsStore().theme = 'dark'
+    await nextTick()
+    expect(setTheme).toHaveBeenCalled()
+  })
+
+  it('disposes every editor when its container goes away', async () => {
+    const { containers, ours, result, theirs } = scene()
+    containers.result.value = null
+    await nextTick()
+    for (const editor of [ours, result, theirs]) expect(editor.dispose).toHaveBeenCalled()
+  })
+})
diff --git a/tests/renderer/utils/mergeConflicts.test.js b/tests/renderer/utils/mergeConflicts.test.js
index 9595f041..0f475b28 100644
--- a/tests/renderer/utils/mergeConflicts.test.js
+++ b/tests/renderer/utils/mergeConflicts.test.js
@@ -150,3 +150,26 @@ describe('parseConflicts — a file whose line endings are mixed', () => {
     expect(composeMerge(parseConflicts(plain), [])).toBe(plain)
   })
 })
+
+// A decoration and an edit both need to know WHERE a region is, in the lines
+// Monaco counts from 1.
+describe('parseConflicts — where each region sits', () => {
+  it('gives each conflict its line range, markers included', () => {
+    const [, conflict] = parseConflicts(FILE).segments
+    // 1 top · 2 <<<<<<< · 3-4 ours · 5 ======= · 6 theirs · 7 >>>>>>> · 8 bottom
+    expect(conflict.startLine).toBe(2)
+    expect(conflict.endLine).toBe(7)
+  })
+
+  it('counts a second conflict from where the first ended', () => {
+    const two = parseConflicts([FILE, FILE].join('\n'))
+    const conflicts = two.segments.filter((s) => s.type === 'conflict')
+    expect(conflicts[0].startLine).toBe(2)
+    expect(conflicts[1].startLine).toBe(10)
+    expect(conflicts[1].endLine).toBe(15)
+  })
+
+  it('starts at line 1 when the file opens on a conflict', () => {
+    expect(parseConflicts(DIFF3).segments[0].startLine).toBe(1)
+  })
+})
diff --git a/tests/stubs/monaco-editor.js b/tests/stubs/monaco-editor.js
index 17282472..47737f66 100644
--- a/tests/stubs/monaco-editor.js
+++ b/tests/stubs/monaco-editor.js
@@ -1,7 +1,15 @@
 // A feature slice's index.js is its whole surface, so a composable importing the
 // slice pulls its components — and Monaco — into the module graph. Nothing under
 // test runs an editor; this keeps the resolver from loading 2 MB of one.
+export class Range {
+  constructor(startLineNumber, startColumn, endLineNumber, endColumn) {
+    Object.assign(this, { startLineNumber, startColumn, endLineNumber, endColumn })
+  }
+}
+
 export const editor = {
+  OverviewRulerLane: { Left: 1, Center: 2, Right: 4, Full: 7 },
+  MouseTargetType: { GUTTER_GLYPH_MARGIN: 2 },
   create: () => ({ dispose: () => {} }),
   createDiffEditor: () => ({ dispose: () => {} }),
   colorizeElement: async () => {},
@@ -12,4 +20,4 @@ export const editor = {
 export const languages = { register: () => {}, setMonarchTokensProvider: () => {} }
 export const KeyCode = {}
 export const KeyMod = {}
-export default { editor, languages, KeyCode, KeyMod }
+export default { editor, languages, KeyCode, KeyMod, Range }
diff --git a/vitest.config.mjs b/vitest.config.mjs
index 4b23c310..a4137a94 100644
--- a/vitest.config.mjs
+++ b/vitest.config.mjs
@@ -43,10 +43,10 @@ export default defineConfig({
       // floor, which this ratchet forbids. They need tests of their own first —
       // then they join the set and the floors go up again.
       thresholds: {
-        statements: 94,
-        branches: 87,
+        statements: 95,
+        branches: 88,
         functions: 95,
-        lines: 95
+        lines: 96
       },
       include: [
         'src/main/sealing.js',