Esc alternates between the last two panes; Toggleterm is gone

Esc ran Toggleterm, which hopped between the newest DOC and the newest
TERMINAL. That distinction never earned its keep. It made Esc unpredictable —
which of three panes you landed on depended on their kinds, not on where you
had been — and it could not alternate between two files at all, which is the
case you hit most. Editing two files, Esc did nothing.

The replacement already existed. Last (SPC j j) is "the pane you were in
before this one, whichever it was": it walks the jump stack for the newest
entry naming a different pane and restores its line and column. So Esc, and
Shift-Esc in tty, now run Last, and Toggleterm is deleted rather than renamed
— a third implementation of "go to the other pane" was the thing to avoid.
SPC w t goes with it; the w group is the four directional moves, and the jump
group already had SPC j j.

Held down, Esc alternates. Two files, a file and its shell, a file and a
+Search — all the same, because Last has no notion of kind to get wrong.

This depends on the swap in the same series: Last reads the stack backwards,
and until hopping stopped appending, the pane you came from could fall off it.

windownav.snap needed only its keys and prose changed — its golden did not
move at all, which is the useful evidence here: for the one scenario the old
builtin handled well, Last produces an identical focus sequence.

Coverage for what it did not handle is new: a unit test opens a second FILE by
looking its name and asserts Esc alternates between two panes of the SAME
kind, which is the case that used to be a no-op.

Docs follow: tutor.txt, docs/helix-keys.md, docs/design.typ, and the builtin
index goldens, which are now one row shorter.

75/75 snapshots, both unit suites, and the macOS ABI build all pass.

52 files changed, 971 insertions, 706 deletions

diff --git a/docs/design.typ b/docs/design.typ
index c6f0e73e..75c89812 100644
--- a/docs/design.typ
+++ b/docs/design.typ
@@ -201,8 +201,9 @@ the source (cursor row kept visible); dying pane's weight absorbed by one
 sibling; emptied column hands width to a neighbor; border-drag resize on a
 pane's own trailing edge (v and h), hover shows `╎`/`╌` glyph-only hints;
 move-drag via the gutter box with preview; Alt-n new shell below, Alt-c move
-pane to new column; Ctrl-w h/j/k/l directional focus; body-normal Esc toggles
-between the latest document and terminal (the same builtin as SPC w t);
+pane to new column; Ctrl-w h/j/k/l directional focus; body-normal Esc hops to
+the pane you were in before this one, alternating between two (the same
+builtin as SPC j j);
 `--tty` single-pane mode.
 
 *Mouse.* Left: select (block, stays highlighted after drag, pins cursor,
diff --git a/docs/helix-keys.md b/docs/helix-keys.md
index 23f8f926..13a9a279 100644
--- a/docs/helix-keys.md
+++ b/docs/helix-keys.md
@@ -83,7 +83,7 @@ with a reason in `test/hxcases/waivers.jsonl`.
 | `y` | yank selection; bare cursor yanks the 1-wide selection (char under cursor) | line-yank vim-ism removed (phase 5); yank keeps selection AND cursor (helix). Also emits `set_clipboard` (OSC 52 out) | helix-verified |
 | `u` / `U` | undo / redo | restores the pre-edit selection (helix); snapshot granularity, no `Alt-u`/`Alt-U` history walking (skipped) | helix-verified |
 | `p` (normal) | paste the core's yank register after the selection | helix default-register semantics; yank still mirrors OUT via OSC 52 (`set_clipboard`) but `p` never reads the system clipboard back — most terminals refuse the OSC 52 read, which left `p` a silent no-op | helix-verified |
-| `Esc` (body normal) | clear a pending modal prefix / exit select mode, keeping the selection, then run `Toggleterm`: hop between the most recently focused document and terminal, exactly like `SPC w t` | Pardes-specific focus binding layered on helix's cleanup. A leader path, tag, topbar or search owns Esc while it is active; raw tty forwards it | pardes-specific (cleanup helix-verified) |
+| `Esc` (body normal) | clear a pending modal prefix / exit select mode, keeping the selection, then run `Last`: hop to the pane you were in before this one, whichever kind it was, exactly like `SPC j j` — so held down it alternates between two panes, two files as readily as a file and its shell | Pardes-specific focus binding layered on helix's cleanup. A leader path, tag, topbar or search owns Esc while it is active; raw tty forwards it | pardes-specific (cleanup helix-verified) |
 | `Esc` (insert) | back to normal mode, cursor right after the insertion (no vim left-step) | | helix-verified |
 | `Enter` (normal) | acme **look** chord: EXPLICIT selection, else file-ish word under cursor | pardes-specific, keep (helix normal-mode Enter unbound). Covers helix `gf`. Implicit motion residue falls back to the cursor word | pardes-specific |
 | `Tab` (normal) | acme **execute** chord | pardes-specific, keep; explicit-selection rule as Enter | pardes-specific |
@@ -92,7 +92,7 @@ with a reason in `test/hxcases/waivers.jsonl`.
 | `Ctrl-w` + `h/j/k/l`/arrows | directional pane focus prefix — normal/tty modes only | pardes' own window handling (helix window mode skipped, section C). Runs the SAME `Left`/`Down`/`Up`/`Right` builtins `SPC w h/j/k/l` runs; kept alongside the leader because a pane in raw **tty** mode never sees `SPC` (the shell owns it), so this is the only keyboard way out of one. Insert mode owns `Ctrl-w` = delete-word-back, so a tag being TYPED into swallows it; from a tag in normal mode (`:`) it moves focus to the neighbour's BODY, while the bare letters `h/j/k/l` there move to its TAGLINE (next row) | pardes-specific |
 | `Alt-n` | new terminal below (any mode) | shadows helix `Alt-n` TS sibling-select — skipped anyway (tree-sitter) | pardes-specific |
 | `Alt-c` | move active terminal to a fresh column (any mode) | helix `Alt-c` is change-noyank; the pardes window op wins (do-not-touch contract). `Alt-d` + `i` covers the behavior | waived (`alt-c-window-op`) |
-| `Space` (normal, body) | the pardes LEADER: a key path from here runs a BUILTIN with no arguments — the same builtins the topbar and the tags hold. `SPC k` Kill, `SPC d` Del, `SPC f s` Save, `SPC f n` New (an empty temporary file focused in the calling pane's column), `SPC f f` Find (fd over the pane's directory, results into `+Search`), `SPC f g` Grep (grep -R over the CONTENTS of every pane's directory, the ones another pane already covers dropped, rows relative to the asking pane's own directory, results into `+Search`; like Find it takes an ARGUMENT — `Grep foo` executed, or a selection chorded onto the word, searches that and skips the input), `SPC h t` Tutor, `SPC c n`/`SPC c d` Newcol/Delcol, `SPC t d/c/n/r` Debug/Colors/NextColor/Crt, `SPC t t` ThemeSel (the whole theme ring as `Theme <name>` rows in an output buffer — the one list whose rows are COMMANDS, so n/N execute each row instead of looking it and stepping is a live preview), `SPC t p/l/a` Petscii/Palette/Ascii (an image pane's renderer toggles — the words its tag used to spell out, so the bar stays a bar), `SPC s d`/`SPC s r` Dump/Restore, `SPC w h/j/k/l` Left/Down/Up/Right (directional pane focus — the `Ctrl-w` prefix's four moves as builtins), `SPC w t` Toggleterm (focus hops between the most recently focused document — file, image or `+Search`/`+Help` buffer — and the most recently focused terminal; the same key hops back). `?` at ANY depth opens the Help builtin listing what the prefix can still reach (`SPC ?` = all, `SPC h ?` = the docs group), into a `+Help` output buffer. The pending path shows at the right edge of the active pane's tag; Esc — or any unmapped key — abandons it | helix spends Space on pickers/LSP (section C); pardes has neither, and acme's builtins are what a leader is for. Enum-derived: the paths, the Help lines and the execute dispatch all fold out of one `Builtin` enum at comptime. Normal mode on a BODY only — tags are always insert, tty keys belong to the program | pardes-specific |
+| `Space` (normal, body) | the pardes LEADER: a key path from here runs a BUILTIN with no arguments — the same builtins the topbar and the tags hold. `SPC k` Kill, `SPC d` Del, `SPC f s` Save, `SPC f n` New (an empty temporary file focused in the calling pane's column), `SPC f f` Find (fd over the pane's directory, results into `+Search`), `SPC f g` Grep (grep -R over the CONTENTS of every pane's directory, the ones another pane already covers dropped, rows relative to the asking pane's own directory, results into `+Search`; like Find it takes an ARGUMENT — `Grep foo` executed, or a selection chorded onto the word, searches that and skips the input), `SPC h t` Tutor, `SPC c n`/`SPC c d` Newcol/Delcol, `SPC t d/c/n/r` Debug/Colors/NextColor/Crt, `SPC t t` ThemeSel (the whole theme ring as `Theme <name>` rows in an output buffer — the one list whose rows are COMMANDS, so n/N execute each row instead of looking it and stepping is a live preview), `SPC t p/l/a` Petscii/Palette/Ascii (an image pane's renderer toggles — the words its tag used to spell out, so the bar stays a bar), `SPC s d`/`SPC s r` Dump/Restore, `SPC w h/j/k/l` Left/Down/Up/Right (directional pane focus — the `Ctrl-w` prefix's four moves as builtins), `SPC j o`/`SPC j i`/`SPC j j`/`SPC j l` Back/Forward/Last/Jumplist (the jump stack: walk it back, walk it forward, hop to the pane before this one — what body-normal Esc runs — and read the stack as a clickable buffer). `?` at ANY depth opens the Help builtin listing what the prefix can still reach (`SPC ?` = all, `SPC h ?` = the docs group), into a `+Help` output buffer. The pending path shows at the right edge of the active pane's tag; Esc — or any unmapped key — abandons it | helix spends Space on pickers/LSP (section C); pardes has neither, and acme's builtins are what a leader is for. Enum-derived: the paths, the Help lines and the execute dispatch all fold out of one `Builtin` enum at comptime. Normal mode on a BODY only — tags are always insert, tty keys belong to the program | pardes-specific |
 | `/` then `n`/`N` (any pane) | pardes' own plain-substring search into a `+Search` output buffer, n/N walk the result rows and look them (EXPLICIT selections) | KEEP, do not touch; not in the corpus (helix `/` is regex search) | pardes-specific |
 | `n`/`N` (terminal panes, no search armed) | lookable-token motion over scrollback (EXPLICIT selections) | KEEP, do not touch | pardes-specific |
 | insert: printable text | file: real edit; terminal: typed run splice | | helix-verified (file) |
diff --git a/src/builtins.zig b/src/builtins.zig
index 9fa459f2..b1380203 100644
--- a/src/builtins.zig
+++ b/src/builtins.zig
@@ -526,40 +526,6 @@ pub const Right = struct {
     }
 };
 
-/// The file<->terminal hop. "Latest" is already recorded: the jump stack runs
-/// oldest-first and a closing pane hands focus back through the same list — so
-/// this walks it instead of keeping a second one. Which side is which: only a
-/// shell is a terminal; a file, an image and an output buffer (+Search/+Help)
-/// are all DOCS you read, so isTerminal is the whole test. Landing pushes this
-/// pane onto that same history, which is why the hop back is the same key.
-pub const Toggleterm = struct {
-    pub fn run(c: Ctx) void {
-        const want_term = !c.pane.isTerminal();
-        var t: ?usize = null;
-        // any live pane of the other kind: a pane you have never focused (the
-        // file you started with) is in no history at all
-        for (c.p.panes, 0..) |slot, k| {
-            const op = slot orelse continue;
-            if (k != c.id and op.isTerminal() == want_term) t = k;
-        }
-        // ...but the most recently focused one wins
-        var i = c.p.njumps;
-        while (i > 0) {
-            i -= 1;
-            const hid = c.p.jumps[i].pane;
-            const hp = c.p.panes[hid] orelse continue;
-            if (hid != c.id and hp.isTerminal() == want_term) {
-                t = hid;
-                break;
-            }
-        }
-        if (t) |target| {
-            c.p.active = target;
-            c.p.panes[target].?.pending = 0;
-        }
-    }
-};
-
 // ---- the jump group ----
 
 // Where focus HAS BEEN, as three verbs and a list over the one stack pardes
@@ -583,12 +549,20 @@ pub const Forward = struct {
 };
 
 /// vim's Ctrl-^: the pane you were in before this one, whichever it was — the
-/// hop you press twice a minute and never want to count steps for.
+/// hop you press twice a minute and never want to count steps for. Body-normal
+/// Esc is this, which is what makes alternating between two panes one key you
+/// hold down: two files, or a file and its shell, or a file and a +Search.
 ///
 /// It does NOT move the stack cursor: it goes somewhere, so trackJump records
 /// it like any other move, and that is exactly what makes it an involution —
 /// after the hop, the pane you came from is the newest OTHER pane, so pressing
 /// it again comes straight back. Back/Forward walk history; this one makes it.
+///
+/// It replaced a `Toggleterm` that hopped specifically between the newest DOC
+/// and the newest TERMINAL. That distinction never earned its keep: it made Esc
+/// unpredictable (which of three panes you landed on depended on their kinds),
+/// and it could not alternate between two files at all — the case you hit most.
+/// "The pane before this one" needs no kinds and is the same key twice.
 pub const Last = struct {
     pub fn run(c: Ctx) void {
         var i = c.p.njumps;
diff --git a/src/config.zig b/src/config.zig
index 9451a2a7..93395406 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -144,7 +144,6 @@ pub const leader_path = paths: {
         .Down = "wj",
         .Up = "wk",
         .Right = "wl",
-        .Toggleterm = "wt",
         // the `j` JUMP group, its own letter rather than more of `w`: the window
         // group moves focus by GEOMETRY (the pane left of this one), these move it
         // by TIME (the pane I was in before). `o` and `i` are the letters of the
@@ -311,6 +310,18 @@ pub const topbar_str = "New Newcol Find Grep Help Tutor Dump NextColor Debug Kil
 pub const pane_builtins_str = "New Del";
 pub const file_pane_builtins_str = "Save New Del";
 
+/// Columns kept clear to the RIGHT of a tagline's builtins. The path stays at
+/// the left edge and the builtins are pushed over to end this far short of the
+/// pane's, which leaves somewhere to type: a word executed from the tagline is
+/// how you run anything here, and with the builtins hard against the edge
+/// there was nowhere to put one without first making room.
+///
+/// The gap that does the pushing is made of ordinary spaces inside the tag, so
+/// both it and this run are editable text — see Pardes.tagGap. Widen it and
+/// every untouched tagline reflows on the next frame; taglines you have
+/// already edited keep the spacing you left them with.
+pub const tag_right_pad: u16 = 20;
+
 /// the pane's mode, as ONE character in the layout box at its top-left — live
 /// chrome, not text you own. It used to be a three-letter word leading every
 /// tagline; the box was already there carrying no information at all, so the
@@ -807,9 +818,11 @@ pub const redo: []const Chord = &.{.{ .cp = 'U' }};
 /// where it is still SIGINT.
 pub const comment_toggle: []const Chord = &.{.{ .cp = 'c', .ctrl = true }};
 
-/// In body normal mode, clear modal residue and run Toggleterm (the same
-/// builtin as `SPC w t`). Elsewhere: leave insert mode; abandon a leader path,
-/// tag, armed search or the topbar; raw tty mode forwards it to the program.
+/// In body normal mode, clear modal residue and run Last (the same builtin as
+/// `SPC j j`): the pane you were in before this one, whichever it was. Held
+/// down it alternates between two panes — two files, or a file and its shell.
+/// Elsewhere: leave insert mode; abandon a leader path, tag, armed search or
+/// the topbar; raw tty mode forwards it to the program.
 pub const escape: []const Chord = &.{.{ .cp = Key.escape }};
 
 // ---- insert mode ----
diff --git a/src/pardes.zig b/src/pardes.zig
index 5d0ff9fb..8c1e22f4 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -1800,8 +1800,12 @@ test "pane-tag Exec prefers New and argument builtins before shell fallback" {
 
     // A real middle-click on the canonical pane-tag word reaches Exec, which
     // must consume New as a builtin before any write can reach the shell.
-    p.update(.{ .mouse = .{ .button = config.exec_button, .kind = .press, .col = tag_x + 1, .row = tag_y } });
-    p.update(.{ .mouse = .{ .button = config.exec_button, .kind = .release, .col = tag_x + 1, .row = tag_y } });
+    // The builtins are right-aligned (see tagGap), so the column is found in
+    // the rendered tag rather than assumed to be at its left edge.
+    const rendered = try p.tagText(p.scratch.allocator(), pane);
+    const new_x = tag_x + @as(u16, @intCast(std.mem.indexOf(u8, rendered, "New").?)) + 1;
+    p.update(.{ .mouse = .{ .button = config.exec_button, .kind = .press, .col = new_x, .row = tag_y } });
+    p.update(.{ .mouse = .{ .button = config.exec_button, .kind = .release, .col = new_x, .row = tag_y } });
     var saw_new = false;
     while (p.nextEffect()) |effect| switch (effect) {
         .new_file => |request| {
@@ -3938,7 +3942,7 @@ pub const Pardes = struct {
     /// the entries past it are the ones Ctrl-i walks forward into). Maintained
     /// in exactly one place — sync() — and read by everything that asks "where
     /// was I": Back/Forward, Last, the Jumplist buffer, prevFocus when a pane
-    /// closes, Toggleterm, and the directory order a look resolves in.
+    /// closes, Last, and the directory order a look resolves in.
     ///
     /// One list, not two. A jumplist kept beside a focus history is two things
     /// to keep agreeing, and they would disagree the first time one of them
@@ -4520,24 +4524,72 @@ pub const Pardes = struct {
         return pane_tail;
     }
 
-    /// the tag exactly as it is rendered: prefix ++ tail. THE text tag_col and
-    /// tag_anchor index, so the renderer, the mouse, the motions and the chord
-    /// all read the same bytes at the same columns.
+    fn paneIdOf(p: *const Pardes, pane: *const Pane) ?usize {
+        for (p.panes, 0..) |slot, id| if (slot) |sp| {
+            if (sp == pane) return id;
+        };
+        return null;
+    }
+
+    /// Spaces to sit between the path and the commands, so the commands END
+    /// `tag_right_pad` columns short of the pane's edge — right-aligned, with
+    /// that many columns left free to type in.
+    ///
+    /// Real spaces rather than a second print at an offset, because the tag is
+    /// ONE buffer that tag_col, the mouse, the motions and the chord all index
+    /// by the same columns; two separately-positioned pieces would need a
+    /// column-to-offset map that none of them has. Being characters is also
+    /// what makes both paddings editable, which is the point: `:` lands at the
+    /// start of this gap, and there are `tag_right_pad` free columns past the
+    /// commands to type into.
+    ///
+    /// Zero once the tag has been touched. From then on the spaces are IN
+    /// tag_tail and belong to you — recomputing would both double them and
+    /// slide the commands sideways under your cursor as you type. So an
+    /// untouched tag reflows with the pane and an edited one stays put.
+    fn tagGap(p: *const Pardes, pane: *const Pane, used: usize) usize {
+        if (pane.tag_init) return 0;
+        const id = p.paneIdOf(pane) orelse return 0;
+        const w = p.rects[id].w;
+        if (w <= config.GUTTER) return 0;
+        const tw: usize = w - config.GUTTER;
+        return (tw -| config.tag_right_pad) -| used;
+    }
+
+    /// the tag exactly as it is rendered: prefix ++ gap ++ tail. THE text
+    /// tag_col and tag_anchor index, so the renderer, the mouse, the motions
+    /// and the chord all read the same bytes at the same columns.
     fn tagText(p: *Pardes, arena: std.mem.Allocator, pane: *Pane) ![]u8 {
-        return std.fmt.allocPrint(arena, "{s}{s}", .{ try p.tagPrefix(pane), curTail(pane) });
+        const prefix = try p.tagPrefix(pane);
+        const tail = curTail(pane);
+        const gap = p.tagGap(pane, prefix.len + tail.len);
+        const out = try arena.alloc(u8, prefix.len + gap + tail.len);
+        @memcpy(out[0..prefix.len], prefix);
+        @memset(out[prefix.len..][0..gap], ' ');
+        @memcpy(out[prefix.len + gap ..], tail);
+        return out;
+    }
+
+    /// Take the laid-out tail into the pane's own buffer, once, on first touch.
+    /// The gap comes along as ordinary characters — that is what hands the
+    /// padding to you to edit, and what freezes it against reflow from here on.
+    fn seedTail(p: *Pardes, pane: *Pane) void {
+        if (pane.tag_init) return;
+        const tail = curTail(pane);
+        const prefix_len = (p.tagPrefix(pane) catch return).len;
+        pane.tag_tail.appendNTimes(p.gpa, ' ', p.tagGap(pane, prefix_len + tail.len)) catch return;
+        pane.tag_tail.appendSlice(p.gpa, tail) catch return;
+        pane.tag_init = true;
     }
 
     /// focus the tag for editing, seeding the tail on first touch and parking
     /// the cursor at `col` — a column of the RENDERED tag (see tag_col).
-    /// NEGATIVE means the first EDITABLE column, which is where `:` and a
-    /// tagline hop land: a place no click can name, so it needs no sentinel of
-    /// its own and the callers need no prefix length.
+    /// NEGATIVE means the tail's first WORD, which is where `:` and a tagline
+    /// hop land: a place no click can name, so it needs no sentinel of its own
+    /// and the callers need no prefix length.
     fn enterTagEdit(p: *Pardes, pane: *Pane, col: i32) void {
         const edit0: i32 = @intCast((p.tagPrefix(pane) catch return).len);
-        if (!pane.tag_init) {
-            pane.tag_tail.appendSlice(p.gpa, curTail(pane)) catch return;
-            pane.tag_init = true;
-        }
+        p.seedTail(pane);
         if (!pane.tag_edit) pane.tag_mode = pane.mode;
         pane.tag_edit = true;
         pane.tag_sel = false;
@@ -4545,7 +4597,15 @@ pub const Pardes = struct {
         pane.mode = .insert;
         pane.pending = 0;
         const end = edit0 + @as(i32, @intCast(pane.tag_tail.items.len));
-        pane.tag_col = @intCast(if (col < 0) edit0 else std.math.clamp(col, 0, end));
+        // Past the gap that right-aligns the builtins, not at the first
+        // editable column: `:` promises the tail's START, and the start of a
+        // run of layout spaces is not it. Landing there would cost `:w` its
+        // second keystroke — w would select the whitespace and execute nothing
+        // — and `:w` being the same two keys every time is the whole point of
+        // the door. The spaces stay editable; h and Left still walk into them.
+        const tail = pane.tag_tail.items;
+        const lead: i32 = @intCast(tail.len - std.mem.trimStart(u8, tail, " ").len);
+        pane.tag_col = @intCast(if (col < 0) @min(edit0 + lead, end) else std.math.clamp(col, 0, end));
     }
 
     fn exitTagEdit(pane: *Pane) void {
@@ -5011,10 +5071,16 @@ pub const Pardes = struct {
         // path. Shift-Esc needs a host that reports modifiers on Escape (the
         // kitty keyboard protocol); where it doesn't it arrives as a plain
         // Escape and still means what Escape always means.
-        const tty_toggle = (key.ctrl and key.cp == p.opts.tty_toggle) or
-            hit(key, config.tty_toggle_alt);
+        const tty_alt = hit(key, config.tty_toggle_alt);
+        const tty_toggle = (key.ctrl and key.cp == p.opts.tty_toggle) or tty_alt;
         if (pane.isTerminal() and tty_toggle) {
             if (pane.mode == .tty) {
+                // Shift-Esc IN tty is what Escape is in normal mode: Last,
+                // the pane you were in before this one. The pane keeps its tty
+                // mode, so coming back lands you in the program you left rather
+                // than in normal mode on top of it — and Ctrl-<the configured
+                // key> is still how you leave tty in place.
+                if (tty_alt) return p.runBuiltin(.Last, p.active, "", null);
                 pane.mode = .normal;
                 pane.pending = 0;
             } else p.enterTty(p.active);
@@ -6387,7 +6453,7 @@ pub const Pardes = struct {
         switch (semantic) {
             .escape => {
                 pane.select = false;
-                return p.runBuiltin(.Toggleterm, p.active, "", null);
+                return p.runBuiltin(.Last, p.active, "", null);
             },
             .goto => |go| switch (go.target) {
                 .file_start => {
@@ -6657,10 +6723,7 @@ pub const Pardes = struct {
     fn startPipe(p: *Pardes, pane: *Pane) void {
         const f = pane.file orelse return;
         if (!output_pane.fileTraits(f.output).saves) return;
-        if (!pane.tag_init) {
-            pane.tag_tail.appendSlice(p.gpa, curTail(pane)) catch return;
-            pane.tag_init = true;
-        }
+        p.seedTail(pane);
         pane.pipe_at = @intCast(pane.tag_tail.items.len);
         pane.tag_tail.appendSlice(p.gpa, config.pipe_marker) catch return;
         pane.pipe_edit = true;
@@ -6876,10 +6939,7 @@ pub const Pardes = struct {
     /// tail after `marker` — the existing modal one-line editor, visible while
     /// typing, nothing that disappears. Enter/Esc are intercepted in handleKey.
     pub fn startSearch(p: *Pardes, pane: *Pane, marker: []const u8) void {
-        if (!pane.tag_init) {
-            pane.tag_tail.appendSlice(p.gpa, curTail(pane)) catch return;
-            pane.tag_init = true;
-        }
+        p.seedTail(pane);
         pane.search_at = @intCast(pane.tag_tail.items.len);
         pane.tag_tail.appendSlice(p.gpa, marker) catch return;
         pane.search_edit = true;
@@ -10572,7 +10632,7 @@ pub const Pardes = struct {
         switch (semantic) {
             .escape => {
                 pane.select = false;
-                return p.runBuiltin(.Toggleterm, p.active, "", null);
+                return p.runBuiltin(.Last, p.active, "", null);
             },
             .move => |move| switch (move.motion) {
                 .down => p.movePdfRows(pane, 1, move.count),
@@ -11438,7 +11498,14 @@ pub const Pardes = struct {
             if (output_pane.fileTraits(f.output).saves) legacy_file_pane_tail else legacy_pane_tail
         else
             legacy_pane_tail;
-        if (std.mem.eql(u8, rest, curTail(pane)) or std.mem.eql(u8, rest, legacy)) return;
+        // A saved tag carries its layout gap, because the padding is real
+        // characters — and the pane it is restored into is very often a
+        // different width than the one it was dumped from. So compare what the
+        // tail SAYS and not where it sat: leading spaces are layout, never
+        // content, and a default that came back padded is still a default.
+        const said = std.mem.trimStart(u8, rest, " ");
+        if (std.mem.eql(u8, said, std.mem.trimStart(u8, curTail(pane), " ")) or
+            std.mem.eql(u8, said, std.mem.trimStart(u8, legacy, " "))) return;
         pane.tag_tail.appendSlice(p.gpa, rest) catch return;
         pane.tag_init = true;
     }
@@ -11489,6 +11556,18 @@ pub const Pardes = struct {
     /// two entries per keystroke. That transparency is the whole reason the
     /// rule lives in sync() rather than at the sites that move focus, which is
     /// where the heuristics used to be scattered.
+    /// The same PLACE, which is the one question the push rule asks: the same
+    /// live pane, and near enough within it that the cursor was only strolling.
+    /// Distance is a bodyful because that is what "you cannot see it any more"
+    /// means on a screen. A location with no line — an unpinned shell, whose
+    /// cursor belongs to the program — has no distance to be at.
+    fn samePlace(p: *const Pardes, a: Loc, b: Loc) bool {
+        if (a.pane != b.pane or a.serial != b.serial) return false;
+        if (a.line == 0 or b.line == 0) return true;
+        const body = @max(1, p.rects[b.pane].h -| BOX_H);
+        return @max(a.line, b.line) - @min(a.line, b.line) <= body;
+    }
+
     fn trackJump(p: *Pardes) void {
         // dead entries first, in one compacting pass. A slot is reused, so the
         // test is the SERIAL: an entry whose pane has been replaced names a
@@ -11519,19 +11598,35 @@ pub const Pardes = struct {
             .line = if (pane.pdfPage()) |page| @intCast(page + 1) else if (pane.cur_pinned) @intCast(@max(0, pane.cur_row) + 1) else 0,
             .col = if (pane.pdfPage() != null) 0 else if (pane.cur_pinned) @intCast(@max(0, pane.cur_col) + 1) else 0,
         };
-        if (p.njumps > 0) {
-            const at = &p.jumps[p.jcur];
-            const body = @max(1, p.rects[p.active].h -| BOX_H);
-            const far = at.line != 0 and now.line != 0 and
-                @max(now.line, at.line) - @min(now.line, at.line) > body;
-            if (at.pane == now.pane and !far) {
-                at.* = now; // same visit; the entry IS where you are
-                return;
-            }
+        if (p.njumps > 0 and p.samePlace(p.jumps[p.jcur], now)) {
+            p.jumps[p.jcur] = now; // same visit; the entry IS where you are
+            return;
         }
         // a new jump made from the middle of the list drops everything ahead of
         // it, the way vim's does: the future you did not take is not history.
         if (p.njumps > 0) p.njumps = p.jcur + 1;
+        // ...and neither is a hop STRAIGHT BACK to the entry under this one.
+        // That is not two jumps, it is the same two places again: Esc between a
+        // doc and its shell, `SPC w k` / `SPC w j`, clicking back and forth.
+        // Appending would grow the stack by one per press until the ping-pong
+        // is the only thing it remembers — sixty-four presses and every older
+        // place is gone.
+        //
+        // So SWAP the two instead of appending, rather than the other obvious
+        // move of leaving them alone and walking jcur back down onto the older
+        // one. The stack has a second job: it is also the focus history, and
+        // prevFocus, Last and the look order all read it backwards on the
+        // promise that it "runs least-recent -> active". Parking jcur mid-array
+        // leaves the pane you are IN somewhere other than the top and quietly
+        // breaks all three — a look would resolve against the directory of the
+        // pane you just left before the one you are in. Swapping keeps the
+        // promise, keeps the length, and leaves Ctrl-o stepping out past both.
+        if (p.njumps >= 2 and p.samePlace(p.jumps[p.njumps - 2], now)) {
+            p.jumps[p.njumps - 2] = p.jumps[p.njumps - 1];
+            p.jumps[p.njumps - 1] = now;
+            p.jcur = p.njumps - 1;
+            return;
+        }
         if (p.njumps == MAX_JUMPS) {
             std.mem.copyForwards(Loc, p.jumps[0 .. MAX_JUMPS - 1], p.jumps[1..]);
             p.njumps -= 1;
@@ -11694,6 +11789,7 @@ pub const Pardes = struct {
         s.cursor = null;
         s.nimages = 0;
         const chrome = p.chromeTheme();
+        const th = p.theme(); // the message row paints in the editor's colours
         // gaps between panes read as chrome (scrollbar track), not raw default
         s.fill(0, 0, s.cols, s.rows, .{ .bg = .{ .rgb = chrome.scroll_track } });
 
@@ -11740,16 +11836,45 @@ pub const Pardes = struct {
                 pane.tag_tail.items[@min(at, pane.tag_tail.items.len)..]
             else
                 pane.msg[0..pane.msg_len];
-            if (text.len == 0) continue;
+            // The pending SPC path is the third thing that wants this row, and
+            // it can want it while the row is otherwise empty.
+            const leader_here = id == p.active and p.leader_on;
+            if (text.len == 0 and !leader_here) continue;
             const tx = r.x + config.GUTTER;
             const tw = r.w - config.GUTTER;
             const row = r.y + r.h - 1;
+            // In the EDITOR's colours, not the tag bar's: this row is the one
+            // place the program talks back to you about the buffer you are in,
+            // and it reads as part of that buffer rather than as another strip
+            // of chrome. th and not chrome for the same reason a selection
+            // uses th — it is not attached to any geometry, so it arrives with
+            // the theme instead of sliding in over the chrome animation.
+            const msg_style: CellStyle = .{
+                .fg = if (th.fg) |c| .{ .rgb = c } else .default,
+                .bg = if (th.bg) |c| .{ .rgb = c } else .default,
+            };
             // the WHOLE row, the way the tagline fills its own before printing:
             // a message is a section and not a stamp, and print writes only the
             // cells it needs — so without the fill the body row shows through
             // to the right of a short message and reads as one garbled line.
-            s.fill(tx, row, tw, 1, .{ .bg = .{ .rgb = chrome.tag_bg } });
-            _ = s.print(tx, row, tw, text, .{ .fg = .{ .rgb = chrome.tag_fg }, .bg = .{ .rgb = chrome.tag_bg } });
+            s.fill(tx, row, tw, 1, .{ .bg = msg_style.bg });
+            if (text.len > 0) _ = s.print(tx, row, tw, text, msg_style);
+            // The pending SPC leader path, right-aligned. It used to sit on the
+            // active pane's tagline, where it had to fight the builtins in the
+            // tail for the same columns; down here it is beside the rest of the
+            // transient state, and printed AFTER the message so a long one
+            // loses its last columns rather than hiding what you are typing.
+            if (leader_here) {
+                var ibuf: [16]u8 = @splat(' ');
+                @memcpy(ibuf[1..4], "SPC");
+                var iw: usize = 4;
+                for (p.leader_keys[0..p.leader_n]) |ch| {
+                    ibuf[iw + 1] = ch;
+                    iw += 2;
+                }
+                const w: u16 = @intCast(iw);
+                if (w < tw) _ = s.print(tx + tw - w, row, w, ibuf[0..iw], msg_style);
+            }
             // ...and the cursor follows the text it edits. tag_col is a
             // rendered-tag column, so the prompt's own column is it minus where
             // the marker starts; a cursor LEFT of that is still over the part
@@ -11970,23 +12095,6 @@ pub const Pardes = struct {
         else
             tag.len;
         _ = s.print(tx, r.y, tw, tag[0..tag_cut], tag_style);
-        // pending SPC leader path, on the ACTIVE pane's tag at its RIGHT edge:
-        // the same rule as the `/` input — state you can see, nothing that
-        // disappears — but right-aligned, so it never collides with the
-        // builtins in the tail. Printed AFTER the tag, so a tag long enough to
-        // reach it loses its last columns instead: what you are about to press
-        // beats the path, which is still readable in the prefix.
-        if (active and p.leader_on) {
-            var ibuf: [16]u8 = @splat(' ');
-            @memcpy(ibuf[1..4], "SPC");
-            var iw: usize = 4;
-            for (p.leader_keys[0..p.leader_n]) |ch| {
-                ibuf[iw + 1] = ch;
-                iw += 2;
-            }
-            const w: u16 = @intCast(iw);
-            if (w < tw) _ = s.print(tx + tw - w, r.y, w, ibuf[0..iw], tag_style);
-        }
         // tag char selection highlight (helix v/x, or a tagline sweep),
         // inclusive [lo, hi] — rendered-tag columns, so no conversion.
         //
@@ -12563,3 +12671,117 @@ pub const Pardes = struct {
         return term_pane.bodyText(arena, pane);
     }
 };
+
+test "Esc alternates between two panes of the SAME kind" {
+    if (platform == .web) return;
+    const gpa = std.testing.allocator;
+    // An ABSOLUTE boot path, the way main.zig resolves argv: a file pane's
+    // directory is its path's dirname, and a relative one leaves nothing for
+    // the look below to resolve against.
+    var cwdbuf: [4096]u8 = undefined;
+    const cwd = std.mem.span(@as([*:0]u8, @ptrCast(std.c.getcwd(&cwdbuf, cwdbuf.len) orelse return)));
+    var pathbuf: [4096]u8 = undefined;
+    const boot = try std.fmt.bufPrint(&pathbuf, "{s}/mise.toml", .{cwd});
+
+    const p = try Pardes.init(gpa, .{ .cols = 80, .rows = 40, .file = boot });
+    defer p.deinit();
+    p.update(.{ .resize = .{ .cols = 80, .rows = 40 } });
+    const a = p.active;
+    // A second FILE. This is the case the doc<->terminal hop Esc used to run
+    // could not do AT ALL: both panes are docs, so it had nothing of "the other
+    // kind" to reach and Esc did nothing.
+    p.runBuiltin(.Look, a, "", "build.zig");
+    p.sync();
+    const b = p.active;
+    try std.testing.expect(b != a);
+    try std.testing.expect(!p.panes[a].?.isTerminal() and !p.panes[b].?.isTerminal());
+
+    for (0..6) |_| {
+        const was = p.active;
+        p.update(.{ .key = .{ .cp = Key.escape } });
+        try std.testing.expectEqual(if (was == a) b else a, p.active);
+    }
+}
+
+test "Shift-Esc in tty hops to the doc and leaves the shell in tty" {
+    if (platform == .web) return;
+    const gpa = std.testing.allocator;
+    const p = try Pardes.init(gpa, .{ .cols = 80, .rows = 24, .file = "mise.toml" });
+    defer p.deinit();
+    p.update(.{ .resize = .{ .cols = 80, .rows = 24 } });
+    p.update(.{ .key = .{ .cp = 'n', .alt = true } }); // a shell under the doc
+    const shell = p.active;
+    const shell_pane = p.panes[shell].?;
+    try std.testing.expect(shell_pane.isTerminal());
+
+    // Shift-Esc still gets you IN, exactly as the configured Ctrl-key does.
+    const shift_esc: Key = .{ .cp = Key.escape, .shift = true };
+    p.update(.{ .key = shift_esc });
+    try std.testing.expectEqual(Mode.tty, shell_pane.mode);
+
+    // ...and out of tty it is Escape-in-normal-mode instead of a toggle: the
+    // doc takes focus and the shell KEEPS its tty mode, so coming back lands
+    // in the program you left rather than in normal mode on top of it.
+    p.update(.{ .key = shift_esc });
+    try std.testing.expect(p.active != shell);
+    try std.testing.expect(!p.panes[p.active].?.isTerminal());
+    try std.testing.expectEqual(Mode.tty, shell_pane.mode);
+
+    // The configured Ctrl-key is now the only thing that leaves tty in place.
+    p.update(.{ .key = .{ .cp = Key.escape, .shift = true } }); // back to the shell
+    try std.testing.expectEqual(shell, p.active);
+    p.update(.{ .key = .{ .cp = p.opts.tty_toggle, .ctrl = true } });
+    try std.testing.expectEqual(Mode.normal, shell_pane.mode);
+    try std.testing.expectEqual(shell, p.active);
+}
+
+test "hopping between two panes does not grow the jump stack" {
+    if (platform == .web) return;
+    const gpa = std.testing.allocator;
+    const p = try Pardes.init(gpa, .{ .cols = 80, .rows = 24, .file = "mise.toml" });
+    defer p.deinit();
+    p.update(.{ .resize = .{ .cols = 80, .rows = 24 } });
+    p.update(.{ .key = .{ .cp = 'n', .alt = true } }); // a shell under the doc
+    const doc = 0;
+    const shell = p.active;
+    try std.testing.expect(shell != doc);
+    const depth = p.njumps;
+
+    // Esc is Last — the everyday two-pane hop. Each press used to
+    // append, so sixty-four of them left the stack remembering nothing else.
+    for (0..8) |_| {
+        const was = p.active;
+        p.update(.{ .key = .{ .cp = Key.escape } });
+        try std.testing.expect(p.active != was);
+    }
+    try std.testing.expectEqual(depth, p.njumps);
+
+    // ...and so are the other two ways to switch panes.
+    for (0..8) |_| {
+        const want = if (p.active == doc) shell else doc;
+        const dir: u21 = if (p.active == doc) 'j' else 'k';
+        p.update(.{ .key = .{ .cp = ' ' } });
+        p.update(.{ .key = .{ .cp = 'w' } });
+        p.update(.{ .key = .{ .cp = dir } });
+        try std.testing.expectEqual(want, p.active);
+    }
+    try std.testing.expectEqual(depth, p.njumps);
+
+    for (0..8) |_| {
+        const other = if (p.active == doc) shell else doc;
+        const r = p.rects[other];
+        p.update(.{ .mouse = .{ .button = .left, .kind = .press, .col = r.x + config.GUTTER + 1, .row = r.y + BOX_H + 1 } });
+        p.update(.{ .mouse = .{ .button = .left, .kind = .release, .col = r.x + config.GUTTER + 1, .row = r.y + BOX_H + 1 } });
+        try std.testing.expectEqual(other, p.active);
+    }
+    try std.testing.expectEqual(depth, p.njumps);
+
+    // The collapse must not eat history: Back still walks OUT of the ping-pong
+    // to the place before it, which is what makes the entry a cursor move
+    // rather than a deletion.
+    const before = p.active;
+    p.runBuiltin(.Back, p.active, "", null);
+    p.sync();
+    try std.testing.expect(p.active != before);
+    try std.testing.expectEqual(depth, p.njumps);
+}
diff --git a/src/tutor.txt b/src/tutor.txt
index 1d01d626..1d51a4ac 100644
--- a/src/tutor.txt
+++ b/src/tutor.txt
@@ -227,12 +227,14 @@
    TTY     ($)  the REAL shell — prompts + typed input shown, and keys
                 go straight to the pty as terminal input.
 
- ESC:    insert -> normal; from body NORMAL it hops between the last
-         document and last terminal (the same Toggleterm as SPC w t).
+ ESC:    insert -> normal; from body NORMAL it hops to the pane you
+         were in before this one, whichever it was (the same Last as
+         SPC j j) — so held down it alternates between two panes.
          In raw TTY it still goes to the program.
- Ctrl-b: toggles TTY on a terminal by default; SHIFT-ESC is the same
-         toggle, where the host reports modifiers on Escape. Those are
-         the ONLY ways in or out.
+ Ctrl-b: toggles TTY on a terminal, and is the only way back OUT of it.
+         SHIFT-ESC gets you IN, and once in TTY it does what ESC does in
+         normal mode — hops away, leaving this pane in TTY so coming
+         back lands you in the program you left.
          Use `pardes --tty-toggle=g` (or another letter) to make Ctrl-g
          the toggle instead. Entering is tty-native: if the shell is at
          a prompt and your modal cursor sits on the input line, it first
@@ -494,8 +496,9 @@
    Ctrl-w h/j/k/l   focus the pane left/down/up/right (SPC w h/j/k/l
                     does the same; Ctrl-w also reaches a tty pane,
                     where SPC belongs to the shell)
-   Esc              hop between the last document and last terminal
-                    (body normal mode; the same builtin as SPC w t)
+   Esc              hop to the pane you were in before this one, so
+                    held down it alternates between two (body normal
+                    mode; the same builtin as SPC j j)
    Alt-n            new terminal below the active one
    Alt-c            move the active terminal into a fresh column
 
@@ -523,8 +526,9 @@
                     letters join the matcher's glyph set
    SPC s d / s r    Dump / Restore the session
    SPC w h/j/k/l    Left/Down/Up/Right: focus the pane that way
-   SPC w t          Toggleterm: hop between the last document you
-                    looked at and the last terminal, and back
+   SPC j o / j i    Back / Forward: walk the jump history
+   SPC j j          Last: the pane you were in before this one — what
+                    body-normal ESC runs, so it alternates
 
  `?` works at ANY depth: SPC ? lists everything, SPC h ? lists only
  what the "h" group holds. Help writes into a "+Help" OUTPUT BUFFER,
@@ -564,7 +568,7 @@
                 SPC = the leader: a key path runs a builtin (SPC ? lists
                 them; SPC k Kill, SPC d Del, SPC f s Save, SPC f f Find,
                 SPC f n New,
-                SPC w hjkl focus, SPC w t file <-> terminal)
+                SPC w hjkl focus, SPC j j the pane before this one)
 
  vs Helix: no multi-cursor; selection is LINE-first (x), plus v chars.
  vs Vim:  no verb+noun (dw); motions only move; body-normal Esc hops focus.
diff --git a/test/snapshots/argv.golden b/test/snapshots/argv.golden
index 02b5e2e6..1109132c 100644
--- a/test/snapshots/argv.golden
+++ b/test/snapshots/argv.golden
@@ -1,6 +1,6 @@
 == snap noargs grid=100x30 cursor=4,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|$ /tmp/pardes-snap/argv/cwd New Del
+|$ /tmp/pardes-snap/argv/cwd                                              New Del
 |  $ echo ARGV''TTY
 |  ARGVTTY
 |  $
@@ -31,7 +31,7 @@
 |
 == snap filearg grid=100x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/argv/cwd/notes.txt Save New Del
+|  /tmp/pardes-snap/argv/cwd/notes.txt                               Save New Del
 |     3 line 3
 |     4 line 4
 |     5 line 5
@@ -62,7 +62,7 @@
 |
 == snap filearg-n3 grid=100x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/argv/cwd/notes.txt Save New Del
+|  /tmp/pardes-snap/argv/cwd/notes.txt                               Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -93,7 +93,7 @@
 |
 == snap dirarg grid=100x30 cursor=4,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/argv/cwd/sub New Del
+|  /tmp/pardes-snap/argv/cwd/sub                                          New Del
 |
 |  inside.txt
 |
diff --git a/test/snapshots/badutf.golden b/test/snapshots/badutf.golden
index 6e30321c..dceef522 100644
--- a/test/snapshots/badutf.golden
+++ b/test/snapshots/badutf.golden
@@ -1,6 +1,6 @@
 == snap badbytes grid=100x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/badutf/cwd/bad.txt Save New Del
+|  /tmp/pardes-snap/badutf/cwd/bad.txt                               Save New Del
 |     1 hello �� world
 |     2 latin-1 caf� tail
 |     3 truncated �� here
diff --git a/test/snapshots/boot.golden b/test/snapshots/boot.golden
index a0eca707..d347b7eb 100644
--- a/test/snapshots/boot.golden
+++ b/test/snapshots/boot.golden
@@ -1,6 +1,6 @@
 == snap boot grid=100x30 cursor=4,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/boot/cwd New Del
+|  /tmp/pardes-snap/boot/cwd                                              New Del
 |
 |  hello.txt
 |
@@ -31,7 +31,7 @@
 |
 == style boot
 |0: 0-56 #949494,#121212, 57-99 d,#121212,
-|1: 0-1 #ffffff,#626262, 2-34 #949494,#121212, 35-99 d,#121212,
+|1: 0-1 #ffffff,#626262, 2-79 #949494,#121212, 80-99 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808,
diff --git a/test/snapshots/builtins.golden b/test/snapshots/builtins.golden
index 08c701d7..afee3f3f 100644
--- a/test/snapshots/builtins.golden
+++ b/test/snapshots/builtins.golden
@@ -1,6 +1,6 @@
 == snap boot grid=120x60 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del
+|  /tmp/pardes-snap/builtins/cwd/notes.txt                                               Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -61,7 +61,7 @@
 |
 == snap index grid=120x60 cursor=7,32
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del
+|  /tmp/pardes-snap/builtins/cwd/notes.txt                                               Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -91,7 +91,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/builtins/cwd/+Help New Del
+|  /tmp/pardes-snap/builtins/cwd/+Help                                                        New Del
 |     1 pardes builtins, and how to run each:
 |     2 SPC and its keys, a chord, a button, the
 |     3 topbar - or the name, executed anywhere.
@@ -122,7 +122,7 @@
 |    28 SPC l w   Lspwhy
 == snap index-tail grid=120x60 cursor=7,58
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del
+|  /tmp/pardes-snap/builtins/cwd/notes.txt                                               Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -152,7 +152,8 @@
 |
 |
 |
-|  /tmp/pardes-snap/builtins/cwd/+Help New Del
+|  /tmp/pardes-snap/builtins/cwd/+Help                                                        New Del
+|    24 SPC l i   Lspinfo
 |    25 SPC l k   Hover
 |    26 SPC l r   Rename
 |    27 SPC l s   Symbols
@@ -175,15 +176,14 @@
 |    44 SPC w j   Down            C-w j, C-w down
 |    45 SPC w k   Up              C-w k, C-w up
 |    46 SPC w l   Right           C-w l, C-w right
-|    47 SPC w t   Toggleterm
-|    48           Look            enter, right-click
-|    49           Exec            tab, middle-click
-|    50           Theme
-|    51           Shell
-|    52
+|    47           Look            enter, right-click
+|    48           Exec            tab, middle-click
+|    49           Theme
+|    50           Shell
+|    51
 == snap not-a-picker grid=120x60 cursor=7,58
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del
+|  /tmp/pardes-snap/builtins/cwd/notes.txt                                               Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -213,7 +213,8 @@
 |
 |
 |
-|  /tmp/pardes-snap/builtins/cwd/+Help New Del
+|  /tmp/pardes-snap/builtins/cwd/+Help                                                        New Del
+|    24 SPC l i   Lspinfo
 |    25 SPC l k   Hover
 |    26 SPC l r   Rename
 |    27 SPC l s   Symbols
@@ -236,15 +237,14 @@
 |    44 SPC w j   Down            C-w j, C-w down
 |    45 SPC w k   Up              C-w k, C-w up
 |    46 SPC w l   Right           C-w l, C-w right
-|    47 SPC w t   Toggleterm
-|    48           Look            enter, right-click
-|    49           Exec            tab, middle-click
-|    50           Theme
-|    51           Shell
-|    52
+|    47           Look            enter, right-click
+|    48           Exec            tab, middle-click
+|    49           Theme
+|    50           Shell
+|    51
 == snap window-group grid=120x60 cursor=7,32
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del
+|  /tmp/pardes-snap/builtins/cwd/notes.txt                                               Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -274,15 +274,15 @@
 |
 |
 |
-|  /tmp/pardes-snap/builtins/cwd/+Help New Del
+|  /tmp/pardes-snap/builtins/cwd/+Help                                                        New Del
 |     1 pardes builtins under SPC w
 |     2
 |     3 SPC w h   Left            C-w h, C-w left
 |     4 SPC w j   Down            C-w j, C-w down
 |     5 SPC w k   Up              C-w k, C-w up
 |     6 SPC w l   Right           C-w l, C-w right
-|     7 SPC w t   Toggleterm
-|     8
+|     7
+|
 |
 |
 |
@@ -305,7 +305,7 @@
 |
 == snap tutor-from-index grid=120x60 cursor=7,17
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del
+|  /tmp/pardes-snap/builtins/cwd/notes.txt                                               Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -320,7 +320,7 @@
 |
 |
 |
-|  /Tutor Save New Del
+|  /Tutor                                                                                Save New Del
 |     1
 |     2                                PARDES TUTOR
 |     3                      tmux + vi + acme, from scratch.
@@ -335,7 +335,7 @@
 |    12 =================================================================
 |    13
 |    14  Pardes is tmux + vi + acme, made from scratch. The foundation is
-|  /tmp/pardes-snap/builtins/cwd/+Help New Del
+|  /tmp/pardes-snap/builtins/cwd/+Help                                                        New Del
 |     1 pardes builtins, and how to run each:
 |     2 SPC and its keys, a chord, a button, the
 |     3 topbar - or the name, executed anywhere.
diff --git a/test/snapshots/builtins.snap b/test/snapshots/builtins.snap
index b29a1109..93e33710 100644
--- a/test/snapshots/builtins.snap
+++ b/test/snapshots/builtins.snap
@@ -40,11 +40,11 @@ key n
 stable 700 15000
 snap not-a-picker
 # and the mid-chord filter is untouched: `SPC w ?` still answers "what can w
-# still reach", rewriting the same +Help buffer with just that group — five
-# rows, each now also showing the Ctrl-w chord that is the other way in, and
-# none of the three path-less builtins, which `w` cannot reach.
+# still reach", rewriting the same +Help buffer with just that group — the four
+# directional moves, each now also showing the Ctrl-w chord that is the other
+# way in, and none of the three path-less builtins, which `w` cannot reach.
 key space w ?
-wait 10000 Toggleterm
+wait 10000 Right
 stable 700 15000
 snap window-group
 # back to the whole index, and a NAME in it is live text like anywhere else:
diff --git a/test/snapshots/cmdword.golden b/test/snapshots/cmdword.golden
index 56436881..f5d6f003 100644
--- a/test/snapshots/cmdword.golden
+++ b/test/snapshots/cmdword.golden
@@ -1,6 +1,6 @@
 == snap opened grid=120x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/cmdword/cwd/cmds.txt                                                 Save New Del
 |     1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .`
 |
 |
@@ -31,7 +31,7 @@
 |
 == snap atexec grid=120x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/cmdword/cwd/cmds.txt                                                 Save New Del
 |     1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .`
 |
 |
@@ -46,7 +46,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/cmdword/cwd New Del
+|  /tmp/pardes-snap/cmdword/cwd                                                               New Del
 |  echo ZZ''E
 |
 |  ZZE
@@ -62,7 +62,7 @@
 |
 == snap atlook grid=120x30 cursor=4,22
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/cmdword/cwd/cmds.txt                                                 Save New Del
 |     1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .`
 |
 |
@@ -77,7 +77,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/cmdword/cwd New Del
+|  /tmp/pardes-snap/cmdword/cwd                                                               New Del
 |  echo ZZ''E
 |
 |  ZZE
@@ -93,7 +93,7 @@
 |
 == snap lookword grid=120x30 cursor=7,10
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/cmdword/cwd/cmds.txt                                                 Save New Del
 |     1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .`
 |
 |
@@ -101,14 +101,14 @@
 |
 |
 |
-|  /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del
+|  /tmp/pardes-snap/cmdword/cwd/p.txt                                                    Save New Del
 |     1 just text
 |
 |
 |
 |
 |
-|  /tmp/pardes-snap/cmdword/cwd New Del
+|  /tmp/pardes-snap/cmdword/cwd                                                               New Del
 |  echo ZZ''E
 |
 |  ZZE
@@ -124,7 +124,7 @@
 |
 == snap nested grid=120x30 cursor=4,24
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/cmdword/cwd/cmds.txt                                                 Save New Del
 |     1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .`
 |
 |
@@ -132,14 +132,14 @@
 |
 |
 |
-|  /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del
+|  /tmp/pardes-snap/cmdword/cwd/p.txt                                                    Save New Del
 |     1 just text
 |
 |
 |
 |
 |
-|  /tmp/pardes-snap/cmdword/cwd New Del
+|  /tmp/pardes-snap/cmdword/cwd                                                               New Del
 |  echo ZZ''E
 |
 |  ZZE
@@ -153,9 +153,9 @@
 |
 |
 |
-== snap execword grid=120x30 cursor=42,16
+== snap execword grid=120x30 cursor=104,16
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/cmdword/cwd/cmds.txt                                                 Save New Del
 |     1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .`
 |
 |
@@ -163,14 +163,14 @@
 |
 |
 |
-|  /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del
+|  /tmp/pardes-snap/cmdword/cwd/p.txt                                                    Save New Del
 |     1 just text
 |
 |
 |
 |
 |
-|  /tmp/pardes-snap/cmdword/cwd New Del Exec
+|  /tmp/pardes-snap/cmdword/cwd                                                               New Del Exec
 |  echo ZZ''E
 |
 |  ZZE
@@ -184,9 +184,9 @@
 |
 |
 |
-== snap tagcmd grid=120x30 cursor=56,16
+== snap tagcmd grid=120x30 cursor=118,16
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/cmdword/cwd/cmds.txt                                                 Save New Del
 |     1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .`
 |
 |
@@ -194,14 +194,14 @@
 |
 |
 |
-|  /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del
+|  /tmp/pardes-snap/cmdword/cwd/p.txt                                                    Save New Del
 |     1 just text
 |
 |
 |
 |
 |
-|  /tmp/pardes-snap/cmdword/cwd New Del Exec @`echo ZZ''T`
+|  /tmp/pardes-snap/cmdword/cwd                                                               New Del Exec @`echo ZZ''T`
 |  echo ZZ''E
 |
 |  ZZE
diff --git a/test/snapshots/cornerdrag.golden b/test/snapshots/cornerdrag.golden
index 7b48482f..ae933701 100644
--- a/test/snapshots/cornerdrag.golden
+++ b/test/snapshots/cornerdrag.golden
@@ -62,7 +62,7 @@
 |                             ╎
 == snap edge-done grid=100x30 cursor=4,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/cornerdrag/  /tmp/pardes-snap/cornerdrag/cwd New Del
+|  /tmp/pardes-snap/cornerdrag/  /tmp/pardes-snap/cornerdrag/cwd          New Del
 |
 |  w.txt                         w.txt
 |
@@ -93,7 +93,7 @@
 |
 == snap corner-drag grid=100x30 cursor=4,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/cornerdrag/  /tmp/pardes-snap/cornerdrag╎cwd New Del
+|  /tmp/pardes-snap/cornerdrag/  /tmp/pardes-snap/cornerdrag╎cwd          New Del
 |                                                           ╎
 |  w.txt                         w.txt                      ╎
 |                                                           ╎
diff --git a/test/snapshots/exec-bigdrag.golden b/test/snapshots/exec-bigdrag.golden
index 8aa4385e..da0e2467 100644
--- a/test/snapshots/exec-bigdrag.golden
+++ b/test/snapshots/exec-bigdrag.golden
@@ -1,6 +1,6 @@
 == snap alive grid=200x60 cursor=119,37
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/exec-bigdrag/cwd New Del                                                           /tmp/pardes-snap/exec-bigdrag/cwd New Del
+|  /tmp/pardes-snap/exec-bigdrag/cwd                                      New Del                      /tmp/pardes-snap/exec-bigdrag/cwd                                      New Del
 |                                                                                                      bash: line: command not found
 |  big.txt
 |                                                                                                      bash: 4line: command not found
@@ -30,7 +30,7 @@
 |                                                                                                      bash: 2835line: command not found
 |
 |                                                                                                      bash: 2846line: command not found
-|  /tmp/pardes-snap/exec-bigdrag/cwd New Del
+|  /tmp/pardes-snap/exec-bigdrag/cwd                                      New Del
 |                                                                                                      bash: e: command not found
 |  big.txt
 |                                                                                                      bash: ne: command not found
diff --git a/test/snapshots/find.golden b/test/snapshots/find.golden
index 6419cba0..0a33df22 100644
--- a/test/snapshots/find.golden
+++ b/test/snapshots/find.golden
@@ -1,6 +1,6 @@
 == snap group grid=120x40 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/find/cwd/here.txt Save New Del                                                                  SPC f
+|  /tmp/pardes-snap/find/cwd/here.txt                                                    Save New Del
 |     1 Find
 |
 |
@@ -38,10 +38,10 @@
 |
 |
 |
-|
+|                                                                                                                   SPC f
 == snap armed grid=120x40 cursor=9,39
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/find/cwd/here.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/here.txt                                                    Save New Del
 |     1 Find
 |
 |
@@ -82,7 +82,7 @@
 |   Find /
 == snap typing grid=120x40 cursor=12,39
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/find/cwd/here.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/here.txt                                                    Save New Del
 |     1 Find
 |
 |
@@ -123,7 +123,7 @@
 |   Find /zqm
 == snap results grid=120x40 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/find/cwd/here.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/here.txt                                                    Save New Del
 |     1 Find
 |
 |
@@ -158,13 +158,13 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/+Search New Del
+|  /tmp/pardes-snap/find/cwd/+Search                                                          New Del
 |     1 sub/ZQMARK-beta.txt
 |     2 sub/nest/zqmark-gamma.txt
 |     3 zqmark-alpha.txt
 == snap first grid=120x40 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/find/cwd/here.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/here.txt                                                    Save New Del
 |     1 Find
 |
 |
@@ -182,7 +182,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt                                         Save New Del
 |     1 beta body
 |
 |
@@ -199,13 +199,13 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/+Search New Del
+|  /tmp/pardes-snap/find/cwd/+Search                                                          New Del
 |     1 sub/ZQMARK-beta.txt
 |     2 sub/nest/zqmark-gamma.txt
 |     3 zqmark-alpha.txt
 == style first
 |0: 0-56 #949494,#121212, 57-119 d,#121212,
-|1: 0-1 #ffffff,#626262, 2-48 #949494,#121212, 49-119 d,#121212,
+|1: 0-1 #ffffff,#626262, 2-99 #949494,#121212, 100-119 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-10 #bdbdbd,#080808, 11-119 d,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808,
@@ -223,7 +223,7 @@
 |16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808,
 |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808,
 |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808,
-|19: 0-1 #ffffff,#262626, 2-59 #949494,#121212, 60-119 d,#121212,
+|19: 0-1 #ffffff,#262626, 2-99 #949494,#121212, 100-119 d,#121212,
 |20: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-119 d,#080808,
 |21: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808,
 |22: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808,
@@ -240,13 +240,13 @@
 |33: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808,
 |34: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808,
 |35: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808,
-|36: 0-1 #ffffff,#262626, 2-42 #949494,#121212, 43-119 d,#121212,
+|36: 0-1 #ffffff,#262626, 2-99 #949494,#121212, 100-119 d,#121212,
 |37: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 #080808,#80a0ff,
 |38: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-31 #bdbdbd,#080808, 32-119 d,#080808,
 |39: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-22 #bdbdbd,#080808, 23-119 d,#080808,
 == snap second grid=120x40 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/find/cwd/here.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/here.txt                                                    Save New Del
 |     1 Find
 |
 |
@@ -255,7 +255,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt                                   Save New Del
 |     1 gamma body
 |
 |
@@ -264,7 +264,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt                                         Save New Del
 |     1 beta body
 |
 |
@@ -281,22 +281,22 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/+Search New Del
+|  /tmp/pardes-snap/find/cwd/+Search                                                          New Del
 |     1 sub/ZQMARK-beta.txt
 |     2 sub/nest/zqmark-gamma.txt
 |     3 zqmark-alpha.txt
 == snap third grid=120x40 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/find/cwd/here.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/here.txt                                                    Save New Del
 |     1 Find
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/zqmark-alpha.txt                                            Save New Del
 |     1 alpha body
 |
 |
-|  /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt                                   Save New Del
 |     1 gamma body
 |
 |
@@ -305,7 +305,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt                                         Save New Del
 |     1 beta body
 |
 |
@@ -322,22 +322,22 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/+Search New Del
+|  /tmp/pardes-snap/find/cwd/+Search                                                          New Del
 |     1 sub/ZQMARK-beta.txt
 |     2 sub/nest/zqmark-gamma.txt
 |     3 zqmark-alpha.txt
 == snap back grid=120x40 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/find/cwd/here.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/here.txt                                                    Save New Del
 |     1 Find
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/zqmark-alpha.txt                                            Save New Del
 |     1 alpha body
 |
 |
-|  /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt                                   Save New Del
 |     1 gamma body
 |
 |
@@ -346,7 +346,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt                                         Save New Del
 |     1 beta body
 |
 |
@@ -363,22 +363,22 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/+Search New Del
+|  /tmp/pardes-snap/find/cwd/+Search                                                          New Del
 |     1 sub/ZQMARK-beta.txt
 |     2 sub/nest/zqmark-gamma.txt
 |     3 zqmark-alpha.txt
 == snap word grid=120x40 cursor=9,5
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/find/cwd/here.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/here.txt                                                    Save New Del
 |     1 Find
 |
 |
 |   Find /
-|  /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/zqmark-alpha.txt                                            Save New Del
 |     1 alpha body
 |
 |
-|  /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt                                   Save New Del
 |     1 gamma body
 |
 |
@@ -387,7 +387,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt                                         Save New Del
 |     1 beta body
 |
 |
@@ -404,22 +404,22 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/+Search New Del
+|  /tmp/pardes-snap/find/cwd/+Search                                                          New Del
 |     1 sub/ZQMARK-beta.txt
 |     2 sub/nest/zqmark-gamma.txt
 |     3 zqmark-alpha.txt
 == snap cancel grid=120x40 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/find/cwd/here.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/here.txt                                                    Save New Del
 |     1 Find
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/zqmark-alpha.txt                                            Save New Del
 |     1 alpha body
 |
 |
-|  /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt                                   Save New Del
 |     1 gamma body
 |
 |
@@ -428,7 +428,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt                                         Save New Del
 |     1 beta body
 |
 |
@@ -445,22 +445,22 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/+Search New Del
+|  /tmp/pardes-snap/find/cwd/+Search                                                          New Del
 |     1 sub/ZQMARK-beta.txt
 |     2 sub/nest/zqmark-gamma.txt
 |     3 zqmark-alpha.txt
 == snap nomatch grid=120x40 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/find/cwd/here.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/here.txt                                                    Save New Del
 |     1 Find
 |
-|  /tmp/pardes-snap/find/cwd/+Search New Del
+|  /tmp/pardes-snap/find/cwd/+Search                                                          New Del
 |     1
-|  /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/zqmark-alpha.txt                                            Save New Del
 |     1 alpha body
 |
 |
-|  /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt                                   Save New Del
 |     1 gamma body
 |
 |
@@ -469,7 +469,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt                                         Save New Del
 |     1 beta body
 |
 |
@@ -486,22 +486,22 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/+Search New Del
+|  /tmp/pardes-snap/find/cwd/+Search                                                          New Del
 |     1 sub/ZQMARK-beta.txt
 |     2 sub/nest/zqmark-gamma.txt
 |     3 zqmark-alpha.txt
 == snap refit grid=120x40 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/find/cwd/here.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/here.txt                                                    Save New Del
 |     1 Find
 |
-|  /tmp/pardes-snap/find/cwd/+Search New Del
+|  /tmp/pardes-snap/find/cwd/+Search                                                          New Del
 |     1
-|  /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/zqmark-alpha.txt                                            Save New Del
 |     1 alpha body
 |
 |
-|  /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt                                   Save New Del
 |     1 gamma body
 |
 |
@@ -510,7 +510,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt                                         Save New Del
 |     1 beta body
 |
 |
@@ -527,22 +527,22 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/+Search New Del
+|  /tmp/pardes-snap/find/cwd/+Search                                                          New Del
 |     1 sub/ZQMARK-beta.txt
 |     2 sub/nest/zqmark-gamma.txt
 |     3 zqmark-alpha.txt
 == snap topbar grid=120x40 cursor=12,7
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/find/cwd/here.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/here.txt                                                    Save New Del
 |     1 Find
 |
-|  /tmp/pardes-snap/find/cwd/+Search New Del
+|  /tmp/pardes-snap/find/cwd/+Search                                                          New Del
 |     1
-|  /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/zqmark-alpha.txt                                            Save New Del
 |     1 alpha body
-|  /tmp/pardes-snap/find/cwd/+Search New Del
+|  /tmp/pardes-snap/find/cwd/+Search                                                          New Del
 |     1 zqmark-alpha.txt
-|  /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt                                   Save New Del
 |     1 gamma body
 |
 |
@@ -551,7 +551,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del
+|  /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt                                         Save New Del
 |     1 beta body
 |
 |
@@ -568,7 +568,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/find/cwd/+Search New Del
+|  /tmp/pardes-snap/find/cwd/+Search                                                          New Del
 |     1 sub/ZQMARK-beta.txt
 |     2 sub/nest/zqmark-gamma.txt
 |     3 zqmark-alpha.txt
diff --git a/test/snapshots/fsearch.golden b/test/snapshots/fsearch.golden
index 08132e28..8de3f0e7 100644
--- a/test/snapshots/fsearch.golden
+++ b/test/snapshots/fsearch.golden
@@ -1,6 +1,6 @@
 == snap opened grid=180x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd New Del                        /tmp/pardes-snap/fsearch/cwd New Del
+|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd   New Del                      /tmp/pardes-snap/fsearch/cwd   New Del
 |     1 l1
 |     2 MARK a                                                 g.txt                                                       g.txt
 |     3 l3
@@ -15,7 +15,7 @@
 |    12 l12
 |
 |
-|                                                              /tmp/pardes-snap/fsearch/cwd New Del
+|                                                              /tmp/pardes-snap/fsearch/cwd   New Del
 |
 |                                                              g.txt
 |
@@ -31,7 +31,7 @@
 |
 == snap typing grid=180x30 cursor=8,29
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd New Del                        /tmp/pardes-snap/fsearch/cwd New Del
+|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd   New Del                      /tmp/pardes-snap/fsearch/cwd   New Del
 |     1 l1
 |     2 MARK a                                                 g.txt                                                       g.txt
 |     3 l3
@@ -46,7 +46,7 @@
 |    12 l12
 |
 |
-|                                                              /tmp/pardes-snap/fsearch/cwd New Del
+|                                                              /tmp/pardes-snap/fsearch/cwd   New Del
 |
 |                                                              g.txt
 |
@@ -62,7 +62,7 @@
 |   /MARK
 == snap results grid=180x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd New Del                        /tmp/pardes-snap/fsearch/cwd New Del
+|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd   New Del                      /tmp/pardes-snap/fsearch/cwd   New Del
 |     1 l1
 |     2 MARK a                                                 g.txt                                                       g.txt
 |     3 l3
@@ -77,7 +77,7 @@
 |    12 l12
 |
 |
-|                                                              /tmp/pardes-snap/fsearch/cwd New Del
+|                                                              /tmp/pardes-snap/fsearch/cwd   New Del
 |
 |                                                              g.txt
 |
@@ -93,7 +93,7 @@
 |     3 g.txt:10:1-4 MARK c
 == snap first grid=180x30 cursor=10,3
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd New Del                        /tmp/pardes-snap/fsearch/cwd New Del
+|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd   New Del                      /tmp/pardes-snap/fsearch/cwd   New Del
 |     1 l1
 |     2 MARK a                                                 g.txt                                                       g.txt
 |     3 l3
@@ -108,7 +108,7 @@
 |    12 l12
 |
 |
-|                                                              /tmp/pardes-snap/fsearch/cwd New Del
+|                                                              /tmp/pardes-snap/fsearch/cwd   New Del
 |
 |                                                              g.txt
 |
@@ -124,7 +124,7 @@
 |     3 g.txt:10:1-4 MARK c
 == style first
 |0: 0-56 #949494,#121212, 57-179 d,#121212,
-|1: 0-1 #ffffff,#626262, 2-48 #949494,#121212, 49-59 d,#121212, 60-61 #ffffff,#262626, 62-97 #949494,#121212, 98-119 d,#121212, 120-121 #ffffff,#262626, 122-157 #949494,#121212, 158-179 d,#121212,
+|1: 0-1 #ffffff,#626262, 2-48 #949494,#121212, 49-59 d,#121212, 60-61 #ffffff,#262626, 62-99 #949494,#121212, 100-119 d,#121212, 120-121 #ffffff,#262626, 122-159 #949494,#121212, 160-179 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-8 #bdbdbd,#080808, 9-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-10 #080808,#80a0ff, 11-12 #bdbdbd,#080808, 13-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-8 #bdbdbd,#080808, 9-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808,
@@ -139,7 +139,7 @@
 |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-9 #bdbdbd,#080808, 10-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808,
 |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808,
 |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808,
-|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 #ffffff,#262626, 62-97 #949494,#121212, 98-119 d,#121212, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808,
+|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 #ffffff,#262626, 62-99 #949494,#121212, 100-119 d,#121212, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808,
 |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808,
 |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808,
 |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808,
@@ -155,7 +155,7 @@
 |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-25 #bdbdbd,#080808, 26-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808,
 == snap second grid=180x30 cursor=10,7
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd New Del                        /tmp/pardes-snap/fsearch/cwd New Del
+|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd   New Del                      /tmp/pardes-snap/fsearch/cwd   New Del
 |     1 l1
 |     2 MARK a                                                 g.txt                                                       g.txt
 |     3 l3
@@ -170,7 +170,7 @@
 |    12 l12
 |
 |
-|                                                              /tmp/pardes-snap/fsearch/cwd New Del
+|                                                              /tmp/pardes-snap/fsearch/cwd   New Del
 |
 |                                                              g.txt
 |
@@ -186,7 +186,7 @@
 |     3 g.txt:10:1-4 MARK c
 == snap third grid=180x30 cursor=10,11
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd New Del                        /tmp/pardes-snap/fsearch/cwd New Del
+|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd   New Del                      /tmp/pardes-snap/fsearch/cwd   New Del
 |     1 l1
 |     2 MARK a                                                 g.txt                                                       g.txt
 |     3 l3
@@ -201,7 +201,7 @@
 |    12 l12
 |
 |
-|                                                              /tmp/pardes-snap/fsearch/cwd New Del
+|                                                              /tmp/pardes-snap/fsearch/cwd   New Del
 |
 |                                                              g.txt
 |
@@ -217,7 +217,7 @@
 |     3 g.txt:10:1-4 MARK c
 == snap back grid=180x30 cursor=10,7
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd New Del                        /tmp/pardes-snap/fsearch/cwd New Del
+|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd   New Del                      /tmp/pardes-snap/fsearch/cwd   New Del
 |     1 l1
 |     2 MARK a                                                 g.txt                                                       g.txt
 |     3 l3
@@ -232,7 +232,7 @@
 |    12 l12
 |
 |
-|                                                              /tmp/pardes-snap/fsearch/cwd New Del
+|                                                              /tmp/pardes-snap/fsearch/cwd   New Del
 |
 |                                                              g.txt
 |
@@ -248,7 +248,7 @@
 |     3 g.txt:10:1-4 MARK c
 == snap cancel grid=180x30 cursor=10,7
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd New Del                        /tmp/pardes-snap/fsearch/cwd New Del
+|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd   New Del                      /tmp/pardes-snap/fsearch/cwd   New Del
 |     1 l1
 |     2 MARK a                                                 g.txt                                                       g.txt
 |     3 l3
@@ -263,7 +263,7 @@
 |    12 l12
 |
 |
-|                                                              /tmp/pardes-snap/fsearch/cwd New Del
+|                                                              /tmp/pardes-snap/fsearch/cwd   New Del
 |
 |                                                              g.txt
 |
@@ -279,7 +279,7 @@
 |     3 g.txt:10:1-4 MARK c
 == snap nomatch grid=180x30 cursor=10,7
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd New Del                        /tmp/pardes-snap/fsearch/cwd New Del
+|  /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del             /tmp/pardes-snap/fsearch/cwd   New Del                      /tmp/pardes-snap/fsearch/cwd   New Del
 |     1 l1
 |     2 MARK a                                                 g.txt                                                       g.txt
 |     3 l3
@@ -294,7 +294,7 @@
 |    12 l12
 |
 |
-|                                                              /tmp/pardes-snap/fsearch/cwd New Del
+|                                                              /tmp/pardes-snap/fsearch/cwd   New Del
 |
 |                                                              g.txt
 |
diff --git a/test/snapshots/grep.golden b/test/snapshots/grep.golden
index f64119a8..ed1086df 100644
--- a/test/snapshots/grep.golden
+++ b/test/snapshots/grep.golden
@@ -1,6 +1,6 @@
 == snap opened grid=180x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/grep/cwd/a.txt Save New Del                /tmp/pardes-snap/grep/cwd New Del                           /tmp/pardes-snap/grep/cwd New Del
+|  /tmp/pardes-snap/grep/cwd/a.txt Save New Del                /tmp/pardes-snap/grep/cwd      New Del                      /tmp/pardes-snap/grep/cwd      New Del
 |     1 hello TARGET one
 |     2 nothing here                                           a.txt  noise.txt  sub                                       a.txt  noise.txt  sub
 |     3 last TARGET line
@@ -15,7 +15,7 @@
 |
 |
 |
-|                                                              /tmp/pardes-snap/grep/cwd New Del
+|                                                              /tmp/pardes-snap/grep/cwd      New Del
 |
 |                                                              a.txt  noise.txt  sub
 |
@@ -31,7 +31,7 @@
 |
 == snap typing grid=180x30 cursor=15,29
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/grep/cwd/a.txt Save New Del                /tmp/pardes-snap/grep/cwd New Del                           /tmp/pardes-snap/grep/cwd New Del
+|  /tmp/pardes-snap/grep/cwd/a.txt Save New Del                /tmp/pardes-snap/grep/cwd      New Del                      /tmp/pardes-snap/grep/cwd      New Del
 |     1 hello TARGET one
 |     2 nothing here                                           a.txt  noise.txt  sub                                       a.txt  noise.txt  sub
 |     3 last TARGET line
@@ -46,7 +46,7 @@
 |
 |
 |
-|                                                              /tmp/pardes-snap/grep/cwd New Del
+|                                                              /tmp/pardes-snap/grep/cwd      New Del
 |
 |                                                              a.txt  noise.txt  sub
 |
@@ -62,7 +62,7 @@
 |   Grep /TARGET
 == snap results grid=180x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/grep/cwd/a.txt Save New Del                /tmp/pardes-snap/grep/cwd New Del                           /tmp/pardes-snap/grep/cwd New Del
+|  /tmp/pardes-snap/grep/cwd/a.txt Save New Del                /tmp/pardes-snap/grep/cwd      New Del                      /tmp/pardes-snap/grep/cwd      New Del
 |     1 hello TARGET one
 |     2 nothing here                                           a.txt  noise.txt  sub                                       a.txt  noise.txt  sub
 |     3 last TARGET line
@@ -77,7 +77,7 @@
 |
 |
 |
-|                                                              /tmp/pardes-snap/grep/cwd New Del
+|                                                              /tmp/pardes-snap/grep/cwd      New Del
 |
 |                                                              a.txt  noise.txt  sub
 |
@@ -93,7 +93,7 @@
 |     3 sub/b.txt:2:1-6 TARGET inside sub
 == snap first grid=180x30 cursor=18,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/grep/cwd/a.txt Save New Del                /tmp/pardes-snap/grep/cwd New Del                           /tmp/pardes-snap/grep/cwd New Del
+|  /tmp/pardes-snap/grep/cwd/a.txt Save New Del                /tmp/pardes-snap/grep/cwd      New Del                      /tmp/pardes-snap/grep/cwd      New Del
 |     1 hello TARGET one
 |     2 nothing here                                           a.txt  noise.txt  sub                                       a.txt  noise.txt  sub
 |     3 last TARGET line
@@ -108,7 +108,7 @@
 |
 |
 |
-|                                                              /tmp/pardes-snap/grep/cwd New Del
+|                                                              /tmp/pardes-snap/grep/cwd      New Del
 |
 |                                                              a.txt  noise.txt  sub
 |
@@ -124,7 +124,7 @@
 |     3 sub/b.txt:2:1-6 TARGET inside sub
 == snap opened-hit grid=180x30 cursor=17,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/grep/cwd/a.txt Save New Del                /tmp/pardes-snap/grep/cwd New Del                           /tmp/pardes-snap/grep/cwd New Del
+|  /tmp/pardes-snap/grep/cwd/a.txt Save New Del                /tmp/pardes-snap/grep/cwd      New Del                      /tmp/pardes-snap/grep/cwd      New Del
 |     1 hello TARGET one
 |     2 nothing here                                           a.txt  noise.txt  sub                                       a.txt  noise.txt  sub
 |     3 last TARGET line
@@ -139,7 +139,7 @@
 |
 |  /tmp/pardes-snap/grep/cwd/sub/b.txt Save New Del
 |     1 deep
-|     2 TARGET inside sub                                      /tmp/pardes-snap/grep/cwd New Del
+|     2 TARGET inside sub                                      /tmp/pardes-snap/grep/cwd      New Del
 |
 |                                                              a.txt  noise.txt  sub
 |
@@ -155,7 +155,7 @@
 |     3 sub/b.txt:2:1-6 TARGET inside sub
 == snap nomatch grid=180x30 cursor=17,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/grep/cwd/a.txt Save New Del                /tmp/pardes-snap/grep/cwd New Del                           /tmp/pardes-snap/grep/cwd New Del
+|  /tmp/pardes-snap/grep/cwd/a.txt Save New Del                /tmp/pardes-snap/grep/cwd      New Del                      /tmp/pardes-snap/grep/cwd      New Del
 |     1 hello TARGET one
 |     2 nothing here                                           a.txt  noise.txt  sub                                       a.txt  noise.txt  sub
 |     3 last TARGET line
@@ -170,7 +170,7 @@
 |     1
 |  /tmp/pardes-snap/grep/cwd/sub/b.txt Save New Del
 |     1 deep
-|     2 TARGET inside sub                                      /tmp/pardes-snap/grep/cwd New Del
+|     2 TARGET inside sub                                      /tmp/pardes-snap/grep/cwd      New Del
 |
 |                                                              a.txt  noise.txt  sub
 |
@@ -186,7 +186,7 @@
 |     3 sub/b.txt:2:1-6 TARGET inside sub
 == snap chordsel grid=180x30 cursor=19,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/grep/cwd/a.txt Save New Del                /tmp/pardes-snap/grep/cwd New Del                           /tmp/pardes-snap/grep/cwd New Del
+|  /tmp/pardes-snap/grep/cwd/a.txt Save New Del                /tmp/pardes-snap/grep/cwd      New Del                      /tmp/pardes-snap/grep/cwd      New Del
 |     1 hello TARGET one
 |     2 nothing here                                           a.txt  noise.txt  sub                                       a.txt  noise.txt  sub
 |     3 last TARGET line
@@ -201,7 +201,7 @@
 |     1
 |  /tmp/pardes-snap/grep/cwd/sub/b.txt Save New Del
 |     1 deep
-|     2 TARGET inside sub                                      /tmp/pardes-snap/grep/cwd New Del
+|     2 TARGET inside sub                                      /tmp/pardes-snap/grep/cwd      New Del
 |
 |                                                              a.txt  noise.txt  sub
 |
@@ -217,7 +217,7 @@
 |     3 sub/b.txt:2:1-6 TARGET inside sub
 == snap chord grid=180x30 cursor=19,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/grep/cwd/a.txt Save New Del                /tmp/pardes-snap/grep/cwd New Del                           /tmp/pardes-snap/grep/cwd New Del
+|  /tmp/pardes-snap/grep/cwd/a.txt Save New Del                /tmp/pardes-snap/grep/cwd      New Del                      /tmp/pardes-snap/grep/cwd      New Del
 |     1 hello TARGET one
 |     2 nothing here                                           a.txt  noise.txt  sub                                       a.txt  noise.txt  sub
 |     3 last TARGET line
@@ -232,7 +232,7 @@
 |     1
 |  /tmp/pardes-snap/grep/cwd/sub/b.txt Save New Del
 |     1 deep
-|     2 TARGET inside sub                                      /tmp/pardes-snap/grep/cwd New Del
+|     2 TARGET inside sub                                      /tmp/pardes-snap/grep/cwd      New Del
 |
 |                                                              a.txt  noise.txt  sub
 |
diff --git a/test/snapshots/jumps.golden b/test/snapshots/jumps.golden
index cf9b01d5..a557ce1f 100644
--- a/test/snapshots/jumps.golden
+++ b/test/snapshots/jumps.golden
@@ -1,6 +1,6 @@
 == snap start grid=150x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/jumps/cwd/big.txt Save New Del
+|  /tmp/pardes-snap/jumps/cwd/big.txt                                                                                  Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -31,7 +31,7 @@
 |    28 line 28
 == snap to-shell grid=150x30 cursor=79,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/jumps/cwd/big.txt Save New Del                            /tmp/pardes-snap/jumps/cwd New Del
+|  /tmp/pardes-snap/jumps/cwd/big.txt       Save New Del                      /tmp/pardes-snap/jumps/cwd                    New Del
 |     1 line 1
 |     2 line 2                                                                big.txt
 |     3 line 3
@@ -62,7 +62,7 @@
 |    28 line 28
 == snap to-file grid=150x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/jumps/cwd/big.txt Save New Del                            /tmp/pardes-snap/jumps/cwd New Del
+|  /tmp/pardes-snap/jumps/cwd/big.txt       Save New Del                      /tmp/pardes-snap/jumps/cwd                    New Del
 |     1 line 1
 |     2 line 2                                                                big.txt
 |     3 line 3
@@ -93,7 +93,7 @@
 |    28 line 28
 == snap goto-100 grid=150x30 cursor=7,26
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/jumps/cwd/big.txt Save New Del                            /tmp/pardes-snap/jumps/cwd New Del
+|  /tmp/pardes-snap/jumps/cwd/big.txt       Save New Del                      /tmp/pardes-snap/jumps/cwd                    New Del
 |    76 line 76
 |    77 line 77                                                               big.txt
 |    78 line 78
@@ -124,7 +124,7 @@
 |   103 line 103
 == snap back-in-file grid=150x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/jumps/cwd/big.txt Save New Del                            /tmp/pardes-snap/jumps/cwd New Del
+|  /tmp/pardes-snap/jumps/cwd/big.txt       Save New Del                      /tmp/pardes-snap/jumps/cwd                    New Del
 |     1 line 1
 |     2 line 2                                                                big.txt
 |     3 line 3
@@ -155,7 +155,7 @@
 |    28 line 28
 == snap back-to-shell grid=150x30 cursor=79,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/jumps/cwd/big.txt Save New Del                            /tmp/pardes-snap/jumps/cwd New Del
+|  /tmp/pardes-snap/jumps/cwd/big.txt       Save New Del                      /tmp/pardes-snap/jumps/cwd                    New Del
 |     1 line 1
 |     2 line 2                                                                big.txt
 |     3 line 3
@@ -186,7 +186,7 @@
 |    28 line 28
 == snap forward-file grid=150x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/jumps/cwd/big.txt Save New Del                            /tmp/pardes-snap/jumps/cwd New Del
+|  /tmp/pardes-snap/jumps/cwd/big.txt       Save New Del                      /tmp/pardes-snap/jumps/cwd                    New Del
 |     1 line 1
 |     2 line 2                                                                big.txt
 |     3 line 3
@@ -217,7 +217,7 @@
 |    28 line 28
 == snap forward-100 grid=150x30 cursor=7,16
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/jumps/cwd/big.txt Save New Del                            /tmp/pardes-snap/jumps/cwd New Del
+|  /tmp/pardes-snap/jumps/cwd/big.txt       Save New Del                      /tmp/pardes-snap/jumps/cwd                    New Del
 |    86 line 86
 |    87 line 87                                                               big.txt
 |    88 line 88
@@ -248,7 +248,7 @@
 |   113 line 113
 == snap last grid=150x30 cursor=79,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/jumps/cwd/big.txt Save New Del                            /tmp/pardes-snap/jumps/cwd New Del
+|  /tmp/pardes-snap/jumps/cwd/big.txt       Save New Del                      /tmp/pardes-snap/jumps/cwd                    New Del
 |    86 line 86
 |    87 line 87                                                               big.txt
 |    88 line 88
@@ -279,7 +279,7 @@
 |   113 line 113
 == snap last-back grid=150x30 cursor=7,16
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/jumps/cwd/big.txt Save New Del                            /tmp/pardes-snap/jumps/cwd New Del
+|  /tmp/pardes-snap/jumps/cwd/big.txt       Save New Del                      /tmp/pardes-snap/jumps/cwd                    New Del
 |    86 line 86
 |    87 line 87                                                               big.txt
 |    88 line 88
@@ -310,7 +310,7 @@
 |   113 line 113
 == snap jumplist grid=150x30 cursor=7,16
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/jumps/cwd/big.txt Save New Del                            /tmp/pardes-snap/jumps/cwd New Del
+|  /tmp/pardes-snap/jumps/cwd/big.txt       Save New Del                      /tmp/pardes-snap/jumps/cwd                    New Del
 |    86 line 86
 |    87 line 87                                                               big.txt
 |    88 line 88
@@ -332,78 +332,78 @@
 |   104 line 104
 |   105 line 105
 |   106 line 106
-|  /tmp/pardes-snap/jumps/cwd/+Jumps New Del
-|     1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
-|     2 @p1:3:3 /tmp/pardes-snap/jumps/cwd
-|     3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
+|   107 line 107
+|   108 line 108
+|  /tmp/pardes-snap/jumps/cwd/+Jumps             New Del
+|     1 @p1:3:3 /tmp/pardes-snap/jumps/cwd
+|     2 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
+|     3 @p1:3:3 /tmp/pardes-snap/jumps/cwd
 |     4 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100
-|     5 @p1:3:3 /tmp/pardes-snap/jumps/cwd
-|     6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100
-== snap step1 grid=150x30 cursor=7,2
+== snap step1-shell grid=150x30 cursor=7,16
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/jumps/cwd/big.txt Save New Del                            /tmp/pardes-snap/jumps/cwd New Del
-|     1 line 1
-|     2 line 2                                                                big.txt
-|     3 line 3
-|     4 line 4
-|     5 line 5
-|     6 line 6
-|     7 line 7
-|     8 line 8
-|     9 line 9
-|    10 line 10
-|    11 line 11
-|    12 line 12
-|    13 line 13
-|    14 line 14
-|    15 line 15
-|    16 line 16
-|    17 line 17
-|    18 line 18
-|    19 line 19
-|    20 line 20
-|    21 line 21
-|  /tmp/pardes-snap/jumps/cwd/+Jumps New Del
-|     1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
-|     2 @p1:3:3 /tmp/pardes-snap/jumps/cwd
-|     3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
+|  /tmp/pardes-snap/jumps/cwd/big.txt       Save New Del                      /tmp/pardes-snap/jumps/cwd                    New Del
+|    86 line 86
+|    87 line 87                                                               big.txt
+|    88 line 88
+|    89 line 89
+|    90 line 90
+|    91 line 91
+|    92 line 92
+|    93 line 93
+|    94 line 94
+|    95 line 95
+|    96 line 96
+|    97 line 97
+|    98 line 98
+|    99 line 99
+|   100 line 100
+|   101 line 101
+|   102 line 102
+|   103 line 103
+|   104 line 104
+|   105 line 105
+|   106 line 106
+|   107 line 107
+|   108 line 108
+|  /tmp/pardes-snap/jumps/cwd/+Jumps             New Del
+|     1 @p1:3:3 /tmp/pardes-snap/jumps/cwd
+|     2 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
+|     3 @p1:3:3 /tmp/pardes-snap/jumps/cwd
 |     4 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100
-|     5 @p1:3:3 /tmp/pardes-snap/jumps/cwd
-|     6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100
-== style step1
+== style step1-shell
 |0: 0-56 #949494,#121212, 57-149 d,#121212,
-|1: 0-1 #ffffff,#626262, 2-48 #949494,#121212, 49-74 d,#121212, 75-76 #ffffff,#262626, 77-110 #949494,#121212, 111-149 d,#121212,
-|2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|4: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|5: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|6: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|7: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|8: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|9: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|10: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|11: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|12: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|1: 0-1 #ffffff,#626262, 2-54 #949494,#121212, 55-74 d,#121212, 75-76 #ffffff,#262626, 77-129 #949494,#121212, 130-149 d,#121212,
+|2: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|3: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|4: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|5: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|6: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|7: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|8: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|9: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|10: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|11: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|12: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
 |13: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
 |14: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
 |15: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|16: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|18: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|19: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|20: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|21: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|22: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|23: 0-1 #ffffff,#262626, 2-42 #949494,#121212, 43-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|24: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-74 #080808,#80a0ff, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|25: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-40 #bdbdbd,#080808, 41-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|26: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-51 #bdbdbd,#080808, 52-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-|27: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-55 #bdbdbd,#080808, 56-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|16: 0-0 d,#121212, 1-1 d,#080808, 2-6 #949494,#121212, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|18: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|19: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|20: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|21: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|22: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|23: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|24: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|25: 0-1 #ffffff,#262626, 2-54 #949494,#121212, 55-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|26: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-74 #080808,#80a0ff, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
+|27: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-51 #bdbdbd,#080808, 52-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
 |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-40 #bdbdbd,#080808, 41-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
 |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-55 #bdbdbd,#080808, 56-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808,
-== snap step2-shell grid=150x30 cursor=7,2
+== snap step2-file grid=150x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/jumps/cwd/big.txt Save New Del                            /tmp/pardes-snap/jumps/cwd New Del
+|  /tmp/pardes-snap/jumps/cwd/big.txt       Save New Del                      /tmp/pardes-snap/jumps/cwd                    New Del
 |     1 line 1
 |     2 line 2                                                                big.txt
 |     3 line 3
@@ -425,18 +425,19 @@
 |    19 line 19
 |    20 line 20
 |    21 line 21
-|  /tmp/pardes-snap/jumps/cwd/+Jumps New Del
-|     1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
-|     2 @p1:3:3 /tmp/pardes-snap/jumps/cwd
-|     3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
+|    22 line 22
+|    23 line 23
+|  /tmp/pardes-snap/jumps/cwd/+Jumps             New Del
+|     1 @p1:3:3 /tmp/pardes-snap/jumps/cwd
+|     2 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
+|     3 @p1:3:3 /tmp/pardes-snap/jumps/cwd
 |     4 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100
-|     5 @p1:3:3 /tmp/pardes-snap/jumps/cwd
-|     6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100
-== snap step4-line100 grid=150x30 cursor=7,12
+== snap step4-line100 grid=150x30 cursor=7,13
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/jumps/cwd/big.txt Save New Del                            /tmp/pardes-snap/jumps/cwd New Del
-|    90 line 90
-|    91 line 91                                                               big.txt
+|  /tmp/pardes-snap/jumps/cwd/big.txt       Save New Del                      /tmp/pardes-snap/jumps/cwd                    New Del
+|    89 line 89
+|    90 line 90                                                               big.txt
+|    91 line 91
 |    92 line 92
 |    93 line 93
 |    94 line 94
@@ -456,49 +457,49 @@
 |   108 line 108
 |   109 line 109
 |   110 line 110
-|  /tmp/pardes-snap/jumps/cwd/+Jumps New Del
-|     1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
-|     2 @p1:3:3 /tmp/pardes-snap/jumps/cwd
-|     3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
+|   111 line 111
+|  /tmp/pardes-snap/jumps/cwd/+Jumps             New Del
+|     1 @p1:3:3 /tmp/pardes-snap/jumps/cwd
+|     2 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
+|     3 @p1:3:3 /tmp/pardes-snap/jumps/cwd
 |     4 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100
-|     5 @p1:3:3 /tmp/pardes-snap/jumps/cwd
-|     6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100
-== snap step-back grid=150x30 cursor=7,2
+== snap step-back grid=150x30 cursor=7,13
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/jumps/cwd/big.txt Save New Del                            /tmp/pardes-snap/jumps/cwd New Del
-|     1 line 1
-|     2 line 2                                                                big.txt
-|     3 line 3
-|     4 line 4
-|     5 line 5
-|     6 line 6
-|     7 line 7
-|     8 line 8
-|     9 line 9
-|    10 line 10
-|    11 line 11
-|    12 line 12
-|    13 line 13
-|    14 line 14
-|    15 line 15
-|    16 line 16
-|    17 line 17
-|    18 line 18
-|    19 line 19
-|    20 line 20
-|    21 line 21
-|  /tmp/pardes-snap/jumps/cwd/+Jumps New Del
-|     1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
-|     2 @p1:3:3 /tmp/pardes-snap/jumps/cwd
-|     3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
+|  /tmp/pardes-snap/jumps/cwd/big.txt       Save New Del                      /tmp/pardes-snap/jumps/cwd                    New Del
+|    89 line 89
+|    90 line 90                                                               big.txt
+|    91 line 91
+|    92 line 92
+|    93 line 93
+|    94 line 94
+|    95 line 95
+|    96 line 96
+|    97 line 97
+|    98 line 98
+|    99 line 99
+|   100 line 100
+|   101 line 101
+|   102 line 102
+|   103 line 103
+|   104 line 104
+|   105 line 105
+|   106 line 106
+|   107 line 107
+|   108 line 108
+|   109 line 109
+|   110 line 110
+|   111 line 111
+|  /tmp/pardes-snap/jumps/cwd/+Jumps             New Del
+|     1 @p1:3:3 /tmp/pardes-snap/jumps/cwd
+|     2 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
+|     3 @p1:3:3 /tmp/pardes-snap/jumps/cwd
 |     4 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100
-|     5 @p1:3:3 /tmp/pardes-snap/jumps/cwd
-|     6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100
-== snap look-row grid=150x30 cursor=7,12
+== snap look-row grid=150x30 cursor=7,13
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/jumps/cwd/big.txt Save New Del                            /tmp/pardes-snap/jumps/cwd New Del
-|    90 line 90
-|    91 line 91                                                               big.txt
+|  /tmp/pardes-snap/jumps/cwd/big.txt       Save New Del                      /tmp/pardes-snap/jumps/cwd                    New Del
+|    89 line 89
+|    90 line 90                                                               big.txt
+|    91 line 91
 |    92 line 92
 |    93 line 93
 |    94 line 94
@@ -518,10 +519,9 @@
 |   108 line 108
 |   109 line 109
 |   110 line 110
-|  /tmp/pardes-snap/jumps/cwd/+Jumps New Del
-|     1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
-|     2 @p1:3:3 /tmp/pardes-snap/jumps/cwd
-|     3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
+|   111 line 111
+|  /tmp/pardes-snap/jumps/cwd/+Jumps             New Del
+|     1 @p1:3:3 /tmp/pardes-snap/jumps/cwd
+|     2 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
+|     3 @p1:3:3 /tmp/pardes-snap/jumps/cwd
 |     4 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100
-|     5 @p1:3:3 /tmp/pardes-snap/jumps/cwd
-|     6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100
diff --git a/test/snapshots/jumps.snap b/test/snapshots/jumps.snap
index 6ab9df2a..1e2a9075 100644
--- a/test/snapshots/jumps.snap
+++ b/test/snapshots/jumps.snap
@@ -16,10 +16,13 @@ stable 700 20000
 # a FILE boots alone now, so this is one column holding big.txt, focused, and
 # the stack is one entry deep
 snap start
-# two focus moves, so the stack is file -> shell -> file. The shell has to be
-# opened before it can be walked to, and SPC c n (Newcol) puts it in a column
-# of its own on the right AND focuses it — so opening it IS the first of the
-# two moves, and the stack below is the same one a shell at boot left.
+# two focus moves. The shell has to be opened before it can be walked to, and
+# SPC c n (Newcol) puts it in a column of its own on the right AND focuses it —
+# so opening it IS the first of the two moves, and the stack below is the same
+# one a shell at boot left. Walking straight back to the file does NOT leave
+# `file -> shell -> file` behind: a hop to the entry under the top one is the
+# same two places again, so trackJump swaps them rather than appending, and the
+# stack is `shell -> file` with the file on top (see trackJump).
 key space c n
 stable 700 15000
 snap to-shell
@@ -40,7 +43,7 @@ snap back-in-file
 key c-o
 stable 400 5000
 snap back-to-shell
-# Ctrl-i forward, twice: the shell entry, then line 100 again. Sent as the
+# Ctrl-i forward, twice: back to line 1 of the file, then line 100 again. Sent as the
 # kitty-protocol CSI u (`CSI 105;5u`) because on the wire Ctrl-i IS Tab —
 # see config.jump_keys.
 send \e[105;5u
@@ -63,15 +66,21 @@ stable 700 15000
 snap jumplist
 # n/N step the rows and look them, exactly as they do a +Search: the stepped
 # row is selected in the buffer (snapstyle) and the pane it names follows.
-# Row 1 is the file at line 1, row 2 the shell (no path, so `@pN`), row 4 the
+# Row 1 is the shell (no path, so `@pN`), row 2 the file at line 1, row 4 the
 # file at line 100 — so the body visibly rides the list.
+#
+# ponytail: stepping onto an `@pN` row selects it but does NOT focus that pane —
+# the cursor stays where it was, which is why step1-shell's header is still the
+# file's. Only rows with a PATH move focus. Nothing tested this before, because
+# until the swap above the shell never survived on the stack to be listed at
+# all. Fix belongs in the location-list step, next to the path case.
 key n
 stable 700 15000
-snap step1
-snapstyle step1
+snap step1-shell
+snapstyle step1-shell
 key n
 stable 700 15000
-snap step2-shell
+snap step2-file
 key n
 stable 700 15000
 key n
@@ -82,8 +91,9 @@ stable 700 15000
 snap step-back
 # and an ordinary LOOK on a row goes there too — the leading word IS a
 # location, so the right-click look resolves it like any other path. Row 4
-# again, this time by clicking it.
-press right 16 28
-release right 16 28
+# again, this time by clicking it: the buffer's four rows are the last four
+# screen rows, so row 4 is the bottom one.
+press right 16 30
+release right 16 30
 stable 700 15000
 snap look-row
diff --git a/test/snapshots/layout-close.golden b/test/snapshots/layout-close.golden
index e2ff65ce..e809621e 100644
--- a/test/snapshots/layout-close.golden
+++ b/test/snapshots/layout-close.golden
@@ -1,18 +1,18 @@
 == snap built grid=140x40 cursor=4,16
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/layout-close/cwd New Del                             /tmp/pardes-snap/layout-close/cwd New Del
+|  /tmp/pardes-snap/layout-close/cwd        New Del                      /tmp/pardes-snap/layout-close/cwd        New Del
 |
 |  marker.txt                                                            marker.txt
 |
-|  /tmp/pardes-snap/layout-close/cwd New Del
+|  /tmp/pardes-snap/layout-close/cwd        New Del
 |
 |  marker.txt
 |
-|  /tmp/pardes-snap/layout-close/cwd New Del
+|  /tmp/pardes-snap/layout-close/cwd        New Del
 |
 |  marker.txt
 |
-|  /tmp/pardes-snap/layout-close/cwd New Del
+|  /tmp/pardes-snap/layout-close/cwd        New Del
 |
 |  marker.txt
 |
@@ -20,7 +20,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/layout-close/cwd New Del
+|  /tmp/pardes-snap/layout-close/cwd        New Del
 |
 |  marker.txt
 |
@@ -164,7 +164,7 @@
 |
 == snap colclose grid=140x40 cursor=4,7
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/layout-close/cwd New Del      /tmp/pardes-snap/layout-close/cwd New Del
+|  /tmp/pardes-snap/layout-close/cwd New Del      /tmp/pardes-snap/layout-close/cwd                               New Del
 |
 |  marker.txt                                     marker.txt
 |
diff --git a/test/snapshots/leader.golden b/test/snapshots/leader.golden
index c33b1633..9398b158 100644
--- a/test/snapshots/leader.golden
+++ b/test/snapshots/leader.golden
@@ -1,6 +1,6 @@
 == snap spc grid=100x40 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del                                              SPC
+|  /tmp/pardes-snap/leader/cwd/cmds.txt                              Save New Del
 |     1 Help
 |
 |
@@ -38,10 +38,10 @@
 |
 |
 |
-|
+|                                                                                                 SPC
 == snap spc-h grid=100x40 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del                                            SPC h
+|  /tmp/pardes-snap/leader/cwd/cmds.txt                              Save New Del
 |     1 Help
 |
 |
@@ -79,10 +79,10 @@
 |
 |
 |
-|
+|                                                                                               SPC h
 == snap abandoned grid=100x40 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/leader/cwd/cmds.txt                              Save New Del
 |     1 Help
 |
 |
@@ -123,7 +123,7 @@
 |
 == snap unmapped grid=100x40 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/leader/cwd/cmds.txt                              Save New Del
 |     1 Help
 |
 |
@@ -164,7 +164,7 @@
 |
 == snap help-word grid=100x40 cursor=7,22
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/leader/cwd/cmds.txt                              Save New Del
 |     1 Help
 |
 |
@@ -184,7 +184,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/leader/cwd/+Help New Del
+|  /tmp/pardes-snap/leader/cwd/+Help                                      New Del
 |     1 pardes builtins, and how to run each:
 |     2 SPC and its keys, a chord, a button, the
 |     3 topbar - or the name, executed anywhere.
@@ -205,7 +205,7 @@
 |    18 SPC k     Kill            topbar
 == snap help-group grid=100x40 cursor=7,22
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/leader/cwd/cmds.txt                              Save New Del
 |     1 Help
 |
 |
@@ -225,7 +225,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/leader/cwd/+Help New Del
+|  /tmp/pardes-snap/leader/cwd/+Help                                      New Del
 |     1 pardes builtins under SPC h
 |     2
 |     3 SPC h t   Tutor           topbar
@@ -246,7 +246,7 @@
 |
 == snap tutor grid=100x40 cursor=7,12
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/leader/cwd/cmds.txt                              Save New Del
 |     1 Help
 |
 |
@@ -256,7 +256,7 @@
 |
 |
 |
-|  /Tutor Save New Del
+|  /Tutor                                                            Save New Del
 |     1
 |     2                                PARDES TUTOR
 |     3                      tmux + vi + acme, from scratch.
@@ -266,7 +266,7 @@
 |     7         Press j until you reach the introduction.
 |     8
 |     9
-|  /tmp/pardes-snap/leader/cwd/+Help New Del
+|  /tmp/pardes-snap/leader/cwd/+Help                                      New Del
 |     1 pardes builtins under SPC h
 |     2
 |     3 SPC h t   Tutor           topbar
@@ -287,7 +287,7 @@
 |
 == snap deleted grid=100x40 cursor=7,22
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/leader/cwd/cmds.txt                              Save New Del
 |     1 Help
 |
 |
@@ -307,7 +307,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/leader/cwd/+Help New Del
+|  /tmp/pardes-snap/leader/cwd/+Help                                      New Del
 |     1 pardes builtins under SPC h
 |     2
 |     3 SPC h t   Tutor           topbar
@@ -328,7 +328,7 @@
 |
 == snap help-all grid=100x40 cursor=7,22
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/leader/cwd/cmds.txt                              Save New Del
 |     1 Help
 |
 |
@@ -348,7 +348,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/leader/cwd/+Help New Del
+|  /tmp/pardes-snap/leader/cwd/+Help                                      New Del
 |     1 pardes builtins, and how to run each:
 |     2 SPC and its keys, a chord, a button, the
 |     3 topbar - or the name, executed anywhere.
@@ -369,7 +369,7 @@
 |    18 SPC k     Kill            topbar
 == snap help-toggles grid=100x40 cursor=7,22
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/leader/cwd/cmds.txt                              Save New Del
 |     1 Help
 |
 |
@@ -389,7 +389,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/leader/cwd/+Help New Del
+|  /tmp/pardes-snap/leader/cwd/+Help                                      New Del
 |     1 pardes builtins under SPC t
 |     2
 |     3 SPC t a   Ascii
@@ -410,7 +410,7 @@
 |
 == snap help-window grid=100x40 cursor=7,22
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/leader/cwd/cmds.txt                              Save New Del
 |     1 Help
 |
 |
@@ -430,15 +430,15 @@
 |
 |
 |
-|  /tmp/pardes-snap/leader/cwd/+Help New Del
+|  /tmp/pardes-snap/leader/cwd/+Help                                      New Del
 |     1 pardes builtins under SPC w
 |     2
 |     3 SPC w h   Left            C-w h, C-w left
 |     4 SPC w j   Down            C-w j, C-w down
 |     5 SPC w k   Up              C-w k, C-w up
 |     6 SPC w l   Right           C-w l, C-w right
-|     7 SPC w t   Toggleterm
-|     8
+|     7
+|
 |
 |
 |
@@ -451,7 +451,7 @@
 |
 == snap help-language grid=100x40 cursor=7,22
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/leader/cwd/cmds.txt                              Save New Del
 |     1 Help
 |
 |
@@ -471,7 +471,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/leader/cwd/+Help New Del
+|  /tmp/pardes-snap/leader/cwd/+Help                                      New Del
 |     1 pardes builtins under SPC l
 |     2
 |     3 SPC l D   WsDiagnostics
@@ -492,7 +492,7 @@
 |
 == snap del-output grid=100x40 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del
+|  /tmp/pardes-snap/leader/cwd/cmds.txt                              Save New Del
 |     1 Help
 |
 |
diff --git a/test/snapshots/leader.snap b/test/snapshots/leader.snap
index 18abf103..c71aaee6 100644
--- a/test/snapshots/leader.snap
+++ b/test/snapshots/leader.snap
@@ -80,7 +80,7 @@ snap help-toggles
 key space
 key w
 key ?
-wait 10000 Toggleterm
+wait 10000 Right
 stable 700 15000
 snap help-window
 # `SPC l ?`: the LANGUAGE group — every LSP command lives here rather than on
@@ -95,7 +95,7 @@ wait 10000 WsDiagnostics
 stable 700 15000
 snap help-language
 # Output buffers close through the same explicit Del builtin as every other
-# pane. Body-normal Esc is now Toggleterm and deliberately keeps +Help alive.
+# pane. Body-normal Esc is now Last and deliberately keeps +Help alive.
 key space d
 settle 100
 stable 700 15000
diff --git a/test/snapshots/logquiet.golden b/test/snapshots/logquiet.golden
index 88d59b6d..9698fd2b 100644
--- a/test/snapshots/logquiet.golden
+++ b/test/snapshots/logquiet.golden
@@ -1,6 +1,6 @@
 == snap quiet grid=100x30 cursor=62,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|$ /tmp/pardes-snap/logquiet/cwd New Del
+|$ /tmp/pardes-snap/logquiet/cwd                                          New Del
 |  $ ls
 |  $ printf '\033_Ga=q,i=1,s=1,v=1,f=24,t=d;AAAA\033\\\033[>0p'
 |  $ '\033_Ga=q,i=1,s=1,v=1,f=24,t=d;AAAA\033\\\033[>0p'Gi=1;OK
diff --git a/test/snapshots/lookpanes.golden b/test/snapshots/lookpanes.golden
index 276de16b..acdb02a3 100644
--- a/test/snapshots/lookpanes.golden
+++ b/test/snapshots/lookpanes.golden
@@ -1,6 +1,6 @@
 == snap shells grid=130x50 cursor=122,3
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del       /tmp/pardes-snap/lookpanes/cwd New Del
+|  /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del       /tmp/pardes-snap/lookpanes/cwd      New Del
 |     1 both.txt
 |     2 b-marker                                                    alpha  beta  zzboot.txt    zqonly.txt pick.txt twin.txt
 |
@@ -51,7 +51,7 @@
 |
 == snap other-dir grid=130x50 cursor=7,27
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del       /tmp/pardes-snap/lookpanes/cwd New Del
+|  /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del       /tmp/pardes-snap/lookpanes/cwd      New Del
 |     1 both.txt
 |     2 b-marker                                                    alpha  beta  zzboot.txt    zqonly.txt pick.txt twin.txt
 |
@@ -102,7 +102,7 @@
 |
 == snap clicked-wins grid=130x50 cursor=7,15
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del       /tmp/pardes-snap/lookpanes/cwd New Del
+|  /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del       /tmp/pardes-snap/lookpanes/cwd      New Del
 |     1 both.txt
 |     2 b-marker                                                    alpha  beta  zzboot.txt    zqonly.txt pick.txt twin.txt
 |
@@ -153,7 +153,7 @@
 |
 == snap mru-alpha grid=130x50 cursor=7,21
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del       /tmp/pardes-snap/lookpanes/cwd New Del
+|  /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del       /tmp/pardes-snap/lookpanes/cwd      New Del
 |     1 both.txt
 |     2 b-marker                                                    alpha  beta  zzboot.txt    zqonly.txt pick.txt twin.txt
 |
@@ -204,7 +204,7 @@
 |
 == snap mru-beta grid=130x50 cursor=7,9
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del       /tmp/pardes-snap/lookpanes/cwd New Del
+|  /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del       /tmp/pardes-snap/lookpanes/cwd      New Del
 |     1 both.txt
 |     2 b-marker                                                    alpha  beta  zzboot.txt    zqonly.txt pick.txt twin.txt
 |
@@ -255,7 +255,7 @@
 |
 == style mru-beta
 |0: 0-56 #949494,#121212, 57-129 d,#121212,
-|1: 0-1 #ffffff,#262626, 2-59 #949494,#121212, 60-64 d,#121212, 65-66 #ffffff,#262626, 67-104 #949494,#121212, 105-129 d,#121212,
+|1: 0-1 #ffffff,#262626, 2-59 #949494,#121212, 60-64 d,#121212, 65-66 #ffffff,#262626, 67-109 #949494,#121212, 110-129 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-121 #bdbdbd,#080808, 122-129 d,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808,
diff --git a/test/snapshots/lookrange.golden b/test/snapshots/lookrange.golden
index 11b0bd2f..6e292431 100644
--- a/test/snapshots/lookrange.golden
+++ b/test/snapshots/lookrange.golden
@@ -1,6 +1,6 @@
 == snap opened grid=150x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/look.txt                                                                             Save New Del
 |     1 r.txt:3-5
 |     2 r.txt:7:4-9
 |     3 r.txt:3:2-5:3
@@ -31,7 +31,7 @@
 |
 == snap wholelines grid=150x30 cursor=11,21
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/look.txt                                                                             Save New Del
 |     1 r.txt:3-5
 |     2 r.txt:7:4-9
 |     3 r.txt:3:2-5:3
@@ -46,7 +46,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/r.txt                                                                                Save New Del
 |     1 aaaa
 |     2 bbbb
 |     3 cccc dccc
@@ -62,7 +62,7 @@
 |
 == style wholelines
 |0: 0-56 #949494,#121212, 57-149 d,#121212,
-|1: 0-1 #ffffff,#262626, 2-53 #949494,#121212, 54-149 d,#121212,
+|1: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-149 d,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-149 d,#080808,
@@ -77,7 +77,7 @@
 |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
-|16: 0-1 #ffffff,#626262, 2-50 #949494,#121212, 51-149 d,#121212,
+|16: 0-1 #ffffff,#626262, 2-129 #949494,#121212, 130-149 d,#121212,
 |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
 |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
 |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 #080808,#80a0ff,
@@ -93,7 +93,7 @@
 |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 == snap onelinespan grid=150x30 cursor=15,23
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/look.txt                                                                             Save New Del
 |     1 r.txt:3-5
 |     2 r.txt:7:4-9
 |     3 r.txt:3:2-5:3
@@ -108,7 +108,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/r.txt                                                                                Save New Del
 |     1 aaaa
 |     2 bbbb
 |     3 cccc dccc
@@ -124,7 +124,7 @@
 |
 == style onelinespan
 |0: 0-56 #949494,#121212, 57-149 d,#121212,
-|1: 0-1 #ffffff,#262626, 2-53 #949494,#121212, 54-149 d,#121212,
+|1: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-149 d,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-149 d,#080808,
@@ -139,7 +139,7 @@
 |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
-|16: 0-1 #ffffff,#626262, 2-50 #949494,#121212, 51-149 d,#121212,
+|16: 0-1 #ffffff,#626262, 2-129 #949494,#121212, 130-149 d,#121212,
 |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
 |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
 |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808,
@@ -155,7 +155,7 @@
 |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 == snap fullspan grid=150x30 cursor=9,21
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/look.txt                                                                             Save New Del
 |     1 r.txt:3-5
 |     2 r.txt:7:4-9
 |     3 r.txt:3:2-5:3
@@ -170,7 +170,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/r.txt                                                                                Save New Del
 |     1 aaaa
 |     2 bbbb
 |     3 cccc dccc
@@ -186,7 +186,7 @@
 |
 == style fullspan
 |0: 0-56 #949494,#121212, 57-149 d,#121212,
-|1: 0-1 #ffffff,#262626, 2-53 #949494,#121212, 54-149 d,#121212,
+|1: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-149 d,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-149 d,#080808,
@@ -201,7 +201,7 @@
 |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
-|16: 0-1 #ffffff,#626262, 2-50 #949494,#121212, 51-149 d,#121212,
+|16: 0-1 #ffffff,#626262, 2-129 #949494,#121212, 130-149 d,#121212,
 |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
 |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
 |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-7 #bdbdbd,#080808, 8-149 #080808,#80a0ff,
@@ -217,7 +217,7 @@
 |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 == snap stale grid=150x30 cursor=10,24
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/look.txt                                                                             Save New Del
 |     1 r.txt:3-5
 |     2 r.txt:7:4-9
 |     3 r.txt:3:2-5:3
@@ -232,7 +232,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/r.txt                                                                                Save New Del
 |     2 bbbb
 |     3 cccc dccc
 |     4 dddd
@@ -248,7 +248,7 @@
 |
 == style stale
 |0: 0-56 #949494,#121212, 57-149 d,#121212,
-|1: 0-1 #ffffff,#262626, 2-53 #949494,#121212, 54-149 d,#121212,
+|1: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-149 d,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-149 d,#080808,
@@ -263,7 +263,7 @@
 |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
-|16: 0-1 #ffffff,#626262, 2-50 #949494,#121212, 51-149 d,#121212,
+|16: 0-1 #ffffff,#626262, 2-129 #949494,#121212, 130-149 d,#121212,
 |17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
 |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808,
 |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
@@ -279,7 +279,7 @@
 |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 == snap results grid=150x30 cursor=10,24
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/look.txt                                                                             Save New Del
 |     1 r.txt:3-5
 |     2 r.txt:7:4-9
 |     3 r.txt:3:2-5:3
@@ -294,7 +294,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/r.txt                                                                                Save New Del
 |     2 bbbb
 |     3 cccc dccc
 |     4 dddd
@@ -305,12 +305,12 @@
 |     9 iiii
 |
 |
-|  /tmp/pardes-snap/lookrange/cwd/+Search New Del
+|  /tmp/pardes-snap/lookrange/cwd/+Search                                                                                   New Del
 |     1 r.txt:7:4-9 gg NEEDLE gg
 |     2 r.txt:8:6-11 hhhh NEEDLE
 == snap hit1 grid=150x30 cursor=15,22
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/look.txt                                                                             Save New Del
 |     1 r.txt:3-5
 |     2 r.txt:7:4-9
 |     3 r.txt:3:2-5:3
@@ -325,7 +325,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/r.txt                                                                                Save New Del
 |     2 bbbb
 |     3 cccc dccc
 |     4 dddd
@@ -336,12 +336,12 @@
 |     9 iiii
 |
 |
-|  /tmp/pardes-snap/lookrange/cwd/+Search New Del
+|  /tmp/pardes-snap/lookrange/cwd/+Search                                                                                   New Del
 |     1 r.txt:7:4-9 gg NEEDLE gg
 |     2 r.txt:8:6-11 hhhh NEEDLE
 == style hit1
 |0: 0-56 #949494,#121212, 57-149 d,#121212,
-|1: 0-1 #ffffff,#262626, 2-53 #949494,#121212, 54-149 d,#121212,
+|1: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-149 d,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-149 d,#080808,
@@ -356,7 +356,7 @@
 |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
-|16: 0-1 #ffffff,#626262, 2-50 #949494,#121212, 51-149 d,#121212,
+|16: 0-1 #ffffff,#626262, 2-129 #949494,#121212, 130-149 d,#121212,
 |17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
 |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808,
 |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
@@ -367,12 +367,12 @@
 |24: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
 |25: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |26: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
-|27: 0-1 #ffffff,#262626, 2-47 #949494,#121212, 48-149 d,#121212,
+|27: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212,
 |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 #080808,#80a0ff,
 |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-30 #bdbdbd,#080808, 31-149 d,#080808,
 == snap hit2 grid=150x30 cursor=17,22
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/look.txt                                                                             Save New Del
 |     1 r.txt:3-5
 |     2 r.txt:7:4-9
 |     3 r.txt:3:2-5:3
@@ -387,7 +387,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/r.txt                                                                                Save New Del
 |     3 cccc dccc
 |     4 dddd
 |     5 eeee
@@ -398,12 +398,12 @@
 |
 |
 |
-|  /tmp/pardes-snap/lookrange/cwd/+Search New Del
+|  /tmp/pardes-snap/lookrange/cwd/+Search                                                                                   New Del
 |     1 r.txt:7:4-9 gg NEEDLE gg
 |     2 r.txt:8:6-11 hhhh NEEDLE
 == style hit2
 |0: 0-56 #949494,#121212, 57-149 d,#121212,
-|1: 0-1 #ffffff,#262626, 2-53 #949494,#121212, 54-149 d,#121212,
+|1: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-149 d,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-149 d,#080808,
@@ -418,7 +418,7 @@
 |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
-|16: 0-1 #ffffff,#626262, 2-50 #949494,#121212, 51-149 d,#121212,
+|16: 0-1 #ffffff,#626262, 2-129 #949494,#121212, 130-149 d,#121212,
 |17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808,
 |18: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
 |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
@@ -429,12 +429,12 @@
 |24: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |25: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |26: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
-|27: 0-1 #ffffff,#262626, 2-47 #949494,#121212, 48-149 d,#121212,
+|27: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212,
 |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-30 #bdbdbd,#080808, 31-149 d,#080808,
 |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 #080808,#80a0ff,
 == snap back grid=150x30 cursor=15,22
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/look.txt                                                                             Save New Del
 |     1 r.txt:3-5
 |     2 r.txt:7:4-9
 |     3 r.txt:3:2-5:3
@@ -449,7 +449,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del
+|  /tmp/pardes-snap/lookrange/cwd/r.txt                                                                                Save New Del
 |     2 bbbb
 |     3 cccc dccc
 |     4 dddd
@@ -460,12 +460,12 @@
 |     9 iiii
 |
 |
-|  /tmp/pardes-snap/lookrange/cwd/+Search New Del
+|  /tmp/pardes-snap/lookrange/cwd/+Search                                                                                   New Del
 |     1 r.txt:7:4-9 gg NEEDLE gg
 |     2 r.txt:8:6-11 hhhh NEEDLE
 == style back
 |0: 0-56 #949494,#121212, 57-149 d,#121212,
-|1: 0-1 #ffffff,#262626, 2-53 #949494,#121212, 54-149 d,#121212,
+|1: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-149 d,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-149 d,#080808,
@@ -480,7 +480,7 @@
 |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
-|16: 0-1 #ffffff,#626262, 2-50 #949494,#121212, 51-149 d,#121212,
+|16: 0-1 #ffffff,#626262, 2-129 #949494,#121212, 130-149 d,#121212,
 |17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
 |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808,
 |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
@@ -491,6 +491,6 @@
 |24: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
 |25: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
 |26: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
-|27: 0-1 #ffffff,#262626, 2-47 #949494,#121212, 48-149 d,#121212,
+|27: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212,
 |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 #080808,#80a0ff,
 |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-30 #bdbdbd,#080808, 31-149 d,#080808,
diff --git a/test/snapshots/lsp.golden b/test/snapshots/lsp.golden
index 46d4a94a..48577a7f 100644
--- a/test/snapshots/lsp.golden
+++ b/test/snapshots/lsp.golden
@@ -1,6 +1,6 @@
 == snap opened grid=120x40 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lsp/cwd/a.zig Save New Del
+|  /tmp/pardes-snap/lsp/cwd/a.zig                                                        Save New Del
 |     1 const std = @import("std");
 |     2
 |     3 fn helper(x: u32) u32 {
@@ -41,7 +41,7 @@
 |
 == snap cursor grid=120x40 cursor=17,9
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lsp/cwd/a.zig Save New Del
+|  /tmp/pardes-snap/lsp/cwd/a.zig                                                        Save New Del
 |     1 const std = @import("std");
 |     2
 |     3 fn helper(x: u32) u32 {
@@ -82,7 +82,7 @@
 |
 == snap definition grid=120x40 cursor=15,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lsp/cwd/a.zig Save New Del
+|  /tmp/pardes-snap/lsp/cwd/a.zig                                                        Save New Del
 |     1 const std = @import("std");
 |     2
 |     3 fn helper(x: u32) u32 {
@@ -123,7 +123,7 @@
 |
 == snap hover grid=120x40 cursor=15,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lsp/cwd/a.zig Save New Del
+|  /tmp/pardes-snap/lsp/cwd/a.zig                                                        Save New Del
 |     1 const std = @import("std");
 |     2
 |     3 fn helper(x: u32) u32 {
@@ -159,12 +159,12 @@
 |
 |
 |
-|  /tmp/pardes-snap/lsp/cwd/+Hover New Del
+|  /tmp/pardes-snap/lsp/cwd/+Hover                                                            New Del
 |     1 fn helper(x: u32) u32
 |     2 (fn (u32) u32)
 == snap symbols grid=120x40 cursor=15,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lsp/cwd/a.zig Save New Del
+|  /tmp/pardes-snap/lsp/cwd/a.zig                                                        Save New Del
 |     1 const std = @import("std");
 |     2
 |     3 fn helper(x: u32) u32 {
@@ -196,16 +196,16 @@
 |
 |
 |
-|  /tmp/pardes-snap/lsp/cwd/+Search New Del
+|  /tmp/pardes-snap/lsp/cwd/+Search                                                           New Del
 |     1 /tmp/pardes-snap/lsp/cwd/a.zig:1:7-9 std
 |     2 /tmp/pardes-snap/lsp/cwd/a.zig:3:4-9 helper  fn helper(x: u32) u32
 |     3 /tmp/pardes-snap/lsp/cwd/a.zig:7:8-11 main  fn main() void
-|  /tmp/pardes-snap/lsp/cwd/+Hover New Del
+|  /tmp/pardes-snap/lsp/cwd/+Hover                                                            New Del
 |     1 fn helper(x: u32) u32
 |     2 (fn (u32) u32)
 == snap step grid=120x40 cursor=15,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lsp/cwd/a.zig Save New Del
+|  /tmp/pardes-snap/lsp/cwd/a.zig                                                        Save New Del
 |     1 const std = @import("std");
 |     2
 |     3 fn helper(x: u32) u32 {
@@ -237,16 +237,16 @@
 |
 |
 |
-|  /tmp/pardes-snap/lsp/cwd/+Search New Del
+|  /tmp/pardes-snap/lsp/cwd/+Search                                                           New Del
 |     1 /tmp/pardes-snap/lsp/cwd/a.zig:1:7-9 std
 |     2 /tmp/pardes-snap/lsp/cwd/a.zig:3:4-9 helper  fn helper(x: u32) u32
 |     3 /tmp/pardes-snap/lsp/cwd/a.zig:7:8-11 main  fn main() void
-|  /tmp/pardes-snap/lsp/cwd/+Hover New Del
+|  /tmp/pardes-snap/lsp/cwd/+Hover                                                            New Del
 |     1 fn helper(x: u32) u32
 |     2 (fn (u32) u32)
 == snap nothing grid=120x40 cursor=7,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lsp/cwd/a.zig Save New Del
+|  /tmp/pardes-snap/lsp/cwd/a.zig                                                        Save New Del
 |     1 const std = @import("std");
 |     2
 |     3 fn helper(x: u32) u32 {
@@ -278,10 +278,10 @@
 |
 |
 |
-|  /tmp/pardes-snap/lsp/cwd/+Search New Del
+|  /tmp/pardes-snap/lsp/cwd/+Search                                                           New Del
 |     1 /tmp/pardes-snap/lsp/cwd/a.zig:1:7-9 std
 |     2 /tmp/pardes-snap/lsp/cwd/a.zig:3:4-9 helper  fn helper(x: u32) u32
 |     3 /tmp/pardes-snap/lsp/cwd/a.zig:7:8-11 main  fn main() void
-|  /tmp/pardes-snap/lsp/cwd/+Hover New Del
+|  /tmp/pardes-snap/lsp/cwd/+Hover                                                            New Del
 |     1 fn helper(x: u32) u32
 |     2 (fn (u32) u32)
diff --git a/test/snapshots/lspdebug.golden b/test/snapshots/lspdebug.golden
index b34a264f..ce90c19d 100644
--- a/test/snapshots/lspdebug.golden
+++ b/test/snapshots/lspdebug.golden
@@ -1,6 +1,6 @@
 == snap opened grid=120x44 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lspdebug/cwd/z.zig Save New Del
+|  /tmp/pardes-snap/lspdebug/cwd/z.zig                                                   Save New Del
 |     1 const std = @import("std");
 |     2
 |     3 fn helper() u32 {
@@ -45,7 +45,7 @@
 |
 == snap ctrlclick grid=120x44 cursor=15,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lspdebug/cwd/z.zig Save New Del
+|  /tmp/pardes-snap/lspdebug/cwd/z.zig                                                   Save New Del
 |     1 const std = @import("std");
 |     2
 |     3 fn helper() u32 {
@@ -90,7 +90,7 @@
 |
 == snap plainclick grid=120x44 cursor=21,9
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lspdebug/cwd/z.zig Save New Del
+|  /tmp/pardes-snap/lspdebug/cwd/z.zig                                                   Save New Del
 |     1 const std = @import("std");
 |     2
 |     3 fn helper() u32 {
@@ -135,7 +135,7 @@
 |
 == snap why grid=120x44 cursor=7,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lspdebug/cwd/z.zig Save New Del
+|  /tmp/pardes-snap/lspdebug/cwd/z.zig                                                   Save New Del
 |     1 const std = @import("std");
 |     2
 |     3 fn helper() u32 {
@@ -168,7 +168,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/lspdebug/cwd/+Lsp New Del
+|  /tmp/pardes-snap/lspdebug/cwd/+Lsp                                                         New Del
 |     1 lsp explain — the definition query at byte 29 of z.zig
 |     2
 |     3 zig lib dir: /usr/lib/zig (open) — `std` imports resolve
@@ -180,7 +180,7 @@
 |     9 0 row(s)
 == snap info grid=120x44 cursor=7,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/lspdebug/cwd/z.zig Save New Del
+|  /tmp/pardes-snap/lspdebug/cwd/z.zig                                                   Save New Del
 |     1 const std = @import("std");
 |     2
 |     3 fn helper() u32 {
@@ -197,7 +197,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/lspdebug/cwd/+Lsp New Del
+|  /tmp/pardes-snap/lspdebug/cwd/+Lsp                                                         New Del
 |     1 backend: zls-inproc
 |     2 zls: 0.16.1-dev+3e0d0820 (compiled in — no server process, no JSON-RPC)
 |     3 zig lib dir: /usr/lib/zig  [OK]
@@ -213,7 +213,7 @@
 |    10   mvzr           /home/goblin/00-projects/0x4200.cafe/02-pardes-code/zig-pkg/mvzr-0.3.9-ZSOky6t2AQCA7efmm5EYbPb5↩
 |       sOdbXa4EFsUgYbQ6hZv9/src/mvzr.zig
 |    11   mupdf          /home/goblin/00-projects/0x4200.cafe/02-pardes-code/src/pdf.zig
-|  /tmp/pardes-snap/lspdebug/cwd/+Lsp New Del
+|  /tmp/pardes-snap/lspdebug/cwd/+Lsp                                                         New Del
 |     1 lsp explain — the definition query at byte 29 of z.zig
 |     2
 |     3 zig lib dir: /usr/lib/zig (open) — `std` imports resolve
diff --git a/test/snapshots/msg.golden b/test/snapshots/msg.golden
index 67ab94ea..77c2678b 100644
--- a/test/snapshots/msg.golden
+++ b/test/snapshots/msg.golden
@@ -1,6 +1,6 @@
 == snap opened grid=70x14 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/msg/cwd/a.txt Save New Del
+|  /tmp/pardes-snap/msg/cwd/a.txt      Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -15,7 +15,7 @@
 |
 == snap saved grid=70x14 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/msg/cwd/a.txt Save New Del
+|  /tmp/pardes-snap/msg/cwd/a.txt      Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -30,7 +30,7 @@
 |  --:--:--  saved /tmp/pardes-snap/msg/cwd/a.txt
 == snap repainted grid=70x16 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/msg/cwd/a.txt Save New Del
+|  /tmp/pardes-snap/msg/cwd/a.txt      Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -47,7 +47,7 @@
 |  --:--:--  saved /tmp/pardes-snap/msg/cwd/a.txt
 == snap keycleared grid=70x16 cursor=7,3
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/msg/cwd/a.txt Save New Del
+|  /tmp/pardes-snap/msg/cwd/a.txt      Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -64,7 +64,7 @@
 |
 == snap saved-again grid=70x16 cursor=7,3
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/msg/cwd/a.txt Save New Del
+|  /tmp/pardes-snap/msg/cwd/a.txt      Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -81,7 +81,7 @@
 |  --:--:--  saved /tmp/pardes-snap/msg/cwd/a.txt
 == snap mousecleared grid=70x16 cursor=7,3
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/msg/cwd/a.txt Save New Del
+|  /tmp/pardes-snap/msg/cwd/a.txt      Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -98,7 +98,7 @@
 |
 == snap reloaded grid=70x16 cursor=7,3
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/msg/cwd/a.txt Save New Del
+|  /tmp/pardes-snap/msg/cwd/a.txt      Save New Del
 |     1 EXTERNAL
 |     2
 |
@@ -115,7 +115,7 @@
 |  --:--:--  reloaded /tmp/pardes-snap/msg/cwd/a.txt
 == snap prompt grid=70x16 cursor=7,15
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/msg/cwd/a.txt Save New Del
+|  /tmp/pardes-snap/msg/cwd/a.txt      Save New Del
 |     1 EXTERNAL
 |     2
 |
@@ -132,7 +132,7 @@
 |   /EXT
 == snap prompt-wins grid=70x16 cursor=7,15
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/msg/cwd/a.txt Save New Del
+|  /tmp/pardes-snap/msg/cwd/a.txt      Save New Del
 |     1 AGAIN
 |     2
 |
@@ -149,7 +149,7 @@
 |   /EXT
 == snap esc grid=70x16 cursor=7,3
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/msg/cwd/a.txt Save New Del
+|  /tmp/pardes-snap/msg/cwd/a.txt      Save New Del
 |     1 AGAIN
 |     2
 |
diff --git a/test/snapshots/pipe.golden b/test/snapshots/pipe.golden
index 0cd57642..080eb71c 100644
--- a/test/snapshots/pipe.golden
+++ b/test/snapshots/pipe.golden
@@ -1,6 +1,6 @@
 == snap prompt grid=180x12 cursor=14,11
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/pipe/cwd/pipe.txt Save New Del
+|  /tmp/pardes-snap/pipe/cwd/pipe.txt                                                                                                                Save New Del
 |     1 alpha beta
 |     2 gamma delta
 |
@@ -13,7 +13,7 @@
 |   |tr a-z A-Z
 == snap filtered grid=180x12 cursor=17,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/pipe/cwd/pipe.txt Save New Del
+|  /tmp/pardes-snap/pipe/cwd/pipe.txt                                                                                                                Save New Del
 |     1 ALPHA BETA
 |     2 gamma delta
 |
@@ -26,7 +26,7 @@
 |
 == snap undone grid=180x12 cursor=17,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/pipe/cwd/pipe.txt Save New Del
+|  /tmp/pardes-snap/pipe/cwd/pipe.txt                                                                                                                Save New Del
 |     1 alpha beta
 |     2 gamma delta
 |
diff --git a/test/snapshots/psearch.golden b/test/snapshots/psearch.golden
index 0ce9f2ee..25af2036 100644
--- a/test/snapshots/psearch.golden
+++ b/test/snapshots/psearch.golden
@@ -1,6 +1,6 @@
 == snap output grid=140x30 cursor=4,8
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/psearch/cwd New Del
+|  /tmp/pardes-snap/psearch/cwd                                                                                   New Del
 |
 |  x MARK a
 |  zz
@@ -31,7 +31,7 @@
 |
 == snap typing grid=140x30 cursor=8,29
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/psearch/cwd New Del
+|  /tmp/pardes-snap/psearch/cwd                                                                                   New Del
 |
 |  x MARK a
 |  zz
@@ -62,7 +62,7 @@
 |   /MARK
 == snap results grid=140x30 cursor=4,8
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/psearch/cwd New Del
+|  /tmp/pardes-snap/psearch/cwd                                                                                   New Del
 |
 |  x MARK a
 |  zz
@@ -87,13 +87,13 @@
 |
 |
 |
-|  /tmp/pardes-snap/psearch/cwd/+Search New Del
+|  /tmp/pardes-snap/psearch/cwd/+Search                                                                           New Del
 |     1 @p0:2:3-6 x MARK a
 |     2 @p0:4:3-6 x MARK b
 |     3 @p0:6:3-6 x MARK c
 == snap first grid=140x30 cursor=7,3
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/psearch/cwd New Del
+|  /tmp/pardes-snap/psearch/cwd                                                                                   New Del
 |
 |  x MARK a
 |  zz
@@ -118,13 +118,13 @@
 |
 |
 |
-|  /tmp/pardes-snap/psearch/cwd/+Search New Del
+|  /tmp/pardes-snap/psearch/cwd/+Search                                                                           New Del
 |     1 @p0:2:3-6 x MARK a
 |     2 @p0:4:3-6 x MARK b
 |     3 @p0:6:3-6 x MARK c
 == style first
 |0: 0-56 #949494,#121212, 57-139 d,#121212,
-|1: 0-1 #ffffff,#626262, 2-37 #949494,#121212, 38-139 d,#121212,
+|1: 0-1 #ffffff,#626262, 2-119 #949494,#121212, 120-139 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-3 #bdbdbd,#080808, 4-7 #080808,#80a0ff, 8-139 #bdbdbd,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
@@ -149,13 +149,13 @@
 |23: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
 |24: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
 |25: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|26: 0-1 #ffffff,#262626, 2-45 #949494,#121212, 46-139 d,#121212,
+|26: 0-1 #ffffff,#262626, 2-119 #949494,#121212, 120-139 d,#121212,
 |27: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-139 #080808,#80a0ff,
 |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-139 d,#080808,
 |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-139 d,#080808,
 == snap second grid=140x30 cursor=7,5
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/psearch/cwd New Del
+|  /tmp/pardes-snap/psearch/cwd                                                                                   New Del
 |
 |  x MARK a
 |  zz
@@ -180,13 +180,13 @@
 |
 |
 |
-|  /tmp/pardes-snap/psearch/cwd/+Search New Del
+|  /tmp/pardes-snap/psearch/cwd/+Search                                                                           New Del
 |     1 @p0:2:3-6 x MARK a
 |     2 @p0:4:3-6 x MARK b
 |     3 @p0:6:3-6 x MARK c
 == snap back grid=140x30 cursor=7,3
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/psearch/cwd New Del
+|  /tmp/pardes-snap/psearch/cwd                                                                                   New Del
 |
 |  x MARK a
 |  zz
@@ -211,13 +211,13 @@
 |
 |
 |
-|  /tmp/pardes-snap/psearch/cwd/+Search New Del
+|  /tmp/pardes-snap/psearch/cwd/+Search                                                                           New Del
 |     1 @p0:2:3-6 x MARK a
 |     2 @p0:4:3-6 x MARK b
 |     3 @p0:6:3-6 x MARK c
 == snap nomatch grid=140x30 cursor=7,3
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/psearch/cwd New Del
+|  /tmp/pardes-snap/psearch/cwd                                                                                   New Del
 |
 |  x MARK a
 |  zz
@@ -240,15 +240,15 @@
 |
 |
 |
-|  /tmp/pardes-snap/psearch/cwd/+Search New Del
+|  /tmp/pardes-snap/psearch/cwd/+Search                                                                           New Del
 |     1
-|  /tmp/pardes-snap/psearch/cwd/+Search New Del
+|  /tmp/pardes-snap/psearch/cwd/+Search                                                                           New Del
 |     1 @p0:2:3-6 x MARK a
 |     2 @p0:4:3-6 x MARK b
 |     3 @p0:6:3-6 x MARK c
 == snap ttyinert grid=140x30 cursor=4,8
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|$ /tmp/pardes-snap/psearch/cwd New Del
+|$ /tmp/pardes-snap/psearch/cwd                                                                                   New Del
 |  $ printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
 |  x MARK a
 |  zz
@@ -271,15 +271,15 @@
 |
 |
 |
-|  /tmp/pardes-snap/psearch/cwd/+Search New Del
+|  /tmp/pardes-snap/psearch/cwd/+Search                                                                           New Del
 |     1
-|  /tmp/pardes-snap/psearch/cwd/+Search New Del
+|  /tmp/pardes-snap/psearch/cwd/+Search                                                                           New Del
 |     1 @p0:2:3-6 x MARK a
 |     2 @p0:4:3-6 x MARK b
 |     3 @p0:6:3-6 x MARK c
 == snap rightsearch grid=140x30 cursor=7,5
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/psearch/cwd New Del
+|  /tmp/pardes-snap/psearch/cwd                                                                                   New Del
 |
 |  x MARK a
 |  zz
@@ -302,9 +302,9 @@
 |
 |
 |
-|  /tmp/pardes-snap/psearch/cwd/+Search New Del
+|  /tmp/pardes-snap/psearch/cwd/+Search                                                                           New Del
 |     1
-|  /tmp/pardes-snap/psearch/cwd/+Search New Del
+|  /tmp/pardes-snap/psearch/cwd/+Search                                                                           New Del
 |     1 @p0:2:3-6 x MARK a
 |     2 @p0:4:3-6 x MARK b
 |     3 @p0:6:3-6 x MARK c
diff --git a/test/snapshots/reflow.golden b/test/snapshots/reflow.golden
index 09d6bfad..b6b303d9 100644
--- a/test/snapshots/reflow.golden
+++ b/test/snapshots/reflow.golden
@@ -1,6 +1,6 @@
 == snap widened grid=200x24 cursor=4,19
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|$ /tmp/pardes-snap/reflow/cwd New Del
+|$ /tmp/pardes-snap/reflow/cwd                                                                                                                                                New Del
 |  $ printf 'y%.0s' $(seq 1 3000); echo do''ne
 |  yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
 |  yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
diff --git a/test/snapshots/restore.golden b/test/snapshots/restore.golden
index 2ff8e586..dea5e81f 100644
--- a/test/snapshots/restore.golden
+++ b/test/snapshots/restore.golden
@@ -1,6 +1,6 @@
 == snap dumped grid=100x30 cursor=4,5
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill Restore /tmp/pardes-snap/restore/dump.zon
-|$ /tmp/pardes-snap/restore/cwd New Del
+|$ /tmp/pardes-snap/restore/cwd                                           New Del
 |  $ ls
 |  $ echo KEEP''ME
 |  KEEPME
@@ -31,7 +31,7 @@
 |
 == snap restored grid=100x30 cursor=4,5
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/restore/cwd New Del
+|  /tmp/pardes-snap/restore/cwd                                           New Del
 |
 |
 |  KEEPME
diff --git a/test/snapshots/rsearch.golden b/test/snapshots/rsearch.golden
index f21af871..852be46d 100644
--- a/test/snapshots/rsearch.golden
+++ b/test/snapshots/rsearch.golden
@@ -1,6 +1,6 @@
 == snap opened grid=180x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd New Del                        /tmp/pardes-snap/rsearch/cwd New Del
+|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd   New Del                      /tmp/pardes-snap/rsearch/cwd   New Del
 |     1 run count_x now
 |     2 open sub/dep.txt:3 here                                code.txt  sub                                               code.txt  sub
 |     3 count_x again
@@ -15,7 +15,7 @@
 |
 |
 |
-|                                                              /tmp/pardes-snap/rsearch/cwd New Del
+|                                                              /tmp/pardes-snap/rsearch/cwd   New Del
 |
 |                                                              code.txt  sub
 |
@@ -31,7 +31,7 @@
 |
 == snap search grid=180x30 cursor=13,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd New Del                        /tmp/pardes-snap/rsearch/cwd New Del
+|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd   New Del                      /tmp/pardes-snap/rsearch/cwd   New Del
 |     1 run count_x now
 |     2 open sub/dep.txt:3 here                                code.txt  sub                                               code.txt  sub
 |     3 count_x again
@@ -46,7 +46,7 @@
 |
 |
 |
-|                                                              /tmp/pardes-snap/rsearch/cwd New Del
+|                                                              /tmp/pardes-snap/rsearch/cwd   New Del
 |
 |                                                              code.txt  sub
 |
@@ -62,7 +62,7 @@
 |     2 code.txt:3:1-7 count_x again
 == snap select grid=180x30 cursor=14,5
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd New Del                        /tmp/pardes-snap/rsearch/cwd New Del
+|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd   New Del                      /tmp/pardes-snap/rsearch/cwd   New Del
 |     1 run count_x now
 |     2 open sub/dep.txt:3 here                                code.txt  sub                                               code.txt  sub
 |     3 count_x again
@@ -77,7 +77,7 @@
 |
 |
 |
-|                                                              /tmp/pardes-snap/rsearch/cwd New Del
+|                                                              /tmp/pardes-snap/rsearch/cwd   New Del
 |
 |                                                              code.txt  sub
 |
@@ -93,7 +93,7 @@
 |     2 code.txt:3:1-7 count_x again
 == snap path-open grid=180x30 cursor=7,16
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd New Del                        /tmp/pardes-snap/rsearch/cwd New Del
+|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd   New Del                      /tmp/pardes-snap/rsearch/cwd   New Del
 |     1 run count_x now
 |     2 open sub/dep.txt:3 here                                code.txt  sub                                               code.txt  sub
 |     3 count_x again
@@ -108,7 +108,7 @@
 |  /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save New Del
 |     1 d1
 |     2 d2
-|     3 DEPTARGET                                              /tmp/pardes-snap/rsearch/cwd New Del
+|     3 DEPTARGET                                              /tmp/pardes-snap/rsearch/cwd   New Del
 |     4 d4
 |     5 d5                                                     code.txt  sub
 |     6 d6
@@ -124,7 +124,7 @@
 |     2 code.txt:3:1-7 count_x again
 == snap step1 grid=180x30 cursor=13,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd New Del                        /tmp/pardes-snap/rsearch/cwd New Del
+|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd   New Del                      /tmp/pardes-snap/rsearch/cwd   New Del
 |     1 run count_x now
 |     2 open sub/dep.txt:3 here                                code.txt  sub                                               code.txt  sub
 |     3 count_x again
@@ -139,7 +139,7 @@
 |  /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save New Del
 |     1 d1
 |     2 d2
-|     3 DEPTARGET                                              /tmp/pardes-snap/rsearch/cwd New Del
+|     3 DEPTARGET                                              /tmp/pardes-snap/rsearch/cwd   New Del
 |     4 d4
 |     5 d5                                                     code.txt  sub
 |     6 d6
@@ -155,7 +155,7 @@
 |     2 code.txt:3:1-7 count_x again
 == snap step2 grid=180x30 cursor=17,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd New Del                        /tmp/pardes-snap/rsearch/cwd New Del
+|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd   New Del                      /tmp/pardes-snap/rsearch/cwd   New Del
 |     1 run count_x now
 |     2 open sub/dep.txt:3 here                                code.txt  sub                                               code.txt  sub
 |     3 count_x again
@@ -170,7 +170,7 @@
 |  /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save New Del
 |     1 d1
 |     2 d2
-|     3 DEPTARGET                                              /tmp/pardes-snap/rsearch/cwd New Del
+|     3 DEPTARGET                                              /tmp/pardes-snap/rsearch/cwd   New Del
 |     4 d4
 |     5 d5                                                     code.txt  sub
 |     6 d6
@@ -186,7 +186,7 @@
 |     2 code.txt:3:1-7 count_x again
 == snap step3 grid=180x30 cursor=17,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd New Del                        /tmp/pardes-snap/rsearch/cwd New Del
+|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd   New Del                      /tmp/pardes-snap/rsearch/cwd   New Del
 |     1 run count_x now
 |     2 open sub/dep.txt:3 here                                code.txt  sub                                               code.txt  sub
 |     3 count_x again
@@ -201,7 +201,7 @@
 |  /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save New Del
 |     1 d1
 |     2 d2
-|     3 DEPTARGET                                              /tmp/pardes-snap/rsearch/cwd New Del
+|     3 DEPTARGET                                              /tmp/pardes-snap/rsearch/cwd   New Del
 |     4 d4
 |     5 d5                                                     code.txt  sub
 |     6 d6
@@ -217,7 +217,7 @@
 |     2 code.txt:3:1-7 count_x again
 == snap selclick grid=180x30 cursor=14,5
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd New Del                        /tmp/pardes-snap/rsearch/cwd New Del
+|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd   New Del                      /tmp/pardes-snap/rsearch/cwd   New Del
 |     1 run count_x now
 |     2 open sub/dep.txt:3 here                                code.txt  sub                                               code.txt  sub
 |     3 count_x again
@@ -232,7 +232,7 @@
 |  /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save New Del
 |     1 d1
 |     2 d2
-|     3 DEPTARGET                                              /tmp/pardes-snap/rsearch/cwd New Del
+|     3 DEPTARGET                                              /tmp/pardes-snap/rsearch/cwd   New Del
 |     4 d4
 |     5 d5                                                     code.txt  sub
 |     6 d6
@@ -248,7 +248,7 @@
 |     2 code.txt:3:1-7 count_x again
 == snap outside grid=180x30 cursor=20,5
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd New Del                        /tmp/pardes-snap/rsearch/cwd New Del
+|  /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del          /tmp/pardes-snap/rsearch/cwd   New Del                      /tmp/pardes-snap/rsearch/cwd   New Del
 |     1 run count_x now
 |     2 open sub/dep.txt:3 here                                code.txt  sub                                               code.txt  sub
 |     3 count_x again
@@ -263,7 +263,7 @@
 |  /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save New Del
 |     1 d1
 |     2 d2
-|     3 DEPTARGET                                              /tmp/pardes-snap/rsearch/cwd New Del
+|     3 DEPTARGET                                              /tmp/pardes-snap/rsearch/cwd   New Del
 |     4 d4
 |     5 d5                                                     code.txt  sub
 |     6 d6
diff --git a/test/snapshots/selregex.golden b/test/snapshots/selregex.golden
index 8317a2a6..59dc5d86 100644
--- a/test/snapshots/selregex.golden
+++ b/test/snapshots/selregex.golden
@@ -1,6 +1,6 @@
 == snap prompt-armed grid=160x24 cursor=11,23
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/selregex/cwd/m.zig Save New Del
+|  /tmp/pardes-snap/selregex/cwd/m.zig                                                                                           Save New Del
 |     1 const one = 1;
 |     2 const two = 2;
 |     3 const three = 3;
@@ -25,7 +25,7 @@
 |   Select /
 == snap preview grid=160x24 cursor=16,23
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/selregex/cwd/m.zig Save New Del
+|  /tmp/pardes-snap/selregex/cwd/m.zig                                                                                           Save New Del
 |     1 const one = 1;
 |     2 const two = 2;
 |     3 const three = 3;
@@ -50,7 +50,7 @@
 |   Select /const
 == style preview
 |0: 0-56 #949494,#121212, 57-159 d,#121212,
-|1: 0-1 #ffffff,#626262, 2-49 #949494,#121212, 50-159 d,#121212,
+|1: 0-1 #ffffff,#626262, 2-139 #949494,#121212, 140-159 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #080808,#80a0ff, 11-11 #80a0ff,#080808, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-159 d,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #080808,#445483, 11-11 #80a0ff,#080808, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-159 d,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #080808,#445483, 11-11 #80a0ff,#080808, 12-20 #bdbdbd,#080808, 21-21 #e3c78a,#080808, 22-22 #bdbdbd,#080808, 23-159 d,#080808,
@@ -72,10 +72,10 @@
 |20: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-159 d,#080808,
 |21: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-159 d,#080808,
 |22: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-159 d,#080808,
-|23: 0-0 d,#444444, 1-1 d,#080808, 2-15 #949494,#121212, 16-159 d,#121212,
+|23: 0-0 d,#444444, 1-1 d,#080808, 2-15 #bdbdbd,#080808, 16-159 d,#080808,
 == snap three-selected grid=160x24 cursor=11,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/selregex/cwd/m.zig Save New Del
+|  /tmp/pardes-snap/selregex/cwd/m.zig                                                                                           Save New Del
 |     1 const one = 1;
 |     2 const two = 2;
 |     3 const three = 3;
@@ -100,7 +100,7 @@
 |
 == style three-selected
 |0: 0-56 #949494,#121212, 57-159 d,#121212,
-|1: 0-1 #ffffff,#626262, 2-49 #949494,#121212, 50-159 d,#121212,
+|1: 0-1 #ffffff,#626262, 2-139 #949494,#121212, 140-159 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-11 #080808,#80a0ff, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-159 d,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #080808,#445483, 11-11 #80a0ff,#080808, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-159 d,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #080808,#445483, 11-11 #80a0ff,#080808, 12-20 #bdbdbd,#080808, 21-21 #e3c78a,#080808, 22-22 #bdbdbd,#080808, 23-159 d,#080808,
@@ -125,7 +125,7 @@
 |23: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-159 d,#080808,
 == snap narrowed grid=160x24 cursor=12,23
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/selregex/cwd/m.zig Save New Del
+|  /tmp/pardes-snap/selregex/cwd/m.zig                                                                                           Save New Del
 |     1 const one = 1;
 |     2 const two = 2;
 |     3 const three = 3;
@@ -150,7 +150,7 @@
 |   Select /t
 == style narrowed
 |0: 0-56 #949494,#121212, 57-159 d,#121212,
-|1: 0-1 #ffffff,#626262, 2-49 #949494,#121212, 50-159 d,#121212,
+|1: 0-1 #ffffff,#626262, 2-139 #949494,#121212, 140-159 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-11 #80a0ff,#080808, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-159 d,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-11 #80a0ff,#080808, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-159 d,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-11 #80a0ff,#080808, 12-20 #bdbdbd,#080808, 21-21 #e3c78a,#080808, 22-22 #bdbdbd,#080808, 23-159 d,#080808,
@@ -172,10 +172,10 @@
 |20: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-159 d,#080808,
 |21: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-159 d,#080808,
 |22: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-159 d,#080808,
-|23: 0-0 d,#444444, 1-1 d,#080808, 2-11 #949494,#121212, 12-159 d,#121212,
+|23: 0-0 d,#444444, 1-1 d,#080808, 2-11 #bdbdbd,#080808, 12-159 d,#080808,
 == snap esc-restores grid=160x24 cursor=11,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/selregex/cwd/m.zig Save New Del
+|  /tmp/pardes-snap/selregex/cwd/m.zig                                                                                           Save New Del
 |     1 const one = 1;
 |     2 const two = 2;
 |     3 const three = 3;
@@ -200,7 +200,7 @@
 |
 == style esc-restores
 |0: 0-56 #949494,#121212, 57-159 d,#121212,
-|1: 0-1 #ffffff,#626262, 2-49 #949494,#121212, 50-159 d,#121212,
+|1: 0-1 #ffffff,#626262, 2-139 #949494,#121212, 140-159 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-11 #080808,#80a0ff, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-159 d,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #080808,#445483, 11-11 #80a0ff,#080808, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-159 d,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #080808,#445483, 11-11 #80a0ff,#080808, 12-20 #bdbdbd,#080808, 21-21 #e3c78a,#080808, 22-22 #bdbdbd,#080808, 23-159 d,#080808,
@@ -225,7 +225,7 @@
 |23: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-159 d,#080808,
 == snap commented grid=160x24 cursor=14,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/selregex/cwd/m.zig Save New Del
+|  /tmp/pardes-snap/selregex/cwd/m.zig                                                                                           Save New Del
 |     1 // const one = 1;
 |     2 // const two = 2;
 |     3 // const three = 3;
@@ -250,7 +250,7 @@
 |
 == snap uncommented grid=160x24 cursor=11,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/selregex/cwd/m.zig Save New Del
+|  /tmp/pardes-snap/selregex/cwd/m.zig                                                                                           Save New Del
 |     1 const one = 1;
 |     2 const two = 2;
 |     3 const three = 3;
diff --git a/test/snapshots/shellset.golden b/test/snapshots/shellset.golden
index 330d21dc..5cf503f7 100644
--- a/test/snapshots/shellset.golden
+++ b/test/snapshots/shellset.golden
@@ -1,6 +1,6 @@
 == snap boot grid=90x20 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/shellset/cwd/cmd.txt Save New Del
+|  /tmp/pardes-snap/shellset/cwd/cmd.txt                   Save New Del
 |     1 Shell zznosuchshell
 |
 |
@@ -21,7 +21,7 @@
 |
 == snap builtin-ran grid=90x20 cursor=25,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/shellset/cwd/cmd.txt Save New Del
+|  /tmp/pardes-snap/shellset/cwd/cmd.txt                   Save New Del
 |     1 Shell zznosuchshell
 |
 |
diff --git a/test/snapshots/tag.golden b/test/snapshots/tag.golden
index 7cb2d098..68e8ad1f 100644
--- a/test/snapshots/tag.golden
+++ b/test/snapshots/tag.golden
@@ -1,6 +1,6 @@
-== snap tag-focus grid=150x30 cursor=34,1
+== snap tag-focus grid=150x30 cursor=39,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tag/cwd New Del                                           /tmp/pardes-snap/tag/cwd New Del
+|  /tmp/pardes-snap/tag/cwd                      New Del                      /tmp/pardes-snap/tag/cwd                      New Del
 |
 |  t.txt                                                                      t.txt
 |
@@ -15,7 +15,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/tag/cwd New Del
+|  /tmp/pardes-snap/tag/cwd                      New Del
 |
 |  t.txt
 |
@@ -29,9 +29,9 @@
 |
 |
 |
-== snap tag-typed grid=150x30 cursor=40,1
+== snap tag-typed grid=150x30 cursor=45,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tag/cwd New Del t.txt                                     /tmp/pardes-snap/tag/cwd New Del
+|  /tmp/pardes-snap/tag/cwd              t.txt         New Del                /tmp/pardes-snap/tag/cwd                      New Del
 |
 |  t.txt                                                                      t.txt
 |
@@ -46,7 +46,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/tag/cwd New Del
+|  /tmp/pardes-snap/tag/cwd                      New Del
 |
 |  t.txt
 |
@@ -60,9 +60,9 @@
 |
 |
 |
-== snap tag-del grid=150x30 cursor=36,1
+== snap tag-del grid=150x30 cursor=41,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tag/cwd New Del t                                         /tmp/pardes-snap/tag/cwd New Del
+|  /tmp/pardes-snap/tag/cwd              t         New Del                    /tmp/pardes-snap/tag/cwd                      New Del
 |
 |  t.txt                                                                      t.txt
 |
@@ -77,7 +77,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/tag/cwd New Del
+|  /tmp/pardes-snap/tag/cwd                      New Del
 |
 |  t.txt
 |
@@ -93,7 +93,7 @@
 |
 == snap tag-exit grid=150x30 cursor=4,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tag/cwd New Del t.txt                                     /tmp/pardes-snap/tag/cwd New Del
+|  /tmp/pardes-snap/tag/cwd              t.txt         New Del                /tmp/pardes-snap/tag/cwd                      New Del
 |
 |  t.txt                                                                      t.txt
 |
@@ -108,7 +108,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/tag/cwd New Del
+|  /tmp/pardes-snap/tag/cwd                      New Del
 |
 |  t.txt
 |
@@ -124,7 +124,7 @@
 |
 == snap tag-look grid=150x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tag/cwd/t.txt Save New Del       /tmp/pardes-snap/tag/cwd New Del t.txt            /tmp/pardes-snap/tag/cwd New Del
+|  /tmp/pardes-snap/tag/cwd/t.txt Save New Del       /tmp/pardes-snap/tag/cwd              t.txt       /tmp/pardes-snap/tag/cwd New Del
 |     1 ZZLOOKED
 |                                                    t.txt                                             t.txt
 |
diff --git a/test/snapshots/tag.snap b/test/snapshots/tag.snap
index b0c9de44..966bfd52 100644
--- a/test/snapshots/tag.snap
+++ b/test/snapshots/tag.snap
@@ -6,7 +6,9 @@ file t.txt ZZLOOKED
 start 30 150 -n 3
 wait 8000 t.txt
 stable 700 20000
-# click into the tag tail of pane 0: straight into insert. The layout box shows
+# click into the tag tail of pane 0: straight into insert. Column 40 is inside
+# the gap that right-aligns the builtins — ordinary spaces in the tag, so this
+# is the tail like any other part of it. The layout box shows
 # the pane's BODY mode, not the tag's, so the evidence for "this click went to
 # insert" is the next step — the typed text lands as text instead of running as
 # normal-mode commands.
@@ -32,12 +34,12 @@ key esc
 settle 100
 stable 400 5000
 snap tag-exit
-# re-enter the tag and look the typed word: Enter opens t.txt as a file pane
-press left 40 2
-release left 40 2
-stable 400 5000
-key left
-key left
+# re-enter the tag and look the typed word: Enter opens t.txt as a file pane.
+# Clicked ON the word rather than past the end of the tag and walked back into
+# it — the builtins are right-aligned now (config.tag_right_pad), so the tag no
+# longer ends where the typing does and a click past it lands in the gap.
+press left 43 2
+release left 43 2
 stable 400 5000
 key enter
 wait 10000 ZZLOOKED
diff --git a/test/snapshots/tagcmd.golden b/test/snapshots/tagcmd.golden
index 57fbd567..bb341ac8 100644
--- a/test/snapshots/tagcmd.golden
+++ b/test/snapshots/tagcmd.golden
@@ -1,6 +1,6 @@
 == snap edited grid=100x30 cursor=13,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tagcmd/cwd/c.txt Save New Del
+|  /tmp/pardes-snap/tagcmd/cwd/c.txt                                 Save New Del
 |     1 ZZEDITline 1
 |     2 line 2
 |     3 line 3
@@ -29,9 +29,9 @@
 |
 |
 |
-== snap colon grid=100x30 cursor=35,1
+== snap colon grid=100x30 cursor=68,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tagcmd/cwd/c.txt Save New Del
+|  /tmp/pardes-snap/tagcmd/cwd/c.txt                                 Save New Del
 |     1 ZZEDITline 1
 |     2 line 2
 |     3 line 3
@@ -60,9 +60,9 @@
 |
 |
 |
-== snap word grid=100x30 cursor=40,1
+== snap word grid=100x30 cursor=72,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tagcmd/cwd/c.txt Save New Del
+|  /tmp/pardes-snap/tagcmd/cwd/c.txt                                 Save New Del
 |     1 ZZEDITline 1
 |     2 line 2
 |     3 line 3
@@ -93,7 +93,7 @@
 |
 == snap saved grid=100x30 cursor=13,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tagcmd/cwd/c.txt Save New Del
+|  /tmp/pardes-snap/tagcmd/cwd/c.txt                                 Save New Del
 |     1 ZZEDITline 1
 |     2 line 2
 |     3 line 3
@@ -133,7 +133,7 @@ line 6
 == end file
 == snap escaped grid=100x30 cursor=13,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tagcmd/cwd/c.txt Save New Del
+|  /tmp/pardes-snap/tagcmd/cwd/c.txt                                 Save New Del
 |     1 ZZEDITline 1
 |     2 line 2
 |     3 line 3
diff --git a/test/snapshots/tagnav.golden b/test/snapshots/tagnav.golden
index 72cfd175..e3e5e8d2 100644
--- a/test/snapshots/tagnav.golden
+++ b/test/snapshots/tagnav.golden
@@ -29,7 +29,7 @@
 |
 |
 |
-== snap colon grid=100x30 cursor=35,1
+== snap colon grid=100x30 cursor=36,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
 |  /tmp/pardes-snap/tagnav/cwd/w.txt Save New Del    /tmp/pardes-snap/tagnav/cwd New Del
 |     1 alpha
@@ -60,7 +60,7 @@
 |
 |
 |
-== snap right-tag grid=100x30 cursor=79,1
+== snap right-tag grid=100x30 cursor=80,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
 |  /tmp/pardes-snap/tagnav/cwd/w.txt Save New Del    /tmp/pardes-snap/tagnav/cwd New Del
 |     1 alpha
@@ -91,7 +91,7 @@
 |
 |
 |
-== snap left-tag grid=100x30 cursor=35,1
+== snap left-tag grid=100x30 cursor=36,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
 |  /tmp/pardes-snap/tagnav/cwd/w.txt Save New Del    /tmp/pardes-snap/tagnav/cwd New Del
 |     1 alpha
@@ -122,7 +122,7 @@
 |
 |
 |
-== snap down-tag grid=100x30 cursor=29,16
+== snap down-tag grid=100x30 cursor=30,16
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
 |  /tmp/pardes-snap/tagnav/cwd/w.txt Save New Del    /tmp/pardes-snap/tagnav/cwd New Del
 |     1 alpha
@@ -153,7 +153,7 @@
 |
 |
 |
-== snap up-tag grid=100x30 cursor=35,1
+== snap up-tag grid=100x30 cursor=36,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
 |  /tmp/pardes-snap/tagnav/cwd/w.txt Save New Del    /tmp/pardes-snap/tagnav/cwd New Del
 |     1 alpha
@@ -277,7 +277,7 @@
 |
 |
 |
-== snap back-down grid=100x30 cursor=35,1
+== snap back-down grid=100x30 cursor=36,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
 |  /tmp/pardes-snap/tagnav/cwd/w.txt Save New Del    /tmp/pardes-snap/tagnav/cwd New Del
 |     1 alpha
@@ -308,7 +308,7 @@
 |
 |
 |
-== snap arrows-still-motion grid=100x30 cursor=37,1
+== snap arrows-still-motion grid=100x30 cursor=38,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
 |  /tmp/pardes-snap/tagnav/cwd/w.txt Save New Del    /tmp/pardes-snap/tagnav/cwd New Del
 |     1 alpha
@@ -401,7 +401,7 @@
 |
 |
 |
-== snap tty-tag grid=100x30 cursor=79,1
+== snap tty-tag grid=100x30 cursor=80,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
 |  /tmp/pardes-snap/tagnav/cwd/w.txt Save New Del  $ /tmp/pardes-snap/tagnav/cwd New Del
 |     1 alpha
diff --git a/test/snapshots/tagpath.golden b/test/snapshots/tagpath.golden
index ae7f08b0..f0c7c15c 100644
--- a/test/snapshots/tagpath.golden
+++ b/test/snapshots/tagpath.golden
@@ -1,6 +1,6 @@
 == snap start grid=100x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del
+|  /tmp/pardes-snap/tagpath/cwd/c.txt                                Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -29,9 +29,9 @@
 |
 |
 |
-== snap colon grid=100x30 cursor=36,1
+== snap colon grid=100x30 cursor=68,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del
+|  /tmp/pardes-snap/tagpath/cwd/c.txt                                Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -62,7 +62,7 @@
 |
 == snap col0 grid=100x30 cursor=2,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del
+|  /tmp/pardes-snap/tagpath/cwd/c.txt                                Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -93,7 +93,7 @@
 |
 == snap sel-path grid=100x30 cursor=35,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del
+|  /tmp/pardes-snap/tagpath/cwd/c.txt                                Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -124,7 +124,7 @@
 |
 == style sel-path
 |0: 0-56 #949494,#121212, 57-99 d,#121212,
-|1: 0-1 #ffffff,#626262, 2-35 #080808,#80a0ff, 36-48 #949494,#121212, 49-99 d,#121212,
+|1: 0-1 #ffffff,#626262, 2-35 #080808,#80a0ff, 36-79 #949494,#121212, 80-99 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
@@ -155,7 +155,7 @@
 |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808,
 == snap yanked-path grid=100x30 cursor=41,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del
+|  /tmp/pardes-snap/tagpath/cwd/c.txt                                Save New Del
 |     1 l/tmp/pardes-snap/tagpath/cwd/c.txtine 1
 |     2 line 2
 |     3 line 3
@@ -186,7 +186,7 @@
 |
 == snap drag-cross grid=100x30 cursor=41,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del
+|  /tmp/pardes-snap/tagpath/cwd/c.txt                                Save New Del
 |     1 l/tmp/pardes-snap/tagpath/cwd/c.txtine 1
 |     2 line 2
 |     3 line 3
@@ -217,7 +217,7 @@
 |
 == style drag-cross
 |0: 0-56 #949494,#121212, 57-99 d,#121212,
-|1: 0-1 #ffffff,#626262, 2-10 #949494,#121212, 11-41 #080808,#80a0ff, 42-48 #949494,#121212, 49-99 d,#121212,
+|1: 0-1 #ffffff,#626262, 2-10 #949494,#121212, 11-41 #080808,#80a0ff, 42-79 #949494,#121212, 80-99 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-46 #bdbdbd,#080808, 47-99 d,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
@@ -248,7 +248,7 @@
 |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808,
 == snap path-inert grid=100x30 cursor=11,1
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del
+|  /tmp/pardes-snap/tagpath/cwd/c.txt                                Save New Del
 |     1 l/tmp/pardes-snap/tagpath/cwd/c.txtine 1
 |     2 line 2
 |     3 line 3
diff --git a/test/snapshots/themesel.golden b/test/snapshots/themesel.golden
index 2f2568ec..08d5a271 100644
--- a/test/snapshots/themesel.golden
+++ b/test/snapshots/themesel.golden
@@ -1,6 +1,6 @@
 == snap boot grid=100x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/themesel/cwd/t.txt Save New Del
+|  /tmp/pardes-snap/themesel/cwd/t.txt                               Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -31,7 +31,7 @@
 |    28 line 28
 == snap list grid=100x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/themesel/cwd/t.txt Save New Del
+|  /tmp/pardes-snap/themesel/cwd/t.txt                               Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -46,7 +46,7 @@
 |    12 line 12
 |    13 line 13
 |    14 line 14
-|  /tmp/pardes-snap/themesel/cwd/+Themes New Del
+|  /tmp/pardes-snap/themesel/cwd/+Themes                                  New Del
 |     1 Theme helix
 |     2 Theme dark
 |     3 Theme acme
@@ -62,7 +62,7 @@
 |    13 Theme ashen
 == snap step-helix grid=100x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/themesel/cwd/t.txt Save New Del
+|  /tmp/pardes-snap/themesel/cwd/t.txt                               Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -77,7 +77,7 @@
 |    12 line 12
 |    13 line 13
 |    14 line 14
-|  /tmp/pardes-snap/themesel/cwd/+Themes New Del
+|  /tmp/pardes-snap/themesel/cwd/+Themes                                  New Del
 |     1 Theme helix
 |     2 Theme dark
 |     3 Theme acme
@@ -93,7 +93,7 @@
 |    13 Theme ashen
 == style step-helix
 |0: 0-56 #949494,#121212, 57-99 d,#121212,
-|1: 0-1 #ffffff,#626262, 2-49 #949494,#121212, 50-99 d,#121212,
+|1: 0-1 #ffffff,#626262, 2-79 #949494,#121212, 80-99 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
@@ -108,7 +108,7 @@
 |13: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-99 d,#080808,
 |14: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-99 d,#080808,
 |15: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-99 d,#080808,
-|16: 0-1 #ffffff,#262626, 2-46 #949494,#121212, 47-99 d,#121212,
+|16: 0-1 #ffffff,#262626, 2-79 #949494,#121212, 80-99 d,#121212,
 |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 #080808,#80a0ff,
 |18: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-16 #bdbdbd,#080808, 17-99 d,#080808,
 |19: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-16 #bdbdbd,#080808, 17-99 d,#080808,
@@ -124,7 +124,7 @@
 |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-99 d,#080808,
 == snap step-dark grid=100x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/themesel/cwd/t.txt Save New Del
+|  /tmp/pardes-snap/themesel/cwd/t.txt                               Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -139,7 +139,7 @@
 |    12 line 12
 |    13 line 13
 |    14 line 14
-|  /tmp/pardes-snap/themesel/cwd/+Themes New Del
+|  /tmp/pardes-snap/themesel/cwd/+Themes                                  New Del
 |     1 Theme helix
 |     2 Theme dark
 |     3 Theme acme
@@ -155,7 +155,7 @@
 |    13 Theme ashen
 == style step-dark
 |0: 0-56 #969696,#2c2a3e, 57-99 d,#2c2a3e,
-|1: 0-1 #ffffff,#6e4fd0, 2-49 #969696,#2c2a3e, 50-99 d,#2c2a3e,
+|1: 0-1 #ffffff,#6e4fd0, 2-79 #969696,#2c2a3e, 80-99 d,#2c2a3e,
 |2: 0-0 d,#525252, 1-1 d,d, 2-6 #969696,#2c2a3e, 7-99 d,d,
 |3: 0-0 d,#525252, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
 |4: 0-0 d,#525252, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
@@ -170,7 +170,7 @@
 |13: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
 |14: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
 |15: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|16: 0-1 #ffffff,#383c54, 2-46 #969696,#2c2a3e, 47-99 d,#2c2a3e,
+|16: 0-1 #ffffff,#383c54, 2-79 #969696,#2c2a3e, 80-99 d,#2c2a3e,
 |17: 0-0 d,#525252, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
 |18: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 #d8c8a8,#4a3a1e,
 |19: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
@@ -186,7 +186,7 @@
 |29: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
 == snap step-acme grid=100x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/themesel/cwd/t.txt Save New Del
+|  /tmp/pardes-snap/themesel/cwd/t.txt                               Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -201,7 +201,7 @@
 |    12 line 12
 |    13 line 13
 |    14 line 14
-|  /tmp/pardes-snap/themesel/cwd/+Themes New Del
+|  /tmp/pardes-snap/themesel/cwd/+Themes                                  New Del
 |     1 Theme helix
 |     2 Theme dark
 |     3 Theme acme
@@ -217,7 +217,7 @@
 |    13 Theme ashen
 == style step-acme
 |0: 0-56 #000000,#eaffff, 57-99 d,#eaffff,
-|1: 0-1 #ffffff,#6e4fd0, 2-49 #000000,#eaffff, 50-99 d,#eaffff,
+|1: 0-1 #ffffff,#6e4fd0, 2-79 #000000,#eaffff, 80-99 d,#eaffff,
 |2: 0-1 d,#ffffea, 2-6 #000000,#eaffff, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
 |3: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
 |4: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
@@ -232,7 +232,7 @@
 |13: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
 |14: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
 |15: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
-|16: 0-1 #ffffff,#383c54, 2-46 #000000,#eaffff, 47-99 d,#eaffff,
+|16: 0-1 #ffffff,#383c54, 2-79 #000000,#eaffff, 80-99 d,#eaffff,
 |17: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-17 #000000,#ffffea, 18-99 d,#ffffea,
 |18: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-99 d,#ffffea,
 |19: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-99 #000000,#eeee9e,
@@ -248,7 +248,7 @@
 |29: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-17 #000000,#ffffea, 18-99 d,#ffffea,
 == snap step-generated grid=100x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/themesel/cwd/t.txt Save New Del
+|  /tmp/pardes-snap/themesel/cwd/t.txt                               Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -263,7 +263,7 @@
 |    12 line 12
 |    13 line 13
 |    14 line 14
-|  /tmp/pardes-snap/themesel/cwd/+Themes New Del
+|  /tmp/pardes-snap/themesel/cwd/+Themes                                  New Del
 |     1 Theme helix
 |     2 Theme dark
 |     3 Theme acme
@@ -279,7 +279,7 @@
 |    13 Theme ashen
 == style step-generated
 |0: 0-56 #e0e0e0,#1e262e, 57-99 d,#1e262e,
-|1: 0-1 #000000,#ffa060, 2-49 #e0e0e0,#1e262e, 50-99 d,#1e262e,
+|1: 0-1 #000000,#ffa060, 2-79 #e0e0e0,#1e262e, 80-99 d,#1e262e,
 |2: 0-0 d,#303840, 1-1 d,#161e26, 2-6 #e0e0e0,#1e262e, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
 |3: 0-0 d,#303840, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
 |4: 0-0 d,#303840, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
@@ -294,7 +294,7 @@
 |13: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-13 #e0e0e0,#161e26, 14-99 d,#161e26,
 |14: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-13 #e0e0e0,#161e26, 14-99 d,#161e26,
 |15: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-13 #e0e0e0,#161e26, 14-99 d,#161e26,
-|16: 0-1 #ffffff,#303840, 2-46 #e0e0e0,#1e262e, 47-99 d,#1e262e,
+|16: 0-1 #ffffff,#303840, 2-79 #e0e0e0,#1e262e, 80-99 d,#1e262e,
 |17: 0-0 d,#303840, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-17 #e0e0e0,#161e26, 18-99 d,#161e26,
 |18: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-16 #e0e0e0,#161e26, 17-99 d,#161e26,
 |19: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-16 #e0e0e0,#161e26, 17-99 d,#161e26,
@@ -310,7 +310,7 @@
 |29: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-17 #e0e0e0,#161e26, 18-99 d,#161e26,
 == snap step-back grid=100x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/themesel/cwd/t.txt Save New Del
+|  /tmp/pardes-snap/themesel/cwd/t.txt                               Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -325,7 +325,7 @@
 |    12 line 12
 |    13 line 13
 |    14 line 14
-|  /tmp/pardes-snap/themesel/cwd/+Themes New Del
+|  /tmp/pardes-snap/themesel/cwd/+Themes                                  New Del
 |     1 Theme helix
 |     2 Theme dark
 |     3 Theme acme
@@ -341,7 +341,7 @@
 |    13 Theme ashen
 == style step-back
 |0: 0-56 #000000,#eaffff, 57-99 d,#eaffff,
-|1: 0-1 #ffffff,#6e4fd0, 2-49 #000000,#eaffff, 50-99 d,#eaffff,
+|1: 0-1 #ffffff,#6e4fd0, 2-79 #000000,#eaffff, 80-99 d,#eaffff,
 |2: 0-1 d,#ffffea, 2-6 #000000,#eaffff, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
 |3: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
 |4: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
@@ -356,7 +356,7 @@
 |13: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
 |14: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
 |15: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
-|16: 0-1 #ffffff,#383c54, 2-46 #000000,#eaffff, 47-99 d,#eaffff,
+|16: 0-1 #ffffff,#383c54, 2-79 #000000,#eaffff, 80-99 d,#eaffff,
 |17: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-17 #000000,#ffffea, 18-99 d,#ffffea,
 |18: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-99 d,#ffffea,
 |19: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-99 #000000,#eeee9e,
@@ -372,7 +372,7 @@
 |29: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-17 #000000,#ffffea, 18-99 d,#ffffea,
 == snap tail grid=100x30 cursor=7,28
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/themesel/cwd/t.txt Save New Del
+|  /tmp/pardes-snap/themesel/cwd/t.txt                               Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -387,7 +387,7 @@
 |    12 line 12
 |    13 line 13
 |    14 line 14
-|  /tmp/pardes-snap/themesel/cwd/+Themes New Del
+|  /tmp/pardes-snap/themesel/cwd/+Themes                                  New Del
 |   217 Theme wolf_alabaster_dark_bg
 |   218 Theme wolf_alabaster_dark_mono
 |   219 Theme wolf_alabaster_light
@@ -403,7 +403,7 @@
 |   229
 == snap picked grid=100x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/themesel/cwd/t.txt Save New Del
+|  /tmp/pardes-snap/themesel/cwd/t.txt                               Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -434,7 +434,7 @@
 |    28 line 28
 == style picked
 |0: 0-56 #000000,#eaffff, 57-99 d,#eaffff,
-|1: 0-1 #ffffff,#6e4fd0, 2-49 #000000,#eaffff, 50-99 d,#eaffff,
+|1: 0-1 #ffffff,#6e4fd0, 2-79 #000000,#eaffff, 80-99 d,#eaffff,
 |2: 0-1 d,#ffffea, 2-6 #000000,#eaffff, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
 |3: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
 |4: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
diff --git a/test/snapshots/themesel.snap b/test/snapshots/themesel.snap
index 56d81494..d714fa84 100644
--- a/test/snapshots/themesel.snap
+++ b/test/snapshots/themesel.snap
@@ -53,7 +53,7 @@ stable 700 15000
 snap step-back
 snapstyle step-back
 # PICKING is just stopping. Walk down into the list and explicitly Del it: the
-# theme the last step left behind is still on. Body-normal Esc is Toggleterm,
+# theme the last step left behind is still on. Body-normal Esc is Last,
 # so it deliberately leaves this document-like output buffer open.
 key space w j
 stable 400 5000
diff --git a/test/snapshots/tinywin.golden b/test/snapshots/tinywin.golden
index f753d70c..6e085aa9 100644
--- a/test/snapshots/tinywin.golden
+++ b/test/snapshots/tinywin.golden
@@ -1,17 +1,17 @@
 == snap stacked grid=100x30 cursor=4,14
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|$ /tmp/pardes-snap/tinywin/cwd New Del
+|$ /tmp/pardes-snap/tinywin/cwd                                           New Del
 |  $
-|  /tmp/pardes-snap/tinywin/cwd New Del
+|  /tmp/pardes-snap/tinywin/cwd                                           New Del
 |
 |
-|  /tmp/pardes-snap/tinywin/cwd New Del
+|  /tmp/pardes-snap/tinywin/cwd                                           New Del
 |
 |
-|  /tmp/pardes-snap/tinywin/cwd New Del
+|  /tmp/pardes-snap/tinywin/cwd                                           New Del
 |
 |
-|  /tmp/pardes-snap/tinywin/cwd New Del
+|  /tmp/pardes-snap/tinywin/cwd                                           New Del
 |
 |
 |
@@ -31,8 +31,8 @@
 |
 == snap shrunk grid=60x3 cursor=59,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|$ /tmp/pardes-snap/tinywin/cwd New Del
-|  /tmp/pardes-snap/tinywin/cwd New Del
+|$ /tmp/pardes-snap/tinywin/cwd   New Del
+|  /tmp/pardes-snap/tinywin/cwd   New Del
 == snap columns grid=100x30 cursor=79,3
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
 |$ /tmp/pardes-snap/tinywi  /tmp/pardes-snap/tinywi  /tmp/pardes-snap/tinywi  /tmp/pardes-snap/tinywi
diff --git a/test/snapshots/tty.golden b/test/snapshots/tty.golden
index bbba818d..f15afcb9 100644
--- a/test/snapshots/tty.golden
+++ b/test/snapshots/tty.golden
@@ -122,7 +122,38 @@
 |
 |
 |
-== snap shift-esc-off grid=100x30 cursor=4,6
+== snap shift-esc-nodoc grid=100x30 cursor=4,6
+|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
+|$ /tmp/pardes-snap/tty/cwd New Del                  /tmp/pardes-snap/tty/cwd New Del
+|  $ ls
+|  m.txt                                             m.txt
+|  $ echo SNAP''OK
+|  SNAPOK
+|  $
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|  /tmp/pardes-snap/tty/cwd New Del
+|
+|  m.txt
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+== snap ctrl-b-off grid=100x30 cursor=4,6
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
 |  /tmp/pardes-snap/tty/cwd New Del                  /tmp/pardes-snap/tty/cwd New Del
 |
diff --git a/test/snapshots/tty.snap b/test/snapshots/tty.snap
index a3af511d..58f4c1ee 100644
--- a/test/snapshots/tty.snap
+++ b/test/snapshots/tty.snap
@@ -1,6 +1,11 @@
-# tty mode round-trip: Ctrl-b in, run a command, Ctrl-b out. Shift-Esc is the
-# same toggle (CSI 27;2u — needs a host that reports modifiers on Escape); a
-# PLAIN Esc is not, it still goes to the shell.
+# tty mode round-trip: Ctrl-b in, run a command, Ctrl-b out. Shift-Esc (CSI
+# 27;2u — needs a host that reports modifiers on Escape) also gets you IN; a
+# PLAIN Esc does not, it still goes to the shell.
+#
+# Getting OUT is Ctrl-b alone. Shift-Esc in tty is what Escape is in normal
+# mode instead — Last, the pane you were in before this one — leaving this pane
+# in tty so coming back lands in the program you left. The hop itself is
+# covered by a unit test in pardes.zig.
 file m.txt marker
 start 30 100 -n 3
 wait 8000 m.txt
@@ -16,10 +21,16 @@ snap tty-echo
 key c-b
 stable 600 8000
 snap tty-off
-# Shift-Esc: in, then out again — the same toggle from the other key
+# Shift-Esc: in, the same as Ctrl-b...
 send \e[27;2u
 stable 600 8000
 snap shift-esc-on
+# ...but not out. With no doc pane to hop to it changes nothing: still tty,
+# prompts still shown, same pane focused.
 send \e[27;2u
 stable 600 8000
-snap shift-esc-off
+snap shift-esc-nodoc
+# Ctrl-b still leaves tty in place, which is now the only thing that does.
+key c-b
+stable 600 8000
+snap ctrl-b-off
diff --git a/test/snapshots/ttyhelp.golden b/test/snapshots/ttyhelp.golden
index bcce61d4..69b5961a 100644
--- a/test/snapshots/ttyhelp.golden
+++ b/test/snapshots/ttyhelp.golden
@@ -1,6 +1,6 @@
 == snap boot grid=100x30 cursor=4,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|$ /tmp/pardes-snap/ttyhelp/cwd New Del
+|$ /tmp/pardes-snap/ttyhelp/cwd                                           New Del
 |  $
 |
 |
@@ -31,9 +31,9 @@
 |
 == snap helped grid=100x30 cursor=7,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|$ /tmp/pardes-snap/ttyhelp/cwd New Del
+|$ /tmp/pardes-snap/ttyhelp/cwd                                           New Del
 |  $
-|  /tmp/pardes-snap/ttyhelp/cwd/+Help New Del
+|  /tmp/pardes-snap/ttyhelp/cwd/+Help                                     New Del
 |     1 pardes builtins, and how to run each:
 |     2 SPC and its keys, a chord, a button, the
 |     3 topbar - or the name, executed anywhere.
@@ -62,9 +62,9 @@
 |    26 SPC l r   Rename
 == snap leaderworks grid=100x30 cursor=7,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|$ /tmp/pardes-snap/ttyhelp/cwd New Del
+|$ /tmp/pardes-snap/ttyhelp/cwd                                           New Del
 |  $
-|  /tmp/pardes-snap/ttyhelp/cwd/+Help New Del
+|  /tmp/pardes-snap/ttyhelp/cwd/+Help                                     New Del
 |     1 pardes builtins, and how to run each:
 |     2 SPC and its keys, a chord, a button, the
 |     3 topbar - or the name, executed anywhere.
diff --git a/test/snapshots/ttylook.golden b/test/snapshots/ttylook.golden
index 09b54c88..3b82e3c7 100644
--- a/test/snapshots/ttylook.golden
+++ b/test/snapshots/ttylook.golden
@@ -1,6 +1,6 @@
 == snap tok1 grid=120x30 cursor=2,3
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/ttylook/cwd New Del                        /tmp/pardes-snap/ttylook/cwd New Del
+|  /tmp/pardes-snap/ttylook/cwd   New Del                      /tmp/pardes-snap/ttylook/cwd   New Del
 |
 |  big.txt  plain.txt  sub                                     big.txt  plain.txt  sub
 |
@@ -15,7 +15,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/ttylook/cwd New Del
+|  /tmp/pardes-snap/ttylook/cwd   New Del
 |
 |  big.txt  plain.txt  sub
 |
@@ -31,7 +31,7 @@
 |
 == style tok1
 |0: 0-56 #949494,#121212, 57-119 d,#121212,
-|1: 0-1 #ffffff,#626262, 2-37 #949494,#121212, 38-59 d,#121212, 60-61 #ffffff,#262626, 62-97 #949494,#121212, 98-119 d,#121212,
+|1: 0-1 #ffffff,#626262, 2-39 #949494,#121212, 40-59 d,#121212, 60-61 #ffffff,#262626, 62-99 #949494,#121212, 100-119 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-8 #080808,#80a0ff, 9-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808,
@@ -46,7 +46,7 @@
 |13: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808,
 |14: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808,
 |15: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808,
-|16: 0-1 #ffffff,#262626, 2-37 #949494,#121212, 38-59 d,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808,
+|16: 0-1 #ffffff,#262626, 2-39 #949494,#121212, 40-59 d,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808,
 |17: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808,
 |18: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808,
 |19: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808,
@@ -62,7 +62,7 @@
 |29: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808,
 == snap tok2 grid=120x30 cursor=11,3
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/ttylook/cwd New Del                        /tmp/pardes-snap/ttylook/cwd New Del
+|  /tmp/pardes-snap/ttylook/cwd   New Del                      /tmp/pardes-snap/ttylook/cwd   New Del
 |
 |  big.txt  plain.txt  sub                                     big.txt  plain.txt  sub
 |
@@ -77,7 +77,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/ttylook/cwd New Del
+|  /tmp/pardes-snap/ttylook/cwd   New Del
 |
 |  big.txt  plain.txt  sub
 |
@@ -93,7 +93,7 @@
 |
 == snap tokback grid=120x30 cursor=2,3
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/ttylook/cwd New Del                        /tmp/pardes-snap/ttylook/cwd New Del
+|  /tmp/pardes-snap/ttylook/cwd   New Del                      /tmp/pardes-snap/ttylook/cwd   New Del
 |
 |  big.txt  plain.txt  sub                                     big.txt  plain.txt  sub
 |
@@ -108,7 +108,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/ttylook/cwd New Del
+|  /tmp/pardes-snap/ttylook/cwd   New Del
 |
 |  big.txt  plain.txt  sub
 |
@@ -124,7 +124,7 @@
 |
 == snap insert grid=120x30 cursor=4,3
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/ttylook/cwd New Del                        /tmp/pardes-snap/ttylook/cwd New Del
+|  /tmp/pardes-snap/ttylook/cwd   New Del                      /tmp/pardes-snap/ttylook/cwd   New Del
 |
 |  nnbig.txt  plain.txt  sub                                   big.txt  plain.txt  sub
 |
@@ -139,7 +139,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/ttylook/cwd New Del
+|  /tmp/pardes-snap/ttylook/cwd   New Del
 |
 |  big.txt  plain.txt  sub
 |
@@ -155,7 +155,7 @@
 |
 == snap tok3 grid=120x30 cursor=22,3
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/ttylook/cwd New Del                        /tmp/pardes-snap/ttylook/cwd New Del
+|  /tmp/pardes-snap/ttylook/cwd   New Del                      /tmp/pardes-snap/ttylook/cwd   New Del
 |
 |  big.txt  plain.txt  sub                                     big.txt  plain.txt  sub
 |
@@ -170,7 +170,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/ttylook/cwd New Del
+|  /tmp/pardes-snap/ttylook/cwd   New Del
 |
 |  big.txt  plain.txt  sub
 |
@@ -186,7 +186,7 @@
 |
 == snap diropen grid=120x30 cursor=4,7
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/ttylook/cwd New Del                        /tmp/pardes-snap/ttylook/cwd New Del
+|  /tmp/pardes-snap/ttylook/cwd   New Del                      /tmp/pardes-snap/ttylook/cwd   New Del
 |
 |  big.txt  plain.txt  sub                                     big.txt  plain.txt  sub
 |
@@ -201,7 +201,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/ttylook/cwd New Del
+|  /tmp/pardes-snap/ttylook/cwd   New Del
 |
 |  big.txt  plain.txt  sub
 |
@@ -217,7 +217,7 @@
 |
 == snap noop grid=120x30 cursor=4,7
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/ttylook/cwd New Del                        /tmp/pardes-snap/ttylook/cwd New Del
+|  /tmp/pardes-snap/ttylook/cwd   New Del                      /tmp/pardes-snap/ttylook/cwd   New Del
 |
 |  big.txt  plain.txt  sub                                     big.txt  plain.txt  sub
 |
@@ -232,7 +232,7 @@
 |
 |
 |
-|  /tmp/pardes-snap/ttylook/cwd New Del
+|  /tmp/pardes-snap/ttylook/cwd   New Del
 |
 |  big.txt  plain.txt  sub
 |
diff --git a/test/snapshots/ttyonly.golden b/test/snapshots/ttyonly.golden
index 2af37176..dad9105f 100644
--- a/test/snapshots/ttyonly.golden
+++ b/test/snapshots/ttyonly.golden
@@ -1,6 +1,6 @@
 == snap ttyonly grid=100x30 cursor=4,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|$ /tmp/pardes-snap/ttyonly/cwd New Del
+|$ /tmp/pardes-snap/ttyonly/cwd                                           New Del
 |  $ echo TTY''ONLY
 |  TTYONLY
 |  $
@@ -31,7 +31,7 @@
 |
 == style ttyonly
 |0: 0-56 #949494,#121212, 57-99 d,#121212,
-|1: 0-1 #ffffff,#626262, 2-37 #949494,#121212, 38-99 d,#121212,
+|1: 0-1 #ffffff,#626262, 2-79 #949494,#121212, 80-99 d,#121212,
 |2: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808,
 |3: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808,
 |4: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808,
diff --git a/test/snapshots/tutor.golden b/test/snapshots/tutor.golden
index 93ecbe58..8bfb47fe 100644
--- a/test/snapshots/tutor.golden
+++ b/test/snapshots/tutor.golden
@@ -1,6 +1,6 @@
 == snap tutor grid=150x30 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /Tutor Save New Del                               /tmp/pardes-snap/tutor/cwd New Del                /tmp/pardes-snap/tutor/cwd New Del
+|  /Tutor          Save New Del                      /tmp/pardes-snap/tutor/cwd New Del                /tmp/pardes-snap/tutor/cwd New Del
 |     1
 |     2                                PARDES TUTO↩
 |       R
diff --git a/test/snapshots/windownav.snap b/test/snapshots/windownav.snap
index 5652116b..c9de55ac 100644
--- a/test/snapshots/windownav.snap
+++ b/test/snapshots/windownav.snap
@@ -1,12 +1,11 @@
 # RULE: moving focus is a BUILTIN like any other, so there is ONE
 # implementation and every route reaches it. SPC w h/j/k/l run Left/Down/Up/
-# Right — the geometric focusDir the Ctrl-w prefix also runs — and SPC w t
-# plus body-normal Esc run Toggleterm, the hop between the most recently
-# focused DOCUMENT (a file, an image, a +Search/+Help output buffer: things
-# you READ) and the most
-# recently focused TERMINAL. "Most recent" is the focus history the core
-# already keeps to hand focus back when a pane closes, so the hop back is the
-# same key. Focus shows up in the golden's `cursor=` header: that is the
+# Right — the geometric focusDir the Ctrl-w prefix also runs — and SPC j j
+# plus body-normal Esc run Last, the hop to the pane you were in BEFORE this
+# one, whichever kind it was. It reads the focus history the core already keeps
+# to hand focus back when a pane closes, and going somewhere is itself recorded,
+# which is what makes the hop back the same key. Focus shows up in the golden's
+# `cursor=` header: that is the
 # ACTIVE pane's cursor, so each snap is named by the pane it should land in.
 file w.txt alpha\nbeta\ngamma
 start 30 100 w.txt
@@ -15,22 +14,20 @@ wait 8000 w.txt
 stable 700 20000
 # A FILE boots alone now, so the terminal every hop below needs is opened here:
 # SPC c n (Newcol) puts it in a column of its own on the right and focuses it,
-# SPC w h comes straight back. WHAT THIS COST: the first SPC w t used to run
-# against a shell that had never been focused, which is Toggleterm's fallback
-# scan; nothing reaches that branch any more, because every way a script has of
-# making a terminal also focuses it.
+# SPC w h comes straight back — which also puts the shell on the stack, and Last
+# only ever names a pane that is on it.
 key space c n
 stable 700 15000
 key space w h
 stable 400 5000
 # left column = the file, right column = that shell; the file has focus
 snap start
-# SPC w t: the hop to the most recently focused TERMINAL, the one just opened
-key space w t
+# SPC j j: the pane before this one, which is the shell just opened
+key space j j
 stable 400 5000
 snap to-term
-# ...and back, because the file is now the latest document
-key space w t
+# ...and back, because going there made the file the pane before THAT
+key space j j
 stable 400 5000
 snap back-to-file
 # A bare Esc from a body in normal mode dispatches that SAME builtin: file to
@@ -63,12 +60,12 @@ snap left
 key space w j
 stable 400 5000
 snap down
-# SPC w t from a terminal: the file, which is the only document here
-key space w t
+# SPC j j from a terminal: the file, which is where SPC w h left off
+key space j j
 stable 400 5000
 snap toggle-doc
-# ...and back to the LATEST terminal — the one just left, not the launch shell
-# in the right column, which was focused earlier
-key space w t
+# ...and back to the shell just left, not the launch shell in the right column,
+# which was focused earlier
+key space j j
 stable 400 5000
 snap toggle-back
diff --git a/test/snapshots/wrap.golden b/test/snapshots/wrap.golden
index 7481cec3..2b4c530b 100644
--- a/test/snapshots/wrap.golden
+++ b/test/snapshots/wrap.golden
@@ -75,7 +75,7 @@
 |
 == snap on-wide grid=128x14 cursor=7,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/wrap/cwd/long.txt Save New Del
+|  /tmp/pardes-snap/wrap/cwd/long.txt                                                            Save New Del
 |     1 0---------1---------2---------3---------4---------5---------6---------7---------8---------9---------A---------B---------↩
 |       C---------D---------E---------F---------G---------H---------I---------J---------
 |     2 second line
diff --git a/test/snapshots/yankpaste.golden b/test/snapshots/yankpaste.golden
index 1a5e7c7f..612c81f0 100644
--- a/test/snapshots/yankpaste.golden
+++ b/test/snapshots/yankpaste.golden
@@ -1,6 +1,6 @@
 == snap linewise-below grid=100x30 cursor=13,5
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/yankpaste/cwd/f.txt Save New Del
+|  /tmp/pardes-snap/yankpaste/cwd/f.txt                              Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -31,7 +31,7 @@
 |
 == snap linewise-above grid=100x30 cursor=13,6
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/yankpaste/cwd/f.txt Save New Del
+|  /tmp/pardes-snap/yankpaste/cwd/f.txt                              Save New Del
 |     1 line 1
 |     2 line 2
 |     3 line 3
@@ -62,7 +62,7 @@
 |
 == snap charwise-inline grid=100x30 cursor=10,2
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/yankpaste/cwd/f.txt Save New Del
+|  /tmp/pardes-snap/yankpaste/cwd/f.txt                              Save New Del
 |     1 liline 1
 |     2 line 2
 |     3 line 3
@@ -93,7 +93,7 @@
 |
 == snap blankline grid=100x30 cursor=7,4
 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/yankpaste/cwd/f.txt Save New Del
+|  /tmp/pardes-snap/yankpaste/cwd/f.txt                              Save New Del
 |     1 liline 1
 |     2
 |     3