From 30c2c8a154e770b3920bcfd7d553825fe9182bf4 Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 12:57:47 -0300
Subject: Move the frame into draw.zig and the transitions out of layout.zig

Pure moves, no behaviour change. draw.zig holds the whole core frame in
order: render, the pane, tag, header and notice painters it calls, and the
character-effect composition (Pardes.render stays a declaration alias).
Presentation.zig is the panel presentation state as a file struct, and
animation.zig the easing curves, transition kinds, tracks and boxes, the
character effects' sources and the generic displayed-value transition, all
of which lived in layout.zig. layout.zig keeps only layout.
---
 src/gui/gui.zig | 66 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/gui.zig b/src/gui/gui.zig
index 6978284b..0737bb63 100644
--- a/src/gui/gui.zig
+++ b/src/gui/gui.zig
@@ -209,11 +209,11 @@ const AnimationClock = struct {
             return false;
         }
         if (clock.next_ns == 0) {
-            clock.next_ns = now_ns +| pardes.layout.Animation.frame_ns;
+            clock.next_ns = now_ns +| pardes.animation.Animation.frame_ns;
             return false;
         }
         if (now_ns < clock.next_ns) return false;
-        clock.next_ns = now_ns +| pardes.layout.Animation.frame_ns;
+        clock.next_ns = now_ns +| pardes.animation.Animation.frame_ns;
         return true;
     }
 };
@@ -221,7 +221,7 @@ const AnimationClock = struct {
 fn finishPresentedAnimationFrame(
     clock: *AnimationClock,
     core: *pardes.Pardes,
-    tracks: []const pardes.layout.Track,
+    tracks: []const pardes.animation.Track,
     now_ns: u64,
 ) void {
     core.acknowledgePanelPresentation(tracks);
@@ -232,9 +232,9 @@ test "GUI animation clock is active-only and cadence gated" {
     var clock: AnimationClock = .{};
     try std.testing.expect(!clock.due(false, 100));
     try std.testing.expect(!clock.due(true, 100));
-    try std.testing.expect(!clock.due(true, 100 + pardes.layout.Animation.frame_ns - 1));
-    try std.testing.expect(clock.due(true, 100 + pardes.layout.Animation.frame_ns));
-    try std.testing.expect(!clock.due(false, 100 + 2 * pardes.layout.Animation.frame_ns));
+    try std.testing.expect(!clock.due(true, 100 + pardes.animation.Animation.frame_ns - 1));
+    try std.testing.expect(clock.due(true, 100 + pardes.animation.Animation.frame_ns));
+    try std.testing.expect(!clock.due(false, 100 + 2 * pardes.animation.Animation.frame_ns));
     try std.testing.expectEqual(@as(u64, 0), clock.next_ns);
 }
 
@@ -248,7 +248,7 @@ test "a persistent scene presents a new panel's frame zero before advancing it"
     core.settings.scene_effects.crt = true;
     const scene_frame = try core.render(arena.allocator());
     finishPresentedAnimationFrame(&clock, core, scene_frame.panelTracks(), 100);
-    try std.testing.expectEqual(@as(u64, 100 + pardes.layout.Animation.frame_ns), clock.next_ns);
+    try std.testing.expectEqual(@as(u64, 100 + pardes.animation.Animation.frame_ns), clock.next_ns);
 
     core.settings.panel_transition = .slide;
     core.update(.{ .command = "Newcol" });
@@ -262,7 +262,7 @@ test "a persistent scene presents a new panel's frame zero before advancing it"
         &clock,
         core,
         first.panelTracks(),
-        100 + pardes.layout.Animation.frame_ns,
+        100 + pardes.animation.Animation.frame_ns,
     );
     _ = arena.reset(.retain_capacity);
     const second = try core.render(arena.allocator());
@@ -557,8 +557,8 @@ const SavedImagePlace = struct {
 const PreparedImage = struct {
     place: SavedImagePlace,
     texture: *c.SDL_GPUTexture,
-    track: ?pardes.layout.Track = null,
-    clip: ?pardes.layout.Box = null,
+    track: ?pardes.animation.Track = null,
+    clip: ?pardes.animation.Box = null,
     old_layer: bool = false,
 };
 
@@ -592,7 +592,7 @@ test "shader instance ABI carries aligned transition vectors" {
     try std.testing.expectEqual(@as(usize, 64), @offsetOf(ImageInstance, "effect"));
     try std.testing.expectEqual(@as(usize, 32), @sizeOf([8]f32));
 
-    const tracks = [_]pardes.layout.Track{
+    const tracks = [_]pardes.animation.Track{
         .{ .pane = 0, .phase = .opening, .effect = .slide },
         .{ .pane = 1, .phase = .moving, .effect = .slide },
         .{ .pane = 2, .phase = .moving, .effect = .slide },
@@ -606,19 +606,19 @@ test "shader instance ABI carries aligned transition vectors" {
 }
 
 test "GUI paint plan snaps history effects without a frozen grid" {
-    const tracks = [_]pardes.layout.Track{
+    const tracks = [_]pardes.animation.Track{
         .{ .pane = 0, .phase = .opening, .effect = .ascii },
         .{ .pane = 1, .phase = .closing, .effect = .vertical },
     };
     try std.testing.expectEqual(@as(usize, 1), makePaintPlan(&tracks, false).len);
     const ready = makePaintPlan(&tracks, true);
     try std.testing.expectEqual(@as(usize, 3), ready.len);
-    try std.testing.expectEqual(pardes.layout.Phase.opening, ready.batches[1].track.?.phase);
-    try std.testing.expectEqual(pardes.layout.Phase.closing, ready.batches[2].track.?.phase);
+    try std.testing.expectEqual(pardes.animation.Phase.opening, ready.batches[1].track.?.phase);
+    try std.testing.expectEqual(pardes.animation.Phase.closing, ready.batches[2].track.?.phase);
 }
 
 test "closing tombstone overlays but never owns canonical cells" {
-    const closing: pardes.layout.Track = .{
+    const closing: pardes.animation.Track = .{
         .pane = 0,
         .phase = .closing,
         .effect = .vertical,
@@ -628,7 +628,7 @@ test "closing tombstone overlays but never owns canonical cells" {
     const plan = makePaintPlan(&.{closing}, true);
     try std.testing.expectEqual(@as(usize, 0), paintBatchAt(&plan, 4, 4));
     try std.testing.expectEqual(@as(usize, 2), plan.len);
-    try std.testing.expectEqual(pardes.layout.Phase.closing, plan.batches[1].track.?.phase);
+    try std.testing.expectEqual(pardes.animation.Phase.closing, plan.batches[1].track.?.phase);
 }
 
 fn updateCoreResize(core: *pardes.Pardes, cols: u16, rows: u16, cell_w: u32, cell_h: u32, tag_w: u32, tag_h: u32) bool {
@@ -2031,10 +2031,10 @@ fn taglineLayoutForCell(g: *const Gui, col: u16) CellLayout {
     return compactTaglineLayout(g, @floatFromInt(col));
 }
 
-const boxContains = pardes.layout.Box.contains;
+const boxContains = pardes.animation.Box.contains;
 
 const PaintBatch = struct {
-    track: ?pardes.layout.Track = null,
+    track: ?pardes.animation.Track = null,
     cell_start: u32 = 0,
     cell_count: u32 = 0,
     image_start: u32 = 0,
@@ -2046,9 +2046,9 @@ const PaintPlan = struct {
     len: usize = 1,
 };
 
-fn makePaintPlan(tracks: []const pardes.layout.Track, has_diff: bool) PaintPlan {
+fn makePaintPlan(tracks: []const pardes.animation.Track, has_diff: bool) PaintPlan {
     var plan: PaintPlan = .{};
-    for ([_]pardes.layout.Phase{ .moving, .opening, .closing }) |phase| {
+    for ([_]pardes.animation.Phase{ .moving, .opening, .closing }) |phase| {
         for (tracks) |track| {
             if (!track.active() or track.phase != phase) continue;
             if (track.effect.needsPreviousGrid() and !has_diff) continue;
@@ -2074,21 +2074,21 @@ fn paintBatchForSerial(plan: *const PaintPlan, serial: u32) usize {
     return 0;
 }
 
-fn panelCellCoord(track: pardes.layout.Track, col: u16, row: u16) u32 {
+fn panelCellCoord(track: pardes.animation.Track, col: u16, row: u16) u32 {
     const source = track.contentBox();
     const x0: u16 = @intFromFloat(@max(0.0, @floor(source.x)));
     const y0: u16 = @intFromFloat(@max(0.0, @floor(source.y)));
     return @as(u32, row -| y0) << 16 | @as(u32, col -| x0);
 }
 
-fn panelGridSize(track: pardes.layout.Track) u32 {
+fn panelGridSize(track: pardes.animation.Track) u32 {
     const source = track.contentBox();
     const cols: u16 = @intFromFloat(@min(@as(f32, std.math.maxInt(u16)), @max(1.0, @ceil(source.w))));
     const rows: u16 = @intFromFloat(@min(@as(f32, std.math.maxInt(u16)), @max(1.0, @ceil(source.h))));
     return @as(u32, rows) << 16 | @as(u32, cols);
 }
 
-fn ndcBox(box: pardes.layout.Box, layout: CellLayout, win_w: f32, win_h: f32) [4]f32 {
+fn ndcBox(box: pardes.animation.Box, layout: CellLayout, win_w: f32, win_h: f32) [4]f32 {
     const px0 = layout.x_off + box.x * layout.w;
     const py0 = layout.y_off + box.y * layout.h;
     const px1 = px0 + box.w * layout.w;
@@ -2103,7 +2103,7 @@ fn ndcBox(box: pardes.layout.Box, layout: CellLayout, win_w: f32, win_h: f32) [4
 
 fn setTransitionFields(
     instance: anytype,
-    track: ?pardes.layout.Track,
+    track: ?pardes.animation.Track,
     layout: CellLayout,
     win_w: f32,
     win_h: f32,
@@ -4636,7 +4636,7 @@ fn snapshotContainsPlacement(g: *const Gui, current: pardes.ImagePlace) bool {
     return false;
 }
 
-fn placeIntersectsBox(place: SavedImagePlace, box: pardes.layout.Box) bool {
+fn placeIntersectsBox(place: SavedImagePlace, box: pardes.animation.Box) bool {
     const x0: f32 = @floatFromInt(place.x);
     const y0: f32 = @floatFromInt(place.y);
     const x1: f32 = @floatFromInt(@as(u32, place.x) + place.w);
@@ -4808,8 +4808,8 @@ fn appendPreparedImage(
     g: *Gui,
     gpa: std.mem.Allocator,
     place: SavedImagePlace,
-    track: ?pardes.layout.Track,
-    clip: ?pardes.layout.Box,
+    track: ?pardes.animation.Track,
+    clip: ?pardes.animation.Box,
     old_layer: bool,
 ) void {
     const texture = g.native_images.get(place.key) orelse return;
@@ -4998,7 +4998,7 @@ fn imageScissor(
     };
 }
 
-fn panelBoxScissor(g: *const Gui, box: pardes.layout.Box, max_w: u32, max_h: u32) c.SDL_Rect {
+fn panelBoxScissor(g: *const Gui, box: pardes.animation.Box, max_w: u32, max_h: u32) c.SDL_Rect {
     const x0: i32 = @intFromFloat(@floor(box.x * @as(f32, @floatFromInt(g.cell_w))));
     const y0: i32 = @intFromFloat(@floor(box.y * @as(f32, @floatFromInt(g.cell_h))));
     const x1: i32 = @intFromFloat(@ceil((box.x + box.w) * @as(f32, @floatFromInt(g.cell_w))));
@@ -5059,7 +5059,7 @@ fn renderFrame(
     theme_bg: ?[3]u8,
     topbar_pane_border_rgb: [3]u8,
     tagline_rgb: [3]u8,
-    scene_effects: pardes.layout.SceneEffect,
+    scene_effects: pardes.animation.SceneEffect,
     debug_on: bool,
 ) !bool {
     if (surface.pointer_shape != g.pointer_shape) {
@@ -5763,7 +5763,7 @@ fn tagLayerCellCount(g: *const Gui, layer: *const pardes.TagLayer) u32 {
     return @min(layer.cols, (pixels + g.tagline_width - 1) / g.tagline_width);
 }
 
-fn emitTagLayer(g: *Gui, instances: [*]CellInstance, next: *u32, layer: *const pardes.TagLayer, win_w: f32, win_h: f32, track: ?pardes.layout.Track, page: Ground, show_cursor: bool, old_layer: bool) void {
+fn emitTagLayer(g: *Gui, instances: [*]CellInstance, next: *u32, layer: *const pardes.TagLayer, win_w: f32, win_h: f32, track: ?pardes.animation.Track, page: Ground, show_cursor: bool, old_layer: bool) void {
     const bw: f32 = @floatFromInt(g.cell_w);
     const bh: f32 = @floatFromInt(g.cell_h);
     const tw: f32 = @floatFromInt(g.tagline_width);
@@ -5826,7 +5826,7 @@ fn clipBodyInstance(instance: *CellInstance, bottom: f32, win_h: f32) void {
     instance.y1 = limit;
 }
 
-fn emitBodyLayer(g: *Gui, instances: [*]CellInstance, next: *u32, layer: *const pardes.BodyLayer, win_w: f32, win_h: f32, track: ?pardes.layout.Track, page: Ground, show_cursor: bool, old_layer: bool, border_rgb: [3]u8) void {
+fn emitBodyLayer(g: *Gui, instances: [*]CellInstance, next: *u32, layer: *const pardes.BodyLayer, win_w: f32, win_h: f32, track: ?pardes.animation.Track, page: Ground, show_cursor: bool, old_layer: bool, border_rgb: [3]u8) void {
     const bw: f32 = @floatFromInt(g.cell_w);
     const bh: f32 = @floatFromInt(g.cell_h);
     const tw: f32 = @floatFromInt(g.tagline_width);
@@ -5919,7 +5919,7 @@ fn emitSurfaceCell(
     body_layout: CellLayout,
     win_w: f32,
     win_h: f32,
-    track: ?pardes.layout.Track,
+    track: ?pardes.animation.Track,
     line: []const pardes.Cell,
     at: usize,
     cursor: ?usize,
@@ -6018,7 +6018,7 @@ fn emitInstance(
     layout: CellLayout,
     win_w: f32,
     win_h: f32,
-    track: ?pardes.layout.Track,
+    track: ?pardes.animation.Track,
     role: pardes.FontRole,
     line: []const pardes.Cell,
     at: usize,
-- 
cgit v1.3


From e0b5564f04aa0ae6666f29ef29c768d800fbabce Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 13:15:41 -0300
Subject: Step core animation by the shell's clock and sleep to the next wake

A shell now answers Host.now, its monotonic clock in ns, and the pump
advances core animation to it: one .tick per whole 16 ms frame since core
time last stood still. The same animation therefore takes the same time at
60, 120 and 144 Hz, over ssh and after a slow frame (the GUI's re-armed
clock ran them ~25% slow at 144 Hz; the tty's post-frame sleep drifted).
nextWake() lists every core animation in one place: a frame from now while
anything moves, the end of the wait while something only waits (a message
lingering, the look-hover delay), null when idle. Shells sleep exactly that
long, and a wait is jumped to its end in one step, so an 800 ms linger
costs one frame instead of fifty. An overshoot under 1.5 ms after a step is
let go: at 60 and 120 Hz every display frame takes exactly one step (a 16 ms
frame against a 16.67 ms vsync would otherwise double-step every 24th).

The six tick drivers are gone: tty's timer thread only times the wait,
interruptibly (a newer, shorter request cuts short a sleep still timing a
longer one); the GUI's
AnimationClock, web's JS tick bank (pardes_tick now takes rAF's timestamp),
the detached server's and the board's ticks; grid mode steps a virtual
clock straight to each wake. PARDES_TEST_CLOCK, set by the snapshot
harness, gives tty and the detached server the same virtual clock.

Every stepped frame is drawn. The old pump never drew the last frame of a
fade (a .tick asks for no frame, and the fade was over by the check), so a
theme switch stopped at 9/10 of the way until the next input: theme.golden,
themesel.golden and the GUI's acme-light scene move to the theme's true
colours, and nothing else changes. The frozen previous grid is captured only
while a panel transition is chosen, not on every idle frame.
---
 docs/render-pipeline.md        |    2 +-
 src/Messages.zig               |   81 ++-
 src/Presentation.zig           |   13 +-
 src/animation.zig              |  261 +++++-----
 src/colors.zig                 |    8 +-
 src/detached/server.zig        |   21 +-
 src/esp32p4.zig                |   15 +-
 src/exec.zig                   |    4 +
 src/gui/gui.zig                |   86 +---
 src/host_io.zig                |   17 +
 src/macos.zig                  |    8 +-
 src/pardes.zig                 |  151 +++++-
 src/tty/tty.zig                |  108 +++-
 src/web.zig                    |   36 +-
 src/web/app.mjs                |   36 +-
 test/gui-goldens.txt           |    6 +-
 test/gui_golden.py             |    4 +-
 test/pdf.zig                   |    2 +-
 test/snapshot.zig              |    3 +
 test/snapshots/theme.golden    | 1066 ++++++++++++++++++++--------------------
 test/snapshots/themesel.golden |  945 ++++++++++++++++++-----------------
 test/web_harness.mjs           |   16 +-
 22 files changed, 1557 insertions(+), 1332 deletions(-)

(limited to 'src/gui')

diff --git a/docs/render-pipeline.md b/docs/render-pipeline.md
index 2a679b8d..590a7e72 100644
--- a/docs/render-pipeline.md
+++ b/docs/render-pipeline.md
@@ -803,7 +803,7 @@ stripped. No visual change until stage 9 unless stated.
 |---|---|---|
 | 0 | GUI capture goldens: a handful of scenes rendered hidden in capture mode, PPM hashes checked in (same machine/driver) | the safety net the GUI stages need; machine- and driver-specific, so a LOCAL gate only, never CI |
 | 1 | pure moves: render → `src/draw.zig`; Presentation/animation out of layout.zig | no behaviour |
-| 2a | clock plumbing: `now_ns` into pump/events, `nextWake`, `advance`, deadlines for linger/hover; all shells pass now and sleep to the wake; six tick drivers deleted; ack moves into pump; capturePrevious only when transitions are on. Animations still compute `frame = floor(elapsed / 16 ms)`, so every curve is identical | pacing is corrected (144 Hz no longer ~25% slow, ssh no longer drifts): a bug fix allowed in this phase. Unit tests step an injected clock by exactly 16 ms, so their numbers do not change. The snapshot harness runs the binary with `--test-clock` (each core-time step is exactly 16.67 ms per tick request, as today), so goldens see the same sequence and `stable` (test/snapshot.zig ~861) is unaffected by wall-time pacing |
+| 2a | clock plumbing: `Host.now` (the shell's monotonic ns) and `Pardes.advance(now)`, which runs one `.tick` per whole 16 ms frame since core time last stood still; `nextWake()` lists every core animation and answers the next frame while anything moves, the wait's end while something only waits (message linger, look-hover delay), null when idle; the pump sleeps to it and draws only stepped frames. No shell posts `.tick` any more (tty's timer thread only wakes the wait; GUI's AnimationClock, web's JS tick bank and the detached server's and the board's ticks are gone; grid mode moves its virtual clock straight to the next wake). `acknowledgePanelPresentation` stays in the shells (revisit at stage 8: grid mode acks `&.{}` on purpose). capturePrevious only when transitions are on. `.tick` stays as the one-frame step `advance` and the unit tests use, so every curve and every asserted number is unchanged | pacing is corrected (144 Hz no longer ~25% slow, ssh no longer drifts): a bug fix allowed in this phase. PARDES_TEST_CLOCK (set by the snapshot harness): tty and the detached server answer a virtual clock that a timed-out wait moves exactly to the core's next wake, so goldens replay the same frame sequence on any machine load. Review fixes: tty's wake timer is interruptible (a newer, shorter request cuts short an older sleep); a wait (linger, hover delay) is jumped to its end in one step, never counted against the 240-frame catch-up cap; an overshoot under 1.5 ms after a step is let go, so 60 and 120 Hz take exactly one step per display frame. Known exceptions: the GUI still polls every 16 ms when idle (SDL events, gamepad, fs tick, smooth scroll depend on it; revisit at stage 8); a minimized GUI renders every stepped frame of a running animation (stage 8) |
 | 2b | (on `fx`, feel-reviewed) Tween/Spring curves, settle rules, OKLab crossfades, new durations from §8.1 | a look change, kept apart from 2a so either can be bisected |
 | 3 | paint functions take `s: *Surface`; delete the swap hack | mechanical, wide |
 | 4 | PLACE: Region list built once; renderPane/tags/notices read their rects from it | wait for tag→Text; the refactor is already replacing BOX_H with `pane.tag_rows` and `p.tagTop/bodyTop(pane, r)` — PLACE absorbs those into the region rects |
diff --git a/src/Messages.zig b/src/Messages.zig
index 97a2f939..7334de95 100644
--- a/src/Messages.zig
+++ b/src/Messages.zig
@@ -272,11 +272,35 @@ fn advanceLine(p: *const Pardes, life: *Pane.MessageLife) bool {
     return false;
 }
 
-/// Is any message line moving (and so owed ticks)?
-pub fn messagesAnimating(pane: *const Pane) bool {
-    if (pane.msg_len > 0 and pane.msg_life.phase != .shown) return true;
-    for (pane.msg_older[0..pane.msg_older_len]) |line| if (line.life.phase != .shown) return true;
-    return false;
+/// Move every lingering message line `frames` along its linger at once:
+/// how `advance` jumps a wait instead of stepping it frame by frame.
+pub fn holdMessages(p: *Pardes, frames: u64) void {
+    const n: u16 = @intCast(@min(frames, std.math.maxInt(u16)));
+    for (p.panes) |slot| {
+        const pane = slot orelse continue;
+        if (pane.msg_len > 0 and pane.msg_life.phase == .lingering) pane.msg_life.frame +|= n;
+        for (pane.msg_older[0..pane.msg_older_len]) |*line| {
+            if (line.life.phase == .lingering) line.life.frame +|= n;
+        }
+    }
+}
+
+/// Frames until this pane's message lines next change: 1 while a line
+/// falls in or dissolves, the rest of its linger while one only waits, null
+/// when every line just shows.
+pub fn messageWake(p: *const Pardes, pane: *const Pane) ?u64 {
+    var soonest: ?u64 = null;
+    const linger = messageFrames(p.settings.message_linger_ms);
+    for (0..@as(usize, pane.msg_older_len) + 1) |i| {
+        const life = if (i < pane.msg_older_len) pane.msg_older[i].life else if (pane.msg_len > 0) pane.msg_life else continue;
+        const frames: u64 = switch (life.phase) {
+            .shown => continue,
+            .entering, .leaving => 1,
+            .lingering => @max(1, linger -| life.frame),
+        };
+        soonest = if (soonest) |n| @min(n, frames) else frames;
+    }
+    return soonest;
 }
 
 /// How present a message is (1 = fully) and how far above its row it
@@ -286,7 +310,7 @@ pub const MessageMotion = struct { alpha: f32 = 1, slide: f32 = 0 };
 
 /// Animation frames a message timing lasts; at least one.
 pub fn messageFrames(ms: u16) u16 {
-    return @intCast(@max(1, (@as(u32, ms) + animation.Animation.frame_ms - 1) / animation.Animation.frame_ms));
+    return @intCast(@max(1, (@as(u32, ms) + animation.frame_ms - 1) / animation.frame_ms));
 }
 
 pub fn messageMotion(p: *const Pardes, life: Pane.MessageLife) MessageMotion {
@@ -792,3 +816,48 @@ test "notices stack over the body's top rows without moving them" {
     for (p.surface.tagLayers()) |*layer|
         try std.testing.expect(layer.cols == 0 or layer.kind != .notice);
 }
+
+test "an idle core wants no wake and a lingering message sleeps to its linger's end" {
+    const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 80, .rows = 24 });
+    defer p.deinit();
+    while (p.nextEffect()) |_| {}
+    const frame = animation.frame_ns;
+    p.advance(1_000_000);
+    try std.testing.expectEqual(@as(?u64, null), p.nextWake());
+    const pane = p.panes[p.active].?;
+    try std.testing.expect(p.executeBuiltinLine(p.active, "Msg hello"));
+    // Falling in: a frame from now.
+    try std.testing.expectEqual(@as(?u64, p.stepped_ns + frame), p.nextWake());
+    const fall = messageFrames(p.settings.message_fall_ms);
+    p.advance(p.stepped_ns + fall * frame);
+    try std.testing.expectEqual(Pane.MessagePhase.shown, pane.msg_life.phase);
+    try std.testing.expectEqual(@as(?u64, null), p.nextWake());
+    // A key starts the 800 ms linger: the core sleeps to its end, not a
+    // frame at a time, and the frames it jumps draw nothing.
+    p.update(.{ .key = .{ .cp = 'x' } });
+    try std.testing.expectEqual(Pane.MessagePhase.lingering, pane.msg_life.phase);
+    const linger = messageFrames(p.settings.message_linger_ms);
+    const due = p.stepped_ns + linger * frame;
+    try std.testing.expectEqual(@as(?u64, due), p.nextWake());
+    p.needs_frame = false;
+    p.advance(due - frame);
+    try std.testing.expectEqual(@as(?u64, due), p.nextWake());
+    try std.testing.expectEqual(Pane.MessagePhase.lingering, pane.msg_life.phase);
+    p.advance(due);
+    try std.testing.expectEqual(Pane.MessagePhase.leaving, pane.msg_life.phase);
+    try std.testing.expectEqual(@as(?u64, due + frame), p.nextWake());
+    p.advance(due + 10 * std.time.ns_per_s);
+    try std.testing.expectEqual(@as(usize, 0), pane.msg_len);
+    try std.testing.expectEqual(@as(?u64, null), p.nextWake());
+
+    // A long linger ends when it says, jumped in one step, not stretched by
+    // the cap on catching up with moving frames.
+    try std.testing.expect(p.executeBuiltinLine(p.active, "MessageLinger 5000"));
+    try std.testing.expect(p.executeBuiltinLine(p.active, "Msg again"));
+    p.advance(p.stepped_ns + fall * frame);
+    p.update(.{ .key = .{ .cp = 'x' } });
+    const long_due = p.stepped_ns + messageFrames(5000) * frame;
+    try std.testing.expectEqual(@as(?u64, long_due), p.nextWake());
+    p.advance(long_due);
+    try std.testing.expectEqual(Pane.MessagePhase.leaving, pane.msg_life.phase);
+}
diff --git a/src/Presentation.zig b/src/Presentation.zig
index fe8317dd..45b196c8 100644
--- a/src/Presentation.zig
+++ b/src/Presentation.zig
@@ -295,11 +295,18 @@ pub fn acknowledge(self: *Presentation, p: *Pardes, tracks: []const Track) void
         self.tracks = @splat(null);
         self.closing_len = 0;
         self.diff_state = .none;
-        self.capturePrevious(p.gpa, &p.surface);
+        // The frozen grid exists for transitions alone: with them off, an
+        // idle frame copies nothing.
+        if (p.settings.panel_transition != .off) {
+            self.capturePrevious(p.gpa, &p.surface);
+        } else {
+            self.previous_valid = false;
+            self.previous_layout = @splat(null);
+        }
     }
 }
 
-fn capturePrevious(self: *Presentation, gpa: std.mem.Allocator, surface: *const pardes.Surface) void {
+pub fn capturePrevious(self: *Presentation, gpa: std.mem.Allocator, surface: *const pardes.Surface) void {
     self.diff_state = .none;
     const cells = surface.cells;
     if (cells.len == 0) {
@@ -651,6 +658,8 @@ test "presentation submission failure preserves shown geometry until retry is ac
     defer p.deinit();
     var frame: std.heap.ArenaAllocator = .init(std.testing.allocator);
     defer frame.deinit();
+    // The frozen grid is kept only while a transition is chosen.
+    p.settings.panel_transition = .slide;
     _ = try p.render(frame.allocator());
     p.acknowledgePanelPresentation(&.{});
     const shown = p.presentation.shown;
diff --git a/src/animation.zig b/src/animation.zig
index b190c1a1..d6ef1ec3 100644
--- a/src/animation.zig
+++ b/src/animation.zig
@@ -588,157 +588,158 @@ test "dissolve has exact stable endpoints" {
     }
 }
 
-pub const Animation = struct {
-    pub const frame_ms: u32 = 16;
-    pub const frame_ns: u64 = frame_ms * std.time.ns_per_ms;
-    pub const transition_steps: u16 = 10;
-
-    pub fn Transition(comptime Value: type) type {
-        return struct {
-            const Self = @This();
-
-            from: Value,
-            to: Value,
-            displayed: Value,
-            step: u16 = transition_steps,
-
-            pub fn init(value: Value) Self {
-                return .{ .from = value, .to = value, .displayed = value };
-            }
+pub const frame_ms: u32 = 16;
+pub const frame_ns: u64 = frame_ms * std.time.ns_per_ms;
+pub const transition_steps: u16 = 10;
+
+/// A displayed value that fades from one target to the next over
+/// `transition_steps` frames; the chrome colours are one.
+pub fn Fade(comptime Value: type) type {
+    return struct {
+        const Self = @This();
+
+        from: Value,
+        to: Value,
+        displayed: Value,
+        step: u16 = transition_steps,
+
+        pub fn init(value: Value) Self {
+            return .{ .from = value, .to = value, .displayed = value };
+        }
 
-            pub fn isActive(a: *const Self) bool {
-                return a.step < transition_steps;
-            }
+        pub fn isActive(a: *const Self) bool {
+            return a.step < transition_steps;
+        }
 
-            pub fn retarget(a: *Self, target: Value) void {
-                a.from = a.displayed;
-                a.to = target;
-                a.step = if (std.meta.eql(a.from, target)) transition_steps else 0;
-                if (a.step == transition_steps) a.displayed = target;
-            }
+        pub fn retarget(a: *Self, target: Value) void {
+            a.from = a.displayed;
+            a.to = target;
+            a.step = if (std.meta.eql(a.from, target)) transition_steps else 0;
+            if (a.step == transition_steps) a.displayed = target;
+        }
 
-            pub fn advance(a: *Self) void {
-                if (!a.isActive()) return;
-                a.step += 1;
-                a.displayed = if (a.step == transition_steps)
-                    a.to
-                else
-                    Value.interpolate(a.from, a.to, a.step, transition_steps);
-            }
+        pub fn advance(a: *Self) void {
+            if (!a.isActive()) return;
+            a.step += 1;
+            a.displayed = if (a.step == transition_steps)
+                a.to
+            else
+                Value.interpolate(a.from, a.to, a.step, transition_steps);
+        }
 
-            pub fn snap(a: *Self, value: Value) void {
-                a.* = init(value);
-            }
-        };
-    }
+        pub fn snap(a: *Self, value: Value) void {
+            a.* = init(value);
+        }
+    };
+}
 
-    pub fn Immediate(comptime Value: type) type {
-        return struct {
-            const Self = @This();
+pub fn Immediate(comptime Value: type) type {
+    return struct {
+        const Self = @This();
 
-            displayed: Value,
+        displayed: Value,
 
-            pub fn init(value: Value) Self {
-                return .{ .displayed = value };
-            }
+        pub fn init(value: Value) Self {
+            return .{ .displayed = value };
+        }
 
-            pub fn isActive(_: *const Self) bool {
-                return false;
-            }
+        pub fn isActive(_: *const Self) bool {
+            return false;
+        }
 
-            pub fn retarget(a: *Self, target: Value) void {
-                a.displayed = target;
-            }
+        pub fn retarget(a: *Self, target: Value) void {
+            a.displayed = target;
+        }
 
-            pub fn advance(_: *Self) void {}
+        pub fn advance(_: *Self) void {}
 
-            pub fn snap(a: *Self, value: Value) void {
-                a.displayed = value;
-            }
-        };
-    }
-
-    pub fn interpolateRgb(from: [3]u8, to: [3]u8, step: u16, steps: u16) [3]u8 {
-        if (step == 0) return from;
-        if (step >= steps) return to;
-        var out: [3]u8 = undefined;
-        for (&out, from, to) |*dst, a, b| {
-            const numerator = @as(u32, a) * (steps - step) + @as(u32, b) * step;
-            dst.* = @intCast((numerator + steps / 2) / steps);
+        pub fn snap(a: *Self, value: Value) void {
+            a.displayed = value;
         }
-        return out;
+    };
+}
+
+pub fn interpolateRgb(from: [3]u8, to: [3]u8, step: u16, steps: u16) [3]u8 {
+    if (step == 0) return from;
+    if (step >= steps) return to;
+    var out: [3]u8 = undefined;
+    for (&out, from, to) |*dst, a, b| {
+        const numerator = @as(u32, a) * (steps - step) + @as(u32, b) * step;
+        dst.* = @intCast((numerator + steps / 2) / steps);
     }
+    return out;
+}
 
-    const TestColor = struct {
-        rgb: [3]u8,
+const TestColor = struct {
+    rgb: [3]u8,
 
-        pub fn interpolate(from: TestColor, to: TestColor, step: u16, steps: u16) TestColor {
-            return .{ .rgb = interpolateRgb(from.rgb, to.rgb, step, steps) };
-        }
-    };
+    pub fn interpolate(from: TestColor, to: TestColor, step: u16, steps: u16) TestColor {
+        return .{ .rgb = interpolateRgb(from.rgb, to.rgb, step, steps) };
+    }
+};
 
-    test "Immediate lands where a completed Transition lands" {
-        const from: TestColor = .{ .rgb = .{ 240, 3, 90 } };
-        const to: TestColor = .{ .rgb = .{ 5, 222, 90 } };
+test "Immediate lands where a completed Transition lands" {
+    const from: TestColor = .{ .rgb = .{ 240, 3, 90 } };
+    const to: TestColor = .{ .rgb = .{ 5, 222, 90 } };
 
-        var faded = Animation.Transition(TestColor).init(from);
-        faded.retarget(to);
-        for (0..transition_steps) |_| faded.advance();
+    var faded = Fade(TestColor).init(from);
+    faded.retarget(to);
+    for (0..transition_steps) |_| faded.advance();
 
-        var instant = Immediate(TestColor).init(from);
-        try std.testing.expect(!instant.isActive());
-        instant.retarget(to);
-        try std.testing.expectEqual(faded.displayed, instant.displayed);
+    var instant = Immediate(TestColor).init(from);
+    try std.testing.expect(!instant.isActive());
+    instant.retarget(to);
+    try std.testing.expectEqual(faded.displayed, instant.displayed);
 
-        // Never active, so a frontend that renders only while something is animating stops immediately
-        // rather than spending ten frames discovering there is nothing to draw.
-        try std.testing.expect(!instant.isActive());
-        instant.advance();
-        try std.testing.expectEqual(to, instant.displayed);
+    // Never active, so a frontend that renders only while something is animating stops immediately
+    // rather than spending ten frames discovering there is nothing to draw.
+    try std.testing.expect(!instant.isActive());
+    instant.advance();
+    try std.testing.expectEqual(to, instant.displayed);
 
-        instant.snap(from);
-        try std.testing.expectEqual(from, instant.displayed);
-    }
+    instant.snap(from);
+    try std.testing.expectEqual(from, instant.displayed);
+}
 
-    test "fixed-step interpolation has exact monotonic endpoints" {
-        const Tween = Animation.Transition(TestColor);
-        const from: TestColor = .{ .rgb = .{ 240, 3, 90 } };
-        const to: TestColor = .{ .rgb = .{ 5, 222, 90 } };
-        var tween = Tween.init(from);
-        tween.retarget(to);
-        try std.testing.expectEqual(from, tween.displayed);
-
-        var previous = tween.displayed;
-        for (0..transition_steps) |_| {
-            tween.advance();
-            try std.testing.expect(tween.displayed.rgb[0] <= previous.rgb[0]);
-            try std.testing.expect(tween.displayed.rgb[1] >= previous.rgb[1]);
-            try std.testing.expectEqual(@as(u8, 90), tween.displayed.rgb[2]);
-            previous = tween.displayed;
-        }
-        try std.testing.expect(!tween.isActive());
-        try std.testing.expectEqual(to, tween.displayed);
-        tween.advance();
-        try std.testing.expectEqual(to, tween.displayed);
-    }
+test "fixed-step interpolation has exact monotonic endpoints" {
+    const Tween = Fade(TestColor);
+    const from: TestColor = .{ .rgb = .{ 240, 3, 90 } };
+    const to: TestColor = .{ .rgb = .{ 5, 222, 90 } };
+    var tween = Tween.init(from);
+    tween.retarget(to);
+    try std.testing.expectEqual(from, tween.displayed);
 
-    test "retarget starts at the currently displayed value" {
-        const Tween = Animation.Transition(TestColor);
-        const first: TestColor = .{ .rgb = .{ 0, 40, 200 } };
-        const second: TestColor = .{ .rgb = .{ 200, 140, 0 } };
-        const third: TestColor = .{ .rgb = .{ 20, 10, 250 } };
-        var tween = Tween.init(first);
-        tween.retarget(second);
-        tween.advance();
-        tween.advance();
+    var previous = tween.displayed;
+    for (0..transition_steps) |_| {
         tween.advance();
-        const on_screen = tween.displayed;
-
-        tween.retarget(third);
-        try std.testing.expectEqual(on_screen, tween.from);
-        try std.testing.expectEqual(on_screen, tween.displayed);
-        try std.testing.expect(tween.isActive());
-        for (0..transition_steps) |_| tween.advance();
-        try std.testing.expectEqual(third, tween.displayed);
+        try std.testing.expect(tween.displayed.rgb[0] <= previous.rgb[0]);
+        try std.testing.expect(tween.displayed.rgb[1] >= previous.rgb[1]);
+        try std.testing.expectEqual(@as(u8, 90), tween.displayed.rgb[2]);
+        previous = tween.displayed;
     }
-};
+    try std.testing.expect(!tween.isActive());
+    try std.testing.expectEqual(to, tween.displayed);
+    tween.advance();
+    try std.testing.expectEqual(to, tween.displayed);
+}
+
+test "retarget starts at the currently displayed value" {
+    const Tween = Fade(TestColor);
+    const first: TestColor = .{ .rgb = .{ 0, 40, 200 } };
+    const second: TestColor = .{ .rgb = .{ 200, 140, 0 } };
+    const third: TestColor = .{ .rgb = .{ 20, 10, 250 } };
+    var tween = Tween.init(first);
+    tween.retarget(second);
+    tween.advance();
+    tween.advance();
+    tween.advance();
+    const on_screen = tween.displayed;
+
+    tween.retarget(third);
+    try std.testing.expectEqual(on_screen, tween.from);
+    try std.testing.expectEqual(on_screen, tween.displayed);
+    try std.testing.expect(tween.isActive());
+    for (0..transition_steps) |_| tween.advance();
+    try std.testing.expectEqual(third, tween.displayed);
+}
+
diff --git a/src/colors.zig b/src/colors.zig
index f814d55d..0065d5ef 100644
--- a/src/colors.zig
+++ b/src/colors.zig
@@ -186,15 +186,15 @@ pub const ChromeTheme = struct {
     pub fn interpolate(from: ChromeTheme, to: ChromeTheme, step: u16, steps: u16) ChromeTheme {
         var out: ChromeTheme = undefined;
         inline for (@typeInfo(ChromeTheme).@"struct".fields) |field|
-            @field(out, field.name) = animation.Animation.interpolateRgb(@field(from, field.name), @field(to, field.name), step, steps);
+            @field(out, field.name) = animation.interpolateRgb(@field(from, field.name), @field(to, field.name), step, steps);
         return out;
     }
 };
 
 pub const ChromeAnimation = if (theme_animation)
-    animation.Animation.Transition(ChromeTheme)
+    animation.Fade(ChromeTheme)
 else
-    animation.Animation.Immediate(ChromeTheme);
+    animation.Immediate(ChromeTheme);
 
 pub const initial_chrome = ChromeTheme.fromTheme(&themes[0]);
 
@@ -414,7 +414,7 @@ test "runtime theme changes animate chrome and retarget without a jump" {
     try std.testing.expectEqualStrings("acme", p.theme().name);
     try std.testing.expectEqual(midflight, p.chromeTheme().*);
     try std.testing.expect(p.animationActive());
-    for (0..animation.Animation.transition_steps) |_| p.update(.tick);
+    for (0..animation.transition_steps) |_| p.update(.tick);
     try std.testing.expect(!p.animationActive());
     try std.testing.expectEqual(ChromeTheme.fromTheme(p.theme()), p.chromeTheme().*);
     // Extra ticks are inert at the exact endpoint.
diff --git a/src/detached/server.zig b/src/detached/server.zig
index 5c0e1487..212c9a3d 100644
--- a/src/detached/server.zig
+++ b/src/detached/server.zig
@@ -140,6 +140,8 @@ pub const Session = struct {
     worker_gpa: std.mem.Allocator,
     io: std.Io,
     core: *pardes.Pardes,
+    /// PARDES_TEST_CLOCK's virtual time (host_io.testClock).
+    test_clock: ?u64 = null,
     listener: c_int = -1,
     path_buf: [sun_path_len]u8 = undefined,
     path_len: usize = 0,
@@ -343,8 +345,14 @@ pub const Session = struct {
         return @ptrCast(@alignCast(ctx.?));
     }
 
+    fn clockNow(ctx: ?*anyopaque) u64 {
+        const s = of(ctx);
+        return s.test_clock orelse host_io.monotonicNs();
+    }
+
     const vtable: host_io.Host.VTable = .{
         .wait_input = waitInput,
+        .now = clockNow,
         .present = present,
         .poll_frame = pollFrame,
         .spawn = spawn,
@@ -827,8 +835,9 @@ pub const Session = struct {
             pardes.turn.rest();
             nap(if (timeout_ms == 0) 16 else timeout_ms);
             pardes.turn.wake();
-            // An animating frame's wait is the frame: tick it.
-            if (timeout_ms != 0) s.core.update(.tick);
+            if (timeout_ms != 0) if (s.test_clock) |*virtual| {
+                virtual.* = @max(virtual.*, s.core.nextWake() orelse virtual.*);
+            };
             return;
         }
         var timeout: c_int = if (timeout_ms == 0) -1 else @intCast(@min(timeout_ms, std.math.maxInt(c_int)));
@@ -838,9 +847,10 @@ pub const Session = struct {
         const ready = libc.poll(&fds, @intCast(n), timeout);
         pardes.turn.wake();
         if (ready > 0) s.dispatch(fds[0..n], src[0..n]);
-        // Animating, the frame's time is up: advance it. There is no other
-        // tick in a detached session, and without it an animation never ends.
-        if (timeout_ms != 0 and monotonicMs() -| now >= timeout_ms) s.core.update(.tick);
+        // The core's wake ran out; the pump advances it from `now`.
+        if (timeout_ms != 0 and monotonicMs() -| now >= timeout_ms) if (s.test_clock) |*virtual| {
+            virtual.* = @max(virtual.*, s.core.nextWake() orelse virtual.*);
+        };
         _ = s.drainCompletions(true);
         s.expire(monotonicMs());
         s.harvest();
@@ -1155,6 +1165,7 @@ pub fn run(init: std.process.Init, opts: pardes.Options, name: []const u8) !void
         .cols = options.cols,
         .rows = options.rows,
         .prompt_rcs = host_io.Shell.prepare(),
+        .test_clock = host_io.testClock(),
     };
     defer session.core.deinit();
     defer session.deinit();
diff --git a/src/esp32p4.zig b/src/esp32p4.zig
index 0d532e1e..c583de54 100644
--- a/src/esp32p4.zig
+++ b/src/esp32p4.zig
@@ -572,10 +572,9 @@ export fn pardes_esp32p4_tick(now_ms: u64) callconv(.c) void {
             dirty = true;
         }
     }
-    if (c.animationActive()) {
-        c.update(.tick);
-        dirty = true;
-    }
+    // The core steps its own animations by this clock (`Host.now`).
+    c.advance(now_ms * std.time.ns_per_ms);
+    if (c.needs_frame) dirty = true;
 }
 
 /// How long a lone ESC waits for a second byte before it counts as the Escape key.
@@ -590,7 +589,7 @@ var esc_held_at: ?u64 = null;
 
 export fn pardes_esp32p4_wants_frame() callconv(.c) bool {
     const c = core orelse return false;
-    return dirty or c.animationActive();
+    return dirty or c.needs_frame;
 }
 
 export fn pardes_esp32p4_render() callconv(.c) u32 {
@@ -607,7 +606,11 @@ export fn pardes_esp32p4_quit() callconv(.c) bool {
 
 // ------------------------------------------------------------------------------------ the host
 
-const pardes_host: pardes.Host.VTable = .{ .present = present, .gpio_toggle = gpioToggle };
+const pardes_host: pardes.Host.VTable = .{ .now = boardNow, .present = present, .gpio_toggle = gpioToggle };
+
+fn boardNow(_: ?*anyopaque) u64 {
+    return last_now_ms * std.time.ns_per_ms;
+}
 
 /// The `Gpio` word's one seam to the board. Nothing here knows what a pad is; it forwards, and
 /// answers false when the firmware brought none, which is what puts "gpio: NoPads" on the message
diff --git a/src/exec.zig b/src/exec.zig
index b16c600c..ad0f7b9b 100644
--- a/src/exec.zig
+++ b/src/exec.zig
@@ -502,6 +502,10 @@ pub fn applySettingBuiltin(p: *Pardes, setting: config.Runtime.Setting, arg: ?[]
     if (p.settings.column_tags != previous_column_tags) {
         if (p.header_column != null) tagline.exitHeader(p);
     }
+    // Idle frames keep no frozen grid while transitions are off; the one
+    // just drawn is the baseline the first transition starts from.
+    if (transition_changed and previous_transition == .off)
+        p.presentation.capturePrevious(p.gpa, &p.surface);
     if (transition_changed or tagline_metrics_changed or p.settings.column_tags != previous_column_tags) {
         p.abandonPanelAnimations();
     }
diff --git a/src/gui/gui.zig b/src/gui/gui.zig
index 0737bb63..a1e21dc0 100644
--- a/src/gui/gui.zig
+++ b/src/gui/gui.zig
@@ -200,55 +200,18 @@ const touch_click_flash_max_frames: u8 = 14;
 const touch_click_flash_vertices: usize = 1400;
 const touch_scroll_tick: f32 = 0.02;
 
-const AnimationClock = struct {
-    next_ns: u64 = 0,
-
-    fn due(clock: *AnimationClock, active: bool, now_ns: u64) bool {
-        if (!active) {
-            clock.next_ns = 0;
-            return false;
-        }
-        if (clock.next_ns == 0) {
-            clock.next_ns = now_ns +| pardes.animation.Animation.frame_ns;
-            return false;
-        }
-        if (now_ns < clock.next_ns) return false;
-        clock.next_ns = now_ns +| pardes.animation.Animation.frame_ns;
-        return true;
-    }
-};
-
-fn finishPresentedAnimationFrame(
-    clock: *AnimationClock,
-    core: *pardes.Pardes,
-    tracks: []const pardes.animation.Track,
-    now_ns: u64,
-) void {
-    core.acknowledgePanelPresentation(tracks);
-    if (clock.due(core.animationActive(), now_ns)) core.update(.tick);
-}
-
-test "GUI animation clock is active-only and cadence gated" {
-    var clock: AnimationClock = .{};
-    try std.testing.expect(!clock.due(false, 100));
-    try std.testing.expect(!clock.due(true, 100));
-    try std.testing.expect(!clock.due(true, 100 + pardes.animation.Animation.frame_ns - 1));
-    try std.testing.expect(clock.due(true, 100 + pardes.animation.Animation.frame_ns));
-    try std.testing.expect(!clock.due(false, 100 + 2 * pardes.animation.Animation.frame_ns));
-    try std.testing.expectEqual(@as(u64, 0), clock.next_ns);
-}
-
 test "a persistent scene presents a new panel's frame zero before advancing it" {
     const core = try pardes.Pardes.init(std.testing.allocator, .{ .tty_only = true });
     defer core.deinit();
     var arena: std.heap.ArenaAllocator = .init(std.testing.allocator);
     defer arena.deinit();
-    var clock: AnimationClock = .{};
+    const frame = pardes.animation.frame_ns;
 
     core.settings.scene_effects.crt = true;
+    core.advance(100);
     const scene_frame = try core.render(arena.allocator());
-    finishPresentedAnimationFrame(&clock, core, scene_frame.panelTracks(), 100);
-    try std.testing.expectEqual(@as(u64, 100 + pardes.animation.Animation.frame_ns), clock.next_ns);
+    core.acknowledgePanelPresentation(scene_frame.panelTracks());
+    try std.testing.expectEqual(@as(?u64, 100 + frame), core.nextWake());
 
     core.settings.panel_transition = .slide;
     core.update(.{ .command = "Newcol" });
@@ -258,12 +221,12 @@ test "a persistent scene presents a new panel's frame zero before advancing it"
     try std.testing.expect(track_count > 0);
     for (first.panelTracks()) |track| try std.testing.expectEqual(@as(u16, 0), track.frame);
 
-    finishPresentedAnimationFrame(
-        &clock,
-        core,
-        first.panelTracks(),
-        100 + pardes.animation.Animation.frame_ns,
-    );
+    core.acknowledgePanelPresentation(first.panelTracks());
+    // Just short of a frame is no frame at all.
+    core.advance(100 + frame - 1);
+    _ = arena.reset(.retain_capacity);
+    for ((try core.render(arena.allocator())).panelTracks()) |track| try std.testing.expectEqual(@as(u16, 0), track.frame);
+    core.advance(100 + frame);
     _ = arena.reset(.retain_capacity);
     const second = try core.render(arena.allocator());
     try std.testing.expectEqual(track_count, second.panelTracks().len);
@@ -3742,7 +3705,6 @@ const Shell = struct {
     presented: bool = false,
     skipped_presents: u8 = 0,
     surface: ?*pardes.Surface = null,
-    animation_clock: AnimationClock = .{},
     saw_event: bool = false,
     dump_err: ?anyerror = null,
     retired_shells: [pardes.MAX_PANES]RetiredShell = @splat(.{}),
@@ -3832,6 +3794,7 @@ const Shell = struct {
 
     const vtable: pardes.Host.VTable = .{
         .wait_input = waitInput,
+        .now = guiNow,
         .present = present,
         .post_present = postPresent,
         .poll_frame = pollFrame,
@@ -3857,6 +3820,7 @@ const Shell = struct {
     const grid_vtable: pardes.Host.VTable = vt: {
         var v = vtable;
         v.wait_input = null;
+        v.now = null;
         v.poll_frame = gridPollFrame;
         v.present = gridPresent;
         v.post_present = gridPostPresent;
@@ -4106,20 +4070,16 @@ fn present(ctx: ?*anyopaque, surface: *const pardes.Surface) void {
 fn postPresent(ctx: ?*anyopaque) void {
     const s = shellOf(ctx);
     const g = s.gui orelse return;
-    if (!s.presented) {
-        // No image (a minimized window): time still passes, so a lingering
-        // message or a hover wait runs out instead of redrawing forever.
-        if (s.animation_clock.due(s.core.animationActive(), c.SDL_GetTicksNS())) s.core.update(.tick);
-        return;
-    }
+    // No image (a minimized window) shows no tracks; time still passes and
+    // the pump advances it all the same.
+    if (!s.presented) return;
     const frame = s.surface orelse return;
     refreshPresentedPointer(g, s.core);
-    finishPresentedAnimationFrame(
-        &s.animation_clock,
-        s.core,
-        frame.panelTracks(),
-        c.SDL_GetTicksNS(),
-    );
+    s.core.acknowledgePanelPresentation(frame.panelTracks());
+}
+
+fn guiNow(_: ?*anyopaque) u64 {
+    return c.SDL_GetTicksNS();
 }
 
 fn gridPollFrame(ctx: ?*anyopaque) void {
@@ -4129,8 +4089,10 @@ fn gridPollFrame(ctx: ?*anyopaque) void {
         if (f.tick().count != 0) s.saw_event = true;
     }
     pollCwds(s.core, s.ptys);
-    if (s.core.animationActive()) {
-        s.core.update(.tick);
+    // Grid time is virtual: each poll moves it straight to the core's
+    // next wake, a frame at a time while anything moves.
+    if (s.core.nextWake()) |due| {
+        s.core.advance(due);
         s.saw_event = true;
     }
 }
diff --git a/src/host_io.zig b/src/host_io.zig
index 6009c00f..f1a4eb98 100644
--- a/src/host_io.zig
+++ b/src/host_io.zig
@@ -12,6 +12,9 @@ pub const Host = struct {
 
     pub const VTable = struct {
         wait_input: ?*const fn (ctx: ?*anyopaque, timeout_ms: u32) void = null,
+        /// The shell's monotonic clock in ns: the only time the core sees.
+        /// Without one, core animation moves only by `.tick` events.
+        now: ?*const fn (ctx: ?*anyopaque) u64 = null,
         present: ?*const fn (ctx: ?*anyopaque, surface: *const pardes.Surface) void = null,
         post_present: ?*const fn (ctx: ?*anyopaque) void = null,
         poll_frame: ?*const fn (ctx: ?*anyopaque) void = null,
@@ -39,6 +42,20 @@ pub const Host = struct {
     };
 };
 
+/// The shells' monotonic clock in ns, the one `Host.now` answers with.
+/// PARDES_TEST_CLOCK makes a shell answer a virtual clock instead, moved
+/// only when a timed wait runs out -- straight to the core's next wake -- so
+/// the snapshot harness sees the same frames whatever the machine's load.
+pub fn monotonicNs() u64 {
+    var ts: libc.timespec = undefined;
+    if (libc.clock_gettime(.MONOTONIC, &ts) != 0) return 0;
+    return @as(u64, @intCast(ts.sec)) * std.time.ns_per_s + @as(u64, @intCast(ts.nsec));
+}
+
+pub fn testClock() ?u64 {
+    return if (libc.getenv("PARDES_TEST_CLOCK")) |v| (if (std.mem.span(v).len != 0) 0 else null) else null;
+}
+
 pub const Fallback = struct {
     pub const dump_path = "pardes.dump.zon";
 
diff --git a/src/macos.zig b/src/macos.zig
index 854b24f8..fce0a53e 100644
--- a/src/macos.zig
+++ b/src/macos.zig
@@ -118,7 +118,7 @@ const scene_frame_hz: u32 = 60;
 
 const scene_wrap_ns: u64 = 4096 * std.time.ns_per_s;
 
-const max_tick_catch_up_ns: u64 = 4 * pardes.animation.Animation.frame_ns;
+const max_tick_catch_up_ns: u64 = 4 * pardes.animation.frame_ns;
 const theme_watch_pane: u8 = @intCast(pardes.MAX_PANES);
 const watch_slot_count = pardes.MAX_PANES + 1;
 
@@ -870,18 +870,18 @@ const TickSpend = struct { elapsed_ns: u64, steps: u32, bank_ns: u64 };
 
 fn spendTickTime(previous_ns: u64, now_ns: u64, bank_ns: u64) TickSpend {
     const measured = if (previous_ns == 0 or now_ns <= previous_ns)
-        pardes.animation.Animation.frame_ns
+        pardes.animation.frame_ns
     else
         now_ns - previous_ns;
     const elapsed = @min(measured, max_tick_catch_up_ns);
     var bank = bank_ns +| elapsed;
     var steps: u32 = 0;
-    while (bank >= pardes.animation.Animation.frame_ns) : (steps += 1) bank -= pardes.animation.Animation.frame_ns;
+    while (bank >= pardes.animation.frame_ns) : (steps += 1) bank -= pardes.animation.frame_ns;
     return .{ .elapsed_ns = elapsed, .steps = steps, .bank_ns = bank };
 }
 
 test "the animation clock spends real time, not callbacks" {
-    const frame = pardes.animation.Animation.frame_ns;
+    const frame = pardes.animation.frame_ns;
     const expectEqual = std.testing.expectEqual;
 
     const first = spendTickTime(0, 999 * std.time.ns_per_s, 0);
diff --git a/src/pardes.zig b/src/pardes.zig
index bfd8a4f6..161a047c 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -3337,9 +3337,9 @@ test "vertical close samples only a canonical baseline containing that pane" {
         defer p.deinit();
         var frame = std.heap.ArenaAllocator.init(std.testing.allocator);
         defer frame.deinit();
+        p.settings.panel_transition = .vertical;
         const boot = try p.render(frame.allocator());
         p.acknowledgePanelPresentation(boot.panelTracks());
-        p.settings.panel_transition = .vertical;
 
         _ = try p.newShell(1, "");
         try std.testing.expect(layout.splitColumn(p, 0, 1, false));
@@ -3360,9 +3360,9 @@ test "vertical close samples only a canonical baseline containing that pane" {
         defer p.deinit();
         var frame = std.heap.ArenaAllocator.init(std.testing.allocator);
         defer frame.deinit();
+        p.settings.panel_transition = .vertical;
         const boot = try p.render(frame.allocator());
         p.acknowledgePanelPresentation(boot.panelTracks());
-        p.settings.panel_transition = .vertical;
 
         _ = try p.newShell(1, "");
         try std.testing.expect(layout.splitColumn(p, 0, 1, false));
@@ -3386,9 +3386,9 @@ test "previous-grid animation refreshes its mask and snaps overlapping layout ch
     defer p.deinit();
     var frame = std.heap.ArenaAllocator.init(std.testing.allocator);
     defer frame.deinit();
+    p.settings.panel_transition = .vertical;
     const boot = try p.render(frame.allocator());
     p.acknowledgePanelPresentation(boot.panelTracks());
-    p.settings.panel_transition = .vertical;
 
     _ = try p.newShell(1, "");
     try std.testing.expect(layout.splitColumn(p, 0, 1, false));
@@ -3875,6 +3875,13 @@ pub const Pardes = struct {
     /// Set by a shell whose present was skipped (no swapchain image): the
     /// frame is still owed, and the next pump draws it again.
     present_skipped: bool = false,
+    /// Core time. `now_ns` is the shell's monotonic clock as `advance` was
+    /// last given it; `stepped_ns` is how far animation has been stepped
+    /// along it, in whole frames of `animation.frame_ns`. Idle, the two are
+    /// the same instant.
+    now_ns: u64 = 0,
+    stepped_ns: u64 = 0,
+    clock_started: bool = false,
     /// Builtins announce themselves on the message row. Off while startup
     /// configuration is applied: those lines are nobody clicking, and should
     /// not leave the row holding the name of the last one.
@@ -4647,7 +4654,17 @@ pub const Pardes = struct {
     pub fn pump(p: *Pardes, h: Host) !void {
         p.host = h;
         const v = h.vtable;
-        if (v.wait_input) |f| f(h.ctx, if (p.animationActive()) animation.Animation.frame_ms else 0);
+        if (v.wait_input) |f| {
+            // Asleep until input or until core animation next needs a
+            // frame; 0 is no timeout at all.
+            const timeout: u32 = if (p.nextWake()) |due| wake: {
+                const now = if (v.now) |clock| clock(h.ctx) else p.now_ns;
+                const ms = ((due -| now) + std.time.ns_per_ms - 1) / std.time.ns_per_ms;
+                break :wake @intCast(std.math.clamp(ms, 1, std.math.maxInt(u32)));
+            } else 0;
+            f(h.ctx, timeout);
+        }
+        if (v.now) |clock| p.advance(clock(h.ctx));
         while (p.nextQueued()) |ev| p.update(ev);
         while (p.nextEffect()) |e| p.perform(e);
         turn.settle();
@@ -4657,7 +4674,9 @@ pub const Pardes = struct {
         // Nothing to draw: do not spend a frame, and above all do not block on
         // the display for one. This is what keeps the frame rate governing
         // rendering and nothing else.
-        if (!p.needs_frame and !p.animationActive()) return;
+        // A shell with a clock draws what `advance` stepped; one without
+        // steps its own `.tick`s and draws while anything animates.
+        if (!p.needs_frame and (v.now != null or !p.animationActive())) return;
         _ = p.frame_arena.reset(.retain_capacity);
         const surface = try p.render(p.frame_arena.allocator());
         if (v.present) |f| f(h.ctx, surface);
@@ -5717,18 +5736,85 @@ pub const Pardes = struct {
         return &p.chrome_animation.displayed;
     }
 
-    /// Whether an idle frontend should schedule another tick. All frame-based
-    /// core work belongs in this one predicate so TTY and GUI mature it alike.
-    pub fn animationActive(p: *const Pardes) bool {
-        if (p.chrome_animation.isActive() or p.look_hover_wait != null) return true;
+    /// When core animation next needs a frame, on the `stepped_ns`
+    /// timeline: a frame from now while anything moves, the end of the
+    /// wait while something only waits (a message lingering, a look-hover
+    /// delay), null when nothing is animating. Every frame-based animation
+    /// the core owns is in this one list, which is what lets every shell
+    /// sleep exactly as long as nothing changes.
+    pub fn nextWake(p: *const Pardes) ?u64 {
+        const next = p.stepped_ns + animation.frame_ns;
+        if (p.chrome_animation.isActive() or p.presentation.animating()) return next;
+        const scene = p.settings.scene_effects;
+        if (scene.crt or scene.ripple or scene.glitch) return next;
+        var frames: ?u64 = null;
+        if (p.look_hover_wait) |waiting| {
+            const delay = config.look_preview_delay_frames orelse return next;
+            frames = @max(1, delay -| waiting.frames);
+        }
         for (p.panes) |slot| if (slot) |pane| {
-            if (Messages.messagesAnimating(pane)) return true;
+            const wait = Messages.messageWake(p, pane) orelse continue;
+            frames = if (frames) |soonest| @min(soonest, wait) else wait;
         };
-        const scene = p.settings.scene_effects;
-        if (scene.crt or scene.ripple or scene.glitch) return true;
-        return p.presentation.animating();
+        return if (frames) |n| p.stepped_ns + n * animation.frame_ns else null;
     }
 
+    /// For shells that only need a yes or no: macOS and the board, which
+    /// keep their own frame banks.
+    pub fn animationActive(p: *const Pardes) bool {
+        return p.nextWake() != null;
+    }
+
+    /// Bring core animation up to `now_ns`, the shell's monotonic clock: one
+    /// `.tick` for every whole frame that has passed since it last stood
+    /// still, so an animation takes as long on a 144 Hz display, over ssh or
+    /// after a slow frame as it does anywhere. A wait (a message lingering,
+    /// the look-hover delay) is jumped to its end in one step and drawn
+    /// once. Idle, time is not banked: the next animation starts from now.
+    pub fn advance(p: *Pardes, now_ns: u64) void {
+        // The first time a shell's clock is seen, core time starts there.
+        const started = p.clock_started;
+        p.clock_started = true;
+        p.now_ns = now_ns;
+        if (!started) p.stepped_ns = now_ns;
+        const frame = animation.frame_ns;
+        var moving: u32 = 0;
+        while (p.nextWake()) |due| {
+            if (due > now_ns) break;
+            // Only waiting until `due`: its counters move there at once.
+            const held = (due - p.stepped_ns) / frame;
+            if (held > 1) {
+                Messages.holdMessages(p, held - 1);
+                if (p.look_hover_wait) |*waiting| waiting.frames +|= @intCast(@min(held - 1, std.math.maxInt(u16)));
+                p.stepped_ns += (held - 1) * frame;
+            }
+            // Back from a stall, the moving frames it missed are not all
+            // run at once: the rest are stepped from now, at their pace.
+            if (moving == max_catch_up_frames) {
+                p.stepped_ns = now_ns;
+                return;
+            }
+            moving += 1;
+            p.stepped_ns += frame;
+            p.update(.tick);
+            // A stepped frame is a frame to draw. (A `.tick` does not ask
+            // for one itself: the last frame of a fade used never to be
+            // drawn.)
+            p.needs_frame = true;
+        } else {
+            p.stepped_ns = now_ns;
+            return;
+        }
+        // A 60 Hz display frame is 16.67 ms and ours 16: without this, every
+        // 24th display frame would take two steps, a hitch in every fade.
+        // An overshoot this small is let go; a larger one (144 Hz lands 4.8
+        // ms past) is kept, so the average rate stays right.
+        if (moving > 0 and now_ns - p.stepped_ns < vsync_slack_ns) p.stepped_ns = now_ns;
+    }
+
+    pub const vsync_slack_ns = 1500 * std.time.ns_per_us;
+    pub const max_catch_up_frames = 240;
+
     pub fn noteHaptic(p: *Pardes, pulse: Haptic) void {
         if (comptime platform != .macos) return;
         if (p.haptic == .look) return;
@@ -6751,9 +6837,9 @@ test "board heap: transition grids fit the budget and the surface borrows its sn
     defer p.deinit();
     var frame: std.heap.ArenaAllocator = .init(std.testing.allocator);
     defer frame.deinit();
+    p.settings.panel_transition = .vertical;
     const boot = try p.render(frame.allocator());
     p.acknowledgePanelPresentation(boot.panelTracks());
-    p.settings.panel_transition = .vertical;
     _ = try p.newShell(1, "");
     try std.testing.expect(layout.splitColumn(p, 0, 1, false));
     p.sync();
@@ -6864,3 +6950,40 @@ test "jump history terminal rectangle follows output and clears on reflow" {
     try std.testing.expect(pane.pointerSelection(pane.sel[0]) == null);
     try std.testing.expectEqual(.none, pane.sel[0].state);
 }
+
+test "core animation keeps wall time at 60, 120 and 144 Hz and across a stall" {
+    const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 80, .rows = 24 });
+    defer p.deinit();
+    const frame = animation.frame_ns;
+    // Something that animates for as long as it is on.
+    p.settings.scene_effects.crt = true;
+    for ([_]u64{ 60, 120, 144 }) |hz| {
+        const start: u64 = 5 * std.time.ns_per_s;
+        p.clock_started = false;
+        p.advance(start);
+        var steps: u64 = 0;
+        var at: u64 = 1;
+        while (at <= hz) : (at += 1) {
+            const before = p.stepped_ns;
+            p.advance(start + at * std.time.ns_per_s / hz);
+            const taken = (p.stepped_ns - before + frame / 2) / frame;
+            // Never two steps in one display frame: that is a visible hitch.
+            try std.testing.expect(taken <= 1);
+            steps += taken;
+        }
+        switch (hz) {
+            // One step a display frame, every display frame.
+            60 => try std.testing.expectEqual(@as(u64, 60), steps),
+            120 => try std.testing.expectEqual(@as(u64, 60), steps),
+            // The frame's own rate: 62 a second, give or take one.
+            else => try std.testing.expect(steps >= 61 and steps <= 63),
+        }
+    }
+    // A stall of minutes is not minutes of frames.
+    const before = p.stepped_ns;
+    p.advance(before + 600 * std.time.ns_per_s);
+    try std.testing.expectEqual(before + 600 * std.time.ns_per_s, p.stepped_ns);
+    p.settings.scene_effects.crt = false;
+    p.advance(p.stepped_ns + frame);
+    try std.testing.expectEqual(@as(?u64, null), p.nextWake());
+}
diff --git a/src/tty/tty.zig b/src/tty/tty.zig
index 66e551b1..6083f609 100644
--- a/src/tty/tty.zig
+++ b/src/tty/tty.zig
@@ -76,7 +76,8 @@ pub const Command = struct {
     pub var value: union(enum) {
         nop,
         quit,
-        tick,
+        /// A timed wait ran out: the core's next wake has come.
+        wake,
         key_press: vaxis.Key,
         pty_read: struct { id: usize, gen: u32, bytes: []u8 },
         pty_eof: struct { id: usize, gen: u32 },
@@ -728,6 +729,7 @@ fn localSession(
         .paste_buf = paste_buf,
         .inotify_fd = file_watch.init(false),
         .fs = fs,
+        .test_clock = host_io.testClock(),
     };
     pardes.lsp.setStatusSink(&sh, lspStatusSink);
     defer {
@@ -775,7 +777,7 @@ fn localSession(
     try startInput(loop, input_cache);
     defer if (attached.* == null) stopInput(loop);
     (try std.Thread.spawn(.{}, winchWatch, .{ loop, vx, tty })).detach();
-    (try std.Thread.spawn(.{}, tickWatch, .{ io, loop })).detach();
+    (try std.Thread.spawn(.{}, wakeWatch, .{ io, loop })).detach();
     if (fs) |f| try f.watch(loop, wakeFs);
     try vx.queryTerminalSend(tty.writer());
 
@@ -900,6 +902,10 @@ const Shell = struct {
     check_files: bool = false,
     in_paste: bool = false,
     tracks: []const pardes.animation.Track = &.{},
+    /// PARDES_TEST_CLOCK's virtual time (host_io.testClock), and where the
+    /// running-out wait moves it: the core's next wake.
+    test_clock: ?u64 = null,
+    wake_to: u64 = 0,
 
     fn of(ctx: ?*anyopaque) *Shell {
         return @ptrCast(@alignCast(ctx.?));
@@ -911,12 +917,14 @@ const Shell = struct {
 
     const isolated_vtable: host_io.Host.VTable = .{
         .wait_input = waitInput,
+        .now = clockNow,
         .present = present,
         .post_present = postPresent,
     };
 
     const vtable: host_io.Host.VTable = .{
         .wait_input = waitInput,
+        .now = clockNow,
         .present = present,
         .post_present = postPresent,
         .poll_frame = pollFrame,
@@ -939,12 +947,20 @@ const Shell = struct {
         .pipe = pipe,
     };
 
+    fn clockNow(ctx: ?*anyopaque) u64 {
+        const s = of(ctx);
+        return s.test_clock orelse host_io.monotonicNs();
+    }
+
     fn waitInput(ctx: ?*anyopaque, timeout_ms: u32) void {
         const s = of(ctx);
         var batch: usize = 0;
-        // The wait is the 9P connections' turn with the core. Animating, the
-        // frame's tick arrives through the same queue (`tickWatch`).
-        if (timeout_ms != 0) tick_request.set(s.io);
+        // The wait is the 9P connections' turn with the core. A timeout (the
+        // core's next wake) arrives through the same queue (`wakeWatch`).
+        if (timeout_ms != 0) {
+            s.wake_to = s.core.nextWake() orelse 0;
+            requestWake(s.io, timeout_ms);
+        }
         pardes.turn.rest();
         const first = s.loop.nextEvent() catch {
             pardes.turn.wake();
@@ -984,7 +1000,9 @@ const Shell = struct {
         defer tz_event.end();
         switch (event) {
             .nop => {},
-            .tick => core.update(.tick),
+            .wake => if (s.test_clock) |*virtual| {
+                virtual.* = @max(virtual.*, s.wake_to);
+            },
             .quit => {
                 core.quit = true;
                 return true;
@@ -1523,21 +1541,77 @@ fn winchWatch(loop: *Loop, vx: *vaxis.Vaxis, tty: *vaxis.Tty) void {
     }
 }
 
-/// Set by an animating frame's wait: post one `.tick` a frame from now. The
-/// tick joins the input queue, so a key or a click that lands inside the
-/// frame is handled at once instead of after a blind sleep.
-var tick_request: std.Io.Event = .unset;
+/// A wait with a timeout: post one `.wake` when it runs out. The wake joins
+/// the input queue, so a key or a click that lands first is handled at once
+/// instead of after a blind sleep; vaxis's queue has no timed wait. Each
+/// request bumps `wake_gen`, which cuts short a sleep still timing an
+/// earlier, longer request (an 800 ms linger interrupted by a key that
+/// starts a 16 ms fall) and times the new one instead.
+var wake_gen: std.atomic.Value(u32) = .init(0);
+var wake_ms: std.atomic.Value(u32) = .init(0);
+
+fn requestWake(io: std.Io, ms: u32) void {
+    wake_ms.store(ms, .release);
+    _ = wake_gen.fetchAdd(1, .acq_rel);
+    io.futexWake(u32, &wake_gen.raw, 1);
+}
+
+fn wakeWatch(io: std.Io, loop: *Loop) void {
+    var seen = wake_gen.load(.acquire);
+    while (true) {
+        // Asleep until a request.
+        while (wake_gen.load(.acquire) == seen) io.futexWaitUncancelable(u32, &wake_gen.raw, seen);
+        seen = wake_gen.load(.acquire);
+        if (timeWake(io, &seen)) loop.postEvent(.wake) catch {};
+    }
+}
 
-fn tickWatch(io: std.Io, loop: *Loop) void {
+/// Sleep out the latest request; true when it ran its course, false when
+/// none is pending. A newer request met on the way restarts the timing.
+fn timeWake(io: std.Io, seen: *u32) bool {
     while (true) {
-        tick_request.waitUncancelable(io);
-        tick_request.reset();
-        var ts: libc.timespec = .{ .sec = 0, .nsec = @as(isize, pardes.animation.Animation.frame_ms) * std.time.ns_per_ms };
-        _ = libc.nanosleep(&ts, null);
-        loop.postEvent(.tick) catch {};
+        const ms = wake_ms.load(.acquire);
+        const deadline = host_io.monotonicNs() + @as(u64, ms) * std.time.ns_per_ms;
+        while (true) {
+            const now = host_io.monotonicNs();
+            if (now >= deadline) return true;
+            io.futexWaitTimeout(u32, &wake_gen.raw, seen.*, .{ .duration = .{
+                .raw = .fromNanoseconds(@intCast(deadline - now)),
+                .clock = .awake,
+            } }) catch {};
+            const gen = wake_gen.load(.acquire);
+            if (gen != seen.*) {
+                seen.* = gen;
+                break;
+            }
+        }
     }
 }
 
+test "a short wake request cuts short a long one still sleeping" {
+    const io = std.testing.io;
+    var seen = wake_gen.load(.acquire);
+    requestWake(io, 800);
+    seen = wake_gen.load(.acquire);
+    const Timer = struct {
+        fn run(timer_io: std.Io, start_seen: u32, done: *std.atomic.Value(u64)) void {
+            var local = start_seen;
+            _ = timeWake(timer_io, &local);
+            done.store(host_io.monotonicNs(), .release);
+        }
+    };
+    var done: std.atomic.Value(u64) = .init(0);
+    const start = host_io.monotonicNs();
+    const thread = try std.Thread.spawn(.{}, Timer.run, .{ io, seen, &done });
+    var pause: std.c.timespec = .{ .sec = 0, .nsec = 50 * std.time.ns_per_ms };
+    _ = std.c.nanosleep(&pause, null);
+    requestWake(io, 16);
+    thread.join();
+    // The 16 ms request lands about 66 ms in: well before the 800 ms one
+    // would have, however loaded the machine.
+    try std.testing.expect(done.load(.acquire) - start < 700 * std.time.ns_per_ms);
+}
+
 fn wakeFs(ctx: ?*anyopaque) void {
     const loop: *Loop = @ptrCast(@alignCast(ctx.?));
     _ = loop.tryPostEvent(.fs_ready) catch {};
@@ -1822,7 +1896,7 @@ const Attach = struct {
 
     fn apply(a: *Attach, event: @TypeOf(Command.value)) ?AttachEnd {
         switch (event) {
-            .nop, .tick, .fs_ready, .lsp_done, .lsp_status, .pipe_done, .pty_read, .pty_eof, .files_changed => {},
+            .nop, .wake, .fs_ready, .lsp_done, .lsp_status, .pipe_done, .pty_read, .pty_eof, .files_changed => {},
             .quit => return .none,
             .focus_in => {},
             .focus_out => return a.send(.pointer_leave),
diff --git a/src/web.zig b/src/web.zig
index b77d07a6..532e3794 100644
--- a/src/web.zig
+++ b/src/web.zig
@@ -1,7 +1,7 @@
 //! Freestanding WebAssembly boundary for the DOM backend.
 //!
 //! JavaScript owns the clock and nothing else: it calls `pardes_tick` (one
-//! `Pardes.pump`) and reads the packed cell buffer `present` left behind. The
+//! `Pardes.pump`, at requestAnimationFrame's timestamp) and reads the packed cell buffer `present` left behind. The
 //! host vtable below is only what a page genuinely has — pixels, the
 //! clipboard, links, downloads. Processes, a real filesystem, a language
 //! backend and subprocess pipes are left null, so the core answers them itself
@@ -106,6 +106,9 @@ const State = struct {
     frame_len: usize = 0,
     frame_cols: u16 = 0,
     frame_rows: u16 = 0,
+    /// requestAnimationFrame's timestamp as the last tick gave it, in ns:
+    /// the core's clock (`Host.now`).
+    now_ns: u64 = 0,
 
     fn init(cols: u16, rows: u16) !State {
         const allocs = pardes.memory.init(gpa);
@@ -276,30 +279,19 @@ export fn pardes_pointer_leave() void {
     s.core.update(.pointer_leave);
 }
 
-/// One iteration of the core's own loop: queued input, effects, render,
-/// present. JS calls it once per animation frame, after spending that frame's
-/// animation ticks.
-export fn pardes_tick() void {
+/// One iteration of the core's own loop: queued input, effects, the frames
+/// of animation `timestamp_ms` (requestAnimationFrame's clock) has brought,
+/// render, present. JS calls it once per display frame; a call with no
+/// timestamp (NaN) leaves the clock where it was.
+export fn pardes_tick(timestamp_ms: f64) void {
     const s = &(state orelse return);
+    if (std.math.isFinite(timestamp_ms) and timestamp_ms >= 0)
+        s.now_ns = @intFromFloat(timestamp_ms * std.time.ns_per_ms);
     s.core.pump(host(s)) catch |err| {
         last_error = @intFromError(err);
     };
 }
 
-/// Spend one fixed 60 Hz animation step, the only writer of animated time in
-/// this host. Separate from the pump for the reason the AppKit shell keeps them
-/// separate: if every input pump also advanced the transition, a burst of keys
-/// would collapse a ten-frame fade into one display frame.
-export fn pardes_animation_tick() void {
-    const s = &(state orelse return);
-    s.core.update(.tick);
-}
-
-export fn pardes_animating() u32 {
-    const s = &(state orelse return 0);
-    return @intFromBool(s.core.animationActive());
-}
-
 /// The Exit builtin, or the last pane closing. JS stops its frame loop.
 export fn pardes_should_quit() u32 {
     const s = &(state orelse return 0);
@@ -462,7 +454,13 @@ extern "pardes" fn host_download(
     bytes_len: usize,
 ) callconv(.c) void;
 
+fn now(ctx: ?*anyopaque) u64 {
+    const s: *State = @ptrCast(@alignCast(ctx.?));
+    return s.now_ns;
+}
+
 const vtable: pardes.Host.VTable = .{
+    .now = now,
     .present = present,
     .write_file = writeFile,
     .write_dump = writeDump,
diff --git a/src/web/app.mjs b/src/web/app.mjs
index 11d8f228..280239d5 100644
--- a/src/web/app.mjs
+++ b/src/web/app.mjs
@@ -1,7 +1,5 @@
 const CELL_SIZE = 20;
 const ATTR_TAGLINE = 1 << 7;
-const ANIMATION_FRAME_MS = 1000 / 60;
-const MAX_ANIMATION_TICKS = 4;
 const DEFAULT_FG = "#cccccc";
 const DEFAULT_BG = "#121212";
 const decoder = new TextDecoder();
@@ -325,7 +323,6 @@ export class PardesRuntime {
     this.running = false;
     this.pointer = null;
     this.frameHandle = 0;
-    this.animationClock = { last: null, lag: 0 };
     this.bindEvents();
   }
 
@@ -338,7 +335,6 @@ export class PardesRuntime {
     this.wasm.pardes_tick();
     this.renderer.render();
     this.running = true;
-    this.animationClock = { last: null, lag: 0 };
     this.frameHandle = requestAnimationFrame((timestamp) => this.frame(timestamp));
     this.root.focus({ preventScroll: true });
   }
@@ -355,13 +351,9 @@ export class PardesRuntime {
       this.resize();
       this.root.style.setProperty("--pardes-tagline-font-size", `${this.measuredTaglinePercent}%`);
     }
-    // JS owns the animation clock; the pump that follows applies those ticks,
-    // runs the core's effects and presents one frame however fast the display
-    // is. Both halves are needed: an idle core still has input and effects.
-    for (let ticks = animationTicks(this.animationClock, timestamp); ticks > 0; ticks -= 1) {
-      this.wasm.pardes_animation_tick();
-    }
-    this.wasm.pardes_tick();
+    // The core's clock is this timestamp: it steps its own animations
+    // by it, however fast the display refreshes.
+    this.wasm.pardes_tick(timestamp);
     if (this.wasm.pardes_should_quit()) this.running = false;
     this.renderer.render();
     this.frameHandle = requestAnimationFrame((nextTimestamp) => this.frame(nextTimestamp));
@@ -559,28 +551,6 @@ export class PardesRuntime {
   }
 }
 
-/// Spend monotonic requestAnimationFrame time as fixed 60 Hz core ticks. A
-/// high-refresh display therefore renders repeated states rather than making
-/// frame-count transitions run twice as fast. Long suspension is capped so a
-/// returning tab cannot execute an unbounded loop before drawing.
-export function animationTicks(clock, timestamp) {
-  if (!Number.isFinite(timestamp)) return 0;
-  if (clock.last === null || timestamp < clock.last) {
-    clock.last = timestamp;
-    clock.lag = 0;
-    return 0;
-  }
-  const elapsed = Math.min(timestamp - clock.last, ANIMATION_FRAME_MS * MAX_ANIMATION_TICKS);
-  clock.last = timestamp;
-  clock.lag += elapsed;
-  const ticks = Math.min(MAX_ANIMATION_TICKS, Math.floor((clock.lag + 1e-7) / ANIMATION_FRAME_MS));
-  clock.lag -= ticks * ANIMATION_FRAME_MS;
-  return ticks;
-}
-
-/// The four things the core asks the page for, as the module's imports. The
-/// holder exists because the import object has to be built before the instance
-/// whose memory those imports read.
 export function browserHost() {
   const host = { wasm: null };
   const view = (ptr, len) => new Uint8Array(host.wasm.memory.buffer, ptr, len);
diff --git a/test/gui-goldens.txt b/test/gui-goldens.txt
index 5531b578..73aa1f86 100644
--- a/test/gui-goldens.txt
+++ b/test/gui-goldens.txt
@@ -3,8 +3,8 @@
 03-notice 4d59205fe6b89a4589e94c68521257f21b40917c0198ea20248925687663d9f5
 04-context-rows-mid-thumb 7129ee318975f858c430b1e610b26ca756d5bb37553338c0dc6caab2290de2a4
 05-body-selection 39103f3747aae07a12b5151e7e377430b88b96e504670ac2f2d0272197eb827b
-06-tag-focus-selection 2bedec24842109aa2cc302226d53a994ff547791ad54d5781fe48d8eaac179ac
-07-prompt-notice 6d6eda3f3a74d3ff048cb0e433e3794ca061e356184ff62a4878395c58482727
+06-tag-focus-selection 6a7f50e292f4ede92df24a817218818b93a01fd15fcf39467cf06c3772077834
+07-prompt-notice d5cdacd74ae6d29834f0b09a607bfce5a2ca8a549c259be50b76a57a2d2d3271
 08-wide-glyph-edges 123a182b82a2a8c455291a5c89ccfa28e1f8ce9566172ca404c0b9c71dd33b48
 09-collapsed-focus-tint ae66076fdfb0cab9a906b052df257deee5ba91a6274712d52a76d8a7adc5b415
 10-tagbottom dd8ba0d3ecabf3420d000b0c9591a57278179cbd2a9060f849d283f3881d1847
@@ -12,5 +12,5 @@
 12-multiline-tag 1b9ccd331814dc76111470f18448b1ca192e1edc3d79ea6eee19a6a78a4b1831
 13-image de18edee2ab2e0f2d4bf4162d86e3d8a1852fccfc344830491fa1a359095d4ea
 14-theme-ink 6e733d4212373c90b860b2e41102ced8719b07480591b5da3905267c8358db18
-15-theme-acme-light 39f9256b7c8ed5187cd8d2cc3840db274efcecad263e519c4f9c79eb9efea19c
+15-theme-acme-light e099dc1a351de8efa63ecd0ec0899636ea31b722a945eb40137a18abd87a82e2
 16-debug e97ce74b7a3d4a08f6a529b1f0de111d62e5532c829a6b1633b966dd45218f55
diff --git a/test/gui_golden.py b/test/gui_golden.py
index 6586af3a..1252014c 100644
--- a/test/gui_golden.py
+++ b/test/gui_golden.py
@@ -89,7 +89,9 @@ def run(args):
     name = 'gui-golden'
     config = root / 'config/pardes'
     config.mkdir(parents=True)
-    (config / 'init').write_text('Shell /bin/sh\nTheme forge\n')
+    # No linger: a dismissed message is gone, not caught part way, when a
+    # scene settles.
+    (config / 'init').write_text('Shell /bin/sh\nTheme forge\nMessageLinger 0\n')
     source = root / 'shapes.zig'
     source.write_bytes(ZIG)
     notes = root / 'notes.txt'
diff --git a/test/pdf.zig b/test/pdf.zig
index ed5d6908..93418727 100644
--- a/test/pdf.zig
+++ b/test/pdf.zig
@@ -1400,7 +1400,7 @@ test "PDF tint and tinted theme changes rebuild every visible raster only" {
     // Chrome animation reads a separate palette. Its ticks must never disturb
     // the target-theme tint key or ask MuPDF for the same pixels again.
     try std.testing.expect(p.animationActive());
-    for (0..animation.Animation.transition_steps) |_| {
+    for (0..animation.transition_steps) |_| {
         p.update(.tick);
         _ = frame.reset(.retain_capacity);
         const tick_surface = try p.render(frame.allocator());
diff --git a/test/snapshot.zig b/test/snapshot.zig
index bdabb56e..53553657 100644
--- a/test/snapshot.zig
+++ b/test/snapshot.zig
@@ -579,6 +579,9 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const
     // views' durations (lsp_zls.zig hideTime) and the transient message row's
     // time of day (message.zig stamp)
     _ = setenv("PARDES_NOTIME", "1", 1);
+    // A virtual core clock: animation moves a frame per timed-out wait,
+    // whatever the machine's load (host_io.testClock).
+    _ = setenv("PARDES_TEST_CLOCK", "1", 1);
     // The protocol client must be HERMETIC under the harness: `.rs` files
     // speak to the deterministic mock when the build handed one over, and
     // every other spec is disabled outright — a script that opened a stray
diff --git a/test/snapshots/theme.golden b/test/snapshots/theme.golden
index 51bb77ff..02750663 100644
--- a/test/snapshots/theme.golden
+++ b/test/snapshots/theme.golden
@@ -53,178 +53,174 @@
 |30: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 d,#608269, 51-51 d,#0d1410, 52-99 #e5eee5,#0d1410,
 == snap dusk grid=100x31 cursor=4,5
 == style dusk grid=100x31
-|0: 0-50 #c4b7c4,#2b262f, 51-59 #fff0eb,#654053, 60-70 #c4b7c4,#2b262f, 71-99 d,#2b262f,
-|1: 0-1 #ffffff,#77795e, 2-2 d,#39303a, 3-34 #d0c3d0,#39303a, 35-49 d,#39303a, 50-51 #ffffff,#77795e, 52-52 d,#2b262f, 53-84 #c4b7c4,#2b262f, 85-99 d,#2b262f,
-|2: 0-1 #000000,#e7b491, 2-2 d,#39303a, 3-29 #d0c3d0,#39303a, 30-32 #a7d3c7,#39303a, 33-49 #d0c3d0,#39303a, 50-51 #ffffff,#705667, 52-52 d,#2b262f, 53-79 #c4b7c4,#2b262f, 80-82 #9cc7bb,#2b262f, 83-99 #c4b7c4,#2b262f,
-|3: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|4: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|5: 0-0 d,#89697a, 1-49 d,#39323b, 50-50 d,#89697a, 51-99 d,#39323b,
-|6: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|7: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|8: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|9: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|10: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|11: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|12: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|13: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|14: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|15: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|16: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|17: 0-1 #ffffff,#705667, 2-2 d,#2b262f, 3-29 #c4b7c4,#2b262f, 30-32 #9cc7bb,#2b262f, 33-49 #c4b7c4,#2b262f, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|18: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|19: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|20: 0-0 d,#89697a, 1-49 d,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|21: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|22: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|23: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|24: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|25: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|26: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|27: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|28: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|29: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
-|30: 0-0 d,#89697a, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#89697a, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|0: 0-50 #c6b6c5,#2c2630, 51-59 #fff0eb,#654053, 60-70 #c6b6c5,#2c2630, 71-99 d,#2c2630,
+|1: 0-1 #ffffff,#757a5f, 2-2 d,#3b2f3b, 3-34 #d2c2d1,#3b2f3b, 35-49 d,#3b2f3b, 50-51 #ffffff,#757a5f, 52-52 d,#2c2630, 53-84 #c6b6c5,#2c2630, 85-99 d,#2c2630,
+|2: 0-1 #000000,#edb092, 2-2 d,#3b2f3b, 3-29 #d2c2d1,#3b2f3b, 30-32 #a1d5c4,#3b2f3b, 33-49 #d2c2d1,#3b2f3b, 50-51 #ffffff,#745469, 52-52 d,#2c2630, 53-79 #c6b6c5,#2c2630, 80-82 #96c9b8,#2c2630, 83-99 #c6b6c5,#2c2630,
+|3: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|4: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|5: 0-0 d,#8e667c, 1-49 d,#39323b, 50-50 d,#8e667c, 51-99 d,#39323b,
+|6: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|7: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|8: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|9: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|10: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|11: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|12: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|13: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|14: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|15: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|16: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|17: 0-1 #ffffff,#745469, 2-2 d,#2c2630, 3-29 #c6b6c5,#2c2630, 30-32 #96c9b8,#2c2630, 33-49 #c6b6c5,#2c2630, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|18: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|19: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|20: 0-0 d,#8e667c, 1-49 d,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|21: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|22: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|23: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|24: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|25: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|26: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|27: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|28: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|29: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
+|30: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 d,#8e667c, 51-51 d,#39323b, 52-99 #c3b6c1,#39323b,
 == snap ink grid=100x31 cursor=4,5
 == style ink grid=100x31
-|0: 0-50 #d4dfed,#17222c, 51-59 #ffffff,#1b547c, 60-70 #d4dfed,#17222c, 71-99 d,#17222c,
-|1: 0-1 #ffffff,#8c7d5b, 2-2 d,#253341, 3-34 #e0eaf5,#253341, 35-49 d,#253341, 50-51 #ffffff,#8c7d5b, 52-52 d,#17222c, 53-84 #d4dfed,#17222c, 85-99 d,#17222c,
-|2: 0-1 #000000,#90d4f4, 2-2 d,#253341, 3-29 #e0eaf5,#253341, 30-32 #f6e8b9,#253341, 33-49 #e0eaf5,#253341, 50-51 #ffffff,#61758c, 52-52 d,#17222c, 53-79 #d4dfed,#17222c, 80-82 #ecdead,#17222c, 83-99 #d4dfed,#17222c,
-|3: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|4: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|5: 0-0 d,#87a1bb, 1-49 d,#000000, 50-50 d,#87a1bb, 51-99 d,#000000,
-|6: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|7: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|8: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|9: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|10: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|11: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|12: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|13: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|14: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|15: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|16: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|17: 0-1 #ffffff,#61758c, 2-2 d,#17222c, 3-29 #d4dfed,#17222c, 30-32 #ecdead,#17222c, 33-49 #d4dfed,#17222c, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|18: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|19: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|20: 0-0 d,#87a1bb, 1-49 d,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|21: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|22: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|23: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|24: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|25: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|26: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|27: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|28: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|29: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
-|30: 0-0 d,#87a1bb, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#87a1bb, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|0: 0-50 #d5e4f1,#15212c, 51-59 #ffffff,#1b547c, 60-70 #d5e4f1,#15212c, 71-99 d,#15212c,
+|1: 0-1 #ffffff,#8f7d5b, 2-2 d,#223342, 3-34 #e1eef9,#223342, 35-49 d,#223342, 50-51 #ffffff,#8f7d5b, 52-52 d,#15212c, 53-84 #d5e4f1,#15212c, 85-99 d,#15212c,
+|2: 0-1 #000000,#86d8ff, 2-2 d,#223342, 3-29 #e1eef9,#223342, 30-32 #ffeab8,#223342, 33-49 #e1eef9,#223342, 50-51 #ffffff,#5f7990, 52-52 d,#15212c, 53-79 #d5e4f1,#15212c, 80-82 #f5e0ac,#15212c, 83-99 #d5e4f1,#15212c,
+|3: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|4: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|5: 0-0 d,#86a8c2, 1-49 d,#000000, 50-50 d,#86a8c2, 51-99 d,#000000,
+|6: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|7: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|8: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|9: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|10: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|11: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|12: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|13: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|14: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|15: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|16: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|17: 0-1 #ffffff,#5f7990, 2-2 d,#15212c, 3-29 #d5e4f1,#15212c, 30-32 #f5e0ac,#15212c, 33-49 #d5e4f1,#15212c, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|18: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|19: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|20: 0-0 d,#86a8c2, 1-49 d,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|21: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|22: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|23: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|24: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|25: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|26: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|27: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|28: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|29: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
+|30: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 d,#86a8c2, 51-51 d,#000000, 52-99 #f3f7fc,#000000,
 == snap paper grid=100x31 cursor=4,5
 == style paper grid=100x31
-|0: 0-50 #5f6f69,#d3d6d1, 51-59 #203e31,#c5e2d0, 60-70 #5f6f69,#d3d6d1, 71-99 d,#d3d6d1,
-|1: 0-1 #000000,#b89e7b, 2-2 d,#c9d3cd, 3-34 #596963,#c9d3cd, 35-49 d,#c9d3cd, 50-51 #000000,#b89e7b, 52-52 d,#d3d6d1, 53-84 #5f6f69,#d3d6d1, 85-99 d,#d3d6d1,
-|2: 0-1 #ffffff,#3e7b68, 2-2 d,#c9d3cd, 3-29 #596963,#c9d3cd, 30-32 #785580,#c9d3cd, 33-49 #596963,#c9d3cd, 50-51 #000000,#8aa194, 52-52 d,#d3d6d1, 53-79 #5f6f69,#d3d6d1, 80-82 #7f5b87,#d3d6d1, 83-99 #5f6f69,#d3d6d1,
-|3: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|4: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|5: 0-0 d,#869e90, 1-49 d,#f5f3ed, 50-50 d,#869e90, 51-99 d,#f5f3ed,
-|6: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|7: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|8: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|9: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|10: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|11: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|12: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|13: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|14: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|15: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|16: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|17: 0-1 #000000,#8aa194, 2-2 d,#d3d6d1, 3-29 #5f6f69,#d3d6d1, 30-32 #7f5b87,#d3d6d1, 33-49 #5f6f69,#d3d6d1, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|18: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|19: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|20: 0-0 d,#869e90, 1-49 d,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|21: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|22: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|23: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|24: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|25: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|26: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|27: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|28: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|29: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
-|30: 0-0 d,#869e90, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869e90, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|0: 0-50 #52625a,#e8eae3, 51-59 #203e31,#c5e2d0, 60-70 #52625a,#e8eae3, 71-99 d,#e8eae3,
+|1: 0-1 #000000,#bda27e, 2-2 d,#dce5dc, 3-34 #4a5a52,#dce5dc, 35-49 d,#dce5dc, 50-51 #000000,#bda27e, 52-52 d,#e8eae3, 53-84 #52625a,#e8eae3, 85-99 d,#e8eae3,
+|2: 0-1 #ffffff,#367157, 2-2 d,#dce5dc, 3-29 #4a5a52,#dce5dc, 30-32 #69447a,#dce5dc, 33-49 #4a5a52,#dce5dc, 50-51 #000000,#8fa594, 52-52 d,#e8eae3, 53-79 #52625a,#e8eae3, 80-82 #724c83,#e8eae3, 83-99 #52625a,#e8eae3,
+|3: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|4: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|5: 0-0 d,#869d8a, 1-49 d,#f5f3ed, 50-50 d,#869d8a, 51-99 d,#f5f3ed,
+|6: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|7: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|8: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|9: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|10: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|11: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|12: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|13: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|14: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|15: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|16: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|17: 0-1 #000000,#8fa594, 2-2 d,#e8eae3, 3-29 #52625a,#e8eae3, 30-32 #724c83,#e8eae3, 33-49 #52625a,#e8eae3, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|18: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|19: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|20: 0-0 d,#869d8a, 1-49 d,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|21: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|22: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|23: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|24: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|25: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|26: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|27: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|28: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|29: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
+|30: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 d,#869d8a, 51-51 d,#f5f3ed, 52-99 #303b3b,#f5f3ed,
 == snap daybreak grid=100x31 cursor=4,5
 == style daybreak grid=100x31
-|0: 0-50 #2d495e,#edf1f5, 51-59 #10364f,#b9dffb, 60-70 #2d495e,#edf1f5, 71-99 d,#edf1f5,
-|1: 0-1 #000000,#b89b7a, 2-2 d,#dfeaf1, 3-34 #254156,#dfeaf1, 35-49 d,#dfeaf1, 50-51 #000000,#b89b7a, 52-52 d,#edf1f5, 53-84 #2d495e,#edf1f5, 85-99 d,#edf1f5,
-|2: 0-1 #ffffff,#056392, 2-2 d,#dfeaf1, 3-29 #254156,#dfeaf1, 30-32 #542862,#dfeaf1, 33-49 #254156,#dfeaf1, 50-51 #000000,#7d9fb4, 52-52 d,#edf1f5, 53-79 #2d495e,#edf1f5, 80-82 #5c306a,#edf1f5, 83-99 #2d495e,#edf1f5,
-|3: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|4: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|5: 0-0 d,#69879e, 1-49 d,#ffffff, 50-50 d,#69879e, 51-99 d,#ffffff,
-|6: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|7: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|8: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|9: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|10: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|11: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|12: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|13: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|14: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|15: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|16: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|17: 0-1 #000000,#7d9fb4, 2-2 d,#edf1f5, 3-29 #2d495e,#edf1f5, 30-32 #5c306a,#edf1f5, 33-49 #2d495e,#edf1f5, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|18: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|19: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|20: 0-0 d,#69879e, 1-49 d,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|21: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|22: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|23: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|24: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|25: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|26: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|27: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|28: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|29: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
-|30: 0-0 d,#69879e, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#69879e, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|0: 0-50 #29465e,#edf2f7, 51-59 #10364f,#b9dffb, 60-70 #29465e,#edf2f7, 71-99 d,#edf2f7,
+|1: 0-1 #000000,#b79a7a, 2-2 d,#dfeaf3, 3-34 #213e56,#dfeaf3, 35-49 d,#dfeaf3, 50-51 #000000,#b79a7a, 52-52 d,#edf2f7, 53-84 #29465e,#edf2f7, 85-99 d,#edf2f7,
+|2: 0-1 #ffffff,#006198, 2-2 d,#dfeaf3, 3-29 #213e56,#dfeaf3, 30-32 #52255f,#dfeaf3, 33-49 #213e56,#dfeaf3, 50-51 #000000,#7b9eb7, 52-52 d,#edf2f7, 53-79 #29465e,#edf2f7, 80-82 #5a2d67,#edf2f7, 83-99 #29465e,#edf2f7,
+|3: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|4: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|5: 0-0 d,#6685a0, 1-49 d,#ffffff, 50-50 d,#6685a0, 51-99 d,#ffffff,
+|6: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|7: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|8: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|9: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|10: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|11: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|12: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|13: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|14: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|15: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|16: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|17: 0-1 #000000,#7b9eb7, 2-2 d,#edf2f7, 3-29 #29465e,#edf2f7, 30-32 #5a2d67,#edf2f7, 33-49 #29465e,#edf2f7, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|18: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|19: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|20: 0-0 d,#6685a0, 1-49 d,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|21: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|22: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|23: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|24: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|25: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|26: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|27: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|28: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|29: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
+|30: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 d,#6685a0, 51-51 d,#ffffff, 52-99 #142d40,#ffffff,
 == snap atelier grid=100x31 cursor=4,5
 == style atelier grid=100x31
-|0: 0-50 #3b5d56,#e5f0ee, 51-59 #35492d,#edf2a5, 60-70 #3b5d56,#e5f0ee, 71-99 d,#e5f0ee,
-|1: 0-1 #000000,#bca380, 2-2 d,#d4e7e1, 3-34 #33554e,#d4e7e1, 35-49 d,#d4e7e1, 50-51 #000000,#bca380, 52-52 d,#e5f0ee, 53-84 #3b5d56,#e5f0ee, 85-99 d,#e5f0ee,
-|2: 0-1 #ffffff,#317f70, 2-2 d,#d4e7e1, 3-29 #33554e,#d4e7e1, 30-32 #633c6a,#d4e7e1, 33-49 #33554e,#d4e7e1, 50-51 #000000,#92b7a4, 52-52 d,#e5f0ee, 53-79 #3b5d56,#e5f0ee, 80-82 #6c4473,#e5f0ee, 83-99 #3b5d56,#e5f0ee,
-|3: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|4: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|5: 0-0 d,#99aa7a, 1-49 d,#fffdeb, 50-50 d,#99aa7a, 51-99 d,#fffdeb,
-|6: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|7: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|8: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|9: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|10: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|11: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|12: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|13: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|14: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|15: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|16: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|17: 0-1 #000000,#92b7a4, 2-2 d,#e5f0ee, 3-29 #3b5d56,#e5f0ee, 30-32 #6c4473,#e5f0ee, 33-49 #3b5d56,#e5f0ee, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|18: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|19: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|20: 0-0 d,#99aa7a, 1-49 d,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|21: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|22: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|23: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|24: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|25: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|26: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|27: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|28: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|29: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-|30: 0-0 d,#99aa7a, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#99aa7a, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
-== snap colors-off grid=100x31 cursor=4,5
-|3:   ls                                       Colors   ls
-== style colors-off grid=100x31
 |0: 0-50 #3d6055,#e4f0ed, 51-59 #35492d,#edf2a5, 60-70 #3d6055,#e4f0ed, 71-99 d,#e4f0ed,
 |1: 0-1 #000000,#bca481, 2-2 d,#d3e7df, 3-34 #35584d,#d3e7df, 35-49 d,#d3e7df, 50-51 #000000,#bca481, 52-52 d,#e4f0ed, 53-84 #3d6055,#e4f0ed, 85-99 d,#e4f0ed,
 |2: 0-1 #ffffff,#36826b, 2-2 d,#d3e7df, 3-29 #35584d,#d3e7df, 30-32 #653f6b,#d3e7df, 33-49 #35584d,#d3e7df, 50-51 #000000,#95baa2, 52-52 d,#e4f0ed, 53-79 #3d6055,#e4f0ed, 80-82 #6e4774,#e4f0ed, 83-99 #3d6055,#e4f0ed,
+|3: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|4: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|5: 0-0 d,#9fae76, 1-49 d,#fffdeb, 50-50 d,#9fae76, 51-99 d,#fffdeb,
+|6: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|7: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|8: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|9: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|10: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|11: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|12: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|13: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|14: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|15: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|16: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|17: 0-1 #000000,#95baa2, 2-2 d,#e4f0ed, 3-29 #3d6055,#e4f0ed, 30-32 #6e4774,#e4f0ed, 33-49 #3d6055,#e4f0ed, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|18: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|19: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|20: 0-0 d,#9fae76, 1-49 d,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|21: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|22: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|23: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|24: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|25: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|26: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|27: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|28: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|29: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+|30: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-99 #293f35,#fffdeb,
+== snap colors-off grid=100x31 cursor=4,5
+|3:   ls                                       Colors   ls
+== style colors-off grid=100x31
 |3: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-3 #293f35,#fffdeb, 4-41 d,#fffdeb, 42-42 d,#e4f0ed, 43-48 #3d6055,#e4f0ed, 49-49 d,#e4f0ed, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-53 #293f35,#fffdeb, 54-99 d,#fffdeb,
 |4: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-6 #293f35,#fffdeb, 7-49 d,#fffdeb, 50-50 d,#9fae76, 51-51 d,#fffdeb, 52-56 #293f35,#fffdeb, 57-99 d,#fffdeb,
-|5: 0-0 d,#9fae76, 1-49 d,#fffdeb, 50-50 d,#9fae76, 51-99 d,#fffdeb,
 |6: 0-0 d,#9fae76, 1-49 d,#fffdeb, 50-50 d,#9fae76, 51-99 d,#fffdeb,
 |7: 0-0 d,#9fae76, 1-49 d,#fffdeb, 50-50 d,#9fae76, 51-99 d,#fffdeb,
 |8: 0-0 d,#9fae76, 1-49 d,#fffdeb, 50-50 d,#9fae76, 51-99 d,#fffdeb,
@@ -253,240 +249,240 @@
 == snap forge grid=100x31 cursor=4,5
 |3:   ls                                                ls
 == style forge grid=100x31
-|0: 0-50 #b7bfc6,#35393e, 51-59 #e2eef4,#1c5172, 60-70 #b7bfc6,#35393e, 71-99 d,#35393e,
-|1: 0-1 #ffffff,#727f6a, 2-2 d,#3e4650, 3-34 #c1c9d0,#3e4650, 35-49 d,#3e4650, 50-51 #ffffff,#727f6a, 52-52 d,#35393e, 53-84 #b7bfc6,#35393e, 85-99 d,#35393e,
-|2: 0-1 #000000,#92bde9, 2-2 d,#3e4650, 3-29 #c1c9d0,#3e4650, 30-32 #e9bda1,#3e4650, 33-49 #c1c9d0,#3e4650, 50-51 #ffffff,#5b6d7f, 52-52 d,#35393e, 53-79 #b7bfc6,#35393e, 80-82 #dfb397,#35393e, 83-99 #b7bfc6,#35393e,
-|3: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|4: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|5: 0-0 d,#758592, 1-49 d,#0c0c0e, 50-50 d,#758592, 51-99 d,#0c0c0e,
-|6: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|7: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|8: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|9: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|10: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|11: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|12: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|13: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|14: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|15: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|16: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|17: 0-1 #ffffff,#5b6d7f, 2-2 d,#35393e, 3-29 #b7bfc6,#35393e, 30-32 #dfb397,#35393e, 33-49 #b7bfc6,#35393e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|18: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|19: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|20: 0-0 d,#758592, 1-49 d,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|21: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|22: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|23: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|24: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|25: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|26: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|27: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|28: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|29: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
-|30: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#758592, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|0: 0-50 #c5c9d2,#22252b, 51-59 #e2eef4,#1c5172, 60-70 #c5c9d2,#22252b, 71-99 d,#22252b,
+|1: 0-1 #ffffff,#6a7b67, 2-2 d,#2d3440, 3-34 #d1d5de,#2d3440, 35-49 d,#2d3440, 50-51 #ffffff,#6a7b67, 52-52 d,#22252b, 53-84 #c5c9d2,#22252b, 85-99 d,#22252b,
+|2: 0-1 #000000,#9cc3f7, 2-2 d,#2d3440, 3-29 #d1d5de,#2d3440, 30-32 #f8cba7,#2d3440, 33-49 #d1d5de,#2d3440, 50-51 #ffffff,#55647b, 52-52 d,#22252b, 53-79 #c5c9d2,#22252b, 80-82 #ecbf9b,#22252b, 83-99 #c5c9d2,#22252b,
+|3: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|4: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|5: 0-0 d,#708095, 1-49 d,#0c0c0e, 50-50 d,#708095, 51-99 d,#0c0c0e,
+|6: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|7: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|8: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|9: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|10: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|11: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|12: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|13: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|14: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|15: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|16: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|17: 0-1 #ffffff,#55647b, 2-2 d,#22252b, 3-29 #c5c9d2,#22252b, 30-32 #ecbf9b,#22252b, 33-49 #c5c9d2,#22252b, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|18: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|19: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|20: 0-0 d,#708095, 1-49 d,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|21: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|22: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|23: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|24: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|25: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|26: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|27: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|28: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|29: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
+|30: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 d,#708095, 51-51 d,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
 == snap lagoon grid=100x31 cursor=4,5
 == style lagoon grid=100x31
-|0: 0-50 #bcd6cc,#28413d, 51-59 #e6f2f3,#325f6c, 60-70 #bcd6cc,#28413d, 71-99 d,#28413d,
-|1: 0-1 #ffffff,#957763, 2-2 d,#33544c, 3-34 #c8e2d8,#33544c, 35-49 d,#33544c, 50-51 #ffffff,#957763, 52-52 d,#28413d, 53-84 #bcd6cc,#28413d, 85-99 d,#28413d,
-|2: 0-1 #000000,#84cebd, 2-2 d,#33544c, 3-29 #c8e2d8,#33544c, 30-32 #f1cef0,#33544c, 33-49 #c8e2d8,#33544c, 50-51 #ffffff,#548073, 52-52 d,#28413d, 53-79 #bcd6cc,#28413d, 80-82 #e5c2e4,#28413d, 83-99 #bcd6cc,#28413d,
-|3: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|4: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|5: 0-0 d,#6e988c, 1-49 d,#34464c, 50-50 d,#6e988c, 51-99 d,#34464c,
-|6: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|7: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|8: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|9: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|10: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|11: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|12: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|13: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|14: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|15: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|16: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|17: 0-1 #ffffff,#548073, 2-2 d,#28413d, 3-29 #bcd6cc,#28413d, 30-32 #e5c2e4,#28413d, 33-49 #bcd6cc,#28413d, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|18: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|19: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|20: 0-0 d,#6e988c, 1-49 d,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|21: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|22: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|23: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|24: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|25: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|26: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|27: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|28: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|29: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
-|30: 0-0 d,#6e988c, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e988c, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|0: 0-50 #bbd7cb,#29443f, 51-59 #e6f2f3,#325f6c, 60-70 #bbd7cb,#29443f, 71-99 d,#29443f,
+|1: 0-1 #ffffff,#9a7662, 2-2 d,#34574d, 3-34 #c7e3d7,#34574d, 35-49 d,#34574d, 50-51 #ffffff,#9a7662, 52-52 d,#29443f, 53-84 #bbd7cb,#29443f, 85-99 d,#29443f,
+|2: 0-1 #000000,#81cfb7, 2-2 d,#34574d, 3-29 #c7e3d7,#34574d, 30-32 #f0cef8,#34574d, 33-49 #c7e3d7,#34574d, 50-51 #ffffff,#548372, 52-52 d,#29443f, 53-79 #bbd7cb,#29443f, 80-82 #e4c2ec,#29443f, 83-99 #bbd7cb,#29443f,
+|3: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|4: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|5: 0-0 d,#6e9b8b, 1-49 d,#34464c, 50-50 d,#6e9b8b, 51-99 d,#34464c,
+|6: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|7: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|8: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|9: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|10: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|11: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|12: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|13: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|14: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|15: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|16: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|17: 0-1 #ffffff,#548372, 2-2 d,#29443f, 3-29 #bbd7cb,#29443f, 30-32 #e4c2ec,#29443f, 33-49 #bbd7cb,#29443f, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|18: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|19: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|20: 0-0 d,#6e9b8b, 1-49 d,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|21: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|22: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|23: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|24: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|25: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|26: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|27: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|28: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|29: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
+|30: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 d,#6e9b8b, 51-51 d,#34464c, 52-99 #bac9ce,#34464c,
 == snap solarium grid=100x31 cursor=4,5
 == style solarium grid=100x31
-|0: 0-50 #c6d4be,#144043, 51-59 #eee8d5,#1f5c64, 60-70 #c6d4be,#144043, 71-99 d,#144043,
-|1: 0-1 #ffffff,#3e7a94, 2-2 d,#234f50, 3-34 #d2e0ca,#234f50, 35-49 d,#234f50, 50-51 #ffffff,#3e7a94, 52-52 d,#144043, 53-84 #c6d4be,#144043, 85-99 d,#144043,
-|2: 0-1 #000000,#d7c36e, 2-2 d,#234f50, 3-29 #d2e0ca,#234f50, 30-32 #f5cded,#234f50, 33-49 #d2e0ca,#234f50, 50-51 #ffffff,#477f76, 52-52 d,#144043, 53-79 #c6d4be,#144043, 80-82 #e9c1e1,#144043, 83-99 #c6d4be,#144043,
-|3: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|4: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|5: 0-0 d,#66978c, 1-49 d,#173e45, 50-50 d,#66978c, 51-99 d,#173e45,
-|6: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|7: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|8: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|9: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|10: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|11: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|12: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|13: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|14: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|15: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|16: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|17: 0-1 #ffffff,#477f76, 2-2 d,#144043, 3-29 #c6d4be,#144043, 30-32 #e9c1e1,#144043, 33-49 #c6d4be,#144043, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|18: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|19: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|20: 0-0 d,#66978c, 1-49 d,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|21: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|22: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|23: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|24: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|25: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|26: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|27: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|28: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|29: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
-|30: 0-0 d,#66978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#66978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|0: 0-50 #c7d4bd,#123f43, 51-59 #eee8d5,#1f5c64, 60-70 #c7d4bd,#123f43, 71-99 d,#123f43,
+|1: 0-1 #ffffff,#347a9a, 2-2 d,#214e50, 3-34 #d3e0c9,#214e50, 35-49 d,#214e50, 50-51 #ffffff,#347a9a, 52-52 d,#123f43, 53-84 #c7d4bd,#123f43, 85-99 d,#123f43,
+|2: 0-1 #000000,#e1c266, 2-2 d,#214e50, 3-29 #d3e0c9,#214e50, 30-32 #f5cdec,#214e50, 33-49 #d3e0c9,#214e50, 50-51 #ffffff,#467f76, 52-52 d,#123f43, 53-79 #c7d4bd,#123f43, 80-82 #e9c1e0,#123f43, 83-99 #c7d4bd,#123f43,
+|3: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|4: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|5: 0-0 d,#65978c, 1-49 d,#173e45, 50-50 d,#65978c, 51-99 d,#173e45,
+|6: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|7: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|8: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|9: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|10: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|11: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|12: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|13: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|14: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|15: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|16: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|17: 0-1 #ffffff,#467f76, 2-2 d,#123f43, 3-29 #c7d4bd,#123f43, 30-32 #e9c1e0,#123f43, 33-49 #c7d4bd,#123f43, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|18: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|19: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|20: 0-0 d,#65978c, 1-49 d,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|21: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|22: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|23: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|24: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|25: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|26: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|27: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|28: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|29: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
+|30: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 d,#65978c, 51-51 d,#173e45, 52-99 #a7b7ae,#173e45,
 == snap spectrum grid=100x31 cursor=4,5
 == style spectrum grid=100x31
-|0: 0-50 #dbd8bb,#373932, 51-59 #fcfcfa,#513f60, 60-70 #dbd8bb,#373932, 71-99 d,#373932,
-|1: 0-1 #ffffff,#6a6796, 2-2 d,#494839, 3-34 #e7e4c7,#494839, 35-49 d,#494839, 50-51 #ffffff,#6a6796, 52-52 d,#373932, 53-84 #dbd8bb,#373932, 85-99 d,#373932,
-|2: 0-1 #000000,#fcd666, 2-2 d,#494839, 3-29 #e7e4c7,#494839, 30-32 #dae1fd,#494839, 33-49 #e7e4c7,#494839, 50-51 #ffffff,#8a8453, 52-52 d,#373932, 53-79 #dbd8bb,#373932, 80-82 #c9d5fc,#373932, 83-99 #dbd8bb,#373932,
-|3: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|4: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|5: 0-0 d,#8f8e72, 1-49 d,#100e11, 50-50 d,#8f8e72, 51-99 d,#100e11,
-|6: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|7: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|8: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|9: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|10: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|11: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|12: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|13: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|14: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|15: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|16: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|17: 0-1 #ffffff,#8a8453, 2-2 d,#373932, 3-29 #dbd8bb,#373932, 30-32 #c9d5fc,#373932, 33-49 #dbd8bb,#373932, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|18: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|19: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|20: 0-0 d,#8f8e72, 1-49 d,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|21: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|22: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|23: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|24: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|25: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|26: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|27: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|28: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|29: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
-|30: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#8f8e72, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|0: 0-50 #ddd8bb,#3b3830, 51-59 #fcfcfa,#513f60, 60-70 #ddd8bb,#3b3830, 71-99 d,#3b3830,
+|1: 0-1 #ffffff,#706596, 2-2 d,#4d4736, 3-34 #e9e4c7,#4d4736, 35-49 d,#4d4736, 50-51 #ffffff,#706596, 52-52 d,#3b3830, 53-84 #ddd8bb,#3b3830, 85-99 d,#3b3830,
+|2: 0-1 #000000,#ffd866, 2-2 d,#4d4736, 3-29 #e9e4c7,#4d4736, 30-32 #d7e3ff,#4d4736, 33-49 #e9e4c7,#4d4736, 50-51 #ffffff,#92844f, 52-52 d,#3b3830, 53-79 #ddd8bb,#3b3830, 80-82 #c5d7ff,#3b3830, 83-99 #ddd8bb,#3b3830,
+|3: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|4: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|5: 0-0 d,#948d6f, 1-49 d,#100e11, 50-50 d,#948d6f, 51-99 d,#100e11,
+|6: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|7: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|8: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|9: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|10: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|11: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|12: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|13: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|14: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|15: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|16: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|17: 0-1 #ffffff,#92844f, 2-2 d,#3b3830, 3-29 #ddd8bb,#3b3830, 30-32 #c5d7ff,#3b3830, 33-49 #ddd8bb,#3b3830, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|18: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|19: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|20: 0-0 d,#948d6f, 1-49 d,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|21: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|22: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|23: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|24: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|25: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|26: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|27: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|28: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|29: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
+|30: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 d,#948d6f, 51-51 d,#100e11, 52-99 #fcfcfa,#100e11,
 == snap harvest grid=100x31 cursor=4,5
 == style harvest grid=100x31
-|0: 0-50 #d6d8b8,#353b2e, 51-59 #f3f2cc,#4f5834, 60-70 #d6d8b8,#353b2e, 71-99 d,#353b2e,
-|1: 0-1 #ffffff,#975948, 2-2 d,#434c38, 3-34 #e2e4c4,#434c38, 35-49 d,#434c38, 50-51 #ffffff,#975948, 52-52 d,#353b2e, 53-84 #d6d8b8,#353b2e, 85-99 d,#353b2e,
-|2: 0-1 #000000,#dcc080, 2-2 d,#434c38, 3-29 #e2e4c4,#434c38, 30-32 #c7e7f8,#434c38, 33-49 #e2e4c4,#434c38, 50-51 #ffffff,#7d7f4e, 52-52 d,#353b2e, 53-79 #d6d8b8,#353b2e, 80-82 #bbdbed,#353b2e, 83-99 #d6d8b8,#353b2e,
-|3: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|4: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|5: 0-0 d,#898e60, 1-49 d,#100e0b, 50-50 d,#898e60, 51-99 d,#100e0b,
-|6: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|7: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|8: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|9: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|10: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|11: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|12: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|13: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|14: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|15: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|16: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|17: 0-1 #ffffff,#7d7f4e, 2-2 d,#353b2e, 3-29 #d6d8b8,#353b2e, 30-32 #bbdbed,#353b2e, 33-49 #d6d8b8,#353b2e, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|18: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|19: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|20: 0-0 d,#898e60, 1-49 d,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|21: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|22: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|23: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|24: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|25: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|26: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|27: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|28: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|29: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
-|30: 0-0 d,#898e60, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#898e60, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|0: 0-50 #d5d8b8,#343b2e, 51-59 #f3f2cc,#4f5834, 60-70 #d5d8b8,#343b2e, 71-99 d,#343b2e,
+|1: 0-1 #ffffff,#9b583f, 2-2 d,#424d38, 3-34 #e1e4c4,#424d38, 35-49 d,#424d38, 50-51 #ffffff,#9b583f, 52-52 d,#343b2e, 53-84 #d5d8b8,#343b2e, 85-99 d,#343b2e,
+|2: 0-1 #000000,#d8bd83, 2-2 d,#424d38, 3-29 #e1e4c4,#424d38, 30-32 #c5e7f7,#424d38, 33-49 #e1e4c4,#424d38, 50-51 #ffffff,#7b7e4e, 52-52 d,#343b2e, 53-79 #d5d8b8,#343b2e, 80-82 #badbeb,#343b2e, 83-99 #d5d8b8,#343b2e,
+|3: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|4: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|5: 0-0 d,#888e5e, 1-49 d,#100e0b, 50-50 d,#888e5e, 51-99 d,#100e0b,
+|6: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|7: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|8: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|9: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|10: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|11: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|12: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|13: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|14: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|15: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|16: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|17: 0-1 #ffffff,#7b7e4e, 2-2 d,#343b2e, 3-29 #d5d8b8,#343b2e, 30-32 #badbeb,#343b2e, 33-49 #d5d8b8,#343b2e, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|18: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|19: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|20: 0-0 d,#888e5e, 1-49 d,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|21: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|22: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|23: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|24: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|25: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|26: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|27: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|28: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|29: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
+|30: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 d,#888e5e, 51-51 d,#100e0b, 52-99 #f3f2cc,#100e0b,
 == snap clay grid=100x31 cursor=4,5
 == style clay grid=100x31
-|0: 0-50 #d7d6b6,#343f35, 51-59 #fbf1c7,#505c38, 60-70 #d7d6b6,#343f35, 71-99 d,#343f35,
-|1: 0-1 #ffffff,#895d61, 2-2 d,#424f3f, 3-34 #e3e2c2,#424f3f, 35-49 d,#424f3f, 50-51 #ffffff,#895d61, 52-52 d,#343f35, 53-84 #d7d6b6,#343f35, 85-99 d,#343f35,
-|2: 0-1 #000000,#92c776, 2-2 d,#424f3f, 3-29 #e3e2c2,#424f3f, 30-32 #b7eced,#424f3f, 33-49 #e3e2c2,#424f3f, 50-51 #ffffff,#6a7c4d, 52-52 d,#343f35, 53-79 #d7d6b6,#343f35, 80-82 #ace0e1,#343f35, 83-99 #d7d6b6,#343f35,
-|3: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|4: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|5: 0-0 d,#8c9366, 1-49 d,#10100e, 50-50 d,#8c9366, 51-99 d,#10100e,
-|6: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|7: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|8: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|9: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|10: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|11: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|12: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|13: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|14: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|15: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|16: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|17: 0-1 #ffffff,#6a7c4d, 2-2 d,#343f35, 3-29 #d7d6b6,#343f35, 30-32 #ace0e1,#343f35, 33-49 #d7d6b6,#343f35, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|18: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|19: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|20: 0-0 d,#8c9366, 1-49 d,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|21: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|22: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|23: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|24: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|25: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|26: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|27: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|28: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|29: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
-|30: 0-0 d,#8c9366, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9366, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|0: 0-50 #d7d6b6,#343f36, 51-59 #fbf1c7,#505c38, 60-70 #d7d6b6,#343f36, 71-99 d,#343f36,
+|1: 0-1 #ffffff,#875e65, 2-2 d,#424f40, 3-34 #e3e2c2,#424f40, 35-49 d,#424f40, 50-51 #ffffff,#875e65, 52-52 d,#343f36, 53-84 #d7d6b6,#343f36, 85-99 d,#343f36,
+|2: 0-1 #000000,#8ac874, 2-2 d,#424f40, 3-29 #e3e2c2,#424f40, 30-32 #b5ecec,#424f40, 33-49 #e3e2c2,#424f40, 50-51 #ffffff,#687c4d, 52-52 d,#343f36, 53-79 #d7d6b6,#343f36, 80-82 #aae0e0,#343f36, 83-99 #d7d6b6,#343f36,
+|3: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|4: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|5: 0-0 d,#8c9467, 1-49 d,#10100e, 50-50 d,#8c9467, 51-99 d,#10100e,
+|6: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|7: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|8: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|9: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|10: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|11: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|12: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|13: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|14: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|15: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|16: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|17: 0-1 #ffffff,#687c4d, 2-2 d,#343f36, 3-29 #d7d6b6,#343f36, 30-32 #aae0e0,#343f36, 33-49 #d7d6b6,#343f36, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|18: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|19: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|20: 0-0 d,#8c9467, 1-49 d,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|21: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|22: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|23: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|24: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|25: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|26: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|27: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|28: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|29: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
+|30: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 d,#8c9467, 51-51 d,#10100e, 52-99 #f3e5bc,#10100e,
 == snap forge-black grid=100x31 cursor=4,5
 == style forge-black grid=100x31
-|0: 0-50 #c7cacf,#24282c, 51-59 #e2eef4,#1c5172, 60-70 #c7cacf,#24282c, 71-99 d,#24282c,
-|1: 0-1 #ffffff,#6d7867, 2-2 d,#2f3740, 3-34 #d3d6db,#2f3740, 35-49 d,#2f3740, 50-51 #ffffff,#6d7867, 52-52 d,#24282c, 53-84 #c7cacf,#24282c, 85-99 d,#24282c,
-|2: 0-1 #000000,#9ac4ea, 2-2 d,#2f3740, 3-29 #d3d6db,#2f3740, 30-32 #f1ceae,#2f3740, 33-49 #d3d6db,#2f3740, 50-51 #ffffff,#576676, 52-52 d,#24282c, 53-79 #c7cacf,#24282c, 80-82 #e5c2a2,#24282c, 83-99 #c7cacf,#24282c,
-|3: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|4: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|5: 0-0 d,#738290, 1-49 d,#000000, 50-50 d,#738290, 51-99 d,#000000,
-|6: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|7: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|8: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|9: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|10: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|11: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|12: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|13: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|14: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|15: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|16: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|17: 0-1 #ffffff,#576676, 2-2 d,#24282c, 3-29 #c7cacf,#24282c, 30-32 #e5c2a2,#24282c, 33-49 #c7cacf,#24282c, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|18: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|19: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|20: 0-0 d,#738290, 1-49 d,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|21: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|22: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|23: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|24: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|25: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|26: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|27: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|28: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|29: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
-|30: 0-0 d,#738290, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#738290, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|0: 0-50 #c5c9d2,#22252b, 51-59 #e2eef4,#1c5172, 60-70 #c5c9d2,#22252b, 71-99 d,#22252b,
+|1: 0-1 #ffffff,#6a7b67, 2-2 d,#2d3440, 3-34 #d1d5de,#2d3440, 35-49 d,#2d3440, 50-51 #ffffff,#6a7b67, 52-52 d,#22252b, 53-84 #c5c9d2,#22252b, 85-99 d,#22252b,
+|2: 0-1 #000000,#9cc3f7, 2-2 d,#2d3440, 3-29 #d1d5de,#2d3440, 30-32 #f8cba7,#2d3440, 33-49 #d1d5de,#2d3440, 50-51 #ffffff,#55647b, 52-52 d,#22252b, 53-79 #c5c9d2,#22252b, 80-82 #ecbf9b,#22252b, 83-99 #c5c9d2,#22252b,
+|3: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|4: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|5: 0-0 d,#708095, 1-49 d,#000000, 50-50 d,#708095, 51-99 d,#000000,
+|6: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|7: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|8: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|9: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|10: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|11: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|12: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|13: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|14: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|15: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|16: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|17: 0-1 #ffffff,#55647b, 2-2 d,#22252b, 3-29 #c5c9d2,#22252b, 30-32 #ecbf9b,#22252b, 33-49 #c5c9d2,#22252b, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|18: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|19: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|20: 0-0 d,#708095, 1-49 d,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|21: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|22: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|23: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|24: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|25: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|26: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|27: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|28: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|29: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
+|30: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 d,#708095, 51-51 d,#000000, 52-99 #f6f6f6,#000000,
 == snap forge-soft grid=100x31 cursor=4,5
 == style forge-soft grid=100x31
-|0: 0-50 #c5c9d2,#292c33, 51-59 #e2eef4,#1c5172, 60-70 #c5c9d2,#292c33, 71-99 d,#292c33,
-|1: 0-1 #ffffff,#6d7f6c, 2-2 d,#363d48, 3-34 #d1d5de,#363d48, 35-49 d,#363d48, 50-51 #ffffff,#6d7f6c, 52-52 d,#292c33, 53-84 #c5c9d2,#292c33, 85-99 d,#292c33,
-|2: 0-1 #000000,#9cc3f7, 2-2 d,#363d48, 3-29 #d1d5de,#363d48, 30-32 #f8cba7,#363d48, 33-49 #d1d5de,#363d48, 50-51 #ffffff,#55647b, 52-52 d,#292c33, 53-79 #c5c9d2,#292c33, 80-82 #ecbf9b,#292c33, 83-99 #c5c9d2,#292c33,
+|0: 0-50 #c5c9d2,#2a2d34, 51-59 #e2eef4,#1c5172, 60-70 #c5c9d2,#2a2d34, 71-99 d,#2a2d34,
+|1: 0-1 #ffffff,#6d7f6c, 2-2 d,#373e49, 3-34 #d1d5de,#373e49, 35-49 d,#373e49, 50-51 #ffffff,#6d7f6c, 52-52 d,#2a2d34, 53-84 #c5c9d2,#2a2d34, 85-99 d,#2a2d34,
+|2: 0-1 #000000,#9cc3f7, 2-2 d,#373e49, 3-29 #d1d5de,#373e49, 30-32 #f8cba7,#373e49, 33-49 #d1d5de,#373e49, 50-51 #ffffff,#55647b, 52-52 d,#2a2d34, 53-79 #c5c9d2,#2a2d34, 80-82 #ecbf9b,#2a2d34, 83-99 #c5c9d2,#2a2d34,
 |3: 0-0 d,#708095, 1-1 d,#35383e, 2-49 #bfc3cc,#35383e, 50-50 d,#708095, 51-51 d,#35383e, 52-99 #bfc3cc,#35383e,
 |4: 0-0 d,#708095, 1-1 d,#35383e, 2-49 #bfc3cc,#35383e, 50-50 d,#708095, 51-51 d,#35383e, 52-99 #bfc3cc,#35383e,
 |5: 0-0 d,#708095, 1-49 d,#35383e, 50-50 d,#708095, 51-99 d,#35383e,
@@ -501,7 +497,7 @@
 |14: 0-0 d,#708095, 1-1 d,#35383e, 2-49 #bfc3cc,#35383e, 50-50 d,#708095, 51-51 d,#35383e, 52-99 #bfc3cc,#35383e,
 |15: 0-0 d,#708095, 1-1 d,#35383e, 2-49 #bfc3cc,#35383e, 50-50 d,#708095, 51-51 d,#35383e, 52-99 #bfc3cc,#35383e,
 |16: 0-0 d,#708095, 1-1 d,#35383e, 2-49 #bfc3cc,#35383e, 50-50 d,#708095, 51-51 d,#35383e, 52-99 #bfc3cc,#35383e,
-|17: 0-1 #ffffff,#55647b, 2-2 d,#292c33, 3-29 #c5c9d2,#292c33, 30-32 #ecbf9b,#292c33, 33-49 #c5c9d2,#292c33, 50-50 d,#708095, 51-51 d,#35383e, 52-99 #bfc3cc,#35383e,
+|17: 0-1 #ffffff,#55647b, 2-2 d,#2a2d34, 3-29 #c5c9d2,#2a2d34, 30-32 #ecbf9b,#2a2d34, 33-49 #c5c9d2,#2a2d34, 50-50 d,#708095, 51-51 d,#35383e, 52-99 #bfc3cc,#35383e,
 |18: 0-0 d,#708095, 1-1 d,#35383e, 2-49 #bfc3cc,#35383e, 50-50 d,#708095, 51-51 d,#35383e, 52-99 #bfc3cc,#35383e,
 |19: 0-0 d,#708095, 1-1 d,#35383e, 2-49 #bfc3cc,#35383e, 50-50 d,#708095, 51-51 d,#35383e, 52-99 #bfc3cc,#35383e,
 |20: 0-0 d,#708095, 1-49 d,#35383e, 50-50 d,#708095, 51-51 d,#35383e, 52-99 #bfc3cc,#35383e,
@@ -517,166 +513,166 @@
 |30: 0-0 d,#708095, 1-1 d,#35383e, 2-49 #bfc3cc,#35383e, 50-50 d,#708095, 51-51 d,#35383e, 52-99 #bfc3cc,#35383e,
 == snap orchard-black grid=100x31 cursor=4,5
 == style orchard-black grid=100x31
-|0: 0-50 #b4c4bb,#1e2926, 51-59 #f5f7ee,#3c614a, 60-70 #b4c4bb,#1e2926, 71-99 d,#1e2926,
-|1: 0-1 #ffffff,#857557, 2-2 d,#283730, 3-34 #c0d0c7,#283730, 35-49 d,#283730, 50-51 #ffffff,#857557, 52-52 d,#1e2926, 53-84 #b4c4bb,#1e2926, 85-99 d,#1e2926,
-|2: 0-1 #000000,#abd195, 2-2 d,#283730, 3-29 #c0d0c7,#283730, 30-32 #e2bedf,#283730, 33-49 #c0d0c7,#283730, 50-51 #ffffff,#4a665a, 52-52 d,#1e2926, 53-79 #b4c4bb,#1e2926, 80-82 #d6b2d3,#1e2926, 83-99 #b4c4bb,#1e2926,
-|3: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|4: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|5: 0-0 d,#62826d, 1-49 d,#000000, 50-50 d,#62826d, 51-99 d,#000000,
-|6: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|7: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|8: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|9: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|10: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|11: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|12: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|13: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|14: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|15: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|16: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|17: 0-1 #ffffff,#4a665a, 2-2 d,#1e2926, 3-29 #b4c4bb,#1e2926, 30-32 #d6b2d3,#1e2926, 33-49 #b4c4bb,#1e2926, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|18: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|19: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|20: 0-0 d,#62826d, 1-49 d,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|21: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|22: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|23: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|24: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|25: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|26: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|27: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|28: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|29: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
-|30: 0-0 d,#62826d, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#62826d, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|0: 0-50 #b2c3b8,#1d2824, 51-59 #f5f7ee,#3c614a, 60-70 #b2c3b8,#1d2824, 71-99 d,#1d2824,
+|1: 0-1 #ffffff,#887455, 2-2 d,#26362d, 3-34 #becfc4,#26362d, 35-49 d,#26362d, 50-51 #ffffff,#887455, 52-52 d,#1d2824, 53-84 #b2c3b8,#1d2824, 85-99 d,#1d2824,
+|2: 0-1 #000000,#add38a, 2-2 d,#26362d, 3-29 #becfc4,#26362d, 30-32 #dfbce5,#26362d, 33-49 #becfc4,#26362d, 50-51 #ffffff,#496656, 52-52 d,#1d2824, 53-79 #b2c3b8,#1d2824, 80-82 #d3b0d9,#1d2824, 83-99 #b2c3b8,#1d2824,
+|3: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|4: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|5: 0-0 d,#608269, 1-49 d,#000000, 50-50 d,#608269, 51-99 d,#000000,
+|6: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|7: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|8: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|9: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|10: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|11: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|12: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|13: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|14: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|15: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|16: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|17: 0-1 #ffffff,#496656, 2-2 d,#1d2824, 3-29 #b2c3b8,#1d2824, 30-32 #d3b0d9,#1d2824, 33-49 #b2c3b8,#1d2824, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|18: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|19: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|20: 0-0 d,#608269, 1-49 d,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|21: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|22: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|23: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|24: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|25: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|26: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|27: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|28: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|29: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
+|30: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 d,#608269, 51-51 d,#000000, 52-99 #f2f8ef,#000000,
 == snap helix grid=100x31 cursor=4,5
 == style helix grid=100x31
-|0: 0-50 #979998,#131414, 51-59 #080808,#80a0ff, 60-70 #979998,#131414, 71-99 d,#131414,
-|1: 0-1 #ffffff,#837048, 2-2 d,#141615, 3-34 #989a99,#141615, 35-49 d,#141615, 50-51 #ffffff,#837048, 52-52 d,#131414, 53-84 #979998,#131414, 85-99 d,#131414,
-|2: 0-1 #ffffff,#6a6d66, 2-2 d,#141615, 3-29 #989a99,#141615, 30-32 #9c989c,#141615, 33-49 #989a99,#141615, 50-51 #ffffff,#2a2c2b, 52-52 d,#131414, 53-79 #979998,#131414, 80-82 #9a979b,#131414, 83-99 #979998,#131414,
-|3: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|4: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|5: 0-0 d,#474a48, 1-49 d,#080808, 50-50 d,#474a48, 51-99 d,#080808,
-|6: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|7: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|8: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|9: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|10: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|11: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|12: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|13: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|14: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|15: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|16: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|17: 0-1 #ffffff,#2a2c2b, 2-2 d,#131414, 3-29 #979998,#131414, 30-32 #9a979b,#131414, 33-49 #979998,#131414, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|18: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|19: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|20: 0-0 d,#474a48, 1-49 d,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|21: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|22: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|23: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|24: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|25: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|26: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|27: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|28: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|29: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
-|30: 0-0 d,#474a48, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#474a48, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|0: 0-50 #949494,#121212, 51-59 #080808,#80a0ff, 60-70 #949494,#121212, 71-99 d,#121212,
+|1: 0-1 #ffffff,#826f46, 2-2 d,#121212, 3-34 #949494,#121212, 35-49 d,#121212, 50-51 #ffffff,#826f46, 52-52 d,#121212, 53-84 #949494,#121212, 85-99 d,#121212,
+|2: 0-1 #ffffff,#626262, 2-2 d,#121212, 3-49 #949494,#121212, 50-51 #ffffff,#262626, 52-52 d,#121212, 53-99 #949494,#121212,
+|3: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|4: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|5: 0-0 d,#444444, 1-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808,
+|6: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|7: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|8: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|9: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|10: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|11: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|12: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|13: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|14: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|15: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|16: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|17: 0-1 #ffffff,#262626, 2-2 d,#121212, 3-49 #949494,#121212, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|18: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|19: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|20: 0-0 d,#444444, 1-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|21: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|22: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|23: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|24: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|25: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|26: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|27: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|28: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|29: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
+|30: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808,
 == snap dark grid=100x31 cursor=4,5
 == style dark grid=100x31
-|0: 0-50 #969696,#29283a, 51-59 #d8c8a8,#513c17, 60-70 #969696,#29283a, 71-99 d,#29283a,
-|1: 0-1 #ffffff,#86794d, 2-2 d,#29283a, 3-34 #969696,#29283a, 35-49 d,#29283a, 50-51 #ffffff,#86794d, 52-52 d,#29283a, 53-84 #969696,#29283a, 85-99 d,#29283a,
-|2: 0-1 #ffffff,#6643d3, 2-2 d,#29283a, 3-49 #969696,#29283a, 50-51 #ffffff,#343853, 52-52 d,#29283a, 53-99 #969696,#29283a,
-|3: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|4: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|5: 0-0 d,#515151, 1-49 d,d, 50-50 d,#515151, 51-99 d,d,
-|6: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|7: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|8: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|9: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|10: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|11: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|12: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|13: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|14: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|15: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|16: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|17: 0-1 #ffffff,#343853, 2-2 d,#29283a, 3-49 #969696,#29283a, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|18: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|19: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|20: 0-0 d,#515151, 1-49 d,d, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|21: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|22: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|23: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|24: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|25: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|26: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|27: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|28: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|29: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
-|30: 0-0 d,#515151, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#515151, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|0: 0-50 #969696,#2c2a3e, 51-59 #d8c8a8,#513c17, 60-70 #969696,#2c2a3e, 71-99 d,#2c2a3e,
+|1: 0-1 #ffffff,#867a4e, 2-2 d,#2c2a3e, 3-34 #969696,#2c2a3e, 35-49 d,#2c2a3e, 50-51 #ffffff,#867a4e, 52-52 d,#2c2a3e, 53-84 #969696,#2c2a3e, 85-99 d,#2c2a3e,
+|2: 0-1 #ffffff,#663fe0, 2-2 d,#2c2a3e, 3-49 #969696,#2c2a3e, 50-51 #ffffff,#353a58, 52-52 d,#2c2a3e, 53-99 #969696,#2c2a3e,
+|3: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|4: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|5: 0-0 d,#525252, 1-49 d,d, 50-50 d,#525252, 51-99 d,d,
+|6: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|7: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|8: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|9: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|10: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|11: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|12: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|13: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|14: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|15: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|16: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|17: 0-1 #ffffff,#353a58, 2-2 d,#2c2a3e, 3-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|18: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|19: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|20: 0-0 d,#525252, 1-49 d,d, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|21: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|22: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|23: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|24: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|25: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|26: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|27: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|28: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|29: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
+|30: 0-0 d,#525252, 1-1 d,d, 2-49 #969696,#2c2a3e, 50-50 d,#525252, 51-51 d,d, 52-99 #969696,#2c2a3e,
 == snap acme grid=100x31 cursor=4,5
 == style acme grid=100x31
-|0: 0-50 #0f0f0f,#d7eaec, 51-59 #000000,#fafa92, 60-70 #0f0f0f,#d7eaec, 71-99 d,#d7eaec,
-|1: 0-1 #000000,#bfa37a, 2-2 d,#d7eaec, 3-34 #0f0f0f,#d7eaec, 35-49 d,#d7eaec, 50-51 #000000,#bfa37a, 52-52 d,#d7eaec, 53-84 #0f0f0f,#d7eaec, 85-99 d,#d7eaec,
-|2: 0-1 #ffffff,#663fe0, 2-2 d,#d7eaec, 3-49 #0f0f0f,#d7eaec, 50-51 #ffffff,#353a58, 52-52 d,#d7eaec, 53-99 #0f0f0f,#d7eaec,
-|3: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|4: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|5: 0-0 d,#eeeedb, 1-49 d,#ffffea, 50-50 d,#eeeedb, 51-99 d,#ffffea,
-|6: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|7: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|8: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|9: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|10: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|11: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|12: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|13: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|14: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|15: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|16: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|17: 0-1 #ffffff,#353a58, 2-2 d,#d7eaec, 3-49 #0f0f0f,#d7eaec, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|18: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|19: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|20: 0-0 d,#eeeedb, 1-49 d,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|21: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|22: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|23: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|24: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|25: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|26: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|27: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|28: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|29: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
-|30: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-49 #000000,#ffffea, 50-50 d,#eeeedb, 51-51 d,#ffffea, 52-99 #000000,#ffffea,
+|0: 0-50 #000000,#eaffff, 51-59 #000000,#fafa92, 60-70 #000000,#eaffff, 71-99 d,#eaffff,
+|1: 0-1 #000000,#c5a87f, 2-2 d,#eaffff, 3-34 #000000,#eaffff, 35-49 d,#eaffff, 50-51 #000000,#c5a87f, 52-52 d,#eaffff, 53-84 #000000,#eaffff, 85-99 d,#eaffff,
+|2: 0-1 #ffffff,#663fe0, 2-2 d,#eaffff, 3-49 #000000,#eaffff, 50-51 #ffffff,#353a58, 52-52 d,#eaffff, 53-99 #000000,#eaffff,
+|3: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|4: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|5: 0-99 d,#ffffea,
+|6: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|7: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|8: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|9: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|10: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|11: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|12: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|13: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|14: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|15: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|16: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|17: 0-1 #ffffff,#353a58, 2-2 d,#eaffff, 3-49 #000000,#eaffff, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|18: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|19: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|20: 0-51 d,#ffffea, 52-99 #000000,#ffffea,
+|21: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|22: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|23: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|24: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|25: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|26: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|27: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|28: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|29: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
+|30: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea,
 == snap generated grid=100x31 cursor=4,5
 == style generated grid=100x31
-|0: 0-50 #cacaca,#323c43, 51-59 #e0e0e0,#303840, 60-70 #cacaca,#323c43, 71-99 d,#323c43,
-|1: 0-1 #ffffff,#5b8094, 2-2 d,#323c43, 3-34 #cacaca,#323c43, 35-49 d,#323c43, 50-51 #ffffff,#5b8094, 52-52 d,#323c43, 53-84 #cacaca,#323c43, 85-99 d,#323c43,
-|2: 0-1 #000000,#f0966d, 2-2 d,#323c43, 3-49 #cacaca,#323c43, 50-51 #ffffff,#313842, 52-52 d,#323c43, 53-99 #cacaca,#323c43,
-|3: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|4: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|5: 0-0 d,#454c51, 1-49 d,#161e26, 50-50 d,#454c51, 51-99 d,#161e26,
-|6: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|7: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|8: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|9: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|10: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|11: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|12: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|13: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|14: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|15: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|16: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|17: 0-1 #ffffff,#313842, 2-2 d,#323c43, 3-49 #cacaca,#323c43, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|18: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|19: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|20: 0-0 d,#454c51, 1-49 d,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|21: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|22: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|23: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|24: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|25: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|26: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|27: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|28: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|29: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
-|30: 0-0 d,#454c51, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#454c51, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|0: 0-50 #e0e0e0,#1e262e, 51-59 #e0e0e0,#303840, 60-70 #e0e0e0,#1e262e, 71-99 d,#1e262e,
+|1: 0-1 #ffffff,#4f7b96, 2-2 d,#1e262e, 3-34 #e0e0e0,#1e262e, 35-49 d,#1e262e, 50-51 #ffffff,#4f7b96, 52-52 d,#1e262e, 53-84 #e0e0e0,#1e262e, 85-99 d,#1e262e,
+|2: 0-1 #000000,#ffa060, 2-2 d,#1e262e, 3-49 #e0e0e0,#1e262e, 50-51 #ffffff,#303840, 52-52 d,#1e262e, 53-99 #e0e0e0,#1e262e,
+|3: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|4: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|5: 0-0 d,#303840, 1-49 d,#161e26, 50-50 d,#303840, 51-99 d,#161e26,
+|6: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|7: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|8: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|9: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|10: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|11: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|12: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|13: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|14: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|15: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|16: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|17: 0-1 #ffffff,#303840, 2-2 d,#1e262e, 3-49 #e0e0e0,#1e262e, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|18: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|19: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|20: 0-0 d,#303840, 1-49 d,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|21: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|22: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|23: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|24: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|25: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|26: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|27: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|28: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|29: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
+|30: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26,
diff --git a/test/snapshots/themesel.golden b/test/snapshots/themesel.golden
index b3100e27..97d3ed41 100644
--- a/test/snapshots/themesel.golden
+++ b/test/snapshots/themesel.golden
@@ -83,169 +83,169 @@
 |30: 0-0 d,#152019, 1-1 d,#0d1410, 2-6 #59675c,#0d1410, 7-16 #e5eee5,#0d1410, 17-99 d,#0d1410,
 == snap step-dusk grid=100x31 cursor=7,20
 == style step-dusk grid=100x31
-|0: 0-70 #c4b7c4,#2b262f, 71-99 d,#2b262f,
-|1: 0-1 #ffffff,#77795e, 2-2 d,#39303a, 3-34 #d0c3d0,#39303a, 35-99 d,#39303a,
-|2: 0-1 #ffffff,#705667, 2-2 d,#2b262f, 3-32 #c4b7c4,#2b262f, 33-37 #9cc7bb,#2b262f, 38-59 #c4b7c4,#2b262f, 60-99 d,#2b262f,
-|3: 0-0 d,#89697a, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
-|4: 0-0 d,#89697a, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
-|5: 0-0 d,#89697a, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
-|6: 0-0 d,#89697a, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
-|7: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
-|8: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
-|9: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
-|10: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
-|11: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
-|12: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-13 #c3b6c1,#39323b, 14-99 d,#39323b,
-|13: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-13 #c3b6c1,#39323b, 14-99 d,#39323b,
-|14: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-13 #c3b6c1,#39323b, 14-99 d,#39323b,
-|15: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-13 #c3b6c1,#39323b, 14-99 d,#39323b,
-|16: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-13 #c3b6c1,#39323b, 14-99 d,#39323b,
-|17: 0-1 #000000,#e7b491, 2-2 d,#39303a, 3-32 #d0c3d0,#39303a, 33-39 #a7d3c7,#39303a, 40-61 #d0c3d0,#39303a, 62-99 d,#39303a,
-|18: 0-0 d,#89697a, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-21 #c3b6c1,#39323b, 22-92 d,#39323b, 93-93 d,#2b262f, 94-98 #c4b7c4,#2b262f, 99-99 d,#2b262f,
-|19: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-19 #c3b6c1,#39323b, 20-99 d,#39323b,
-|20: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #8a7986,#39323b,b 7-16 #c3b6c1,#39323b, 17-99 d,#39323b,
-|21: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-15 #c3b6c1,#39323b, 16-99 d,#39323b,
-|22: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-17 #c3b6c1,#39323b, 18-99 d,#39323b,
-|23: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-20 #c3b6c1,#39323b, 21-99 d,#39323b,
-|24: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-19 #c3b6c1,#39323b, 20-99 d,#39323b,
-|25: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-17 #c3b6c1,#39323b, 18-99 d,#39323b,
-|26: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-18 #c3b6c1,#39323b, 19-99 d,#39323b,
-|27: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-20 #c3b6c1,#39323b, 21-99 d,#39323b,
-|28: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-20 #c3b6c1,#39323b, 21-99 d,#39323b,
-|29: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-19 #c3b6c1,#39323b, 20-99 d,#39323b,
-|30: 0-0 d,#39333c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-16 #c3b6c1,#39323b, 17-99 d,#39323b,
+|0: 0-70 #c6b6c5,#2c2630, 71-99 d,#2c2630,
+|1: 0-1 #ffffff,#757a5f, 2-2 d,#3b2f3b, 3-34 #d2c2d1,#3b2f3b, 35-99 d,#3b2f3b,
+|2: 0-1 #ffffff,#745469, 2-2 d,#2c2630, 3-32 #c6b6c5,#2c2630, 33-37 #96c9b8,#2c2630, 38-59 #c6b6c5,#2c2630, 60-99 d,#2c2630,
+|3: 0-0 d,#8e667c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
+|4: 0-0 d,#8e667c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
+|5: 0-0 d,#8e667c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
+|6: 0-0 d,#8e667c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
+|7: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
+|8: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
+|9: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
+|10: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
+|11: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-12 #c3b6c1,#39323b, 13-99 d,#39323b,
+|12: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-13 #c3b6c1,#39323b, 14-99 d,#39323b,
+|13: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-13 #c3b6c1,#39323b, 14-99 d,#39323b,
+|14: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-13 #c3b6c1,#39323b, 14-99 d,#39323b,
+|15: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-13 #c3b6c1,#39323b, 14-99 d,#39323b,
+|16: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-13 #c3b6c1,#39323b, 14-99 d,#39323b,
+|17: 0-1 #000000,#edb092, 2-2 d,#3b2f3b, 3-32 #d2c2d1,#3b2f3b, 33-39 #a1d5c4,#3b2f3b, 40-61 #d2c2d1,#3b2f3b, 62-99 d,#3b2f3b,
+|18: 0-0 d,#8e667c, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-21 #c3b6c1,#39323b, 22-92 d,#39323b, 93-93 d,#2c2630, 94-98 #c6b6c5,#2c2630, 99-99 d,#2c2630,
+|19: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-19 #c3b6c1,#39323b, 20-99 d,#39323b,
+|20: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #8a7986,#39323b,b 7-16 #c3b6c1,#39323b, 17-99 d,#39323b,
+|21: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-15 #c3b6c1,#39323b, 16-99 d,#39323b,
+|22: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-17 #c3b6c1,#39323b, 18-99 d,#39323b,
+|23: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-20 #c3b6c1,#39323b, 21-99 d,#39323b,
+|24: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-19 #c3b6c1,#39323b, 20-99 d,#39323b,
+|25: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-17 #c3b6c1,#39323b, 18-99 d,#39323b,
+|26: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-18 #c3b6c1,#39323b, 19-99 d,#39323b,
+|27: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-20 #c3b6c1,#39323b, 21-99 d,#39323b,
+|28: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-20 #c3b6c1,#39323b, 21-99 d,#39323b,
+|29: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-19 #c3b6c1,#39323b, 20-99 d,#39323b,
+|30: 0-0 d,#3d3540, 1-1 d,#39323b, 2-6 #82717e,#39323b, 7-16 #c3b6c1,#39323b, 17-99 d,#39323b,
 == snap step-atelier grid=100x31 cursor=7,24
 == style step-atelier grid=100x31
-|0: 0-70 #4b6960,#d2dcda, 71-99 d,#d2dcda,
-|1: 0-1 #000000,#b5a07e, 2-2 d,#c4d5cf, 3-34 #45635a,#c4d5cf, 35-99 d,#c4d5cf,
-|2: 0-1 #000000,#92b09c, 2-2 d,#d2dcda, 3-32 #4b6960,#d2dcda, 33-37 #72547b,#d2dcda, 38-59 #4b6960,#d2dcda, 60-99 d,#d2dcda,
-|3: 0-0 d,#9da777, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
-|4: 0-0 d,#9da777, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
-|5: 0-0 d,#9da777, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
-|6: 0-0 d,#9da777, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
-|7: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
-|8: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
-|9: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
-|10: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
-|11: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
-|12: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-13 #293f35,#fffdeb, 14-99 d,#fffdeb,
-|13: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-13 #293f35,#fffdeb, 14-99 d,#fffdeb,
-|14: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-13 #293f35,#fffdeb, 14-99 d,#fffdeb,
-|15: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-13 #293f35,#fffdeb, 14-99 d,#fffdeb,
-|16: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-13 #293f35,#fffdeb, 14-99 d,#fffdeb,
-|17: 0-1 #ffffff,#48876f, 2-2 d,#c4d5cf, 3-32 #45635a,#c4d5cf, 33-39 #6b4e74,#c4d5cf, 40-61 #45635a,#c4d5cf, 62-99 d,#c4d5cf,
-|18: 0-0 d,#9da777, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-21 #293f35,#fffdeb, 22-92 d,#fffdeb, 93-93 d,#d2dcda, 94-98 #4b6960,#d2dcda, 99-99 d,#d2dcda,
-|19: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-19 #293f35,#fffdeb, 20-99 d,#fffdeb,
-|20: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-16 #293f35,#fffdeb, 17-99 d,#fffdeb,
-|21: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-15 #293f35,#fffdeb, 16-99 d,#fffdeb,
-|22: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-17 #293f35,#fffdeb, 18-99 d,#fffdeb,
-|23: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-20 #293f35,#fffdeb, 21-99 d,#fffdeb,
-|24: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #889078,#fffdeb,b 7-19 #293f35,#fffdeb, 20-99 d,#fffdeb,
-|25: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-17 #293f35,#fffdeb, 18-99 d,#fffdeb,
-|26: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-18 #293f35,#fffdeb, 19-99 d,#fffdeb,
-|27: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-20 #293f35,#fffdeb, 21-99 d,#fffdeb,
-|28: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-20 #293f35,#fffdeb, 21-99 d,#fffdeb,
-|29: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-19 #293f35,#fffdeb, 20-99 d,#fffdeb,
-|30: 0-0 d,#dcdac1, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-16 #293f35,#fffdeb, 17-99 d,#fffdeb,
+|0: 0-70 #3d6055,#e4f0ed, 71-99 d,#e4f0ed,
+|1: 0-1 #000000,#bca481, 2-2 d,#d3e7df, 3-34 #35584d,#d3e7df, 35-99 d,#d3e7df,
+|2: 0-1 #000000,#95baa2, 2-2 d,#e4f0ed, 3-32 #3d6055,#e4f0ed, 33-37 #6e4774,#e4f0ed, 38-59 #3d6055,#e4f0ed, 60-99 d,#e4f0ed,
+|3: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
+|4: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
+|5: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
+|6: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
+|7: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
+|8: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
+|9: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
+|10: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
+|11: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-12 #293f35,#fffdeb, 13-99 d,#fffdeb,
+|12: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-13 #293f35,#fffdeb, 14-99 d,#fffdeb,
+|13: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-13 #293f35,#fffdeb, 14-99 d,#fffdeb,
+|14: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-13 #293f35,#fffdeb, 14-99 d,#fffdeb,
+|15: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-13 #293f35,#fffdeb, 14-99 d,#fffdeb,
+|16: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-13 #293f35,#fffdeb, 14-99 d,#fffdeb,
+|17: 0-1 #ffffff,#36826b, 2-2 d,#d3e7df, 3-32 #35584d,#d3e7df, 33-39 #653f6b,#d3e7df, 40-61 #35584d,#d3e7df, 62-99 d,#d3e7df,
+|18: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-21 #293f35,#fffdeb, 22-92 d,#fffdeb, 93-93 d,#e4f0ed, 94-98 #3d6055,#e4f0ed, 99-99 d,#e4f0ed,
+|19: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-19 #293f35,#fffdeb, 20-99 d,#fffdeb,
+|20: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-16 #293f35,#fffdeb, 17-99 d,#fffdeb,
+|21: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-15 #293f35,#fffdeb, 16-99 d,#fffdeb,
+|22: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-17 #293f35,#fffdeb, 18-99 d,#fffdeb,
+|23: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-20 #293f35,#fffdeb, 21-99 d,#fffdeb,
+|24: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #889078,#fffdeb,b 7-19 #293f35,#fffdeb, 20-99 d,#fffdeb,
+|25: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-17 #293f35,#fffdeb, 18-99 d,#fffdeb,
+|26: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-18 #293f35,#fffdeb, 19-99 d,#fffdeb,
+|27: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-20 #293f35,#fffdeb, 21-99 d,#fffdeb,
+|28: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-20 #293f35,#fffdeb, 21-99 d,#fffdeb,
+|29: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-19 #293f35,#fffdeb, 20-99 d,#fffdeb,
+|30: 0-0 d,#eeeccf, 1-1 d,#fffdeb, 2-6 #909880,#fffdeb, 7-16 #293f35,#fffdeb, 17-99 d,#fffdeb,
 == snap step-forge grid=100x31 cursor=7,25
 == style step-forge grid=100x31
-|0: 0-70 #b7bfc6,#35393e, 71-99 d,#35393e,
-|1: 0-1 #ffffff,#727f6a, 2-2 d,#3e4650, 3-34 #c1c9d0,#3e4650, 35-99 d,#3e4650,
-|2: 0-1 #ffffff,#5b6d7f, 2-2 d,#35393e, 3-32 #b7bfc6,#35393e, 33-37 #dfb397,#35393e, 38-59 #b7bfc6,#35393e, 60-99 d,#35393e,
-|3: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
-|4: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
-|5: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
-|6: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
-|7: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
-|8: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
-|9: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
-|10: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
-|11: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
-|12: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-13 #e5e5e5,#0c0c0e, 14-99 d,#0c0c0e,
-|13: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-13 #e5e5e5,#0c0c0e, 14-99 d,#0c0c0e,
-|14: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-13 #e5e5e5,#0c0c0e, 14-99 d,#0c0c0e,
-|15: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-13 #e5e5e5,#0c0c0e, 14-99 d,#0c0c0e,
-|16: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-13 #e5e5e5,#0c0c0e, 14-99 d,#0c0c0e,
-|17: 0-1 #000000,#92bde9, 2-2 d,#3e4650, 3-32 #c1c9d0,#3e4650, 33-39 #e9bda1,#3e4650, 40-61 #c1c9d0,#3e4650, 62-99 d,#3e4650,
-|18: 0-0 d,#758592, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-21 #e5e5e5,#0c0c0e, 22-92 d,#0c0c0e, 93-93 d,#35393e, 94-98 #b7bfc6,#35393e, 99-99 d,#35393e,
-|19: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-19 #e5e5e5,#0c0c0e, 20-99 d,#0c0c0e,
-|20: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-16 #e5e5e5,#0c0c0e, 17-99 d,#0c0c0e,
-|21: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-15 #e5e5e5,#0c0c0e, 16-99 d,#0c0c0e,
-|22: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-17 #e5e5e5,#0c0c0e, 18-99 d,#0c0c0e,
-|23: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-20 #e5e5e5,#0c0c0e, 21-99 d,#0c0c0e,
-|24: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-19 #e5e5e5,#0c0c0e, 20-99 d,#0c0c0e,
-|25: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #6a6d74,#0c0c0e,b 7-17 #e5e5e5,#0c0c0e, 18-99 d,#0c0c0e,
-|26: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-18 #e5e5e5,#0c0c0e, 19-99 d,#0c0c0e,
-|27: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-20 #e5e5e5,#0c0c0e, 21-99 d,#0c0c0e,
-|28: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-20 #e5e5e5,#0c0c0e, 21-99 d,#0c0c0e,
-|29: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-19 #e5e5e5,#0c0c0e, 20-99 d,#0c0c0e,
-|30: 0-0 d,#2f3132, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-16 #e5e5e5,#0c0c0e, 17-99 d,#0c0c0e,
+|0: 0-70 #c5c9d2,#22252b, 71-99 d,#22252b,
+|1: 0-1 #ffffff,#6a7b67, 2-2 d,#2d3440, 3-34 #d1d5de,#2d3440, 35-99 d,#2d3440,
+|2: 0-1 #ffffff,#55647b, 2-2 d,#22252b, 3-32 #c5c9d2,#22252b, 33-37 #ecbf9b,#22252b, 38-59 #c5c9d2,#22252b, 60-99 d,#22252b,
+|3: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
+|4: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
+|5: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
+|6: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
+|7: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
+|8: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
+|9: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
+|10: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
+|11: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-12 #e5e5e5,#0c0c0e, 13-99 d,#0c0c0e,
+|12: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-13 #e5e5e5,#0c0c0e, 14-99 d,#0c0c0e,
+|13: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-13 #e5e5e5,#0c0c0e, 14-99 d,#0c0c0e,
+|14: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-13 #e5e5e5,#0c0c0e, 14-99 d,#0c0c0e,
+|15: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-13 #e5e5e5,#0c0c0e, 14-99 d,#0c0c0e,
+|16: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-13 #e5e5e5,#0c0c0e, 14-99 d,#0c0c0e,
+|17: 0-1 #000000,#9cc3f7, 2-2 d,#2d3440, 3-32 #d1d5de,#2d3440, 33-39 #f8cba7,#2d3440, 40-61 #d1d5de,#2d3440, 62-99 d,#2d3440,
+|18: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-21 #e5e5e5,#0c0c0e, 22-92 d,#0c0c0e, 93-93 d,#22252b, 94-98 #c5c9d2,#22252b, 99-99 d,#22252b,
+|19: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-19 #e5e5e5,#0c0c0e, 20-99 d,#0c0c0e,
+|20: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-16 #e5e5e5,#0c0c0e, 17-99 d,#0c0c0e,
+|21: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-15 #e5e5e5,#0c0c0e, 16-99 d,#0c0c0e,
+|22: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-17 #e5e5e5,#0c0c0e, 18-99 d,#0c0c0e,
+|23: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-20 #e5e5e5,#0c0c0e, 21-99 d,#0c0c0e,
+|24: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-19 #e5e5e5,#0c0c0e, 20-99 d,#0c0c0e,
+|25: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #6a6d74,#0c0c0e,b 7-17 #e5e5e5,#0c0c0e, 18-99 d,#0c0c0e,
+|26: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-18 #e5e5e5,#0c0c0e, 19-99 d,#0c0c0e,
+|27: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-20 #e5e5e5,#0c0c0e, 21-99 d,#0c0c0e,
+|28: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-20 #e5e5e5,#0c0c0e, 21-99 d,#0c0c0e,
+|29: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-19 #e5e5e5,#0c0c0e, 20-99 d,#0c0c0e,
+|30: 0-0 d,#1a1c21, 1-1 d,#0c0c0e, 2-6 #62656c,#0c0c0e, 7-16 #e5e5e5,#0c0c0e, 17-99 d,#0c0c0e,
 == snap step-lagoon grid=100x31 cursor=7,26
 == style step-lagoon grid=100x31
-|0: 0-70 #bcd6cc,#28413d, 71-99 d,#28413d,
-|1: 0-1 #ffffff,#957763, 2-2 d,#33544c, 3-34 #c8e2d8,#33544c, 35-99 d,#33544c,
-|2: 0-1 #ffffff,#548073, 2-2 d,#28413d, 3-32 #bcd6cc,#28413d, 33-37 #e5c2e4,#28413d, 38-59 #bcd6cc,#28413d, 60-99 d,#28413d,
-|3: 0-0 d,#6e988c, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
-|4: 0-0 d,#6e988c, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
-|5: 0-0 d,#6e988c, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
-|6: 0-0 d,#6e988c, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
-|7: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
-|8: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
-|9: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
-|10: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
-|11: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
-|12: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-13 #bac9ce,#34464c, 14-99 d,#34464c,
-|13: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-13 #bac9ce,#34464c, 14-99 d,#34464c,
-|14: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-13 #bac9ce,#34464c, 14-99 d,#34464c,
-|15: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-13 #bac9ce,#34464c, 14-99 d,#34464c,
-|16: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-13 #bac9ce,#34464c, 14-99 d,#34464c,
-|17: 0-1 #000000,#84cebd, 2-2 d,#33544c, 3-32 #c8e2d8,#33544c, 33-39 #f1cef0,#33544c, 40-61 #c8e2d8,#33544c, 62-99 d,#33544c,
-|18: 0-0 d,#6e988c, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-21 #bac9ce,#34464c, 22-92 d,#34464c, 93-93 d,#28413d, 94-98 #bcd6cc,#28413d, 99-99 d,#28413d,
-|19: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-19 #bac9ce,#34464c, 20-99 d,#34464c,
-|20: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-16 #bac9ce,#34464c, 17-99 d,#34464c,
-|21: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-15 #bac9ce,#34464c, 16-99 d,#34464c,
-|22: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-17 #bac9ce,#34464c, 18-99 d,#34464c,
-|23: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-20 #bac9ce,#34464c, 21-99 d,#34464c,
-|24: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-19 #bac9ce,#34464c, 20-99 d,#34464c,
-|25: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-17 #bac9ce,#34464c, 18-99 d,#34464c,
-|26: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #83999c,#34464c,b 7-18 #bac9ce,#34464c, 19-99 d,#34464c,
-|27: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-20 #bac9ce,#34464c, 21-99 d,#34464c,
-|28: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-20 #bac9ce,#34464c, 21-99 d,#34464c,
-|29: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-19 #bac9ce,#34464c, 20-99 d,#34464c,
-|30: 0-0 d,#37474b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-16 #bac9ce,#34464c, 17-99 d,#34464c,
+|0: 0-70 #bbd7cb,#29443f, 71-99 d,#29443f,
+|1: 0-1 #ffffff,#9a7662, 2-2 d,#34574d, 3-34 #c7e3d7,#34574d, 35-99 d,#34574d,
+|2: 0-1 #ffffff,#548372, 2-2 d,#29443f, 3-32 #bbd7cb,#29443f, 33-37 #e4c2ec,#29443f, 38-59 #bbd7cb,#29443f, 60-99 d,#29443f,
+|3: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
+|4: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
+|5: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
+|6: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
+|7: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
+|8: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
+|9: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
+|10: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
+|11: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-12 #bac9ce,#34464c, 13-99 d,#34464c,
+|12: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-13 #bac9ce,#34464c, 14-99 d,#34464c,
+|13: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-13 #bac9ce,#34464c, 14-99 d,#34464c,
+|14: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-13 #bac9ce,#34464c, 14-99 d,#34464c,
+|15: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-13 #bac9ce,#34464c, 14-99 d,#34464c,
+|16: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-13 #bac9ce,#34464c, 14-99 d,#34464c,
+|17: 0-1 #000000,#81cfb7, 2-2 d,#34574d, 3-32 #c7e3d7,#34574d, 33-39 #f0cef8,#34574d, 40-61 #c7e3d7,#34574d, 62-99 d,#34574d,
+|18: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-21 #bac9ce,#34464c, 22-92 d,#34464c, 93-93 d,#29443f, 94-98 #bbd7cb,#29443f, 99-99 d,#29443f,
+|19: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-19 #bac9ce,#34464c, 20-99 d,#34464c,
+|20: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-16 #bac9ce,#34464c, 17-99 d,#34464c,
+|21: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-15 #bac9ce,#34464c, 16-99 d,#34464c,
+|22: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-17 #bac9ce,#34464c, 18-99 d,#34464c,
+|23: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-20 #bac9ce,#34464c, 21-99 d,#34464c,
+|24: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-19 #bac9ce,#34464c, 20-99 d,#34464c,
+|25: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-17 #bac9ce,#34464c, 18-99 d,#34464c,
+|26: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #83999c,#34464c,b 7-18 #bac9ce,#34464c, 19-99 d,#34464c,
+|27: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-20 #bac9ce,#34464c, 21-99 d,#34464c,
+|28: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-20 #bac9ce,#34464c, 21-99 d,#34464c,
+|29: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-19 #bac9ce,#34464c, 20-99 d,#34464c,
+|30: 0-0 d,#3a4c50, 1-1 d,#34464c, 2-6 #7b9194,#34464c, 7-16 #bac9ce,#34464c, 17-99 d,#34464c,
 == snap step-solarium grid=100x31 cursor=7,27
 == style step-solarium grid=100x31
-|0: 0-70 #c6d4be,#144043, 71-99 d,#144043,
-|1: 0-1 #ffffff,#3e7a94, 2-2 d,#234f50, 3-34 #d2e0ca,#234f50, 35-99 d,#234f50,
-|2: 0-1 #ffffff,#477f76, 2-2 d,#144043, 3-32 #c6d4be,#144043, 33-37 #e9c1e1,#144043, 38-59 #c6d4be,#144043, 60-99 d,#144043,
-|3: 0-0 d,#66978c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
-|4: 0-0 d,#66978c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
-|5: 0-0 d,#66978c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
-|6: 0-0 d,#66978c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
-|7: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
-|8: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
-|9: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
-|10: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
-|11: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
-|12: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-13 #a7b7ae,#173e45, 14-99 d,#173e45,
-|13: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-13 #a7b7ae,#173e45, 14-99 d,#173e45,
-|14: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-13 #a7b7ae,#173e45, 14-99 d,#173e45,
-|15: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-13 #a7b7ae,#173e45, 14-99 d,#173e45,
-|16: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-13 #a7b7ae,#173e45, 14-99 d,#173e45,
-|17: 0-1 #000000,#d7c36e, 2-2 d,#234f50, 3-32 #d2e0ca,#234f50, 33-39 #f5cded,#234f50, 40-61 #d2e0ca,#234f50, 62-99 d,#234f50,
-|18: 0-0 d,#66978c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-21 #a7b7ae,#173e45, 22-92 d,#173e45, 93-93 d,#144043, 94-98 #c6d4be,#144043, 99-99 d,#144043,
-|19: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-19 #a7b7ae,#173e45, 20-99 d,#173e45,
-|20: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-16 #a7b7ae,#173e45, 17-99 d,#173e45,
-|21: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-15 #a7b7ae,#173e45, 16-99 d,#173e45,
-|22: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-17 #a7b7ae,#173e45, 18-99 d,#173e45,
-|23: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-20 #a7b7ae,#173e45, 21-99 d,#173e45,
-|24: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-19 #a7b7ae,#173e45, 20-99 d,#173e45,
-|25: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-17 #a7b7ae,#173e45, 18-99 d,#173e45,
-|26: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-18 #a7b7ae,#173e45, 19-99 d,#173e45,
-|27: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #6c8684,#173e45,b 7-20 #a7b7ae,#173e45, 21-99 d,#173e45,
-|28: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-20 #a7b7ae,#173e45, 21-99 d,#173e45,
-|29: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-19 #a7b7ae,#173e45, 20-99 d,#173e45,
-|30: 0-0 d,#1f464c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-16 #a7b7ae,#173e45, 17-99 d,#173e45,
+|0: 0-70 #c7d4bd,#123f43, 71-99 d,#123f43,
+|1: 0-1 #ffffff,#347a9a, 2-2 d,#214e50, 3-34 #d3e0c9,#214e50, 35-99 d,#214e50,
+|2: 0-1 #ffffff,#467f76, 2-2 d,#123f43, 3-32 #c7d4bd,#123f43, 33-37 #e9c1e0,#123f43, 38-59 #c7d4bd,#123f43, 60-99 d,#123f43,
+|3: 0-0 d,#65978c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
+|4: 0-0 d,#65978c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
+|5: 0-0 d,#65978c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
+|6: 0-0 d,#65978c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
+|7: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
+|8: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
+|9: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
+|10: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
+|11: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-12 #a7b7ae,#173e45, 13-99 d,#173e45,
+|12: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-13 #a7b7ae,#173e45, 14-99 d,#173e45,
+|13: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-13 #a7b7ae,#173e45, 14-99 d,#173e45,
+|14: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-13 #a7b7ae,#173e45, 14-99 d,#173e45,
+|15: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-13 #a7b7ae,#173e45, 14-99 d,#173e45,
+|16: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-13 #a7b7ae,#173e45, 14-99 d,#173e45,
+|17: 0-1 #000000,#e1c266, 2-2 d,#214e50, 3-32 #d3e0c9,#214e50, 33-39 #f5cdec,#214e50, 40-61 #d3e0c9,#214e50, 62-99 d,#214e50,
+|18: 0-0 d,#65978c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-21 #a7b7ae,#173e45, 22-92 d,#173e45, 93-93 d,#123f43, 94-98 #c7d4bd,#123f43, 99-99 d,#123f43,
+|19: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-19 #a7b7ae,#173e45, 20-99 d,#173e45,
+|20: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-16 #a7b7ae,#173e45, 17-99 d,#173e45,
+|21: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-15 #a7b7ae,#173e45, 16-99 d,#173e45,
+|22: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-17 #a7b7ae,#173e45, 18-99 d,#173e45,
+|23: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-20 #a7b7ae,#173e45, 21-99 d,#173e45,
+|24: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-19 #a7b7ae,#173e45, 20-99 d,#173e45,
+|25: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-17 #a7b7ae,#173e45, 18-99 d,#173e45,
+|26: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-18 #a7b7ae,#173e45, 19-99 d,#173e45,
+|27: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #6c8684,#173e45,b 7-20 #a7b7ae,#173e45, 21-99 d,#173e45,
+|28: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-20 #a7b7ae,#173e45, 21-99 d,#173e45,
+|29: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-19 #a7b7ae,#173e45, 20-99 d,#173e45,
+|30: 0-0 d,#1c454c, 1-1 d,#173e45, 2-6 #647e7c,#173e45, 7-16 #a7b7ae,#173e45, 17-99 d,#173e45,
 == snap step-spectrum grid=100x31 cursor=7,27
 |18:      2 Theme orchard                                                                          Theme
 |19:      3 Theme dusk
@@ -261,37 +261,37 @@
 |29:     13 Theme clay
 |30:     14 Theme forge_black
 == style step-spectrum grid=100x31
-|0: 0-70 #dbd8bb,#373932, 71-99 d,#373932,
-|1: 0-1 #ffffff,#6a6796, 2-2 d,#494839, 3-34 #e7e4c7,#494839, 35-99 d,#494839,
-|2: 0-1 #ffffff,#8a8453, 2-2 d,#373932, 3-32 #dbd8bb,#373932, 33-37 #c9d5fc,#373932, 38-59 #dbd8bb,#373932, 60-99 d,#373932,
-|3: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
-|4: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
-|5: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
-|6: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
-|7: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
-|8: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
-|9: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
-|10: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
-|11: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
-|12: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-13 #fcfcfa,#100e11, 14-99 d,#100e11,
-|13: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-13 #fcfcfa,#100e11, 14-99 d,#100e11,
-|14: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-13 #fcfcfa,#100e11, 14-99 d,#100e11,
-|15: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-13 #fcfcfa,#100e11, 14-99 d,#100e11,
-|16: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-13 #fcfcfa,#100e11, 14-99 d,#100e11,
-|17: 0-1 #000000,#fcd666, 2-2 d,#494839, 3-32 #e7e4c7,#494839, 33-39 #dae1fd,#494839, 40-61 #e7e4c7,#494839, 62-99 d,#494839,
-|18: 0-0 d,#8f8e72, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-19 #fcfcfa,#100e11, 20-92 d,#100e11, 93-93 d,#373932, 94-98 #dbd8bb,#373932, 99-99 d,#373932,
-|19: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-16 #fcfcfa,#100e11, 17-99 d,#100e11,
-|20: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-15 #fcfcfa,#100e11, 16-99 d,#100e11,
-|21: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-17 #fcfcfa,#100e11, 18-99 d,#100e11,
-|22: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-20 #fcfcfa,#100e11, 21-99 d,#100e11,
-|23: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-19 #fcfcfa,#100e11, 20-99 d,#100e11,
-|24: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-17 #fcfcfa,#100e11, 18-99 d,#100e11,
-|25: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-18 #fcfcfa,#100e11, 19-99 d,#100e11,
-|26: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-20 #fcfcfa,#100e11, 21-99 d,#100e11,
-|27: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #706973,#100e11,b 7-20 #fcfcfa,#100e11, 21-99 d,#100e11,
-|28: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-19 #fcfcfa,#100e11, 20-99 d,#100e11,
-|29: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-16 #fcfcfa,#100e11, 17-99 d,#100e11,
-|30: 0-0 d,#212127, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-23 #fcfcfa,#100e11, 24-99 d,#100e11,
+|0: 0-70 #ddd8bb,#3b3830, 71-99 d,#3b3830,
+|1: 0-1 #ffffff,#706596, 2-2 d,#4d4736, 3-34 #e9e4c7,#4d4736, 35-99 d,#4d4736,
+|2: 0-1 #ffffff,#92844f, 2-2 d,#3b3830, 3-32 #ddd8bb,#3b3830, 33-37 #c5d7ff,#3b3830, 38-59 #ddd8bb,#3b3830, 60-99 d,#3b3830,
+|3: 0-0 d,#948d6f, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
+|4: 0-0 d,#948d6f, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
+|5: 0-0 d,#948d6f, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
+|6: 0-0 d,#948d6f, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
+|7: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
+|8: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
+|9: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
+|10: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
+|11: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-12 #fcfcfa,#100e11, 13-99 d,#100e11,
+|12: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-13 #fcfcfa,#100e11, 14-99 d,#100e11,
+|13: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-13 #fcfcfa,#100e11, 14-99 d,#100e11,
+|14: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-13 #fcfcfa,#100e11, 14-99 d,#100e11,
+|15: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-13 #fcfcfa,#100e11, 14-99 d,#100e11,
+|16: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-13 #fcfcfa,#100e11, 14-99 d,#100e11,
+|17: 0-1 #000000,#ffd866, 2-2 d,#4d4736, 3-32 #e9e4c7,#4d4736, 33-39 #d7e3ff,#4d4736, 40-61 #e9e4c7,#4d4736, 62-99 d,#4d4736,
+|18: 0-0 d,#948d6f, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-19 #fcfcfa,#100e11, 20-92 d,#100e11, 93-93 d,#3b3830, 94-98 #ddd8bb,#3b3830, 99-99 d,#3b3830,
+|19: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-16 #fcfcfa,#100e11, 17-99 d,#100e11,
+|20: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-15 #fcfcfa,#100e11, 16-99 d,#100e11,
+|21: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-17 #fcfcfa,#100e11, 18-99 d,#100e11,
+|22: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-20 #fcfcfa,#100e11, 21-99 d,#100e11,
+|23: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-19 #fcfcfa,#100e11, 20-99 d,#100e11,
+|24: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-17 #fcfcfa,#100e11, 18-99 d,#100e11,
+|25: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-18 #fcfcfa,#100e11, 19-99 d,#100e11,
+|26: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-20 #fcfcfa,#100e11, 21-99 d,#100e11,
+|27: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #706973,#100e11,b 7-20 #fcfcfa,#100e11, 21-99 d,#100e11,
+|28: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-19 #fcfcfa,#100e11, 20-99 d,#100e11,
+|29: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-16 #fcfcfa,#100e11, 17-99 d,#100e11,
+|30: 0-0 d,#211d23, 1-1 d,#100e11, 2-6 #68616b,#100e11, 7-23 #fcfcfa,#100e11, 24-99 d,#100e11,
 == snap step-harvest grid=100x31 cursor=7,27
 |18:      3 Theme dusk                                                                             Theme
 |19:      4 Theme ink
@@ -307,37 +307,37 @@
 |29:     14 Theme forge_black
 |30:     15 Theme forge_soft
 == style step-harvest grid=100x31
-|0: 0-70 #d6d8b8,#353b2e, 71-99 d,#353b2e,
-|1: 0-1 #ffffff,#975948, 2-2 d,#434c38, 3-34 #e2e4c4,#434c38, 35-99 d,#434c38,
-|2: 0-1 #ffffff,#7d7f4e, 2-2 d,#353b2e, 3-32 #d6d8b8,#353b2e, 33-37 #bbdbed,#353b2e, 38-59 #d6d8b8,#353b2e, 60-99 d,#353b2e,
-|3: 0-0 d,#898e60, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
-|4: 0-0 d,#898e60, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
-|5: 0-0 d,#898e60, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
-|6: 0-0 d,#898e60, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
-|7: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
-|8: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
-|9: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
-|10: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
-|11: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
-|12: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-13 #f3f2cc,#100e0b, 14-99 d,#100e0b,
-|13: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-13 #f3f2cc,#100e0b, 14-99 d,#100e0b,
-|14: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-13 #f3f2cc,#100e0b, 14-99 d,#100e0b,
-|15: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-13 #f3f2cc,#100e0b, 14-99 d,#100e0b,
-|16: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-13 #f3f2cc,#100e0b, 14-99 d,#100e0b,
-|17: 0-1 #000000,#dcc080, 2-2 d,#434c38, 3-32 #e2e4c4,#434c38, 33-39 #c7e7f8,#434c38, 40-61 #e2e4c4,#434c38, 62-99 d,#434c38,
-|18: 0-0 d,#898e60, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-16 #f3f2cc,#100e0b, 17-92 d,#100e0b, 93-93 d,#353b2e, 94-98 #d6d8b8,#353b2e, 99-99 d,#353b2e,
-|19: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-15 #f3f2cc,#100e0b, 16-99 d,#100e0b,
-|20: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-17 #f3f2cc,#100e0b, 18-99 d,#100e0b,
-|21: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-20 #f3f2cc,#100e0b, 21-99 d,#100e0b,
-|22: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-19 #f3f2cc,#100e0b, 20-99 d,#100e0b,
-|23: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-17 #f3f2cc,#100e0b, 18-99 d,#100e0b,
-|24: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-18 #f3f2cc,#100e0b, 19-99 d,#100e0b,
-|25: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-20 #f3f2cc,#100e0b, 21-99 d,#100e0b,
-|26: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-20 #f3f2cc,#100e0b, 21-99 d,#100e0b,
-|27: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #726c5e,#100e0b,b 7-19 #f3f2cc,#100e0b, 20-99 d,#100e0b,
-|28: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-16 #f3f2cc,#100e0b, 17-99 d,#100e0b,
-|29: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-23 #f3f2cc,#100e0b, 24-99 d,#100e0b,
-|30: 0-0 d,#201d18, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-22 #f3f2cc,#100e0b, 23-99 d,#100e0b,
+|0: 0-70 #d5d8b8,#343b2e, 71-99 d,#343b2e,
+|1: 0-1 #ffffff,#9b583f, 2-2 d,#424d38, 3-34 #e1e4c4,#424d38, 35-99 d,#424d38,
+|2: 0-1 #ffffff,#7b7e4e, 2-2 d,#343b2e, 3-32 #d5d8b8,#343b2e, 33-37 #badbeb,#343b2e, 38-59 #d5d8b8,#343b2e, 60-99 d,#343b2e,
+|3: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
+|4: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
+|5: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
+|6: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
+|7: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
+|8: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
+|9: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
+|10: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
+|11: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-12 #f3f2cc,#100e0b, 13-99 d,#100e0b,
+|12: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-13 #f3f2cc,#100e0b, 14-99 d,#100e0b,
+|13: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-13 #f3f2cc,#100e0b, 14-99 d,#100e0b,
+|14: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-13 #f3f2cc,#100e0b, 14-99 d,#100e0b,
+|15: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-13 #f3f2cc,#100e0b, 14-99 d,#100e0b,
+|16: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-13 #f3f2cc,#100e0b, 14-99 d,#100e0b,
+|17: 0-1 #000000,#d8bd83, 2-2 d,#424d38, 3-32 #e1e4c4,#424d38, 33-39 #c5e7f7,#424d38, 40-61 #e1e4c4,#424d38, 62-99 d,#424d38,
+|18: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-16 #f3f2cc,#100e0b, 17-92 d,#100e0b, 93-93 d,#343b2e, 94-98 #d5d8b8,#343b2e, 99-99 d,#343b2e,
+|19: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-15 #f3f2cc,#100e0b, 16-99 d,#100e0b,
+|20: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-17 #f3f2cc,#100e0b, 18-99 d,#100e0b,
+|21: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-20 #f3f2cc,#100e0b, 21-99 d,#100e0b,
+|22: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-19 #f3f2cc,#100e0b, 20-99 d,#100e0b,
+|23: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-17 #f3f2cc,#100e0b, 18-99 d,#100e0b,
+|24: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-18 #f3f2cc,#100e0b, 19-99 d,#100e0b,
+|25: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-20 #f3f2cc,#100e0b, 21-99 d,#100e0b,
+|26: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-20 #f3f2cc,#100e0b, 21-99 d,#100e0b,
+|27: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #726c5e,#100e0b,b 7-19 #f3f2cc,#100e0b, 20-99 d,#100e0b,
+|28: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-16 #f3f2cc,#100e0b, 17-99 d,#100e0b,
+|29: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-23 #f3f2cc,#100e0b, 24-99 d,#100e0b,
+|30: 0-0 d,#201d17, 1-1 d,#100e0b, 2-6 #6a6456,#100e0b, 7-22 #f3f2cc,#100e0b, 23-99 d,#100e0b,
 == snap step-clay grid=100x31 cursor=7,27
 |18:      4 Theme ink                                                                              Theme
 |19:      5 Theme paper
@@ -353,13 +353,13 @@
 |29:     15 Theme forge_soft
 |30:     16 Theme orchard_black
 == style step-clay grid=100x31
-|0: 0-70 #d7d6b6,#343f35, 71-99 d,#343f35,
-|1: 0-1 #ffffff,#895d61, 2-2 d,#424f3f, 3-34 #e3e2c2,#424f3f, 35-99 d,#424f3f,
-|2: 0-1 #ffffff,#6a7c4d, 2-2 d,#343f35, 3-32 #d7d6b6,#343f35, 33-37 #ace0e1,#343f35, 38-59 #d7d6b6,#343f35, 60-99 d,#343f35,
-|3: 0-0 d,#8c9366, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-12 #f3e5bc,#10100e, 13-99 d,#10100e,
-|4: 0-0 d,#8c9366, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-12 #f3e5bc,#10100e, 13-99 d,#10100e,
-|5: 0-0 d,#8c9366, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-12 #f3e5bc,#10100e, 13-99 d,#10100e,
-|6: 0-0 d,#8c9366, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-12 #f3e5bc,#10100e, 13-99 d,#10100e,
+|0: 0-70 #d7d6b6,#343f36, 71-99 d,#343f36,
+|1: 0-1 #ffffff,#875e65, 2-2 d,#424f40, 3-34 #e3e2c2,#424f40, 35-99 d,#424f40,
+|2: 0-1 #ffffff,#687c4d, 2-2 d,#343f36, 3-32 #d7d6b6,#343f36, 33-37 #aae0e0,#343f36, 38-59 #d7d6b6,#343f36, 60-99 d,#343f36,
+|3: 0-0 d,#8c9467, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-12 #f3e5bc,#10100e, 13-99 d,#10100e,
+|4: 0-0 d,#8c9467, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-12 #f3e5bc,#10100e, 13-99 d,#10100e,
+|5: 0-0 d,#8c9467, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-12 #f3e5bc,#10100e, 13-99 d,#10100e,
+|6: 0-0 d,#8c9467, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-12 #f3e5bc,#10100e, 13-99 d,#10100e,
 |7: 0-0 d,#222119, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-12 #f3e5bc,#10100e, 13-99 d,#10100e,
 |8: 0-0 d,#222119, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-12 #f3e5bc,#10100e, 13-99 d,#10100e,
 |9: 0-0 d,#222119, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-12 #f3e5bc,#10100e, 13-99 d,#10100e,
@@ -370,8 +370,8 @@
 |14: 0-0 d,#222119, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-13 #f3e5bc,#10100e, 14-99 d,#10100e,
 |15: 0-0 d,#222119, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-13 #f3e5bc,#10100e, 14-99 d,#10100e,
 |16: 0-0 d,#222119, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-13 #f3e5bc,#10100e, 14-99 d,#10100e,
-|17: 0-1 #000000,#92c776, 2-2 d,#424f3f, 3-32 #e3e2c2,#424f3f, 33-39 #b7eced,#424f3f, 40-61 #e3e2c2,#424f3f, 62-99 d,#424f3f,
-|18: 0-0 d,#8c9366, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-15 #f3e5bc,#10100e, 16-92 d,#10100e, 93-93 d,#343f35, 94-98 #d7d6b6,#343f35, 99-99 d,#343f35,
+|17: 0-1 #000000,#8ac874, 2-2 d,#424f40, 3-32 #e3e2c2,#424f40, 33-39 #b5ecec,#424f40, 40-61 #e3e2c2,#424f40, 62-99 d,#424f40,
+|18: 0-0 d,#8c9467, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-15 #f3e5bc,#10100e, 16-92 d,#10100e, 93-93 d,#343f36, 94-98 #d7d6b6,#343f36, 99-99 d,#343f36,
 |19: 0-0 d,#222119, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-17 #f3e5bc,#10100e, 18-99 d,#10100e,
 |20: 0-0 d,#222119, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-20 #f3e5bc,#10100e, 21-99 d,#10100e,
 |21: 0-0 d,#222119, 1-1 d,#10100e, 2-6 #696455,#10100e, 7-19 #f3e5bc,#10100e, 20-99 d,#10100e,
@@ -399,37 +399,37 @@
 |29:     16 Theme orchard_black
 |30:     17
 == style step-forge-black grid=100x31
-|0: 0-70 #c7cacf,#24282c, 71-99 d,#24282c,
-|1: 0-1 #ffffff,#6d7867, 2-2 d,#2f3740, 3-34 #d3d6db,#2f3740, 35-99 d,#2f3740,
-|2: 0-1 #ffffff,#576676, 2-2 d,#24282c, 3-32 #c7cacf,#24282c, 33-37 #e5c2a2,#24282c, 38-59 #c7cacf,#24282c, 60-99 d,#24282c,
-|3: 0-0 d,#738290, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
-|4: 0-0 d,#738290, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
-|5: 0-0 d,#738290, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
-|6: 0-0 d,#738290, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
-|7: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
-|8: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
-|9: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
-|10: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
-|11: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
-|12: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-13 #f6f6f6,#000000, 14-99 d,#000000,
-|13: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-13 #f6f6f6,#000000, 14-99 d,#000000,
-|14: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-13 #f6f6f6,#000000, 14-99 d,#000000,
-|15: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-13 #f6f6f6,#000000, 14-99 d,#000000,
-|16: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-13 #f6f6f6,#000000, 14-99 d,#000000,
-|17: 0-1 #000000,#9ac4ea, 2-2 d,#2f3740, 3-32 #d3d6db,#2f3740, 33-39 #f1ceae,#2f3740, 40-61 #d3d6db,#2f3740, 62-99 d,#2f3740,
-|18: 0-0 d,#738290, 1-1 d,#000000, 2-6 #62656c,#000000, 7-17 #f6f6f6,#000000, 18-92 d,#000000, 93-93 d,#24282c, 94-98 #c7cacf,#24282c, 99-99 d,#24282c,
-|19: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-20 #f6f6f6,#000000, 21-99 d,#000000,
-|20: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-19 #f6f6f6,#000000, 20-99 d,#000000,
-|21: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-17 #f6f6f6,#000000, 18-99 d,#000000,
-|22: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-18 #f6f6f6,#000000, 19-99 d,#000000,
-|23: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-20 #f6f6f6,#000000, 21-99 d,#000000,
-|24: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-20 #f6f6f6,#000000, 21-99 d,#000000,
-|25: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-19 #f6f6f6,#000000, 20-99 d,#000000,
-|26: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-16 #f6f6f6,#000000, 17-99 d,#000000,
-|27: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #6a6d74,#000000,b 7-23 #f6f6f6,#000000, 24-99 d,#000000,
-|28: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-22 #f6f6f6,#000000, 23-99 d,#000000,
-|29: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-25 #f6f6f6,#000000, 26-99 d,#000000,
-|30: 0-0 d,#15171a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-99 d,#000000,
+|0: 0-70 #c5c9d2,#22252b, 71-99 d,#22252b,
+|1: 0-1 #ffffff,#6a7b67, 2-2 d,#2d3440, 3-34 #d1d5de,#2d3440, 35-99 d,#2d3440,
+|2: 0-1 #ffffff,#55647b, 2-2 d,#22252b, 3-32 #c5c9d2,#22252b, 33-37 #ecbf9b,#22252b, 38-59 #c5c9d2,#22252b, 60-99 d,#22252b,
+|3: 0-0 d,#708095, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
+|4: 0-0 d,#708095, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
+|5: 0-0 d,#708095, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
+|6: 0-0 d,#708095, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
+|7: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
+|8: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
+|9: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
+|10: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
+|11: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-12 #f6f6f6,#000000, 13-99 d,#000000,
+|12: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-13 #f6f6f6,#000000, 14-99 d,#000000,
+|13: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-13 #f6f6f6,#000000, 14-99 d,#000000,
+|14: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-13 #f6f6f6,#000000, 14-99 d,#000000,
+|15: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-13 #f6f6f6,#000000, 14-99 d,#000000,
+|16: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-13 #f6f6f6,#000000, 14-99 d,#000000,
+|17: 0-1 #000000,#9cc3f7, 2-2 d,#2d3440, 3-32 #d1d5de,#2d3440, 33-39 #f8cba7,#2d3440, 40-61 #d1d5de,#2d3440, 62-99 d,#2d3440,
+|18: 0-0 d,#708095, 1-1 d,#000000, 2-6 #62656c,#000000, 7-17 #f6f6f6,#000000, 18-92 d,#000000, 93-93 d,#22252b, 94-98 #c5c9d2,#22252b, 99-99 d,#22252b,
+|19: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-20 #f6f6f6,#000000, 21-99 d,#000000,
+|20: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-19 #f6f6f6,#000000, 20-99 d,#000000,
+|21: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-17 #f6f6f6,#000000, 18-99 d,#000000,
+|22: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-18 #f6f6f6,#000000, 19-99 d,#000000,
+|23: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-20 #f6f6f6,#000000, 21-99 d,#000000,
+|24: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-20 #f6f6f6,#000000, 21-99 d,#000000,
+|25: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-19 #f6f6f6,#000000, 20-99 d,#000000,
+|26: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-16 #f6f6f6,#000000, 17-99 d,#000000,
+|27: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #6a6d74,#000000,b 7-23 #f6f6f6,#000000, 24-99 d,#000000,
+|28: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-22 #f6f6f6,#000000, 23-99 d,#000000,
+|29: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-25 #f6f6f6,#000000, 26-99 d,#000000,
+|30: 0-0 d,#14161a, 1-1 d,#000000, 2-6 #62656c,#000000, 7-99 d,#000000,
 == snap step-forge-soft grid=100x31 cursor=7,27
 |18:      6 Theme daybreak                                                                         Theme
 |19:      7 Theme atelier
@@ -445,37 +445,37 @@
 |29:     17
 |30:     18 # Legacy and imported themes
 == style step-forge-soft grid=100x31
-|0: 0-70 #c5c9d2,#292c33, 71-99 d,#292c33,
-|1: 0-1 #ffffff,#6d7f6c, 2-2 d,#363d48, 3-34 #d1d5de,#363d48, 35-99 d,#363d48,
-|2: 0-1 #ffffff,#55647b, 2-2 d,#292c33, 3-32 #c5c9d2,#292c33, 33-37 #ecbf9b,#292c33, 38-59 #c5c9d2,#292c33, 60-99 d,#292c33,
+|0: 0-70 #c5c9d2,#2a2d34, 71-99 d,#2a2d34,
+|1: 0-1 #ffffff,#6d7f6c, 2-2 d,#373e49, 3-34 #d1d5de,#373e49, 35-99 d,#373e49,
+|2: 0-1 #ffffff,#55647b, 2-2 d,#2a2d34, 3-32 #c5c9d2,#2a2d34, 33-37 #ecbf9b,#2a2d34, 38-59 #c5c9d2,#2a2d34, 60-99 d,#2a2d34,
 |3: 0-0 d,#708095, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-12 #bfc3cc,#35383e, 13-99 d,#35383e,
 |4: 0-0 d,#708095, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-12 #bfc3cc,#35383e, 13-99 d,#35383e,
 |5: 0-0 d,#708095, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-12 #bfc3cc,#35383e, 13-99 d,#35383e,
 |6: 0-0 d,#708095, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-12 #bfc3cc,#35383e, 13-99 d,#35383e,
-|7: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-12 #bfc3cc,#35383e, 13-99 d,#35383e,
-|8: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-12 #bfc3cc,#35383e, 13-99 d,#35383e,
-|9: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-12 #bfc3cc,#35383e, 13-99 d,#35383e,
-|10: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-12 #bfc3cc,#35383e, 13-99 d,#35383e,
-|11: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-12 #bfc3cc,#35383e, 13-99 d,#35383e,
-|12: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-13 #bfc3cc,#35383e, 14-99 d,#35383e,
-|13: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-13 #bfc3cc,#35383e, 14-99 d,#35383e,
-|14: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-13 #bfc3cc,#35383e, 14-99 d,#35383e,
-|15: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-13 #bfc3cc,#35383e, 14-99 d,#35383e,
-|16: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-13 #bfc3cc,#35383e, 14-99 d,#35383e,
-|17: 0-1 #000000,#9cc3f7, 2-2 d,#363d48, 3-32 #d1d5de,#363d48, 33-39 #f8cba7,#363d48, 40-61 #d1d5de,#363d48, 62-99 d,#363d48,
-|18: 0-0 d,#708095, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-20 #bfc3cc,#35383e, 21-92 d,#35383e, 93-93 d,#292c33, 94-98 #c5c9d2,#292c33, 99-99 d,#292c33,
-|19: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-19 #bfc3cc,#35383e, 20-99 d,#35383e,
-|20: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-17 #bfc3cc,#35383e, 18-99 d,#35383e,
-|21: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-18 #bfc3cc,#35383e, 19-99 d,#35383e,
-|22: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-20 #bfc3cc,#35383e, 21-99 d,#35383e,
-|23: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-20 #bfc3cc,#35383e, 21-99 d,#35383e,
-|24: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-19 #bfc3cc,#35383e, 20-99 d,#35383e,
-|25: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-16 #bfc3cc,#35383e, 17-99 d,#35383e,
-|26: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-23 #bfc3cc,#35383e, 24-99 d,#35383e,
-|27: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #8e9199,#35383e,b 7-22 #bfc3cc,#35383e, 23-99 d,#35383e,
-|28: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-25 #bfc3cc,#35383e, 26-99 d,#35383e,
-|29: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-99 d,#35383e,
-|30: 0-0 d,#393c43, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-34 #bfc3cc,#35383e, 35-99 d,#35383e,
+|7: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-12 #bfc3cc,#35383e, 13-99 d,#35383e,
+|8: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-12 #bfc3cc,#35383e, 13-99 d,#35383e,
+|9: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-12 #bfc3cc,#35383e, 13-99 d,#35383e,
+|10: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-12 #bfc3cc,#35383e, 13-99 d,#35383e,
+|11: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-12 #bfc3cc,#35383e, 13-99 d,#35383e,
+|12: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-13 #bfc3cc,#35383e, 14-99 d,#35383e,
+|13: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-13 #bfc3cc,#35383e, 14-99 d,#35383e,
+|14: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-13 #bfc3cc,#35383e, 14-99 d,#35383e,
+|15: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-13 #bfc3cc,#35383e, 14-99 d,#35383e,
+|16: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-13 #bfc3cc,#35383e, 14-99 d,#35383e,
+|17: 0-1 #000000,#9cc3f7, 2-2 d,#373e49, 3-32 #d1d5de,#373e49, 33-39 #f8cba7,#373e49, 40-61 #d1d5de,#373e49, 62-99 d,#373e49,
+|18: 0-0 d,#708095, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-20 #bfc3cc,#35383e, 21-92 d,#35383e, 93-93 d,#2a2d34, 94-98 #c5c9d2,#2a2d34, 99-99 d,#2a2d34,
+|19: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-19 #bfc3cc,#35383e, 20-99 d,#35383e,
+|20: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-17 #bfc3cc,#35383e, 18-99 d,#35383e,
+|21: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-18 #bfc3cc,#35383e, 19-99 d,#35383e,
+|22: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-20 #bfc3cc,#35383e, 21-99 d,#35383e,
+|23: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-20 #bfc3cc,#35383e, 21-99 d,#35383e,
+|24: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-19 #bfc3cc,#35383e, 20-99 d,#35383e,
+|25: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-16 #bfc3cc,#35383e, 17-99 d,#35383e,
+|26: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-23 #bfc3cc,#35383e, 24-99 d,#35383e,
+|27: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #8e9199,#35383e,b 7-22 #bfc3cc,#35383e, 23-99 d,#35383e,
+|28: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-25 #bfc3cc,#35383e, 26-99 d,#35383e,
+|29: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-99 d,#35383e,
+|30: 0-0 d,#3d4047, 1-1 d,#35383e, 2-6 #868991,#35383e, 7-34 #bfc3cc,#35383e, 35-99 d,#35383e,
 == snap step-orchard-black grid=100x31 cursor=7,27
 |18:      7 Theme atelier                                                                          Theme
 |19:      8 Theme forge
@@ -491,37 +491,37 @@
 |29:     18 # Legacy and imported themes
 |30:     19 Theme helix
 == style step-orchard-black grid=100x31
-|0: 0-70 #b4c4bb,#1e2926, 71-99 d,#1e2926,
-|1: 0-1 #ffffff,#857557, 2-2 d,#283730, 3-34 #c0d0c7,#283730, 35-99 d,#283730,
-|2: 0-1 #ffffff,#4a665a, 2-2 d,#1e2926, 3-32 #b4c4bb,#1e2926, 33-37 #d6b2d3,#1e2926, 38-59 #b4c4bb,#1e2926, 60-99 d,#1e2926,
-|3: 0-0 d,#62826d, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
-|4: 0-0 d,#62826d, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
-|5: 0-0 d,#62826d, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
-|6: 0-0 d,#62826d, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
-|7: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
-|8: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
-|9: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
-|10: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
-|11: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
-|12: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-13 #f2f8ef,#000000, 14-99 d,#000000,
-|13: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-13 #f2f8ef,#000000, 14-99 d,#000000,
-|14: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-13 #f2f8ef,#000000, 14-99 d,#000000,
-|15: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-13 #f2f8ef,#000000, 14-99 d,#000000,
-|16: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-13 #f2f8ef,#000000, 14-99 d,#000000,
-|17: 0-1 #000000,#abd195, 2-2 d,#283730, 3-32 #c0d0c7,#283730, 33-39 #e2bedf,#283730, 40-61 #c0d0c7,#283730, 62-99 d,#283730,
-|18: 0-0 d,#62826d, 1-1 d,#000000, 2-6 #59675c,#000000, 7-19 #f2f8ef,#000000, 20-92 d,#000000, 93-93 d,#1e2926, 94-98 #b4c4bb,#1e2926, 99-99 d,#1e2926,
-|19: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-17 #f2f8ef,#000000, 18-99 d,#000000,
-|20: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-18 #f2f8ef,#000000, 19-99 d,#000000,
-|21: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-20 #f2f8ef,#000000, 21-99 d,#000000,
-|22: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-20 #f2f8ef,#000000, 21-99 d,#000000,
-|23: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-19 #f2f8ef,#000000, 20-99 d,#000000,
-|24: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-16 #f2f8ef,#000000, 17-99 d,#000000,
-|25: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-23 #f2f8ef,#000000, 24-99 d,#000000,
-|26: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-22 #f2f8ef,#000000, 23-99 d,#000000,
-|27: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #616f64,#000000,b 7-25 #f2f8ef,#000000, 26-99 d,#000000,
-|28: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-99 d,#000000,
-|29: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-34 #f2f8ef,#000000, 35-99 d,#000000,
-|30: 0-0 d,#151c18, 1-1 d,#000000, 2-6 #59675c,#000000, 7-17 #f2f8ef,#000000, 18-99 d,#000000,
+|0: 0-70 #b2c3b8,#1d2824, 71-99 d,#1d2824,
+|1: 0-1 #ffffff,#887455, 2-2 d,#26362d, 3-34 #becfc4,#26362d, 35-99 d,#26362d,
+|2: 0-1 #ffffff,#496656, 2-2 d,#1d2824, 3-32 #b2c3b8,#1d2824, 33-37 #d3b0d9,#1d2824, 38-59 #b2c3b8,#1d2824, 60-99 d,#1d2824,
+|3: 0-0 d,#608269, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
+|4: 0-0 d,#608269, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
+|5: 0-0 d,#608269, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
+|6: 0-0 d,#608269, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
+|7: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
+|8: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
+|9: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
+|10: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
+|11: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-12 #f2f8ef,#000000, 13-99 d,#000000,
+|12: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-13 #f2f8ef,#000000, 14-99 d,#000000,
+|13: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-13 #f2f8ef,#000000, 14-99 d,#000000,
+|14: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-13 #f2f8ef,#000000, 14-99 d,#000000,
+|15: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-13 #f2f8ef,#000000, 14-99 d,#000000,
+|16: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-13 #f2f8ef,#000000, 14-99 d,#000000,
+|17: 0-1 #000000,#add38a, 2-2 d,#26362d, 3-32 #becfc4,#26362d, 33-39 #dfbce5,#26362d, 40-61 #becfc4,#26362d, 62-99 d,#26362d,
+|18: 0-0 d,#608269, 1-1 d,#000000, 2-6 #59675c,#000000, 7-19 #f2f8ef,#000000, 20-92 d,#000000, 93-93 d,#1d2824, 94-98 #b2c3b8,#1d2824, 99-99 d,#1d2824,
+|19: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-17 #f2f8ef,#000000, 18-99 d,#000000,
+|20: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-18 #f2f8ef,#000000, 19-99 d,#000000,
+|21: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-20 #f2f8ef,#000000, 21-99 d,#000000,
+|22: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-20 #f2f8ef,#000000, 21-99 d,#000000,
+|23: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-19 #f2f8ef,#000000, 20-99 d,#000000,
+|24: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-16 #f2f8ef,#000000, 17-99 d,#000000,
+|25: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-23 #f2f8ef,#000000, 24-99 d,#000000,
+|26: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-22 #f2f8ef,#000000, 23-99 d,#000000,
+|27: 0-0 d,#111813, 1-1 d,#000000, 2-6 #616f64,#000000,b 7-25 #f2f8ef,#000000, 26-99 d,#000000,
+|28: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-99 d,#000000,
+|29: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-34 #f2f8ef,#000000, 35-99 d,#000000,
+|30: 0-0 d,#111813, 1-1 d,#000000, 2-6 #59675c,#000000, 7-17 #f2f8ef,#000000, 18-99 d,#000000,
 == snap step-helix grid=100x31 cursor=7,27
 |18:     10 Theme solarium                                                                         Theme
 |19:     11 Theme spectrum
@@ -537,37 +537,37 @@
 |29:     21 Theme acme
 |30:     22 Theme acid
 == style step-helix grid=100x31
-|0: 0-70 #979998,#131414, 71-99 d,#131414,
-|1: 0-1 #ffffff,#837048, 2-2 d,#141615, 3-34 #989a99,#141615, 35-99 d,#141615,
-|2: 0-1 #ffffff,#2a2c2b, 2-2 d,#131414, 3-32 #979998,#131414, 33-37 #9a979b,#131414, 38-59 #979998,#131414, 60-99 d,#131414,
-|3: 0-0 d,#474a48, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
-|4: 0-0 d,#474a48, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
-|5: 0-0 d,#474a48, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
-|6: 0-0 d,#474a48, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
-|7: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
-|8: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
-|9: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
-|10: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
-|11: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
-|12: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-99 d,#080808,
-|13: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-99 d,#080808,
-|14: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-99 d,#080808,
-|15: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-99 d,#080808,
-|16: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-99 d,#080808,
-|17: 0-1 #ffffff,#6a6d66, 2-2 d,#141615, 3-32 #989a99,#141615, 33-39 #9c989c,#141615, 40-61 #989a99,#141615, 62-99 d,#141615,
-|18: 0-0 d,#474a48, 1-1 d,#080808, 2-6 #626262,#080808, 7-20 #bdbdbd,#080808, 21-92 d,#080808, 93-93 d,#131414, 94-98 #979998,#131414, 99-99 d,#131414,
-|19: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-20 #bdbdbd,#080808, 21-99 d,#080808,
-|20: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-99 d,#080808,
-|21: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-16 #bdbdbd,#080808, 17-99 d,#080808,
-|22: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-23 #bdbdbd,#080808, 24-99 d,#080808,
-|23: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-22 #bdbdbd,#080808, 23-99 d,#080808,
-|24: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-25 #bdbdbd,#080808, 26-99 d,#080808,
-|25: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808,
-|26: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-34 #bdbdbd,#080808, 35-99 d,#080808,
-|27: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808,b 7-17 #bdbdbd,#080808, 18-99 d,#080808,
-|28: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-16 #bdbdbd,#080808, 17-99 d,#080808,
-|29: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-16 #bdbdbd,#080808, 17-99 d,#080808,
-|30: 0-0 d,#121312, 1-1 d,#080808, 2-6 #626262,#080808, 7-16 #bdbdbd,#080808, 17-99 d,#080808,
+|0: 0-70 #949494,#121212, 71-99 d,#121212,
+|1: 0-1 #ffffff,#826f46, 2-2 d,#121212, 3-34 #949494,#121212, 35-99 d,#121212,
+|2: 0-1 #ffffff,#262626, 2-2 d,#121212, 3-59 #949494,#121212, 60-99 d,#121212,
+|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,
+|5: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
+|6: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
+|7: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
+|8: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
+|9: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
+|10: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
+|11: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808,
+|12: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-99 d,#080808,
+|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-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-99 d,#080808,
+|17: 0-1 #ffffff,#626262, 2-2 d,#121212, 3-61 #949494,#121212, 62-99 d,#121212,
+|18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-20 #bdbdbd,#080808, 21-92 d,#080808, 93-93 d,#121212, 94-98 #949494,#121212, 99-99 d,#121212,
+|19: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-20 #bdbdbd,#080808, 21-99 d,#080808,
+|20: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-99 d,#080808,
+|21: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-16 #bdbdbd,#080808, 17-99 d,#080808,
+|22: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-23 #bdbdbd,#080808, 24-99 d,#080808,
+|23: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-22 #bdbdbd,#080808, 23-99 d,#080808,
+|24: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-25 #bdbdbd,#080808, 26-99 d,#080808,
+|25: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808,
+|26: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-34 #bdbdbd,#080808, 35-99 d,#080808,
+|27: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808,b 7-17 #bdbdbd,#080808, 18-99 d,#080808,
+|28: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-16 #bdbdbd,#080808, 17-99 d,#080808,
+|29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-16 #bdbdbd,#080808, 17-99 d,#080808,
+|30: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-16 #bdbdbd,#080808, 17-99 d,#080808,
 == snap step-dark grid=100x31 cursor=7,27
 |18:     11 Theme spectrum                                                                         Theme
 |19:     12 Theme harvest
@@ -583,37 +583,37 @@
 |29:     22 Theme acid
 |30:     23 Theme acme_helix
 == style step-dark grid=100x31
-|0: 0-70 #969696,#29283a, 71-99 d,#29283a,
-|1: 0-1 #ffffff,#86794d, 2-2 d,#29283a, 3-34 #969696,#29283a, 35-99 d,#29283a,
-|2: 0-1 #ffffff,#343853, 2-2 d,#29283a, 3-59 #969696,#29283a, 60-99 d,#29283a,
-|3: 0-0 d,#515151, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|4: 0-0 d,#515151, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|5: 0-0 d,#515151, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|6: 0-0 d,#515151, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|7: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|8: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|9: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|10: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|11: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|12: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|13: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|14: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|15: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|16: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|17: 0-1 #ffffff,#6643d3, 2-2 d,#29283a, 3-61 #969696,#29283a, 62-99 d,#29283a,
-|18: 0-0 d,#515151, 1-1 d,d, 2-6 #5a5a5a,d, 7-92 d,d, 93-93 d,#29283a, 94-98 #969696,#29283a, 99-99 d,#29283a,
-|19: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|20: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|21: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|22: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|23: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|24: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|25: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|26: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|27: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d,b 7-99 d,d,
-|28: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|29: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
-|30: 0-0 d,#282828, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|0: 0-70 #969696,#2c2a3e, 71-99 d,#2c2a3e,
+|1: 0-1 #ffffff,#867a4e, 2-2 d,#2c2a3e, 3-34 #969696,#2c2a3e, 35-99 d,#2c2a3e,
+|2: 0-1 #ffffff,#353a58, 2-2 d,#2c2a3e, 3-59 #969696,#2c2a3e, 60-99 d,#2c2a3e,
+|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,
+|5: 0-0 d,#525252, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|6: 0-0 d,#525252, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|7: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|8: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|9: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|10: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|11: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|12: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|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-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|17: 0-1 #ffffff,#663fe0, 2-2 d,#2c2a3e, 3-61 #969696,#2c2a3e, 62-99 d,#2c2a3e,
+|18: 0-0 d,#525252, 1-1 d,d, 2-6 #5a5a5a,d, 7-92 d,d, 93-93 d,#2c2a3e, 94-98 #969696,#2c2a3e, 99-99 d,#2c2a3e,
+|19: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|20: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|21: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|22: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|23: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|24: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|25: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|26: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|27: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d,b 7-99 d,d,
+|28: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|29: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
+|30: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d,
 == snap step-acme grid=100x31 cursor=7,27
 |18:     12 Theme harvest                                                                          Theme
 |19:     13 Theme clay
@@ -629,37 +629,37 @@
 |29:     23 Theme acme_helix
 |30:     24 Theme adwaita_dark
 == style step-acme grid=100x31
-|0: 0-70 #0f0f0f,#d7eaec, 71-99 d,#d7eaec,
-|1: 0-1 #000000,#bfa37a, 2-2 d,#d7eaec, 3-34 #0f0f0f,#d7eaec, 35-99 d,#d7eaec,
-|2: 0-1 #ffffff,#353a58, 2-2 d,#d7eaec, 3-59 #0f0f0f,#d7eaec, 60-99 d,#d7eaec,
-|3: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|4: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|5: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|6: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|7: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|8: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|9: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|10: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|11: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|12: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
-|13: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
-|14: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
-|15: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
-|16: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
-|17: 0-1 #ffffff,#663fe0, 2-2 d,#d7eaec, 3-61 #0f0f0f,#d7eaec, 62-99 d,#d7eaec,
-|18: 0-0 d,#eeeedb, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-19 #000000,#ffffea, 20-92 d,#ffffea, 93-93 d,#d7eaec, 94-98 #0f0f0f,#d7eaec, 99-99 d,#d7eaec,
-|19: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-99 d,#ffffea,
-|20: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-23 #000000,#ffffea, 24-99 d,#ffffea,
-|21: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-22 #000000,#ffffea, 23-99 d,#ffffea,
-|22: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-25 #000000,#ffffea, 26-99 d,#ffffea,
-|23: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-99 d,#ffffea,
-|24: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-34 #000000,#ffffea, 35-99 d,#ffffea,
-|25: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-17 #000000,#ffffea, 18-99 d,#ffffea,
-|26: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-99 d,#ffffea,
-|27: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea,b 7-16 #000000,#ffffea, 17-99 d,#ffffea,
-|28: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-99 d,#ffffea,
-|29: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-22 #000000,#ffffea, 23-99 d,#ffffea,
-|30: 0-0 d,#8e8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-24 #000000,#ffffea, 25-99 d,#ffffea,
+|0: 0-70 #000000,#eaffff, 71-99 d,#eaffff,
+|1: 0-1 #000000,#c5a87f, 2-2 d,#eaffff, 3-34 #000000,#eaffff, 35-99 d,#eaffff,
+|2: 0-1 #ffffff,#353a58, 2-2 d,#eaffff, 3-59 #000000,#eaffff, 60-99 d,#eaffff,
+|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,
+|5: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
+|6: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
+|7: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
+|8: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
+|9: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
+|10: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
+|11: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
+|12: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
+|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-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
+|17: 0-1 #ffffff,#663fe0, 2-2 d,#eaffff, 3-61 #000000,#eaffff, 62-99 d,#eaffff,
+|18: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-19 #000000,#ffffea, 20-92 d,#ffffea, 93-93 d,#eaffff, 94-98 #000000,#eaffff, 99-99 d,#eaffff,
+|19: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-99 d,#ffffea,
+|20: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-23 #000000,#ffffea, 24-99 d,#ffffea,
+|21: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-22 #000000,#ffffea, 23-99 d,#ffffea,
+|22: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-25 #000000,#ffffea, 26-99 d,#ffffea,
+|23: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-99 d,#ffffea,
+|24: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-34 #000000,#ffffea, 35-99 d,#ffffea,
+|25: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-17 #000000,#ffffea, 18-99 d,#ffffea,
+|26: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-99 d,#ffffea,
+|27: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea,b 7-16 #000000,#ffffea, 17-99 d,#ffffea,
+|28: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-99 d,#ffffea,
+|29: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-22 #000000,#ffffea, 23-99 d,#ffffea,
+|30: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-24 #000000,#ffffea, 25-99 d,#ffffea,
 == snap step-generated grid=100x31 cursor=7,27
 |18:     13 Theme clay                                                                             Theme
 |19:     14 Theme forge_black
@@ -675,70 +675,70 @@
 |29:     24 Theme adwaita_dark
 |30:     25 Theme adwaita_light
 == style step-generated grid=100x31
-|0: 0-70 #cacaca,#323c43, 71-99 d,#323c43,
-|1: 0-1 #ffffff,#5b8094, 2-2 d,#323c43, 3-34 #cacaca,#323c43, 35-99 d,#323c43,
-|2: 0-1 #ffffff,#313842, 2-2 d,#323c43, 3-59 #cacaca,#323c43, 60-99 d,#323c43,
-|3: 0-0 d,#454c51, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
-|4: 0-0 d,#454c51, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
-|5: 0-0 d,#454c51, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
-|6: 0-0 d,#454c51, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
-|7: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
-|8: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
-|9: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
-|10: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
-|11: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
-|12: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-13 #e0e0e0,#161e26, 14-99 d,#161e26,
-|13: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-13 #e0e0e0,#161e26, 14-99 d,#161e26,
-|14: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-13 #e0e0e0,#161e26, 14-99 d,#161e26,
-|15: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-13 #e0e0e0,#161e26, 14-99 d,#161e26,
-|16: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-13 #e0e0e0,#161e26, 14-99 d,#161e26,
-|17: 0-1 #000000,#f0966d, 2-2 d,#323c43, 3-61 #cacaca,#323c43, 62-99 d,#323c43,
-|18: 0-0 d,#454c51, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-16 #e0e0e0,#161e26, 17-92 d,#161e26, 93-93 d,#323c43, 94-98 #cacaca,#323c43, 99-99 d,#323c43,
-|19: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-23 #e0e0e0,#161e26, 24-99 d,#161e26,
-|20: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-22 #e0e0e0,#161e26, 23-99 d,#161e26,
-|21: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-25 #e0e0e0,#161e26, 26-99 d,#161e26,
-|22: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-99 d,#161e26,
-|23: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-34 #e0e0e0,#161e26, 35-99 d,#161e26,
-|24: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-17 #e0e0e0,#161e26, 18-99 d,#161e26,
-|25: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-16 #e0e0e0,#161e26, 17-99 d,#161e26,
-|26: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-16 #e0e0e0,#161e26, 17-99 d,#161e26,
-|27: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26,b 7-16 #e0e0e0,#161e26, 17-99 d,#161e26,
-|28: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-22 #e0e0e0,#161e26, 23-99 d,#161e26,
-|29: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-24 #e0e0e0,#161e26, 25-99 d,#161e26,
-|30: 0-0 d,#2a3231, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-25 #e0e0e0,#161e26, 26-99 d,#161e26,
+|0: 0-70 #e0e0e0,#1e262e, 71-99 d,#1e262e,
+|1: 0-1 #ffffff,#4f7b96, 2-2 d,#1e262e, 3-34 #e0e0e0,#1e262e, 35-99 d,#1e262e,
+|2: 0-1 #ffffff,#303840, 2-2 d,#1e262e, 3-59 #e0e0e0,#1e262e, 60-99 d,#1e262e,
+|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,
+|5: 0-0 d,#303840, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
+|6: 0-0 d,#303840, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
+|7: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
+|8: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
+|9: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
+|10: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
+|11: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26,
+|12: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-13 #e0e0e0,#161e26, 14-99 d,#161e26,
+|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-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-13 #e0e0e0,#161e26, 14-99 d,#161e26,
+|17: 0-1 #000000,#ffa060, 2-2 d,#1e262e, 3-61 #e0e0e0,#1e262e, 62-99 d,#1e262e,
+|18: 0-0 d,#303840, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-16 #e0e0e0,#161e26, 17-92 d,#161e26, 93-93 d,#1e262e, 94-98 #e0e0e0,#1e262e, 99-99 d,#1e262e,
+|19: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-23 #e0e0e0,#161e26, 24-99 d,#161e26,
+|20: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-22 #e0e0e0,#161e26, 23-99 d,#161e26,
+|21: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-25 #e0e0e0,#161e26, 26-99 d,#161e26,
+|22: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-99 d,#161e26,
+|23: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-34 #e0e0e0,#161e26, 35-99 d,#161e26,
+|24: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-17 #e0e0e0,#161e26, 18-99 d,#161e26,
+|25: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-16 #e0e0e0,#161e26, 17-99 d,#161e26,
+|26: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-16 #e0e0e0,#161e26, 17-99 d,#161e26,
+|27: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26,b 7-16 #e0e0e0,#161e26, 17-99 d,#161e26,
+|28: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-22 #e0e0e0,#161e26, 23-99 d,#161e26,
+|29: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-24 #e0e0e0,#161e26, 25-99 d,#161e26,
+|30: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-25 #e0e0e0,#161e26, 26-99 d,#161e26,
 == snap step-back grid=100x31 cursor=7,26
 == style step-back grid=100x31
-|0: 0-70 #161616,#d6e9ea, 71-99 d,#d6e9ea,
-|1: 0-1 #000000,#b9a481, 2-2 d,#d6e9ea, 3-34 #161616,#d6e9ea, 35-99 d,#d6e9ea,
-|2: 0-1 #ffffff,#353a56, 2-2 d,#d6e9ea, 3-59 #161616,#d6e9ea, 60-99 d,#d6e9ea,
-|3: 0-0 d,#eaebd9, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|4: 0-0 d,#eaebd9, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|5: 0-0 d,#eaebd9, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|6: 0-0 d,#eaebd9, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|7: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|8: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|9: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|10: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|11: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|12: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
-|13: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
-|14: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
-|15: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
-|16: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
-|17: 0-1 #ffffff,#7549d3, 2-2 d,#d6e9ea, 3-61 #161616,#d6e9ea, 62-99 d,#d6e9ea,
-|18: 0-0 d,#eaebd9, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-92 d,#ffffea, 93-93 d,#d6e9ea, 94-98 #161616,#d6e9ea, 99-99 d,#d6e9ea,
-|19: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-23 #000000,#ffffea, 24-99 d,#ffffea,
-|20: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-22 #000000,#ffffea, 23-99 d,#ffffea,
-|21: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-25 #000000,#ffffea, 26-99 d,#ffffea,
-|22: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-99 d,#ffffea,
-|23: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-34 #000000,#ffffea, 35-99 d,#ffffea,
-|24: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-17 #000000,#ffffea, 18-99 d,#ffffea,
-|25: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-99 d,#ffffea,
-|26: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea,b 7-16 #000000,#ffffea, 17-99 d,#ffffea,
-|27: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-99 d,#ffffea,
-|28: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-22 #000000,#ffffea, 23-99 d,#ffffea,
-|29: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-24 #000000,#ffffea, 25-99 d,#ffffea,
-|30: 0-0 d,#8d8e49, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-25 #000000,#ffffea, 26-99 d,#ffffea,
+|0: 0-70 #000000,#eaffff, 71-99 d,#eaffff,
+|1: 0-1 #000000,#c5a87f, 2-2 d,#eaffff, 3-34 #000000,#eaffff, 35-99 d,#eaffff,
+|2: 0-1 #ffffff,#353a58, 2-2 d,#eaffff, 3-59 #000000,#eaffff, 60-99 d,#eaffff,
+|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,
+|5: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
+|6: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
+|7: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
+|8: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
+|9: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
+|10: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
+|11: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
+|12: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
+|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-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea,
+|17: 0-1 #ffffff,#663fe0, 2-2 d,#eaffff, 3-61 #000000,#eaffff, 62-99 d,#eaffff,
+|18: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-92 d,#ffffea, 93-93 d,#eaffff, 94-98 #000000,#eaffff, 99-99 d,#eaffff,
+|19: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-23 #000000,#ffffea, 24-99 d,#ffffea,
+|20: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-22 #000000,#ffffea, 23-99 d,#ffffea,
+|21: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-25 #000000,#ffffea, 26-99 d,#ffffea,
+|22: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-99 d,#ffffea,
+|23: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-34 #000000,#ffffea, 35-99 d,#ffffea,
+|24: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-17 #000000,#ffffea, 18-99 d,#ffffea,
+|25: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-99 d,#ffffea,
+|26: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea,b 7-16 #000000,#ffffea, 17-99 d,#ffffea,
+|27: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-99 d,#ffffea,
+|28: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-22 #000000,#ffffea, 23-99 d,#ffffea,
+|29: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-24 #000000,#ffffea, 25-99 d,#ffffea,
+|30: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-25 #000000,#ffffea, 26-99 d,#ffffea,
 == snap tail grid=100x31 cursor=7,29
 |18:    235 Theme wolf_alabaster_dark_bg
 |19:    236 Theme wolf_alabaster_dark_mono
@@ -769,13 +769,8 @@
 |29:     27 line 27
 |30:     28 line 28
 == style picked grid=100x31
-|0: 0-70 #000000,#eaffff, 71-99 d,#eaffff,
-|1: 0-1 #000000,#c5a87f, 2-2 d,#eaffff, 3-34 #000000,#eaffff, 35-99 d,#eaffff,
 |2: 0-1 #ffffff,#663fe0, 2-2 d,#eaffff, 3-59 #000000,#eaffff, 60-99 d,#eaffff,
 |3: 0-1 d,#ffffea, 2-6 #999980,#ffffea,b 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,
-|5: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
-|6: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
 |7: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
 |8: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
 |9: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea,
diff --git a/test/web_harness.mjs b/test/web_harness.mjs
index 90dd9a19..402e41f4 100644
--- a/test/web_harness.mjs
+++ b/test/web_harness.mjs
@@ -17,7 +17,7 @@ async function main() {
   const webDir = path.resolve(process.argv[2]);
   const wasmBytes = await fs.readFile(path.join(webDir, "pardes.wasm"));
   const module = await WebAssembly.compile(wasmBytes);
-  const { DomRenderer, animationTicks, browserHost } = await import(pathToFileURL(path.join(webDir, "app.mjs")));
+  const { DomRenderer, browserHost } = await import(pathToFileURL(path.join(webDir, "app.mjs")));
   assert.deepEqual(
     [...new Set(WebAssembly.Module.imports(module).map((entry) => entry.module))],
     ["pardes"],
@@ -40,7 +40,7 @@ async function main() {
   for (const name of [
     "memory", "pardes_init", "pardes_frame", "pardes_frame_ptr", "pardes_key",
     "pardes_mouse", "pardes_pointer_leave", "pardes_pointer_shape", "pardes_gui_tagline_font_percent",
-    "pardes_paste", "pardes_tick", "pardes_animation_tick", "pardes_animating",
+    "pardes_paste", "pardes_tick",
     "pardes_should_quit", "pardes_deinit",
   ]) assert.ok(wasm[name], `missing wasm export ${name}`);
 
@@ -85,18 +85,6 @@ async function main() {
     "DOM did not use the build-time tagline percentage",
   );
 
-  for (const hz of [60, 120, 144]) {
-    const clock = { last: null, lag: 0 };
-    let ticks = 0;
-    for (let frame = 0; frame <= hz; frame += 1) {
-      ticks += animationTicks(clock, frame * 1000 / hz);
-    }
-    assert.equal(ticks, 60, `${hz} Hz rAF did not produce 60 core ticks per second`);
-  }
-  const stalled = { last: null, lag: 0 };
-  assert.equal(animationTicks(stalled, 0), 0);
-  assert.equal(animationTicks(stalled, 60_000), 4, "suspended tab catch-up was not bounded");
-
   const firstCell = renderer.cells[0];
   const second = draw();
   assert.equal(renderer.cells[0], firstCell, "stable frames should reuse DOM nodes");
-- 
cgit v1.3


From 767aefd1e1cfd79e2a240a59d2d16bfb326f062d Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 15:59:00 -0300
Subject: Registers hold a value per range, and "<reg> names one

Registers.zig replaces the one yank buffer: every register keeps a value per
range, y fills them in document order, and p, P, R and insert Ctrl-r put
value i at range i, repeating the last (helix paste_impl). "<reg> names the
register for the next command; _ swallows, # numbers the ranges, . is each
range's text, % the file's name, / the last s/S pattern, and + and * are the
system clipboard through the ClipYank and ClipPaste paths. SPC y now writes
+ alone, as helix's does. The acme chords and a paste into a terminal take
the default register joined by newlines. The msel-yank-paste waiver is gone.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 docs/helix-keys.md         |  21 +++++----
 docs/selections.md         |  15 +++---
 src/Registers.zig          | 106 ++++++++++++++++++++++++++++++++++++++++++
 src/Text.zig               |   2 +
 src/config.zig             |   2 +
 src/edit.zig               | 112 +++++++++++++++++++++++++++++++++++++--------
 src/gui/gui.zig            |   2 +-
 src/look.zig               |   6 ++-
 src/modal.zig              |  13 ++++++
 src/mouse.zig              |  12 ++---
 src/normal.zig             |  17 +++++--
 src/pardes.zig             |  22 ++++++---
 test/hxcases/cases.jsonl   |  13 ++++++
 test/hxcases/goldens.jsonl |  13 ++++++
 test/hxcases/waivers.jsonl |   1 -
 test/panes.zig             |  20 ++++----
 16 files changed, 312 insertions(+), 65 deletions(-)
 create mode 100644 src/Registers.zig

(limited to 'src/gui')

diff --git a/docs/helix-keys.md b/docs/helix-keys.md
index 972ef0d2..90efc463 100644
--- a/docs/helix-keys.md
+++ b/docs/helix-keys.md
@@ -110,9 +110,9 @@ language-backend queries, and the shell pipe.
 | `x` / `<n>x` | select current line / extend one (n) line(s) down, char-range through the newline, cursor ON the `\n` | col-0 vim-ism removed (phase 5); matches `extend_line_below`, mode stays normal | helix-verified |
 | `d` | delete selection (implicit or explicit); bare cursor = the 1-wide selection | always yanks (`Alt-d` noyank in B); terminals: drops typed runs only | helix-verified |
 | `c` | change (delete + insert mode); linewise selections open a fresh indented line | same shape as `d` | helix-verified |
-| `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). Writes the DEFAULT REGISTER and nothing else — the system clipboard is `SPC y`, which is helix's own split and so moves this row TOWARDS helix, not away: a `d` of one character can no longer clobber what the desktop was holding | helix-verified |
+| `y` | yank each range's text into the register (`"<reg>` names one, else `"`), one value per range | line-yank vim-ism removed (phase 5); yank keeps selection AND cursor (helix). The system clipboard is `"+y` / `SPC y`, helix's own split: a `d` of one character never clobbers what the desktop holds | 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, and only the register — nothing on this path reads or writes the system clipboard. `SPC p` is the word that does, and on a tty its read is OSC 52, which most terminals refuse: an honest no-op there rather than a paste of the wrong text | helix-verified |
+| `p` (normal) | paste the register after each range: value i at range i, the last value repeated when there are fewer | helix `paste_impl`. `"+p` asks the system clipboard (`SPC p`); on a tty that read is OSC 52, which most terminals refuse: an honest no-op rather than a paste of the wrong text | 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. A PDF pane is the ONE exception: there Esc is the document's own cancel (drop the mouse selection and the search overlay, stay where you are reading) and `Shift-Esc` is the hop out, while raw tty only intercepts unmodified Esc at a detected shell prompt | 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 |
@@ -123,7 +123,7 @@ language-backend queries, and the shell pipe.
 | `Alt-n` | new terminal below (outside raw tty) | shadows helix `Alt-n` TS sibling-select — skipped anyway (tree-sitter) | pardes-specific |
 | `Alt-c` | move active terminal to a fresh column (outside raw tty) | 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) | starts the pardes LEADER: a key path runs the same builtin words used by tags and the topbar. The main groups are `f` files, `h` docs, `c` columns, `t` toggles/effects, `a` panel animations, `s` session, `j` jumps, `l` language, and `w` directional focus; `SPC ?` lists every path and `<prefix> ?` lists one group in `+Help`. Neither `Exit` (quits the editor, acme's Exit) nor `Kill` (stops the commands pardes typed into terminals, acme's Kill) has a leader path: both are the topbar's and the root `ctl`'s. The pending path appears on the active pane's transient body/message row. Esc or an unmapped key abandons it. Paths, Help rows, and dispatch are all generated from the builtin registry at comptime; the leader applies only to a BODY in normal mode because tags and tty programs own their input | pardes-specific; helix spends Space on pickers/LSP (section C), while pardes uses acme-style executable words |
-| `SPC y` `SPC Y` `SPC p` `SPC P` `SPC R` | helix's clipboard menu on helix's own letters: yank the selection to the system clipboard (`ClipYank`) or the PRIMARY selection alone (`ClipYankMain`), paste the system clipboard after (`ClipPaste`) / before (`ClipPasteBefore`) the selection, replace the selection with it (`ClipReplace`) | the ONLY five words in pardes that touch the desktop's clipboard — `y`/`d`/`c`/`p`/`P`/`R` and the acme cut/paste chords are the internal register alone. Builtins rather than bare chords because a leader path names a builtin: they land in Help's index and are executable words like every other verb. One divergence: pardes keeps a single register VALUE where helix keeps one per range, so `SPC y` at N cursors joins them with newlines (`Pardes.setYank`, the divergence `msel-yank-paste` already waives). On a tty the write is OSC 52 out and the READ is OSC 52 back, which many terminals refuse or gate — so `SPC y` works there and `SPC p` can be a no-op | out of corpus |
+| `SPC y` `SPC Y` `SPC p` `SPC P` `SPC R` | helix's clipboard menu on helix's own letters: yank the selection to the system clipboard (`ClipYank`) or the PRIMARY selection alone (`ClipYankMain`), paste the system clipboard after (`ClipPaste`) / before (`ClipPasteBefore`) the selection, replace the selection with it (`ClipReplace`) | the same as `"+y`, `"+p`, `"+P`, `"+R`: register `+` (and `*`) IS the desktop's clipboard, the only register that reaches it. `SPC y` writes `+` alone, as helix's does, not the default register too. Builtins rather than bare chords because a leader path names a builtin: they land in Help's index and are executable words like every other verb. The clipboard holds one text, so N values go out joined by newlines, as helix sends them. On a tty the write is OSC 52 out and the READ is OSC 52 back, which many terminals refuse or gate — so `SPC y` works there and `SPC p` can be a no-op | out of corpus |
 | a paste from the OUTER terminal | one `Event.paste`, spliced in at the cursor | the tty shell enables bracketed paste and coalesces `paste_start`..`paste_end` into a single event; before that the bytes arrived as individual key presses and normal mode RAN them, which is how a pasted `d` deleted a line. The bytes deliberately never enter the yank register — clipboard and default register are separate stores in both directions | pardes-specific |
 | `/` (any pane) | pardes' own plain-substring search into a `+Search` output buffer: the pattern is typed on a line of its own on the pane's notice band, Enter fills the buffer, and its rows are ordinary look targets. Enter also GOES to the first row — the buffer is focused and then the step `n` is and the look Enter is run in it (`Pardes.lookFirstHit`), so `/foo` lands on the first hit with the matched span selected. A pattern that matched nothing opens its empty buffer and moves nothing | KEEP, do not touch; not in the corpus (helix `/` is regex search). Find and Grep answer with OTHER files and deliberately do NOT jump. The stepping half is the next row | pardes-specific |
 | `n` / `N` (any pane) | MOTION, not a jump: move the SELECTION to the next / previous look-able text and open NOTHING. Enter — the look chord — on what it leaves selected is what opens it | KEEP, do not touch; not in the corpus (helix's `n`/`N` walk regex search hits). What a step selects is the pane's GRAIN (`output_pane.Grain`, read in `Pardes.lookSpanIn`): in FREE TEXT — a terminal, a file, a PDF, a prose answer buffer — the largest whitespace-delimited run `look.resolve` can act on (`look.lookableSpan`, wrapper punctuation peeled off both ends), several to a line; in a RESULTS BUFFER one stop per ROW, the largest run its head resolves as (`look.lookableLineSpan`), because a row there IS one location and the words after it are the match rather than a second place to go; in a COMMAND list the whole line. The walk is a RING across PANES: every pane that has performed a Look, most recent first (`Pardes.look_src`), then the output buffers that have not, newest first, and only when both are empty the active pane. Exhausting a pane enters the next at its first (forward) / last (backward) span and the end wraps to the start, so `N` is the exact inverse of `n`. What it lands on becomes an EXPLICIT `vsel` with the cursor on its FIRST column, in the pane the walk focuses. ONE motion in every pane kind and every buffer kind — a PDF steps the `+Search` buffer its own search filled, `n` to select the row and Enter to jump. The single thing a buffer may change is that grain, and it changes it by BEING a kind of buffer rather than by a branch: `output_pane.Traits.steps` (a list of locations) makes a step take one row at a time, and `Traits.commands` makes it take the WHOLE LINE, because a command list (`ThemeSel`/`FontSel`) holds words to run and there is no path inside `Theme gruvbox` to pick out. Tab on what `n` selected wears the theme, which is the same middle click on the row is. `]d`/`[d` are helix's diagnostic motions, a different binding, and they do still jump to each diagnostic (`docs/lsp.md`) | pardes-specific |
@@ -224,7 +224,9 @@ grew `sels` + `primary`, emitted only when there is more than one range.
 | `_` | trim whitespace off both ends of every range | empty and all-whitespace ranges drop; nothing left = collapse + keep primary (helix) | helix-verified |
 | `<n>o` / `<n>O` | open n lines, one cursor per line | helix `open` with a count; this is why the `o-count` golden gained a `sels` field | helix-verified |
 | every motion/operator | acts at every cursor | replayed last-range-first, so an edit never disturbs a range still waiting; each pass's result is remembered as a distance from the END of the text, which an earlier edit cannot move | helix-verified (56 msel-* cases) |
-| `y` with several ranges | joins the ranges' text with newlines into the ONE register | helix keeps a register VALUE per range and pastes value[i] at range[i]. Waived (`msel-yank-paste`) | waived |
+| `y` with several ranges | one value per range, pasted back value i at range i by `p`/`P`/`R` and insert `Ctrl-r`; the acme cut/paste chords and a paste into a terminal take the values joined by newlines | `Registers.zig` | helix-verified |
+| `"<reg>` | the next command's register: any character names one of its own. Computed ones: `_` swallows writes and reads nothing (`"_d`), `#` is each range's number from 1, `.` each range's text, `%` the file's name, `/` the last `s`/`S` pattern; `+`/`*` the system clipboard. A count typed before `"` stays the command's | helix `select_register` | helix-verified |
+| insert `Ctrl-r <reg>` | type this range's value of the register (`Ctrl-r #` numbers the cursors). Esc after `Ctrl-r` only cancels it. `Ctrl-r +` reads what pardes last put on the clipboard, not the desktop's | helix `insert_register` | helix-verified |
 | `a` … `Esc` with several ranges | the primary's appended-over span is restored; the others collapse to bare cursors | `Pane.append_at` is a single field. Waived (`msel-append`) | waived |
 | `&` | align selections into columns: the k-th range of each line is column k, and spaces go in before each range until its head reaches the column's widest head, in display cells (`File.rawDisplayCol`) | helix `align_selections` as of the harness's helix (25.07.1 grouped columns differently). A range over several lines refuses. A TAB counts as `tab_width` cells, not up to the next stop | helix-verified |
 | `Alt-)` / `Alt-(` / `<n>Alt-)` | rotate the CONTENTS of the selections forward / back by one range (n ranges), in one edit; each range comes back over the text it now holds and the primary moves with its text | helix `rotate_selection_contents_*` as of the harness's helix: 25.07.1 read the count as a GROUP size instead (rotate by one within each run of n ranges) and left the primary where it was, which is what helix-golf's `invert_dictionary_2` relies on | helix-verified |
@@ -342,7 +344,6 @@ text.
 | `]f [f ]t [t ]a [a ]c [c ]e [e ]T [T ]x [x` | TS unimpaired jumps | tree-sitter |
 | `]g [g ]G [G` | git change jumps | needs VCS diff state |
 | insert `Ctrl-x` | completion menu | completion exists, but not as a popup: insert-mode Tab straight after a `.` opens a buffer of candidate DECLARATIONS (section A). helix's menu itself is skipped |
-| `"` `<reg>`, insert `Ctrl-r` | register select / insert | registers — one yank register and no way to name a second; the system clipboard is not spelled as a register here either, it is the five `SPC` commands in A |
 | `Q` / `q` | record / replay macro | macros — needs replayable input log |
 | `Ctrl-s` (normal) | save jumplist position | jumplist itself is implemented (`Ctrl-o`/`Ctrl-i`, section A); only the explicit save point is skipped |
 | `Alt-u` / `Alt-U` | undo-history earlier/later | history timeline — linear snapshot u/U covers pardes |
@@ -388,12 +389,12 @@ Files (all in `test/hxcases/`):
   (runs the `hx-harness` binary from the helix checkout; override with
   `$HX_HARNESS`). Only needed when cases change — the diff itself runs
   offline.
-- `waivers.jsonl` — named exemptions, each with a reason. Four live ones:
+- `waivers.jsonl` — named exemptions, each with a reason. Three live ones:
   `wiX-edit-drops-sel` and `msel-append` (helix maps selections through
-  insert-mode edits, pardes does not), `alt-c-window-op` (the pardes
-  window op deliberately shadows helix change-noyank) and `msel-yank-paste`
-  (one yank register, not one value per range). `sel-regex-caret` and
-  `sel-regex-dot-newline` went when `s`/`S` began searching line by line.
+  insert-mode edits, pardes does not) and `alt-c-window-op` (the pardes
+  window op deliberately shadows helix change-noyank). `msel-yank-paste`
+  went with registers of one value per range; `sel-regex-caret` and
+  `sel-regex-dot-newline` when `s`/`S` began searching line by line.
 - `parity.jsonl` — 80 further cases, used only by the parity gate below.
 - `parity-waivers.jsonl` — 14 named exemptions for the parity gate, in three
   classes: one deliberate pardes binding (`ctrl-b-page`, since `Ctrl-b` IS the
diff --git a/docs/selections.md b/docs/selections.md
index 5b992cc4..0f000e2c 100644
--- a/docs/selections.md
+++ b/docs/selections.md
@@ -74,19 +74,18 @@ A parsed action has a scope (`modal.Normal.Action.scope`).
 - An undo snapshot (`File.Snapshot`) holds the content and the PRIMARY
   range. Undo puts the primary back and leaves the other ranges where they
   were; helix restores the whole selection of that revision.
-- There is ONE register, `Pardes.yank`, written by `y`, `d` and `c` and read
-  by `p`, `P` and `R`. A yank at several ranges joins their texts with
-  newlines into it, and a paste puts that whole value at every range.
+- Registers (`Registers.zig`) hold one value per range. A yank under the
+  replay fills slot `Pardes.multi_index` of `multi_count`, and `p`, `P`, `R`
+  and insert `Ctrl-r` read slot i at range i, the last value standing in
+  for missing ones. `"<reg>` names the register (`Pardes.register` for the
+  length of one command); `_ # . % /` are computed or special and `+`/`*`
+  is the system clipboard. The acme chords and a paste into a terminal read
+  the default register joined by newlines.
 - `Alt-.` repeats the last `f`/`t`/`F`/`T`. There is no `.` and there are no
   macros.
 
 ## Where it differs from helix
 
-- Registers: helix keeps one value PER RANGE and pastes value `i` at range
-  `i`; it has named registers (`"a`), special ones (`#` range indices,
-  `.` the selection, `/` the search, `_` the black hole) and inserts a
-  register in insert mode with `Ctrl-r`. None exist here (waiver
-  `msel-yank-paste`).
 - Insert mode: helix maps every range through each keystroke's edit, so a
   range an `i`/`a` started from stretches over what is typed and keeps its
   anchor. Here only the cursor cells move, and after Esc only the primary's
diff --git a/src/Registers.zig b/src/Registers.zig
new file mode 100644
index 00000000..d2a42434
--- /dev/null
+++ b/src/Registers.zig
@@ -0,0 +1,106 @@
+//! helix's registers: named stores of text, each holding one VALUE PER RANGE
+//! of the selection that wrote it. `"` is the default, `+` the one the
+//! system clipboard is copied from, `/` the last s/S pattern, `@` the last
+//! macro; any other character names a register of its own. The registers
+//! computed from the editor rather than stored (`_`, `#`, `.`, `%`) and the
+//! clipboard's paste side are read in edit.zig, which has the pane at hand.
+const std = @import("std");
+
+const Registers = @This();
+
+list: std.ArrayList(Reg) = .empty,
+
+pub const Reg = struct {
+    name: u21,
+    /// gpa-owned, one per range, in document order
+    values: [][]u8,
+    /// the values joined by newlines, for the readers that take one text
+    /// (the acme chords, a paste into a terminal, the clipboard); gpa-owned,
+    /// made on first read
+    joined: ?[]u8 = null,
+};
+
+pub const default = '"';
+
+pub fn deinit(r: *Registers, gpa: std.mem.Allocator) void {
+    for (r.list.items) |*reg| freeReg(gpa, reg);
+    r.list.deinit(gpa);
+    r.* = .{};
+}
+
+fn freeReg(gpa: std.mem.Allocator, reg: *Reg) void {
+    for (reg.values) |v| gpa.free(v);
+    gpa.free(reg.values);
+    if (reg.joined) |j| gpa.free(j);
+}
+
+pub fn get(r: *Registers, name: u21) ?*Reg {
+    for (r.list.items) |*reg| if (reg.name == name) return reg;
+    return null;
+}
+
+/// Value `i` of register `name`: a register holding fewer values than there
+/// are ranges repeats its last (helix paste_impl).
+pub fn value(r: *Registers, name: u21, i: usize) ?[]const u8 {
+    const reg = r.get(name) orelse return null;
+    if (reg.values.len == 0) return null;
+    return reg.values[@min(i, reg.values.len - 1)];
+}
+
+/// Store value `i` of `n`. `fresh` starts the register over with `n` empty
+/// values; the replay across ranges passes it on its first pass only, so
+/// every range fills its own slot.
+pub fn put(r: *Registers, gpa: std.mem.Allocator, name: u21, bytes: []const u8, i: usize, n: usize, fresh: bool) void {
+    const copy = gpa.dupe(u8, bytes) catch return;
+    const reg = r.get(name) orelse blk: {
+        r.list.append(gpa, .{ .name = name, .values = &.{} }) catch {
+            gpa.free(copy);
+            return;
+        };
+        break :blk &r.list.items[r.list.items.len - 1];
+    };
+    if (fresh or reg.values.len != n) {
+        const values = gpa.alloc([]u8, n) catch {
+            gpa.free(copy);
+            return;
+        };
+        for (values) |*v| v.* = &.{};
+        freeReg(gpa, reg);
+        reg.* = .{ .name = name, .values = values };
+    }
+    gpa.free(reg.values[i]);
+    reg.values[i] = copy;
+    if (reg.joined) |j| gpa.free(j);
+    reg.joined = null;
+}
+
+/// The whole register as one text: its values joined by newlines, no
+/// newline added after a value that already ends in one.
+pub fn text(r: *Registers, gpa: std.mem.Allocator, name: u21) ?[]const u8 {
+    const reg = r.get(name) orelse return null;
+    if (reg.joined) |j| return j;
+    var out: std.ArrayList(u8) = .empty;
+    for (reg.values, 0..) |v, i| {
+        if (i > 0 and !std.mem.endsWith(u8, reg.values[i - 1], "\n")) out.append(gpa, '\n') catch return null;
+        out.appendSlice(gpa, v) catch return null;
+    }
+    reg.joined = out.toOwnedSlice(gpa) catch return null;
+    return reg.joined;
+}
+
+test "a register holds a value per range and joins them for one-text readers" {
+    const gpa = std.testing.allocator;
+    var r: Registers = .{};
+    defer r.deinit(gpa);
+    try std.testing.expect(r.value(default, 0) == null);
+    // a replay fills the last range first
+    r.put(gpa, default, "two", 1, 2, true);
+    r.put(gpa, default, "one\n", 0, 2, false);
+    try std.testing.expectEqualStrings("one\n", r.value(default, 0).?);
+    try std.testing.expectEqualStrings("two", r.value(default, 1).?);
+    try std.testing.expectEqualStrings("two", r.value(default, 5).?);
+    try std.testing.expectEqualStrings("one\ntwo", r.text(gpa, default).?);
+    r.put(gpa, 'a', "x", 0, 1, true);
+    try std.testing.expectEqualStrings("x", r.text(gpa, 'a').?);
+    try std.testing.expectEqualStrings("one\ntwo", r.text(gpa, default).?);
+}
diff --git a/src/Text.zig b/src/Text.zig
index 43dd8a95..7ad243a1 100644
--- a/src/Text.zig
+++ b/src/Text.zig
@@ -66,6 +66,8 @@ select: bool = false,
 /// non-vertical range write resets it to -1.
 sticky_col: i32 = -1,
 append_at: ?struct { row: i32, col: i32 } = null,
+/// insert `Ctrl-r` was pressed: the next key names the register to insert
+reg_wait: bool = false,
 normal: modal.Normal.State = .{},
 /// last f/F/t/T motion, for Alt-. repeat
 find_op: u8 = 0,
diff --git a/src/config.zig b/src/config.zig
index 85a6bc59..4412ef0d 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -492,6 +492,7 @@ pub const match_around = 'a';
 pub const surround_add = 's';
 pub const surround_replace = 'r';
 pub const surround_delete = 'd';
+pub const register_prefix = '"';
 
 pub const goto_paragraph: []const Chord = &.{.{ .cp = 'p' }};
 pub const add_newline: []const Chord = &.{.{ .cp = ' ' }};
@@ -557,6 +558,7 @@ pub const escape: []const Chord = &.{.{ .cp = Key.escape }};
 pub const insert_backspace_alias: []const Chord = &.{.{ .cp = 'h', .ctrl = true }};
 pub const insert_enter_alias: []const Chord = &.{.{ .cp = 'j', .ctrl = true }};
 pub const insert_delete_alias: []const Chord = &.{.{ .cp = 'd', .ctrl = true }};
+pub const insert_register: []const Chord = &.{.{ .cp = 'r', .ctrl = true }};
 pub const delete_word_backward: []const Chord = &.{ .{ .cp = 'w', .ctrl = true }, .{ .cp = Key.backspace, .alt = true } };
 pub const delete_word_forward: []const Chord = &.{ .{ .cp = 'd', .alt = true }, .{ .cp = Key.delete, .alt = true } };
 pub const kill_to_line_start: []const Chord = &.{.{ .cp = 'u', .ctrl = true }};
diff --git a/src/edit.zig b/src/edit.zig
index 24354df8..14d8b7ed 100644
--- a/src/edit.zig
+++ b/src/edit.zig
@@ -26,23 +26,75 @@ const hit = pardes.hit;
 const sel_slot = pardes.sel_slot;
 const Effect = pardes.Effect;
 const Pardes = pardes.Pardes;
+const Registers = pardes.Registers;
 
+/// Write `text` as this range's value of the register the running command
+/// names (`"<reg>`), the default one otherwise. `_` swallows it, and the
+/// registers computed from the editor (`#`, `.`, `%`) cannot be written.
+/// `+` and `*` are the system clipboard: the value is sent there too.
 pub fn setYank(p: *Pardes, text: []const u8) void {
-    if (p.multi_on and !p.multi_first) {
-        const old = p.yank orelse "";
-        const sep: []const u8 = if (text.len > 0 and text[text.len - 1] == '\n') "" else "\n";
-        const joined = std.fmt.allocPrint(p.gpa, "{s}{s}{s}", .{ text, sep, old }) catch return;
-        if (p.yank) |y| p.gpa.free(y);
-        p.yank = joined;
-        return;
+    var name: u21 = if (p.register != 0) p.register else Registers.default;
+    switch (name) {
+        '_', '#', '.', '%' => return,
+        '*' => name = '+',
+        else => {},
     }
-    if (p.yank) |y| p.gpa.free(y);
-    p.yank = p.gpa.dupe(u8, text) catch null;
+    const one = !p.multi_on;
+    p.registers.put(p.gpa, name, text, if (one) 0 else p.multi_index, if (one) 1 else p.multi_count, one or p.multi_first);
+    if (name == '+' and (one or p.multi_first)) p.emit(.{ .set_clipboard = {} });
 }
 
 pub fn setClipboard(p: *Pardes, text: []const u8) void {
+    const named = p.register;
+    p.register = '+';
+    defer p.register = named;
     setYank(p, text);
-    if (!p.multi_on or p.multi_first) p.emit(.{ .set_clipboard = {} });
+}
+
+/// Value `i` of register `name` as the command at range `i` reads it, the
+/// computed registers included: `#` is the range's number from 1, `.` its
+/// text, `%` the file's name, `_` nothing. Scratch- or register-owned.
+pub fn registerValue(p: *Pardes, t: *Text, name: u21) ?[]const u8 {
+    const i = if (p.multi_on) p.multi_index else 0;
+    return switch (name) {
+        '_' => null,
+        '#' => std.fmt.allocPrint(p.scratch.allocator(), "{d}", .{i + 1}) catch null,
+        '.' => selText(p, t),
+        '%' => if (t.what == .body) if (t.pane()) |pane| (if (pane.file) |f| f.path else null) else null else null,
+        else => p.registers.value(name, i),
+    };
+}
+
+/// the text of the range under the cursor: the selection, or the cursor's
+/// own character
+fn selText(p: *Pardes, t: *Text) []const u8 {
+    if (t.msel.active) return yankRows(p, t, @min(t.msel.r0, t.msel.r1), @max(t.msel.r0, t.msel.r1));
+    const save = t.vsel;
+    defer t.vsel = save;
+    if (!t.vsel.active) t.vsel = .{ .active = true, .row = t.cur_row, .col = t.cur_col, .explicit = false };
+    return vselText(p, t);
+}
+
+/// `p` / `P` / `R` from the register the command names: this range's value
+/// of it. The clipboard's is asked of the shell and pasted when it answers,
+/// once, at the primary.
+pub fn pasteRegister(p: *Pardes, t: *Text, how: enum { after, before, replace }, count: usize) void {
+    const name: u21 = if (p.register != 0) p.register else Registers.default;
+    if (name == '+' or name == '*') {
+        if (!normal.multiOnce(p)) return;
+        const pane = t.pane() orelse return;
+        return clipRequest(p, p.paneIdOf(pane) orelse return, switch (how) {
+            .after => .after,
+            .before => .before,
+            .replace => .replace,
+        });
+    }
+    const y = registerValue(p, t, name) orelse return;
+    switch (how) {
+        .after => pasteText(p, t, y, false, count),
+        .before => pasteText(p, t, y, true, count),
+        .replace => replaceWithText(p, t, y),
+    }
 }
 
 /// Where a `SPC p` / `SPC P` / `SPC R` goes once the shell answers.
@@ -125,6 +177,10 @@ pub fn clipYank(p: *Pardes, pane: *Pane, main_only: bool) void {
         if (pv.selection_text.len > 0) setClipboard(p, pv.selection_text);
         return;
     };
+    // helix's `"+y`: the clipboard register, and only it
+    const named = p.register;
+    p.register = '+';
+    defer p.register = named;
     if (pane.body.nsel > 0 and !main_only) {
         normal.replaySels(p, &pane.body, .{ .normal = .{ .edit = .{ .kind = .yank, .count = 1 } } });
     } else {
@@ -133,7 +189,6 @@ pub fn clipYank(p: *Pardes, pane: *Pane, main_only: bool) void {
         normalYank(p, &pane.body);
         pane.body.nsel = others;
     }
-    p.emit(.{ .set_clipboard = {} });
 }
 
 /// tag + '\n' + body: the full selectable pane text, a row to a screen row
@@ -286,6 +341,7 @@ pub fn currentSelText(p: *Pardes, pane: *Pane) ?[]const u8 {
 
 pub fn exitInsert(p: *Pardes, t: *Text) void {
     t.mode = .normal;
+    t.reg_wait = false;
     t.msel.active = false;
     t.normal.clear();
     if (t.append_at) |aa| {
@@ -565,6 +621,19 @@ pub fn insertKey(p: *Pardes, t: *Text, key: Key) void {
     if (hit(key, config.insert_backspace_alias)) return insertKey(p, t, .{ .cp = Key.backspace });
     if (hit(key, config.insert_enter_alias)) return insertKey(p, t, .{ .cp = Key.enter });
     if (hit(key, config.insert_delete_alias)) return insertKey(p, t, .{ .cp = Key.delete });
+    // Ctrl-r <reg>: type this range's value of the register (helix
+    // insert_register)
+    if (t.reg_wait) {
+        t.reg_wait = false;
+        if (key.ctrl or key.alt or key.cp >= 0xF0000) return;
+        const y = registerValue(p, t, key.cp) orelse return;
+        if (y.len > 0) insertKey(p, t, .{ .cp = key.cp, .text = y });
+        return;
+    }
+    if (hit(key, config.insert_register)) {
+        t.reg_wait = true;
+        return;
+    }
     t.vsel.active = false;
     if (!t.cur_pinned) pinPaneCursor(p, t);
     _ = clampFileCursor(t);
@@ -1132,8 +1201,9 @@ pub fn normalReplaceChar(p: *Pardes, t: *Text, ch: u21) void {
 
 /// `R`: replace the selection (or the cursor char) with the DEFAULT
 /// register. `SPC R` is the same verb over the system clipboard.
-pub fn normalReplaceYank(p: *Pardes, t: *Text) void {
-    replaceWithText(p, t, p.yank orelse return);
+/// The acme chords' replace: the default register as one text.
+pub fn chordReplace(p: *Pardes, t: *Text) void {
+    replaceWithText(p, t, p.registers.text(p.gpa, Registers.default) orelse return);
 }
 
 /// The pasted text becomes the selection, in the direction the replaced one
@@ -1957,16 +2027,20 @@ test "only the SPC clipboard commands cross to the system clipboard" {
 
     _ = drainedEffect(p, .set_clipboard);
     p.update(.{ .key = .{ .cp = 'y' } });
-    try std.testing.expect(p.yank != null and p.yank.?.len > 0);
+    const plain = p.registers.text(gpa, Registers.default) orelse return error.MissingYank;
+    try std.testing.expect(plain.len > 0);
     try std.testing.expect(!drainedEffect(p, .set_clipboard));
     p.update(.{ .key = .{ .cp = 'd' } });
     try std.testing.expect(!drainedEffect(p, .set_clipboard));
 
-    // `SPC y` is the one that does, and it puts the SAME text there that `y`
-    // put in the register — it is the ordinary yank path plus the mirror.
+    // `SPC y` is the one that does: helix's `"+y`, the ordinary yank into
+    // the clipboard register instead of the default one.
     p.update(.{ .key = .{ .cp = ' ' } });
     p.update(.{ .key = .{ .cp = 'y' } });
-    const yanked = p.yank orelse return error.MissingYank;
+    const yanked = try gpa.dupe(u8, p.registers.text(gpa, Registers.default) orelse "");
+    defer gpa.free(yanked);
+    const clip: []const u8 = p.registers.text(gpa, '+') orelse "";
+    try std.testing.expect(clip.len > 0);
     try std.testing.expect(drainedEffect(p, .set_clipboard));
 
     const before = pane.file.?.content.len;
@@ -1980,14 +2054,14 @@ test "only the SPC clipboard commands cross to the system clipboard" {
     try std.testing.expect(std.mem.indexOf(u8, pane.file.?.content, "PASTED") != null);
     // ...and it did NOT land in the register on its way past, nor echo back
     // out to the clipboard it came from.
-    try std.testing.expectEqualStrings(yanked, p.yank orelse "");
+    try std.testing.expectEqualStrings(yanked, p.registers.text(gpa, Registers.default) orelse "");
     try std.testing.expect(!drainedEffect(p, .set_clipboard));
 
     // An UNSOLICITED paste — the outer terminal's bracketed paste, a Cmd-V —
     // is the same event with no request behind it, and means paste after.
     p.update(.{ .paste = "UNASKED" });
     try std.testing.expect(std.mem.indexOf(u8, pane.file.?.content, "UNASKED") != null);
-    try std.testing.expectEqualStrings(yanked, p.yank orelse "");
+    try std.testing.expectEqualStrings(yanked, p.registers.text(gpa, Registers.default) orelse "");
 
     // A request the shell never answers dies at the next keystroke rather
     // than firing late into whatever pane is focused by then.
diff --git a/src/gui/gui.zig b/src/gui/gui.zig
index 46bd5ffc..8f6248ce 100644
--- a/src/gui/gui.zig
+++ b/src/gui/gui.zig
@@ -4385,7 +4385,7 @@ test "the headless grid host round-trips a yank back as a paste" {
     core.update(.{ .key = .{ .cp = ' ' } });
     core.update(.{ .key = .{ .cp = 'y' } });
     while (core.nextEffect()) |e| core.perform(e);
-    const yanked = core.yank orelse return error.MissingYank;
+    const yanked = core.registers.text(core.gpa, '+') orelse return error.MissingYank;
     try std.testing.expect(yanked.len > 0);
 
     const before = pane.file.?.content.len;
diff --git a/src/look.zig b/src/look.zig
index d7e763d3..5e2d6068 100644
--- a/src/look.zig
+++ b/src/look.zig
@@ -502,7 +502,11 @@ const SearchStart = enum { top, cursor };
 
 pub fn submitSearch(p: *Pardes, id: usize) void {
     const pane = p.panes[id] orelse return;
-    if (normal.selRegexArmed(pane)) |a| return if (p.promptTarget(pane)) |t| normal.applySelRegex(p, pane, t, a.pat, a.split);
+    if (normal.selRegexArmed(pane)) |a| {
+        // helix keeps the pattern in `/`
+        if (a.pat.len > 0) p.registers.put(p.gpa, '/', a.pat, 0, 1, true);
+        return if (p.promptTarget(pane)) |t| normal.applySelRegex(p, pane, t, a.pat, a.split);
+    }
     const armed = pane.promptText() orelse return;
     const slash = std.mem.indexOfScalar(u8, armed, '/') orelse return;
     if (std.mem.startsWith(u8, armed, config.rename_marker)) return p.lspRequest(id, .rename, armed[slash + 1 ..]);
diff --git a/src/modal.zig b/src/modal.zig
index aadaab00..aec1c579 100644
--- a/src/modal.zig
+++ b/src/modal.zig
@@ -15,6 +15,7 @@ pub const Normal = struct {
         prefix_replace,
         prefix_next,
         prefix_prev,
+        prefix_register,
 
         goto_file_start,
         goto_last_line,
@@ -160,6 +161,7 @@ pub const Normal = struct {
         replace,
         next,
         prev,
+        register,
     };
 
     pub const MatchSub = enum(u8) {
@@ -176,6 +178,8 @@ pub const Normal = struct {
         prefix: Prefix = .none,
         match_sub: MatchSub = .none,
         held_char: u21 = 0,
+        /// `"<reg>`: the register the next command names, 0 for none
+        register: u21 = 0,
 
         pub fn clear(state: *State) void {
             state.* = .{};
@@ -491,6 +495,14 @@ pub const Normal = struct {
                 if (key.has(.goto_diagnostic_end)) return resultAction(.{ .diagnostic = .{ .direction = direction, .endpoint = true } });
                 return .ignored;
             },
+            .register => {
+                state.prefix = .none;
+                const char = key.literal() orelse return .ignored;
+                state.register = char;
+                // the count typed before `"` is still the command's
+                state.count = if (counted.explicit) count else 0;
+                return .pending;
+            },
             .none => {},
         }
 
@@ -505,6 +517,7 @@ pub const Normal = struct {
         if (key.has(.prefix_next)) return armPrefix(state, .next, if (counted.explicit) count else 0);
         if (key.has(.prefix_prev)) return armPrefix(state, .prev, if (counted.explicit) count else 0);
         if (key.has(.prefix_match)) return armPrefix(state, .match, 0);
+        if (key.has(.prefix_register)) return armPrefix(state, .register, if (counted.explicit) count else 0);
 
         if (key.has(.move_left)) return resultAction(.{ .move = .{ .motion = .left, .count = count } });
         if (key.has(.move_right)) return resultAction(.{ .move = .{ .motion = .right, .count = count } });
diff --git a/src/mouse.zig b/src/mouse.zig
index f222b5da..91ec41a6 100644
--- a/src/mouse.zig
+++ b/src/mouse.zig
@@ -963,8 +963,8 @@ fn chordCutPaste(p: *Pardes, cut: bool) void {
         if (cut) {
             if (t.vsel.active) edit.normalDelete(p, t, true);
         } else if (t.vsel.active) {
-            edit.normalReplaceYank(p, t);
-        } else edit.pasteText(p, t, p.yank orelse return, true, 1);
+            edit.chordReplace(p, t);
+        } else edit.pasteText(p, t, p.registers.text(p.gpa, pardes.Registers.default) orelse return, true, 1);
         return;
     }
     if (pane.body.mode == .tty) {
@@ -973,7 +973,7 @@ fn chordCutPaste(p: *Pardes, cut: bool) void {
             pane.sel[sel_slot].state = .none; // drop the sweep highlight
         }
         if (cut) return;
-        const y = p.yank orelse return;
+        const y = p.registers.text(p.gpa, pardes.Registers.default) orelse return;
         if (y.len == 0) return;
         if (panes.Terminal.reportsMouse(pane)) {
             const col: u16 = @intCast(std.math.clamp(pane.sel[sel_slot].c1 + 1, 1, 9999));
@@ -1016,11 +1016,11 @@ fn chordCutPaste(p: *Pardes, cut: bool) void {
     if (cut) {
         if (pane.body.vsel.active) edit.normalDelete(p, &pane.body, true);
     } else if (pane.body.vsel.active) {
-        edit.normalReplaceYank(p, &pane.body);
+        edit.chordReplace(p, &pane.body);
     } else if (pane.file) |*f| {
         // bare cursor: splice the register in literally (no linewise
         // magic) so a paste right after a cut restores the text exactly
-        const y = p.yank orelse return;
+        const y = p.registers.text(p.gpa, pardes.Registers.default) orelse return;
         if (y.len == 0) return;
         const at = modal.Cursor{ .row = @intCast(@max(0, pane.body.cur_row)), .col = @intCast(@max(0, pane.body.cur_col)) };
         edit.pushUndo(p, &pane.body);
@@ -1039,7 +1039,7 @@ fn chordCutPaste(p: *Pardes, cut: bool) void {
         pane.body.cur_pinned = true;
         pane.body.sticky_col = -1;
         pane.ensureCursorVisible();
-    } else edit.pasteText(p, &pane.body, p.yank orelse return, true, 1);
+    } else edit.pasteText(p, &pane.body, p.registers.text(p.gpa, pardes.Registers.default) orelse return, true, 1);
 }
 
 test "plain left click clears explicit modal selection" {
diff --git a/src/normal.zig b/src/normal.zig
index 5a6c1cd5..f5e868a4 100644
--- a/src/normal.zig
+++ b/src/normal.zig
@@ -35,6 +35,7 @@ fn roleBindingName(comptime role: modal.Normal.Role) []const u8 {
         .prefix_replace => "replace_prefix",
         .prefix_next => "next_prefix",
         .prefix_prev => "prev_prefix",
+        .prefix_register => "register_prefix",
         else => @tagName(role),
     };
 }
@@ -149,6 +150,7 @@ const KeyState = struct {
     find_op: u8,
     find_ch: u21,
     append_at: @FieldType(Text, "append_at"),
+    reg_wait: bool,
 
     fn of(t: *Text) KeyState {
         return .{
@@ -158,6 +160,7 @@ const KeyState = struct {
             .find_op = t.find_op,
             .find_ch = t.find_ch,
             .append_at = t.append_at,
+            .reg_wait = t.reg_wait,
         };
     }
 
@@ -168,6 +171,7 @@ const KeyState = struct {
         t.find_op = s.find_op;
         t.find_ch = s.find_ch;
         t.append_at = s.append_at;
+        t.reg_wait = s.reg_wait;
     }
 };
 
@@ -227,6 +231,8 @@ pub fn replaySels(p: *Pardes, t: *Text, what: Replay) void {
     while (i > 0) {
         i -= 1;
         p.multi_first = passes == 0;
+        p.multi_index = i;
+        p.multi_count = n;
         passes += 1;
         saved.into(t);
         t.nsel = 0; // the handler underneath sees ONE selection
@@ -284,11 +290,16 @@ pub fn replaySels(p: *Pardes, t: *Text, what: Replay) void {
 }
 
 pub fn handleNormal(p: *Pardes, t: *Text, key: Key) void {
+    // `"<reg>` is held by the parser until the command it names arrives
+    const named = t.normal.register;
     const parsed = modal.Normal.parse(&t.normal, normalInput(key));
     const semantic = switch (parsed) {
         .pending, .ignored, .unbound => return,
         .action => |value| value,
     };
+    t.normal.register = 0;
+    p.register = named;
+    defer p.register = 0;
     if (t.nsel == 0 or semantic.scope() == .once)
         return executeNormalAction(p, t, semantic);
     replaySels(p, t, .{ .normal = semantic });
@@ -534,9 +545,9 @@ fn executeNormalAction(p: *Pardes, t: *Text, semantic: modal.Normal.Action) void
             .delete_noyank => return edit.normalDelete(p, t, false),
             .change => return edit.normalChange(p, t),
             .yank => return edit.normalYank(p, t),
-            .replace_with_yank => return edit.normalReplaceYank(p, t),
-            .paste_after => return edit.pasteText(p, t, p.yank orelse return, false, op.count),
-            .paste_before => return edit.pasteText(p, t, p.yank orelse return, true, op.count),
+            .replace_with_yank => return edit.pasteRegister(p, t, .replace, op.count),
+            .paste_after => return edit.pasteRegister(p, t, .after, op.count),
+            .paste_before => return edit.pasteRegister(p, t, .before, op.count),
             .switch_case => return edit.normalCase(p, t, .toggle),
             .lowercase => return edit.normalCase(p, t, .lower),
             .uppercase => return edit.normalCase(p, t, .upper),
diff --git a/src/pardes.zig b/src/pardes.zig
index 9821839f..e4645d70 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -17,6 +17,7 @@ pub const normal = @import("normal.zig");
 pub const edit = @import("edit.zig");
 pub const body_layer = @import("body_layer.zig");
 pub const Messages = @import("Messages.zig");
+pub const Registers = @import("Registers.zig");
 pub const Pipe = @import("Pipe.zig");
 pub const colors = @import("colors.zig");
 pub const Theme = colors.Theme;
@@ -453,6 +454,7 @@ test {
     _ = @import("regexp.zig");
     _ = @import("edit.zig");
     _ = @import("Messages.zig");
+    _ = @import("Registers.zig");
     _ = @import("selection_pipe.zig");
     _ = @import("Pipe.zig");
     _ = @import("colors.zig");
@@ -2326,7 +2328,7 @@ test "a host with no methods at all is a complete in-process pardes" {
     try std.testing.expectEqual(before, p.panes[0].?.terminal.?.vt.screens.active.cursor.y);
 
     // the clipboard round-trips through the in-process one
-    p.yank = try gpa.dupe(u8, "copied");
+    p.registers.put(gpa, '+', "copied", 0, 1, true);
     p.perform(.set_clipboard);
     try std.testing.expectEqualStrings("copied", p.fallback.clipboard.items);
 
@@ -4003,6 +4005,14 @@ pub const Pardes = struct {
     multi_on: bool = false,
     multi_first: bool = false,
     multi_stop: bool = false,
+    /// While a key is replayed across the ranges: which range this pass is,
+    /// in document order, and how many there are. A register value belongs
+    /// to its range by this index.
+    multi_index: usize = 0,
+    multi_count: usize = 1,
+    /// The register the running normal command names (`"<reg>`); 0 for the
+    /// default one.
+    register: u21 = 0,
     leader_on: bool = false,
     leader_keys: [4]u8 = undefined,
     leader_n: u8 = 0,
@@ -4085,7 +4095,7 @@ pub const Pardes = struct {
     in_head: usize = 0,
     in_len: usize = 0,
 
-    yank: ?[]u8 = null,
+    registers: Registers = .{},
     clip_pending: ?edit.ClipRequest = null,
     /// the last serialized dump (gpa-owned), read by the write_dump effect
     dump_out: ?[]u8 = null,
@@ -4256,7 +4266,7 @@ pub const Pardes = struct {
         const gpa = p.gpa;
         for (&p.col_tags) |*t| t.deinit(gpa);
         p.global_tag.deinit(gpa);
-        if (p.yank) |y| gpa.free(y);
+        p.registers.deinit(gpa);
         if (p.dump_out) |d| gpa.free(d);
         p.fallback.deinit();
         if (p.last_dump) |d| gpa.free(d);
@@ -4826,7 +4836,7 @@ pub const Pardes = struct {
                 }
             },
             .set_clipboard => {
-                const text = p.yank orelse "";
+                const text = p.registers.text(p.gpa, '+') orelse "";
                 if (v.set_clipboard) |f| f(p.host.ctx, text) else p.fallback.setClipboard(text);
             },
             // No desktop to ask: answer from the in-process clipboard at once,
@@ -5162,7 +5172,7 @@ pub const Pardes = struct {
                 // in it the chord is the program's -- vim's visual block,
                 // readline's quoted-insert -- and swallowing it would make
                 // Ctrl-V a black hole in every full-screen application.
-                if (p.yank) |text| return edit.typeToTty(p, p.active, pane, text);
+                if (p.registers.text(p.gpa, Registers.default)) |text| return edit.typeToTty(p, p.active, pane, text);
             }
             return panes.Terminal.forwardKey(p, p.active, key);
         }
@@ -5310,7 +5320,7 @@ pub const Pardes = struct {
         switch (t.mode) {
             .normal => normal.handleNormal(p, t, key),
             .insert => {
-                if (hit(key, config.escape)) return edit.exitInsert(p, t);
+                if (hit(key, config.escape) and !t.reg_wait) return edit.exitInsert(p, t);
                 edit.handleInsert(p, t, key);
             },
             .tty => panes.Terminal.forwardKey(p, p.active, key),
diff --git a/test/hxcases/cases.jsonl b/test/hxcases/cases.jsonl
index 487cd445..7ba44f09 100644
--- a/test/hxcases/cases.jsonl
+++ b/test/hxcases/cases.jsonl
@@ -442,6 +442,19 @@
 {"name": "msel-collapse", "pane": "file", "text": "abcd\nabcd\n", "keys": "vllC;"}
 {"name": "msel-flip", "pane": "file", "text": "abcd\nabcd\n", "keys": "vllC<A-;>"}
 {"name": "msel-yank-paste", "pane": "file", "text": "ab\ncd\n", "keys": "Cyp"}
+{"name": "reg-named-yank-paste", "pane": "file", "text": "ab cd\n", "keys": "\"ayw\"ap"}
+{"name": "reg-named-keeps-default", "pane": "file", "text": "ab cd\n", "keys": "yw\"ay\"_dp"}
+{"name": "reg-blackhole-delete", "pane": "file", "text": "ab cd\n", "keys": "yw\"_dP"}
+{"name": "msel-reg-paste-per-range", "pane": "file", "text": "ab\ncd\n", "keys": "Cyl2Pp"}
+{"name": "msel-reg-fewer-values", "pane": "file", "text": "ab\ncd\nef\n", "keys": "yCCp"}
+{"name": "msel-reg-replace-per-range", "pane": "file", "text": "ab\ncd\n", "keys": "Cy<A-(>Ry"}
+{"name": "msel-reg-more-values-one-range", "pane": "file", "text": "ab\ncd\n", "keys": "Cy,p"}
+{"name": "reg-index-insert", "pane": "file", "text": "x\nx\nx\n", "keys": "%<A-s>i<C-r>#<esc>"}
+{"name": "reg-search-paste", "pane": "file", "text": "ab\n", "keys": "%sb<ret>\"/p"}
+{"name": "reg-count-before-quote", "pane": "file", "text": "ab\n", "keys": "y2\"ap"}
+{"name": "reg-count-after-quote", "pane": "file", "text": "ab\n", "keys": "\"ay\"a3p"}
+{"name": "reg-ctrl-r-named", "pane": "file", "text": "ab\n", "keys": "\"ayli<C-r>a<esc>"}
+{"name": "reg-ctrl-r-esc", "pane": "file", "text": "ab\n", "keys": "i<C-r><esc>x"}
 {"name": "msel-esc-keeps", "pane": "file", "text": "aa\nbb\n", "keys": "C<esc>"}
 {"name": "msel-select-mode", "pane": "file", "text": "abcd\nabcd\n", "keys": "Cvl"}
 {"name": "msel-open-count", "pane": "file", "text": "ab\n", "keys": "2O"}
diff --git a/test/hxcases/goldens.jsonl b/test/hxcases/goldens.jsonl
index 006524e8..f6a6aada 100644
--- a/test/hxcases/goldens.jsonl
+++ b/test/hxcases/goldens.jsonl
@@ -442,6 +442,19 @@
 {"name":"msel-collapse","text":"abcd\nabcd\n","mode":"select","cursor":{"row":1,"col":2},"anchor":{"row":1,"col":2},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":2}},{"cursor":{"row":1,"col":2},"anchor":{"row":1,"col":2}}],"primary":1}
 {"name":"msel-flip","text":"abcd\nabcd\n","mode":"select","cursor":{"row":1,"col":0},"anchor":{"row":1,"col":2},"sels":[{"cursor":{"row":0,"col":0},"anchor":{"row":0,"col":2}},{"cursor":{"row":1,"col":0},"anchor":{"row":1,"col":2}}],"primary":1}
 {"name":"msel-yank-paste","text":"aab\nccd\n","mode":"normal","cursor":{"row":1,"col":1},"anchor":{"row":1,"col":1},"sels":[{"cursor":{"row":0,"col":1},"anchor":{"row":0,"col":1}},{"cursor":{"row":1,"col":1},"anchor":{"row":1,"col":1}}],"primary":1}
+{"name":"reg-named-yank-paste","text":"ab acd\n","mode":"normal","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3}}
+{"name":"reg-named-keeps-default","text":"cad\n","mode":"normal","cursor":{"row":0,"col":1},"anchor":{"row":0,"col":1}}
+{"name":"reg-blackhole-delete","text":"acd\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}}
+{"name":"msel-reg-paste-per-range","text":"aaaab\nccccd\n","mode":"normal","cursor":{"row":1,"col":3},"anchor":{"row":1,"col":3},"sels":[{"cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3}},{"cursor":{"row":1,"col":3},"anchor":{"row":1,"col":3}}],"primary":1}
+{"name":"msel-reg-fewer-values","text":"aab\ncad\neaf\n","mode":"normal","cursor":{"row":2,"col":1},"anchor":{"row":2,"col":1},"sels":[{"cursor":{"row":0,"col":1},"anchor":{"row":0,"col":1}},{"cursor":{"row":1,"col":1},"anchor":{"row":1,"col":1}},{"cursor":{"row":2,"col":1},"anchor":{"row":2,"col":1}}],"primary":2}
+{"name":"msel-reg-replace-per-range","text":"ab\ncd\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0},"sels":[{"cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}},{"cursor":{"row":1,"col":0},"anchor":{"row":1,"col":0}}],"primary":0}
+{"name":"msel-reg-more-values-one-range","text":"ab\ncad\n","mode":"normal","cursor":{"row":1,"col":1},"anchor":{"row":1,"col":1}}
+{"name":"reg-index-insert","text":"1x\n2x\n3x\n","mode":"normal","cursor":{"row":0,"col":1},"anchor":{"row":0,"col":1},"sels":[{"cursor":{"row":0,"col":1},"anchor":{"row":0,"col":1}},{"cursor":{"row":1,"col":1},"anchor":{"row":1,"col":1}},{"cursor":{"row":2,"col":1},"anchor":{"row":2,"col":1}}],"primary":0}
+{"name":"reg-search-paste","text":"abb\n","mode":"normal","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":2}}
+{"name":"reg-count-before-quote","text":"ab\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}}
+{"name":"reg-count-after-quote","text":"aaaab\n","mode":"normal","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":1}}
+{"name":"reg-ctrl-r-named","text":"aab\n","mode":"normal","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":2}}
+{"name":"reg-ctrl-r-esc","text":"xab\n","mode":"insert","cursor":{"row":0,"col":1},"anchor":{"row":0,"col":1}}
 {"name":"msel-esc-keeps","text":"aa\nbb\n","mode":"normal","cursor":{"row":1,"col":0},"anchor":{"row":1,"col":0},"sels":[{"cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}},{"cursor":{"row":1,"col":0},"anchor":{"row":1,"col":0}}],"primary":1}
 {"name":"msel-select-mode","text":"abcd\nabcd\n","mode":"select","cursor":{"row":1,"col":1},"anchor":{"row":1,"col":0},"sels":[{"cursor":{"row":0,"col":1},"anchor":{"row":0,"col":0}},{"cursor":{"row":1,"col":1},"anchor":{"row":1,"col":0}}],"primary":1}
 {"name":"msel-open-count","text":"\n\nab\n","mode":"insert","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0},"sels":[{"cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}},{"cursor":{"row":1,"col":0},"anchor":{"row":1,"col":0}}],"primary":0}
diff --git a/test/hxcases/waivers.jsonl b/test/hxcases/waivers.jsonl
index 01e6cfa7..8ac3bd9c 100644
--- a/test/hxcases/waivers.jsonl
+++ b/test/hxcases/waivers.jsonl
@@ -1,4 +1,3 @@
 {"name":"wiX-edit-drops-sel","reason":"Insert edits clear the selection instead of tracking its anchor.","reference":{"name":"wiX-edit-drops-sel","text":"Xalpha beta\n","mode":"normal","cursor":{"row":0,"col":1},"anchor":{"row":0,"col":6}},"expected":{"name":"wiX-edit-drops-sel","text":"Xalpha beta\n","mode":"normal","cursor":{"row":0,"col":1},"anchor":{"row":0,"col":1}}}
 {"name":"alt-c-window-op","reason":"Alt-c moves a pane to a new column instead of Helix's change-noyank.","reference":{"name":"alt-c-window-op","text":"bc def\n","mode":"insert","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}},"expected":{"name":"alt-c-window-op","text":"abc def\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}}}
 {"name":"msel-append","reason":"Append-mode selection origins are tracked only for the primary selection.","reference":{"name":"msel-append","text":"aza\nbzb\n","mode":"normal","cursor":{"row":1,"col":1},"anchor":{"row":1,"col":0},"sels":[{"cursor":{"row":0,"col":1},"anchor":{"row":0,"col":0}},{"cursor":{"row":1,"col":1},"anchor":{"row":1,"col":0}}],"primary":1},"expected":{"name":"msel-append","text":"aza\nbzb\n","mode":"normal","cursor":{"row":1,"col":1},"anchor":{"row":1,"col":0},"sels":[{"cursor":{"row":0,"col":1},"anchor":{"row":0,"col":1}},{"cursor":{"row":1,"col":1},"anchor":{"row":1,"col":0}}],"primary":1}}
-{"name":"msel-yank-paste","reason":"Pardes has one combined yank register, not one value per selection.","reference":{"name":"msel-yank-paste","text":"aab\nccd\n","mode":"normal","cursor":{"row":1,"col":1},"anchor":{"row":1,"col":1},"sels":[{"cursor":{"row":0,"col":1},"anchor":{"row":0,"col":1}},{"cursor":{"row":1,"col":1},"anchor":{"row":1,"col":1}}],"primary":1},"expected":{"name":"msel-yank-paste","text":"aa\ncb\nca\ncd\n","mode":"normal","cursor":{"row":3,"col":0},"anchor":{"row":2,"col":1},"sels":[{"cursor":{"row":1,"col":0},"anchor":{"row":0,"col":1}},{"cursor":{"row":3,"col":0},"anchor":{"row":2,"col":1}}],"primary":1}}
diff --git a/test/panes.zig b/test/panes.zig
index d0551cfc..cbf9d097 100644
--- a/test/panes.zig
+++ b/test/panes.zig
@@ -325,7 +325,7 @@ const TagNavigationTests = struct {
         try std.testing.expectEqual(@as(i32, 0), pane.tag.cur_col);
         key(p, 'E');
         key(p, 'y');
-        try std.testing.expectEqualStrings("/test.txt", p.yank.?);
+        try std.testing.expectEqualStrings("/test.txt", p.registers.text(p.gpa, '"').?);
         // an edit that reaches into it is refused, the cursor with it
         const before = try std.testing.allocator.dupe(u8, try pardes.edit.flatSurface(p, &pane.tag));
         defer std.testing.allocator.free(before);
@@ -848,12 +848,12 @@ const TtySelectionTests = struct {
         const x = rect.x + config.GUTTER;
         const y = p.bodyTop(pane, rect);
         JumpSelectionTests.drag(p, x + 1, y, x + 3, y);
-        try std.testing.expectEqualStrings("lph", p.yank orelse return error.MissingAutomaticTtyYank);
+        try std.testing.expectEqualStrings("lph", p.registers.text(p.gpa, '"') orelse return error.MissingAutomaticTtyYank);
         p.update(.{ .key = .{ .cp = p.opts.tty_toggle, .ctrl = true } });
         p.update(.{ .key = .{ .cp = 'l' } });
         try std.testing.expectEqual(@as(i32, 4), pane.body.cur_col);
         p.update(.{ .key = .{ .cp = 'y' } });
-        try std.testing.expectEqualStrings("a", p.yank.?);
+        try std.testing.expectEqualStrings("a", p.registers.text(p.gpa, '"').?);
         try noChildInput(p);
     }
 
@@ -881,7 +881,7 @@ const TtySelectionTests = struct {
             const expected = if (prompt) "$ ab" else "lph\nrav";
             try std.testing.expectEqual(panes.Text.Mode.tty, pane.body.mode);
             try std.testing.expectEqualStrings(expected, pardes.test_api.heldSelection(p, 0).?);
-            try std.testing.expectEqualStrings(expected, p.yank orelse return error.MissingAutomaticTtyYank);
+            try std.testing.expectEqualStrings(expected, p.registers.text(p.gpa, '"') orelse return error.MissingAutomaticTtyYank);
             try noChildInput(p);
 
             try std.testing.expect(p.executeBuiltinLine(0, "ClipYank"));
@@ -897,7 +897,7 @@ const TtySelectionTests = struct {
             }
             try std.testing.expectEqualStrings(expected, pardes.test_api.heldSelection(p, 0).?);
             p.update(.{ .key = .{ .cp = 'y' } });
-            try std.testing.expectEqualStrings(expected, p.yank.?);
+            try std.testing.expectEqualStrings(expected, p.registers.text(p.gpa, '"').?);
             try noChildInput(p);
             p.update(.{ .key = .{ .cp = p.opts.tty_toggle, .ctrl = true } });
             try std.testing.expectEqual(panes.Text.Mode.tty, pane.body.mode);
@@ -908,7 +908,7 @@ const TtySelectionTests = struct {
             _ = try p.render(frame.allocator());
             try std.testing.expectEqual(panes.Text.Mode.tty, pane.body.mode);
             try std.testing.expectEqualStrings(expected, pardes.test_api.heldSelection(p, 0).?);
-            try std.testing.expectEqualStrings(expected, p.yank.?);
+            try std.testing.expectEqualStrings(expected, p.registers.text(p.gpa, '"').?);
             try noChildInput(p);
         }
     }
@@ -940,7 +940,7 @@ const TtySelectionTests = struct {
                 const sx = source.x + config.GUTTER;
                 const sy = if (p.settings.tag_bottom) source.y else source.y + pardes.BOX_H;
                 JumpSelectionTests.drag(p, sx + 1, sy, sx + 3, sy + 1);
-                try std.testing.expectEqualStrings("lph\nrav", p.yank orelse return error.MissingAutomaticTtyYank);
+                try std.testing.expectEqualStrings("lph\nrav", p.registers.text(p.gpa, '"') orelse return error.MissingAutomaticTtyYank);
                 try noChildInput(p);
 
                 const target = p.rects[1];
@@ -1001,7 +1001,7 @@ const TtySelectionTests = struct {
             try std.testing.expectEqual(panes.Text.Mode.tty, pane.body.mode);
             if (bracketed) p.update(.{ .output = .{ .pane = 0, .bytes = "\x1b[?2004h" } });
             try std.testing.expectEqual(bracketed, panes.Terminal.bracketedPaste(pane));
-            p.yank = try p.gpa.dupe(u8, "one\ntwo"); // what a `y` anywhere left behind
+            p.registers.put(p.gpa, '"', "one\ntwo", 0, 1, true); // what a `y` anywhere left behind
             var buf: [256]u8 = undefined;
             _ = childInput(p, &buf);
 
@@ -1033,7 +1033,7 @@ const TtySelectionTests = struct {
                 );
             }
             // ...and neither chord put the clipboard in the register on its way.
-            try std.testing.expectEqualStrings("one\ntwo", p.yank orelse "");
+            try std.testing.expectEqualStrings("one\ntwo", p.registers.text(p.gpa, '"') orelse "");
         }
     }
 };
@@ -4242,7 +4242,7 @@ test "an empty counted paste leaves no count for the next motion" {
         const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 60, .rows = 12 });
         defer p.deinit();
         const pane = try p.setTestFile("abcdefgh\n");
-        if (empty_register) p.yank = try p.gpa.dupe(u8, "");
+        if (empty_register) p.registers.put(p.gpa, '"', "", 0, 1, true);
         for ("3p") |cp| p.update(.{ .key = .{ .cp = cp } });
         try std.testing.expectEqual(modal.Normal.State{}, pane.body.normal);
         p.update(.{ .key = .{ .cp = 'l' } });
-- 
cgit v1.3


From d88e381793c6505bf3f2af43705bd2fa32f55ef6 Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 14:37:29 -0300
Subject: One Layer for tags, notices, headers and bodies; a taller tag is one
 layer of rows; wire v8

src/Layer.zig merges TagLayer and BodyLayer. `rows` (0 = no layer) and a
cursor at {x, y}. A tag of N rows is ONE layer of N grid rows: tagHit answers
the row as `line`, bodyHit keeps its meaning, and the per-line layer bases
(TAG_LINE_LAYER_BASE, HEADER_LINE_LAYER_BASE) are gone, not aliased.

Wire v8, the one bump: tag layers carry rows and cursor y, and the frame
carries the placed region list. v7 and v9 peers are refused in both
directions (server test over both, a new frontend test over both).

web: tag_layer_value 11 = rows, 12 = cursor y; app.mjs lays every row.
macOS: the Zig side compiles against Layer; pardes.h still sees one row
per tag layer (accepted, the macOS shell is ignored for now).

No visual change: snapshot goldens and the 17 GUI goldens byte-identical.

Shared files touched: pardes.zig, Messages.zig, gui.zig, macos.zig,
detached/client.zig, detached/server.zig, detached/wire.zig (plus web.zig,
app.mjs, edit.zig, look.zig). Not touched: mouse.zig, tagline.zig,
colors.zig, tty.zig, dump.zig, exec.zig, host_io.zig, panes.zig.
---
 docs/render-pipeline.md |   2 +-
 src/Layer.zig           | 198 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/Messages.zig        |   6 +-
 src/Presentation.zig    |  12 +--
 src/body_layer.zig      | 117 ++--------------------------
 src/detached/client.zig |  30 ++++++--
 src/detached/server.zig |   3 +-
 src/detached/wire.zig   | 118 ++++++++++++++++++++---------
 src/draw.zig            | 187 +++++++++++++++++++++++----------------------
 src/edit.zig            |   2 +-
 src/gui/gui.zig         | 139 +++++++++++++++++----------------
 src/look.zig            |   2 +-
 src/macos.zig           |  12 +--
 src/pardes.zig          |  40 +++++-----
 src/surface.zig         |  15 ++--
 src/tag_layer.zig       |  87 ++-------------------
 src/web.zig             |  12 ++-
 src/web/app.mjs         |  38 ++++++----
 test/column_drag.zig    |  10 +--
 test/panes.zig          |  30 ++++----
 20 files changed, 590 insertions(+), 470 deletions(-)
 create mode 100644 src/Layer.zig

(limited to 'src/gui')

diff --git a/docs/render-pipeline.md b/docs/render-pipeline.md
index f63b9a0b..a8b3f019 100644
--- a/docs/render-pipeline.md
+++ b/docs/render-pipeline.md
@@ -809,7 +809,7 @@ stripped. No visual change until stage 9 unless stated.
 | 4 | PLACE: Region list built once; renderPane/tags/notices read their rects from it | wait for tag→Text; the refactor is already replacing BOX_H with `pane.tag_rows` and `p.tagTop/bodyTop(pane, r)` — PLACE absorbs those into the region rects |
 | 5 | JOIN: paint tags/notices/headers once into layers, copy into grid; the grid wins where the copies disagree, and each disagreement is listed for a later decision | goldens are the oracle; wide-grapheme re-clip at the edge (§3.2) |
 | 6 | body layer joined the same way (paint once, copy visible rows) | riskiest join; A/B the old double paint in a temporary test with tag_bottom on and off, then delete it |
-| 7 | Layer merge (TagLayer + BodyLayer), wire v8, web accessors | after the other agent lands; touches mouse hit paths; breaks the macOS shell's layer ABI (accepted: macOS build ignored for now) |
+| 7 | Layer merge (TagLayer + BodyLayer), wire v8, web accessors | after the other agent lands; touches mouse hit paths; breaks the macOS shell's layer ABI (accepted: macOS build ignored for now); done: one `Layer` (src/Layer.zig) with `rows` (0 = no layer) and a `cursor{x, y}`; a tag of N rows is ONE layer of N grid rows (`tagHit` answers the row as `line`, `bodyHit` keeps its meaning), so the per-line layer bases are gone. Wire v8 ships rows, cursor y and the region list in the one bump; v7 and v9 peers are refused in both directions (tests). web: `tag_layer_value` 11 = rows, 12 = cursor y, and app.mjs lays every row. macOS: its Zig side compiles against `Layer`, but pardes.h still sees one row per tag layer (a taller tag shows its first row there) |
 | 8 | GUI draws from regions: role tiers with track groups in tiers 2-3, page cover, hard-edged snapped decor for rules/rails/grips (pane chrome in the pane's tier), per-instance clip; delete inference functions, `transient_on` and `mark_hover` (breaks macOS glass hover; accepted, macOS ignored for now) | stage-0 PPM goldens byte-identical (possible only because hard decor is snapped and not anti-aliased); pane chrome now also shows during transitions, which is the one allowed visible delta, listed |
 | 9 | post chain: glslang, Shadertoy prefix, ping-pong, ShaderAnimation, redraw levels A/B (§5.5); bundled CRT without barrel; delete scene_effects/crt.zig/crt.frag | first visual change (the CRT look) |
 | 10+ | `fx` bookmark: G1–G3 → feel review → G4 bundled → G5 lapis theme → P2s; tty T1–T2 → feel review → removals of audited effects (after user decision) → T3–T5 | each effect its own change, default off |
diff --git a/src/Layer.zig b/src/Layer.zig
new file mode 100644
index 00000000..e979eab7
--- /dev/null
+++ b/src/Layer.zig
@@ -0,0 +1,198 @@
+//! A band of cells a pixel shell draws over the grid at its own pitch: a
+//! pane's, a column's or the workspace's tag rows, a notice chip, or a file
+//! body whose compact tree-sitter context rows outnumber its grid rows. The
+//! grid under it holds a copy of what fits there (draw.zig joins them), so a
+//! terminal client, which has only the grid, loses nothing but the pitch.
+//!
+//! Its viewport is in grid cells, so compact text never moves a hit target.
+//! A tag's rows are each one grid row, their glyphs at the tagline's size; a
+//! body's first `context_rows` rows are stacked at the tagline's height, the
+//! rest at the body's. `rows == 0` is no layer.
+const std = @import("std");
+const pardes = @import("pardes.zig");
+const config = @import("config.zig");
+const limits = @import("memory.zig").limits;
+
+const Layer = @This();
+
+/// `notice` is a pane's transient line -- a builtin's name, a pending leader
+/// chord -- carried as a tagline-shaped band so it gets the tagline's height,
+/// small-font metrics, band offset and border instead of being a body-grid row
+/// wearing a tagline font.
+pub const Kind = enum(u8) { workspace, column, pane, notice, body };
+
+pub const Metrics = struct {
+    body_w: u16 = 1,
+    body_h: u16 = 1,
+    tagline_w: u16 = 1,
+    tagline_h: u16 = 1,
+};
+
+/// A point on a tag, notice or header layer: which row of it and which
+/// column at the tagline's pitch.
+pub const TagHit = struct {
+    kind: Kind,
+    id: u16,
+    serial: u32,
+    col: u16,
+    /// Which row of a taller tag.
+    line: u16 = 0,
+    pixel_x: f32,
+    pixel_y: f32,
+    metrics: Metrics,
+};
+
+kind: Kind = .body,
+/// The pane slot, or the column, it belongs to.
+id: u16 = 0,
+serial: u32 = 0,
+viewport: pardes.Rect = .{ .x = 0, .y = 0, .w = 0, .h = 0 },
+cols: u16 = 0,
+rows: u16 = 0,
+/// A body's compact rows, from its top.
+context_rows: u16 = 0,
+context_separators: std.bit_set.StaticBitSet(limits.wrap_rows) = .initEmpty(),
+/// `rows * cols`, row after row.
+cells: []pardes.Cell = &.{},
+cursor: ?struct { x: u16, y: u16, bar: bool = false } = null,
+/// A band's fill, where its cells run out.
+bg: [3]u8 = .{ 0, 0, 0 },
+/// Vertical offset in rows (negative: above its viewport), for a band
+/// that is moving into place. A pixel shell draws it offset and clipped
+/// to the rows below the viewport's top; the grid has no such thing.
+slide: f32 = 0,
+/// How present a notice band is (1 = fully) while it fades up or
+/// dissolves. `bg` and the cells are already blended by it; a pixel
+/// shell uses it for what it draws around the band, like its rule.
+fade: f32 = 1,
+
+/// Tag columns a viewport this wide holds at the tagline's pitch.
+pub fn capacity(layer: *const Layer, metrics: Metrics) u16 {
+    return @intCast(@min(std.math.maxInt(u16), @max(1, @as(u32, layer.viewport.w) * @max(1, metrics.body_w) / @max(1, metrics.tagline_w))));
+}
+
+pub fn setContextLines(layer: *Layer, lines: []const i32) void {
+    layer.context_separators = .initEmpty();
+    const count = @min(lines.len, layer.context_rows);
+    var index: usize = 0;
+    while (index + 1 < count and index < limits.wrap_rows) : (index += 1) {
+        if (lines[index + 1] != lines[index] +| 1) layer.context_separators.set(index);
+    }
+}
+
+pub fn hasContextBorderAfter(layer: *const Layer, index: usize) bool {
+    if (index >= layer.context_rows or index >= limits.wrap_rows) return false;
+    return index + 1 == layer.context_rows or layer.context_separators.isSet(index);
+}
+
+/// Pixel top of row `index`: a body's compact rows stacked at the tagline's
+/// height, every other row a grid row.
+pub fn rowTop(layer: *const Layer, index: u16, body_h: f32, tagline_h: f32) f32 {
+    const body = @max(1, body_h);
+    const tag = std.math.clamp(tagline_h, 1, body);
+    return @as(f32, @floatFromInt(layer.viewport.y)) * body +
+        @as(f32, @floatFromInt(@min(index, layer.context_rows))) * tag +
+        @as(f32, @floatFromInt(index -| layer.context_rows)) * body;
+}
+
+pub fn rowHeight(layer: *const Layer, index: u16, body_h: f32, tagline_h: f32) f32 {
+    return if (index < layer.context_rows) std.math.clamp(tagline_h, 1, @max(1, body_h)) else @max(1, body_h);
+}
+
+const Point = struct { index: u16, col: u16, metrics: Metrics };
+
+/// The row and column a window pixel lands on, each row at its own pitch:
+/// a tag's at the tagline's width, a body's compact rows too.
+fn pointAt(layer: *const Layer, x: f32, y: f32, body_w: f32, body_h: f32, tagline_w: f32, tagline_h: f32) ?Point {
+    if (layer.rows == 0 or !std.math.isFinite(x) or !std.math.isFinite(y)) return null;
+    // A band's hit is refused outright on metrics no host could have; a
+    // body's has always been floored to a pixel instead.
+    if (layer.kind != .body) for ([_]f32{ body_w, body_h, tagline_w, tagline_h }) |metric|
+        if (!std.math.isFinite(metric) or metric < 1 or metric > std.math.maxInt(u16)) return null;
+    const bw = @max(1, body_w);
+    const bh = @max(1, body_h);
+    const tw = std.math.clamp(tagline_w, 1, bw);
+    const th = std.math.clamp(tagline_h, 1, bh);
+    const dx = x - @as(f32, @floatFromInt(layer.viewport.x)) * bw;
+    const dy = y - @as(f32, @floatFromInt(layer.viewport.y)) * bh;
+    if (dx < 0 or dy < 0 or dx >= @as(f32, @floatFromInt(layer.viewport.w)) * bw or dy >= @as(f32, @floatFromInt(layer.viewport.h)) * bh) return null;
+    const headers = @as(f32, @floatFromInt(layer.context_rows)) * th;
+    const index: u16 = @intFromFloat(if (dy < headers) @floor(dy / th) else @as(f32, @floatFromInt(layer.context_rows)) + @floor((dy - headers) / bh));
+    if (index >= layer.rows) return null;
+    const pitch = if (layer.kind != .body or index < layer.context_rows) tw else bw;
+    return .{
+        .index = index,
+        .col = @intFromFloat(@min(@as(f32, @floatFromInt(layer.cols -| 1)), @floor(dx / pitch))),
+        .metrics = .{ .body_w = @intFromFloat(bw), .body_h = @intFromFloat(bh), .tagline_w = @intFromFloat(tw), .tagline_h = @intFromFloat(th) },
+    };
+}
+
+/// A body layer's pixel as the body cell under it (grid columns, from the
+/// pane's text edge).
+pub fn bodyHit(layer: *const Layer, x: f32, y: f32, body_w: f32, body_h: f32, tagline_w: f32, tagline_h: f32) ?pardes.Mouse.BodyHit {
+    if (layer.kind != .body) return null;
+    const point = layer.pointAt(x, y, body_w, body_h, tagline_w, tagline_h) orelse return null;
+    return .{ .serial = layer.serial, .row = point.index, .col = point.col + config.GUTTER, .pixel_x = x, .pixel_y = y, .metrics = point.metrics };
+}
+
+/// A band's pixel as the tag cell under it.
+pub fn tagHit(layer: *const Layer, x: f32, y: f32, body_w: f32, body_h: f32, tagline_w: f32, tagline_h: f32) ?TagHit {
+    if (layer.kind == .body) return null;
+    const point = layer.pointAt(x, y, body_w, body_h, tagline_w, tagline_h) orelse return null;
+    return .{ .kind = layer.kind, .id = layer.id, .serial = layer.serial, .line = point.index, .col = point.col, .pixel_x = x, .pixel_y = y, .metrics = point.metrics };
+}
+
+test "compact body layer rows fill reclaimed height and invert exact boundaries" {
+    const layer: Layer = .{ .serial = 7, .viewport = .{ .x = 4, .y = 3, .w = 40, .h = 10 }, .cols = 40, .rows = 15, .context_rows = 5 };
+    try std.testing.expectEqual(@as(f32, 120), layer.rowTop(5, 20, 12));
+    try std.testing.expectEqual(@as(f32, 240), layer.rowTop(11, 20, 12));
+    try std.testing.expectEqual(@as(f32, 12), layer.rowHeight(4, 20, 12));
+    try std.testing.expectEqual(@as(f32, 20), layer.rowHeight(5, 20, 12));
+    for (0..12) |index| {
+        const r: u16 = @intCast(index);
+        const y = layer.rowTop(r, 20, 12) + layer.rowHeight(r, 20, 12) / 2;
+        const width: f32 = if (r < 5) 6 else 10;
+        const hit = layer.bodyHit(40 + 3.5 * width, y, 10, 20, 6, 12).?;
+        try std.testing.expectEqual(r, hit.row);
+        try std.testing.expectEqual(@as(u16, 3 + config.GUTTER), hit.col);
+    }
+    try std.testing.expectEqual(@as(u16, 4), layer.bodyHit(45, 119.99, 10, 20, 6, 12).?.row);
+    try std.testing.expectEqual(@as(u16, 5), layer.bodyHit(45, 120, 10, 20, 6, 12).?.row);
+    try std.testing.expectEqual(@as(u16, 11), layer.bodyHit(45, 259.99, 10, 20, 6, 12).?.row);
+    try std.testing.expect(layer.bodyHit(45, 260, 10, 20, 6, 12) == null);
+    try std.testing.expect(layer.bodyHit(39.99, 80, 10, 20, 6, 12) == null);
+    try std.testing.expect(layer.bodyHit(std.math.nan(f32), 80, 10, 20, 6, 12) == null);
+}
+
+test "compact context borders separate source gaps and preserve multiline headers" {
+    var layer: Layer = .{ .context_rows = 6 };
+    layer.setContextLines(&.{ 3, 4, 8, 9, 10, 17 });
+    const expected = [_]bool{ false, true, false, false, true, true, false };
+    for (expected, 0..) |border, index| try std.testing.expectEqual(border, layer.hasContextBorderAfter(index));
+    layer.context_rows = 2;
+    layer.setContextLines(&.{ 9, 10 });
+    try std.testing.expect(!layer.hasContextBorderAfter(0));
+    try std.testing.expect(layer.hasContextBorderAfter(1));
+    try std.testing.expect(!layer.hasContextBorderAfter(4));
+    try std.testing.expect(!layer.context_separators.isSet(4));
+}
+
+test "tag text capacity uses its own pitch and excludes the physical grip" {
+    const layer: Layer = .{ .kind = .pane, .id = 2, .serial = 7, .viewport = .{ .x = 12, .y = 4, .w = 38, .h = 1 }, .cols = 90, .rows = 1 };
+    try std.testing.expectEqual(@as(u16, 63), layer.capacity(.{ .body_w = 10, .tagline_w = 6 }));
+    try std.testing.expect(layer.tagHit(119.99, 85, 10, 20, 6, 12) == null);
+    try std.testing.expectEqual(@as(u16, 0), layer.tagHit(120, 85, 10, 20, 6, 12).?.col);
+    try std.testing.expectEqual(@as(u16, 50), layer.tagHit(423, 85, 10, 20, 6, 12).?.col);
+    try std.testing.expect(layer.tagHit(500, 85, 10, 20, 6, 12) == null);
+    try std.testing.expect(layer.tagHit(120, 85, std.math.nan(f32), 20, 6, 12) == null);
+    try std.testing.expect(layer.tagHit(120, 85, 10, 20, 0, 12) == null);
+}
+
+test "a taller tag's rows are grid rows, each hit on its own line" {
+    const layer: Layer = .{ .kind = .pane, .id = 2, .serial = 7, .viewport = .{ .x = 12, .y = 4, .w = 38, .h = 3 }, .cols = 90, .rows = 3 };
+    try std.testing.expectEqual(@as(u16, 0), layer.tagHit(120, 80, 10, 20, 6, 12).?.line);
+    try std.testing.expectEqual(@as(u16, 1), layer.tagHit(120, 100, 10, 20, 6, 12).?.line);
+    try std.testing.expectEqual(@as(u16, 2), layer.tagHit(120, 139.99, 10, 20, 6, 12).?.line);
+    try std.testing.expect(layer.tagHit(120, 140, 10, 20, 6, 12) == null);
+    try std.testing.expect(layer.bodyHit(120, 100, 10, 20, 6, 12) == null);
+}
diff --git a/src/Messages.zig b/src/Messages.zig
index 7334de95..b7153e5c 100644
--- a/src/Messages.zig
+++ b/src/Messages.zig
@@ -747,7 +747,7 @@ test "a builtin announces itself on the message row, and Verbose silences it" {
     _ = try p.render(frame.allocator());
     const r = p.rects[p.active];
     const band = for (p.surface.tagLayers()) |*layer| {
-        if (layer.cols != 0 and layer.kind == .notice) break layer;
+        if (layer.rows != 0 and layer.kind == .notice) break layer;
     } else return error.NoNoticeBand;
     try std.testing.expectEqual(@as(u16, 1), band.viewport.h);
     try std.testing.expectEqual(if (p.settings.tag_bottom) r.y else r.y + BOX_H, band.viewport.y);
@@ -794,7 +794,7 @@ test "notices stack over the body's top rows without moving them" {
 
     var seen: usize = 0;
     for (p.surface.tagLayers()) |*layer| {
-        if (layer.cols == 0 or layer.kind != .notice) continue;
+        if (layer.rows == 0 or layer.kind != .notice) continue;
         try std.testing.expectEqual(@as(u16, 1), layer.viewport.h);
         // Sized to its own message, right up against the pane's right edge --
         // not the width of the pane.
@@ -814,7 +814,7 @@ test "notices stack over the body's top rows without moving them" {
     _ = frame.reset(.retain_capacity);
     _ = try p.render(frame.allocator());
     for (p.surface.tagLayers()) |*layer|
-        try std.testing.expect(layer.cols == 0 or layer.kind != .notice);
+        try std.testing.expect(layer.rows == 0 or layer.kind != .notice);
 }
 
 test "an idle core wants no wake and a lingering message sleeps to its linger's end" {
diff --git a/src/Presentation.zig b/src/Presentation.zig
index 45b196c8..e1f1b585 100644
--- a/src/Presentation.zig
+++ b/src/Presentation.zig
@@ -42,8 +42,8 @@ shown_closing_len: usize = 0,
 acknowledged: bool = false,
 pending: bool = false,
 previous_cells: []pardes.Cell = &.{},
-previous_body_layers: [MAX_PANES]pardes.BodyLayer = @splat(.{}),
-previous_tag_layers: [pardes.MAX_TAG_LAYERS]pardes.TagLayer = @splat(.{}),
+previous_body_layers: [MAX_PANES]pardes.Layer = @splat(.{}),
+previous_tag_layers: [pardes.MAX_TAG_LAYERS]pardes.Layer = @splat(.{}),
 previous_cols: u16 = 0,
 previous_rows: u16 = 0,
 previous_valid: bool = false,
@@ -335,7 +335,7 @@ pub fn capturePrevious(self: *Presentation, gpa: std.mem.Allocator, surface: *co
         old.cells = storage;
     }
     for (&self.previous_tag_layers, surface.tagLayers()) |*old, *current| {
-        const count = if (current.cols > 0) current.cells.len else 0;
+        const count = if (current.rows > 0) current.cells.len else 0;
         const storage = if (old.cells.len == count) old.cells else gpa.realloc(old.cells, count) catch {
             self.previous_valid = false;
             self.previous_layout = @splat(null);
@@ -684,7 +684,7 @@ test "presentation submission failure preserves shown geometry until retry is ac
 }
 
 test "fractional panel inverse preserves compact header rows through slide and zoom" {
-    const layer: pardes.BodyLayer = .{ .serial = 7, .viewport = .{ .x = 4, .y = 3, .w = 30, .h = 10 }, .cols = 30, .rows = 15, .context_rows = 4 };
+    const layer: pardes.Layer = .{ .serial = 7, .viewport = .{ .x = 4, .y = 3, .w = 30, .h = 10 }, .cols = 30, .rows = 15, .context_rows = 4 };
     for ([_]Transition{ .slide, .zoom, .vertical }) |effect| {
         var presentation: Presentation = .{};
         const track: Track = .{ .serial = 7, .effect = effect, .frame = 4, .frame_count = 10, .from = .{ .x = 2, .y = 2, .w = 20, .h = 8 }, .to = .{ .x = 3, .y = 2, .w = 32, .h = 12 } };
@@ -699,7 +699,7 @@ test "fractional panel inverse preserves compact header rows through slide and z
             const point = presentation.pointerFractional(80, 30, x, y).?;
             try std.testing.expectApproxEqAbs(source_x, point.x, 0.0001);
             try std.testing.expectApproxEqAbs(source_y, point.y, 0.0001);
-            const body_hit = layer.hitAt(point.x * 10, point.y * 20, 10, 20, 8, 10).?;
+            const body_hit = layer.bodyHit(point.x * 10, point.y * 20, 10, 20, 8, 10).?;
             try std.testing.expectEqual(row, body_hit.row);
         }
     }
@@ -715,7 +715,7 @@ test "presentation snapshots own compact body and tag rows across later edits" {
     surface.body_layers[0] = .{ .serial = 9, .cols = 1, .rows = 2, .context_rows = 1, .cells = &body };
     var tag: [1]pardes.Cell = .{.{}};
     tag[0].text[0] = 'T';
-    surface.tag_layers[0] = .{ .kind = .pane, .serial = 9, .cols = 1, .cells = &tag };
+    surface.tag_layers[0] = .{ .kind = .pane, .serial = 9, .cols = 1, .rows = 1, .cells = &tag };
     state.capturePrevious(std.testing.allocator, &surface);
     try std.testing.expect(state.previous_valid);
     tag[0].text[0] = 'U';
diff --git a/src/body_layer.zig b/src/body_layer.zig
index ac87a07b..583a2e98 100644
--- a/src/body_layer.zig
+++ b/src/body_layer.zig
@@ -1,9 +1,6 @@
-//! A pane body as the surface shows it. A file body's logical rows can
-//! outnumber its physical grid rows: hosts place the compact declaration rows
-//! first and clip the remaining body rows. After the layer types come the
-//! functions that draw a body into the surface: its text, colours, selections
-//! and cursor; then the tags drawn beside it, a pane's and the column and
-//! workspace ones, each line a tag layer of its own.
+//! Drawing a pane body into a surface: its text, colours, selections and
+//! cursor, and joining a body with compact context rows through its layer
+//! (Layer.zig).
 const std = @import("std");
 const pardes = @import("pardes.zig");
 const normal = @import("normal.zig");
@@ -29,7 +26,7 @@ const tagline = @import("tagline.zig");
 const Messages = @import("Messages.zig");
 const Text = panes.Text;
 const MAX_PANES = pardes.MAX_PANES;
-const TagKind = @import("tag_layer.zig").Kind;
+const TagKind = @import("Layer.zig").Kind;
 const MAX_TAG_ROWS = pardes.MAX_TAG_ROWS;
 const NOTICE_LAYER_BASE = pardes.NOTICE_LAYER_BASE;
 const TAG_LINE_LAYER_BASE = pardes.TAG_LINE_LAYER_BASE;
@@ -40,108 +37,7 @@ const COLBAR_H = pardes.COLBAR_H;
 const TAG_GAP = pardes.TAG_GAP;
 const wordBoundsAtCol = pardes.wordBoundsAtCol;
 
-pub const Metrics = struct {
-    body_w: u16 = 1,
-    body_h: u16 = 1,
-    tagline_w: u16 = 1,
-    tagline_h: u16 = 1,
-};
-
-pub const Layer = struct {
-    pane: u16 = 0,
-    serial: u32 = 0,
-    viewport: pardes.Rect = .{ .x = 0, .y = 0, .w = 0, .h = 0 },
-    cols: u16 = 0,
-    rows: u16 = 0,
-    context_rows: u16 = 0,
-    context_separators: std.bit_set.StaticBitSet(limits.wrap_rows) = .initEmpty(),
-    cells: []pardes.Cell = &.{},
-    cursor: ?struct { x: u16, y: u16, bar: bool = false } = null,
-
-    pub fn setContextLines(layer: *Layer, lines: []const i32) void {
-        layer.context_separators = .initEmpty();
-        const count = @min(lines.len, layer.context_rows);
-        var row: usize = 0;
-        while (row + 1 < count and row < limits.wrap_rows) : (row += 1) {
-            if (lines[row + 1] != lines[row] +| 1) layer.context_separators.set(row);
-        }
-    }
-
-    pub fn hasContextBorderAfter(layer: *const Layer, row: usize) bool {
-        if (row >= layer.context_rows or row >= limits.wrap_rows) return false;
-        return row + 1 == layer.context_rows or layer.context_separators.isSet(row);
-    }
-
-    pub fn rowTop(layer: *const Layer, row: u16, body_h: f32, tagline_h: f32) f32 {
-        const body = @max(1, body_h);
-        const tag = std.math.clamp(tagline_h, 1, body);
-        return @as(f32, @floatFromInt(layer.viewport.y)) * body +
-            @as(f32, @floatFromInt(@min(row, layer.context_rows))) * tag +
-            @as(f32, @floatFromInt(row -| layer.context_rows)) * body;
-    }
-
-    pub fn rowHeight(layer: *const Layer, row: u16, body_h: f32, tagline_h: f32) f32 {
-        return if (row < layer.context_rows) std.math.clamp(tagline_h, 1, @max(1, body_h)) else @max(1, body_h);
-    }
-
-    pub fn hitAt(layer: *const Layer, x: f32, y: f32, body_w: f32, body_h: f32, tagline_w: f32, tagline_h: f32) ?pardes.Mouse.BodyHit {
-        if (layer.rows == 0 or !std.math.isFinite(x) or !std.math.isFinite(y)) return null;
-        const bw = @max(1, body_w);
-        const bh = @max(1, body_h);
-        const tw = std.math.clamp(tagline_w, 1, bw);
-        const th = std.math.clamp(tagline_h, 1, bh);
-        const dx = x - @as(f32, @floatFromInt(layer.viewport.x)) * bw;
-        const dy = y - @as(f32, @floatFromInt(layer.viewport.y)) * bh;
-        if (dx < 0 or dy < 0 or dx >= @as(f32, @floatFromInt(layer.viewport.w)) * bw or dy >= @as(f32, @floatFromInt(layer.viewport.h)) * bh) return null;
-        const headers = @as(f32, @floatFromInt(layer.context_rows)) * th;
-        const row: u16 = @intFromFloat(if (dy < headers) @floor(dy / th) else @as(f32, @floatFromInt(layer.context_rows)) + @floor((dy - headers) / bh));
-        if (row >= layer.rows) return null;
-        const col: u16 = @intFromFloat(@min(@as(f32, @floatFromInt(layer.cols -| 1)), @floor(dx / (if (row < layer.context_rows) tw else bw))));
-        return .{
-            .serial = layer.serial,
-            .row = row,
-            .col = col + config.GUTTER,
-            .pixel_x = x,
-            .pixel_y = y,
-            .metrics = .{ .body_w = @intFromFloat(bw), .body_h = @intFromFloat(bh), .tagline_w = @intFromFloat(tw), .tagline_h = @intFromFloat(th) },
-        };
-    }
-};
-
-test "compact body layer rows fill reclaimed height and invert exact boundaries" {
-    const layer: Layer = .{ .serial = 7, .viewport = .{ .x = 4, .y = 3, .w = 40, .h = 10 }, .cols = 40, .rows = 15, .context_rows = 5 };
-    try std.testing.expectEqual(@as(f32, 120), layer.rowTop(5, 20, 12));
-    try std.testing.expectEqual(@as(f32, 240), layer.rowTop(11, 20, 12));
-    try std.testing.expectEqual(@as(f32, 12), layer.rowHeight(4, 20, 12));
-    try std.testing.expectEqual(@as(f32, 20), layer.rowHeight(5, 20, 12));
-    for (0..12) |index| {
-        const row: u16 = @intCast(index);
-        const y = layer.rowTop(row, 20, 12) + layer.rowHeight(row, 20, 12) / 2;
-        const width: f32 = if (row < 5) 6 else 10;
-        const hit = layer.hitAt(40 + 3.5 * width, y, 10, 20, 6, 12).?;
-        try std.testing.expectEqual(row, hit.row);
-        try std.testing.expectEqual(@as(u16, 3 + config.GUTTER), hit.col);
-    }
-    try std.testing.expectEqual(@as(u16, 4), layer.hitAt(45, 119.99, 10, 20, 6, 12).?.row);
-    try std.testing.expectEqual(@as(u16, 5), layer.hitAt(45, 120, 10, 20, 6, 12).?.row);
-    try std.testing.expectEqual(@as(u16, 11), layer.hitAt(45, 259.99, 10, 20, 6, 12).?.row);
-    try std.testing.expect(layer.hitAt(45, 260, 10, 20, 6, 12) == null);
-    try std.testing.expect(layer.hitAt(39.99, 80, 10, 20, 6, 12) == null);
-    try std.testing.expect(layer.hitAt(std.math.nan(f32), 80, 10, 20, 6, 12) == null);
-}
-
-test "compact context borders separate source gaps and preserve multiline headers" {
-    var layer: Layer = .{ .context_rows = 6 };
-    layer.setContextLines(&.{ 3, 4, 8, 9, 10, 17 });
-    const expected = [_]bool{ false, true, false, false, true, true, false };
-    for (expected, 0..) |border, row| try std.testing.expectEqual(border, layer.hasContextBorderAfter(row));
-    layer.context_rows = 2;
-    layer.setContextLines(&.{ 9, 10 });
-    try std.testing.expect(!layer.hasContextBorderAfter(0));
-    try std.testing.expect(layer.hasContextBorderAfter(1));
-    try std.testing.expect(!layer.hasContextBorderAfter(4));
-    try std.testing.expect(!layer.context_separators.isSet(4));
-}
+const Layer = @import("Layer.zig");
 
 // ---- drawing a pane body into the surface ----
 
@@ -305,7 +201,8 @@ pub fn joinBody(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane,
         const start = (row + first_row) * r.w + config.GUTTER;
         @memcpy(layer.cells[row * width ..][0..width], temporary_cells[start..][0..width]);
     }
-    layer.pane = @intCast(id);
+    layer.kind = .body;
+    layer.id = @intCast(id);
     layer.serial = pane.serial;
     const body = s.region(.body, id).?;
     layer.viewport = .{ .x = body.rect.x, .y = body.rect.y, .w = body.rect.w - body.clip, .h = body.rect.h };
diff --git a/src/detached/client.zig b/src/detached/client.zig
index 4468c961..3347f609 100644
--- a/src/detached/client.zig
+++ b/src/detached/client.zig
@@ -103,8 +103,10 @@ pub const Client = struct {
     grid: std.ArrayListUnmanaged(pardes.Cell) = .empty,
     cursor: ?wire.Cursor = null,
     pointer_shape: pardes.Surface.PointerShape = .arrow,
-    body_layers: [pardes.MAX_PANES]pardes.BodyLayer = @splat(.{}),
-    tag_layers: [pardes.MAX_TAG_LAYERS]pardes.TagLayer = @splat(.{}),
+    body_layers: [pardes.MAX_PANES]pardes.Layer = @splat(.{}),
+    tag_layers: [pardes.MAX_TAG_LAYERS]pardes.Layer = @splat(.{}),
+    /// The session's placed regions, as its last frame gave them.
+    regions: std.ArrayListUnmanaged(pardes.Region) = .empty,
     in: std.ArrayListUnmanaged(u8) = .empty,
     out: std.ArrayListUnmanaged(u8) = .empty,
     /// Bytes of `in` belonging to the message `next` returned last. Compacted at
@@ -182,6 +184,7 @@ pub const Client = struct {
             layer.* = .{};
         }
         for (&c.tag_layers) |*layer| c.gpa.free(layer.cells);
+        c.regions.deinit(c.gpa);
         c.in.deinit(c.gpa);
         c.out.deinit(c.gpa);
     }
@@ -319,7 +322,7 @@ pub const Client = struct {
                     try c.reshape(f.cols, f.rows);
                 }
                 try f.apply(c.grid.items);
-                f.applyLayers(c.gpa, &c.body_layers, &c.tag_layers) catch |err| return switch (err) {
+                f.applyLayers(c.gpa, &c.body_layers, &c.tag_layers, &c.regions) catch |err| return switch (err) {
                     error.OutOfMemory => error.Closed,
                     else => @as(wire.Error, @errorCast(err)),
                 };
@@ -995,6 +998,12 @@ test "detached session: a frontend that dies takes nothing with it" {
 }
 
 test "detached session: a frontend speaking another protocol is refused, loudly" {
+    // The protocol before this one (v7 carried one-row tags and no regions)
+    // and the one after.
+    for ([_]u16{ wire.version - 1, wire.version + 1 }) |claimed| try refusedHello(claimed);
+}
+
+fn refusedHello(claimed: u16) !void {
     var h: Harness = undefined;
     try h.init(60, 16);
     defer h.deinit();
@@ -1006,7 +1015,7 @@ test "detached session: a frontend speaking another protocol is refused, loudly"
     defer _ = libc.close(fd);
     var buf: [64]u8 = undefined;
     const hello = try wire.encodeClient(&buf, .{
-        .hello = .{ .version = wire.version + 1, .cols = 60, .rows = 16 },
+        .hello = .{ .version = claimed, .cols = 60, .rows = 16 },
     });
     try testing.expectEqual(@as(isize, @intCast(hello.len)), libc.send(fd, hello.ptr, hello.len, nosignal));
 
@@ -1024,6 +1033,17 @@ test "detached session: a frontend speaking another protocol is refused, loudly"
     try testing.expect(!h.core.quit);
 }
 
+test "detached frontend: a session speaking another protocol is not attached to" {
+    for ([_]u16{ wire.version - 1, wire.version + 1 }) |claimed| {
+        var c: Client = .{ .gpa = testing.allocator };
+        defer c.deinit();
+        var buf: [64]u8 = undefined;
+        try c.in.appendSlice(testing.allocator, try wire.encodeServer(&buf, .{ .welcome = .{ .version = claimed, .slot = 0, .cols = 60, .rows = 16 } }));
+        try testing.expectError(error.Ungreeted, c.next());
+        try testing.expect(!c.attached());
+    }
+}
+
 test "detached session: a peer that sends garbage is dropped, not obeyed" {
     var h: Harness = undefined;
     try h.init(60, 16);
@@ -1281,7 +1301,7 @@ fn pumpUntilNotice(h: *Harness, c: *Client, want: []const u8) !bool {
         try c.wait(5);
         while (try c.next()) |_| {}
         for (&c.tag_layers) |*layer| {
-            if (layer.cols == 0 or layer.kind != .notice) continue;
+            if (layer.rows == 0 or layer.kind != .notice) continue;
             var n: usize = 0;
             for (layer.cells[0..layer.cols]) |cell| {
                 const g = cell.grapheme();
diff --git a/src/detached/server.zig b/src/detached/server.zig
index 212c9a3d..46fb8fcf 100644
--- a/src/detached/server.zig
+++ b/src/detached/server.zig
@@ -739,7 +739,7 @@ pub const Session = struct {
 
     fn sendFrame(s: *Session, c: *Client, surface: *const pardes.Surface) void {
         const cells = surface.cells;
-        const want = wire.frameBound(surface.cols, surface.rows) + wire.layersBound(&surface.body_layers, &surface.tag_layers);
+        const want = wire.frameBound(surface.cols, surface.rows) + wire.layersBound(&surface.body_layers, &surface.tag_layers, surface.regionList());
         s.scratch.ensureTotalCapacity(s.gpa, want) catch return s.close(c, .oom);
         const prev: []const pardes.Cell = if (c.need_full or c.mirror.items.len != cells.len)
             &.{}
@@ -759,6 +759,7 @@ pub const Session = struct {
             prev,
             &surface.body_layers,
             &surface.tag_layers,
+            surface.regionList(),
         ) catch |err| {
             log.debug("frame {d}x{d} not encodable: {t}", .{ surface.cols, surface.rows, err });
             return;
diff --git a/src/detached/wire.zig b/src/detached/wire.zig
index 94bd7f0b..684c869b 100644
--- a/src/detached/wire.zig
+++ b/src/detached/wire.zig
@@ -7,7 +7,9 @@ const limits = @import("../memory.zig").limits;
 /// 7: tag layers gained the `.notice` kind, so a frame can carry a tag value
 /// an older frontend would reject mid-session. The greeting is where that has
 /// to be refused, which is what this number is for.
-pub const version: u16 = 7;
+/// 8: one layer type: a tag band carries all its rows (not a layer per
+/// line), and a frame carries the core's placed regions after its layers.
+pub const version: u16 = 8;
 
 pub const Error = error{ Truncated, Overlong, BadTag, BadValue, Trailing, NoSpace };
 
@@ -167,7 +169,8 @@ pub const Frame = struct {
     nruns: u32,
     runs: []const u8,
 
-    pub fn applyLayers(f: Frame, gpa: std.mem.Allocator, layers: *[pardes.MAX_PANES]pardes.BodyLayer, tags: *[pardes.MAX_TAG_LAYERS]pardes.TagLayer) !void {
+    pub fn applyLayers(f: Frame, gpa: std.mem.Allocator, layers: *[pardes.MAX_PANES]pardes.Layer, tags: *[pardes.MAX_TAG_LAYERS]pardes.Layer, regions: *std.ArrayListUnmanaged(pardes.Region)) !void {
+        regions.clearRetainingCapacity();
         for (layers) |*layer| {
             gpa.free(layer.cells);
             layer.* = .{};
@@ -191,13 +194,14 @@ pub const Frame = struct {
         const count = try r.getU16();
         if (count > layers.len) return error.Overlong;
         for (layers[0..count]) |*layer| {
-            layer.pane = try r.getU16();
+            layer.kind = .body;
+            layer.id = try r.getU16();
             layer.serial = try r.getU32();
             layer.viewport = .{ .x = try r.getU16(), .y = try r.getU16(), .w = try r.getU16(), .h = try r.getU16() };
             layer.cols = try r.getU16();
             layer.rows = try r.getU16();
             layer.context_rows = try r.getU16();
-            if (layer.pane >= pardes.MAX_PANES or layer.cols == 0 or layer.cols > f.cols or
+            if (layer.id >= pardes.MAX_PANES or layer.cols == 0 or layer.cols > f.cols or
                 layer.rows == 0 or layer.rows > 2 * max_rows or layer.context_rows > layer.rows or layer.context_rows > limits.wrap_rows or
                 layer.viewport.x > f.cols or layer.viewport.w > f.cols - layer.viewport.x or
                 layer.viewport.y > f.rows or layer.viewport.h > f.rows - layer.viewport.y) return error.BadValue;
@@ -217,19 +221,40 @@ pub const Frame = struct {
             layer.serial = try r.getU32();
             layer.viewport = .{ .x = try r.getU16(), .y = try r.getU16(), .w = try r.getU16(), .h = try r.getU16() };
             layer.cols = try r.getU16();
+            layer.rows = try r.getU16();
             for (&layer.bg) |*channel| channel.* = try r.getByte();
-            if (layer.cols == 0 or layer.viewport.w == 0 or layer.viewport.h != 1 or
+            if (layer.cols == 0 or layer.viewport.w == 0 or layer.rows == 0 or layer.rows > pardes.MAX_TAG_ROWS or
+                layer.viewport.h != layer.rows or
                 layer.viewport.x > f.cols or layer.viewport.w > f.cols - layer.viewport.x or
-                layer.viewport.y >= f.rows or (switch (layer.kind) {
+                layer.viewport.y >= f.rows or layer.viewport.h > f.rows - layer.viewport.y or (switch (layer.kind) {
                 .workspace => layer.id != 0,
                 .column => layer.id >= pardes.MAX_COLS,
                 .pane, .notice => layer.id >= pardes.MAX_PANES,
+                .body => true,
             })) return error.BadValue;
-            const cursor = try getCursor(&r, layer.cols, 1);
-            layer.cursor = if (cursor) |c| .{ .col = c.x, .bar = c.bar } else null;
-            layer.cells = try gpa.alloc(pardes.Cell, layer.cols);
+            const cursor = try getCursor(&r, layer.cols, layer.rows);
+            layer.cursor = if (cursor) |c| .{ .x = c.x, .y = c.y, .bar = c.bar } else null;
+            layer.cells = try gpa.alloc(pardes.Cell, @as(usize, layer.cols) * layer.rows);
             for (layer.cells) |*cell| cell.* = try decodeCell(&r);
         }
+        const region_count = try r.getU16();
+        if (region_count > pardes.MAX_REGIONS) return error.Overlong;
+        try regions.ensureTotalCapacity(gpa, region_count);
+        for (0..region_count) |_| {
+            var region: pardes.Region = .{ .kind = try r.getTag(pardes.Region.Kind), .rect = undefined };
+            region.owner = try r.getByte();
+            region.serial = try r.getU32();
+            region.rect = .{ .x = try r.getU16(), .y = try r.getU16(), .w = try r.getU16(), .h = try r.getU16() };
+            region.active = try r.getBool();
+            region.thumb_y = try r.getU16();
+            region.thumb_h = try r.getU16();
+            region.notice = try r.getByte();
+            region.clip = try r.getU16();
+            if (region.rect.x > f.cols or region.rect.w > f.cols - region.rect.x or
+                region.rect.y > f.rows or region.rect.h > f.rows - region.rect.y or
+                region.clip > region.rect.w or region.thumb_y > region.rect.h or region.thumb_h > region.rect.h - region.thumb_y) return error.BadValue;
+            regions.appendAssumeCapacity(region);
+        }
         try r.end();
     }
 
@@ -672,21 +697,23 @@ pub fn encodeFramePointer(
     cells: []const pardes.Cell,
     prev: []const pardes.Cell,
 ) Error![]const u8 {
-    return encodeFrameLayers(out, cols, rows, cursor, pointer_shape, cells, prev, &.{}, &.{});
+    return encodeFrameLayers(out, cols, rows, cursor, pointer_shape, cells, prev, &.{}, &.{}, &.{});
 }
 
-pub fn layersBound(layers: []const pardes.BodyLayer, tags: []const pardes.TagLayer) usize {
-    var n: usize = 4;
+pub fn layersBound(layers: []const pardes.Layer, tags: []const pardes.Layer, regions: []const pardes.Region) usize {
+    var n: usize = 6;
     for (layers) |layer| if (layer.rows != 0) {
         n += 26 + layer.context_rows + layer.cells.len * cell_max;
     };
-    for (tags) |layer| if (layer.cols != 0) {
-        n += 26 + layer.cells.len * cell_max;
+    for (tags) |layer| if (layer.rows != 0) {
+        n += 28 + layer.cells.len * cell_max;
     };
-    return n;
+    return n + regions.len * region_len;
 }
 
-pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, pointer_shape: pardes.Surface.PointerShape, cells: []const pardes.Cell, prev: []const pardes.Cell, layers: []const pardes.BodyLayer, tags: []const pardes.TagLayer) Error![]const u8 {
+const region_len = 1 + 1 + 4 + 8 + 1 + 2 + 2 + 1 + 2;
+
+pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, pointer_shape: pardes.Surface.PointerShape, cells: []const pardes.Cell, prev: []const pardes.Cell, layers: []const pardes.Layer, tags: []const pardes.Layer, regions: []const pardes.Region) Error![]const u8 {
     // The protocol's ceiling, enforced by the ENCODER too, and BEFORE the
     // assert below so a caller can be told rather than tripped. `max_payload`
     // is derived from these two, so a larger grid is a frame this decoder
@@ -708,7 +735,7 @@ pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, point
     const layers_len_at = w.n;
     try w.putU32(0);
     const layers_start = w.n;
-    if (layers.len != 0 or tags.len != 0) {
+    if (layers.len != 0 or tags.len != 0 or regions.len != 0) {
         var count: u16 = 0;
         for (layers) |layer| if (layer.rows != 0) {
             count += 1;
@@ -717,7 +744,7 @@ pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, point
         for (layers) |layer| {
             if (layer.rows == 0) continue;
             if (layer.context_rows > limits.wrap_rows or layer.context_rows > layer.rows) return error.BadValue;
-            try w.putU16(layer.pane);
+            try w.putU16(layer.id);
             try w.putU32(layer.serial);
             try w.putU16(layer.viewport.x);
             try w.putU16(layer.viewport.y);
@@ -731,13 +758,13 @@ pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, point
             for (layer.cells) |*cell| try putCell(&w, cell);
         }
         var tag_count: u16 = 0;
-        for (tags) |layer| if (layer.cols != 0) {
+        for (tags) |layer| if (layer.rows != 0) {
             tag_count += 1;
         };
         try w.putU16(tag_count);
         for (tags) |layer| {
-            if (layer.cols == 0) continue;
-            if (layer.cells.len != layer.cols) return error.BadValue;
+            if (layer.rows == 0) continue;
+            if (layer.cells.len != @as(usize, layer.cols) * layer.rows) return error.BadValue;
             try w.putByte(@intFromEnum(layer.kind));
             try w.putU16(layer.id);
             try w.putU32(layer.serial);
@@ -746,10 +773,26 @@ pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, point
             try w.putU16(layer.viewport.w);
             try w.putU16(layer.viewport.h);
             try w.putU16(layer.cols);
+            try w.putU16(layer.rows);
             for (layer.bg) |channel| try w.putByte(channel);
-            try putCursor(&w, if (layer.cursor) |c| .{ .x = c.col, .y = 0, .bar = c.bar } else null, layer.cols, 1);
+            try putCursor(&w, if (layer.cursor) |c| .{ .x = c.x, .y = c.y, .bar = c.bar } else null, layer.cols, layer.rows);
             for (layer.cells) |*cell| try putCell(&w, cell);
         }
+        try w.putU16(@intCast(regions.len));
+        for (regions) |region| {
+            try w.putByte(@intFromEnum(region.kind));
+            try w.putByte(region.owner);
+            try w.putU32(region.serial);
+            try w.putU16(region.rect.x);
+            try w.putU16(region.rect.y);
+            try w.putU16(region.rect.w);
+            try w.putU16(region.rect.h);
+            try w.putBool(region.active);
+            try w.putU16(region.thumb_y);
+            try w.putU16(region.thumb_h);
+            try w.putByte(region.notice);
+            try w.putU16(region.clip);
+        }
     }
     std.mem.writeInt(u32, w.buf[layers_len_at..][0..4], @intCast(w.n - layers_start), .little);
     const nruns_at = w.n;
@@ -1820,22 +1863,26 @@ test "detached wire carries compact body rows and exact pointer metrics" {
     var cells: [8]pardes.Cell = @splat(.{});
     var logical: [12]pardes.Cell = @splat(.{});
     logical[10] = .{ .text = "z".* ++ @as([6]u8, @splat(0)), .len = 1, .default = false };
-    var layer: pardes.BodyLayer = .{ .pane = 0, .serial = 42, .viewport = .{ .x = 0, .y = 0, .w = 2, .h = 4 }, .cols = 2, .rows = 6, .context_rows = 2, .cells = &logical, .cursor = .{ .x = 0, .y = 5, .bar = true } };
+    var layer: pardes.Layer = .{ .id = 0, .serial = 42, .viewport = .{ .x = 0, .y = 0, .w = 2, .h = 4 }, .cols = 2, .rows = 6, .context_rows = 2, .cells = &logical, .cursor = .{ .x = 0, .y = 5, .bar = true } };
     layer.context_separators.set(0);
     var tag_cells: [3]pardes.Cell = @splat(.{});
     tag_cells[2] = logical[10];
-    const tag: pardes.TagLayer = .{ .kind = .column, .id = 1, .viewport = .{ .x = 0, .y = 0, .w = 2, .h = 1 }, .cols = 3, .bg = .{ 11, 22, 33 }, .cells = &tag_cells, .cursor = .{ .col = 2, .bar = true } };
-    const out = try gpa.alloc(u8, frameBound(2, 4) + layersBound(&.{layer}, &.{tag}));
+    const tag: pardes.Layer = .{ .kind = .column, .id = 1, .viewport = .{ .x = 0, .y = 0, .w = 2, .h = 1 }, .cols = 3, .rows = 1, .bg = .{ 11, 22, 33 }, .cells = &tag_cells, .cursor = .{ .x = 2, .y = 0, .bar = true } };
+    const placed = [_]pardes.Region{.{ .kind = .rail, .owner = 3, .serial = 42, .rect = .{ .x = 0, .y = 1, .w = 2, .h = 3 }, .active = true, .thumb_y = 1, .thumb_h = 2, .clip = 1 }};
+    const out = try gpa.alloc(u8, frameBound(2, 4) + layersBound(&.{layer}, &.{tag}, &placed));
     defer gpa.free(out);
-    const encoded = try encodeFrameLayers(out, 2, 4, null, .link, &cells, &cells, &.{layer}, &.{tag});
+    const encoded = try encodeFrameLayers(out, 2, 4, null, .link, &cells, &cells, &.{layer}, &.{tag}, &placed);
     const packet = (try framed(encoded)).?;
     const frame = (try decodeServer(packet.tag, packet.payload)).frame;
-    var decoded: [pardes.MAX_PANES]pardes.BodyLayer = @splat(.{});
-    var tags: [pardes.MAX_TAG_LAYERS]pardes.TagLayer = @splat(.{});
+    var decoded: [pardes.MAX_PANES]pardes.Layer = @splat(.{});
+    var tags: [pardes.MAX_TAG_LAYERS]pardes.Layer = @splat(.{});
     defer for (&tags) |*item| gpa.free(item.cells);
     defer for (&decoded) |*item| gpa.free(item.cells);
     try frame.apply(&cells);
-    try frame.applyLayers(gpa, &decoded, &tags);
+    var regions: std.ArrayListUnmanaged(pardes.Region) = .empty;
+    defer regions.deinit(gpa);
+    try frame.applyLayers(gpa, &decoded, &tags, &regions);
+    try std.testing.expectEqualDeep(placed[0..], regions.items);
     try std.testing.expectEqual(@as(u16, 6), decoded[0].rows);
     try std.testing.expect(decoded[0].context_separators.isSet(0));
     try std.testing.expect(!decoded[0].context_separators.isSet(1));
@@ -1847,10 +1894,10 @@ test "detached wire carries compact body rows and exact pointer metrics" {
     try std.testing.expectEqual(tag.id, tags[0].id);
     try std.testing.expectEqual(tag.bg, tags[0].bg);
     try std.testing.expectEqual(tag.cols, tags[0].cols);
-    try std.testing.expectEqual(@as(u16, 2), tags[0].cursor.?.col);
+    try std.testing.expectEqual(@as(u16, 2), tags[0].cursor.?.x);
     try std.testing.expectEqualStrings("z", tags[0].cells[2].grapheme());
-    const pointer = layer.hitAt(4, 27, 8, 16, 6, 8).?;
-    const tag_pointer = tag.hitAt(11, 8, 8, 16, 4, 8).?;
+    const pointer = layer.bodyHit(4, 27, 8, 16, 6, 8).?;
+    const tag_pointer = tag.tagHit(11, 8, 8, 16, 4, 8).?;
     const message: ClientMsg = .{ .event = .{ .mouse = .{ .col = 0, .row = 1, .button = .left, .kind = .press, .body_hit = pointer, .tag_hit = tag_pointer } } };
     var mouse_bytes: [256]u8 = undefined;
     const mouse_encoded = try encodeClient(&mouse_bytes, message);
@@ -1861,19 +1908,20 @@ test "detached wire carries compact body rows and exact pointer metrics" {
     try std.testing.expect(mouse_encoded.len <= clientBound(message));
     var truncated = frame;
     truncated.layers = frame.layers[0 .. frame.layers.len - 1];
-    try std.testing.expectError(error.Truncated, truncated.applyLayers(gpa, &decoded, &tags));
+    try std.testing.expectError(error.Truncated, truncated.applyLayers(gpa, &decoded, &tags, &regions));
     for (decoded) |item| {
         try std.testing.expectEqual(@as(u16, 0), item.rows);
         try std.testing.expectEqual(@as(usize, 0), item.cells.len);
         try std.testing.expectEqual(@as(usize, 0), item.context_separators.count());
     }
     for (tags) |item| {
-        try std.testing.expectEqual(@as(u16, 0), item.cols);
+        try std.testing.expectEqual(@as(u16, 0), item.rows);
         try std.testing.expectEqual(@as(usize, 0), item.cells.len);
     }
+    try std.testing.expectEqual(@as(usize, 0), regions.items.len);
     const no_layers = try encodeFramePointer(out, 2, 4, null, .arrow, &cells, &cells);
     const cleared_packet = (try framed(no_layers)).?;
     const cleared = (try decodeServer(cleared_packet.tag, cleared_packet.payload)).frame;
-    try cleared.applyLayers(gpa, &decoded, &tags);
+    try cleared.applyLayers(gpa, &decoded, &tags, &regions);
     try std.testing.expectEqual(@as(u16, 0), decoded[0].rows);
 }
diff --git a/src/draw.zig b/src/draw.zig
index 7d91ad31..7cfe7554 100644
--- a/src/draw.zig
+++ b/src/draw.zig
@@ -28,7 +28,7 @@ const Pane = panes.Pane;
 const Text = panes.Text;
 const Rect = layout.Rect;
 const Region = @import("surface.zig").Region;
-const TagKind = @import("tag_layer.zig").Kind;
+const TagKind = @import("Layer.zig").Kind;
 const pdf_enabled = panes.Pdf.enabled;
 const wordBoundsAtCol = pardes.wordBoundsAtCol;
 const BOX_H = pardes.BOX_H;
@@ -40,8 +40,6 @@ const MAX_PANES = pardes.MAX_PANES;
 const MAX_COLS = pardes.MAX_COLS;
 const MAX_TAG_ROWS = pardes.MAX_TAG_ROWS;
 const NOTICE_LAYER_BASE = pardes.NOTICE_LAYER_BASE;
-const TAG_LINE_LAYER_BASE = pardes.TAG_LINE_LAYER_BASE;
-const HEADER_LINE_LAYER_BASE = pardes.HEADER_LINE_LAYER_BASE;
 
 /// Where every part of the frame goes, decided once before anything is
 /// painted: the page; each pane's grip, tag, body, rail (with its thumb)
@@ -172,7 +170,7 @@ pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface {
     // never set.
     for (s.cells) |*c| c.hover = false;
     for (&s.body_layers) |*layer| layer.rows = 0;
-    for (&s.tag_layers) |*layer| layer.cols = 0;
+    for (&s.tag_layers) |*layer| layer.rows = 0;
     s.nimages = 0;
     s.npanel_tracks = 0;
     s.previous_cells = &.{};
@@ -505,11 +503,9 @@ pub fn paintHeaders(p: *Pardes, s: *Surface, arena: std.mem.Allocator) !void {
     tagline.revealHeader(p);
     if (s.region(.workspace_tag, Region.none)) |region| {
         const top = if (p.header_focus and p.header_column == null) p.header_top else 0;
-        for (0..region.rect.h) |line| {
-            const index = if (line == 0) MAX_PANES + MAX_COLS else HEADER_LINE_LAYER_BASE + MAX_COLS * (MAX_TAG_ROWS - 1) + line - 1;
-            try renderHeaderLayer(p, arena, index, .workspace, 0, @intCast(line), .{ .x = region.rect.x, .y = region.rect.y + @as(u16, @intCast(line)), .w = region.rect.w, .h = TOPBAR_H }, modal.lineSlice(tagline.topbar(p), line + top), chrome.tag_bg, chrome.tag_fg);
-            joinHeaderLine(s, &s.tag_layers[index], chrome.tag_fg);
-        }
+        const layer = &s.tag_layers[MAX_PANES + MAX_COLS];
+        try renderHeaderLayer(p, arena, layer, .workspace, 0, region.rect, tagline.topbar(p), top, chrome.tag_bg, chrome.tag_fg);
+        joinHeaderRows(s, layer, chrome.tag_fg);
     }
     const column_rows = p.columnBarHeight();
     if (column_rows > 0) for (0..p.ncol) |c| {
@@ -531,23 +527,21 @@ pub fn paintHeaders(p: *Pardes, s: *Surface, arena: std.mem.Allocator) !void {
             s.fill(p.col_x[c] + grip, region.rect.y, inset - grip, column_rows, .{ .bg = .{ .rgb = bg }, .font_role = .tagline });
         }
         const top = if (p.header_focus and p.header_column == c) p.header_top else 0;
-        for (0..column_rows) |line| {
-            const index = if (line == 0) MAX_PANES + c else HEADER_LINE_LAYER_BASE + c * (MAX_TAG_ROWS - 1) + line - 1;
-            try renderHeaderLayer(p, arena, index, .column, @intCast(c), @intCast(line), .{ .x = region.rect.x, .y = region.rect.y + @as(u16, @intCast(line)), .w = region.rect.w, .h = COLBAR_H }, modal.lineSlice(tagline.columnTag(p, c), line + top), bg, fg);
-            if (p.col_x[c] < s.cols) joinHeaderLine(s, &s.tag_layers[index], fg);
-            // Laid out at its full width; only shown short of the rail.
-            s.tag_layers[index].viewport.w -= region.clip;
-        }
+        const layer = &s.tag_layers[MAX_PANES + c];
+        try renderHeaderLayer(p, arena, layer, .column, @intCast(c), region.rect, tagline.columnTag(p, c), top, bg, fg);
+        if (p.col_x[c] < s.cols) joinHeaderRows(s, layer, fg);
+        // Laid out at its full width; only shown short of the rail.
+        layer.viewport.w -= region.clip;
     };
 }
 
-/// Copy a header line's layer into the grid under it, and its caret.
-fn joinHeaderLine(s: *Surface, layer: *const pardes.TagLayer, fg: [3]u8) void {
+/// Copy a header's layer into the grid under it, row by row, and its caret.
+fn joinHeaderRows(s: *Surface, layer: *const pardes.Layer, fg: [3]u8) void {
     const v = layer.viewport;
     const w = @min(v.w, s.cols -| v.x);
-    joinCells(s, v.x, v.y, layer.cells[0..layer.cols], 0, w, .{ .rgb = fg });
+    for (0..layer.rows) |line| joinCells(s, v.x, v.y + @as(u16, @intCast(line)), layer.cells[line * layer.cols ..][0..layer.cols], 0, w, .{ .rgb = fg });
     if (layer.cursor) |caret| {
-        if (caret.col < v.w) s.cursor = .{ .x = v.x + caret.col, .y = v.y, .bar = caret.bar };
+        if (caret.x < v.w) s.cursor = .{ .x = v.x + caret.x, .y = v.y + caret.y, .bar = caret.bar };
     }
 }
 
@@ -600,77 +594,85 @@ fn tagTintRange(pane: *const Pane, tag: []const u8, prefix_len: usize) ?struct {
     return .{ .lo = start + basename, .hi = start + name.len };
 }
 
-/// One row of a header or a notice band as a tag layer: `text` is line
-/// `line` of what it shows.
-fn renderHeaderLayer(p: *Pardes, arena: std.mem.Allocator, index: usize, kind: TagKind, id: u16, line: u16, viewport: Rect, text: []const u8, bg: [3]u8, fg: [3]u8) !void {
+/// A header or a notice band as a tag layer: `viewport.h` rows, line `top`
+/// of `text` and on, laid out at the tagline's pitch -- as wide as its
+/// widest line and never narrower than its viewport.
+fn renderHeaderLayer(p: *Pardes, arena: std.mem.Allocator, layer: *pardes.Layer, kind: TagKind, id: u16, viewport: Rect, text: []const u8, top: usize, bg: [3]u8, fg: [3]u8) !void {
     _ = arena;
-    const layer = &p.surface.tag_layers[index];
-    if (viewport.w == 0) {
-        layer.cols = 0;
+    if (viewport.w == 0 or viewport.h == 0) {
+        layer.rows = 0;
         return;
     }
-    const columns: u16 = @intCast(@min(std.math.maxInt(u16), @max(p.tagCapacity(viewport.w), panes.File.displayWidth(text) + 1)));
-    if (layer.cells.len != columns) layer.cells = try p.gpa.realloc(layer.cells, columns);
+    var widest: usize = 0;
+    for (0..viewport.h) |line| widest = @max(widest, panes.File.displayWidth(modal.lineSlice(text, line + top)));
+    const columns: u16 = @intCast(@min(std.math.maxInt(u16), @max(p.tagCapacity(viewport.w), widest + 1)));
+    const count = @as(usize, columns) * viewport.h;
+    if (layer.cells.len != count) layer.cells = try p.gpa.realloc(layer.cells, count);
     layer.kind = kind;
     layer.id = id;
-    layer.line = line;
     layer.serial = if (kind == .column) p.col_serial[id] else 0;
     layer.viewport = viewport;
     layer.cols = columns;
+    layer.rows = viewport.h;
+    layer.context_rows = 0;
     layer.bg = bg;
     layer.cursor = null;
     layer.slide = 0;
     layer.fade = 1;
-    var surface: Surface = .{ .cols = columns, .rows = 1, .cells = layer.cells };
     // A notice band carries a PANE id, not a column index, so it must not
     // answer to the column being edited -- that would scroll and select
     // its text with the column tag's offsets and give it a second caret.
     const editing: ?*Text = if (p.header_focus and switch (kind) {
         .workspace => p.header_column == null,
         .column => p.header_column == id,
-        .pane, .notice => false,
+        .pane, .notice, .body => false,
     }) tagline.focusedHeader(p) else null;
     const scroll = if (editing != null) p.header_scroll else 0;
-    surface.fill(0, 0, columns, 1, .{ .bg = .{ .rgb = bg }, .font_role = .tagline });
-    _ = surface.print(0, 0, columns, text[panes.File.rawAtDisplay(text, scroll)..], .{ .fg = .{ .rgb = fg }, .bg = .{ .rgb = bg }, .font_role = .tagline });
-    // The word under the pointer: on a header even while it is edited, but
-    // not on a notice (a message is not a command line), nor on a column a
-    // carried column's pointer is aiming at a place over.
-    const hovered = p.pointer_inside and kind != .notice and !(kind == .column and p.drag == .column_move);
-    if (hovered) {
-        const tag_hit = p.pointer_tag_hit;
-        const col: ?usize = if (tag_hit) |pointer|
-            (if (pointer.kind == kind and pointer.id == id and pointer.line == line) pointer.col else null)
-        else if (p.hover_row == viewport.y and p.hover_col >= viewport.x and p.hover_col - viewport.x < viewport.w)
-            p.hover_col - viewport.x
-        else
-            null;
-        if (col) |hover| if (wordBoundsAtCol(text, panes.File.rawAtDisplay(text, hover + scroll))) |bounds| {
-            var cell = panes.File.rawDisplayCol(text, bounds.lo) -| scroll;
-            const end = panes.File.rawDisplayCol(text, bounds.hi) -| scroll;
-            while (cell < end and cell < columns) : (cell += 1) {
-                surface.at(@intCast(cell), 0).style.bg = .{ .rgb = p.theme().sel_bg };
-                surface.at(@intCast(cell), 0).style.fg = .{ .rgb = p.theme().sel_fg };
-            }
-        };
-    }
-    if (editing) |t| {
-        if (tagline.headerSelection(t, try edit.flatSurface(p, t), line + p.header_top)) |span| {
-            var col = panes.File.rawDisplayCol(text, span.lo) -| scroll;
-            const end = panes.File.rawDisplayCol(text, span.hi) -| scroll;
-            while (col < end and col < columns) : (col += 1) {
-                surface.at(@intCast(col), 0).style.bg = .{ .rgb = p.theme().sel_bg };
-                surface.at(@intCast(col), 0).style.fg = .{ .rgb = p.theme().sel_fg };
+    for (0..viewport.h) |index| {
+        const line: u16 = @intCast(index);
+        const shown = modal.lineSlice(text, index + top);
+        var surface: Surface = .{ .cols = columns, .rows = 1, .cells = layer.cells[index * columns ..][0..columns] };
+        surface.fill(0, 0, columns, 1, .{ .bg = .{ .rgb = bg }, .font_role = .tagline });
+        _ = surface.print(0, 0, columns, shown[panes.File.rawAtDisplay(shown, scroll)..], .{ .fg = .{ .rgb = fg }, .bg = .{ .rgb = bg }, .font_role = .tagline });
+        // The word under the pointer: on a header even while it is edited,
+        // but not on a notice (a message is not a command line), nor on a
+        // column a carried column's pointer is aiming at a place over.
+        const hovered = p.pointer_inside and kind != .notice and !(kind == .column and p.drag == .column_move);
+        if (hovered) {
+            const tag_hit = p.pointer_tag_hit;
+            const col: ?usize = if (tag_hit) |pointer|
+                (if (pointer.kind == kind and pointer.id == id and pointer.line == line) pointer.col else null)
+            else if (p.hover_row == viewport.y + line and p.hover_col >= viewport.x and p.hover_col - viewport.x < viewport.w)
+                p.hover_col - viewport.x
+            else
+                null;
+            if (col) |hover| if (wordBoundsAtCol(shown, panes.File.rawAtDisplay(shown, hover + scroll))) |bounds| {
+                var cell = panes.File.rawDisplayCol(shown, bounds.lo) -| scroll;
+                const end = panes.File.rawDisplayCol(shown, bounds.hi) -| scroll;
+                while (cell < end and cell < columns) : (cell += 1) {
+                    surface.at(@intCast(cell), 0).style.bg = .{ .rgb = p.theme().sel_bg };
+                    surface.at(@intCast(cell), 0).style.fg = .{ .rgb = p.theme().sel_fg };
+                }
+            };
+        }
+        if (editing) |t| {
+            if (tagline.headerSelection(t, try edit.flatSurface(p, t), line + p.header_top)) |span| {
+                var col = panes.File.rawDisplayCol(shown, span.lo) -| scroll;
+                const end = panes.File.rawDisplayCol(shown, span.hi) -| scroll;
+                while (col < end and col < columns) : (col += 1) {
+                    surface.at(@intCast(col), 0).style.bg = .{ .rgb = p.theme().sel_bg };
+                    surface.at(@intCast(col), 0).style.fg = .{ .rgb = p.theme().sel_fg };
+                }
             }
+            const caret = panes.File.rawDisplayCol(shown, @min(@as(usize, @intCast(@max(0, t.cur_col))), shown.len)) -| scroll;
+            const asking = if (p.panes[p.active]) |active| active.prompt != .none else false;
+            if (!asking and t.cur_row == line + p.header_top and caret < columns) layer.cursor = .{ .x = @intCast(caret), .y = line, .bar = t.mode == .insert };
         }
-        const caret = panes.File.rawDisplayCol(text, @min(@as(usize, @intCast(@max(0, t.cur_col))), text.len)) -| scroll;
-        const asking = if (p.panes[p.active]) |active| active.prompt != .none else false;
-        if (!asking and t.cur_row == line + p.header_top and caret < columns) layer.cursor = .{ .col = @intCast(caret), .bar = t.mode == .insert };
     }
 }
 
-/// A pane's tag rows, painted once into their layers, a layer to a line,
-/// and copied into the grid; the grid's caret where the layer has it.
+/// A pane's tag rows, painted once into their layer, a row to a line, and
+/// copied into the grid; the grid's caret where the layer has it.
 fn joinPaneTag(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane, r: Rect, id: usize, active: bool) !void {
     const capacity = p.tagCapacity(r.w -| TAG_TEXT_INSET);
     // Too narrow for a layer: only the grid's gap cell.
@@ -692,23 +694,26 @@ fn joinPaneTag(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane, r
     var temporary: Surface = .{ .cols = columns + TAG_TEXT_INSET, .rows = rows, .cells = storage };
     try paintPaneTag(p, &temporary, arena, pane, .{ .x = 0, .y = 0, .w = columns + TAG_TEXT_INSET, .h = rows }, id, active, capacity);
     const tag_fg: Color = .{ .rgb = if (active and p.settings.focus_tint) chrome.tag_active_fg else chrome.tag_fg };
-    // A layer to a line: the first in the pane's own slot, the rest in the
-    // slots kept for the lines of taller tags.
+    // One layer, a row to each line the tag shows.
+    const layer = &s.tag_layers[id];
+    const count = @as(usize, columns) * rows;
+    if (layer.cells.len != count) layer.cells = try p.gpa.realloc(layer.cells, count);
+    layer.kind = .pane;
+    layer.id = @intCast(id);
+    layer.serial = pane.serial;
+    layer.viewport = .{ .x = region.rect.x + TAG_GAP, .y = region.rect.y, .w = region.rect.w - TAG_GAP - region.clip, .h = rows };
+    layer.cols = columns;
+    layer.rows = rows;
+    layer.context_rows = 0;
+    layer.bg = if (active and p.settings.focus_tint) chrome.tag_active_bg else chrome.tag_bg;
+    layer.slide = 0;
+    layer.fade = 1;
+    layer.cursor = if (p.header_focus) null else if (temporary.cursor) |cursor|
+        .{ .x = cursor.x - TAG_TEXT_INSET, .y = cursor.y, .bar = cursor.bar }
+    else
+        null;
     for (0..rows) |line| {
-        const layer = &s.tag_layers[if (line == 0) id else TAG_LINE_LAYER_BASE + id * (MAX_TAG_ROWS - 1) + line - 1];
-        if (layer.cells.len != columns) layer.cells = try p.gpa.realloc(layer.cells, columns);
-        @memcpy(layer.cells, storage[line * pitch + TAG_TEXT_INSET ..][0..columns]);
-        layer.kind = .pane;
-        layer.id = @intCast(id);
-        layer.serial = pane.serial;
-        layer.line = @intCast(line);
-        layer.viewport = .{ .x = region.rect.x + TAG_GAP, .y = region.rect.y + @as(u16, @intCast(line)), .w = region.rect.w - TAG_GAP - region.clip, .h = BOX_H };
-        layer.cols = columns;
-        layer.bg = if (active and p.settings.focus_tint) chrome.tag_active_bg else chrome.tag_bg;
-        layer.cursor = if (p.header_focus) null else if (temporary.cursor) |cursor|
-            (if (cursor.y == line) .{ .col = cursor.x - TAG_TEXT_INSET, .bar = cursor.bar } else null)
-        else
-            null;
+        @memcpy(layer.cells[line * columns ..][0..columns], storage[line * pitch + TAG_TEXT_INSET ..][0..columns]);
         // The grid's row: the gap cell and the text, as far as the pane.
         joinCells(s, region.rect.x, region.rect.y + @as(u16, @intCast(line)), storage[line * pitch ..][0..pitch], config.GUTTER, region.rect.w, tag_fg);
     }
@@ -765,9 +770,8 @@ fn joinNotice(p: *Pardes, s: *Surface, arena: std.mem.Allocator, region: Region)
     const line = try arena.alloc(u8, pad + kept.len);
     @memset(line[0..pad], ' ');
     @memcpy(line[pad..], kept);
-    const index = NOTICE_LAYER_BASE + id * Pane.Notices.max + i;
-    try renderHeaderLayer(p, arena, index, .notice, @intCast(id), 0, region.rect, line, bg, fg);
-    const layer = &s.tag_layers[index];
+    const layer = &s.tag_layers[NOTICE_LAYER_BASE + id * Pane.Notices.max + i];
+    try renderHeaderLayer(p, arena, layer, .notice, @intCast(id), region.rect, line, 0, bg, fg);
     layer.slide = motion.slide;
     layer.fade = motion.alpha;
     // The caret rides the band, where the prompt's glyphs are.
@@ -775,7 +779,7 @@ fn joinNotice(p: *Pardes, s: *Surface, arena: std.mem.Allocator, region: Region)
         const typed = panes.File.displayWidth(text[0..@min(@as(usize, @intCast(@max(0, pane.input.cur_col))), text.len)]);
         const dropped = shown - panes.File.displayWidth(kept);
         if (typed < dropped) break :caret;
-        layer.cursor = .{ .col = @intCast(pad + typed - dropped), .bar = pane.input.mode == .insert };
+        layer.cursor = .{ .x = @intCast(pad + typed - dropped), .y = 0, .bar = pane.input.mode == .insert };
     }
     // The grid shows the chip's last cells of the band, where the text ends
     // (all of it where the tagline's pitch is the grid's).
@@ -785,7 +789,7 @@ fn joinNotice(p: *Pardes, s: *Surface, arena: std.mem.Allocator, region: Region)
     // no ink of its own (the layer prints it as spaces in the band's ink).
     for (skip..@min(pad, skip + chip)) |col| s.at(region.rect.x + @as(u16, @intCast(col - skip)), region.rect.y).style.fg = .default;
     if (layer.cursor) |caret| {
-        if (caret.col >= skip) s.cursor = .{ .x = region.rect.x + caret.col - @as(u16, @intCast(skip)), .y = region.rect.y, .bar = caret.bar };
+        if (caret.x >= skip) s.cursor = .{ .x = region.rect.x + caret.x - @as(u16, @intCast(skip)), .y = region.rect.y, .bar = caret.bar };
     }
     // Laid out at its full width; only shown short of the rail.
     layer.viewport.w -= region.clip;
@@ -960,10 +964,11 @@ test "place puts every part where the painters and layers put it, in every layou
             try std.testing.expectEqual(FontRole.tagline, s.at(grip.rect.x, grip.rect.y).style.font_role);
             const tag = s.region(.tag, id).?;
             try std.testing.expectEqual(Rect{ .x = r.x + config.GUTTER, .y = p.tagTop(pane, r), .w = r.w - config.GUTTER, .h = pane.tag_rows }, tag.rect);
-            if (r.w > TAG_TEXT_INSET) for (0..pane.tag_rows) |line| {
-                const layer = &s.tag_layers[if (line == 0) id else TAG_LINE_LAYER_BASE + id * (MAX_TAG_ROWS - 1) + line - 1];
-                try std.testing.expectEqual(Rect{ .x = r.x + TAG_TEXT_INSET, .y = p.tagTop(pane, r) + @as(u16, @intCast(line)), .w = r.w - TAG_TEXT_INSET, .h = BOX_H }, layer.viewport);
-            };
+            // One layer, a row to each line of the tag.
+            if (r.w > TAG_TEXT_INSET) {
+                try std.testing.expectEqual(Rect{ .x = r.x + TAG_TEXT_INSET, .y = p.tagTop(pane, r), .w = r.w - TAG_TEXT_INSET, .h = pane.tag_rows }, s.tag_layers[id].viewport);
+                try std.testing.expectEqual(pane.tag_rows, s.tag_layers[id].rows);
+            }
             if (pane.collapsed) {
                 try std.testing.expect(s.region(.body, id) == null);
                 try std.testing.expect(s.region(.rail, id) == null);
diff --git a/src/edit.zig b/src/edit.zig
index b2d71ed2..9044d7ed 100644
--- a/src/edit.zig
+++ b/src/edit.zig
@@ -17,7 +17,7 @@ const platform = pardes.platform;
 const Pane = panes.Pane;
 const Text = panes.Text;
 const tag_layer = @import("tag_layer.zig");
-const TagHit = tag_layer.Hit;
+const TagHit = pardes.TagHit;
 const BOX_H = pardes.BOX_H;
 const TAG_TEXT_INSET = pardes.TAG_TEXT_INSET;
 const Mouse = pardes.Mouse;
diff --git a/src/gui/gui.zig b/src/gui/gui.zig
index a1e21dc0..ff99bd39 100644
--- a/src/gui/gui.zig
+++ b/src/gui/gui.zig
@@ -1779,8 +1779,8 @@ const Gui = struct {
     tagline_percent: u8,
     tagline_width: u32,
     tagline_height: u32,
-    attached_layers: ?*const [pardes.MAX_PANES]pardes.BodyLayer = null,
-    attached_tag_layers: ?*const [pardes.MAX_TAG_LAYERS]pardes.TagLayer = null,
+    attached_layers: ?*const [pardes.MAX_PANES]pardes.Layer = null,
+    attached_tag_layers: ?*const [pardes.MAX_TAG_LAYERS]pardes.Layer = null,
     cell_w: u32,
     cell_h: u32,
     ascent: i32,
@@ -3517,7 +3517,7 @@ fn gridCellAtDimensions(
     var point: MouseCell = .{ .col = @intFromFloat(@min(@floor(@max(x, 0) / @max(body_w, 1)), 10_000)), .row = row };
     if (core) |p| if (p.presentation.pointerFractional(p.screen_w, p.screen_h, x / @max(body_w, 1), y / @max(body_h, 1))) |mapped| {
         for (p.surface.tagLayers()) |*layer| {
-            if (layer.hitAt(mapped.x * body_w, mapped.y * body_h, body_w, body_h, tagline_w, @floatFromInt(p.row_metrics.tagline_h))) |hit| {
+            if (layer.tagHit(mapped.x * body_w, mapped.y * body_h, body_w, body_h, tagline_w, @floatFromInt(p.row_metrics.tagline_h))) |hit| {
                 point.tag_hit = hit;
                 break;
             }
@@ -3529,19 +3529,19 @@ fn gridCellAtDimensions(
 fn gridCellAtPixels(g: *const Gui, core: ?*const pardes.Pardes, x: f32, y: f32) MouseCell {
     var point = gridCellAtDimensions(core, x, y, @floatFromInt(g.cell_w), @floatFromInt(g.cell_h), @floatFromInt(g.tagline_width));
     if (core) |p| if (p.presentation.pointerFractional(p.screen_w, p.screen_h, x / @as(f32, @floatFromInt(g.cell_w)), y / @as(f32, @floatFromInt(g.cell_h)))) |mapped| for (p.surface.bodyLayers()) |*layer| {
-        if (layer.hitAt(mapped.x * @as(f32, @floatFromInt(g.cell_w)), mapped.y * @as(f32, @floatFromInt(g.cell_h)), @floatFromInt(g.cell_w), @floatFromInt(g.cell_h), @floatFromInt(g.tagline_width), @floatFromInt(g.tagline_height))) |hit| {
+        if (layer.bodyHit(mapped.x * @as(f32, @floatFromInt(g.cell_w)), mapped.y * @as(f32, @floatFromInt(g.cell_h)), @floatFromInt(g.cell_w), @floatFromInt(g.cell_h), @floatFromInt(g.tagline_width), @floatFromInt(g.tagline_height))) |hit| {
             point.body_hit = hit;
             break;
         }
     };
     if (core == null) if (g.attached_layers) |layers| for (layers) |*layer| {
-        if (layer.hitAt(x, y, @floatFromInt(g.cell_w), @floatFromInt(g.cell_h), @floatFromInt(g.tagline_width), @floatFromInt(g.tagline_height))) |body_hit| {
+        if (layer.bodyHit(x, y, @floatFromInt(g.cell_w), @floatFromInt(g.cell_h), @floatFromInt(g.tagline_width), @floatFromInt(g.tagline_height))) |body_hit| {
             point.body_hit = body_hit;
             break;
         }
     };
     if (core == null) if (g.attached_tag_layers) |layers| for (layers) |*layer| {
-        if (layer.hitAt(x, y, @floatFromInt(g.cell_w), @floatFromInt(g.cell_h), @floatFromInt(g.tagline_width), @floatFromInt(g.tagline_height))) |hit| {
+        if (layer.tagHit(x, y, @floatFromInt(g.cell_w), @floatFromInt(g.cell_h), @floatFromInt(g.tagline_width), @floatFromInt(g.tagline_height))) |hit| {
             point.tag_hit = hit;
             break;
         }
@@ -5203,18 +5203,18 @@ fn renderFrame(
         }
     }
     for (surface.tagLayers()) |*layer| {
-        if (layer.cols == 0) continue;
+        if (layer.rows == 0) continue;
         const batch = &paint_plan.batches[paintBatchAt(&paint_plan, layer.viewport.x, layer.viewport.y)];
-        batch.cell_count += tagLayerCellCount(g, layer) + 1;
+        batch.cell_count += (tagLayerCellCount(g, layer) + 1) * layer.rows;
     }
     for (paint_plan.batches[1..paint_plan.len], 1..) |batch, batch_index| {
         const track = batch.track.?;
         const under = track.effect == .vertical and track.phase == .opening;
         if (!under and track.phase != .closing and track.effect != .dissolve) continue;
         for (surface.previous_tag_layers) |*layer| {
-            if (layer.cols == 0 or layer.kind != .pane or layer.serial != track.serial) continue;
+            if (layer.rows == 0 or layer.kind != .pane or layer.serial != track.serial) continue;
             const destination = if (under) &paint_plan.batches[0] else &paint_plan.batches[batch_index];
-            destination.cell_count += tagLayerCellCount(g, layer) + 1;
+            destination.cell_count += (tagLayerCellCount(g, layer) + 1) * layer.rows;
         }
     }
     var cell_next: [pardes.MAX_PANES * 2 + 1]u32 = @splat(0);
@@ -5303,7 +5303,7 @@ fn renderFrame(
             emitBodyLayer(g, instances, &cell_next[batch_index], layer, win_w, win_h, paint_plan.batches[batch_index].track, page, paint_plan.len == 1, false, topbar_pane_border_rgb);
         }
         for (surface.tagLayers()) |*layer| {
-            if (layer.cols == 0) continue;
+            if (layer.rows == 0) continue;
             const batch_index = paintBatchAt(&paint_plan, layer.viewport.x, layer.viewport.y);
             emitTagLayer(g, instances, &cell_next[batch_index], layer, win_w, win_h, paint_plan.batches[batch_index].track, page, paint_plan.len == 1, false);
         }
@@ -5312,7 +5312,7 @@ fn renderFrame(
             const under = track.effect == .vertical and track.phase == .opening;
             if (!under and track.phase != .closing and track.effect != .dissolve) continue;
             for (surface.previous_tag_layers) |*layer| {
-                if (layer.cols == 0 or layer.kind != .pane or layer.serial != track.serial) continue;
+                if (layer.rows == 0 or layer.kind != .pane or layer.serial != track.serial) continue;
                 const destination: usize = if (under) 0 else batch_index;
                 emitTagLayer(g, instances, &cell_next[destination], layer, win_w, win_h, if (under) null else track, page, false, track.effect == .dissolve);
             }
@@ -5621,10 +5621,10 @@ test "compact column and pane underlays share focus tint without tinting the glo
     try std.testing.expectEqual(chrome.tag_bg, taglineBaseRgb(core, active.x, pardes.TOPBAR_H));
 }
 
-fn tagLayerIn(layers: []const pardes.TagLayer, col: u16, row: u16) ?*const pardes.TagLayer {
+fn tagLayerIn(layers: []const pardes.Layer, col: u16, row: u16) ?*const pardes.Layer {
     for (layers) |*layer| {
         const r = layer.viewport;
-        if (layer.cols > 0 and row == r.y and col >= r.x and col - r.x < r.w) return layer;
+        if (layer.rows > 0 and row >= r.y and row - r.y < layer.rows and col >= r.x and col - r.x < r.w) return layer;
     }
     return null;
 }
@@ -5633,9 +5633,9 @@ fn tagLayerIn(layers: []const pardes.TagLayer, col: u16, row: u16) ?*const parde
 /// themselves: the grid's cell loops skip them. Filling each layer's rectangle
 /// once replaces scanning every layer for every cell, which was a third of the
 /// gui's CPU on a full screen of text. It marks exactly the cells bodyLayerIn
-/// and tagLayerIn find a layer for: a tag layer covers only its viewport's
-/// first row, and a viewport past the grid covers the grid's part of it.
-fn coverLayers(cover: []bool, cols: u16, rows: u16, body_layers: []const pardes.BodyLayer, tag_layers: []const pardes.TagLayer) void {
+/// and tagLayerIn find a layer for: a tag layer covers its rows, and a
+/// viewport past the grid covers the grid's part of it.
+fn coverLayers(cover: []bool, cols: u16, rows: u16, body_layers: []const pardes.Layer, tag_layers: []const pardes.Layer) void {
     @memset(cover, false);
     for (body_layers) |*layer| {
         const r = layer.viewport;
@@ -5647,12 +5647,13 @@ fn coverLayers(cover: []bool, cols: u16, rows: u16, body_layers: []const pardes.
     for (tag_layers) |*layer| {
         const r = layer.viewport;
         const right = @min(cols, @as(u32, r.x) + r.w);
-        if (layer.cols == 0 or r.y >= rows or r.x >= right) continue;
-        @memset(cover[@as(usize, r.y) * cols ..][r.x..right], true);
+        if (layer.rows == 0 or r.x >= right) continue;
+        var y: u32 = r.y;
+        while (y < @min(rows, @as(u32, r.y) + layer.rows)) : (y += 1) @memset(cover[y * cols ..][r.x..right], true);
     }
 }
 
-fn expectCoverIsScan(cover: []const bool, cols: u16, rows: u16, body_layers: []const pardes.BodyLayer, tag_layers: []const pardes.TagLayer) !void {
+fn expectCoverIsScan(cover: []const bool, cols: u16, rows: u16, body_layers: []const pardes.Layer, tag_layers: []const pardes.Layer) !void {
     for (0..rows) |row| for (0..cols) |col| {
         const scan = bodyLayerIn(body_layers, @intCast(col), @intCast(row)) != null or tagLayerIn(tag_layers, @intCast(col), @intCast(row)) != null;
         try std.testing.expectEqual(scan, cover[row * cols + col]);
@@ -5685,7 +5686,7 @@ test "the layer cover is the per-cell layer scan, over a core's layouts and rand
         @memset(&cover, true); // what an earlier frame left
         coverLayers(&cover, s.cols, s.rows, s.bodyLayers(), s.tagLayers());
         try expectCoverIsScan(&cover, s.cols, s.rows, s.bodyLayers(), s.tagLayers());
-        for (s.tagLayers()) |layer| notices = notices or (layer.cols != 0 and layer.kind == .notice);
+        for (s.tagLayers()) |layer| notices = notices or (layer.rows != 0 and layer.kind == .notice);
     }
     try std.testing.expect(notices);
 
@@ -5702,8 +5703,8 @@ test "the layer cover is the per-cell layer scan, over a core's layouts and rand
     };
     var prng = std.Random.DefaultPrng.init(0x6c61796572);
     const random = prng.random();
-    var body: [pardes.MAX_PANES]pardes.BodyLayer = undefined;
-    var tag: [pardes.MAX_TAG_LAYERS]pardes.TagLayer = undefined;
+    var body: [pardes.MAX_PANES]pardes.Layer = undefined;
+    var tag: [pardes.MAX_TAG_LAYERS]pardes.Layer = undefined;
     var grid: [64 * 40]bool = undefined;
     for (0..3000) |_| {
         const cols = random.intRangeAtMost(u16, 1, 64);
@@ -5720,12 +5721,12 @@ test "the layer cover is the per-cell layer scan, over a core's layouts and rand
     }
 }
 
-fn tagLayerCellCount(g: *const Gui, layer: *const pardes.TagLayer) u32 {
+fn tagLayerCellCount(g: *const Gui, layer: *const pardes.Layer) u32 {
     const pixels = @as(u32, layer.viewport.w) * g.cell_w;
     return @min(layer.cols, (pixels + g.tagline_width - 1) / g.tagline_width);
 }
 
-fn emitTagLayer(g: *Gui, instances: [*]CellInstance, next: *u32, layer: *const pardes.TagLayer, win_w: f32, win_h: f32, track: ?pardes.animation.Track, page: Ground, show_cursor: bool, old_layer: bool) void {
+fn emitTagLayer(g: *Gui, instances: [*]CellInstance, next: *u32, layer: *const pardes.Layer, win_w: f32, win_h: f32, track: ?pardes.animation.Track, page: Ground, show_cursor: bool, old_layer: bool) void {
     const bw: f32 = @floatFromInt(g.cell_w);
     const bh: f32 = @floatFromInt(g.cell_h);
     const tw: f32 = @floatFromInt(g.tagline_width);
@@ -5735,20 +5736,25 @@ fn emitTagLayer(g: *Gui, instances: [*]CellInstance, next: *u32, layer: *const p
     // A band sliding into place is drawn offset and cut at its row's top, so
     // it comes out from under whatever is above it.
     const slide = layer.slide * bh;
-    const top = @as(f32, @floatFromInt(layer.viewport.y)) * bh;
     // A window is rarely a whole number of cells wide: a band that ends at
     // the last column runs on through the leftover pixels to the edge.
     const band_right = if (win_w - right < bw) @max(right, win_w) else right;
-    emitInstance(g, instances, next.*, 0, layer.viewport.y, .{ .w = band_right - left, .h = bh, .x_off = left, .y_off = slide }, win_w, win_h, track, .body, (&background)[0..1], 0, null, old_layer, false, page);
-    if (slide != 0) clipInstanceTop(&instances[next.*], top, win_h);
-    next.* += 1;
-    const line_cursor: ?usize = if (layer.cursor) |cu| cu.col else null;
-    for (0..tagLayerCellCount(g, layer)) |col| {
-        const cursor = if (layer.cursor) |cu| show_cursor and !cu.bar and cu.col == col else false;
-        emitInstance(g, instances, next.*, @intCast(col), layer.viewport.y, .{ .w = tw, .h = bh, .x_off = left, .y_off = slide }, win_w, win_h, track, .tagline, layer.cells[0..layer.cols], col, line_cursor, old_layer, cursor, page);
-        clipInstanceRight(&instances[next.*], right, win_w);
+    // A row to each line, each a grid row with the tagline's glyphs.
+    for (0..layer.rows) |index| {
+        const y = layer.viewport.y + @as(u16, @intCast(index));
+        const top = @as(f32, @floatFromInt(y)) * bh;
+        emitInstance(g, instances, next.*, 0, y, .{ .w = band_right - left, .h = bh, .x_off = left, .y_off = slide }, win_w, win_h, track, .body, (&background)[0..1], 0, null, old_layer, false, page);
         if (slide != 0) clipInstanceTop(&instances[next.*], top, win_h);
         next.* += 1;
+        const cells = layer.cells[index * layer.cols ..][0..layer.cols];
+        const line_cursor: ?usize = if (layer.cursor) |cu| (if (cu.y == index) cu.x else null) else null;
+        for (0..tagLayerCellCount(g, layer)) |col| {
+            const cursor = if (layer.cursor) |cu| show_cursor and !cu.bar and cu.x == col and cu.y == index else false;
+            emitInstance(g, instances, next.*, @intCast(col), y, .{ .w = tw, .h = bh, .x_off = left, .y_off = slide }, win_w, win_h, track, .tagline, cells, col, line_cursor, old_layer, cursor, page);
+            clipInstanceRight(&instances[next.*], right, win_w);
+            if (slide != 0) clipInstanceTop(&instances[next.*], top, win_h);
+            next.* += 1;
+        }
     }
 }
 
@@ -5760,11 +5766,11 @@ fn clipInstanceTop(instance: *CellInstance, top: f32, win_h: f32) void {
     instance.y0 = @max(instance.y1, limit);
 }
 
-fn bodyLayerAt(surface: *const pardes.Surface, col: u16, row: u16) ?*const pardes.BodyLayer {
+fn bodyLayerAt(surface: *const pardes.Surface, col: u16, row: u16) ?*const pardes.Layer {
     return bodyLayerIn(surface.bodyLayers(), col, row);
 }
 
-fn bodyLayerIn(layers: []const pardes.BodyLayer, col: u16, row: u16) ?*const pardes.BodyLayer {
+fn bodyLayerIn(layers: []const pardes.Layer, col: u16, row: u16) ?*const pardes.Layer {
     for (layers) |*layer| {
         const r = layer.viewport;
         if (layer.rows > 0 and col >= r.x and col - r.x < r.w and row >= r.y and row - r.y < r.h) return layer;
@@ -5788,7 +5794,7 @@ fn clipBodyInstance(instance: *CellInstance, bottom: f32, win_h: f32) void {
     instance.y1 = limit;
 }
 
-fn emitBodyLayer(g: *Gui, instances: [*]CellInstance, next: *u32, layer: *const pardes.BodyLayer, win_w: f32, win_h: f32, track: ?pardes.animation.Track, page: Ground, show_cursor: bool, old_layer: bool, border_rgb: [3]u8) void {
+fn emitBodyLayer(g: *Gui, instances: [*]CellInstance, next: *u32, layer: *const pardes.Layer, win_w: f32, win_h: f32, track: ?pardes.animation.Track, page: Ground, show_cursor: bool, old_layer: bool, border_rgb: [3]u8) void {
     const bw: f32 = @floatFromInt(g.cell_w);
     const bh: f32 = @floatFromInt(g.cell_h);
     const tw: f32 = @floatFromInt(g.tagline_width);
@@ -5851,11 +5857,11 @@ fn gripCellChanged(surface: *const pardes.Surface, col: u16, row: u16) bool {
     return false;
 }
 
-fn paneGripCell(layers: []const pardes.TagLayer, cells: []const pardes.Cell, cols: u16, col: u16, row: u16) ?GripCell {
+fn paneGripCell(layers: []const pardes.Layer, cells: []const pardes.Cell, cols: u16, col: u16, row: u16) ?GripCell {
     const at = @as(usize, row) * cols + col;
     if (at >= cells.len or cells[at].default or cells[at].style.font_role != .tagline) return null;
     for (layers) |layer| {
-        if (layer.cols == 0 or layer.kind != .pane or layer.viewport.x < pardes.TAG_TEXT_INSET or layer.viewport.y != row) continue;
+        if (layer.rows == 0 or layer.kind != .pane or layer.viewport.x < pardes.TAG_TEXT_INSET or row < layer.viewport.y or row - layer.viewport.y >= layer.rows) continue;
         const x = layer.viewport.x - pardes.TAG_TEXT_INSET;
         if (col < x or col - x >= config.GUTTER) continue;
         const index = @as(usize, row) * cols + x;
@@ -6607,7 +6613,7 @@ test "pane indicator halves share dissolve changes and safe exhausted atlas" {
     cells[0].text[0] = '$';
     var previous = cells;
     previous[0].text[0] = '^';
-    var layers = [_]pardes.TagLayer{.{ .kind = .pane, .serial = 1, .viewport = .{ .x = pardes.TAG_TEXT_INSET, .y = 0, .w = 3, .h = 1 }, .cols = 3 }};
+    var layers = [_]pardes.Layer{.{ .kind = .pane, .serial = 1, .viewport = .{ .x = pardes.TAG_TEXT_INSET, .y = 0, .w = 3, .h = 1 }, .cols = 3, .rows = 1 }};
     var diffs: [12]pardes.PanelCellDiff = @splat(.unchanged);
     diffs[0] = pardes.PanelCellDiff.between(&previous[0], &cells[0]);
     var surface: pardes.Surface = .{ .cols = 6, .rows = 2, .cells = &cells, .previous_cells = &previous, .previous_tag_layers = &layers, .cell_diffs = &diffs };
@@ -7316,16 +7322,17 @@ fn buildOverlay(
         }
     };
     if (transient_on) for (surface.tagLayers()) |*layer| {
-        if (layer.cols == 0) continue;
+        if (layer.rows == 0) continue;
         const cursor = layer.cursor orelse continue;
-        if (!cursor.bar or cursor.col >= layer.cols) continue;
+        if (!cursor.bar or cursor.x >= layer.cols or cursor.y >= layer.rows) continue;
         const width: f32 = @floatFromInt(g.tagline_width);
         const left = @as(f32, @floatFromInt(layer.viewport.x)) * layout.w;
         const right = left + @as(f32, @floatFromInt(layer.viewport.w)) * layout.w;
-        const x = left + @as(f32, @floatFromInt(cursor.col)) * width;
+        const x = left + @as(f32, @floatFromInt(cursor.x)) * width;
         if (x >= right) continue;
-        const top = @as(f32, @floatFromInt(layer.viewport.y)) * layout.h + @as(f32, @floatFromInt(taglineBandOffset(layer.viewport.y, builder.win_h, g.cell_h, g.tagline_height)));
-        builder.addRect(x, top, @min(right, x + @max(1, width / 8)), top + @as(f32, @floatFromInt(g.tagline_height)), overlayRgb(cursorColor(core, &layer.cells[cursor.col], .tagline)));
+        const y = layer.viewport.y + cursor.y;
+        const top = @as(f32, @floatFromInt(y)) * layout.h + @as(f32, @floatFromInt(taglineBandOffset(y, builder.win_h, g.cell_h, g.tagline_height)));
+        builder.addRect(x, top, @min(right, x + @max(1, width / 8)), top + @as(f32, @floatFromInt(g.tagline_height)), overlayRgb(cursorColor(core, &layer.cells[@as(usize, cursor.y) * layer.cols + cursor.x], .tagline)));
     };
     if (transient_on) appendTouchOverlay(g, &builder, debug_on);
     return @intCast(builder.len);
@@ -7506,7 +7513,7 @@ fn appendPaneChrome(
     // off from the text beneath it the way a tagline is: the same colour and
     // thickness along its bottom, running to the window edge when it does.
     for (surface.tagLayers()) |*layer| {
-        if (layer.cols == 0 or layer.kind != .notice) continue;
+        if (layer.rows == 0 or layer.kind != .notice) continue;
         const x0 = @as(f32, @floatFromInt(layer.viewport.x)) * layout.w;
         const x1 = x0 + @as(f32, @floatFromInt(layer.viewport.w)) * layout.w;
         const rule_x1 = if (builder.win_w - x1 < layout.w) @max(x1, builder.win_w) else x1;
@@ -7528,21 +7535,25 @@ fn appendPaneChrome(
 fn appendTagGrips(g: *const Gui, surface: *const pardes.Surface, layout: CellLayout, builder: *OverlayBuilder) void {
     if (g.tagline_height < 6 or g.tagline_width < 3) return;
     for (surface.tagLayers()) |layer| {
-        if (layer.cols == 0 or layer.kind != .pane or layer.viewport.x < pardes.TAG_TEXT_INSET) continue;
+        if (layer.rows == 0 or layer.kind != .pane or layer.viewport.x < pardes.TAG_TEXT_INSET) continue;
         const x = layer.viewport.x - pardes.TAG_TEXT_INSET;
-        const y = layer.viewport.y;
-        if (x >= surface.cols or y >= surface.rows) continue;
-        const cell = &surface.cells[@as(usize, y) * surface.cols + x];
-        if (cell.default or cell.printableAscii() != ' ') continue;
-        const rgb = switch (cell.style.fg) {
-            .rgb => |rgb| rgb,
-            else => continue,
-        };
-        const center_x = (@as(f32, @floatFromInt(x)) + @as(f32, @floatFromInt(config.GUTTER)) / 2) * layout.w + @as(f32, @floatFromInt(anchorInset(g, y, builder.win_h) / 2));
-        const center_y = @as(f32, @floatFromInt(y)) * layout.h + @as(f32, @floatFromInt(taglineBandOffset(y, builder.win_h, g.cell_h, g.tagline_height))) + @as(f32, @floatFromInt(g.tagline_height)) / 2;
-        const half_w = @max(1, @min(3, layout.w - 2));
-        builder.addRect(@floor(center_x - half_w), @floor(center_y - 2), @floor(center_x + half_w), @floor(center_y - 1), overlayRgb(rgb));
-        builder.addRect(@floor(center_x - half_w), @floor(center_y + 1), @floor(center_x + half_w), @floor(center_y + 2), overlayRgb(rgb));
+        // A mark on each of the tag's rows whose grip cell is blank: every
+        // row but the one with the mode's glyph.
+        for (0..layer.rows) |index| {
+            const y = layer.viewport.y + @as(u16, @intCast(index));
+            if (x >= surface.cols or y >= surface.rows) continue;
+            const cell = &surface.cells[@as(usize, y) * surface.cols + x];
+            if (cell.default or cell.printableAscii() != ' ') continue;
+            const rgb = switch (cell.style.fg) {
+                .rgb => |rgb| rgb,
+                else => continue,
+            };
+            const center_x = (@as(f32, @floatFromInt(x)) + @as(f32, @floatFromInt(config.GUTTER)) / 2) * layout.w + @as(f32, @floatFromInt(anchorInset(g, y, builder.win_h) / 2));
+            const center_y = @as(f32, @floatFromInt(y)) * layout.h + @as(f32, @floatFromInt(taglineBandOffset(y, builder.win_h, g.cell_h, g.tagline_height))) + @as(f32, @floatFromInt(g.tagline_height)) / 2;
+            const half_w = @max(1, @min(3, layout.w - 2));
+            builder.addRect(@floor(center_x - half_w), @floor(center_y - 2), @floor(center_x + half_w), @floor(center_y - 1), overlayRgb(rgb));
+            builder.addRect(@floor(center_x - half_w), @floor(center_y + 1), @floor(center_x + half_w), @floor(center_y + 2), overlayRgb(rgb));
+        }
     }
 }
 
@@ -7553,8 +7564,8 @@ test "column grips stay unmarked while pane marks retain physical centering" {
     g.cell_h = 20;
     var cells: [80]pardes.Cell = @splat(.{ .default = false, .style = .{ .fg = .{ .rgb = .{ 100, 120, 140 } } } });
     var surface: pardes.Surface = .{ .cols = 20, .rows = 4, .cells = &cells };
-    surface.tag_layers[0] = .{ .kind = .column, .viewport = .{ .x = 8, .y = 1, .w = 13, .h = 1 }, .cols = 20 };
-    surface.tag_layers[1] = .{ .kind = .pane, .viewport = .{ .x = 8, .y = 3, .w = 13, .h = 1 }, .cols = 20 };
+    surface.tag_layers[0] = .{ .kind = .column, .viewport = .{ .x = 8, .y = 1, .w = 13, .h = 1 }, .cols = 20, .rows = 1 };
+    surface.tag_layers[1] = .{ .kind = .pane, .viewport = .{ .x = 8, .y = 3, .w = 13, .h = 1 }, .cols = 20, .rows = 1 };
     var vertices: [24]OverlayVertex = undefined;
     var builder: OverlayBuilder = .{ .vertices = &vertices, .win_w = 200, .win_h = 80 };
     appendTagGrips(&g, &surface, .{ .w = 10, .h = 20, .x_off = 0, .y_off = 0 }, &builder);
@@ -7927,7 +7938,7 @@ test "compact body layer rendering fills recovered rows and clips the final glyp
     g.tagline_height = 12;
     g.space_slot = .{ .u = 0, .v = 0 };
     var cells: [24]pardes.Cell = @splat(.{});
-    var layer: pardes.BodyLayer = .{
+    var layer: pardes.Layer = .{
         .viewport = .{ .x = 3, .y = 2, .w = 2, .h = 5 },
         .cols = 2,
         .rows = 12,
@@ -7967,7 +7978,7 @@ test "compact tag layers fill available width and clip at their physical edge" {
     g.tagline_height = 12;
     g.space_slot = .{ .u = 0, .v = 0 };
     var cells: [6]pardes.Cell = @splat(.{});
-    const layer: pardes.TagLayer = .{ .kind = .pane, .id = 0, .serial = 7, .viewport = .{ .x = 2, .y = 3, .w = 3, .h = 1 }, .cols = 6, .cells = &cells, .bg = .{ 20, 30, 40 } };
+    const layer: pardes.Layer = .{ .kind = .pane, .id = 0, .serial = 7, .viewport = .{ .x = 2, .y = 3, .w = 3, .h = 1 }, .cols = 6, .rows = 1, .cells = &cells, .bg = .{ 20, 30, 40 } };
     var instances: [8]CellInstance = undefined;
     var next: u32 = 0;
     emitTagLayer(&g, &instances, &next, &layer, 100, 100, null, Ground.opaqueRgb(bg_default), false, false);
diff --git a/src/look.zig b/src/look.zig
index 8f9e15f2..258cf8f5 100644
--- a/src/look.zig
+++ b/src/look.zig
@@ -21,7 +21,7 @@ const pdf = panes.Pdf.pdf;
 const Pane = panes.Pane;
 const MAX_PANES = pardes.MAX_PANES;
 const tag_layer = @import("tag_layer.zig");
-const TagHit = tag_layer.Hit;
+const TagHit = pardes.TagHit;
 const BOX_H = pardes.BOX_H;
 const TAG_TEXT_INSET = pardes.TAG_TEXT_INSET;
 const pathUnder = pardes.pathUnder;
diff --git a/src/macos.zig b/src/macos.zig
index fce0a53e..f7e03cd4 100644
--- a/src/macos.zig
+++ b/src/macos.zig
@@ -1861,9 +1861,9 @@ fn clearFrame(st: *State) void {
     st.panel_diff_len = 0;
 }
 
-fn blankTagCells(cells: []Cell, cols: u16, rows: u16, source: []const pardes.Cell, layers: []const pardes.TagLayer) void {
+fn blankTagCells(cells: []Cell, cols: u16, rows: u16, source: []const pardes.Cell, layers: []const pardes.Layer) void {
     for (layers) |layer| {
-        if (layer.cols == 0 or layer.viewport.y >= rows or layer.viewport.x >= cols) continue;
+        if (layer.rows == 0 or layer.viewport.y >= rows or layer.viewport.x >= cols) continue;
         const start = @as(usize, layer.viewport.y) * cols + layer.viewport.x;
         const count = @min(layer.viewport.w, cols - layer.viewport.x);
         for (cells[start..][0..count], source[start..][0..count]) |*cell, was| {
@@ -1879,7 +1879,7 @@ fn blankTagCells(cells: []Cell, cols: u16, rows: u16, source: []const pardes.Cel
 fn tagCursorCovered(core: *const pardes.Pardes) bool {
     const cursor = core.surface.cursor orelse return false;
     for (core.surface.tag_layers) |layer| {
-        if (layer.cols != 0 and cursor.y == layer.viewport.y and cursor.x >= layer.viewport.x and
+        if (layer.rows != 0 and cursor.y == layer.viewport.y and cursor.x >= layer.viewport.x and
             cursor.x - layer.viewport.x < layer.viewport.w) return true;
     }
     return false;
@@ -2121,7 +2121,7 @@ export fn pardes_tag_layer_value(index: u32, field: u32) u32 {
         5 => layer.viewport.y,
         6 => layer.viewport.w,
         7 => layer.viewport.h,
-        8 => if (layer.cursor) |c| c.col else 65535,
+        8 => if (layer.cursor) |c| c.x else 65535,
         9 => if (layer.cursor) |c| @intFromBool(c.bar) else 0,
         10 => @as(u32, layer.bg[0]) << 16 | @as(u32, layer.bg[1]) << 8 | layer.bg[2],
         11 => @intFromBool(layer.kind == .pane and st.core.settings.tag_bottom),
@@ -2139,7 +2139,7 @@ export fn pardes_tag_layer_cells(index: u32) ?[*]const Cell {
     const st = &(state orelse return null);
     if (index >= pardes.MAX_TAG_LAYERS) return null;
     const layer = &st.core.surface.tag_layers[index];
-    if (layer.cols == 0) return null;
+    if (layer.rows == 0) return null;
     const cells = &st.tag_cells[index];
     if (cells.len != layer.cells.len) cells.* = st.gpa.realloc(cells.*, layer.cells.len) catch return null;
     for (layer.cells, cells.*) |source, *out| out.* = encodeCell(source);
@@ -3110,7 +3110,7 @@ test "mac tag layer ABI preserves logical capacity and physical grip" {
     logical[11].text[0] = 'Z';
     logical[11].len = 1;
     logical[11].default = false;
-    core.surface.tag_layers[0] = .{ .kind = .pane, .id = 1, .serial = 42, .viewport = .{ .x = 2, .y = 1, .w = 6, .h = 1 }, .cols = 12, .cells = &logical, .bg = .{ 0x12, 0x34, 0x56 }, .cursor = .{ .col = 11, .bar = true } };
+    core.surface.tag_layers[0] = .{ .kind = .pane, .id = 1, .serial = 42, .viewport = .{ .x = 2, .y = 1, .w = 6, .h = 1 }, .cols = 12, .rows = 1, .cells = &logical, .bg = .{ 0x12, 0x34, 0x56 }, .cursor = .{ .x = 11, .y = 0, .bar = true } };
     defer core.surface.tag_layers[0] = .{};
     try std.testing.expectEqual(@as(u32, 12), pardes_tag_layer_value(0, 0));
     try std.testing.expectEqual(@as(u32, 0x123456), pardes_tag_layer_value(0, 10));
diff --git a/src/pardes.zig b/src/pardes.zig
index 6946e123..f8087bdb 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -39,6 +39,7 @@ pub const ImagePatch = @import("surface.zig").ImagePatch;
 pub const ImagePlace = @import("surface.zig").ImagePlace;
 pub const Surface = @import("surface.zig").Surface;
 pub const Region = @import("surface.zig").Region;
+pub const MAX_REGIONS = @import("surface.zig").MAX_REGIONS;
 pub const builtins = @import("builtins.zig");
 const limits = memory.limits;
 const selection_pipe = @import("selection_pipe.zig");
@@ -247,21 +248,17 @@ pub const Pane = panes.Pane;
 const Text = panes.Text;
 
 pub const MAX_PANES = 16;
-pub const BodyLayer = @import("body_layer.zig").Layer;
-pub const RowMetrics = @import("body_layer.zig").Metrics;
-pub const TagLayer = @import("tag_layer.zig").Layer;
-pub const TagHit = @import("tag_layer.zig").Hit;
-pub const TagKind = @import("tag_layer.zig").Kind;
-/// Panes, then columns, then the workspace bar, then each pane's notice bands.
+pub const Layer = @import("Layer.zig");
+pub const RowMetrics = Layer.Metrics;
+pub const TagHit = Layer.TagHit;
+pub const TagKind = Layer.Kind;
 /// A tag shows at most this many lines; past them it is cut, like a line
 /// too long for its width.
 pub const MAX_TAG_ROWS = 8;
-pub const MAX_TAG_LAYERS = MAX_PANES + MAX_COLS + 1 + MAX_PANES * Pane.Notices.max + (MAX_PANES + MAX_COLS + 1) * (MAX_TAG_ROWS - 1);
+/// Panes, then columns, then the workspace bar, then each pane's notice
+/// bands: a band to a tag, however many lines it has.
+pub const MAX_TAG_LAYERS = MAX_PANES + MAX_COLS + 1 + MAX_PANES * Pane.Notices.max;
 pub const NOTICE_LAYER_BASE = MAX_PANES + MAX_COLS + 1;
-/// Where the layers for a pane tag's second and later lines start.
-pub const TAG_LINE_LAYER_BASE = NOTICE_LAYER_BASE + MAX_PANES * Pane.Notices.max;
-/// ...and those of a column's (by index) or the workspace's (after them).
-pub const HEADER_LINE_LAYER_BASE = TAG_LINE_LAYER_BASE + MAX_PANES * (MAX_TAG_ROWS - 1);
 pub const PDF_PAGE_GAP_PX = panes.Pdf.page_gap_px;
 pub const MAX_COLS = 6;
 const column_weight_unit = layout.column_weight_unit;
@@ -787,7 +784,7 @@ test "TreeContext tag style preserves message rows and its opt-out survives rest
     try std.testing.expectEqual(full_height, p.surface.body_layers[0].viewport.h);
     const r = p.rects[0];
     const band = for (p.surface.tagLayers()) |*layer| {
-        if (layer.cols != 0 and layer.kind == .notice) break layer;
+        if (layer.rows != 0 and layer.kind == .notice) break layer;
     } else return error.NoNoticeBand;
     try std.testing.expectEqual(p.bodyTop(pane, r), band.viewport.y);
     try std.testing.expectEqual(p.surface.body_layers[0].viewport.y, band.viewport.y);
@@ -5832,15 +5829,14 @@ pub const Pardes = struct {
 
     pub fn reprojectTagHit(p: *const Pardes, tag_hit: TagHit) ?TagHit {
         for (p.surface.tagLayers()) |*layer| {
-            if (layer.cols == 0 or layer.kind != tag_hit.kind or layer.id != tag_hit.id or layer.serial != tag_hit.serial) continue;
+            if (layer.rows == 0 or layer.kind != tag_hit.kind or layer.id != tag_hit.id or layer.serial != tag_hit.serial) continue;
             if (layer.kind == .pane) {
                 if (layer.id >= p.panes.len) return null;
                 const pane = p.panes[layer.id] orelse return null;
                 if (pane.serial != layer.serial) return null;
             }
             if (layer.kind == .column and (layer.id >= p.ncol or p.col_serial[layer.id] != layer.serial)) return null;
-            // A taller tag has a layer per line; the point is on one of them.
-            return layer.hitAt(tag_hit.pixel_x, tag_hit.pixel_y, @floatFromInt(tag_hit.metrics.body_w), @floatFromInt(tag_hit.metrics.body_h), @floatFromInt(tag_hit.metrics.tagline_w), @floatFromInt(tag_hit.metrics.tagline_h)) orelse continue;
+            return layer.tagHit(tag_hit.pixel_x, tag_hit.pixel_y, @floatFromInt(tag_hit.metrics.body_w), @floatFromInt(tag_hit.metrics.body_h), @floatFromInt(tag_hit.metrics.tagline_w), @floatFromInt(tag_hit.metrics.tagline_h)) orelse continue;
         }
         return null;
     }
@@ -5858,14 +5854,14 @@ pub const Pardes = struct {
     }
 
     pub fn tagCapacity(p: *const Pardes, physical_width: u16) u16 {
-        const layer: TagLayer = .{ .viewport = .{ .x = 0, .y = 0, .w = physical_width, .h = 1 } };
+        const layer: Layer = .{ .kind = .pane, .viewport = .{ .x = 0, .y = 0, .w = physical_width, .h = 1 } };
         return layer.capacity(p.row_metrics);
     }
 
     pub fn reprojectBodyHit(p: *const Pardes, body_hit: Mouse.BodyHit) ?Mouse.BodyHit {
         for (&p.surface.body_layers) |*layer| {
             if (layer.rows == 0 or layer.serial != body_hit.serial) continue;
-            return layer.hitAt(body_hit.pixel_x, body_hit.pixel_y, @floatFromInt(body_hit.metrics.body_w), @floatFromInt(body_hit.metrics.body_h), @floatFromInt(body_hit.metrics.tagline_w), @floatFromInt(body_hit.metrics.tagline_h));
+            return layer.bodyHit(body_hit.pixel_x, body_hit.pixel_y, @floatFromInt(body_hit.metrics.body_w), @floatFromInt(body_hit.metrics.body_h), @floatFromInt(body_hit.metrics.tagline_w), @floatFromInt(body_hit.metrics.tagline_h));
         }
         return null;
     }
@@ -6111,12 +6107,12 @@ test "a prompt chip is a band with its caret, still on the grid, and only the ch
     // A pixel shell draws the prompt from its band, in the tagline's pitch,
     // with the caret right after the marker's last glyph.
     const band = for (p.surface.tagLayers()) |*layer| {
-        if (layer.cols != 0 and layer.kind == .notice) break layer;
+        if (layer.rows != 0 and layer.kind == .notice) break layer;
     } else return error.NoPromptBand;
     try std.testing.expectEqual(row, band.viewport.y);
     const caret = band.cursor orelse return error.MissingBandCaret;
     try std.testing.expect(caret.bar);
-    try std.testing.expectEqualStrings("/", band.cells[caret.col - 1].grapheme());
+    try std.testing.expectEqualStrings("/", band.cells[caret.x - 1].grapheme());
 
     // The chip covers only its own columns. Left of it is ordinary body, and
     // a sweep there still selects.
@@ -6162,11 +6158,11 @@ test "a prompt is typed on its own line in the notice band and leaves the tag ro
     try std.testing.expect(p.surface.tag_layers[0].cursor == null);
     // The band carries the answer and the caret, one cell back from its end.
     const band = for (p.surface.tagLayers()) |*layer| {
-        if (layer.cols != 0 and layer.kind == .notice) break layer;
+        if (layer.rows != 0 and layer.kind == .notice) break layer;
     } else return error.NoPromptBand;
     const caret = band.cursor orelse return error.MissingBandCaret;
-    try std.testing.expectEqualStrings("t", band.cells[caret.col - 1].grapheme());
-    try std.testing.expectEqualStrings("w", band.cells[caret.col].grapheme());
+    try std.testing.expectEqualStrings("t", band.cells[caret.x - 1].grapheme());
+    try std.testing.expectEqualStrings("w", band.cells[caret.x].grapheme());
     const grid = p.surface.cursor orelse return error.MissingPromptCursor;
     try std.testing.expectEqual(p.bodyTop(pane, p.rects[0]), grid.y);
 
diff --git a/src/surface.zig b/src/surface.zig
index fec43e30..db7dd468 100644
--- a/src/surface.zig
+++ b/src/surface.zig
@@ -11,8 +11,7 @@ const config = @import("config.zig");
 const pdf_enabled = panes.Pdf.enabled;
 const image = @import("image.zig");
 const MAX_PANES = pardes.MAX_PANES;
-const BodyLayer = @import("body_layer.zig").Layer;
-const TagLayer = @import("tag_layer.zig").Layer;
+const Layer = @import("Layer.zig");
 const MAX_TAG_LAYERS = pardes.MAX_TAG_LAYERS;
 const CellPixels = pardes.CellPixels;
 
@@ -380,8 +379,8 @@ pub const Surface = struct {
     /// paint the quiet affordance can carry the hover bit through the ABI
     /// without every selection painter learning a new parameter.
     mark_hover: bool = false,
-    body_layers: [MAX_PANES]BodyLayer = @splat(.{}),
-    tag_layers: [MAX_TAG_LAYERS]TagLayer = @splat(.{}),
+    body_layers: [MAX_PANES]Layer = @splat(.{}),
+    tag_layers: [MAX_TAG_LAYERS]Layer = @splat(.{}),
     cols: u16 = 0,
     rows: u16 = 0,
     regions: [MAX_REGIONS]Region = undefined,
@@ -394,15 +393,15 @@ pub const Surface = struct {
     panel_tracks: [MAX_PANES * 2]animation.Track = undefined,
     npanel_tracks: usize = 0,
     previous_cells: []const Cell = &.{},
-    previous_body_layers: []const BodyLayer = &.{},
-    previous_tag_layers: []const TagLayer = &.{},
+    previous_body_layers: []const Layer = &.{},
+    previous_tag_layers: []const Layer = &.{},
     cell_diffs: []const PanelCellDiff = &.{},
 
-    pub fn tagLayers(s: *const Surface) []const TagLayer {
+    pub fn tagLayers(s: *const Surface) []const Layer {
         return &s.tag_layers;
     }
 
-    pub fn bodyLayers(s: *const Surface) []const BodyLayer {
+    pub fn bodyLayers(s: *const Surface) []const Layer {
         return &s.body_layers;
     }
 
diff --git a/src/tag_layer.zig b/src/tag_layer.zig
index 7cfe5bbf..213ebc07 100644
--- a/src/tag_layer.zig
+++ b/src/tag_layer.zig
@@ -1,83 +1,10 @@
-//! Tag text has its own horizontal pitch. Its viewport stays in physical
-//! body-grid coordinates so compact text never changes pane hit targets.
+//! Pointer hits on tag bands (Layer.TagHit): comparing two, and bringing one
+//! that left its band back onto it.
 const std = @import("std");
 const pardes = @import("pardes.zig");
-
-/// `notice` is a pane's transient line -- a builtin's name, a pending leader
-/// chord -- carried as a tagline-shaped band so it gets the tagline's height,
-/// small-font metrics, band offset and border instead of being a body-grid row
-/// wearing a tagline font.
-pub const Kind = enum(u8) { workspace, column, pane, notice };
-pub const Hit = struct {
-    kind: Kind,
-    id: u16,
-    serial: u32,
-    col: u16,
-    /// Which line of a taller tag the layer draws.
-    line: u16 = 0,
-    pixel_x: f32,
-    pixel_y: f32,
-    metrics: pardes.RowMetrics,
-};
-pub const Layer = struct {
-    kind: Kind = .workspace,
-    id: u16 = 0,
-    serial: u32 = 0,
-    /// A pane's tag taller than a line is drawn a layer to a line; this is
-    /// which one, counted from its first.
-    line: u16 = 0,
-    viewport: pardes.Rect = .{ .x = 0, .y = 0, .w = 0, .h = 0 },
-    cols: u16 = 0,
-    bg: [3]u8 = .{ 0, 0, 0 },
-    cells: []pardes.Cell = &.{},
-    cursor: ?struct { col: u16, bar: bool = false } = null,
-    /// Vertical offset in rows (negative: above its viewport), for a band
-    /// that is moving into place. A pixel shell draws it offset and clipped
-    /// to the rows below the viewport's top; the grid has no such thing.
-    slide: f32 = 0,
-    /// How present a notice band is (1 = fully) while it fades up or
-    /// dissolves. `bg` and the cells are already blended by it; a pixel
-    /// shell uses it for what it draws around the band, like its rule.
-    fade: f32 = 1,
-
-    pub fn capacity(layer: *const Layer, metrics: pardes.RowMetrics) u16 {
-        return @intCast(@min(std.math.maxInt(u16), @max(1, @as(u32, layer.viewport.w) * @max(1, metrics.body_w) / @max(1, metrics.tagline_w))));
-    }
-
-    pub fn hitAt(layer: *const Layer, x: f32, y: f32, body_w: f32, body_h: f32, tagline_w: f32, tagline_h: f32) ?Hit {
-        if (layer.cols == 0 or !std.math.isFinite(x) or !std.math.isFinite(y)) return null;
-        for ([_]f32{ body_w, body_h, tagline_w, tagline_h }) |metric|
-            if (!std.math.isFinite(metric) or metric < 1 or metric > std.math.maxInt(u16)) return null;
-        const bw = @max(1, body_w);
-        const bh = @max(1, body_h);
-        const tw = std.math.clamp(tagline_w, 1, bw);
-        const th = std.math.clamp(tagline_h, 1, bh);
-        const dx = x - @as(f32, @floatFromInt(layer.viewport.x)) * bw;
-        const dy = y - @as(f32, @floatFromInt(layer.viewport.y)) * bh;
-        if (dx < 0 or dy < 0 or dx >= @as(f32, @floatFromInt(layer.viewport.w)) * bw or dy >= @as(f32, @floatFromInt(layer.viewport.h)) * bh) return null;
-        return .{
-            .kind = layer.kind,
-            .id = layer.id,
-            .serial = layer.serial,
-            .line = layer.line,
-            .col = @intFromFloat(@min(@as(f32, @floatFromInt(layer.cols - 1)), @floor(dx / tw))),
-            .pixel_x = x,
-            .pixel_y = y,
-            .metrics = .{ .body_w = @intFromFloat(bw), .body_h = @intFromFloat(bh), .tagline_w = @intFromFloat(tw), .tagline_h = @intFromFloat(th) },
-        };
-    }
-};
-
-test "tag text capacity uses its own pitch and excludes the physical grip" {
-    const layer: Layer = .{ .kind = .pane, .id = 2, .serial = 7, .viewport = .{ .x = 12, .y = 4, .w = 38, .h = 1 }, .cols = 90 };
-    try std.testing.expectEqual(@as(u16, 63), layer.capacity(.{ .body_w = 10, .tagline_w = 6 }));
-    try std.testing.expect(layer.hitAt(119.99, 85, 10, 20, 6, 12) == null);
-    try std.testing.expectEqual(@as(u16, 0), layer.hitAt(120, 85, 10, 20, 6, 12).?.col);
-    try std.testing.expectEqual(@as(u16, 50), layer.hitAt(423, 85, 10, 20, 6, 12).?.col);
-    try std.testing.expect(layer.hitAt(500, 85, 10, 20, 6, 12) == null);
-    try std.testing.expect(layer.hitAt(120, 85, std.math.nan(f32), 20, 6, 12) == null);
-    try std.testing.expect(layer.hitAt(120, 85, 10, 20, 0, 12) == null);
-}
+const Layer = @import("Layer.zig");
+const Hit = Layer.TagHit;
+const Kind = Layer.Kind;
 
 /// Whether two pointer hits name the same cell of the same tag line.
 pub fn sameCell(a: ?Hit, b: ?Hit) bool {
@@ -92,13 +19,13 @@ pub fn columnAt(p: *const pardes.Pardes, kind: Kind, id: usize, supplied: ?Hit,
     var point = supplied orelse return null;
     if (point.kind != kind or point.id != id) return null;
     if (clamp) for (p.surface.tagLayers()) |*layer| {
-        if (layer.cols == 0 or layer.kind != kind or layer.id != id or layer.serial != point.serial or layer.line != line) continue;
+        if (layer.rows == 0 or layer.kind != kind or layer.id != id or layer.serial != point.serial or line >= layer.rows) continue;
         const bw: f32 = @floatFromInt(point.metrics.body_w);
         const bh: f32 = @floatFromInt(point.metrics.body_h);
         const left = @as(f32, @floatFromInt(layer.viewport.x)) * bw;
         const right = @as(f32, @floatFromInt(layer.viewport.x + layer.viewport.w)) * bw;
         point.pixel_x = std.math.clamp(point.pixel_x, left, @max(left, right - 0.001));
-        point.pixel_y = (@as(f32, @floatFromInt(layer.viewport.y)) + 0.5) * bh;
+        point.pixel_y = (@as(f32, @floatFromInt(layer.viewport.y + line)) + 0.5) * bh;
         break;
     };
     return if (p.reprojectTagHit(point)) |mapped| mapped.col else null;
diff --git a/src/web.zig b/src/web.zig
index 532e3794..ac0ecbbf 100644
--- a/src/web.zig
+++ b/src/web.zig
@@ -224,13 +224,13 @@ export fn pardes_mouse_pixel(button_arg: u32, kind_arg: u32, col_arg: u32, row_a
     var hit: ?pardes.Mouse.BodyHit = null;
     for (&s.core.surface.body_layers) |*layer| {
         const point = source orelse break;
-        hit = layer.hitAt(point.x * bw, point.y * bh, bw, bh, tw, th);
+        hit = layer.bodyHit(point.x * bw, point.y * bh, bw, bh, tw, th);
         if (hit != null) break;
     }
     var tag_hit: ?pardes.TagHit = null;
     for (&s.core.surface.tag_layers) |*layer| {
         const point = source orelse break;
-        tag_hit = layer.hitAt(point.x * bw, point.y * bh, bw, bh, tw, th);
+        tag_hit = layer.tagHit(point.x * bw, point.y * bh, bw, bh, tw, th);
         if (tag_hit != null) break;
     }
     mouseWithHit(button_arg, kind_arg, col_arg, row_arg, mods, hit, tag_hit);
@@ -341,6 +341,7 @@ export fn pardes_tag_layer_value(index: u32, field: u32) u32 {
     const s = &(state orelse return 0);
     if (index >= pardes.MAX_TAG_LAYERS) return 0;
     const layer = &s.core.surface.tag_layers[index];
+    if (layer.rows == 0) return 0;
     return switch (field) {
         0 => layer.cols,
         1 => @intFromEnum(layer.kind),
@@ -350,9 +351,12 @@ export fn pardes_tag_layer_value(index: u32, field: u32) u32 {
         5 => layer.viewport.y,
         6 => layer.viewport.w,
         7 => layer.viewport.h,
-        8 => if (layer.cursor) |c| c.col else 65535,
+        8 => if (layer.cursor) |c| c.x else 65535,
         9 => if (layer.cursor) |c| @intFromBool(c.bar) else 0,
         10 => @as(u32, layer.bg[0]) << 16 | @as(u32, layer.bg[1]) << 8 | layer.bg[2],
+        // A band has a row to each line of its tag: `cols * rows` cells.
+        11 => layer.rows,
+        12 => if (layer.cursor) |c| c.y else 65535,
         else => 0,
     };
 }
@@ -361,7 +365,7 @@ export fn pardes_tag_layer_cells(index: u32) ?[*]const WebCell {
     const s = &(state orelse return null);
     if (index >= pardes.MAX_TAG_LAYERS) return null;
     const layer = &s.core.surface.tag_layers[index];
-    if (layer.cols == 0) return null;
+    if (layer.rows == 0) return null;
     const cells = &s.tag_cells[index];
     if (cells.len != layer.cells.len) cells.* = gpa.realloc(cells.*, layer.cells.len) catch return null;
     for (layer.cells, cells.*) |source, *out| out.* = encodeWebCell(source);
diff --git a/src/web/app.mjs b/src/web/app.mjs
index 280239d5..03829178 100644
--- a/src/web/app.mjs
+++ b/src/web/app.mjs
@@ -64,13 +64,16 @@ export class DomRenderer {
         if (!val(0)) continue;
         const gripCols = this.wasm.pardes_grip_columns?.() ?? 2;
         const textInset = this.wasm.pardes_tag_text_inset?.() ?? gripCols;
-        if (val(1) !== 0 && val(4) >= textInset && this.cellHeight) {
-          const offset = this.wasm.pardes_tagline_band_offset(val(5),rows*this.cellHeight*256,Math.round(this.cellHeight*256),Math.round(this.taglineHeight*256))/256;
-          for (let x = val(4)-textInset; x < val(4); x++) tagPrefixBands.set(val(5)*cols+x,offset);
-          if (val(1) === 2) paneIndicators.add(val(5)*cols+val(4)-textInset);
-        }
-        for (let x = val(4); x < Math.min(cols, val(4) + val(6)); x++) {
-          if (val(5) < rows) tagCovered[val(5) * cols + x] = 1;
+        // A row to each line of a taller tag.
+        for (let y = val(5); y < val(5) + Math.max(1, val(11)); y++) {
+          if (val(1) !== 0 && val(4) >= textInset && this.cellHeight) {
+            const offset = this.wasm.pardes_tagline_band_offset(y,rows*this.cellHeight*256,Math.round(this.cellHeight*256),Math.round(this.taglineHeight*256))/256;
+            for (let x = val(4)-textInset; x < val(4); x++) tagPrefixBands.set(y*cols+x,offset);
+            if (val(1) === 2) paneIndicators.add(y*cols+val(4)-textInset);
+          }
+          for (let x = val(4); x < Math.min(cols, val(4) + val(6)); x++) {
+            if (y < rows) tagCovered[y * cols + x] = 1;
+          }
         }
       }
     }
@@ -118,27 +121,35 @@ export class DomRenderer {
     const nodes = [];
     const bw = this.cellWidth, bh = this.cellHeight, tw = this.taglineWidth, th = this.taglineHeight;
     for (let i = 0; i < this.wasm.pardes_tag_layer_limit(); i++) {
-      const values = Array.from({length:11}, (_,field) => this.wasm.pardes_tag_layer_value(i,field));
-      const cols = values[0];
+      const layerValues = Array.from({length:13}, (_,field) => this.wasm.pardes_tag_layer_value(i,field));
+      const cols = layerValues[0];
       if (!cols) continue;
       const ptr = this.wasm.pardes_tag_layer_cells(i);
       if (!ptr) continue;
-      const bytes = new Uint8Array(this.wasm.memory.buffer,ptr,cols*CELL_SIZE);
+      // A row to each line of a taller tag, each drawn as a band of its own.
+      for (let line = 0; line < Math.max(1, layerValues[11]); line++) {
+      const key = i*64+line;
+      const values = layerValues.slice(0,11);
+      values[5] = layerValues[5] + line;
+      values[7] = 1;
+      values[8] = layerValues[12] === line ? layerValues[8] : 65535;
+      const bytes = new Uint8Array(this.wasm.memory.buffer,ptr+line*cols*CELL_SIZE,cols*CELL_SIZE);
       const offset = this.wasm.pardes_tagline_band_offset(values[5],this.rowCount*bh*256,Math.round(bh*256),Math.round(th*256))/256;
       const gripCols = this.wasm.pardes_grip_columns?.() ?? 2;
       const gripX = values[4] - (this.wasm.pardes_tag_text_inset?.() ?? gripCols);
       const gripCell = canonical[values[5]*this.cols+gripX];
       const grip = values[1] === 2 && gripX >= 0 && gripCell && th >= 1 && tw >= 1;
       const geometry = [bw,bh,tw,th,offset,...values,grip,gripCell?.fg,gripCell?.bg,gripCell?.attrs,gripCell?.text,globalThis.devicePixelRatio].join(":");
-      const cached = this.tagNodes.get(i);
+      const cached = this.tagNodes.get(key);
       if (cached && cached.geometry === geometry && cached.bytes.length === bytes.length && cached.bytes.every((byte,index)=>byte===bytes[index])) {
         nodes.push(cached.node);
         if (cached.grip) nodes.push(cached.grip);
         continue;
       }
-      const view = new DataView(this.wasm.memory.buffer,ptr,cols*CELL_SIZE);
+      const view = new DataView(this.wasm.memory.buffer,ptr+line*cols*CELL_SIZE,cols*CELL_SIZE);
       const layer = this.root.ownerDocument.createElement("div");
       layer.dataset.tagLayer = String(i);
+      layer.dataset.tagLine = String(line);
       layer.style.cssText = `position:absolute;overflow:hidden;white-space:pre;left:${values[4]*bw}px;top:${values[5]*bh+offset}px;width:${values[6]*bw}px;height:${th}px;background:${color(values[10],DEFAULT_BG)}`;
       for (let col = 0; col < cols; col++) {
         const off = col*CELL_SIZE;
@@ -171,9 +182,10 @@ export class DomRenderer {
           gripNode.append(mark);
         }
       }
-      this.tagNodes.set(i,{geometry,bytes:bytes.slice(),node:layer,grip:gripNode});
+      this.tagNodes.set(key,{geometry,bytes:bytes.slice(),node:layer,grip:gripNode});
       nodes.push(layer);
       if (gripNode) nodes.push(gripNode);
+      }
     }
     if (nodes.length !== this.tagRoot.childNodes.length || nodes.some((node,index)=>node!==this.tagRoot.childNodes[index])) this.tagRoot.replaceChildren(...nodes);
   }
diff --git a/test/column_drag.zig b/test/column_drag.zig
index feea1bf7..3aea4286 100644
--- a/test/column_drag.zig
+++ b/test/column_drag.zig
@@ -8,17 +8,17 @@ fn mouse(p: *Pardes, kind: pardes.Mouse.Kind, col: u16) void {
     p.update(.{ .mouse = .{ .button = .left, .kind = kind, .col = col, .row = pardes.TOPBAR_H } });
 }
 
-fn tagLayer(p: *Pardes, column: usize) !*pardes.TagLayer {
+fn tagLayer(p: *Pardes, column: usize) !*pardes.Layer {
     for (&p.surface.tag_layers) |*layer| {
-        if (layer.cols > 0 and layer.kind == .column and layer.id == column) return layer;
+        if (layer.rows > 0 and layer.kind == .column and layer.id == column) return layer;
     }
     return error.MissingColumnTagLayer;
 }
 
-fn headerMouse(layer: *const pardes.TagLayer, display_col: u16, kind: pardes.Mouse.Kind) pardes.Mouse {
+fn headerMouse(layer: *const pardes.Layer, display_col: u16, kind: pardes.Mouse.Kind) pardes.Mouse {
     const x = @as(f32, @floatFromInt(layer.viewport.x)) * 10 + (@as(f32, @floatFromInt(display_col)) + 0.5) * 5;
     const y = (@as(f32, @floatFromInt(layer.viewport.y)) + 0.5) * 20;
-    return .{ .button = .left, .kind = kind, .col = @intFromFloat(x / 10), .row = @intFromFloat(y / 20), .tag_hit = layer.hitAt(x, y, 10, 20, 5, 10) };
+    return .{ .button = .left, .kind = kind, .col = @intFromFloat(x / 10), .row = @intFromFloat(y / 20), .tag_hit = layer.tagHit(x, y, 10, 20, 5, 10) };
 }
 
 const Snapshot = struct {
@@ -144,7 +144,7 @@ test "column grip is separate from compact text and the resize seam" {
         try std.testing.expectEqual(p.col_x[column], rect.x);
         try std.testing.expectEqual(rect.x + pardes.TAG_TEXT_INSET, (try tagLayer(p, column)).viewport.x);
         for (p.surface.tagLayers()) |pane_layer| {
-            if (pane_layer.cols > 0 and pane_layer.kind == .pane and pane_layer.id == pane_id)
+            if (pane_layer.rows > 0 and pane_layer.kind == .pane and pane_layer.id == pane_id)
                 try std.testing.expectEqual((try tagLayer(p, column)).viewport.x, pane_layer.viewport.x);
         }
         const pane_tag_y = if (p.settings.tag_bottom) rect.y + rect.h - pardes.BOX_H else rect.y;
diff --git a/test/panes.zig b/test/panes.zig
index 11fb750a..5e26cdd0 100644
--- a/test/panes.zig
+++ b/test/panes.zig
@@ -19,17 +19,17 @@ fn setTag(pane: *Pane, text: []const u8) !void {
 }
 
 const TagLayerTests = struct {
-    const Kind = @FieldType(pardes.TagLayer, "kind");
-    fn findLayer(p: *Pardes, kind: Kind, id: usize) !*pardes.TagLayer {
+    const Kind = @FieldType(pardes.Layer, "kind");
+    fn findLayer(p: *Pardes, kind: Kind, id: usize) !*pardes.Layer {
         for (&p.surface.tag_layers) |*layer| {
-            if (layer.cols > 0 and layer.kind == kind and layer.id == id) return layer;
+            if (layer.rows > 0 and layer.kind == kind and layer.id == id) return layer;
         }
         return error.MissingTagLayer;
     }
 
-    fn mouse(layer: *const pardes.TagLayer, x: f32, kind: pardes.Mouse.Kind) pardes.Mouse {
+    fn mouse(layer: *const pardes.Layer, x: f32, kind: pardes.Mouse.Kind) pardes.Mouse {
         const y = (@as(f32, @floatFromInt(layer.viewport.y)) + 0.5) * 20;
-        return .{ .button = .left, .kind = kind, .col = @intFromFloat(x / 10), .row = @intFromFloat(y / 20), .tag_hit = layer.hitAt(x, y, 10, 20, 5, 10) };
+        return .{ .button = .left, .kind = kind, .col = @intFromFloat(x / 10), .row = @intFromFloat(y / 20), .tag_hit = layer.tagHit(x, y, 10, 20, 5, 10) };
     }
 
     test "compact tag layers render and edit Unicode text beyond body column capacity" {
@@ -200,14 +200,16 @@ test "a tag with a newline in it is as tall as its lines, and each line is typed
         const body_y = p.bodyTop(pane, r);
         try std.testing.expectEqual(if (bottom) r.y else r.y + 2, body_y);
         try std.testing.expectEqualStrings("b", surface.at(r.x + config.GUTTER + panes.File.gutterWidth(pane), body_y).grapheme());
-        // a layer to a line, for a pixel shell
-        var lines: usize = 0;
+        // one layer, a row to each line, for a pixel shell
+        var layers: usize = 0;
         for (p.surface.tagLayers()) |*layer| {
-            if (layer.cols == 0 or layer.kind != .pane or layer.id != 0) continue;
-            try std.testing.expectEqual(tag_y + layer.line, layer.viewport.y);
-            lines += 1;
+            if (layer.rows == 0 or layer.kind != .pane or layer.id != 0) continue;
+            try std.testing.expectEqual(tag_y, layer.viewport.y);
+            try std.testing.expectEqual(@as(u16, 2), layer.rows);
+            try std.testing.expectEqual(@as(u16, 2), layer.viewport.h);
+            layers += 1;
         }
-        try std.testing.expectEqual(@as(usize, 2), lines);
+        try std.testing.expectEqual(@as(usize, 1), layers);
         // a click on the second line puts the tag's cursor on it
         p.update(.{ .key = .{ .cp = Key.escape } });
         p.update(.{ .key = .{ .cp = ':' } });
@@ -541,11 +543,11 @@ const TagNavigationTests = struct {
 };
 
 const BodyHitTests = struct {
-    fn mouse(layer: *const pardes.BodyLayer, row: u16, col: u16, kind: pardes.Mouse.Kind) pardes.Mouse {
+    fn mouse(layer: *const pardes.Layer, row: u16, col: u16, kind: pardes.Mouse.Kind) pardes.Mouse {
         const width: f32 = if (row < layer.context_rows) 8 else 10;
         const x = @as(f32, @floatFromInt(layer.viewport.x)) * 10 + (@as(f32, @floatFromInt(col)) + 0.5) * width;
         const y = layer.rowTop(row, 20, 10) + layer.rowHeight(row, 20, 10) / 2;
-        return .{ .button = .left, .kind = kind, .col = @intFromFloat(x / 10), .row = @intFromFloat(y / 20), .body_hit = layer.hitAt(x, y, 10, 20, 8, 10).? };
+        return .{ .button = .left, .kind = kind, .col = @intFromFloat(x / 10), .row = @intFromFloat(y / 20), .body_hit = layer.bodyHit(x, y, 10, 20, 8, 10).? };
     }
 
     test "compact TreeContext mouse follows source rows in reclaimed space" {
@@ -673,7 +675,7 @@ const TreeContextTests = struct {
             const y = layer.rowTop(row, 20, 10) + 9.5;
             const x = @as(f32, @floatFromInt(layer.viewport.x)) * 10 + 5;
             // A one-pixel separator remains inside its existing header row.
-            try std.testing.expectEqual(row, layer.hitAt(x, y, 10, 20, 8, 10).?.row);
+            try std.testing.expectEqual(row, layer.bodyHit(x, y, 10, 20, 8, 10).?.row);
         }
         pane.scrollBy(-5);
         _ = try p.render(frame.allocator());
-- 
cgit v1.3


From 360b72ade0acfa655a3740b638a0cc8e23238a05 Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 14:59:21 -0300
Subject: The GUI draws in tiers from the regions; pane chrome moves with its
 pane

Stage 8 of docs/render-pipeline.md. The frame is drawn in groups: tier 0,
one per track in paint order (tiers 2 and 3), tier 4 (notices, then guides
and the debug box), tier 5 (bar cursors), each cells, images, decor. Decor
(rules, rails, thumbs, grip marks, spines, the workspace and column rules,
the bottom band, notice rules, bar cursors) is whole-pixel rects through
the new decor.frag over ui.vert, so it carries its track's transition and
clip. A closing pane's chrome comes from Surface.previous_regions.

Deleted: taglineBaseRgb, topbarPaneBorderHeight, bottomTaglinePresent,
frameChromeBg, cellBackgroundIs and the rail inference, paneGripCell's
scan, transient_on, PaintPlan. One cover map (coverFrame) is marked from
the layers and regions once a frame. New regions column, guide and debug;
Surface.chrome is the palette, carried in wire v8 (not shipped yet), so an
attached GUI draws the same chrome (test). A per-instance clip replaces the
vertical transition's scissor.

Goldens: 01-12 byte-identical. 13-17 differ only past the grid: the image
pass left its scissor at the grid's size, cutting rule ends, rail feet and
the bottom band in the leftover pixels whenever a picture was on screen.
16-debug now shows the debug box, which a context-row layer had hidden.
18-mid-transition is new: virtual clock (PARDES_TEST_CLOCK in the GUI),
PanelSlide Newcol with the picture, frame 6 of 12.

Also: the GUI sleeps when idle instead of polling every 16 ms, and a
minimized or occluded window sleeps through animation. Tracy 'gui frame
build' at 200x60: 992/1015 us median before, 989/987 us after.

Shared files touched: pardes.zig (one export), detached/client.zig,
detached/server.zig, detached/wire.zig (all additive), gui.zig. Not touched:
Messages.zig, mouse.zig, tagline.zig, colors.zig, tty.zig, host_io.zig,
dump.zig, exec.zig, panes.zig.
---
 build.zig                        |    1 +
 docs/render-pipeline.md          |   14 +-
 shaders/decor.frag.glsl          |   24 +
 shaders/prebuilt/decor.frag.glsl |   24 +
 shaders/prebuilt/decor.frag.spv  |  Bin 0 -> 2100 bytes
 shaders/prebuilt/ui.frag.glsl    |    3 +
 shaders/prebuilt/ui.frag.spv     |  Bin 4668 -> 5700 bytes
 shaders/prebuilt/ui.vert.glsl    |    6 +
 shaders/prebuilt/ui.vert.spv     |  Bin 5468 -> 5612 bytes
 shaders/ui.frag.glsl             |    3 +
 shaders/ui.vert.glsl             |    6 +
 src/Presentation.zig             |    5 +
 src/detached/client.zig          |    4 +-
 src/detached/server.zig          |    1 +
 src/detached/wire.zig            |   41 +-
 src/draw.zig                     |   63 +-
 src/gui/gui.zig                  | 1476 +++++++++++++++++++-------------------
 src/pardes.zig                   |    1 +
 src/surface.zig                  |   40 +-
 test/gui-goldens.txt             |   11 +-
 test/gui_golden.py               |   18 +-
 21 files changed, 978 insertions(+), 763 deletions(-)
 create mode 100644 shaders/decor.frag.glsl
 create mode 100644 shaders/prebuilt/decor.frag.glsl
 create mode 100644 shaders/prebuilt/decor.frag.spv

(limited to 'src/gui')

diff --git a/build.zig b/build.zig
index 666e792d..803f773d 100644
--- a/build.zig
+++ b/build.zig
@@ -47,6 +47,7 @@ pub const TreeSitterGrammars = enum { disabled, zig, minimal, full };
 
 const gui_shaders = [_][]const u8{
     "ui.vert",      "ui.frag",
+    "decor.frag",
     "overlay.vert", "overlay.frag",
     "image.vert",   "image.frag",
     "crt.vert",     "crt.frag",
diff --git a/docs/render-pipeline.md b/docs/render-pipeline.md
index a8b3f019..69645c96 100644
--- a/docs/render-pipeline.md
+++ b/docs/render-pipeline.md
@@ -810,7 +810,7 @@ stripped. No visual change until stage 9 unless stated.
 | 5 | JOIN: paint tags/notices/headers once into layers, copy into grid; the grid wins where the copies disagree, and each disagreement is listed for a later decision | goldens are the oracle; wide-grapheme re-clip at the edge (§3.2) |
 | 6 | body layer joined the same way (paint once, copy visible rows) | riskiest join; A/B the old double paint in a temporary test with tag_bottom on and off, then delete it |
 | 7 | Layer merge (TagLayer + BodyLayer), wire v8, web accessors | after the other agent lands; touches mouse hit paths; breaks the macOS shell's layer ABI (accepted: macOS build ignored for now); done: one `Layer` (src/Layer.zig) with `rows` (0 = no layer) and a `cursor{x, y}`; a tag of N rows is ONE layer of N grid rows (`tagHit` answers the row as `line`, `bodyHit` keeps its meaning), so the per-line layer bases are gone. Wire v8 ships rows, cursor y and the region list in the one bump; v7 and v9 peers are refused in both directions (tests). web: `tag_layer_value` 11 = rows, 12 = cursor y, and app.mjs lays every row. macOS: its Zig side compiles against `Layer`, but pardes.h still sees one row per tag layer (a taller tag shows its first row there) |
-| 8 | GUI draws from regions: role tiers with track groups in tiers 2-3, page cover, hard-edged snapped decor for rules/rails/grips (pane chrome in the pane's tier), per-instance clip; delete inference functions, `transient_on` and `mark_hover` (breaks macOS glass hover; accepted, macOS ignored for now) | stage-0 PPM goldens byte-identical (possible only because hard decor is snapped and not anti-aliased); pane chrome now also shows during transitions, which is the one allowed visible delta, listed |
+| 8 | GUI draws from regions: role tiers with track groups in tiers 2-3, page cover, hard-edged snapped decor for rules/rails/grips (pane chrome in the pane's tier), per-instance clip; delete inference functions, `transient_on` and `mark_hover` (breaks macOS glass hover; accepted, macOS ignored for now) | stage-0 PPM goldens byte-identical (possible only because hard decor is snapped and not anti-aliased); pane chrome now also shows during transitions, which is the one allowed visible delta, listed Done: the frame is drawn in groups (makeGroups): tier 0, one group per track in paint order (tiers 2 and 3), tier 4 as two groups (the notices; then the guides and the debug box, which the core paints over them), tier 5 (bar cursors), each drawing cells, images, decor. Decor is every rule, rail, thumb, grip mark, spine, the workspace and column rules, the bottom band, notice rules and bar cursors: whole-pixel rects drawn by `decor.frag` over `ui.vert` as cell instances (colour in the ground, coverage in fg.r, blended like the overlay), so each carries its track's transition and clip; a closing pane's comes from the last frame's regions (`Surface.previous_regions`). Only `solid` exists yet: `decor.vert` and the other kinds (§5.1) come with the first effect that needs them. Deleted: taglineBaseRgb, topbarPaneBorderHeight, bottomTaglinePresent, frameChromeBg, cellBackgroundIs and the rail inference, paneGripCell's scan, transient_on, PaintPlan; one cover map (coverFrame: layer, grip and offset, focus, anchor, floating) is marked from layers and regions once a frame. New regions: `column` (spines, anchors, the focused column's tint), `guide`, `debug`; `Surface.chrome` is the palette, on the wire in v8 (not yet shipped, so no bump), and an attached GUI draws the same chrome (test). Per-instance clip (`CellInstance.clip_*`) replaces the vertical transition's scissor. Goldens: 01-12 byte-identical; 13-17 differ only in pixels past the grid (with a picture on screen the image pass left the scissor at the grid's size, cutting every rule end, rail foot and band that runs into the leftover pixels; they now run to the edge as in every scene without one); 16-debug shows the debug box (it was drawn from the grid under the source's context-row layer, so the GUI never showed it there); 18-mid-transition is new (virtual clock, PanelSlide Newcol with the picture, frame 6 of 12: chrome moves with its pane). Other deltas, outside the goldens: a guide over a tag or a context-row body now shows; with WindowOpacity < 100 a layer's bar cursor is ink like the grid's; an attached GUI gains the focus tint, notice rules, spines and the theme's page and caret colours. Deferrals fixed: the GUI sleeps when idle (SDL and queue events wake it; a smooth scroll, a gamepad, the test feed, a shell's kill deadline, a present to retry still poll), and a minimized or occluded window sleeps through animation. Tracy, `gui frame build`, 200x60, terminal output plus scrolling, ReleaseFast, two interleaved runs of ~180 frames: before 992/1015 µs median, after 989/987 µs |
 | 9 | post chain: glslang, Shadertoy prefix, ping-pong, ShaderAnimation, redraw levels A/B (§5.5); bundled CRT without barrel; delete scene_effects/crt.zig/crt.frag | first visual change (the CRT look) |
 | 10+ | `fx` bookmark: G1–G3 → feel review → G4 bundled → G5 lapis theme → P2s; tty T1–T2 → feel review → removals of audited effects (after user decision) → T3–T5 | each effect its own change, default off |
 
@@ -845,13 +845,21 @@ goldens; ssh/tty byte budgets; wire version bump breaks mixed-version attach.
 6. Revisit at the first visual stage (from stage 5): the notice layer lost
    its hover word to keep the grid's behaviour. Notice words are Look/Exec
    targets, so bring the hover affordance back in BOTH the grid and the
-   layer then.
+   layer then. Carried forward from stage 8 (a GUI-only stage) to the hover
+   change after it, which also retires `mark_hover`: the affordance is a
+   core paint every shell and snapshot sees.
 7. Revisit at stage 8 (from stage 6): a body without context rows has no
    layer (paint once, straight onto the grid). If the GUI is to read every
    body from a layer, give every body one then and measure the copy. The
    context-row path also still builds the body's text twice (a pre-pass
    with body_rows 0 decides the context rows, renderBody builds it again at
-   the layer's rows); the paint is single. Measure both there.
+   the layer's rows); the paint is single. Measure both there. Decided at
+   stage 8, measured (Tracy, 200x60, TreeContext on a scrolled source,
+   ReleaseFast): the pre-pass text build is 5 µs median and the layer's
+   copies 10 µs per context-row body per frame. Kept as they are: nothing in
+   the GUI reads a layerless body from anything but the grid, which is
+   exact, so a layer for every body would be ~10 µs a body a frame for no
+   pixel.
 
 ## 15. Questions for the user
 
diff --git a/shaders/decor.frag.glsl b/shaders/decor.frag.glsl
new file mode 100644
index 00000000..4c2bd6d8
--- /dev/null
+++ b/shaders/decor.frag.glsl
@@ -0,0 +1,24 @@
+#version 450
+
+// Decor: a flat, hard-edged fill (a rule, a rail, a grip mark, a bar cursor)
+// that ui.vert.glsl places like a cell, its track's transition included. Its
+// colour rides in the cell's ground (a_bg) and its coverage in a_fg.r. The
+// pipeline blends it as the overlay pipeline does (backgroundLayerBlend), so
+// a fading rule shows through, and the result is that pipeline's exactly.
+// Ink (a cursor) is drawn with the opacity uniform at 1.
+
+layout(std140, set = 3, binding = 0) uniform UiUniforms {
+    float background_opacity;
+} u_ui;
+
+layout(location = 1) in vec3 v_fg;
+layout(location = 2) in vec3 v_bg;
+layout(location = 5) flat in vec4 v_clip;
+
+layout(location = 0) out vec4 o_col;
+
+void main() {
+    if (v_clip.z >= v_clip.x && (gl_FragCoord.x < v_clip.x || gl_FragCoord.x >= v_clip.z ||
+        gl_FragCoord.y < v_clip.y || gl_FragCoord.y >= v_clip.w)) discard;
+    o_col = vec4(v_bg * clamp(u_ui.background_opacity, 0.0, 1.0), v_fg.r);
+}
diff --git a/shaders/prebuilt/decor.frag.glsl b/shaders/prebuilt/decor.frag.glsl
new file mode 100644
index 00000000..4c2bd6d8
--- /dev/null
+++ b/shaders/prebuilt/decor.frag.glsl
@@ -0,0 +1,24 @@
+#version 450
+
+// Decor: a flat, hard-edged fill (a rule, a rail, a grip mark, a bar cursor)
+// that ui.vert.glsl places like a cell, its track's transition included. Its
+// colour rides in the cell's ground (a_bg) and its coverage in a_fg.r. The
+// pipeline blends it as the overlay pipeline does (backgroundLayerBlend), so
+// a fading rule shows through, and the result is that pipeline's exactly.
+// Ink (a cursor) is drawn with the opacity uniform at 1.
+
+layout(std140, set = 3, binding = 0) uniform UiUniforms {
+    float background_opacity;
+} u_ui;
+
+layout(location = 1) in vec3 v_fg;
+layout(location = 2) in vec3 v_bg;
+layout(location = 5) flat in vec4 v_clip;
+
+layout(location = 0) out vec4 o_col;
+
+void main() {
+    if (v_clip.z >= v_clip.x && (gl_FragCoord.x < v_clip.x || gl_FragCoord.x >= v_clip.z ||
+        gl_FragCoord.y < v_clip.y || gl_FragCoord.y >= v_clip.w)) discard;
+    o_col = vec4(v_bg * clamp(u_ui.background_opacity, 0.0, 1.0), v_fg.r);
+}
diff --git a/shaders/prebuilt/decor.frag.spv b/shaders/prebuilt/decor.frag.spv
new file mode 100644
index 00000000..7e162f5a
Binary files /dev/null and b/shaders/prebuilt/decor.frag.spv differ
diff --git a/shaders/prebuilt/ui.frag.glsl b/shaders/prebuilt/ui.frag.glsl
index 3c366602..0b099db3 100644
--- a/shaders/prebuilt/ui.frag.glsl
+++ b/shaders/prebuilt/ui.frag.glsl
@@ -17,6 +17,7 @@ layout(location = 1) in vec3 v_fg;
 layout(location = 2) in vec3 v_bg;
 layout(location = 3) in vec2 v_cell_uv;
 layout(location = 4) flat in uvec4 v_effect;
+layout(location = 5) flat in vec4 v_clip;
 
 layout(location = 0) out vec4 o_col;
 
@@ -31,6 +32,8 @@ float cellNoise(uint serial, uint col, uint row) {
 }
 
 void main() {
+    if (v_clip.z >= v_clip.x && (gl_FragCoord.x < v_clip.x || gl_FragCoord.x >= v_clip.z ||
+        gl_FragCoord.y < v_clip.y || gl_FragCoord.y >= v_clip.w)) discard;
     float a = texture(u_atlas, v_uv).r;
     bool oldLayer = (v_effect.x & 0x80000000u) != 0u;
     // A block cursor is foreground chrome even though its fill occupies the
diff --git a/shaders/prebuilt/ui.frag.spv b/shaders/prebuilt/ui.frag.spv
index 120438e7..033c10ab 100644
Binary files a/shaders/prebuilt/ui.frag.spv and b/shaders/prebuilt/ui.frag.spv differ
diff --git a/shaders/prebuilt/ui.vert.glsl b/shaders/prebuilt/ui.vert.glsl
index d23b609c..c1779add 100644
--- a/shaders/prebuilt/ui.vert.glsl
+++ b/shaders/prebuilt/ui.vert.glsl
@@ -19,12 +19,17 @@ layout(location = 5) in vec4 a_present_rect;
 // the id is what is left below them; integer transport preserves the exact
 // cross-backend hash.
 layout(location = 6) in uvec4 a_effect;
+// A clip rectangle in target pixels (x0, y0, x1, y1): the fragment shader
+// drops what lies outside it. x1 < x0 is none. A vertical transition clips
+// its pane's instances to the box the pane is growing into.
+layout(location = 7) in vec4 a_clip;
 
 layout(location = 0) out vec2 v_uv;
 layout(location = 1) out vec3 v_fg;
 layout(location = 2) out vec3 v_bg;
 layout(location = 3) out vec2 v_cell_uv;
 layout(location = 4) flat out uvec4 v_effect;
+layout(location = 5) flat out vec4 v_clip;
 
 void main() {
     vec2 pos;
@@ -70,5 +75,6 @@ void main() {
     v_fg = a_fg;
     v_bg = a_bg;
     v_effect = a_effect;
+    v_clip = a_clip;
     gl_Position = vec4(pos, 0.0, 1.0);
 }
diff --git a/shaders/prebuilt/ui.vert.spv b/shaders/prebuilt/ui.vert.spv
index 659049dd..619a9690 100644
Binary files a/shaders/prebuilt/ui.vert.spv and b/shaders/prebuilt/ui.vert.spv differ
diff --git a/shaders/ui.frag.glsl b/shaders/ui.frag.glsl
index 3c366602..0b099db3 100644
--- a/shaders/ui.frag.glsl
+++ b/shaders/ui.frag.glsl
@@ -17,6 +17,7 @@ layout(location = 1) in vec3 v_fg;
 layout(location = 2) in vec3 v_bg;
 layout(location = 3) in vec2 v_cell_uv;
 layout(location = 4) flat in uvec4 v_effect;
+layout(location = 5) flat in vec4 v_clip;
 
 layout(location = 0) out vec4 o_col;
 
@@ -31,6 +32,8 @@ float cellNoise(uint serial, uint col, uint row) {
 }
 
 void main() {
+    if (v_clip.z >= v_clip.x && (gl_FragCoord.x < v_clip.x || gl_FragCoord.x >= v_clip.z ||
+        gl_FragCoord.y < v_clip.y || gl_FragCoord.y >= v_clip.w)) discard;
     float a = texture(u_atlas, v_uv).r;
     bool oldLayer = (v_effect.x & 0x80000000u) != 0u;
     // A block cursor is foreground chrome even though its fill occupies the
diff --git a/shaders/ui.vert.glsl b/shaders/ui.vert.glsl
index d23b609c..c1779add 100644
--- a/shaders/ui.vert.glsl
+++ b/shaders/ui.vert.glsl
@@ -19,12 +19,17 @@ layout(location = 5) in vec4 a_present_rect;
 // the id is what is left below them; integer transport preserves the exact
 // cross-backend hash.
 layout(location = 6) in uvec4 a_effect;
+// A clip rectangle in target pixels (x0, y0, x1, y1): the fragment shader
+// drops what lies outside it. x1 < x0 is none. A vertical transition clips
+// its pane's instances to the box the pane is growing into.
+layout(location = 7) in vec4 a_clip;
 
 layout(location = 0) out vec2 v_uv;
 layout(location = 1) out vec3 v_fg;
 layout(location = 2) out vec3 v_bg;
 layout(location = 3) out vec2 v_cell_uv;
 layout(location = 4) flat out uvec4 v_effect;
+layout(location = 5) flat out vec4 v_clip;
 
 void main() {
     vec2 pos;
@@ -70,5 +75,6 @@ void main() {
     v_fg = a_fg;
     v_bg = a_bg;
     v_effect = a_effect;
+    v_clip = a_clip;
     gl_Position = vec4(pos, 0.0, 1.0);
 }
diff --git a/src/Presentation.zig b/src/Presentation.zig
index e1f1b585..3b5bb3e0 100644
--- a/src/Presentation.zig
+++ b/src/Presentation.zig
@@ -44,6 +44,8 @@ pending: bool = false,
 previous_cells: []pardes.Cell = &.{},
 previous_body_layers: [MAX_PANES]pardes.Layer = @splat(.{}),
 previous_tag_layers: [pardes.MAX_TAG_LAYERS]pardes.Layer = @splat(.{}),
+previous_regions: [pardes.MAX_REGIONS]pardes.Region = undefined,
+previous_nregions: u16 = 0,
 previous_cols: u16 = 0,
 previous_rows: u16 = 0,
 previous_valid: bool = false,
@@ -346,6 +348,8 @@ pub fn capturePrevious(self: *Presentation, gpa: std.mem.Allocator, surface: *co
         old.cells = storage;
     }
     @memcpy(self.previous_cells, cells);
+    @memcpy(self.previous_regions[0..surface.nregions], surface.regionList());
+    self.previous_nregions = surface.nregions;
     self.previous_cols = surface.cols;
     self.previous_rows = surface.rows;
     self.previous_valid = true;
@@ -584,6 +588,7 @@ pub fn submit(self: *Presentation, p: *Pardes, s: *pardes.Surface) !void {
         s.previous_cells = self.previous_cells;
         s.previous_body_layers = &self.previous_body_layers;
         s.previous_tag_layers = &self.previous_tag_layers;
+        s.previous_regions = self.previous_regions[0..self.previous_nregions];
         s.cell_diffs = self.diffs;
     }
     s.npanel_tracks = paintOrder(
diff --git a/src/detached/client.zig b/src/detached/client.zig
index 3347f609..9fa85fb4 100644
--- a/src/detached/client.zig
+++ b/src/detached/client.zig
@@ -107,6 +107,8 @@ pub const Client = struct {
     tag_layers: [pardes.MAX_TAG_LAYERS]pardes.Layer = @splat(.{}),
     /// The session's placed regions, as its last frame gave them.
     regions: std.ArrayListUnmanaged(pardes.Region) = .empty,
+    /// The palette its chrome is drawn in, as its last frame gave it.
+    chrome: pardes.Chrome = .{},
     in: std.ArrayListUnmanaged(u8) = .empty,
     out: std.ArrayListUnmanaged(u8) = .empty,
     /// Bytes of `in` belonging to the message `next` returned last. Compacted at
@@ -322,7 +324,7 @@ pub const Client = struct {
                     try c.reshape(f.cols, f.rows);
                 }
                 try f.apply(c.grid.items);
-                f.applyLayers(c.gpa, &c.body_layers, &c.tag_layers, &c.regions) catch |err| return switch (err) {
+                f.applyLayers(c.gpa, &c.body_layers, &c.tag_layers, &c.regions, &c.chrome) catch |err| return switch (err) {
                     error.OutOfMemory => error.Closed,
                     else => @as(wire.Error, @errorCast(err)),
                 };
diff --git a/src/detached/server.zig b/src/detached/server.zig
index 46fb8fcf..9e18e125 100644
--- a/src/detached/server.zig
+++ b/src/detached/server.zig
@@ -760,6 +760,7 @@ pub const Session = struct {
             &surface.body_layers,
             &surface.tag_layers,
             surface.regionList(),
+            surface.chrome,
         ) catch |err| {
             log.debug("frame {d}x{d} not encodable: {t}", .{ surface.cols, surface.rows, err });
             return;
diff --git a/src/detached/wire.zig b/src/detached/wire.zig
index 684c869b..32cd5229 100644
--- a/src/detached/wire.zig
+++ b/src/detached/wire.zig
@@ -169,8 +169,9 @@ pub const Frame = struct {
     nruns: u32,
     runs: []const u8,
 
-    pub fn applyLayers(f: Frame, gpa: std.mem.Allocator, layers: *[pardes.MAX_PANES]pardes.Layer, tags: *[pardes.MAX_TAG_LAYERS]pardes.Layer, regions: *std.ArrayListUnmanaged(pardes.Region)) !void {
+    pub fn applyLayers(f: Frame, gpa: std.mem.Allocator, layers: *[pardes.MAX_PANES]pardes.Layer, tags: *[pardes.MAX_TAG_LAYERS]pardes.Layer, regions: *std.ArrayListUnmanaged(pardes.Region), chrome: *pardes.Chrome) !void {
         regions.clearRetainingCapacity();
+        chrome.* = .{};
         for (layers) |*layer| {
             gpa.free(layer.cells);
             layer.* = .{};
@@ -188,6 +189,8 @@ pub const Frame = struct {
                 gpa.free(layer.cells);
                 layer.* = .{};
             }
+            regions.clearRetainingCapacity();
+            chrome.* = .{};
         }
         if (f.layers.len == 0) return;
         var r: Reader = .init(f.layers);
@@ -255,6 +258,15 @@ pub const Frame = struct {
                 region.clip > region.rect.w or region.thumb_y > region.rect.h or region.thumb_h > region.rect.h - region.thumb_y) return error.BadValue;
             regions.appendAssumeCapacity(region);
         }
+        inline for (@typeInfo(pardes.Chrome).@"struct".fields) |field| {
+            const rgb = &@field(chrome, field.name);
+            if (field.type == ?[3]u8) {
+                if (try r.getBool()) {
+                    rgb.* = .{ 0, 0, 0 };
+                    for (&rgb.*.?) |*channel| channel.* = try r.getByte();
+                }
+            } else for (rgb) |*channel| channel.* = try r.getByte();
+        }
         try r.end();
     }
 
@@ -697,7 +709,7 @@ pub fn encodeFramePointer(
     cells: []const pardes.Cell,
     prev: []const pardes.Cell,
 ) Error![]const u8 {
-    return encodeFrameLayers(out, cols, rows, cursor, pointer_shape, cells, prev, &.{}, &.{}, &.{});
+    return encodeFrameLayers(out, cols, rows, cursor, pointer_shape, cells, prev, &.{}, &.{}, &.{}, .{});
 }
 
 pub fn layersBound(layers: []const pardes.Layer, tags: []const pardes.Layer, regions: []const pardes.Region) usize {
@@ -708,12 +720,15 @@ pub fn layersBound(layers: []const pardes.Layer, tags: []const pardes.Layer, reg
     for (tags) |layer| if (layer.rows != 0) {
         n += 28 + layer.cells.len * cell_max;
     };
-    return n + regions.len * region_len;
+    return n + regions.len * region_len + chrome_len;
 }
 
 const region_len = 1 + 1 + 4 + 8 + 1 + 2 + 2 + 1 + 2;
+/// The palette: each colour three bytes, a theme's optional ones a flag
+/// before them.
+const chrome_len = @typeInfo(pardes.Chrome).@"struct".fields.len * 4;
 
-pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, pointer_shape: pardes.Surface.PointerShape, cells: []const pardes.Cell, prev: []const pardes.Cell, layers: []const pardes.Layer, tags: []const pardes.Layer, regions: []const pardes.Region) Error![]const u8 {
+pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, pointer_shape: pardes.Surface.PointerShape, cells: []const pardes.Cell, prev: []const pardes.Cell, layers: []const pardes.Layer, tags: []const pardes.Layer, regions: []const pardes.Region, chrome: pardes.Chrome) Error![]const u8 {
     // The protocol's ceiling, enforced by the ENCODER too, and BEFORE the
     // assert below so a caller can be told rather than tripped. `max_payload`
     // is derived from these two, so a larger grid is a frame this decoder
@@ -793,6 +808,13 @@ pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, point
             try w.putByte(region.notice);
             try w.putU16(region.clip);
         }
+        inline for (@typeInfo(pardes.Chrome).@"struct".fields) |field| {
+            const rgb = @field(chrome, field.name);
+            if (field.type == ?[3]u8) {
+                try w.putBool(rgb != null);
+                if (rgb) |value| for (value) |channel| try w.putByte(channel);
+            } else for (rgb) |channel| try w.putByte(channel);
+        }
     }
     std.mem.writeInt(u32, w.buf[layers_len_at..][0..4], @intCast(w.n - layers_start), .little);
     const nruns_at = w.n;
@@ -1871,7 +1893,8 @@ test "detached wire carries compact body rows and exact pointer metrics" {
     const placed = [_]pardes.Region{.{ .kind = .rail, .owner = 3, .serial = 42, .rect = .{ .x = 0, .y = 1, .w = 2, .h = 3 }, .active = true, .thumb_y = 1, .thumb_h = 2, .clip = 1 }};
     const out = try gpa.alloc(u8, frameBound(2, 4) + layersBound(&.{layer}, &.{tag}, &placed));
     defer gpa.free(out);
-    const encoded = try encodeFrameLayers(out, 2, 4, null, .link, &cells, &cells, &.{layer}, &.{tag}, &placed);
+    const palette: pardes.Chrome = .{ .page = .{ 1, 2, 3 }, .border = .{ 4, 5, 6 }, .tag_focus_bg = .{ 7, 8, 9 }, .scroll_thumb = .{ 10, 11, 12 } };
+    const encoded = try encodeFrameLayers(out, 2, 4, null, .link, &cells, &cells, &.{layer}, &.{tag}, &placed, palette);
     const packet = (try framed(encoded)).?;
     const frame = (try decodeServer(packet.tag, packet.payload)).frame;
     var decoded: [pardes.MAX_PANES]pardes.Layer = @splat(.{});
@@ -1881,8 +1904,10 @@ test "detached wire carries compact body rows and exact pointer metrics" {
     try frame.apply(&cells);
     var regions: std.ArrayListUnmanaged(pardes.Region) = .empty;
     defer regions.deinit(gpa);
-    try frame.applyLayers(gpa, &decoded, &tags, &regions);
+    var chrome: pardes.Chrome = .{};
+    try frame.applyLayers(gpa, &decoded, &tags, &regions, &chrome);
     try std.testing.expectEqualDeep(placed[0..], regions.items);
+    try std.testing.expectEqualDeep(palette, chrome);
     try std.testing.expectEqual(@as(u16, 6), decoded[0].rows);
     try std.testing.expect(decoded[0].context_separators.isSet(0));
     try std.testing.expect(!decoded[0].context_separators.isSet(1));
@@ -1908,7 +1933,7 @@ test "detached wire carries compact body rows and exact pointer metrics" {
     try std.testing.expect(mouse_encoded.len <= clientBound(message));
     var truncated = frame;
     truncated.layers = frame.layers[0 .. frame.layers.len - 1];
-    try std.testing.expectError(error.Truncated, truncated.applyLayers(gpa, &decoded, &tags, &regions));
+    try std.testing.expectError(error.Truncated, truncated.applyLayers(gpa, &decoded, &tags, &regions, &chrome));
     for (decoded) |item| {
         try std.testing.expectEqual(@as(u16, 0), item.rows);
         try std.testing.expectEqual(@as(usize, 0), item.cells.len);
@@ -1922,6 +1947,6 @@ test "detached wire carries compact body rows and exact pointer metrics" {
     const no_layers = try encodeFramePointer(out, 2, 4, null, .arrow, &cells, &cells);
     const cleared_packet = (try framed(no_layers)).?;
     const cleared = (try decodeServer(cleared_packet.tag, cleared_packet.payload)).frame;
-    try cleared.applyLayers(gpa, &decoded, &tags, &regions);
+    try cleared.applyLayers(gpa, &decoded, &tags, &regions, &chrome);
     try std.testing.expectEqual(@as(u16, 0), decoded[0].rows);
 }
diff --git a/src/draw.zig b/src/draw.zig
index 7cfe7554..4242a6e7 100644
--- a/src/draw.zig
+++ b/src/draw.zig
@@ -47,14 +47,7 @@ const NOTICE_LAYER_BASE = pardes.NOTICE_LAYER_BASE;
 /// painters below and every shell read these rectangles.
 pub fn place(p: *Pardes, s: *Surface) void {
     s.nregions = 0;
-    const add = struct {
-        fn region(surface: *Surface, r: Region) void {
-            std.debug.assert(surface.nregions < surface.regions.len);
-            surface.regions[surface.nregions] = r;
-            surface.nregions += 1;
-        }
-    }.region;
-    add(s, .{ .kind = .page, .rect = .{ .x = 0, .y = 0, .w = s.cols, .h = s.rows } });
+    s.addRegion(.{ .kind = .page, .rect = .{ .x = 0, .y = 0, .w = s.cols, .h = s.rows } });
     for (&p.panes, 0..) |*slot, id| {
         const pane = slot.* orelse continue;
         Messages.collectNotices(p, pane, p.rects[id], id);
@@ -64,12 +57,12 @@ pub fn place(p: *Pardes, s: *Surface) void {
         const active = id == p.active;
         const tag_y = p.tagTop(pane, r);
         const body_y = p.bodyTop(pane, r);
-        add(s, .{ .kind = .grip, .owner = owner, .serial = pane.serial, .active = active, .rect = .{ .x = r.x, .y = tag_y, .w = config.GUTTER, .h = pane.tag_rows } });
-        add(s, .{ .kind = .tag, .owner = owner, .serial = pane.serial, .active = active, .rect = .{ .x = r.x + config.GUTTER, .y = tag_y, .w = r.w - config.GUTTER, .h = pane.tag_rows } });
+        s.addRegion(.{ .kind = .grip, .owner = owner, .serial = pane.serial, .active = active, .rect = .{ .x = r.x, .y = tag_y, .w = config.GUTTER, .h = pane.tag_rows } });
+        s.addRegion(.{ .kind = .tag, .owner = owner, .serial = pane.serial, .active = active, .rect = .{ .x = r.x + config.GUTTER, .y = tag_y, .w = r.w - config.GUTTER, .h = pane.tag_rows } });
         // A folded pane is its tag rows and nothing else.
         if (pane.collapsed) continue;
         const body_h = r.h -| pane.tag_rows;
-        add(s, .{ .kind = .body, .owner = owner, .serial = pane.serial, .active = active, .rect = .{ .x = r.x + config.GUTTER, .y = body_y, .w = r.w - config.GUTTER, .h = body_h } });
+        s.addRegion(.{ .kind = .body, .owner = owner, .serial = pane.serial, .active = active, .rect = .{ .x = r.x + config.GUTTER, .y = body_y, .w = r.w - config.GUTTER, .h = body_h } });
         var rail: Region = .{ .kind = .rail, .owner = owner, .serial = pane.serial, .active = active, .rect = .{ .x = r.x, .y = body_y, .w = config.GUTTER, .h = body_h } };
         // An image's rail has no thumb; a native PDF's is measured as its
         // pages are placed (Pdf.draw); every other pane's is here.
@@ -93,7 +86,7 @@ pub fn place(p: *Pardes, s: *Surface) void {
             rail.thumb_y = @intCast(@min(pos, track_h));
             rail.thumb_h = @intCast(@min(len, track_h - rail.thumb_y));
         }
-        add(s, rail);
+        s.addRegion(rail);
         // Each notice a chip at the right edge, one to a row in the order
         // collectNotices chose, as wide as its own message and no wider, so
         // the text beneath the rest of the row keeps reading as the file.
@@ -106,7 +99,7 @@ pub fn place(p: *Pardes, s: *Surface) void {
             const chip = Messages.noticeCols(p, text, tw);
             if (chip == 0) continue;
             pane.notices.left[i] = tx + tw - chip;
-            add(s, .{ .kind = .notice, .owner = owner, .serial = pane.serial, .active = active, .notice = @intCast(i), .rect = .{ .x = tx + tw - chip, .y = body_y + @as(u16, pane.notices.row[i]), .w = chip, .h = BOX_H } });
+            s.addRegion(.{ .kind = .notice, .owner = owner, .serial = pane.serial, .active = active, .notice = @intCast(i), .rect = .{ .x = tx + tw - chip, .y = body_y + @as(u16, pane.notices.row[i]), .w = chip, .h = BOX_H } });
         }
     }
     const column_rows = p.columnBarHeight();
@@ -114,11 +107,16 @@ pub fn place(p: *Pardes, s: *Surface) void {
         if (p.col_w[c] == 0) continue;
         const active = if (layout.findPane(p, p.active)) |found| found.col == c else false;
         const inset = @min(TAG_TEXT_INSET, p.col_w[c]);
-        add(s, .{ .kind = .column_grip, .owner = @intCast(c), .serial = p.col_serial[c], .active = active, .rect = .{ .x = p.col_x[c], .y = p.topBarHeight(), .w = @min(config.GUTTER, p.col_w[c]), .h = column_rows } });
-        add(s, .{ .kind = .column_tag, .owner = @intCast(c), .serial = p.col_serial[c], .active = active, .rect = .{ .x = p.col_x[c] + inset, .y = p.topBarHeight(), .w = p.col_w[c] - inset, .h = column_rows } });
+        s.addRegion(.{ .kind = .column_grip, .owner = @intCast(c), .serial = p.col_serial[c], .active = active, .rect = .{ .x = p.col_x[c], .y = p.topBarHeight(), .w = @min(config.GUTTER, p.col_w[c]), .h = column_rows } });
+        s.addRegion(.{ .kind = .column_tag, .owner = @intCast(c), .serial = p.col_serial[c], .active = active, .rect = .{ .x = p.col_x[c] + inset, .y = p.topBarHeight(), .w = p.col_w[c] - inset, .h = column_rows } });
     };
+    const active_col = if (layout.findPane(p, p.active)) |found| found.col else null;
+    for (0..p.ncol) |c| {
+        if (p.col_w[c] == 0) continue;
+        s.addRegion(.{ .kind = .column, .owner = @intCast(c), .serial = p.col_serial[c], .active = active_col == c, .rect = .{ .x = p.col_x[c], .y = p.topBarHeight(), .w = p.col_w[c], .h = s.rows -| p.topBarHeight() } });
+    }
     if (p.settings.workspace_tag)
-        add(s, .{ .kind = .workspace_tag, .rect = .{ .x = 0, .y = 0, .w = s.cols, .h = p.topBarHeight() } });
+        s.addRegion(.{ .kind = .workspace_tag, .rect = .{ .x = 0, .y = 0, .w = s.cols, .h = p.topBarHeight() } });
     // A column carried to the window's right edge shows where it lands as a
     // rail in the last cell: the layers under it stop a cell short.
     if (p.drag == .column_move) rail: {
@@ -176,8 +174,20 @@ pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface {
     s.previous_cells = &.{};
     s.previous_body_layers = &.{};
     s.previous_tag_layers = &.{};
+    s.previous_regions = &.{};
     s.cell_diffs = &.{};
     const chrome = p.chromeTheme();
+    s.chrome = .{
+        .page = p.theme().bg,
+        .fg = p.theme().fg,
+        .border = chrome.border,
+        .topbar_rule = config.gui_topbar_pane_border_rgb orelse chrome.border,
+        .tag_bg = chrome.tag_bg,
+        .tag_focus_bg = if (p.settings.focus_tint) chrome.tag_active_bg else chrome.tag_bg,
+        .tag_fg = chrome.tag_fg,
+        .scroll_track = chrome.scroll_track,
+        .scroll_thumb = chrome.scroll_thumb,
+    };
     place(p, s);
     // Separators have their own role; a scrollbar need not frame the page.
     const whole = s.regions[0].rect;
@@ -203,16 +213,20 @@ pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface {
             if (d.cur_x < s.cols) {
                 var row: u16 = p.topBarHeight();
                 while (row < s.rows) : (row += 1) s.overlayDash(d.cur_x, row, "╎");
+                s.addRegion(.{ .kind = .guide, .rect = .{ .x = d.cur_x, .y = p.topBarHeight(), .w = 1, .h = s.rows -| p.topBarHeight() } });
             }
             if (d.corner) |k| if (d.cur_y < s.rows) {
-                var col = if (k.col == d.left_col) p.col_x[k.col] else d.cur_x +| 1;
+                const first = if (k.col == d.left_col) p.col_x[k.col] else d.cur_x +| 1;
                 const end = if (k.col == d.left_col) d.cur_x else p.col_x[k.col] +| p.col_w[k.col] -| 1;
+                var col = first;
                 while (col <= end and col < s.cols) : (col += 1) s.overlayDash(col, d.cur_y, "╌");
+                if (col > first) s.addRegion(.{ .kind = .guide, .rect = .{ .x = first, .y = d.cur_y, .w = col - first, .h = 1 } });
             };
         },
         .border_h => |d| if (d.cur_y < s.rows) {
             var col = p.col_x[d.col];
             while (col < p.col_x[d.col] + p.col_w[d.col]) : (col += 1) s.overlayDash(col, d.cur_y, "╌");
+            s.addRegion(.{ .kind = .guide, .rect = .{ .x = p.col_x[d.col], .y = d.cur_y, .w = p.col_w[d.col], .h = 1 } });
         },
         .column_move => |d| rail: {
             const source = layout.columnBySerial(p, d.serial) orelse break :rail;
@@ -232,13 +246,20 @@ pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface {
             // color: this is where the grabbed column lands.
             const x = @min(if (edge == 0) config.GUTTER - 1 else edge - 1, s.cols -| 1);
             var row: u16 = p.topBarHeight();
+            // A guide region for each run of it the tags do not break.
+            var run: u16 = row;
             while (row < s.rows) : (row += 1) {
                 // Past the left edge's scroll rail the rail would cut
                 // through column 0's grip and pane boxes: leave them whole.
-                if (edge == 0 and s.at(x, row).style.font_role == .tagline) continue;
+                if (edge == 0 and s.at(x, row).style.font_role == .tagline) {
+                    if (row > run) s.addRegion(.{ .kind = .guide, .rect = .{ .x = x, .y = run, .w = 1, .h = row - run } });
+                    run = row + 1;
+                    continue;
+                }
                 s.overlayDash(x, row, "╎");
                 s.at(x, row).style.fg = .{ .rgb = chrome.column_box };
             }
+            if (row > run) s.addRegion(.{ .kind = .guide, .rect = .{ .x = x, .y = run, .w = 1, .h = row - run } });
         },
         .move => |d| if (d.cur_x < s.cols) {
             if (layout.movePlacement(p, d.id, d.cur_x, d.cur_y)) |placement| {
@@ -247,6 +268,8 @@ pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface {
                     s.set(col, placement.row, "╌", .{ .fg = .{ .rgb = chrome.lineno } });
                 }
                 s.set(d.cur_x, placement.row, "▌", .{ .fg = .{ .rgb = chrome.lineno } });
+                s.addRegion(.{ .kind = .guide, .rect = .{ .x = p.col_x[placement.preview_col], .y = placement.row, .w = p.col_w[placement.preview_col], .h = 1 } });
+                s.addRegion(.{ .kind = .guide, .rect = .{ .x = d.cur_x, .y = placement.row, .w = 1, .h = 1 } });
             }
         },
         .none, .select => if (p.pointer_inside) {
@@ -256,6 +279,7 @@ pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface {
                 if (p.hover_col == p.col_x[c] + p.col_w[c] -| 1) {
                     var row: u16 = p.topBarHeight();
                     while (row < s.rows) : (row += 1) s.overlayDash(p.hover_col, row, "╎");
+                    s.addRegion(.{ .kind = .guide, .rect = .{ .x = p.hover_col, .y = p.topBarHeight(), .w = 1, .h = s.rows -| p.topBarHeight() } });
                 }
             }
             for (0..p.ncol) |cc| {
@@ -264,6 +288,7 @@ pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface {
                 if (mouse.seamIdxAt(p, cc, p.hover_row) != null) {
                     var col = p.col_x[cc];
                     while (col < p.col_x[cc] + p.col_w[cc]) : (col += 1) s.overlayDash(col, p.hover_row, "╌");
+                    s.addRegion(.{ .kind = .guide, .rect = .{ .x = p.col_x[cc], .y = p.hover_row, .w = p.col_w[cc], .h = 1 } });
                 }
             }
             for (0..p.ncol -| 1) |cn| {
@@ -272,6 +297,7 @@ pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface {
                 if (mouse.seamIdxAt(p, cn + 1, p.hover_row) == null) continue;
                 var col = p.col_x[cn + 1];
                 while (col < p.col_x[cn + 1] + p.col_w[cn + 1]) : (col += 1) s.overlayDash(col, p.hover_row, "╌");
+                s.addRegion(.{ .kind = .guide, .rect = .{ .x = p.col_x[cn + 1], .y = p.hover_row, .w = p.col_w[cn + 1], .h = 1 } });
             }
         },
     }
@@ -309,6 +335,7 @@ pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface {
         const oh: u16 = 10;
         const ox: u16 = if (s.cols > ow) s.cols - ow else 0;
         if (ox + ow <= s.cols and p.topBarHeight() + oh <= s.rows) {
+            s.addRegion(.{ .kind = .debug, .rect = .{ .x = ox, .y = p.topBarHeight(), .w = ow, .h = oh } });
             // vaxis single_rounded border ring, default style
             s.set(ox, p.topBarHeight(), "╭", .{});
             s.set(ox + ow - 1, p.topBarHeight(), "╮", .{});
diff --git a/src/gui/gui.zig b/src/gui/gui.zig
index ff99bd39..35fbc99d 100644
--- a/src/gui/gui.zig
+++ b/src/gui/gui.zig
@@ -21,6 +21,7 @@ const c_heap = @import("c_heap");
 const ninep_io = @import("../9p_io.zig");
 
 const detached_client = @import("../detached/client.zig");
+const tracy = @import("../tracy.zig");
 
 pub const c = @cImport({
     @cDefine("SDL_DISABLE_OLD_NAMES", "1");
@@ -37,6 +38,7 @@ const log = std.log.scoped(.gui);
 const font_ttf = @embedFile("AdwaitaMono-Regular.ttf");
 const vert_spv = @embedFile("ui.vert.spv");
 const frag_spv = @embedFile("ui.frag.spv");
+const decor_frag_spv = @embedFile("decor.frag.spv");
 const overlay_vert_spv = @embedFile("overlay.vert.spv");
 const overlay_frag_spv = @embedFile("overlay.frag.spv");
 const image_vert_spv = @embedFile("image.vert.spv");
@@ -443,6 +445,11 @@ const CellInstance = extern struct {
     progress_bits: u32 = @bitCast(@as(f32, 1)),
     serial: u32 = 0,
     cell_coord: u32 = 0,
+    /// A clip rectangle in target pixels; x1 < x0 is none (ui.vert.glsl).
+    clip_x0: f32 = 0,
+    clip_y0: f32 = 0,
+    clip_x1: f32 = -1,
+    clip_y1: f32 = -1,
 };
 
 const OverlayVertex = extern struct {
@@ -545,7 +552,8 @@ test "saved native placement retains identity and geometry but no producer bytes
 }
 
 test "shader instance ABI carries aligned transition vectors" {
-    try std.testing.expectEqual(@as(usize, 104), @sizeOf(CellInstance));
+    try std.testing.expectEqual(@as(usize, 120), @sizeOf(CellInstance));
+    try std.testing.expectEqual(@as(usize, 104), @offsetOf(CellInstance, "clip_x0"));
     try std.testing.expectEqual(@as(usize, 56), @offsetOf(CellInstance, "panel_x0"));
     try std.testing.expectEqual(@as(usize, 72), @offsetOf(CellInstance, "present_x0"));
     try std.testing.expectEqual(@as(usize, 88), @offsetOf(CellInstance, "effect"));
@@ -560,12 +568,17 @@ test "shader instance ABI carries aligned transition vectors" {
         .{ .pane = 1, .phase = .moving, .effect = .slide },
         .{ .pane = 2, .phase = .moving, .effect = .slide },
     };
-    const plan = makePaintPlan(&tracks, true);
-    try std.testing.expectEqual(@as(usize, 4), plan.len);
-    try std.testing.expect(plan.batches[0].track == null);
-    try std.testing.expectEqual(@as(u8, 1), plan.batches[1].track.?.pane);
-    try std.testing.expectEqual(@as(u8, 2), plan.batches[2].track.?.pane);
-    try std.testing.expectEqual(@as(u8, 0), plan.batches[3].track.?.pane);
+    // Tier 0, the tracks as the core ordered them, then tiers 4 and 5.
+    const groups = makeGroups(&tracks, true);
+    try std.testing.expectEqual(@as(usize, 7), groups.len);
+    try std.testing.expect(groups.items[0].track == null);
+    try std.testing.expectEqual(@as(u8, 0), groups.items[1].track.?.pane);
+    try std.testing.expectEqual(@as(u8, 1), groups.items[2].track.?.pane);
+    try std.testing.expectEqual(@as(u8, 2), groups.items[3].track.?.pane);
+    try std.testing.expectEqual(@as(usize, 4), groups.notices);
+    try std.testing.expectEqual(@as(usize, 5), groups.guides);
+    try std.testing.expectEqual(@as(usize, 6), groups.ink);
+    for ([_]usize{ groups.notices, groups.guides, groups.ink }) |index| try std.testing.expect(groups.items[index].track == null);
 }
 
 test "GUI paint plan snaps history effects without a frozen grid" {
@@ -573,11 +586,11 @@ test "GUI paint plan snaps history effects without a frozen grid" {
         .{ .pane = 0, .phase = .opening, .effect = .ascii },
         .{ .pane = 1, .phase = .closing, .effect = .vertical },
     };
-    try std.testing.expectEqual(@as(usize, 1), makePaintPlan(&tracks, false).len);
-    const ready = makePaintPlan(&tracks, true);
-    try std.testing.expectEqual(@as(usize, 3), ready.len);
-    try std.testing.expectEqual(pardes.animation.Phase.opening, ready.batches[1].track.?.phase);
-    try std.testing.expectEqual(pardes.animation.Phase.closing, ready.batches[2].track.?.phase);
+    try std.testing.expectEqual(@as(usize, 0), makeGroups(&tracks, false).tracks);
+    const ready = makeGroups(&tracks, true);
+    try std.testing.expectEqual(@as(usize, 2), ready.tracks);
+    try std.testing.expectEqual(pardes.animation.Phase.opening, ready.items[1].track.?.phase);
+    try std.testing.expectEqual(pardes.animation.Phase.closing, ready.items[2].track.?.phase);
 }
 
 test "closing tombstone overlays but never owns canonical cells" {
@@ -588,10 +601,10 @@ test "closing tombstone overlays but never owns canonical cells" {
         .from = .{ .x = 2, .y = 3, .w = 10, .h = 4 },
         .to = .{ .x = 2, .y = -1, .w = 10, .h = 4 },
     };
-    const plan = makePaintPlan(&.{closing}, true);
-    try std.testing.expectEqual(@as(usize, 0), paintBatchAt(&plan, 4, 4));
-    try std.testing.expectEqual(@as(usize, 2), plan.len);
-    try std.testing.expectEqual(pardes.animation.Phase.closing, plan.batches[1].track.?.phase);
+    const groups = makeGroups(&.{closing}, true);
+    try std.testing.expectEqual(@as(usize, 0), groupAt(&groups, 4, 4));
+    try std.testing.expectEqual(@as(usize, 1), groups.tracks);
+    try std.testing.expectEqual(pardes.animation.Phase.closing, groups.items[1].track.?.phase);
 }
 
 fn updateCoreResize(core: *pardes.Pardes, cols: u16, rows: u16, cell_w: u32, cell_h: u32, tag_w: u32, tag_h: u32) bool {
@@ -1745,6 +1758,7 @@ const Gui = struct {
     device: *c.SDL_GPUDevice,
     swapchain_format: c.SDL_GPUTextureFormat,
     pipeline: *c.SDL_GPUGraphicsPipeline,
+    decor_pipeline: *c.SDL_GPUGraphicsPipeline,
     overlay_pipeline: *c.SDL_GPUGraphicsPipeline,
     image_pipeline: *c.SDL_GPUGraphicsPipeline,
     crt_pipeline: *c.SDL_GPUGraphicsPipeline,
@@ -1764,9 +1778,11 @@ const Gui = struct {
     native_images: std.AutoHashMapUnmanaged(pardes.ImageCacheKey, *c.SDL_GPUTexture) = .empty,
     presented_images: std.ArrayListUnmanaged(SavedImagePlace) = .empty,
     prepared_images: std.ArrayListUnmanaged(PreparedImage) = .empty,
-    /// renderFrame's cover of the grid by layers (coverLayers): this frame's
-    /// layers, then the layers a panel transition is leaving.
-    layer_cover: std.ArrayListUnmanaged(bool) = .empty,
+    /// renderFrame's cover of the grid (coverFrame): this frame's, then the
+    /// frame a panel transition is leaving.
+    cover: std.ArrayListUnmanaged(Cover) = .empty,
+    /// renderFrame's decor instances, group by group (buildDecor).
+    decor: std.ArrayListUnmanaged(CellInstance) = .empty,
 
     font: *c.UIFont,
     font_bytes: []u8 = &.{},
@@ -1996,47 +2012,127 @@ fn taglineLayoutForCell(g: *const Gui, col: u16) CellLayout {
 
 const boxContains = pardes.animation.Box.contains;
 
-const PaintBatch = struct {
+/// What one tier draws, or one track in tiers 2 and 3 (docs/render-pipeline.md
+/// §3.4), in this order: its cells, its images, then its decor.
+const Group = struct {
     track: ?pardes.animation.Track = null,
     cell_start: u32 = 0,
     cell_count: u32 = 0,
     image_start: u32 = 0,
     image_count: u32 = 0,
+    decor_start: u32 = 0,
+    decor_count: u32 = 0,
 };
 
-const PaintPlan = struct {
-    batches: [pardes.MAX_PANES * 2 + 1]PaintBatch = @splat(.{}),
-    len: usize = 1,
+/// The frame's draw groups, bottom to top: tier 0 (the page and the panes
+/// standing still), a group for each track in paint order (tier 2 moving and
+/// opening, tier 3 closing), tier 4 (floating: the notices, then the guides
+/// and the debug box, which the core paints over them) and tier 5 (ink: the
+/// bar cursors; the pet and the touch overlay draw after it). Tier 1 is the
+/// focus lift, which does not exist yet.
+const Groups = struct {
+    items: [pardes.MAX_PANES * 2 + 4]Group = @splat(.{}),
+    /// Groups 1 through `tracks` are the tracks'.
+    tracks: usize = 0,
+    notices: usize = 1,
+    guides: usize = 2,
+    ink: usize = 3,
+    len: usize = 4,
 };
 
-fn makePaintPlan(tracks: []const pardes.animation.Track, has_diff: bool) PaintPlan {
-    var plan: PaintPlan = .{};
-    for ([_]pardes.animation.Phase{ .moving, .opening, .closing }) |phase| {
-        for (tracks) |track| {
-            if (!track.active() or track.phase != phase) continue;
-            if (track.effect.needsPreviousGrid() and !has_diff) continue;
-            std.debug.assert(plan.len < plan.batches.len);
-            plan.batches[plan.len].track = track;
-            plan.len += 1;
-        }
+fn makeGroups(tracks: []const pardes.animation.Track, has_diff: bool) Groups {
+    var groups: Groups = .{};
+    for (tracks) |track| {
+        if (!track.active()) continue;
+        if (track.effect.needsPreviousGrid() and !has_diff) continue;
+        std.debug.assert(groups.tracks < pardes.MAX_PANES * 2);
+        groups.tracks += 1;
+        groups.items[groups.tracks].track = track;
     }
-    return plan;
+    groups.notices = groups.tracks + 1;
+    groups.guides = groups.tracks + 2;
+    groups.ink = groups.tracks + 3;
+    groups.len = groups.tracks + 4;
+    return groups;
 }
 
-fn paintBatchAt(plan: *const PaintPlan, col: u16, row: u16) usize {
-    for (plan.batches[1..plan.len], 1..) |batch, index| {
-        if (batch.track.?.phase == .closing) continue;
-        if (boxContains(batch.track.?.to, col, row)) return index;
+/// The group of the track whose pane covers this cell, else tier 0.
+fn groupAt(groups: *const Groups, col: u16, row: u16) usize {
+    for (groups.items[1..][0..groups.tracks], 1..) |group, index| {
+        if (group.track.?.phase == .closing) continue;
+        if (boxContains(group.track.?.to, col, row)) return index;
     }
     return 0;
 }
 
-fn paintBatchForSerial(plan: *const PaintPlan, serial: u32) usize {
-    for (plan.batches[1..plan.len], 1..) |batch, index|
-        if (batch.track.?.serial == serial) return index;
+fn groupOf(groups: *const Groups, serial: u32) usize {
+    for (groups.items[1..][0..groups.tracks], 1..) |group, index|
+        if (group.track.?.serial == serial) return index;
     return 0;
 }
 
+/// What draws a grid cell, marked once a frame from the layers and the
+/// regions (coverFrame), so the cell loops read it rather than search.
+const Cover = packed struct(u16) {
+    /// A layer draws it; the grid's copy is not drawn.
+    layer: bool = false,
+    /// Under a guide or the debug box: drawn from the grid over the panes.
+    floating: bool = false,
+    /// In a pane's grip, `grip_offset` cells from its left: the grip's
+    /// glyph is the cell that far to the left.
+    grip: bool = false,
+    grip_offset: u4 = 0,
+    /// In the focused pane's or column's tag rows.
+    focus: bool = false,
+    /// At a column's left edge, where a tag's anchor is inset.
+    anchor: bool = false,
+    _: u7 = 0,
+};
+
+/// Marks the grid cells a body or tag layer covers, which the layers paint
+/// themselves, and what the regions say of the rest. Filling each rectangle
+/// once replaces scanning every layer for every cell, which was a third of
+/// the gui's CPU on a full screen of text.
+fn coverFrame(cover: []Cover, cols: u16, rows: u16, body_layers: []const pardes.Layer, tag_layers: []const pardes.Layer, regions: []const pardes.Region) void {
+    @memset(cover, .{});
+    const mark = struct {
+        fn rect(into: []Cover, width: u16, height: u16, r: pardes.Rect, comptime field: []const u8, value: anytype) void {
+            const right = @min(width, @as(u32, r.x) + r.w);
+            if (r.x >= right) return;
+            var y: u32 = r.y;
+            while (y < @min(height, @as(u32, r.y) + r.h)) : (y += 1)
+                for (into[y * width ..][r.x..right]) |*cell| {
+                    @field(cell, field) = value;
+                };
+        }
+    };
+    for (body_layers) |*layer| {
+        if (layer.rows != 0) mark.rect(cover, cols, rows, layer.viewport, "layer", true);
+    }
+    for (tag_layers) |*layer| {
+        if (layer.rows != 0) mark.rect(cover, cols, rows, .{ .x = layer.viewport.x, .y = layer.viewport.y, .w = layer.viewport.w, .h = layer.rows }, "layer", true);
+    }
+    // The column bar's rows, which the focused column's tint spans.
+    var bar: ?pardes.Rect = null;
+    for (regions) |region| {
+        if (region.kind == .column_grip) bar = region.rect;
+    }
+    for (regions) |region| switch (region.kind) {
+        .grip => {
+            mark.rect(cover, cols, rows, region.rect, "grip", true);
+            for (0..@min(region.rect.w, 16)) |offset| mark.rect(cover, cols, rows, .{ .x = region.rect.x +| @as(u16, @intCast(offset)), .y = region.rect.y, .w = 1, .h = region.rect.h }, "grip_offset", @as(u4, @intCast(offset)));
+            if (region.active) mark.rect(cover, cols, rows, region.rect, "focus", true);
+        },
+        .tag => if (region.active) mark.rect(cover, cols, rows, region.rect, "focus", true),
+        .column => {
+            mark.rect(cover, cols, rows, .{ .x = region.rect.x, .y = 0, .w = 1, .h = rows }, "anchor", true);
+            if (region.active) if (bar) |b| mark.rect(cover, cols, rows, .{ .x = region.rect.x, .y = b.y, .w = region.rect.w, .h = b.h }, "focus", true);
+        },
+        .guide, .debug => mark.rect(cover, cols, rows, region.rect, "floating", true),
+        else => {},
+    };
+}
+
 fn panelCellCoord(track: pardes.animation.Track, col: u16, row: u16) u32 {
     const source = track.contentBox();
     const x0: u16 = @intFromFloat(@max(0.0, @floor(source.x)));
@@ -2101,6 +2197,15 @@ fn setTransitionFields(
     instance.progress_bits = @bitCast(active.amount());
     instance.serial = active.serial;
     instance.cell_coord = cell_coord;
+    // A vertical transition shows its pane only inside the box it grows
+    // into, in whole pixels.
+    if (@hasField(@TypeOf(instance.*), "clip_x0") and active.effect == .vertical) {
+        const box = active.contentBox();
+        instance.clip_x0 = std.math.clamp(@floor(box.x * layout.w), 0, win_w);
+        instance.clip_y0 = std.math.clamp(@floor(box.y * layout.h), 0, win_h);
+        instance.clip_x1 = std.math.clamp(@ceil((box.x + box.w) * layout.w), instance.clip_x0, win_w);
+        instance.clip_y1 = std.math.clamp(@ceil((box.y + box.h) * layout.h), instance.clip_y0, win_h);
+    }
 }
 
 pub const run = runNative;
@@ -2276,7 +2381,8 @@ fn runNative(init: std.process.Init, opts_in: pardes.Options, attach: ?[]const u
     var ax_info = c.SDL_GPUTransferBufferCreateInfo{ .usage = c.SDL_GPU_TRANSFERBUFFERUSAGE_UPLOAD, .size = atlas_w * atlas_h, .props = 0 };
     const atlas_xfer = c.SDL_CreateGPUTransferBuffer(device, &ax_info) orelse return error.GpuCreate;
 
-    const pipeline = try makePipeline(device, swapchain_format);
+    const pipeline = try makePipeline(device, swapchain_format, frag_spv, 1, std.mem.zeroes(c.SDL_GPUColorTargetBlendState));
+    const decor_pipeline = try makePipeline(device, swapchain_format, decor_frag_spv, 0, backgroundLayerBlend());
     const overlay_pipeline = try makeOverlayPipeline(device, swapchain_format);
     const image_pipeline = try makeImagePipeline(device, swapchain_format);
     const crt_pipeline = try makeCrtPipeline(device, swapchain_format);
@@ -2306,6 +2412,7 @@ fn runNative(init: std.process.Init, opts_in: pardes.Options, attach: ?[]const u
         .device = device,
         .swapchain_format = swapchain_format,
         .pipeline = pipeline,
+        .decor_pipeline = decor_pipeline,
         .overlay_pipeline = overlay_pipeline,
         .image_pipeline = image_pipeline,
         .crt_pipeline = crt_pipeline,
@@ -2343,6 +2450,7 @@ fn runNative(init: std.process.Init, opts_in: pardes.Options, attach: ?[]const u
     // regrown to; the image ones are released below.
     defer {
         c.SDL_ReleaseGPUGraphicsPipeline(device, g.pipeline);
+        c.SDL_ReleaseGPUGraphicsPipeline(device, g.decor_pipeline);
         c.SDL_ReleaseGPUGraphicsPipeline(device, g.overlay_pipeline);
         c.SDL_ReleaseGPUGraphicsPipeline(device, g.crt_pipeline);
         c.SDL_ReleaseGPUTexture(device, g.atlas_tex);
@@ -2368,7 +2476,8 @@ fn runNative(init: std.process.Init, opts_in: pardes.Options, attach: ?[]const u
         g.native_images.deinit(gpa);
         g.presented_images.deinit(gpa);
         g.prepared_images.deinit(gpa);
-        g.layer_cover.deinit(gpa);
+        g.cover.deinit(gpa);
+        g.decor.deinit(gpa);
     }
     defer c.SDL_ReleaseGPUTransferBuffer(device, g.image_vxfer);
     defer c.SDL_ReleaseGPUBuffer(device, g.image_vbuf);
@@ -2479,6 +2588,7 @@ fn localSession(
         .watches = &watches,
         .fs = fs,
         .test_mode = test_mode,
+        .test_clock = if (test_mode) host_io.testClock() else null,
     };
     defer shell.shutdownPtys();
     const host = shell.host();
@@ -2668,24 +2778,12 @@ fn attachedLoop(gpa: std.mem.Allocator, g: *Gui, client: *detached_client.Client
 }
 
 fn paintAttached(g: *Gui, gpa: std.mem.Allocator, client: *detached_client.Client) void {
-    var surface: pardes.Surface = .{
-        .cols = client.cols,
-        .rows = client.rows,
-        .cells = client.grid.items,
-        .cursor = if (client.cursor) |cu| .{ .x = cu.x, .y = cu.y, .bar = cu.bar } else null,
-        .pointer_shape = client.pointer_shape,
-        .body_layers = client.body_layers,
-        .tag_layers = client.tag_layers,
-    };
-    const chrome = frameChromeBg(&surface);
+    var surface = attachedSurface(client);
     _ = renderFrame(
         g,
         gpa,
         null,
         &surface,
-        null,
-        chrome,
-        chrome,
         .{},
         false,
     ) catch |err| blk: {
@@ -2694,17 +2792,67 @@ fn paintAttached(g: *Gui, gpa: std.mem.Allocator, client: *detached_client.Clien
     };
 }
 
-fn frameChromeBg(surface: *const pardes.Surface) [3]u8 {
-    if (surface.rows == 0 or surface.cols == 0) return bg_default;
-    for (surface.cells[0..surface.cols]) |cell| {
-        if (cell.default or cell.style.font_role != .tagline) continue;
-        return switch (cell.style.bg) {
-            .default => bg_default,
-            .index => |i| palColor(i),
-            .rgb => |rgb| rgb,
-        };
-    }
-    return bg_default;
+/// The session's frame as a surface: its cells, layers, regions and palette,
+/// so its chrome is drawn from them as a local one's is.
+fn attachedSurface(client: *const detached_client.Client) pardes.Surface {
+    var surface: pardes.Surface = .{
+        .cols = client.cols,
+        .rows = client.rows,
+        .cells = client.grid.items,
+        .cursor = if (client.cursor) |cu| .{ .x = cu.x, .y = cu.y, .bar = cu.bar } else null,
+        .pointer_shape = client.pointer_shape,
+        .body_layers = client.body_layers,
+        .tag_layers = client.tag_layers,
+        .chrome = client.chrome,
+    };
+    const placed = client.regions.items[0..@min(client.regions.items.len, surface.regions.len)];
+    @memcpy(surface.regions[0..placed.len], placed);
+    surface.nregions = @intCast(placed.len);
+    return surface;
+}
+
+test "an attached frontend draws the session's chrome from its frame alone" {
+    const gpa = std.testing.allocator;
+    const core = try pardes.Pardes.init(gpa, .{ .cols = 80, .rows = 24 });
+    defer core.deinit();
+    // A gui-shaped core, whose tags and notices are layers.
+    core.update(.{ .resize = .{ .cols = 80, .rows = 24, .row_metrics = .{ .body_w = 10, .body_h = 20, .tagline_w = 6, .tagline_h = 12 } } });
+    _ = try core.newShell(1, "");
+    try std.testing.expect(pardes.layout.splitColumn(core, 0, 1, false));
+    core.settings.focus_tint = true;
+    try std.testing.expect(core.executeBuiltinLine(0, "Msg a notice with a rule under it"));
+    pardes.test_api.sync(core);
+    // Past its slide into place, where its rule shows.
+    for (0..30) |_| core.update(.tick);
+    const s = try core.render(core.scratch.allocator());
+
+    const wire = @import("../detached/wire.zig");
+    var client: detached_client.Client = .{ .gpa = gpa };
+    defer client.deinit();
+    var welcome: [64]u8 = undefined;
+    try client.in.appendSlice(gpa, try wire.encodeServer(&welcome, .{ .welcome = .{ .slot = 0, .cols = s.cols, .rows = s.rows } }));
+    const out = try gpa.alloc(u8, wire.frameBound(s.cols, s.rows) + wire.layersBound(&s.body_layers, &s.tag_layers, s.regionList()));
+    defer gpa.free(out);
+    try client.in.appendSlice(gpa, try wire.encodeFrameLayers(out, s.cols, s.rows, null, s.pointer_shape, s.cells, &.{}, &s.body_layers, &s.tag_layers, s.regionList(), s.chrome));
+    _ = try client.next();
+    _ = try client.next();
+    const attached = attachedSurface(&client);
+
+    var g: Gui = undefined;
+    g.cell_w = 10;
+    g.cell_h = 20;
+    g.tagline_width = 6;
+    g.tagline_height = 12;
+    g.decor = .empty;
+    defer g.decor.deinit(gpa);
+    var groups = makeGroups(&.{}, false);
+    try buildDecor(&g, gpa, s, &groups, fixedCellLayout(&g), 800, 480, true);
+    const local = try gpa.dupe(CellInstance, g.decor.items);
+    defer gpa.free(local);
+    try std.testing.expect(local.len > 8);
+    try std.testing.expect(groups.items[groups.notices].decor_count != 0);
+    try buildDecor(&g, gpa, &attached, &groups, fixedCellLayout(&g), 800, 480, true);
+    try std.testing.expectEqualSlices(u8, std.mem.sliceAsBytes(local), std.mem.sliceAsBytes(g.decor.items));
 }
 
 fn runGrid(init: std.process.Init, opts_in: pardes.Options) !void {
@@ -3708,6 +3856,8 @@ const Shell = struct {
     saw_event: bool = false,
     dump_err: ?anyerror = null,
     retired_shells: [pardes.MAX_PANES]RetiredShell = @splat(.{}),
+    /// PARDES_TEST_CLOCK's virtual time (host_io.testClock), in test mode.
+    test_clock: ?u64 = null,
 
     fn reap(s: *Shell) void {
         const now = shellClock();
@@ -3898,13 +4048,31 @@ fn waitInput(ctx: ?*anyopaque, timeout_ms: u32) void {
     var in: Input = .{ .core = core };
     if (s.gui) |g| {
         var sev = std.mem.zeroes(c.SDL_Event);
+        // Idle is asleep until an event: SDL's own, and the user events the
+        // shell's queue raises for a terminal's output, a completion, a file
+        // system request. What the shell moves or times itself polls every
+        // frame: a smooth scroll, a gamepad's sticks, the test stdin feed,
+        // a retired shell waiting to be killed, a present to retry. A
+        // minimized window sleeps through the core's animation too: nothing
+        // shows it, and it is caught up at once when the window is back.
+        const retiring = for (s.retired_shells) |child| {
+            if (child.kill_at != 0) break true;
+        } else for (s.ptys) |slot| {
+            if (slot) |pt| if (pt.kill_at != 0) break true;
+        } else false;
+        const polls = g.scroll_lag != 0 or g.scroll_delta != 0 or g.gamepad != null or s.test_mode or core.needs_frame or retiring;
+        const minimized = !s.test_mode and c.SDL_GetWindowFlags(g.window) & (c.SDL_WINDOW_MINIMIZED | c.SDL_WINDOW_OCCLUDED) != 0;
         // A latency trace is fed on stdin, whose poll below paces the loop:
         // waiting here too would make every tick cost two frames.
-        const ms: c_int = if (latency_fd >= 0) 0 else if (timeout_ms != 0) @intCast(timeout_ms) else 16;
+        const ms: c_int = if (latency_fd >= 0) 0 else if (minimized) -1 else if (timeout_ms != 0) @intCast(timeout_ms) else if (polls) 16 else -1;
         // The wait is the 9P connections' turn with the core.
         pardes.turn.rest();
         const got = c.SDL_WaitEventTimeout(&sev, ms);
         pardes.turn.wake();
+        // The core's wake ran out: a virtual clock moves exactly there.
+        if (!got and timeout_ms != 0) if (s.test_clock) |*virtual| {
+            virtual.* = @max(virtual.*, core.nextWake() orelse virtual.*);
+        };
         if (got) {
             // A run of queued motions is one move to its last position (the
             // handler reads only absolute x/y and held buttons): acting on
@@ -4044,9 +4212,6 @@ fn present(ctx: ?*anyopaque, surface: *const pardes.Surface) void {
         s.gpa,
         core,
         frame,
-        core.theme().bg,
-        config.gui_topbar_pane_border_rgb orelse core.chromeTheme().border,
-        core.chromeTheme().tag_bg,
         core.settings.scene_effects,
         core.settings.debug,
     ) catch |err| blk: {
@@ -4078,8 +4243,8 @@ fn postPresent(ctx: ?*anyopaque) void {
     s.core.acknowledgePanelPresentation(frame.panelTracks());
 }
 
-fn guiNow(_: ?*anyopaque) u64 {
-    return c.SDL_GetTicksNS();
+fn guiNow(ctx: ?*anyopaque) u64 {
+    return shellOf(ctx).test_clock orelse c.SDL_GetTicksNS();
 }
 
 fn gridPollFrame(ctx: ?*anyopaque) void {
@@ -4846,7 +5011,7 @@ fn prepareNativeImages(
     gpa: std.mem.Allocator,
     cmd: *c.SDL_GPUCommandBuffer,
     surface: *pardes.Surface,
-    plan: *PaintPlan,
+    groups: *Groups,
     sw: u32,
     sh: u32,
 ) bool {
@@ -4872,9 +5037,9 @@ fn prepareNativeImages(
     }
 
     g.prepared_images.clearRetainingCapacity();
-    for (plan.batches[0..plan.len], 0..) |*batch, batch_index| {
-        batch.image_start = std.math.cast(u32, g.prepared_images.items.len) orelse return false;
-        const track = batch.track;
+    for (groups.items[0..groups.len], 0..) |*group, group_index| {
+        group.image_start = std.math.cast(u32, g.prepared_images.items.len) orelse return false;
+        const track = group.track;
 
         if (track) |active| {
             if (active.phase == .closing) {
@@ -4894,7 +5059,7 @@ fn prepareNativeImages(
             for (surface.images[0..surface.nimages]) |maybe| {
                 const current = maybe orelse continue;
                 if (validImageBytes(current) == null or
-                    paintBatchForSerial(plan, current.serial) != batch_index) continue;
+                    groupOf(groups, current.serial) != group_index) continue;
                 const saved = SavedImagePlace.from(current);
                 const current_track = if (track) |active| switch (active.effect) {
                     .dissolve => if (snapshotContainsPlacement(g, current)) null else active,
@@ -4903,7 +5068,7 @@ fn prepareNativeImages(
                 appendPreparedImage(g, gpa, saved, current_track, null, false);
             }
         }
-        if (batch_index == 0) for (plan.batches[1..plan.len]) |tracked| {
+        if (group_index == 0) for (groups.items[1..][0..groups.tracks]) |tracked| {
             const active = tracked.track.?;
             if (active.effect != .vertical or active.phase != .opening) continue;
             for (g.presented_images.items) |saved| {
@@ -4912,7 +5077,7 @@ fn prepareNativeImages(
             }
         };
         const image_end = std.math.cast(u32, g.prepared_images.items.len) orelse return false;
-        batch.image_count = image_end - batch.image_start;
+        group.image_count = image_end - group.image_start;
     }
 
     const capacity = std.math.cast(u32, g.prepared_images.items.len) orelse return false;
@@ -4981,11 +5146,10 @@ fn drawNativeImagesGpu(
     g: *Gui,
     rp: ?*c.SDL_GPURenderPass,
     surface: *pardes.Surface,
-    plan: *const PaintPlan,
-    batch_index: usize,
+    batch: Group,
+    whole: c.SDL_Rect,
 ) void {
     const pass = rp orelse return;
-    const batch = plan.batches[batch_index];
     c.SDL_BindGPUGraphicsPipeline(pass, g.image_pipeline);
     const max_w = @as(u32, surface.cols) * g.cell_w;
     const max_h = @as(u32, surface.rows) * g.cell_h;
@@ -5004,12 +5168,8 @@ fn drawNativeImagesGpu(
         idx += 1;
     }
     std.debug.assert(idx == batch.image_start + batch.image_count);
-    const whole = c.SDL_Rect{
-        .x = 0,
-        .y = 0,
-        .w = @intCast(@as(u32, surface.cols) * g.cell_w),
-        .h = @intCast(@as(u32, surface.rows) * g.cell_h),
-    };
+    // Back to the whole target: what draws after a picture may run on past
+    // the grid, as a rule and a band do.
     c.SDL_SetGPUScissor(pass, &whole);
 }
 
@@ -5018,9 +5178,6 @@ fn renderFrame(
     gpa: std.mem.Allocator,
     core: ?*const pardes.Pardes,
     surface: *pardes.Surface,
-    theme_bg: ?[3]u8,
-    topbar_pane_border_rgb: [3]u8,
-    tagline_rgb: [3]u8,
     scene_effects: pardes.animation.SceneEffect,
     debug_on: bool,
 ) !bool {
@@ -5084,45 +5241,39 @@ fn renderFrame(
     };
     const scene: *c.SDL_GPUTexture = if (scene_on) g.scene_tex.? else target;
 
+    // The frame's CPU side: groups, decor, cover and every instance, up to
+    // their upload.
+    const build_zone = tracy.zone(@src(), "gui frame build");
+    var building = true;
+    defer if (building) build_zone.end();
     const layout = fixedCellLayout(g);
-    var paint_plan = makePaintPlan(surface.panelTracks(), surface.hasPanelDiff());
-    var overlay_count = buildOverlay(
-        g,
-        core,
-        surface,
-        layout,
-        sw,
-        sh,
-        topbar_pane_border_rgb,
-        tagline_rgb,
-        paint_plan.len == 1,
-        debug_on,
-    );
+    const chrome = &surface.chrome;
+    var groups = makeGroups(surface.panelTracks(), surface.hasPanelDiff());
+    // Cursors stand still while panes move, as they always have.
+    const cursors_shown = groups.tracks == 0;
+    var overlay_count = buildOverlay(g, core, surface, sw, sh, debug_on);
     if (overlay_count != 0 and !uploadOverlayGpu(g, cmd, overlay_count))
         overlay_count = 0;
-    if (!prepareNativeImages(g, gpa, cmd, surface, &paint_plan, sw, sh)) {
+    if (!prepareNativeImages(g, gpa, cmd, surface, &groups, sw, sh)) {
         g.prepared_images.clearRetainingCapacity();
-        for (paint_plan.batches[0..paint_plan.len]) |*batch| {
-            batch.image_start = 0;
-            batch.image_count = 0;
+        for (groups.items[0..groups.len]) |*group| {
+            group.image_start = 0;
+            group.image_count = 0;
         }
     }
 
     const cells: u32 = @as(u32, surface.cols) * surface.rows;
-    try g.layer_cover.resize(gpa, @as(usize, cells) * 2);
-    const covered = g.layer_cover.items[0..cells];
-    coverLayers(covered, surface.cols, surface.rows, surface.bodyLayers(), surface.tagLayers());
+    try g.cover.resize(gpa, @as(usize, cells) * 2);
+    const covered = g.cover.items[0..cells];
+    coverFrame(covered, surface.cols, surface.rows, surface.bodyLayers(), surface.tagLayers(), surface.regionList());
     // Only a panel transition paints the grid under the layers it leaves.
-    const previous_covered = g.layer_cover.items[cells..];
-    if (paint_plan.len > 1)
-        coverLayers(previous_covered, surface.cols, surface.rows, surface.previous_body_layers, surface.previous_tag_layers);
+    const previous_covered = g.cover.items[cells..];
+    if (groups.tracks != 0)
+        coverFrame(previous_covered, surface.cols, surface.rows, surface.previous_body_layers, surface.previous_tag_layers, surface.previous_regions);
+    try buildDecor(g, gpa, surface, &groups, layout, win_w, win_h, cursors_shown);
 
-    const page = ground(theme_bg, g.transparent);
+    const page = ground(chrome.page, g.transparent);
     const background_opacity = backgroundOpacity(g.applied_window_opacity);
-    const tagline_base = pardes.Cell{
-        .style = .{ .bg = .{ .rgb = tagline_rgb }, .font_role = .tagline },
-        .default = false,
-    };
     var color_target = std.mem.zeroes(c.SDL_GPUColorTargetInfo);
     color_target.texture = scene;
     color_target.clear_color = if (page.clear) .{ .r = 0, .g = 0, .b = 0, .a = 0 } else .{
@@ -5139,28 +5290,21 @@ fn renderFrame(
     while (row < surface.rows) : (row += 1) {
         var col: u16 = 0;
         while (col < surface.cols) : (col += 1) {
-            if (covered[@as(usize, row) * surface.cols + col]) continue;
-            const batch_index = paintBatchAt(&paint_plan, col, row);
-            const track = paint_plan.batches[batch_index].track;
-            const data_effect = if (track) |active|
-                active.effect == .dissolve
-            else
-                false;
-            const data_diff = data_effect and gripCellChanged(surface, col, row);
-            const logical_idx: u32 = @as(u32, row) * surface.cols + col;
+            const at = @as(usize, row) * surface.cols + col;
+            if (covered[at].layer and !covered[at].floating) continue;
+            const group_index = if (covered[at].floating) groups.guides else groupAt(&groups, col, row);
+            const track = groups.items[group_index].track;
+            const data_effect = if (track) |active| active.effect == .dissolve else false;
+            const data_diff = data_effect and gripCellChanged(surface, covered, previous_covered, col, row);
             const instance_count = if (data_diff)
-                cellInstanceCount(&surface.previous_cells[logical_idx]) + cellInstanceCount(surface.at(col, row))
+                cellInstanceCount(&surface.previous_cells[at]) + cellInstanceCount(&surface.cells[at])
             else
-                cellInstanceCount(surface.at(col, row));
-            paint_plan.batches[batch_index].cell_count = std.math.add(
-                u32,
-                paint_plan.batches[batch_index].cell_count,
-                instance_count,
-            ) catch return error.GpuCapacity;
+                cellInstanceCount(&surface.cells[at]);
+            groups.items[group_index].cell_count = std.math.add(u32, groups.items[group_index].cell_count, instance_count) catch return error.GpuCapacity;
         }
     }
-    for (paint_plan.batches[1..paint_plan.len]) |*batch| {
-        const track = batch.track.?;
+    for (groups.items[1..][0..groups.tracks]) |*group| {
+        const track = group.track.?;
         const duplicate_under = track.effect == .vertical and track.phase == .opening;
         if (!duplicate_under and track.phase != .closing) continue;
         row = 0;
@@ -5168,33 +5312,29 @@ fn renderFrame(
             var col: u16 = 0;
             while (col < surface.cols) : (col += 1) {
                 if (!boxContains(track.contentBox(), col, row)) continue;
-                if (previous_covered[@as(usize, row) * surface.cols + col]) continue;
-                const destination = if (duplicate_under) &paint_plan.batches[0] else batch;
-                const logical_idx: u32 = @as(u32, row) * surface.cols + col;
-                destination.cell_count = std.math.add(
-                    u32,
-                    destination.cell_count,
-                    cellInstanceCount(&surface.previous_cells[logical_idx]),
-                ) catch return error.GpuCapacity;
+                const at = @as(usize, row) * surface.cols + col;
+                if (previous_covered[at].layer) continue;
+                const destination = if (duplicate_under) &groups.items[0] else group;
+                destination.cell_count = std.math.add(u32, destination.cell_count, cellInstanceCount(&surface.previous_cells[at])) catch return error.GpuCapacity;
             }
         }
     }
     for (surface.bodyLayers()) |*layer| {
         if (layer.rows == 0) continue;
-        const batch = &paint_plan.batches[paintBatchAt(&paint_plan, layer.viewport.x, layer.viewport.y)];
+        const group = &groups.items[groupAt(&groups, layer.viewport.x, layer.viewport.y)];
         const bottom = @as(f32, @floatFromInt(layer.viewport.y + layer.viewport.h)) * layout.h;
         for (0..layer.rows) |lr| {
             if (layer.rowTop(@intCast(lr), layout.h, @floatFromInt(g.tagline_height)) >= bottom) break;
-            batch.cell_count += layer.cols + @as(u32, if (lr < layer.context_rows) 1 else 0) + @as(u32, @intFromBool(layer.hasContextBorderAfter(lr)));
+            group.cell_count += layer.cols + @as(u32, if (lr < layer.context_rows) 1 else 0) + @as(u32, @intFromBool(layer.hasContextBorderAfter(lr)));
         }
     }
-    for (paint_plan.batches[1..paint_plan.len], 1..) |batch, batch_index| {
-        const track = batch.track.?;
+    for (groups.items[1..][0..groups.tracks], 1..) |group, index| {
+        const track = group.track.?;
         const under = track.effect == .vertical and track.phase == .opening;
         if (!under and track.phase != .closing and track.effect != .dissolve) continue;
         for (surface.previous_body_layers) |*layer| {
             if (layer.rows == 0 or layer.serial != track.serial) continue;
-            const destination = if (under) &paint_plan.batches[0] else &paint_plan.batches[batch_index];
+            const destination = &groups.items[if (under) 0 else index];
             const bottom = @as(f32, @floatFromInt(layer.viewport.y + layer.viewport.h)) * layout.h;
             for (0..layer.rows) |lr| {
                 if (layer.rowTop(@intCast(lr), layout.h, @floatFromInt(g.tagline_height)) >= bottom) break;
@@ -5204,28 +5344,28 @@ fn renderFrame(
     }
     for (surface.tagLayers()) |*layer| {
         if (layer.rows == 0) continue;
-        const batch = &paint_plan.batches[paintBatchAt(&paint_plan, layer.viewport.x, layer.viewport.y)];
-        batch.cell_count += (tagLayerCellCount(g, layer) + 1) * layer.rows;
+        const group_index = if (layer.kind == .notice) groups.notices else groupAt(&groups, layer.viewport.x, layer.viewport.y);
+        groups.items[group_index].cell_count += (tagLayerCellCount(g, layer) + 1) * layer.rows;
     }
-    for (paint_plan.batches[1..paint_plan.len], 1..) |batch, batch_index| {
-        const track = batch.track.?;
+    for (groups.items[1..][0..groups.tracks], 1..) |group, index| {
+        const track = group.track.?;
         const under = track.effect == .vertical and track.phase == .opening;
         if (!under and track.phase != .closing and track.effect != .dissolve) continue;
         for (surface.previous_tag_layers) |*layer| {
             if (layer.rows == 0 or layer.kind != .pane or layer.serial != track.serial) continue;
-            const destination = if (under) &paint_plan.batches[0] else &paint_plan.batches[batch_index];
-            destination.cell_count += (tagLayerCellCount(g, layer) + 1) * layer.rows;
+            groups.items[if (under) 0 else index].cell_count += (tagLayerCellCount(g, layer) + 1) * layer.rows;
         }
     }
-    var cell_next: [pardes.MAX_PANES * 2 + 1]u32 = @splat(0);
+    var cell_next: [pardes.MAX_PANES * 2 + 4]u32 = @splat(0);
     var cell_total: u32 = 0;
-    for (paint_plan.batches[0..paint_plan.len], 0..) |*batch, batch_index| {
-        batch.cell_start = cell_total;
-        cell_next[batch_index] = cell_total;
-        cell_total = std.math.add(u32, cell_total, batch.cell_count) catch return error.GpuCapacity;
-    }
-    if (cell_total != 0) {
-        const capacity = std.math.add(u32, cell_total, cells) catch return error.GpuCapacity;
+    for (groups.items[0..groups.len], 0..) |*group, index| {
+        group.cell_start = cell_total;
+        cell_next[index] = cell_total;
+        cell_total = std.math.add(u32, cell_total, group.cell_count) catch return error.GpuCapacity;
+    }
+    const decor_len: u32 = @intCast(g.decor.items.len);
+    if (cell_total != 0 or decor_len != 0) {
+        const capacity = std.math.add(u32, cell_total, cells + decor_len) catch return error.GpuCapacity;
         try ensureVbuf(g, capacity);
 
         const vptr: [*]u8 = @ptrCast(c.SDL_MapGPUTransferBuffer(g.device, g.vxfer.?, false) orelse {
@@ -5239,45 +5379,40 @@ fn renderFrame(
         row = 0;
         while (row < surface.rows) : (row += 1) {
             const line = surface.cells[@as(usize, row) * surface.cols ..][0..surface.cols];
+            const line_cover = covered[@as(usize, row) * surface.cols ..][0..surface.cols];
             const line_cursor: ?usize = if (surface.cursor) |cu| if (cu.y == row) cu.x else null else null;
             var col: u16 = 0;
             while (col < surface.cols) : (col += 1) {
-                if (covered[@as(usize, row) * surface.cols + col]) continue;
-                const batch_index = paintBatchAt(&paint_plan, col, row);
-                const track = paint_plan.batches[batch_index].track;
-                const logical_idx: u32 = @as(u32, row) * surface.cols + col;
-                const data_effect = if (track) |active|
-                    active.effect == .dissolve
-                else
-                    false;
-                const data_diff = data_effect and gripCellChanged(surface, col, row);
-                if (data_diff) {
-                    emitSurfaceCell(
-                        g,
-                        core,
-                        instances,
-                        &cell_next[batch_index],
-                        col,
-                        row,
-                        layout,
-                        win_w,
-                        win_h,
-                        track,
-                        surface.previous_cells[@as(usize, row) * surface.cols ..][0..surface.cols],
-                        col,
-                        null,
-                        &tagline_base,
-                        paneGripCell(surface.previous_tag_layers, surface.previous_cells, surface.cols, col, row),
-                        true,
-                        false,
-                        page,
-                    );
-                }
+                const at = @as(usize, row) * surface.cols + col;
+                if (covered[at].layer and !covered[at].floating) continue;
+                const group_index = if (covered[at].floating) groups.guides else groupAt(&groups, col, row);
+                const track = groups.items[group_index].track;
+                const data_effect = if (track) |active| active.effect == .dissolve else false;
+                const data_diff = data_effect and gripCellChanged(surface, covered, previous_covered, col, row);
+                if (data_diff) emitSurfaceCell(
+                    g,
+                    chrome,
+                    instances,
+                    &cell_next[group_index],
+                    col,
+                    row,
+                    layout,
+                    win_w,
+                    win_h,
+                    track,
+                    surface.previous_cells[@as(usize, row) * surface.cols ..][0..surface.cols],
+                    previous_covered[@as(usize, row) * surface.cols ..][0..surface.cols],
+                    col,
+                    null,
+                    true,
+                    false,
+                    page,
+                );
                 emitSurfaceCell(
                     g,
-                    core,
+                    chrome,
                     instances,
-                    &cell_next[batch_index],
+                    &cell_next[group_index],
                     col,
                     row,
                     layout,
@@ -5285,12 +5420,11 @@ fn renderFrame(
                     win_h,
                     if (data_effect and !data_diff) null else track,
                     line,
+                    line_cover,
                     col,
                     line_cursor,
-                    &tagline_base,
-                    paneGripCell(surface.tagLayers(), surface.cells, surface.cols, col, row),
                     false,
-                    paint_plan.len == 1 and logical_idx == cursor_idx and !cursor_bar and bodyLayerAt(surface, col, row) == null,
+                    cursors_shown and at == cursor_idx and !cursor_bar and bodyLayerAt(surface, col, row) == null,
                     page,
                 );
             }
@@ -5299,36 +5433,36 @@ fn renderFrame(
         // is a tag layer, and instances paint in emission order.
         for (surface.bodyLayers()) |*layer| {
             if (layer.rows == 0) continue;
-            const batch_index = paintBatchAt(&paint_plan, layer.viewport.x, layer.viewport.y);
-            emitBodyLayer(g, instances, &cell_next[batch_index], layer, win_w, win_h, paint_plan.batches[batch_index].track, page, paint_plan.len == 1, false, topbar_pane_border_rgb);
+            const group_index = groupAt(&groups, layer.viewport.x, layer.viewport.y);
+            emitBodyLayer(g, instances, &cell_next[group_index], layer, win_w, win_h, groups.items[group_index].track, page, cursors_shown, false, chrome.topbar_rule);
         }
         for (surface.tagLayers()) |*layer| {
             if (layer.rows == 0) continue;
-            const batch_index = paintBatchAt(&paint_plan, layer.viewport.x, layer.viewport.y);
-            emitTagLayer(g, instances, &cell_next[batch_index], layer, win_w, win_h, paint_plan.batches[batch_index].track, page, paint_plan.len == 1, false);
+            const track_index = groupAt(&groups, layer.viewport.x, layer.viewport.y);
+            // A notice floats over the panes, moving with its own.
+            const group_index = if (layer.kind == .notice) groups.notices else track_index;
+            emitTagLayer(g, instances, &cell_next[group_index], layer, win_w, win_h, groups.items[track_index].track, page, cursors_shown, false);
         }
-        for (paint_plan.batches[1..paint_plan.len], 1..) |batch, batch_index| {
-            const track = batch.track.?;
+        for (groups.items[1..][0..groups.tracks], 1..) |group, index| {
+            const track = group.track.?;
             const under = track.effect == .vertical and track.phase == .opening;
             if (!under and track.phase != .closing and track.effect != .dissolve) continue;
             for (surface.previous_tag_layers) |*layer| {
                 if (layer.rows == 0 or layer.kind != .pane or layer.serial != track.serial) continue;
-                const destination: usize = if (under) 0 else batch_index;
-                emitTagLayer(g, instances, &cell_next[destination], layer, win_w, win_h, if (under) null else track, page, false, track.effect == .dissolve);
+                emitTagLayer(g, instances, &cell_next[if (under) 0 else index], layer, win_w, win_h, if (under) null else track, page, false, track.effect == .dissolve);
             }
         }
-        for (paint_plan.batches[1..paint_plan.len], 1..) |batch, batch_index| {
-            const track = batch.track.?;
+        for (groups.items[1..][0..groups.tracks], 1..) |group, index| {
+            const track = group.track.?;
             const under = track.effect == .vertical and track.phase == .opening;
             if (!under and track.phase != .closing and track.effect != .dissolve) continue;
             for (surface.previous_body_layers) |*layer| {
                 if (layer.rows == 0 or layer.serial != track.serial) continue;
-                const destination: usize = if (under) 0 else batch_index;
-                emitBodyLayer(g, instances, &cell_next[destination], layer, win_w, win_h, if (under) null else track, page, false, track.effect == .dissolve, topbar_pane_border_rgb);
+                emitBodyLayer(g, instances, &cell_next[if (under) 0 else index], layer, win_w, win_h, if (under) null else track, page, false, track.effect == .dissolve, chrome.topbar_rule);
             }
         }
-        for (paint_plan.batches[1..paint_plan.len], 1..) |batch, batch_index| {
-            const track = batch.track.?;
+        for (groups.items[1..][0..groups.tracks], 1..) |group, index| {
+            const track = group.track.?;
             const duplicate_under = track.effect == .vertical and track.phase == .opening;
             if (!duplicate_under and track.phase != .closing) continue;
             row = 0;
@@ -5336,13 +5470,12 @@ fn renderFrame(
                 var col: u16 = 0;
                 while (col < surface.cols) : (col += 1) {
                     if (!boxContains(track.contentBox(), col, row)) continue;
-                    if (previous_covered[@as(usize, row) * surface.cols + col]) continue;
-                    const destination: usize = if (duplicate_under) 0 else batch_index;
+                    if (previous_covered[@as(usize, row) * surface.cols + col].layer) continue;
                     emitSurfaceCell(
                         g,
-                        core,
+                        chrome,
                         instances,
-                        &cell_next[destination],
+                        &cell_next[if (duplicate_under) 0 else index],
                         col,
                         row,
                         layout,
@@ -5350,10 +5483,9 @@ fn renderFrame(
                         win_h,
                         if (duplicate_under) null else track,
                         surface.previous_cells[@as(usize, row) * surface.cols ..][0..surface.cols],
+                        previous_covered[@as(usize, row) * surface.cols ..][0..surface.cols],
                         col,
                         null,
-                        &tagline_base,
-                        paneGripCell(surface.previous_tag_layers, surface.previous_cells, surface.cols, col, row),
                         false,
                         false,
                         page,
@@ -5361,57 +5493,56 @@ fn renderFrame(
                 }
             }
         }
-        for (paint_plan.batches[0..paint_plan.len], 0..) |batch, batch_index|
-            std.debug.assert(cell_next[batch_index] == batch.cell_start + batch.cell_count);
+        for (groups.items[0..groups.len], 0..) |group, index|
+            std.debug.assert(cell_next[index] == group.cell_start + group.cell_count);
         shifted = emitScrollRows(g, instances, cell_total, surface, layout, win_w, win_h, page);
+        @memcpy(instances[cell_total + shifted ..][0..decor_len], g.decor.items);
         c.SDL_UnmapGPUTransferBuffer(g.device, g.vxfer.?);
 
         if (g.atlas_dirty_top < g.atlas_dirty_bottom) uploadAtlas(g, cmd);
 
         const copy = c.SDL_BeginGPUCopyPass(cmd);
         const src = c.SDL_GPUTransferBufferLocation{ .transfer_buffer = g.vxfer.?, .offset = 0 };
-        const dst = c.SDL_GPUBufferRegion{ .buffer = g.vbuf.?, .offset = 0, .size = (cell_total + shifted) * @sizeOf(CellInstance) };
+        const dst = c.SDL_GPUBufferRegion{ .buffer = g.vbuf.?, .offset = 0, .size = (cell_total + shifted + decor_len) * @sizeOf(CellInstance) };
         c.SDL_UploadToGPUBuffer(copy, &src, &dst, false);
         c.SDL_EndGPUCopyPass(copy);
     }
 
+    build_zone.end();
+    building = false;
     const rp = c.SDL_BeginGPURenderPass(cmd, &color_target, 1, null);
     pushLayerOpacity(cmd, rp, background_opacity);
     const whole = c.SDL_Rect{ .x = 0, .y = 0, .w = @intCast(sw), .h = @intCast(sh) };
-    for (paint_plan.batches[0..paint_plan.len], 0..) |batch, batch_index| {
-        const has_shifted = batch_index == 0 and shifted != 0;
-        if ((batch.cell_count != 0 or has_shifted) and g.vbuf != null) {
+    const decor_base = cell_total + shifted;
+    for (groups.items[0..groups.len], 0..) |group, index| {
+        const has_shifted = index == 0 and shifted != 0;
+        if ((group.cell_count != 0 or has_shifted) and g.vbuf != null) {
             c.SDL_BindGPUGraphicsPipeline(rp, g.pipeline);
             const samp_binding = c.SDL_GPUTextureSamplerBinding{ .texture = g.atlas_tex, .sampler = g.atlas_sampler };
             c.SDL_BindGPUFragmentSamplers(rp, 0, &samp_binding, 1);
-            if (batch.cell_count != 0) {
-                const panel_clipped = if (batch.track) |active| active.effect == .vertical else false;
-                if (panel_clipped) {
-                    const clip = panelBoxScissor(g, batch.track.?.contentBox(), sw, sh);
-                    c.SDL_SetGPUScissor(rp, &clip);
-                }
-                const binding = c.SDL_GPUBufferBinding{
-                    .buffer = g.vbuf.?,
-                    .offset = batch.cell_start * @sizeOf(CellInstance),
-                };
+            if (group.cell_count != 0) {
+                const binding = c.SDL_GPUBufferBinding{ .buffer = g.vbuf.?, .offset = group.cell_start * @sizeOf(CellInstance) };
                 c.SDL_BindGPUVertexBuffers(rp, 0, &binding, 1);
-                c.SDL_DrawGPUPrimitives(rp, 6, batch.cell_count, 0, 0);
-                if (panel_clipped) c.SDL_SetGPUScissor(rp, &whole);
+                c.SDL_DrawGPUPrimitives(rp, 6, group.cell_count, 0, 0);
             }
             if (has_shifted) {
                 const clip = scrollScissor(g, layout, sw, sh);
                 c.SDL_SetGPUScissor(rp, &clip);
-                const binding = c.SDL_GPUBufferBinding{
-                    .buffer = g.vbuf.?,
-                    .offset = cell_total * @sizeOf(CellInstance),
-                };
+                const binding = c.SDL_GPUBufferBinding{ .buffer = g.vbuf.?, .offset = cell_total * @sizeOf(CellInstance) };
                 c.SDL_BindGPUVertexBuffers(rp, 0, &binding, 1);
                 c.SDL_DrawGPUPrimitives(rp, 6, shifted, 0, 0);
                 c.SDL_SetGPUScissor(rp, &whole);
             }
         }
-        if (batch.image_count != 0)
-            drawNativeImagesGpu(g, rp, surface, &paint_plan, batch_index);
+        if (group.image_count != 0) drawNativeImagesGpu(g, rp, surface, group, whole);
+        if (group.decor_count != 0 and g.vbuf != null) {
+            c.SDL_BindGPUGraphicsPipeline(rp, g.decor_pipeline);
+            // Ink keeps its colour at any WindowOpacity.
+            pushLayerOpacity(cmd, rp, if (index == groups.ink) 1 else background_opacity);
+            const binding = c.SDL_GPUBufferBinding{ .buffer = g.vbuf.?, .offset = (decor_base + group.decor_start) * @sizeOf(CellInstance) };
+            c.SDL_BindGPUVertexBuffers(rp, 0, &binding, 1);
+            c.SDL_DrawGPUPrimitives(rp, 6, group.decor_count, 0, 0);
+        }
     }
     drawOverlayGpu(g, cmd, rp, overlay_count);
     c.SDL_EndGPURenderPass(rp);
@@ -5455,23 +5586,23 @@ fn renderFrame(
     }
     if (g.capture) {
         command_consumed = true;
-        try captureFrame(g, gpa, cmd, target, sw, sh);
+        try captureFrame(g, gpa, cmd, target, sw, sh, if (groups.tracks != 0) groups.items[1].track.?.frame else null);
         g.presented_scene = rendered_scene;
-        if (paint_plan.len == 1) rememberPresentedImages(g, gpa, surface);
+        if (groups.tracks == 0) rememberPresentedImages(g, gpa, surface);
         return true;
     }
     if (g.soft_present) {
         command_consumed = true;
         try softPresentFrame(g, cmd, target, sw, sh);
         g.presented_scene = rendered_scene;
-        if (paint_plan.len == 1) rememberPresentedImages(g, gpa, surface);
+        if (groups.tracks == 0) rememberPresentedImages(g, gpa, surface);
         return true;
     }
     command_consumed = true;
     const submitted = c.SDL_SubmitGPUCommandBuffer(cmd);
     if (submitted) {
         g.presented_scene = rendered_scene;
-        if (paint_plan.len == 1) rememberPresentedImages(g, gpa, surface);
+        if (groups.tracks == 0) rememberPresentedImages(g, gpa, surface);
     }
     return submitted;
 }
@@ -5487,24 +5618,6 @@ const ResolvedCell = struct {
 const topbarPaneBorderPixels = pardes.topbarPaneBorderPixels;
 const taglineBandOffset = pardes.taglineBandOffset;
 
-fn topbarPaneBorderHeight(surface: *const pardes.Surface, top: u16, cell_h: u32, tagline_h: u32) ?u32 {
-    if (top == 0 or surface.rows <= top) return null;
-    const height = topbarPaneBorderPixels(cell_h, tagline_h);
-    if (height == 0) return null;
-    const base = @as(usize, top) * surface.cols;
-    for (surface.cells[base..][0..surface.cols]) |cell|
-        if (!cell.default and cell.style.font_role == .tagline) return height;
-    return null;
-}
-
-fn bottomTaglinePresent(surface: *const pardes.Surface) bool {
-    if (surface.rows == 0) return false;
-    const base = @as(usize, surface.rows - 1) * surface.cols;
-    for (surface.cells[base..][0..surface.cols]) |cell|
-        if (!cell.default and cell.style.font_role == .tagline) return true;
-    return false;
-}
-
 test "tagline bands center in their cells and Tagbottom faces the window edge" {
     const cell_h: u32 = 20;
     const tagline_h: u32 = 16;
@@ -5587,40 +5700,6 @@ fn cellInstanceCount(cell: *const pardes.Cell) u32 {
     return if (cellFontRole(cell) == .tagline) 2 else 1;
 }
 
-fn taglineBaseRgb(core: *const pardes.Pardes, col: u16, row: u16) [3]u8 {
-    const chrome = core.chromeTheme();
-    if (!core.settings.focus_tint) return chrome.tag_bg;
-    if (row >= core.topBarHeight() and row < core.topBarHeight() + core.columnBarHeight()) {
-        for (0..core.ncol) |column| for (core.col_panes[column][0..core.col_n[column]]) |id| {
-            if (id != core.active) continue;
-            const x = core.col_x[column];
-            if (col >= x and col - x < core.col_w[column]) return chrome.tag_active_bg;
-        };
-    }
-    const r = core.rects[core.active];
-    const pane = core.panes[core.active] orelse return chrome.tag_bg;
-    const tag_y = core.tagTop(pane, r);
-    return if (r.h > 0 and row >= tag_y and row < tag_y + pane.tag_rows and col >= r.x and col - r.x < r.w) chrome.tag_active_bg else chrome.tag_bg;
-}
-
-test "compact column and pane underlays share focus tint without tinting the global tag" {
-    const core = try pardes.Pardes.init(std.testing.allocator, .{ .cols = 120, .rows = 24 });
-    defer core.deinit();
-    _ = try core.newShell(1, "");
-    try std.testing.expect(pardes.layout.splitColumn(core, 0, 1, false));
-    pardes.test_api.sync(core);
-    core.active = 1;
-    const active = core.rects[1];
-    const inactive = core.rects[0];
-    const chrome = core.chromeTheme();
-    try std.testing.expectEqual(chrome.tag_bg, taglineBaseRgb(core, active.x, 0));
-    try std.testing.expectEqual(chrome.tag_active_bg, taglineBaseRgb(core, active.x, pardes.TOPBAR_H));
-    try std.testing.expectEqual(chrome.tag_bg, taglineBaseRgb(core, inactive.x, pardes.TOPBAR_H));
-    try std.testing.expectEqual(chrome.tag_active_bg, taglineBaseRgb(core, active.x, active.y));
-    core.settings.focus_tint = false;
-    try std.testing.expectEqual(chrome.tag_bg, taglineBaseRgb(core, active.x, pardes.TOPBAR_H));
-}
-
 fn tagLayerIn(layers: []const pardes.Layer, col: u16, row: u16) ?*const pardes.Layer {
     for (layers) |*layer| {
         const r = layer.viewport;
@@ -5629,34 +5708,10 @@ fn tagLayerIn(layers: []const pardes.Layer, col: u16, row: u16) ?*const pardes.L
     return null;
 }
 
-/// Marks the grid cells a body or tag layer covers, which the layers paint
-/// themselves: the grid's cell loops skip them. Filling each layer's rectangle
-/// once replaces scanning every layer for every cell, which was a third of the
-/// gui's CPU on a full screen of text. It marks exactly the cells bodyLayerIn
-/// and tagLayerIn find a layer for: a tag layer covers its rows, and a
-/// viewport past the grid covers the grid's part of it.
-fn coverLayers(cover: []bool, cols: u16, rows: u16, body_layers: []const pardes.Layer, tag_layers: []const pardes.Layer) void {
-    @memset(cover, false);
-    for (body_layers) |*layer| {
-        const r = layer.viewport;
-        const right = @min(cols, @as(u32, r.x) + r.w);
-        if (layer.rows == 0 or r.x >= right) continue;
-        var y: u32 = r.y;
-        while (y < @min(rows, @as(u32, r.y) + r.h)) : (y += 1) @memset(cover[y * cols ..][r.x..right], true);
-    }
-    for (tag_layers) |*layer| {
-        const r = layer.viewport;
-        const right = @min(cols, @as(u32, r.x) + r.w);
-        if (layer.rows == 0 or r.x >= right) continue;
-        var y: u32 = r.y;
-        while (y < @min(rows, @as(u32, r.y) + layer.rows)) : (y += 1) @memset(cover[y * cols ..][r.x..right], true);
-    }
-}
-
-fn expectCoverIsScan(cover: []const bool, cols: u16, rows: u16, body_layers: []const pardes.Layer, tag_layers: []const pardes.Layer) !void {
+fn expectCoverIsScan(cover: []const Cover, cols: u16, rows: u16, body_layers: []const pardes.Layer, tag_layers: []const pardes.Layer) !void {
     for (0..rows) |row| for (0..cols) |col| {
         const scan = bodyLayerIn(body_layers, @intCast(col), @intCast(row)) != null or tagLayerIn(tag_layers, @intCast(col), @intCast(row)) != null;
-        try std.testing.expectEqual(scan, cover[row * cols + col]);
+        try std.testing.expectEqual(scan, cover[row * cols + col].layer);
     };
 }
 
@@ -5670,7 +5725,7 @@ test "the layer cover is the per-cell layer scan, over a core's layouts and rand
     try std.testing.expect(pardes.layout.splitColumn(core, 0, 1, false));
     pardes.layout.insert(core, 1, 1, 2);
     pardes.layout.insert(core, 0, 1, 3);
-    var cover: [97 * 31]bool = undefined;
+    var cover: [97 * 31]Cover = undefined;
     var notices = false;
     for (0..32) |step| {
         core.settings.tag_bottom = step & 1 != 0;
@@ -5683,9 +5738,20 @@ test "the layer cover is the per-cell layer scan, over a core's layouts and rand
         }
         const s = try core.render(core.scratch.allocator());
         try std.testing.expectEqual(@as(usize, cover.len), @as(usize, s.cols) * s.rows);
-        @memset(&cover, true); // what an earlier frame left
-        coverLayers(&cover, s.cols, s.rows, s.bodyLayers(), s.tagLayers());
+        @memset(&cover, .{ .layer = true, .floating = true, .grip = true, .focus = true }); // what an earlier frame left
+        coverFrame(&cover, s.cols, s.rows, s.bodyLayers(), s.tagLayers(), s.regionList());
         try expectCoverIsScan(&cover, s.cols, s.rows, s.bodyLayers(), s.tagLayers());
+        // A grip's cells know their way to its glyph, and the focused
+        // pane's tag rows are the focused ones.
+        for (s.regionList()) |region| {
+            if (region.kind != .grip) continue;
+            for (0..region.rect.w) |offset| {
+                const cell = cover[@as(usize, region.rect.y) * s.cols + region.rect.x + offset];
+                try std.testing.expect(cell.grip);
+                try std.testing.expectEqual(offset, cell.grip_offset);
+                try std.testing.expectEqual(region.owner == core.active, cell.focus);
+            }
+        }
         for (s.tagLayers()) |layer| notices = notices or (layer.rows != 0 and layer.kind == .notice);
     }
     try std.testing.expect(notices);
@@ -5705,18 +5771,18 @@ test "the layer cover is the per-cell layer scan, over a core's layouts and rand
     const random = prng.random();
     var body: [pardes.MAX_PANES]pardes.Layer = undefined;
     var tag: [pardes.MAX_TAG_LAYERS]pardes.Layer = undefined;
-    var grid: [64 * 40]bool = undefined;
+    var grid: [64 * 40]Cover = undefined;
     for (0..3000) |_| {
         const cols = random.intRangeAtMost(u16, 1, 64);
         const rows = random.intRangeAtMost(u16, 1, 40);
         const empty = random.intRangeAtMost(u8, 2, 5); // about one layer in `empty` is empty
         for (&body) |*layer| layer.* = .{ .rows = @intFromBool(random.uintLessThan(u8, empty) != 0), .viewport = gen.rect(random, cols, rows) };
-        for (&tag) |*layer| layer.* = .{ .cols = @intFromBool(random.uintLessThan(u8, empty) != 0), .viewport = gen.rect(random, cols, rows) };
+        for (&tag) |*layer| layer.* = .{ .rows = @intFromBool(random.uintLessThan(u8, empty) != 0), .viewport = gen.rect(random, cols, rows) };
         const bodies = body[0..random.uintAtMost(usize, body.len)];
         const tags = tag[0..random.uintAtMost(usize, tag.len)];
         const cells = grid[0 .. @as(usize, cols) * rows];
-        @memset(cells, random.boolean());
-        coverLayers(cells, cols, rows, bodies, tags);
+        @memset(cells, .{ .layer = random.boolean() });
+        coverFrame(cells, cols, rows, bodies, tags, &.{});
         try expectCoverIsScan(cells, cols, rows, bodies, tags);
     }
 }
@@ -5844,42 +5910,23 @@ fn emitBodyLayer(g: *Gui, instances: [*]CellInstance, next: *u32, layer: *const
     }
 }
 
-const GripCell = struct { cell: *const pardes.Cell, offset: u16 };
-
-fn gripCellChanged(surface: *const pardes.Surface, col: u16, row: u16) bool {
+/// A dissolving cell changes with its grip's glyph, which is the cell its
+/// grip offset to the left, in this frame's grip or the last one's.
+fn gripCellChanged(surface: *const pardes.Surface, covered: []const Cover, previous_covered: []const Cover, col: u16, row: u16) bool {
     if (surface.panelCellChanged(col, row)) return true;
-    if (paneGripCell(surface.tagLayers(), surface.cells, surface.cols, col, row)) |grip| {
-        if (surface.panelCellChanged(col - grip.offset, row)) return true;
-    }
-    if (paneGripCell(surface.previous_tag_layers, surface.previous_cells, surface.cols, col, row)) |grip| {
-        if (surface.panelCellChanged(col - grip.offset, row)) return true;
-    }
+    const at = @as(usize, row) * surface.cols + col;
+    for ([_]Cover{ covered[at], previous_covered[at] }) |cover|
+        if (cover.grip and surface.panelCellChanged(col -| cover.grip_offset, row)) return true;
     return false;
 }
 
-fn paneGripCell(layers: []const pardes.Layer, cells: []const pardes.Cell, cols: u16, col: u16, row: u16) ?GripCell {
-    const at = @as(usize, row) * cols + col;
-    if (at >= cells.len or cells[at].default or cells[at].style.font_role != .tagline) return null;
-    for (layers) |layer| {
-        if (layer.rows == 0 or layer.kind != .pane or layer.viewport.x < pardes.TAG_TEXT_INSET or row < layer.viewport.y or row - layer.viewport.y >= layer.rows) continue;
-        const x = layer.viewport.x - pardes.TAG_TEXT_INSET;
-        if (col < x or col - x >= config.GUTTER) continue;
-        const index = @as(usize, row) * cols + x;
-        if (index >= cells.len) return null;
-        const cell = &cells[index];
-        if (cell.default or cell.printableAscii() == ' ' or cell.style.invisible) return null;
-        return .{ .cell = cell, .offset = col - x };
-    }
-    return null;
-}
-
 fn anchorInset(g: *const Gui, row: u16, win_h: f32) u32 {
     return taglineBandOffset(row, win_h, g.cell_h, g.tagline_height);
 }
 
 fn emitSurfaceCell(
     g: *Gui,
-    core: ?*const pardes.Pardes,
+    chrome: *const pardes.Chrome,
     instances: [*]CellInstance,
     next: *u32,
     col: u16,
@@ -5889,18 +5936,20 @@ fn emitSurfaceCell(
     win_h: f32,
     track: ?pardes.animation.Track,
     line: []const pardes.Cell,
+    line_cover: []const Cover,
     at: usize,
     cursor: ?usize,
-    tagline_base: *const pardes.Cell,
-    grip: ?GripCell,
     old_layer: bool,
     is_cursor: bool,
     page: Ground,
 ) void {
     const role = cellFontRole(&line[at]);
     if (role == .tagline) {
-        var band_base = tagline_base.*;
-        if (core) |p| band_base.style.bg = .{ .rgb = taglineBaseRgb(p, col, row) };
+        const here = line_cover[at];
+        const band_base: pardes.Cell = .{
+            .style = .{ .bg = .{ .rgb = if (here.focus) chrome.tag_focus_bg else chrome.tag_bg }, .font_role = .tagline },
+            .default = false,
+        };
         // The smaller font changes the ink, not the chrome's coverage. Painting
         // this underlay at tagline height leaves page-colored gutters between
         // adjacent workspace, column and pane tags at TaglineSize < 100.
@@ -5908,27 +5957,32 @@ fn emitSurfaceCell(
         next.* += 1;
         // Tag glyphs keep their font size inside a full physical-width grip.
         emitInstance(g, instances, next.*, col, row, body_layout, win_w, win_h, track, .tagline, line, at, cursor, old_layer, is_cursor, page);
+        // A grip's glyph is the cell at its left edge, and a blank one is
+        // no glyph: its marks are decor.
+        const glyph = &line[at - @min(here.grip_offset, at)];
+        const grip = here.grip and !glyph.default and glyph.printableAscii() != ' ' and !glyph.style.invisible;
+        const offset: u16 = if (grip) @min(here.grip_offset, at) else 0;
         // An anchor starts at its column's rule: its left edge is inset by
         // its top margin so the band frames it on the left as above and
         // below, and its mark moves right by half that to stay centered.
-        const inset: u32 = if (core) |p| if (std.mem.indexOfScalar(u16, p.col_x[0..p.ncol], col -| (if (grip) |indicator| indicator.offset else 0)) != null) anchorInset(g, row, win_h) else 0 else 0;
-        if (grip) |indicator| {
+        const inset: u32 = if (line_cover[at - offset].anchor) anchorInset(g, row, win_h) else 0;
+        if (grip) {
             // A grip is one glyph centered across the gutter, not text: it is
             // looked up by its codepoint's glyph, never shaped.
-            const drawn = glyphForCodepoint(g, cellCodepoint(indicator.cell));
-            const cached = cachedGlyph(g, .{ .face = drawn.face, .glyph = drawn.glyph, .role = .tagline, .decoration = GlyphDecoration.fromCell(indicator.cell), .centered = true });
+            const drawn = glyphForCodepoint(g, cellCodepoint(glyph));
+            const cached = cachedGlyph(g, .{ .face = drawn.face, .glyph = drawn.glyph, .role = .tagline, .decoration = GlyphDecoration.fromCell(glyph), .centered = true });
             const slot = cached orelse g.space_slot;
-            const offset: f32 = if (cached != null) @as(f32, @floatFromInt(@as(u32, indicator.offset) * g.cell_w)) - @as(f32, @floatFromInt(inset / 2)) else 0;
-            const resolved = resolveCell(g, indicator.cell[0..1], 0, null, .tagline, false, page);
+            const shift: f32 = if (cached != null) @as(f32, @floatFromInt(@as(u32, offset) * g.cell_w)) - @as(f32, @floatFromInt(inset / 2)) else 0;
+            const resolved = resolveCell(g, glyph[0..1], 0, null, .tagline, false, page);
             instances[next.*].fr = @as(f32, @floatFromInt(resolved.fg[0])) / 255;
             instances[next.*].fg = @as(f32, @floatFromInt(resolved.fg[1])) / 255;
             instances[next.*].fb = @as(f32, @floatFromInt(resolved.fg[2])) / 255;
-            instances[next.*].u0 = (@as(f32, @floatFromInt(slot.u)) + offset) / atlas_w;
+            instances[next.*].u0 = (@as(f32, @floatFromInt(slot.u)) + shift) / atlas_w;
             instances[next.*].v0 = @as(f32, @floatFromInt(slot.v)) / atlas_h;
             instances[next.*].v1 = @as(f32, @floatFromInt(slot.v + g.tagline_height)) / atlas_h;
         }
         instances[next.*].u1 = instances[next.*].u0 + @as(f32, @floatFromInt(g.cell_w)) / atlas_w;
-        if (inset > 0 and (grip == null or grip.?.offset == 0)) {
+        if (inset > 0 and (!grip or offset == 0)) {
             instances[next.*].x0 += @as(f32, @floatFromInt(inset)) / win_w * 2;
             instances[next.*].u0 += @as(f32, @floatFromInt(inset)) / atlas_w;
         }
@@ -5940,8 +5994,7 @@ fn emitSurfaceCell(
 }
 
 test "small tagline fonts leave no background gutters between adjacent tags" {
-    const core = try pardes.Pardes.init(std.testing.allocator, .{ .cols = 80, .rows = 24 });
-    defer core.deinit();
+    const chrome: pardes.Chrome = .{};
     var g: Gui = undefined;
     g.words = .{};
     g.cell_w = 10;
@@ -5954,7 +6007,7 @@ test "small tagline fonts leave no background gutters between adjacent tags" {
     var next: u32 = 0;
     for (0..3) |row| {
         // Column 1: past the anchor's inset edge at the column's left.
-        emitSurfaceCell(&g, core, &instances, &next, 1, @intCast(row), fixedCellLayout(&g), 800, 480, null, (&cell)[0..1], 0, null, &cell, null, false, false, Ground.opaqueRgb(bg_default));
+        emitSurfaceCell(&g, &chrome, &instances, &next, 1, @intCast(row), fixedCellLayout(&g), 800, 480, null, (&cell)[0..1], &.{.{}}, 0, null, false, false, Ground.opaqueRgb(bg_default));
         const base = instances[row * 2];
         const ink = instances[row * 2 + 1];
         try std.testing.expectApproxEqAbs(@as(f32, 20.0 / 480.0 * 2), base.y0 - base.y1, 0.0001);
@@ -5967,12 +6020,12 @@ test "small tagline fonts leave no background gutters between adjacent tags" {
     // Column 0 is an anchor's edge: its ink is inset by the band's margin
     // (2 px here) and its underlay still covers the whole cell.
     next = 0;
-    emitSurfaceCell(&g, core, &instances, &next, 0, 1, fixedCellLayout(&g), 800, 480, null, (&cell)[0..1], 0, null, &cell, null, false, false, Ground.opaqueRgb(bg_default));
+    emitSurfaceCell(&g, &chrome, &instances, &next, 0, 1, fixedCellLayout(&g), 800, 480, null, (&cell)[0..1], &.{.{ .anchor = true }}, 0, null, false, false, Ground.opaqueRgb(bg_default));
     try std.testing.expectApproxEqAbs(@as(f32, 10.0 / 800.0 * 2), instances[0].x1 - instances[0].x0, 0.0001);
     try std.testing.expectApproxEqAbs(@as(f32, 8.0 / 800.0 * 2), instances[1].x1 - instances[1].x0, 0.0001);
     try std.testing.expectApproxEqAbs(@as(f32, 8) / atlas_w, instances[1].u1 - instances[1].u0, 0.0001);
     next = 0;
-    emitSurfaceCell(&g, null, &instances, &next, 0, 2, fixedCellLayout(&g), 800, 480, null, (&cell)[0..1], 0, null, &cell, null, true, false, Ground.opaqueRgb(bg_default));
+    emitSurfaceCell(&g, &chrome, &instances, &next, 0, 2, fixedCellLayout(&g), 800, 480, null, (&cell)[0..1], &.{.{}}, 0, null, true, false, Ground.opaqueRgb(bg_default));
     try std.testing.expectEqual(@as(u32, 2), next);
     try std.testing.expectApproxEqAbs(@as(f32, 16.0 / 480.0 * 2), instances[1].y0 - instances[1].y1, 0.0001);
 }
@@ -6086,24 +6139,25 @@ test "insert cursor overlays without replacing the character beneath it" {
     };
     try std.testing.expectEqual(@as(u32, 'x'), cellCodepoint(&cell));
 
-    var vertices: [6]OverlayVertex = undefined;
-    var builder: OverlayBuilder = .{
-        .vertices = &vertices,
-        .win_w = 100,
-        .win_h = 100,
-    };
-    addCursorBar(&builder, 2, 3, true, 8, .{
-        .x_off = 0,
-        .y_off = 0,
-        .w = 10,
-        .h = 20,
-    }, .{ 32, 48, 64 });
-    try std.testing.expectEqual(@as(usize, 6), builder.len);
-    try std.testing.expectApproxEqAbs(@as(f32, -0.32), vertices[0].y, 0.0001);
-    try std.testing.expectApproxEqAbs(@as(f32, -0.48), vertices[2].y, 0.0001);
-    try std.testing.expectApproxEqAbs(@as(f32, 32.0 / 255.0), vertices[0].r, 0.0001);
-    for (vertices) |vertex| try std.testing.expectEqual(@as(u32, 1), vertex.ink);
-    try std.testing.expect(!builder.ink);
+    // A bar at a tag cell: tagline-tall, centered in its row, in the
+    // cell's ink, drawn as decor over it.
+    var cells: [25]pardes.Cell = @splat(.{});
+    cells[3 * 5 + 2] = .{ .default = false, .style = .{ .fg = .{ .rgb = .{ 32, 48, 64 } }, .font_role = .tagline } };
+    const surface: pardes.Surface = .{ .cols = 5, .rows = 5, .cells = &cells, .cursor = .{ .x = 2, .y = 3, .bar = true } };
+    var g: Gui = undefined;
+    g.decor = .empty;
+    defer g.decor.deinit(std.testing.allocator);
+    g.cell_w = 10;
+    g.cell_h = 20;
+    g.tagline_width = 8;
+    g.tagline_height = 8;
+    try cursorDecor(&g, std.testing.allocator, &surface, fixedCellLayout(&g), 100, 100);
+    try std.testing.expectEqual(@as(usize, 1), g.decor.items.len);
+    const bar = g.decor.items[0];
+    try std.testing.expectApproxEqAbs(@as(f32, -0.32), bar.y0, 0.0001);
+    try std.testing.expectApproxEqAbs(@as(f32, -0.48), bar.y1, 0.0001);
+    try std.testing.expectApproxEqAbs(@as(f32, 32.0 / 255.0), bar.br, 0.0001);
+    try std.testing.expectEqual(@as(f32, 1), bar.fr);
 }
 
 fn palColor(idx: u8) [3]u8 {
@@ -6613,17 +6667,24 @@ test "pane indicator halves share dissolve changes and safe exhausted atlas" {
     cells[0].text[0] = '$';
     var previous = cells;
     previous[0].text[0] = '^';
-    var layers = [_]pardes.Layer{.{ .kind = .pane, .serial = 1, .viewport = .{ .x = pardes.TAG_TEXT_INSET, .y = 0, .w = 3, .h = 1 }, .cols = 3, .rows = 1 }};
     var diffs: [12]pardes.PanelCellDiff = @splat(.unchanged);
     diffs[0] = pardes.PanelCellDiff.between(&previous[0], &cells[0]);
-    var surface: pardes.Surface = .{ .cols = 6, .rows = 2, .cells = &cells, .previous_cells = &previous, .previous_tag_layers = &layers, .cell_diffs = &diffs };
-    surface.tag_layers[0] = layers[0];
-    try std.testing.expect(gripCellChanged(&surface, 0, 0));
-    try std.testing.expect(gripCellChanged(&surface, 1, 0));
-    try std.testing.expect(!gripCellChanged(&surface, 2, 0));
-    try std.testing.expect(paneGripCell(surface.tagLayers(), &cells, 6, 2, 0) == null);
-    layers[0].kind = .column;
-    try std.testing.expect(paneGripCell(&layers, &cells, 6, 0, 0) == null);
+    const surface: pardes.Surface = .{ .cols = 6, .rows = 2, .cells = &cells, .previous_cells = &previous, .cell_diffs = &diffs };
+    // A grip two cells wide at the top left, in both frames.
+    const grip = [_]pardes.Region{.{ .kind = .grip, .serial = 1, .rect = .{ .x = 0, .y = 0, .w = 2, .h = 1 } }};
+    var cover: [12]Cover = undefined;
+    var previous_cover: [12]Cover = undefined;
+    coverFrame(&cover, 6, 2, &.{}, &.{}, &grip);
+    coverFrame(&previous_cover, 6, 2, &.{}, &.{}, &grip);
+    try std.testing.expect(gripCellChanged(&surface, &cover, &previous_cover, 0, 0));
+    try std.testing.expect(gripCellChanged(&surface, &cover, &previous_cover, 1, 0));
+    try std.testing.expect(!gripCellChanged(&surface, &cover, &previous_cover, 2, 0));
+    try std.testing.expect(!cover[2].grip);
+    // A column's grip has no glyph of a pane's.
+    coverFrame(&cover, 6, 2, &.{}, &.{}, &.{.{ .kind = .column_grip, .rect = .{ .x = 0, .y = 0, .w = 2, .h = 1 } }});
+    try std.testing.expect(!cover[0].grip);
+    coverFrame(&cover, 6, 2, &.{}, &.{}, &grip);
+    const chrome: pardes.Chrome = .{};
 
     const font = c.ui_font_new(font_ttf.ptr, @intCast(font_ttf.len)).?;
     defer c.ui_font_free(font);
@@ -6647,7 +6708,7 @@ test "pane indicator halves share dissolve changes and safe exhausted atlas" {
         var instances: [4]CellInstance = undefined;
         var next: u32 = 0;
         for (0..2) |col| {
-            emitSurfaceCell(&g, null, &instances, &next, @intCast(col), 0, fixedCellLayout(&g), 100, 100, null, cells[0..6], col, null, &cells[2], .{ .cell = &cells[0], .offset = @intCast(col) }, old, false, Ground.opaqueRgb(bg_default));
+            emitSurfaceCell(&g, &chrome, &instances, &next, @intCast(col), 0, fixedCellLayout(&g), 100, 100, null, cells[0..6], cover[0..6], col, null, old, false, Ground.opaqueRgb(bg_default));
             try std.testing.expectEqual(@as(f32, 0), instances[col * 2 + 1].u0);
             try std.testing.expectEqual(old, instances[col * 2 + 1].effect & old_layer_bit != 0);
         }
@@ -6802,10 +6863,12 @@ fn ensureVbuf(g: *Gui, cells: u32) !void {
     g.vbuf_cells = capacity;
 }
 
-fn makePipeline(device: *c.SDL_GPUDevice, color_format: c.SDL_GPUTextureFormat) !*c.SDL_GPUGraphicsPipeline {
+/// A pipeline over cell instances: the cells' own (ui.frag, the atlas, no
+/// blending) or the decor's (decor.frag, blended like the overlay).
+fn makePipeline(device: *c.SDL_GPUDevice, color_format: c.SDL_GPUTextureFormat, frag: []const u8, samplers: u32, blend: c.SDL_GPUColorTargetBlendState) !*c.SDL_GPUGraphicsPipeline {
     const vs = try makeShader(device, vert_spv, c.SDL_GPU_SHADERSTAGE_VERTEX, 0, 0);
     defer c.SDL_ReleaseGPUShader(device, vs);
-    const fs = try makeShader(device, frag_spv, c.SDL_GPU_SHADERSTAGE_FRAGMENT, 1, 1);
+    const fs = try makeShader(device, frag, c.SDL_GPU_SHADERSTAGE_FRAGMENT, samplers, 1);
     defer c.SDL_ReleaseGPUShader(device, fs);
 
     var vbuf_desc = c.SDL_GPUVertexBufferDescription{
@@ -6822,8 +6885,9 @@ fn makePipeline(device: *c.SDL_GPUDevice, color_format: c.SDL_GPUTextureFormat)
         .{ .location = 4, .buffer_slot = 0, .format = c.SDL_GPU_VERTEXELEMENTFORMAT_FLOAT4, .offset = @offsetOf(CellInstance, "panel_x0") },
         .{ .location = 5, .buffer_slot = 0, .format = c.SDL_GPU_VERTEXELEMENTFORMAT_FLOAT4, .offset = @offsetOf(CellInstance, "present_x0") },
         .{ .location = 6, .buffer_slot = 0, .format = c.SDL_GPU_VERTEXELEMENTFORMAT_UINT4, .offset = @offsetOf(CellInstance, "effect") },
+        .{ .location = 7, .buffer_slot = 0, .format = c.SDL_GPU_VERTEXELEMENTFORMAT_FLOAT4, .offset = @offsetOf(CellInstance, "clip_x0") },
     };
-    var col_desc = c.SDL_GPUColorTargetDescription{ .format = color_format, .blend_state = std.mem.zeroes(c.SDL_GPUColorTargetBlendState) };
+    var col_desc = c.SDL_GPUColorTargetDescription{ .format = color_format, .blend_state = blend };
 
     var info = std.mem.zeroes(c.SDL_GPUGraphicsPipelineCreateInfo);
     info.vertex_shader = vs;
@@ -7135,7 +7199,10 @@ fn latencyNote(comptime fmt: []const u8, args: anytype) void {
     _ = libc.write(latency_fd, line.ptr, line.len);
 }
 
-fn captureFrame(g: *Gui, gpa: std.mem.Allocator, cmd: *c.SDL_GPUCommandBuffer, target: *c.SDL_GPUTexture, sw: u32, sh: u32) !void {
+/// Writes the frame to latest.ppm in the capture directory, and a panel
+/// transition's frame `transition` to transition-<frame>.ppm too, so a test
+/// can hold one partway (test/gui_golden.py).
+fn captureFrame(g: *Gui, gpa: std.mem.Allocator, cmd: *c.SDL_GPUCommandBuffer, target: *c.SDL_GPUTexture, sw: u32, sh: u32, transition: ?u16) !void {
     const size = c.SDL_CalculateGPUTextureFormatSize(g.swapchain_format, sw, sh, 1);
     if (size == 0) {
         _ = c.SDL_SubmitGPUCommandBuffer(cmd);
@@ -7168,10 +7235,12 @@ fn captureFrame(g: *Gui, gpa: std.mem.Allocator, cmd: *c.SDL_GPUCommandBuffer, t
     const mapped = c.SDL_MapGPUTransferBuffer(g.device, xfer, false) orelse return error.GpuMap;
     defer c.SDL_UnmapGPUTransferBuffer(g.device, xfer);
     const pixels: [*]const u8 = @ptrCast(mapped);
-    try writeCapturePpm(g, gpa, pixels[0..size], sw, sh);
+    try writeCapturePpm(g, gpa, pixels[0..size], sw, sh, "latest");
+    var name: [24]u8 = undefined;
+    if (transition) |frame| try writeCapturePpm(g, gpa, pixels[0..size], sw, sh, std.fmt.bufPrint(&name, "transition-{d}", .{frame}) catch unreachable);
 }
 
-fn writeCapturePpm(g: *Gui, gpa: std.mem.Allocator, pixels: []const u8, width: u32, height: u32) !void {
+fn writeCapturePpm(g: *Gui, gpa: std.mem.Allocator, pixels: []const u8, width: u32, height: u32, name: []const u8) !void {
     // A latency trace times frames, and an 8 MB file write per frame would
     // stall the loop it is timing.
     if (g.capture_dir.len == 0 or latency_fd >= 0) return;
@@ -7185,8 +7254,8 @@ fn writeCapturePpm(g: *Gui, gpa: std.mem.Allocator, pixels: []const u8, width: u
 
     var tmp_buf: [4096]u8 = undefined;
     var final_buf: [4096]u8 = undefined;
-    const tmp_path = std.fmt.bufPrintSentinel(&tmp_buf, "{s}/latest.ppm.tmp", .{g.capture_dir}, 0) catch return error.CapturePathTooLong;
-    const final_path = std.fmt.bufPrintSentinel(&final_buf, "{s}/latest.ppm", .{g.capture_dir}, 0) catch return error.CapturePathTooLong;
+    const tmp_path = std.fmt.bufPrintSentinel(&tmp_buf, "{s}/{s}.ppm.tmp", .{ g.capture_dir, name }, 0) catch return error.CapturePathTooLong;
+    const final_path = std.fmt.bufPrintSentinel(&final_buf, "{s}/{s}.ppm", .{ g.capture_dir, name }, 0) catch return error.CapturePathTooLong;
 
     const fd = libc.open(tmp_path, .{ .ACCMODE = .WRONLY, .CREAT = true, .TRUNC = true }, @as(libc.mode_t, 0o644));
     if (fd < 0) return error.CaptureWriteFailed;
@@ -7212,116 +7281,263 @@ fn writeCapturePpm(g: *Gui, gpa: std.mem.Allocator, pixels: []const u8, width: u
     if (libc.rename(tmp_path, final_path) != 0) return error.CaptureWriteFailed;
 }
 
-fn addCursorBar(
-    builder: *OverlayBuilder,
-    x: u16,
-    y: u16,
-    bar: bool,
-    visual_height: f32,
-    layout: CellLayout,
-    rgb: [3]u8,
-) void {
-    if (!bar) return;
-    const previous_ink = builder.ink;
-    builder.ink = true;
-    defer builder.ink = previous_ink;
-    const x0 = layout.x_off + @as(f32, @floatFromInt(x)) * layout.w;
-    const height = std.math.clamp(visual_height, 1.0, layout.h);
-    const y0 = layout.y_off + @as(f32, @floatFromInt(y)) * layout.h +
-        @as(f32, @floatFromInt(taglineBandOffset(y, builder.win_h, @intFromFloat(layout.h), @intFromFloat(height))));
-    builder.addRect(
-        x0,
-        y0,
-        x0 + @max(1.0, layout.w / 8.0),
-        y0 + height,
-        .{
-            .r = @as(f32, @floatFromInt(rgb[0])) / 255.0,
-            .g = @as(f32, @floatFromInt(rgb[1])) / 255.0,
-            .b = @as(f32, @floatFromInt(rgb[2])) / 255.0,
-            .a = 1.0,
-        },
-    );
+/// One flat, hard-edged rectangle of decor, in window pixels: clipped to the
+/// window and dropped when empty, as the triangle overlay drew it, and moved
+/// by `track` as its pane's cells are.
+fn addDecor(g: *Gui, gpa: std.mem.Allocator, x0_in: f32, y0_in: f32, x1_in: f32, y1_in: f32, rgb: [3]u8, alpha: f32, track: ?pardes.animation.Track, win_w: f32, win_h: f32) !void {
+    const x0 = std.math.clamp(@min(x0_in, x1_in), 0.0, win_w);
+    const x1 = std.math.clamp(@max(x0_in, x1_in), 0.0, win_w);
+    const y0 = std.math.clamp(@min(y0_in, y1_in), 0.0, win_h);
+    const y1 = std.math.clamp(@max(y0_in, y1_in), 0.0, win_h);
+    if (x1 <= x0 or y1 <= y0) return;
+    // decor.frag.glsl reads the colour from the ground and the coverage
+    // from the ink's red.
+    var instance: CellInstance = .{
+        .x0 = (x0 / win_w) * 2.0 - 1.0,
+        .y0 = 1.0 - (y0 / win_h) * 2.0,
+        .x1 = (x1 / win_w) * 2.0 - 1.0,
+        .y1 = 1.0 - (y1 / win_h) * 2.0,
+        .u0 = 0,
+        .v0 = 0,
+        .u1 = 0,
+        .v1 = 0,
+        .fr = alpha,
+        .fg = 0,
+        .fb = 0,
+        .br = @as(f32, @floatFromInt(rgb[0])) / 255.0,
+        .bg = @as(f32, @floatFromInt(rgb[1])) / 255.0,
+        .bb = @as(f32, @floatFromInt(rgb[2])) / 255.0,
+    };
+    setTransitionFields(&instance, track, fixedCellLayout(g), win_w, win_h, 0);
+    try g.decor.append(gpa, instance);
+}
+
+/// The frame's decor, group by group (docs/render-pipeline.md §3.4), all of it
+/// read from the regions and the palette: the page's rules and the still
+/// panes' rails, rules and grip marks in tier 0, a moving or closing pane's
+/// in its track's group, notice rules in tier 4, bar cursors in tier 5.
+fn buildDecor(g: *Gui, gpa: std.mem.Allocator, surface: *const pardes.Surface, groups: *Groups, layout: CellLayout, win_w: f32, win_h: f32, cursors_shown: bool) !void {
+    g.decor.clearRetainingCapacity();
+    const chrome = &surface.chrome;
+    const regions = surface.regionList();
+    for (groups.items[0..groups.len], 0..) |*group, index| {
+        group.decor_start = @intCast(g.decor.items.len);
+        defer group.decor_count = @as(u32, @intCast(g.decor.items.len)) - group.decor_start;
+        if (index == 0) {
+            const top = for (regions) |region| {
+                if (region.kind == .workspace_tag) break region.rect.h;
+            } else 0;
+            // The workspace tag is ruled off from the tags right under it.
+            const tag_under = for (regions) |region| switch (region.kind) {
+                .grip, .tag, .column_grip, .column_tag => if (region.rect.y == top) break true,
+                else => {},
+            } else false;
+            const height = topbarPaneBorderPixels(g.cell_h, g.tagline_height);
+            if (top != 0 and top < surface.rows and tag_under and height != 0) {
+                const y0: f32 = @floatFromInt(top * g.cell_h - height / 2);
+                try addDecor(g, gpa, 0, y0, win_w, y0 + @as(f32, @floatFromInt(height)), chrome.topbar_rule, 1, null, win_w, win_h);
+            }
+            // The column bar is ruled off from the panes under it.
+            for (regions) |bar| {
+                if (bar.kind != .column_grip) continue;
+                const y = @as(f32, @floatFromInt(bar.rect.y + bar.rect.h)) * layout.h;
+                try addDecor(g, gpa, 0, y - 1, win_w, y, chrome.border, 1, null, win_w, win_h);
+                break;
+            }
+            // A tag on the last row runs on through the pixels under the grid.
+            const grid_bottom = @as(f32, @floatFromInt(surface.rows)) * layout.h;
+            const tag_last = for (regions) |region| switch (region.kind) {
+                .grip, .tag, .column_grip, .column_tag, .workspace_tag => if (region.rect.h != 0 and region.rect.y + region.rect.h == surface.rows) break true,
+                else => {},
+            } else false;
+            if (grid_bottom < win_h and tag_last) try addDecor(g, gpa, 0, grid_bottom, win_w, win_h, chrome.tag_bg, 1, null, win_w, win_h);
+        }
+        if (index <= groups.tracks) {
+            const track = group.track;
+            // A closing pane is gone: its chrome is the last frame's.
+            const closing = if (track) |active| active.phase == .closing else false;
+            const placed = if (closing) surface.previous_regions else regions;
+            const grid = if (closing) surface.previous_cells else surface.cells;
+            try paneDecor(g, gpa, placed, groups, index, chrome, layout, surface.cols, surface.rows, win_w, win_h, track);
+            // A single spine runs down each column, through every tag and body.
+            if (index == 0) for (regions) |column| {
+                if (column.kind != .column) continue;
+                const x = @as(f32, @floatFromInt(column.rect.x)) * layout.w;
+                const y0 = @as(f32, @floatFromInt(column.rect.y)) * layout.h;
+                const grid_y1 = @as(f32, @floatFromInt(surface.rows)) * layout.h;
+                const y1 = if (win_h - grid_y1 < layout.h) @max(grid_y1, win_h) else grid_y1;
+                if (y1 > y0) try addDecor(g, gpa, x, y0, x + 1, y1, chrome.border, 1, null, win_w, win_h);
+            };
+            try gripDecor(g, gpa, placed, grid, groups, index, layout, surface.cols, surface.rows, win_w, win_h, track);
+        }
+        // A notice chip is tagline hung over the body's top rows, so it is
+        // ruled off from the text beneath it the way a tag is: the same
+        // colour and thickness along its bottom, running to the window's
+        // edge when it does, fading up and dissolving with its band.
+        if (index == groups.notices) for (surface.tagLayers()) |*layer| {
+            if (layer.rows == 0 or layer.kind != .notice) continue;
+            const x0 = @as(f32, @floatFromInt(layer.viewport.x)) * layout.w;
+            const x1 = x0 + @as(f32, @floatFromInt(layer.viewport.w)) * layout.w;
+            const rule_x1 = if (win_w - x1 < layout.w) @max(x1, win_w) else x1;
+            const top = @as(f32, @floatFromInt(layer.viewport.y)) * layout.h;
+            // A band still falling into place is cut at its row's top; its
+            // rule comes with it, and shows only once it is below that cut.
+            const rule_y = top + (1 + layer.slide) * layout.h;
+            if (rule_y - 1 < top) continue;
+            const track = groups.items[groupAt(groups, layer.viewport.x, layer.viewport.y)].track;
+            try addDecor(g, gpa, x0, rule_y - 1, rule_x1, rule_y, chrome.border, layer.fade, track, win_w, win_h);
+        };
+        if (index == groups.ink and cursors_shown) try cursorDecor(g, gpa, surface, layout, win_w, win_h);
+    }
+}
+
+/// Each pane's rule between its tag and body, and its scroll rail: a page
+/// coloured gutter with a thin track and its thumb, running down through the
+/// pixels past the last whole row. Only the panes of group `index`.
+fn paneDecor(g: *Gui, gpa: std.mem.Allocator, regions: []const pardes.Region, groups: *const Groups, index: usize, chrome: *const pardes.Chrome, layout: CellLayout, cols: u16, rows: u16, win_w: f32, win_h: f32, track: ?pardes.animation.Track) !void {
+    const page = chrome.page orelse bg_default;
+    for (regions) |rail| {
+        if (rail.kind != .rail or rail.rect.h == 0 or groupOf(groups, rail.serial) != index) continue;
+        const tag = for (regions) |region| {
+            if (region.kind == .tag and region.owner == rail.owner) break region;
+        } else continue;
+        if (@as(u32, tag.rect.x) + tag.rect.w > cols or @as(u32, tag.rect.y) + tag.rect.h > rows or
+            @as(u32, rail.rect.y) + rail.rect.h > rows) continue;
+        const x0 = @as(f32, @floatFromInt(rail.rect.x)) * layout.w;
+        const x1 = @as(f32, @floatFromInt(tag.rect.x + tag.rect.w)) * layout.w;
+        // Like the band above it, the rule of a pane at the right edge runs
+        // on through the pixels past the last whole cell. Under a tag on
+        // top, over one below its body.
+        const rule_x1 = if (win_w - x1 < layout.w) @max(x1, win_w) else x1;
+        const tag_bottom = tag.rect.y > rail.rect.y;
+        const rule_y = @as(f32, @floatFromInt(if (tag_bottom) tag.rect.y else tag.rect.y + tag.rect.h)) * layout.h;
+        try addDecor(g, gpa, x0, if (tag_bottom) rule_y else rule_y - 1, rule_x1, if (tag_bottom) rule_y + 1 else rule_y, chrome.border, 1, track, win_w, win_h);
+
+        const y0 = @as(f32, @floatFromInt(rail.rect.y)) * layout.h;
+        const body_end = rail.rect.y + rail.rect.h;
+        const body_y1 = @as(f32, @floatFromInt(body_end)) * layout.h;
+        const y1 = if (body_end == rows and win_h - body_y1 < layout.h) @max(body_y1, win_h) else body_y1;
+        try addDecor(g, gpa, x0, y0, x0 + layout.w, y1, page, 1, track, win_w, win_h);
+        try addDecor(g, gpa, x0, y0, x0 + @min(layout.w, 2), y1, chrome.scroll_track, 1, track, win_w, win_h);
+        if (rail.thumb_h != 0) {
+            const thumb_y0 = @as(f32, @floatFromInt(rail.rect.y + rail.thumb_y)) * layout.h;
+            const thumb_y1 = if (rail.thumb_y + rail.thumb_h == rail.rect.h) y1 else @as(f32, @floatFromInt(rail.rect.y + rail.thumb_y + rail.thumb_h)) * layout.h;
+            try addDecor(g, gpa, x0, thumb_y0, x0 + @min(layout.w, @max(2, @floor(layout.w * 0.5))), thumb_y1, chrome.scroll_thumb, 1, track, win_w, win_h);
+        }
+    }
 }
 
-fn buildOverlay(
-    g: *Gui,
-    core: ?*const pardes.Pardes,
-    surface: *const pardes.Surface,
-    layout: CellLayout,
-    sw: u32,
-    sh: u32,
-    topbar_pane_border_rgb: [3]u8,
-    tagline_rgb: [3]u8,
-    transient_on: bool,
-    debug_on: bool,
-) u32 {
-    if (g.overlay_vertices.len == 0 or sw == 0 or sh == 0) return 0;
-    const win_w: f32 = @floatFromInt(sw);
-    const win_h: f32 = @floatFromInt(sh);
-    var builder = OverlayBuilder{ .vertices = g.overlay_vertices, .win_w = win_w, .win_h = win_h };
-    appendWorkspacePet(g, core, surface, &builder);
-    // The workspace tag grows a row per line, so the border follows its foot.
-    const top_rows: u16 = if (core) |p| p.topBarHeight() else pardes.TOPBAR_H;
-    if (topbarPaneBorderHeight(surface, top_rows, g.cell_h, g.tagline_height)) |height| {
-        const y0: f32 = @floatFromInt(top_rows * g.cell_h - height / 2);
-        const rgb = topbar_pane_border_rgb;
-        builder.addRect(0, y0, win_w, y0 + @as(f32, @floatFromInt(height)), .{
-            .r = @as(f32, @floatFromInt(rgb[0])) / 255.0,
-            .g = @as(f32, @floatFromInt(rgb[1])) / 255.0,
-            .b = @as(f32, @floatFromInt(rgb[2])) / 255.0,
-            .a = 1.0,
-        });
+/// The two short bars on each row of a grip with no mode glyph there,
+/// centered in its anchor. Only the panes of group `index`.
+fn gripDecor(g: *Gui, gpa: std.mem.Allocator, regions: []const pardes.Region, cells: []const pardes.Cell, groups: *const Groups, index: usize, layout: CellLayout, cols: u16, rows: u16, win_w: f32, win_h: f32, track: ?pardes.animation.Track) !void {
+    if (g.tagline_height < 6 or g.tagline_width < 3) return;
+    for (regions) |grip| {
+        if (grip.kind != .grip or groupOf(groups, grip.serial) != index) continue;
+        const x = grip.rect.x;
+        for (0..grip.rect.h) |line| {
+            const y = grip.rect.y + @as(u16, @intCast(line));
+            if (x >= cols or y >= rows) continue;
+            const cell = &cells[@as(usize, y) * cols + x];
+            if (cell.default or cell.printableAscii() != ' ') continue;
+            const rgb = switch (cell.style.fg) {
+                .rgb => |rgb| rgb,
+                else => continue,
+            };
+            const center_x = (@as(f32, @floatFromInt(x)) + @as(f32, @floatFromInt(config.GUTTER)) / 2) * layout.w + @as(f32, @floatFromInt(anchorInset(g, y, win_h) / 2));
+            const center_y = @as(f32, @floatFromInt(y)) * layout.h + @as(f32, @floatFromInt(taglineBandOffset(y, win_h, g.cell_h, g.tagline_height))) + @as(f32, @floatFromInt(g.tagline_height)) / 2;
+            const half_w = @max(1, @min(3, layout.w - 2));
+            try addDecor(g, gpa, @floor(center_x - half_w), @floor(center_y - 2), @floor(center_x + half_w), @floor(center_y - 1), rgb, 1, track, win_w, win_h);
+            try addDecor(g, gpa, @floor(center_x - half_w), @floor(center_y + 1), @floor(center_x + half_w), @floor(center_y + 2), rgb, 1, track, win_w, win_h);
+        }
     }
-    if (core) |p| if (p.columnBarHeight() > 0) {
-        const y = @as(f32, @floatFromInt(top_rows + p.columnBarHeight())) * layout.h;
-        builder.addRect(0, y - 1, win_w, y, overlayRgb(p.chromeTheme().border));
+}
+
+test "decor is read from the regions, each pane's in its own group" {
+    const gpa = std.testing.allocator;
+    const core = try pardes.Pardes.init(gpa, .{ .cols = 80, .rows = 24 });
+    defer core.deinit();
+    _ = try core.newShell(1, "");
+    try std.testing.expect(pardes.layout.splitColumn(core, 0, 1, false));
+    pardes.test_api.sync(core);
+    const s = try core.render(core.scratch.allocator());
+    var g: Gui = undefined;
+    g.decor = .empty;
+    defer g.decor.deinit(gpa);
+    g.cell_w = 10;
+    g.cell_h = 20;
+    g.tagline_width = 6;
+    g.tagline_height = 12;
+    const layout = fixedCellLayout(&g);
+    const ndc = struct {
+        fn x(px: f32) f32 {
+            return px / 800 * 2 - 1;
+        }
     };
-    const grid_bottom = @as(f32, @floatFromInt(surface.rows)) * layout.h;
-    if (grid_bottom < win_h and bottomTaglinePresent(surface)) {
-        const rgb = tagline_rgb;
-        builder.addRect(0, grid_bottom, win_w, win_h, .{
-            .r = @as(f32, @floatFromInt(rgb[0])) / 255.0,
-            .g = @as(f32, @floatFromInt(rgb[1])) / 255.0,
-            .b = @as(f32, @floatFromInt(rgb[2])) / 255.0,
-            .a = 1.0,
-        });
-    }
-    if (transient_on) {
-        if (core) |p| appendPaneChrome(p, surface, layout, &builder);
-        appendTagGrips(g, surface, layout, &builder);
-        if (surface.cursor) |cursor| {
-            if (cursor.x < surface.cols and cursor.y < surface.rows and bodyLayerAt(surface, cursor.x, cursor.y) == null and tagLayerIn(surface.tagLayers(), cursor.x, cursor.y) == null) {
-                const cell = surface.cells[@as(usize, cursor.y) * surface.cols + cursor.x];
-                const role = cellFontRole(&cell);
-                const visual_height: f32 = if (role == .tagline)
-                    @floatFromInt(g.tagline_height)
-                else
-                    layout.h;
-                const cursor_layout = if (role == .tagline)
-                    taglineLayoutForCell(g, cursor.x)
-                else
-                    layout;
-                addCursorBar(&builder, cursor.x, cursor.y, cursor.bar, visual_height, cursor_layout, cursorColor(core, &cell, role));
-            }
+    var groups = makeGroups(&.{}, false);
+    try buildDecor(&g, gpa, s, &groups, layout, 800, 480, true);
+    // A spine one pixel wide at each column's left edge, down from under the
+    // workspace tag; a rail two pixels wide at each pane's.
+    for (core.col_x[0..core.ncol]) |x| {
+        const left = ndc.x(@as(f32, @floatFromInt(x)) * 10);
+        const spine = for (g.decor.items) |item| {
+            if (item.x0 == left and @abs(item.x1 - ndc.x(@as(f32, @floatFromInt(x)) * 10 + 1)) < 0.0001) break item;
+        } else return error.TestExpectedSpine;
+        try std.testing.expectApproxEqAbs(@as(f32, 1 - 20.0 / 480.0 * 2), spine.y0, 0.0001);
+        try std.testing.expectEqual(@as(f32, -1), spine.y1);
+        const rail = for (g.decor.items) |item| {
+            if (item.x0 == left and @abs(item.x1 - ndc.x(@as(f32, @floatFromInt(x)) * 10 + 2)) < 0.0001) break item;
+        } else return error.TestExpectedRail;
+        try std.testing.expectApproxEqAbs(@as(f32, s.chrome.scroll_track[0]) / 255, rail.br, 0.0001);
+    }
+    try std.testing.expectEqual(@as(u32, 0), groups.items[groups.notices].decor_count);
+    const still = groups.items[0].decor_count;
+
+    // Pane 1 moving: its rule and rail leave tier 0 for its track's group,
+    // which moves them with it.
+    const serial = core.panes[1].?.serial;
+    const moving: pardes.animation.Track = .{ .pane = 1, .serial = serial, .phase = .moving, .effect = .slide, .from = .{ .x = 0, .y = 1, .w = 40, .h = 23 }, .to = .{ .x = 40, .y = 1, .w = 40, .h = 23 } };
+    groups = makeGroups(&.{moving}, true);
+    try buildDecor(&g, gpa, s, &groups, layout, 800, 480, groups.tracks == 0);
+    const tracked = groups.items[1];
+    try std.testing.expect(tracked.decor_count >= 4);
+    try std.testing.expectEqual(still, groups.items[0].decor_count + tracked.decor_count);
+    for (g.decor.items[tracked.decor_start..][0..tracked.decor_count]) |item|
+        try std.testing.expectEqual(@as(u32, @intFromEnum(pardes.animation.Transition.slide)), item.effect);
+    // Cursors stand still while panes move.
+    try std.testing.expectEqual(@as(u32, 0), groups.items[groups.ink].decor_count);
+}
+
+/// The bar cursors: the grid's where no layer has the cell, and each layer's
+/// at its own pitch.
+fn cursorDecor(g: *Gui, gpa: std.mem.Allocator, surface: *const pardes.Surface, layout: CellLayout, win_w: f32, win_h: f32) !void {
+    const chrome = &surface.chrome;
+    if (surface.cursor) |cursor| {
+        if (cursor.bar and cursor.x < surface.cols and cursor.y < surface.rows and bodyLayerAt(surface, cursor.x, cursor.y) == null and tagLayerIn(surface.tagLayers(), cursor.x, cursor.y) == null) {
+            const cell = &surface.cells[@as(usize, cursor.y) * surface.cols + cursor.x];
+            const role = cellFontRole(cell);
+            const width: f32 = if (role == .tagline) @floatFromInt(g.tagline_width) else layout.w;
+            const height = std.math.clamp(if (role == .tagline) @as(f32, @floatFromInt(g.tagline_height)) else layout.h, 1.0, layout.h);
+            const x0 = @as(f32, @floatFromInt(cursor.x)) * layout.w;
+            const y0 = @as(f32, @floatFromInt(cursor.y)) * layout.h + @as(f32, @floatFromInt(taglineBandOffset(cursor.y, win_h, @intFromFloat(layout.h), @intFromFloat(height))));
+            try addDecor(g, gpa, x0, y0, x0 + @max(1.0, width / 8.0), y0 + height, cursorColor(chrome, cell, role), 1, null, win_w, win_h);
         }
     }
-    if (transient_on) for (surface.bodyLayers()) |*layer| {
+    for (surface.bodyLayers()) |*layer| {
         if (layer.rows == 0) continue;
+        const cursor = layer.cursor orelse continue;
+        if (!cursor.bar or cursor.y >= layer.rows or cursor.x >= layer.cols) continue;
         const left = @as(f32, @floatFromInt(layer.viewport.x)) * layout.w;
         const bottom = @as(f32, @floatFromInt(layer.viewport.y + layer.viewport.h)) * layout.h;
-        if (layer.cursor) |cursor| {
-            if (!cursor.bar or cursor.y >= layer.rows or cursor.x >= layer.cols) continue;
-            const top = layer.rowTop(cursor.y, layout.h, @floatFromInt(g.tagline_height));
-            if (top >= bottom) continue;
-            const height = layer.rowHeight(cursor.y, layout.h, @floatFromInt(g.tagline_height));
-            const role: pardes.FontRole = if (cursor.y < layer.context_rows) .tagline else .body;
-            const width: f32 = if (role == .tagline) @floatFromInt(g.tagline_width) else layout.w;
-            const x = left + @as(f32, @floatFromInt(cursor.x)) * width;
-            const cell = &layer.cells[@as(usize, cursor.y) * layer.cols + cursor.x];
-            builder.addRect(x, top, x + @max(1, width / 8), @min(bottom, top + height), overlayRgb(cursorColor(core, cell, role)));
-        }
-    };
-    if (transient_on) for (surface.tagLayers()) |*layer| {
+        const top = layer.rowTop(cursor.y, layout.h, @floatFromInt(g.tagline_height));
+        if (top >= bottom) continue;
+        const height = layer.rowHeight(cursor.y, layout.h, @floatFromInt(g.tagline_height));
+        const role: pardes.FontRole = if (cursor.y < layer.context_rows) .tagline else .body;
+        const width: f32 = if (role == .tagline) @floatFromInt(g.tagline_width) else layout.w;
+        const x = left + @as(f32, @floatFromInt(cursor.x)) * width;
+        const cell = &layer.cells[@as(usize, cursor.y) * layer.cols + cursor.x];
+        try addDecor(g, gpa, x, top, x + @max(1, width / 8), @min(bottom, top + height), cursorColor(chrome, cell, role), 1, null, win_w, win_h);
+    }
+    for (surface.tagLayers()) |*layer| {
         if (layer.rows == 0) continue;
         const cursor = layer.cursor orelse continue;
         if (!cursor.bar or cursor.x >= layer.cols or cursor.y >= layer.rows) continue;
@@ -7331,10 +7547,25 @@ fn buildOverlay(
         const x = left + @as(f32, @floatFromInt(cursor.x)) * width;
         if (x >= right) continue;
         const y = layer.viewport.y + cursor.y;
-        const top = @as(f32, @floatFromInt(y)) * layout.h + @as(f32, @floatFromInt(taglineBandOffset(y, builder.win_h, g.cell_h, g.tagline_height)));
-        builder.addRect(x, top, @min(right, x + @max(1, width / 8)), top + @as(f32, @floatFromInt(g.tagline_height)), overlayRgb(cursorColor(core, &layer.cells[@as(usize, cursor.y) * layer.cols + cursor.x], .tagline)));
-    };
-    if (transient_on) appendTouchOverlay(g, &builder, debug_on);
+        const top = @as(f32, @floatFromInt(y)) * layout.h + @as(f32, @floatFromInt(taglineBandOffset(y, win_h, g.cell_h, g.tagline_height)));
+        try addDecor(g, gpa, x, top, @min(right, x + @max(1, width / 8)), top + @as(f32, @floatFromInt(g.tagline_height)), cursorColor(chrome, &layer.cells[@as(usize, cursor.y) * layer.cols + cursor.x], .tagline), 1, null, win_w, win_h);
+    }
+}
+
+/// The triangle overlay: the workspace pet and the touch debug view, over
+/// everything.
+fn buildOverlay(
+    g: *Gui,
+    core: ?*const pardes.Pardes,
+    surface: *const pardes.Surface,
+    sw: u32,
+    sh: u32,
+    debug_on: bool,
+) u32 {
+    if (g.overlay_vertices.len == 0 or sw == 0 or sh == 0) return 0;
+    var builder = OverlayBuilder{ .vertices = g.overlay_vertices, .win_w = @floatFromInt(sw), .win_h = @floatFromInt(sh) };
+    appendWorkspacePet(g, core, surface, &builder);
+    appendTouchOverlay(g, &builder, debug_on);
     return @intCast(builder.len);
 }
 
@@ -7409,33 +7640,11 @@ test "pet overlay stays beyond workspace text and vanishes while its tag is edit
     try std.testing.expectEqual(@as(usize, 0), builder.len);
 }
 
-fn cursorColor(core: ?*const pardes.Pardes, cell: *const pardes.Cell, role: pardes.FontRole) [3]u8 {
-    if (core) |p| return if (role == .tagline) switch (cell.style.fg) {
-        .rgb => |rgb| rgb,
-        else => p.chromeTheme().tag_fg,
-    } else p.theme().fg orelse fg_default;
-    return switch (cell.style.fg) {
+fn cursorColor(chrome: *const pardes.Chrome, cell: *const pardes.Cell, role: pardes.FontRole) [3]u8 {
+    return if (role == .tagline) switch (cell.style.fg) {
         .rgb => |rgb| rgb,
-        .index => |index| palColor(index),
-        // Detached frames carry explicit page backgrounds but blank cells need
-        // not carry foreground ink. Keep their insertion caret visible too.
-        .default => switch (cell.style.bg) {
-            .rgb => |rgb| if ((@as(u16, rgb[0]) * 3 + @as(u16, rgb[1]) * 6 + rgb[2]) / 10 > 140)
-                .{ 32, 32, 32 }
-            else
-                fg_default,
-            else => fg_default,
-        },
-    };
-}
-
-test "detached insertion caret contrasts with blank light and dark pages" {
-    var cell: pardes.Cell = .{ .default = false, .style = .{ .bg = .{ .rgb = .{ 248, 246, 237 } } } };
-    try std.testing.expectEqual([3]u8{ 32, 32, 32 }, cursorColor(null, &cell, .body));
-    cell.style.bg = .{ .rgb = .{ 24, 28, 32 } };
-    try std.testing.expectEqual(fg_default, cursorColor(null, &cell, .body));
-    cell.style.fg = .{ .rgb = .{ 122, 188, 160 } };
-    try std.testing.expectEqual([3]u8{ 122, 188, 160 }, cursorColor(null, &cell, .body));
+        else => chrome.tag_fg,
+    } else chrome.fg orelse fg_default;
 }
 
 fn overlayRgb(rgb: [3]u8) OverlayColor {
@@ -7447,185 +7656,6 @@ fn overlayRgb(rgb: [3]u8) OverlayColor {
     };
 }
 
-fn cellBackgroundIs(cell: *const pardes.Cell, rgb: [3]u8) bool {
-    return !cell.default and switch (cell.style.bg) {
-        .rgb => |bg| std.mem.eql(u8, &bg, &rgb),
-        else => false,
-    };
-}
-
-// The canonical surface still owns scrollbar positions and hit targets. Only
-// their pixel ink is inset here; no layout, selection or mouse coordinates move.
-fn appendPaneChrome(
-    core: *const pardes.Pardes,
-    surface: *const pardes.Surface,
-    layout: CellLayout,
-    builder: *OverlayBuilder,
-) void {
-    const chrome = core.chromeTheme();
-    const page = overlayRgb(core.theme().bg orelse bg_default);
-    for (core.panes, core.rects) |slot, r| {
-        const pane = slot orelse continue;
-        if (r.w <= config.GUTTER or r.h <= pane.tag_rows) continue;
-        if (@as(u32, r.x) + r.w > surface.cols or @as(u32, r.y) + r.h > surface.rows) continue;
-        const tag_y = core.tagTop(pane, r);
-        const body_y = core.bodyTop(pane, r);
-        const body_end = body_y + (r.h -| pane.tag_rows);
-        const x0 = @as(f32, @floatFromInt(r.x)) * layout.w;
-        const x1 = x0 + @as(f32, @floatFromInt(r.w)) * layout.w;
-        const tag_cells = surface.cells[@as(usize, tag_y) * surface.cols + r.x + pardes.TAG_TEXT_INSET ..][0 .. r.w - pardes.TAG_TEXT_INSET];
-        const tag_visible = for (tag_cells) |*cell| {
-            if (cellFontRole(cell) != .tagline) break false;
-        } else true;
-        if (tag_visible) {
-            const rule_y = @as(f32, @floatFromInt(tag_y + (if (core.settings.tag_bottom) 0 else pane.tag_rows))) * layout.h;
-            // Like the band above it, the rule of a pane at the right edge
-            // runs on through the pixels past the last whole cell.
-            const rule_x1 = if (builder.win_w - x1 < layout.w) @max(x1, builder.win_w) else x1;
-            builder.addRect(x0, rule_y - @as(f32, if (core.settings.tag_bottom) 0 else 1), rule_x1, rule_y + @as(f32, if (core.settings.tag_bottom) 1 else 0), overlayRgb(chrome.border));
-        }
-
-        // Do not paint over resize previews or debug text occupying the rail.
-        var thumb_start: ?u16 = null;
-        var thumb_end: u16 = body_y;
-        var row = body_y;
-        while (row < body_end) : (row += 1) {
-            const cell = &surface.cells[@as(usize, row) * surface.cols + r.x];
-            if (cell.printableAscii() != ' ') break;
-            if (cellBackgroundIs(cell, chrome.scroll_thumb)) {
-                if (thumb_start == null) thumb_start = row;
-                thumb_end = row + 1;
-            } else if (!cellBackgroundIs(cell, chrome.scroll_track)) break;
-        }
-        if (row != body_end) continue;
-        const y0 = @as(f32, @floatFromInt(body_y)) * layout.h;
-        const body_y1 = @as(f32, @floatFromInt(body_end)) * layout.h;
-        const y1 = if (body_end == surface.rows and builder.win_h - body_y1 < layout.h) @max(body_y1, builder.win_h) else body_y1;
-        builder.addRect(x0, y0, x0 + layout.w, y1, page);
-        appendSquareRail(builder, x0, y0, y1, layout.w, false, overlayRgb(chrome.scroll_track));
-        if (thumb_start) |first| {
-            const thumb_y0 = @as(f32, @floatFromInt(first)) * layout.h;
-            const thumb_y1 = if (thumb_end == body_end) y1 else @as(f32, @floatFromInt(thumb_end)) * layout.h;
-            appendSquareRail(builder, x0, thumb_y0, thumb_y1, layout.w, true, overlayRgb(chrome.scroll_thumb));
-        }
-    }
-    // A notice chip is tagline hung over the body's top rows, so it is ruled
-    // off from the text beneath it the way a tagline is: the same colour and
-    // thickness along its bottom, running to the window edge when it does.
-    for (surface.tagLayers()) |*layer| {
-        if (layer.rows == 0 or layer.kind != .notice) continue;
-        const x0 = @as(f32, @floatFromInt(layer.viewport.x)) * layout.w;
-        const x1 = x0 + @as(f32, @floatFromInt(layer.viewport.w)) * layout.w;
-        const rule_x1 = if (builder.win_w - x1 < layout.w) @max(x1, builder.win_w) else x1;
-        const top = @as(f32, @floatFromInt(layer.viewport.y)) * layout.h;
-        // A band still falling into place is cut at its row's top; its rule
-        // comes with it, and shows only once it is below that cut.
-        const rule_y = top + (1 + layer.slide) * layout.h;
-        if (rule_y - 1 < top) continue;
-        // ...and fades up and dissolves with it rather than standing alone.
-        var rule = overlayRgb(chrome.border);
-        rule.a = layer.fade;
-        builder.addRect(x0, rule_y - 1, rule_x1, rule_y, rule);
-    }
-    appendColumnSpines(core, surface.rows, layout, builder);
-}
-
-// Tag handles use the canonical physical cells, including detached frames.
-// Their tag text begins at the layer viewport and may use a narrower font.
-fn appendTagGrips(g: *const Gui, surface: *const pardes.Surface, layout: CellLayout, builder: *OverlayBuilder) void {
-    if (g.tagline_height < 6 or g.tagline_width < 3) return;
-    for (surface.tagLayers()) |layer| {
-        if (layer.rows == 0 or layer.kind != .pane or layer.viewport.x < pardes.TAG_TEXT_INSET) continue;
-        const x = layer.viewport.x - pardes.TAG_TEXT_INSET;
-        // A mark on each of the tag's rows whose grip cell is blank: every
-        // row but the one with the mode's glyph.
-        for (0..layer.rows) |index| {
-            const y = layer.viewport.y + @as(u16, @intCast(index));
-            if (x >= surface.cols or y >= surface.rows) continue;
-            const cell = &surface.cells[@as(usize, y) * surface.cols + x];
-            if (cell.default or cell.printableAscii() != ' ') continue;
-            const rgb = switch (cell.style.fg) {
-                .rgb => |rgb| rgb,
-                else => continue,
-            };
-            const center_x = (@as(f32, @floatFromInt(x)) + @as(f32, @floatFromInt(config.GUTTER)) / 2) * layout.w + @as(f32, @floatFromInt(anchorInset(g, y, builder.win_h) / 2));
-            const center_y = @as(f32, @floatFromInt(y)) * layout.h + @as(f32, @floatFromInt(taglineBandOffset(y, builder.win_h, g.cell_h, g.tagline_height))) + @as(f32, @floatFromInt(g.tagline_height)) / 2;
-            const half_w = @max(1, @min(3, layout.w - 2));
-            builder.addRect(@floor(center_x - half_w), @floor(center_y - 2), @floor(center_x + half_w), @floor(center_y - 1), overlayRgb(rgb));
-            builder.addRect(@floor(center_x - half_w), @floor(center_y + 1), @floor(center_x + half_w), @floor(center_y + 2), overlayRgb(rgb));
-        }
-    }
-}
-
-test "column grips stay unmarked while pane marks retain physical centering" {
-    var g: Gui = undefined;
-    g.tagline_height = 12;
-    g.tagline_width = 6;
-    g.cell_h = 20;
-    var cells: [80]pardes.Cell = @splat(.{ .default = false, .style = .{ .fg = .{ .rgb = .{ 100, 120, 140 } } } });
-    var surface: pardes.Surface = .{ .cols = 20, .rows = 4, .cells = &cells };
-    surface.tag_layers[0] = .{ .kind = .column, .viewport = .{ .x = 8, .y = 1, .w = 13, .h = 1 }, .cols = 20, .rows = 1 };
-    surface.tag_layers[1] = .{ .kind = .pane, .viewport = .{ .x = 8, .y = 3, .w = 13, .h = 1 }, .cols = 20, .rows = 1 };
-    var vertices: [24]OverlayVertex = undefined;
-    var builder: OverlayBuilder = .{ .vertices = &vertices, .win_w = 200, .win_h = 80 };
-    appendTagGrips(&g, &surface, .{ .w = 10, .h = 20, .x_off = 0, .y_off = 0 }, &builder);
-    try std.testing.expectEqual(@as(usize, 12), builder.len);
-    // Centered in the anchor, whose left edge is inset by the band's offset
-    // (8 px on this last row): the mark moves right by half of it.
-    try std.testing.expectApproxEqAbs(@as(f32, 61.0 / 200.0 * 2.0 - 1.0), vertices[0].x, 0.0001);
-}
-
-fn appendSquareRail(builder: *OverlayBuilder, x: f32, y0: f32, y1: f32, cell_w: f32, thumb: bool, color: OverlayColor) void {
-    const width = @min(cell_w, if (thumb) @max(2, @floor(cell_w * 0.5)) else 2);
-    builder.addRect(x, y0, x + width, y1, color);
-}
-
-fn appendColumnSpines(core: *const pardes.Pardes, rows: u16, layout: CellLayout, builder: *OverlayBuilder) void {
-    const y0 = @as(f32, @floatFromInt(core.topBarHeight())) * layout.h;
-    const grid_y1 = @as(f32, @floatFromInt(rows)) * layout.h;
-    // Down through the pixels past the last whole row, as tags run right.
-    const y1 = if (builder.win_h - grid_y1 < layout.h) @max(grid_y1, builder.win_h) else grid_y1;
-    if (y1 <= y0) return;
-    // A single boundary spans all panes, including their tags. Its left edge
-    // agrees with the square scroll markers and existing move-box hit area.
-    for (core.col_x[0..core.ncol], core.col_w[0..core.ncol]) |col, width| {
-        if (width == 0) continue;
-        const x = @as(f32, @floatFromInt(col)) * layout.w;
-        builder.addRect(x, y0, x + 1, y1, overlayRgb(core.chromeTheme().border));
-    }
-}
-
-test "square scroll markers share the column edge and have no rounded end inset" {
-    var vertices: [12]OverlayVertex = undefined;
-    var builder: OverlayBuilder = .{ .vertices = &vertices, .win_w = 800, .win_h = 480 };
-    appendSquareRail(&builder, 400, 40, 480, 10, false, overlayRgb(.{ 40, 40, 40 }));
-    appendSquareRail(&builder, 400, 80, 160, 10, true, overlayRgb(.{ 100, 100, 100 }));
-    try std.testing.expectEqual(@as(usize, 12), builder.len);
-    try std.testing.expectEqual(vertices[0].x, vertices[6].x);
-    try std.testing.expectApproxEqAbs(@as(f32, 1 - 80.0 / 480.0 * 2), vertices[6].y, 0.0001);
-    try std.testing.expectApproxEqAbs(@as(f32, 1 - 160.0 / 480.0 * 2), vertices[8].y, 0.0001);
-    try std.testing.expectApproxEqAbs(@as(f32, 5.0 / 800.0 * 2), vertices[7].x - vertices[6].x, 0.0001);
-}
-
-test "column spines remain continuous across every pane tag and body" {
-    const core = try pardes.Pardes.init(std.testing.allocator, .{ .cols = 80, .rows = 24 });
-    defer core.deinit();
-    _ = try core.newShell(1, "");
-    try std.testing.expect(pardes.layout.splitColumn(core, 0, 1, false));
-    pardes.test_api.sync(core);
-    var vertices: [12]OverlayVertex = undefined;
-    var builder: OverlayBuilder = .{ .vertices = &vertices, .win_w = 800, .win_h = 480 };
-    appendColumnSpines(core, 24, .{ .w = 10, .h = 20, .x_off = 0, .y_off = 0 }, &builder);
-    try std.testing.expectEqual(@as(usize, 12), builder.len);
-    for (0..2) |col| {
-        const first = vertices[col * 6];
-        const bottom = vertices[col * 6 + 2];
-        try std.testing.expectApproxEqAbs(@as(f32, 1 - 20.0 / 480.0 * 2), first.y, 0.0001);
-        try std.testing.expectEqual(@as(f32, -1), bottom.y);
-        try std.testing.expectApproxEqAbs(@as(f32, @floatFromInt(core.col_x[col])) * 10.0 / 800.0 * 2 - 1, first.x, 0.0001);
-    }
-}
-
 fn appendTouchOverlay(g: *Gui, builder: *OverlayBuilder, debug_on: bool) void {
     if (!debug_on) {
         g.touch.click_flash_frames = 0;
diff --git a/src/pardes.zig b/src/pardes.zig
index f8087bdb..616747fa 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -39,6 +39,7 @@ pub const ImagePatch = @import("surface.zig").ImagePatch;
 pub const ImagePlace = @import("surface.zig").ImagePlace;
 pub const Surface = @import("surface.zig").Surface;
 pub const Region = @import("surface.zig").Region;
+pub const Chrome = @import("surface.zig").Chrome;
 pub const MAX_REGIONS = @import("surface.zig").MAX_REGIONS;
 pub const builtins = @import("builtins.zig");
 const limits = memory.limits;
diff --git a/src/surface.zig b/src/surface.zig
index db7dd468..07b593b1 100644
--- a/src/surface.zig
+++ b/src/surface.zig
@@ -344,6 +344,13 @@ pub const Region = struct {
         column_grip,
         column_tag,
         workspace_tag,
+        /// A column below the workspace tag, its bar and panes: its left
+        /// edge is the spine a pixel shell rules down it.
+        column,
+        /// A drag's guide or a seam's hover hint, drawn over the panes.
+        guide,
+        /// The debug stats box, drawn over the panes.
+        debug,
     };
     pub const none = std.math.maxInt(u8);
 
@@ -368,7 +375,30 @@ pub const Region = struct {
     clip: u16 = 0,
 };
 
-pub const MAX_REGIONS = 1 + MAX_PANES * (4 + panes.Pane.Notices.max) + pardes.MAX_COLS * 2 + 1;
+/// Guides a frame can draw: a run of a column-move rail per pane it skips
+/// the tags of, and a handful of border and hover dashes.
+pub const MAX_GUIDES = MAX_PANES + 4;
+pub const MAX_REGIONS = 1 + MAX_PANES * (4 + panes.Pane.Notices.max) + pardes.MAX_COLS * 3 + 1 + MAX_GUIDES + 1;
+
+/// The colours a pixel shell draws its chrome in (rules, rails, grips, the
+/// tag underlay), resolved by the core each frame, so a frontend attached
+/// to a detached session draws them from the frame alone.
+pub const Chrome = struct {
+    /// The theme's ground and ink; null where it leaves them to the shell.
+    page: ?[3]u8 = null,
+    fg: ?[3]u8 = null,
+    /// Rules and column spines.
+    border: [3]u8 = .{ 0, 0, 0 },
+    /// The rule under the workspace tag.
+    topbar_rule: [3]u8 = .{ 0, 0, 0 },
+    tag_bg: [3]u8 = .{ 0, 0, 0 },
+    /// The focused pane's and column's tag underlay: `tag_bg` unless
+    /// FocusTint is on.
+    tag_focus_bg: [3]u8 = .{ 0, 0, 0 },
+    tag_fg: [3]u8 = .{ 0, 0, 0 },
+    scroll_track: [3]u8 = .{ 0, 0, 0 },
+    scroll_thumb: [3]u8 = .{ 0, 0, 0 },
+};
 
 /// The canonical interface: what a frame of pardes IS. The tty shell writes
 /// these cells to vaxis one-to-one; the SDL shells rasterize them.
@@ -385,6 +415,7 @@ pub const Surface = struct {
     rows: u16 = 0,
     regions: [MAX_REGIONS]Region = undefined,
     nregions: u16 = 0,
+    chrome: Chrome = .{},
     cells: []Cell = &.{},
     /// bar: draw an insert-style thin cursor instead of the block
     cursor: ?struct { x: u16, y: u16, bar: bool = false } = null,
@@ -395,6 +426,7 @@ pub const Surface = struct {
     previous_cells: []const Cell = &.{},
     previous_body_layers: []const Layer = &.{},
     previous_tag_layers: []const Layer = &.{},
+    previous_regions: []const Region = &.{},
     cell_diffs: []const PanelCellDiff = &.{},
 
     pub fn tagLayers(s: *const Surface) []const Layer {
@@ -409,6 +441,12 @@ pub const Surface = struct {
         return s.regions[0..s.nregions];
     }
 
+    pub fn addRegion(s: *Surface, r: Region) void {
+        std.debug.assert(s.nregions < s.regions.len);
+        s.regions[s.nregions] = r;
+        s.nregions += 1;
+    }
+
     /// The first part of `kind` that `owner` has: its tag, its rail.
     pub fn region(s: *Surface, kind: Region.Kind, owner: usize) ?*Region {
         for (s.regions[0..s.nregions]) |*r| if (r.kind == kind and r.owner == owner) return r;
diff --git a/test/gui-goldens.txt b/test/gui-goldens.txt
index e52155a3..27c39150 100644
--- a/test/gui-goldens.txt
+++ b/test/gui-goldens.txt
@@ -10,8 +10,9 @@
 10-tagbottom dd8ba0d3ecabf3420d000b0c9591a57278179cbd2a9060f849d283f3881d1847
 11-column-tags 6b1731d1611404597c96ad77f34c2d5cd5a81c1085ec68c6779388e07ce28614
 12-multiline-tag 1b9ccd331814dc76111470f18448b1ca192e1edc3d79ea6eee19a6a78a4b1831
-13-image de18edee2ab2e0f2d4bf4162d86e3d8a1852fccfc344830491fa1a359095d4ea
-14-theme-ink 6e733d4212373c90b860b2e41102ced8719b07480591b5da3905267c8358db18
-15-theme-acme-light e099dc1a351de8efa63ecd0ec0899636ea31b722a945eb40137a18abd87a82e2
-16-debug e97ce74b7a3d4a08f6a529b1f0de111d62e5532c829a6b1633b966dd45218f55
-17-terminal 304a84d1ef871f581d0a3fade9bc1acdcc87a3612c607548ab0d2851871753ee
+13-image a52e2cf9f238447d885692cba01e68ef7fdc6ae3fc7c8fe1e95c8463c85f519c
+14-theme-ink cc2ea256ddda24e1c97871f75b71ddf62fa825bd02f5d1432592d05e478c707a
+15-theme-acme-light 2bde8a2bdfada7f061217f52cb2272913fc0657dbfa1d7448e1852f321f8e3bf
+16-debug 129ad6f5f85b0e60e81bc6e8e78434629ee751f49731cf2eb28fd0553efd914a
+17-terminal a1305fd755b6bc957228bbf28833f972c2355af9abf40b77f76b30741109574f
+18-mid-transition d4f353ef5fda80411cd9de9729e5b23f59ff7511c10774e69214152ee8070725
diff --git a/test/gui_golden.py b/test/gui_golden.py
index 327911cc..d97009c9 100644
--- a/test/gui_golden.py
+++ b/test/gui_golden.py
@@ -106,7 +106,9 @@ def run(args):
     display = Path(os.environ.get('WAYLAND_DISPLAY', 'wayland-0'))
     if not display.is_absolute():
         display = Path(os.environ.get('XDG_RUNTIME_DIR', '/run/user/%d' % os.getuid())) / display
-    inherited = {'PARDES_TEST': '1', 'PARDES_TEST_COLS': '120', 'PARDES_TEST_ROWS': '40',
+    # The virtual clock: a transition's frames are the same frames on any
+    # machine, so one partway through can be hashed too.
+    inherited = {'PARDES_TEST': '1', 'PARDES_TEST_CLOCK': '1', 'PARDES_TEST_COLS': '120', 'PARDES_TEST_ROWS': '40',
                  'PARDES_TEST_PAD': '7', 'PARDES_TEST_CAPTURE_DIR': str(root),
                  'SDL_VIDEODRIVER': 'wayland', 'WAYLAND_DISPLAY': str(display)}
     launch = ['-c', 'stty cols 120 rows 40; exec "$@"', name, str(args.binary.resolve()),
@@ -117,11 +119,12 @@ def run(args):
         first = require(wait_for(lambda: next((s for s, tag in panes(client).items()
                                                if 'shapes.zig' in tag), None)), 'source pane missing')
 
-        def scene(label):
-            results.append((label, settled(root)))
+        def scene(label, frame='latest.ppm'):
+            settled(root)
+            results.append((label, hashlib.sha256((root / frame).read_bytes()).hexdigest()))
             if args.keep:
                 args.keep.mkdir(parents=True, exist_ok=True)
-                shutil.copyfile(root / 'latest.ppm', args.keep / (label + '.ppm'))
+                shutil.copyfile(root / frame, args.keep / (label + '.ppm'))
             print(label, results[-1][1][:16], flush=True)
 
         def mouse(kind, button, x, y):
@@ -196,6 +199,13 @@ def run(args):
         client.write(f'/pane/{terminal}/pty/data', b"PS1='$ '; clear; printf '\\033[1;36mcolour\\033[0m plain \\033[32mgreen\\033[0m\\n'\r")
         require(wait_for(lambda: b'green' in client.read(f'/pane/{terminal}/body')), 'terminal output missing')
         scene('17-terminal')
+        # Partway through a transition: the panes, the picture among them,
+        # sliding over for a new column, frame 6 of PanelSlide's 12. Its
+        # chrome slides with each pane.
+        client.write('/ctl', b'PanelSlide\n')
+        client.write(f'/pane/{first}/exec', b'Newcol\n')
+        require(wait_for(lambda: (root / 'transition-6.ppm').exists()), 'transition frame 6 never drawn')
+        scene('18-mid-transition', 'transition-6.ppm')
     lines = ''.join(f'{label} {digest}\n' for label, digest in results)
     if args.update:
         GOLDENS.write_text(lines)
-- 
cgit v1.3


From 0465775799cff895e3e830d2aa19f57966cdf21c Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 15:40:11 -0300
Subject: A still pane's notice stays under a closing pane's tombstone

Tier 4 draws notices over every group; while a pane closes, a notice goes
back to its own pane's group instead, so the tombstone sliding over it
covers it as it did before stage 8. Review follow-up to stage 8.

Shared files touched: gui.zig.
---
 docs/render-pipeline.md |  2 +-
 src/gui/gui.zig         | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'src/gui')

diff --git a/docs/render-pipeline.md b/docs/render-pipeline.md
index 69645c96..6c5e4866 100644
--- a/docs/render-pipeline.md
+++ b/docs/render-pipeline.md
@@ -810,7 +810,7 @@ stripped. No visual change until stage 9 unless stated.
 | 5 | JOIN: paint tags/notices/headers once into layers, copy into grid; the grid wins where the copies disagree, and each disagreement is listed for a later decision | goldens are the oracle; wide-grapheme re-clip at the edge (§3.2) |
 | 6 | body layer joined the same way (paint once, copy visible rows) | riskiest join; A/B the old double paint in a temporary test with tag_bottom on and off, then delete it |
 | 7 | Layer merge (TagLayer + BodyLayer), wire v8, web accessors | after the other agent lands; touches mouse hit paths; breaks the macOS shell's layer ABI (accepted: macOS build ignored for now); done: one `Layer` (src/Layer.zig) with `rows` (0 = no layer) and a `cursor{x, y}`; a tag of N rows is ONE layer of N grid rows (`tagHit` answers the row as `line`, `bodyHit` keeps its meaning), so the per-line layer bases are gone. Wire v8 ships rows, cursor y and the region list in the one bump; v7 and v9 peers are refused in both directions (tests). web: `tag_layer_value` 11 = rows, 12 = cursor y, and app.mjs lays every row. macOS: its Zig side compiles against `Layer`, but pardes.h still sees one row per tag layer (a taller tag shows its first row there) |
-| 8 | GUI draws from regions: role tiers with track groups in tiers 2-3, page cover, hard-edged snapped decor for rules/rails/grips (pane chrome in the pane's tier), per-instance clip; delete inference functions, `transient_on` and `mark_hover` (breaks macOS glass hover; accepted, macOS ignored for now) | stage-0 PPM goldens byte-identical (possible only because hard decor is snapped and not anti-aliased); pane chrome now also shows during transitions, which is the one allowed visible delta, listed Done: the frame is drawn in groups (makeGroups): tier 0, one group per track in paint order (tiers 2 and 3), tier 4 as two groups (the notices; then the guides and the debug box, which the core paints over them), tier 5 (bar cursors), each drawing cells, images, decor. Decor is every rule, rail, thumb, grip mark, spine, the workspace and column rules, the bottom band, notice rules and bar cursors: whole-pixel rects drawn by `decor.frag` over `ui.vert` as cell instances (colour in the ground, coverage in fg.r, blended like the overlay), so each carries its track's transition and clip; a closing pane's comes from the last frame's regions (`Surface.previous_regions`). Only `solid` exists yet: `decor.vert` and the other kinds (§5.1) come with the first effect that needs them. Deleted: taglineBaseRgb, topbarPaneBorderHeight, bottomTaglinePresent, frameChromeBg, cellBackgroundIs and the rail inference, paneGripCell's scan, transient_on, PaintPlan; one cover map (coverFrame: layer, grip and offset, focus, anchor, floating) is marked from layers and regions once a frame. New regions: `column` (spines, anchors, the focused column's tint), `guide`, `debug`; `Surface.chrome` is the palette, on the wire in v8 (not yet shipped, so no bump), and an attached GUI draws the same chrome (test). Per-instance clip (`CellInstance.clip_*`) replaces the vertical transition's scissor. Goldens: 01-12 byte-identical; 13-17 differ only in pixels past the grid (with a picture on screen the image pass left the scissor at the grid's size, cutting every rule end, rail foot and band that runs into the leftover pixels; they now run to the edge as in every scene without one); 16-debug shows the debug box (it was drawn from the grid under the source's context-row layer, so the GUI never showed it there); 18-mid-transition is new (virtual clock, PanelSlide Newcol with the picture, frame 6 of 12: chrome moves with its pane). Other deltas, outside the goldens: a guide over a tag or a context-row body now shows; with WindowOpacity < 100 a layer's bar cursor is ink like the grid's; an attached GUI gains the focus tint, notice rules, spines and the theme's page and caret colours. Deferrals fixed: the GUI sleeps when idle (SDL and queue events wake it; a smooth scroll, a gamepad, the test feed, a shell's kill deadline, a present to retry still poll), and a minimized or occluded window sleeps through animation. Tracy, `gui frame build`, 200x60, terminal output plus scrolling, ReleaseFast, two interleaved runs of ~180 frames: before 992/1015 µs median, after 989/987 µs |
+| 8 | GUI draws from regions: role tiers with track groups in tiers 2-3, page cover, hard-edged snapped decor for rules/rails/grips (pane chrome in the pane's tier), per-instance clip; delete inference functions, `transient_on` and `mark_hover` (breaks macOS glass hover; accepted, macOS ignored for now) | stage-0 PPM goldens byte-identical (possible only because hard decor is snapped and not anti-aliased); pane chrome now also shows during transitions, which is the one allowed visible delta, listed Done: the frame is drawn in groups (makeGroups): tier 0, one group per track in paint order (tiers 2 and 3), tier 4 as two groups (the notices; then the guides and the debug box, which the core paints over them), tier 5 (bar cursors), each drawing cells, images, decor. Decor is every rule, rail, thumb, grip mark, spine, the workspace and column rules, the bottom band, notice rules and bar cursors: whole-pixel rects drawn by `decor.frag` over `ui.vert` as cell instances (colour in the ground, coverage in fg.r, blended like the overlay), so each carries its track's transition and clip; a closing pane's comes from the last frame's regions (`Surface.previous_regions`). Only `solid` exists yet: `decor.vert` and the other kinds (§5.1) come with the first effect that needs them. Deleted: taglineBaseRgb, topbarPaneBorderHeight, bottomTaglinePresent, frameChromeBg, cellBackgroundIs and the rail inference, paneGripCell's scan, transient_on, PaintPlan; one cover map (coverFrame: layer, grip and offset, focus, anchor, floating) is marked from layers and regions once a frame. New regions: `column` (spines, anchors, the focused column's tint), `guide`, `debug`; `Surface.chrome` is the palette, on the wire in v8 (not yet shipped, so no bump), and an attached GUI draws the same chrome (test). Per-instance clip (`CellInstance.clip_*`, 104 → 120 bytes an instance, ~15% more upload a frame) replaces the vertical transition's scissor. While a pane closes, notices stay in their own panes' groups, under the tombstone sliding over them. Goldens: 01-12 byte-identical; 13-17 differ only in pixels past the grid (with a picture on screen the image pass left the scissor at the grid's size, cutting every rule end, rail foot and band that runs into the leftover pixels; they now run to the edge as in every scene without one); 16-debug shows the debug box (it was drawn from the grid under the source's context-row layer, so the GUI never showed it there); 18-mid-transition is new (virtual clock, PanelSlide Newcol with the picture, frame 6 of 12: chrome moves with its pane). Other deltas, outside the goldens: a guide over a tag or a context-row body now shows; with WindowOpacity < 100 a layer's bar cursor is ink like the grid's; an attached GUI gains the focus tint, notice rules, spines and the theme's page and caret colours. Deferrals fixed: the GUI sleeps when idle (SDL and queue events wake it; a smooth scroll, a gamepad, the test feed, a shell's kill deadline, a present to retry still poll), and a minimized or occluded window sleeps through animation. Tracy, `gui frame build`, 200x60, terminal output plus scrolling, ReleaseFast, two interleaved runs of ~180 frames: before 992/1015 µs median, after 989/987 µs |
 | 9 | post chain: glslang, Shadertoy prefix, ping-pong, ShaderAnimation, redraw levels A/B (§5.5); bundled CRT without barrel; delete scene_effects/crt.zig/crt.frag | first visual change (the CRT look) |
 | 10+ | `fx` bookmark: G1–G3 → feel review → G4 bundled → G5 lapis theme → P2s; tty T1–T2 → feel review → removals of audited effects (after user decision) → T3–T5 | each effect its own change, default off |
 
diff --git a/src/gui/gui.zig b/src/gui/gui.zig
index 35fbc99d..39d7f61e 100644
--- a/src/gui/gui.zig
+++ b/src/gui/gui.zig
@@ -603,6 +603,10 @@ test "closing tombstone overlays but never owns canonical cells" {
     };
     const groups = makeGroups(&.{closing}, true);
     try std.testing.expectEqual(@as(usize, 0), groupAt(&groups, 4, 4));
+    // A still pane's notice stays under the tombstone sliding over it.
+    const notice: pardes.Layer = .{ .kind = .notice, .viewport = .{ .x = 4, .y = 4, .w = 3, .h = 1 }, .rows = 1 };
+    try std.testing.expectEqual(@as(usize, 0), noticeGroup(&groups, &notice));
+    try std.testing.expectEqual(makeGroups(&.{}, false).notices, noticeGroup(&makeGroups(&.{}, false), &notice));
     try std.testing.expectEqual(@as(usize, 1), groups.tracks);
     try std.testing.expectEqual(pardes.animation.Phase.closing, groups.items[1].track.?.phase);
 }
@@ -2071,6 +2075,14 @@ fn groupOf(groups: *const Groups, serial: u32) usize {
     return 0;
 }
 
+/// A notice floats over the panes (tier 4), except while a pane closes: then
+/// it stays in its own pane's group, under the tombstone sliding over it.
+fn noticeGroup(groups: *const Groups, layer: *const pardes.Layer) usize {
+    for (groups.items[1..][0..groups.tracks]) |group|
+        if (group.track.?.phase == .closing) return groupAt(groups, layer.viewport.x, layer.viewport.y);
+    return groups.notices;
+}
+
 /// What draws a grid cell, marked once a frame from the layers and the
 /// regions (coverFrame), so the cell loops read it rather than search.
 const Cover = packed struct(u16) {
@@ -5344,7 +5356,7 @@ fn renderFrame(
     }
     for (surface.tagLayers()) |*layer| {
         if (layer.rows == 0) continue;
-        const group_index = if (layer.kind == .notice) groups.notices else groupAt(&groups, layer.viewport.x, layer.viewport.y);
+        const group_index = if (layer.kind == .notice) noticeGroup(&groups, layer) else groupAt(&groups, layer.viewport.x, layer.viewport.y);
         groups.items[group_index].cell_count += (tagLayerCellCount(g, layer) + 1) * layer.rows;
     }
     for (groups.items[1..][0..groups.tracks], 1..) |group, index| {
@@ -5440,7 +5452,7 @@ fn renderFrame(
             if (layer.rows == 0) continue;
             const track_index = groupAt(&groups, layer.viewport.x, layer.viewport.y);
             // A notice floats over the panes, moving with its own.
-            const group_index = if (layer.kind == .notice) groups.notices else track_index;
+            const group_index = if (layer.kind == .notice) noticeGroup(&groups, layer) else track_index;
             emitTagLayer(g, instances, &cell_next[group_index], layer, win_w, win_h, groups.items[track_index].track, page, cursors_shown, false);
         }
         for (groups.items[1..][0..groups.tracks], 1..) |group, index| {
@@ -7374,8 +7386,8 @@ fn buildDecor(g: *Gui, gpa: std.mem.Allocator, surface: *const pardes.Surface, g
         // ruled off from the text beneath it the way a tag is: the same
         // colour and thickness along its bottom, running to the window's
         // edge when it does, fading up and dissolving with its band.
-        if (index == groups.notices) for (surface.tagLayers()) |*layer| {
-            if (layer.rows == 0 or layer.kind != .notice) continue;
+        for (surface.tagLayers()) |*layer| {
+            if (layer.rows == 0 or layer.kind != .notice or noticeGroup(groups, layer) != index) continue;
             const x0 = @as(f32, @floatFromInt(layer.viewport.x)) * layout.w;
             const x1 = x0 + @as(f32, @floatFromInt(layer.viewport.w)) * layout.w;
             const rule_x1 = if (win_w - x1 < layout.w) @max(x1, win_w) else x1;
@@ -7386,7 +7398,7 @@ fn buildDecor(g: *Gui, gpa: std.mem.Allocator, surface: *const pardes.Surface, g
             if (rule_y - 1 < top) continue;
             const track = groups.items[groupAt(groups, layer.viewport.x, layer.viewport.y)].track;
             try addDecor(g, gpa, x0, rule_y - 1, rule_x1, rule_y, chrome.border, layer.fade, track, win_w, win_h);
-        };
+        }
         if (index == groups.ink and cursors_shown) try cursorDecor(g, gpa, surface, layout, win_w, win_h);
     }
 }
-- 
cgit v1.3


From 7f179dc4d02cb726194dd73ea316230683f26494 Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 15:50:55 -0300
Subject: While anything moves, a notice stays in its own pane's group

Generalises vowtymmr (review): a pane sliding, zooming or opening over a
neighbour covers that neighbour's notice as a closing one does. Tier 4
holds notices only while nothing moves.

Shared files touched: gui.zig.
---
 docs/render-pipeline.md | 2 +-
 src/gui/gui.zig         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/gui')

diff --git a/docs/render-pipeline.md b/docs/render-pipeline.md
index 7299b357..d25323b6 100644
--- a/docs/render-pipeline.md
+++ b/docs/render-pipeline.md
@@ -810,7 +810,7 @@ stripped. No visual change until stage 9 unless stated.
 | 5 | JOIN: paint tags/notices/headers once into layers, copy into grid; the grid wins where the copies disagree, and each disagreement is listed for a later decision | goldens are the oracle; wide-grapheme re-clip at the edge (§3.2) |
 | 6 | body layer joined the same way (paint once, copy visible rows) | riskiest join; A/B the old double paint in a temporary test with tag_bottom on and off, then delete it |
 | 7 | Layer merge (TagLayer + BodyLayer), wire v8, web accessors | after the other agent lands; touches mouse hit paths; breaks the macOS shell's layer ABI (accepted: macOS build ignored for now); done: one `Layer` (src/Layer.zig) with `rows` (0 = no layer) and a `cursor{x, y}`; a tag of N rows is ONE layer of N grid rows (`tagHit` answers the row as `line`, `bodyHit` keeps its meaning), so the per-line layer bases are gone. Wire v8 ships rows, cursor y and the region list in the one bump; v7 and v9 peers are refused in both directions (tests). web: `tag_layer_value` 11 = rows, 12 = cursor y, and app.mjs lays every row. macOS: its Zig side compiles against `Layer`, but pardes.h still sees one row per tag layer (a taller tag shows its first row there) |
-| 8 | GUI draws from regions: role tiers with track groups in tiers 2-3, page cover, hard-edged snapped decor for rules/rails/grips (pane chrome in the pane's tier), per-instance clip; delete inference functions, `transient_on` and `mark_hover` (breaks macOS glass hover; accepted, macOS ignored for now) | stage-0 PPM goldens byte-identical (possible only because hard decor is snapped and not anti-aliased); pane chrome now also shows during transitions, which is the one allowed visible delta, listed Done: the frame is drawn in groups (makeGroups): tier 0, one group per track in paint order (tiers 2 and 3), tier 4 as two groups (the notices; then the guides and the debug box, which the core paints over them), tier 5 (bar cursors), each drawing cells, images, decor. Decor is every rule, rail, thumb, grip mark, spine, the workspace and column rules, the bottom band, notice rules and bar cursors: whole-pixel rects drawn by `decor.frag` over `ui.vert` as cell instances (colour in the ground, coverage in fg.r, blended like the overlay), so each carries its track's transition and clip; a closing pane's comes from the last frame's regions (`Surface.previous_regions`). Only `solid` exists yet: `decor.vert` and the other kinds (§5.1) come with the first effect that needs them. Deleted: taglineBaseRgb, topbarPaneBorderHeight, bottomTaglinePresent, frameChromeBg, cellBackgroundIs and the rail inference, paneGripCell's scan, transient_on, PaintPlan; one cover map (coverFrame: layer, grip and offset, focus, anchor, floating) is marked from layers and regions once a frame. New regions: `column` (spines, anchors, the focused column's tint), `guide`, `debug`; `Surface.chrome` is the palette, on the wire in v8 (not yet shipped, so no bump), and an attached GUI draws the same chrome (test). Per-instance clip (`CellInstance.clip_*`, 104 → 120 bytes an instance, ~15% more upload a frame) replaces the vertical transition's scissor. While a pane closes, notices stay in their own panes' groups, under the tombstone sliding over them. Goldens: 01-12 byte-identical; 13-17 differ only in pixels past the grid (with a picture on screen the image pass left the scissor at the grid's size, cutting every rule end, rail foot and band that runs into the leftover pixels; they now run to the edge as in every scene without one); 16-debug shows the debug box (it was drawn from the grid under the source's context-row layer, so the GUI never showed it there); 18-mid-transition is new (virtual clock, PanelSlide Newcol with the picture, frame 6 of 12: chrome moves with its pane). Other deltas, outside the goldens: a guide over a tag or a context-row body now shows; with WindowOpacity < 100 a layer's bar cursor is ink like the grid's; an attached GUI gains the focus tint, notice rules, spines and the theme's page and caret colours. Deferrals fixed: the GUI sleeps when idle (SDL and queue events wake it; a smooth scroll, a gamepad, the test feed, a shell's kill deadline, a present to retry still poll), and a minimized or occluded window sleeps through animation. Tracy, `gui frame build`, 200x60, terminal output plus scrolling, ReleaseFast, two interleaved runs of ~180 frames: before 992/1015 µs median, after 989/987 µs |
+| 8 | GUI draws from regions: role tiers with track groups in tiers 2-3, page cover, hard-edged snapped decor for rules/rails/grips (pane chrome in the pane's tier), per-instance clip; delete inference functions, `transient_on` and `mark_hover` (breaks macOS glass hover; accepted, macOS ignored for now) | stage-0 PPM goldens byte-identical (possible only because hard decor is snapped and not anti-aliased); pane chrome now also shows during transitions, which is the one allowed visible delta, listed Done: the frame is drawn in groups (makeGroups): tier 0, one group per track in paint order (tiers 2 and 3), tier 4 as two groups (the notices; then the guides and the debug box, which the core paints over them), tier 5 (bar cursors), each drawing cells, images, decor. Decor is every rule, rail, thumb, grip mark, spine, the workspace and column rules, the bottom band, notice rules and bar cursors: whole-pixel rects drawn by `decor.frag` over `ui.vert` as cell instances (colour in the ground, coverage in fg.r, blended like the overlay), so each carries its track's transition and clip; a closing pane's comes from the last frame's regions (`Surface.previous_regions`). Only `solid` exists yet: `decor.vert` and the other kinds (§5.1) come with the first effect that needs them. Deleted: taglineBaseRgb, topbarPaneBorderHeight, bottomTaglinePresent, frameChromeBg, cellBackgroundIs and the rail inference, paneGripCell's scan, transient_on, PaintPlan; one cover map (coverFrame: layer, grip and offset, focus, anchor, floating) is marked from layers and regions once a frame. New regions: `column` (spines, anchors, the focused column's tint), `guide`, `debug`; `Surface.chrome` is the palette, on the wire in v8 (not yet shipped, so no bump), and an attached GUI draws the same chrome (test). Per-instance clip (`CellInstance.clip_*`, 104 → 120 bytes an instance, ~15% more upload a frame) replaces the vertical transition's scissor. While any pane moves, opens or closes, notices stay in their own panes' groups, under whatever slides over them; tier 4 holds them only when nothing moves. Goldens: 01-12 byte-identical; 13-17 differ only in pixels past the grid (with a picture on screen the image pass left the scissor at the grid's size, cutting every rule end, rail foot and band that runs into the leftover pixels; they now run to the edge as in every scene without one); 16-debug shows the debug box (it was drawn from the grid under the source's context-row layer, so the GUI never showed it there); 18-mid-transition is new (virtual clock, PanelSlide Newcol with the picture, frame 6 of 12: chrome moves with its pane). Other deltas, outside the goldens: a guide over a tag or a context-row body now shows; with WindowOpacity < 100 a layer's bar cursor is ink like the grid's; an attached GUI gains the focus tint, notice rules, spines and the theme's page and caret colours. Deferrals fixed: the GUI sleeps when idle (SDL and queue events wake it; a smooth scroll, a gamepad, the test feed, a shell's kill deadline, a present to retry still poll), and a minimized or occluded window sleeps through animation. Tracy, `gui frame build`, 200x60, terminal output plus scrolling, ReleaseFast, two interleaved runs of ~180 frames: before 992/1015 µs median, after 989/987 µs |
 | 9 | post chain: glslang, Shadertoy prefix, ping-pong, ShaderAnimation, redraw levels A/B (§5.5); bundled CRT without barrel; delete scene_effects/crt.zig/crt.frag | first visual change (the CRT look) |
 | 10+ | `fx` bookmark: G1–G3 → feel review → G4 bundled → G5 lapis theme → P2s; tty T1–T2 → feel review → removals of audited effects (after user decision) → T3–T5 | each effect its own change, default off |
 
diff --git a/src/gui/gui.zig b/src/gui/gui.zig
index 39d7f61e..2cde5edf 100644
--- a/src/gui/gui.zig
+++ b/src/gui/gui.zig
@@ -2075,11 +2075,11 @@ fn groupOf(groups: *const Groups, serial: u32) usize {
     return 0;
 }
 
-/// A notice floats over the panes (tier 4), except while a pane closes: then
-/// it stays in its own pane's group, under the tombstone sliding over it.
+/// A notice floats over the panes and its pane's picture (tier 4) while
+/// nothing moves; while anything does it stays in its own pane's group, under
+/// whatever pane slides, opens or closes over it.
 fn noticeGroup(groups: *const Groups, layer: *const pardes.Layer) usize {
-    for (groups.items[1..][0..groups.tracks]) |group|
-        if (group.track.?.phase == .closing) return groupAt(groups, layer.viewport.x, layer.viewport.y);
+    if (groups.tracks > 0) return groupAt(groups, layer.viewport.x, layer.viewport.y);
     return groups.notices;
 }
 
-- 
cgit v1.3


From c6a5aaf5c4a020eaefe24943ecb6cf9d4eb26836 Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 15:57:22 -0300
Subject: Post chain: Shadertoy passes compiled by glslc; Crt, Ripple and
 Glitch rewritten as Shadertoy files

Stage 9 of docs/render-pipeline.md. src/gui/Post.zig runs the chain over
the finished frame: each pass reads the one before, ping-pong textures
between, the last writes the window; an empty chain is the direct path.
The prefix (shaders/post/prefix.glsl) is ghostty's uniform block, name
for name and offset for offset (tested against a copy of its Uniforms, the
selection colours by their GLSL names), at SDL GPU's bindings, y down.

A user's file (Shader <path>) is compiled by glslc with compileGlsl's own
flags on a thread of its own, taken in at the next loop step; errors name
the file's own lines; a failed compile keeps the last good pipeline;
glslc missing is said once. The bundled passes compile with the build,
through the same prefix.

Crt, Ripple and Glitch are Shadertoy files, rewritten: no barrel (input is
identity, tested), everything in linear light and dithered, keyed to iTime.
scene_effects, crt.zig and crt.frag.glsl are gone; the core keeps no clock
for the chain. ShaderAnimation off|on|always drives redraw level A: the
chain alone over the retained frame (34 us CPU a redraw, measured).

Shared files touched: pardes.zig (nextWake loses the scene line,
disableSceneEffects empties the chain, two tests), builtins.zig (one switch
arm), ninep/ctl.zig (two switch arms), macos.zig (flags from the chain),
gui.zig. Not touched: Messages.zig, mouse.zig, detached/*, host_io, tty.
---
 build.zig                              |  28 +-
 docs/render-pipeline.md                |  28 +-
 shaders/crt.frag.glsl                  | 175 -----------
 shaders/crt.vert.glsl                  |   9 -
 shaders/post.vert.glsl                 |  10 +
 shaders/post/crt.glsl                  |  79 +++++
 shaders/post/glitch.glsl               |  60 ++++
 shaders/post/prefix.glsl               |  67 ++++
 shaders/post/ripple.glsl               |  49 +++
 shaders/prebuilt/crt.frag.glsl         | 175 -----------
 shaders/prebuilt/crt.frag.spv          | Bin 13832 -> 0 bytes
 shaders/prebuilt/crt.vert.glsl         |   9 -
 shaders/prebuilt/crt.vert.spv          | Bin 1208 -> 0 bytes
 shaders/prebuilt/post-crt.frag.glsl    | 146 +++++++++
 shaders/prebuilt/post-crt.frag.spv     | Bin 0 -> 9480 bytes
 shaders/prebuilt/post-glitch.frag.glsl | 127 ++++++++
 shaders/prebuilt/post-glitch.frag.spv  | Bin 0 -> 8308 bytes
 shaders/prebuilt/post-ripple.frag.glsl | 116 +++++++
 shaders/prebuilt/post-ripple.frag.spv  | Bin 0 -> 7180 bytes
 shaders/prebuilt/post.vert.glsl        |  10 +
 shaders/prebuilt/post.vert.spv         | Bin 0 -> 1208 bytes
 src/animation.zig                      |   6 -
 src/builtins.zig                       |   2 +-
 src/config.zig                         | 150 ++++++++-
 src/effect_sources.zig                 |  23 +-
 src/gui/Post.zig                       | 559 +++++++++++++++++++++++++++++++++
 src/gui/crt.zig                        | 101 ------
 src/gui/gui.zig                        | 338 ++++++++++----------
 src/macos.zig                          |  23 +-
 src/ninep/ctl.zig                      |   4 +-
 src/pardes.zig                         |  28 +-
 31 files changed, 1611 insertions(+), 711 deletions(-)
 delete mode 100644 shaders/crt.frag.glsl
 delete mode 100644 shaders/crt.vert.glsl
 create mode 100644 shaders/post.vert.glsl
 create mode 100644 shaders/post/crt.glsl
 create mode 100644 shaders/post/glitch.glsl
 create mode 100644 shaders/post/prefix.glsl
 create mode 100644 shaders/post/ripple.glsl
 delete mode 100644 shaders/prebuilt/crt.frag.glsl
 delete mode 100644 shaders/prebuilt/crt.frag.spv
 delete mode 100644 shaders/prebuilt/crt.vert.glsl
 delete mode 100644 shaders/prebuilt/crt.vert.spv
 create mode 100644 shaders/prebuilt/post-crt.frag.glsl
 create mode 100644 shaders/prebuilt/post-crt.frag.spv
 create mode 100644 shaders/prebuilt/post-glitch.frag.glsl
 create mode 100644 shaders/prebuilt/post-glitch.frag.spv
 create mode 100644 shaders/prebuilt/post-ripple.frag.glsl
 create mode 100644 shaders/prebuilt/post-ripple.frag.spv
 create mode 100644 shaders/prebuilt/post.vert.glsl
 create mode 100644 shaders/prebuilt/post.vert.spv
 create mode 100644 src/gui/Post.zig
 delete mode 100644 src/gui/crt.zig

(limited to 'src/gui')

diff --git a/build.zig b/build.zig
index 803f773d..c1117593 100644
--- a/build.zig
+++ b/build.zig
@@ -50,7 +50,11 @@ const gui_shaders = [_][]const u8{
     "decor.frag",
     "overlay.vert", "overlay.frag",
     "image.vert",   "image.frag",
-    "crt.vert",     "crt.frag",
+    "post.vert",
+    // The bundled post passes: shaders/post/<name>.glsl behind the Shadertoy
+    // prefix (shaderSource).
+    "post-crt.frag", "post-ripple.frag",
+    "post-glitch.frag",
 };
 
 pub fn build(b: *std.Build) void {
@@ -161,7 +165,7 @@ pub fn build(b: *std.Build) void {
     for (gui_shaders) |name| {
         update_shaders.addCopyFileToSource(compileGlsl(b, name), b.fmt("shaders/prebuilt/{s}.spv", .{name}));
         update_shaders.addCopyFileToSource(
-            b.path(b.fmt("shaders/{s}.glsl", .{name})),
+            shaderSource(b, name),
             b.fmt("shaders/prebuilt/{s}.glsl", .{name}),
         );
     }
@@ -691,7 +695,7 @@ pub fn build(b: *std.Build) void {
         mod.addOptions("pardes_isolation", if (isolated_mod == mod) iso_on else iso_off);
         if (shell == .gui) for (gui_shaders) |name| mod.addAnonymousImport(
             b.fmt("effect-source-{s}.glsl", .{name}),
-            .{ .root_source_file = b.path(b.fmt("{s}/{s}.glsl", .{ gui_effect_source_dir, name })) },
+            .{ .root_source_file = if (prebuilt_shaders) b.path(b.fmt("{s}/{s}.glsl", .{ gui_effect_source_dir, name })) else shaderSource(b, name) },
         );
         if (shell == .macos) mod.addAnonymousImport("effect-source-crt.ci.metal", .{
             .root_source_file = b.path("shaders/crt.ci.metal"),
@@ -756,6 +760,8 @@ pub fn build(b: *std.Build) void {
         gm.addAnonymousImport("AdwaitaMono-Regular.ttf", .{
             .root_source_file = b.path("assets/AdwaitaMono-Regular.ttf"),
         });
+        // Put before a user's Shadertoy file when the gui compiles it.
+        gm.addAnonymousImport("post-prefix.glsl", .{ .root_source_file = b.path("shaders/post/prefix.glsl") });
         for (gui_shaders) |name| gm.addAnonymousImport(b.fmt("{s}.spv", .{name}), .{
             .root_source_file = if (prebuilt_shaders)
                 b.path(b.fmt("shaders/prebuilt/{s}.spv", .{name}))
@@ -1444,7 +1450,6 @@ pub fn build(b: *std.Build) void {
             .{ .path = "src/esp32p4/input_rescue.zig", .libc = false },
             .{ .path = "src/fonts.zig", .libc = true },
             .{ .path = "src/c_heap.zig", .libc = false },
-            .{ .path = "src/gui/crt.zig", .libc = false },
         }) |entry| {
             const tests = b.addTest(.{
                 .root_module = b.createModule(.{
@@ -1626,10 +1631,23 @@ fn reindexed(b: *std.Build, archive: std.Build.LazyPath, index: usize) std.Build
 
 // glslc shaders/<name>.glsl -fshader-stage=<vertex|fragment> -o <name>.spv,
 // returned as a LazyPath for @embedFile. The stage is the name's own suffix.
+/// The GLSL a shader is compiled from: shaders/<name>.glsl, or for a bundled
+/// post pass (post-<name>.frag) shaders/post/<name>.glsl behind the Shadertoy
+/// prefix, the one the gui puts before a user's file at run time.
+fn shaderSource(b: *std.Build, name: []const u8) std.Build.LazyPath {
+    if (!std.mem.startsWith(u8, name, "post-")) return b.path(b.fmt("shaders/{s}.glsl", .{name}));
+    const joined = b.addSystemCommand(&.{"cat"});
+    joined.addFileArg(b.path("shaders/post/prefix.glsl"));
+    joined.addFileArg(b.path(b.fmt("shaders/post/{s}.glsl", .{name["post-".len .. name.len - ".frag".len]})));
+    return joined.captureStdOut(.{});
+}
+
+/// The one glslc invocation every shader is compiled with, at build time here
+/// and at run time for a user's post pass (src/gui/Post.zig).
 fn compileGlsl(b: *std.Build, name: []const u8) std.Build.LazyPath {
     const stage = if (std.mem.endsWith(u8, name, ".vert")) "vertex" else "fragment";
     const cmd = b.addSystemCommand(&.{ "glslc", b.fmt("-fshader-stage={s}", .{stage}) });
-    cmd.addFileArg(b.path(b.fmt("shaders/{s}.glsl", .{name})));
+    cmd.addFileArg(shaderSource(b, name));
     cmd.addArg("-o");
     return cmd.addOutputFileArg(b.fmt("{s}.spv", .{name}));
 }
diff --git a/docs/render-pipeline.md b/docs/render-pipeline.md
index d25323b6..254187a3 100644
--- a/docs/render-pipeline.md
+++ b/docs/render-pipeline.md
@@ -491,21 +491,27 @@ Mirror ghostty 1.3.2 (`zig-pkg/ghostty-*/src/renderer/shadertoy.zig`,
   ≈3 cells, at the corners of a 4K screen, where the grips and rails are.
   `crt.zig` is deleted. If the user insists on barrel in the bundled CRT, keep
   `crt.zig`'s inverse keyed to "bundled crt active".
-- **Compile**: GLSL → SPIR-V at runtime with glslang (ghostty's `pkg/glslang`,
-  the same vendored package in zig-pkg, GUI build only, behind `-Dshadertoy`).
-  Compiled on load and on file change (file_watch), never on the frame path;
-  the last good pipeline stays on error; the error is a pane message. glslang is
-  C++ with its own allocator: a recorded exception to the "Zig allocator hooks
-  in all C deps" policy.
+- **Compile** (decision 3): a user's file is compiled by spawning `glslc` with
+  the build's own invocation (`-fshader-stage=fragment <file> -o -`, SPIR-V on
+  stdout), on a thread of its own when the file joins the chain, never on the
+  frame path; the result is taken in at the next loop step. The prefix ends in
+  `#line 1`, so glslc's errors count the file's own lines, and they name the
+  file, not the temporary source. A failed compile keeps the file's last good
+  pipeline and says glslc's first line as a message; glslc missing is said
+  once, and only files stay off (the bundled passes are compiled with the
+  build, through the same prefix). No file watching: `Shader <path>` twice
+  (out, then in) compiles it again.
 - **Animation mode**: `ShaderAnimation off|on|always` (ghostty's
   `custom-shader-animation`): off = redraw only when content changes; on =
   continuous while the window is focused; always = continuous. Continuous means
   the shell redraws its retained Surface (3.1), never a core tick or render.
 - **Existing crt/ripple/glitch** become bundled Shadertoy files in
-  `shaders/post/` selected by the same builtins; `scene_effects` and
-  `crt.frag.glsl`/`crt.zig` are deleted. The bundled CRT is rewritten to
-  quality (6.1); ripple and glitch are dropped unless the feel review keeps a
-  rewritten version.
+  `shaders/post/` selected by the same builtins (decision 2: kept, polished);
+  `scene_effects` and `crt.frag.glsl`/`crt.zig` are deleted. The chain is
+  `Crt`, `Ripple`, `Glitch` and `Shader <path>` in the order they were put in
+  (`Shader off` empties it of files), `ShaderAnimation off|on|always`
+  (default on). The core keeps no clock for it: level A redraws are the
+  shell's.
 - macOS (out of scope) would need spirv-cross → MSL, as ghostty does.
 
 Region filters (e.g. "tint/blur one pane") are NOT built. If one is ever needed:
@@ -811,7 +817,7 @@ stripped. No visual change until stage 9 unless stated.
 | 6 | body layer joined the same way (paint once, copy visible rows) | riskiest join; A/B the old double paint in a temporary test with tag_bottom on and off, then delete it |
 | 7 | Layer merge (TagLayer + BodyLayer), wire v8, web accessors | after the other agent lands; touches mouse hit paths; breaks the macOS shell's layer ABI (accepted: macOS build ignored for now); done: one `Layer` (src/Layer.zig) with `rows` (0 = no layer) and a `cursor{x, y}`; a tag of N rows is ONE layer of N grid rows (`tagHit` answers the row as `line`, `bodyHit` keeps its meaning), so the per-line layer bases are gone. Wire v8 ships rows, cursor y and the region list in the one bump; v7 and v9 peers are refused in both directions (tests). web: `tag_layer_value` 11 = rows, 12 = cursor y, and app.mjs lays every row. macOS: its Zig side compiles against `Layer`, but pardes.h still sees one row per tag layer (a taller tag shows its first row there) |
 | 8 | GUI draws from regions: role tiers with track groups in tiers 2-3, page cover, hard-edged snapped decor for rules/rails/grips (pane chrome in the pane's tier), per-instance clip; delete inference functions, `transient_on` and `mark_hover` (breaks macOS glass hover; accepted, macOS ignored for now) | stage-0 PPM goldens byte-identical (possible only because hard decor is snapped and not anti-aliased); pane chrome now also shows during transitions, which is the one allowed visible delta, listed Done: the frame is drawn in groups (makeGroups): tier 0, one group per track in paint order (tiers 2 and 3), tier 4 as two groups (the notices; then the guides and the debug box, which the core paints over them), tier 5 (bar cursors), each drawing cells, images, decor. Decor is every rule, rail, thumb, grip mark, spine, the workspace and column rules, the bottom band, notice rules and bar cursors: whole-pixel rects drawn by `decor.frag` over `ui.vert` as cell instances (colour in the ground, coverage in fg.r, blended like the overlay), so each carries its track's transition and clip; a closing pane's comes from the last frame's regions (`Surface.previous_regions`). Only `solid` exists yet: `decor.vert` and the other kinds (§5.1) come with the first effect that needs them. Deleted: taglineBaseRgb, topbarPaneBorderHeight, bottomTaglinePresent, frameChromeBg, cellBackgroundIs and the rail inference, paneGripCell's scan, transient_on, PaintPlan; one cover map (coverFrame: layer, grip and offset, focus, anchor, floating) is marked from layers and regions once a frame. New regions: `column` (spines, anchors, the focused column's tint), `guide`, `debug`; `Surface.chrome` is the palette, on the wire in v8 (not yet shipped, so no bump), and an attached GUI draws the same chrome (test). Per-instance clip (`CellInstance.clip_*`, 104 → 120 bytes an instance, ~15% more upload a frame) replaces the vertical transition's scissor. While any pane moves, opens or closes, notices stay in their own panes' groups, under whatever slides over them; tier 4 holds them only when nothing moves. Goldens: 01-12 byte-identical; 13-17 differ only in pixels past the grid (with a picture on screen the image pass left the scissor at the grid's size, cutting every rule end, rail foot and band that runs into the leftover pixels; they now run to the edge as in every scene without one); 16-debug shows the debug box (it was drawn from the grid under the source's context-row layer, so the GUI never showed it there); 18-mid-transition is new (virtual clock, PanelSlide Newcol with the picture, frame 6 of 12: chrome moves with its pane). Other deltas, outside the goldens: a guide over a tag or a context-row body now shows; with WindowOpacity < 100 a layer's bar cursor is ink like the grid's; an attached GUI gains the focus tint, notice rules, spines and the theme's page and caret colours. Deferrals fixed: the GUI sleeps when idle (SDL and queue events wake it; a smooth scroll, a gamepad, the test feed, a shell's kill deadline, a present to retry still poll), and a minimized or occluded window sleeps through animation. Tracy, `gui frame build`, 200x60, terminal output plus scrolling, ReleaseFast, two interleaved runs of ~180 frames: before 992/1015 µs median, after 989/987 µs |
-| 9 | post chain: glslang, Shadertoy prefix, ping-pong, ShaderAnimation, redraw levels A/B (§5.5); bundled CRT without barrel; delete scene_effects/crt.zig/crt.frag | first visual change (the CRT look) |
+| 9 | post chain: glslang, Shadertoy prefix, ping-pong, ShaderAnimation, redraw levels A/B (§5.5); bundled CRT without barrel; delete scene_effects/crt.zig/crt.frag | first visual change (the CRT look) Done: src/gui/Post.zig, shaders/post/ (prefix, crt, ripple, glitch), post.vert. glslc (decision 3) with compileGlsl's flags, off the frame path; ghostty's Uniforms matched offset for offset by a test against a copy, and the prefix's block checked name by name; ghostty's test_shadertoy_crt and _focus compile, _invalid fails with glslc's words. Level A measured (Tracy, 200x60, Crt, idle 10 s): 215 chain-only redraws at 34 µs median CPU each, 6 core frames (957 µs) in the same time; the core's clock stays idle. Input is identity (test: the corner click with Crt on). The three bundled passes were rewritten: Crt without barrel or tube edge, scanlines and mask that average to one, dithered vignette; Ripple as rings in pixels, eased in, lit on their slopes in linear light, dithered; Glitch as short eased bursts of torn bands with an RGB split, keyed to iTime. Before/after stills for the user's judgement. |
 | 10+ | `fx` bookmark: G1–G3 → feel review → G4 bundled → G5 lapis theme → P2s; tty T1–T2 → feel review → removals of audited effects (after user decision) → T3–T5 | each effect its own change, default off |
 
 Tests to add: fixed-clock animation tests (Tween/Spring closed form, retarget
diff --git a/shaders/crt.frag.glsl b/shaders/crt.frag.glsl
deleted file mode 100644
index b0b0b93b..00000000
--- a/shaders/crt.frag.glsl
+++ /dev/null
@@ -1,175 +0,0 @@
-#version 450
-
-// The Crt builtin's post-process. Screen point cc shows the scene at
-// uv' = cc*(1 + BARREL*r2), and src/gui/crt.zig maps mouse input through that
-// same transform — keep them equal or clicks drift near the edges.
-
-layout(set = 2, binding = 0) uniform sampler2D u_scene;
-layout(std140, set = 3, binding = 0) uniform CrtUniforms {
-    float time_seconds;
-    float frame;
-    vec2 viewport;
-    // x = CRT, y = ripple, z = glitch. One scene pass can combine them.
-    vec4 effects;
-} u_crt;
-
-layout(location = 0) out vec4 o_col;
-
-const float TAU = 6.28318530718;
-const float BARREL = 0.016; // MUST match src/gui/crt.zig barrel
-const float EDGE_SOFTNESS_PX = 3.5;
-const float CHROMA_PX = 0.28; // radial R/B separation in physical pixels at r2=1
-const float BLOOM_RADIUS_PX = 1.75;
-const float BLOOM_THRESHOLD = 0.60; // linear-light channel peak
-const float BLOOM_SOFTNESS = 0.25;
-const float BLOOM_STRENGTH = 0.045;
-const float SCAN_PERIOD_PX = 3.0;
-const float SCAN_STRENGTH = 0.055;
-const float MASK_PERIOD_PX = 3.0;
-const float MASK_STRENGTH = 0.015;
-const float VIGNETTE_STRENGTH = 0.11; // 11% only at the extreme corners
-const float HUM_STRENGTH = 0.0025;
-const float NOISE_STRENGTH = 0.0020;
-const float EXPOSURE = 1.012;
-
-vec3 srgbToLinear(vec3 c) {
-    vec3 low = c / 12.92;
-    vec3 high = pow((c + 0.055) / 1.055, vec3(2.4));
-    return mix(high, low, lessThanEqual(c, vec3(0.04045)));
-}
-
-vec3 linearToSrgb(vec3 c) {
-    c = max(c, vec3(0.0));
-    vec3 low = c * 12.92;
-    vec3 high = 1.055 * pow(c, vec3(1.0 / 2.4)) - 0.055;
-    return mix(high, low, lessThanEqual(c, vec3(0.0031308)));
-}
-
-vec3 sceneLinear(vec2 uv) {
-    return srgbToLinear(texture(u_scene, uv).rgb);
-}
-
-vec3 brightPass(vec2 uv) {
-    vec3 c = sceneLinear(uv);
-    float peak = max(c.r, max(c.g, c.b));
-    return c * smoothstep(BLOOM_THRESHOLD, BLOOM_THRESHOLD + BLOOM_SOFTNESS, peak);
-}
-
-float noiseAt(vec2 p) {
-    vec3 q = fract(vec3(p.xyx) * 0.1031);
-    q += dot(q, q.yzx + 33.33);
-    return fract((q.x + q.y) * q.z);
-}
-
-// The non-CRT scene effects deliberately distort the source coordinates,
-// rather than remapping the final colors. Themes retain their palette and the
-// effects remain composable with the linear-light CRT treatment below.
-vec2 sceneUv(vec2 uv) {
-    if (u_crt.effects.y > 0.5) {
-        vec2 centered = uv - 0.5;
-        float radius = length(centered);
-        float envelope = 1.0 - smoothstep(0.04, 0.72, radius);
-        float wave = sin(radius * 42.0 - u_crt.time_seconds * 5.2);
-        uv += centered / max(radius, 0.00001) * wave * envelope * 0.0032;
-    }
-    if (u_crt.effects.z > 0.5) {
-        float band = floor(uv.y * 96.0);
-        float seed = noiseAt(vec2(band, floor(u_crt.time_seconds * 13.0)));
-        float tear = smoothstep(0.955, 1.0, seed);
-        uv.x += (noiseAt(vec2(seed, band)) - 0.5) * tear * 0.020;
-    }
-    return uv;
-}
-
-// The scene, ALPHA INCLUDED: with a see-through ground the grid arrives
-// premultiplied and partly empty, and a pass that dropped .a would turn the
-// desktop behind a `*_transparent` theme into opaque black the moment Crt,
-// Ripple or Glitch came on.
-vec4 sceneSrgb(vec2 uv) {
-    vec2 warped = sceneUv(uv);
-    vec4 center = texture(u_scene, warped);
-    if (u_crt.effects.z <= 0.5) return center;
-
-    float band = floor(warped.y * 96.0);
-    float seed = noiseAt(vec2(band, floor(u_crt.time_seconds * 13.0)));
-    float tear = smoothstep(0.955, 1.0, seed);
-    vec2 chroma = vec2((0.35 + 1.25 * tear) / u_crt.viewport.x, 0.0);
-    return vec4(
-        texture(u_scene, warped + chroma).r,
-        center.g,
-        texture(u_scene, warped - chroma).b,
-        center.a
-    );
-}
-
-vec3 effectSceneLinear(vec2 uv) {
-    return srgbToLinear(sceneSrgb(uv).rgb);
-}
-
-void main() {
-    vec2 size = u_crt.viewport;
-    vec2 texel = 1.0 / size;
-    vec2 cc = gl_FragCoord.xy / size * 2.0 - 1.0;
-    float r2 = dot(cc, cc);
-    vec2 uv = cc * (1.0 + BARREL * r2 * u_crt.effects.x) * 0.5 + 0.5;
-
-    // Ripple and glitch are useful without the CRT. They only move samples;
-    // skip every tube-specific light/mask/exposure adjustment.
-    if (u_crt.effects.x <= 0.5) {
-        // The scene texture is already sRGB. Avoid a needless transfer-curve
-        // round trip so a coordinate-only effect preserves theme bytes.
-        vec4 s = sceneSrgb(uv);
-        o_col = vec4(clamp(s.rgb, 0.0, 1.0), clamp(s.a, 0.0, 1.0));
-        return;
-    }
-
-    vec3 col = vec3(0.0);
-    // Outside the tube nothing is drawn, so nothing is covered either: the
-    // old opaque black there would have punched a rectangle out of the
-    // compositor's backdrop.
-    float alpha = 0.0;
-    float edge = min(min(uv.x, uv.y), min(1.0 - uv.x, 1.0 - uv.y));
-    if (edge > 0.0) {
-        vec3 center = effectSceneLinear(uv);
-        vec2 chroma = cc * (CHROMA_PX * r2) * texel;
-        // Each radial sample follows the same ripple/glitch path from its own
-        // pre-warp coordinate. This is also how the Metal kernel composes the
-        // effects; sampling a once-warped center here made combined effects
-        // diverge between the two GUI backends.
-        col = vec3(
-            effectSceneLinear(uv + chroma).r,
-            center.g,
-            effectSceneLinear(uv - chroma).b
-        );
-
-        vec2 bloom_px = texel * BLOOM_RADIUS_PX;
-        vec3 bloom = brightPass(uv + vec2(bloom_px.x, 0.0)) +
-            brightPass(uv - vec2(bloom_px.x, 0.0)) +
-            brightPass(uv + vec2(0.0, bloom_px.y)) +
-            brightPass(uv - vec2(0.0, bloom_px.y));
-        col += bloom * (0.25 * BLOOM_STRENGTH);
-
-        // The mask has unit mean and the scan loss stays small; neither needs
-        // the old global lift that remapped every theme toward white.
-        float scan_wave = 0.5 + 0.5 * cos(gl_FragCoord.y * TAU / SCAN_PERIOD_PX);
-        col *= 1.0 - SCAN_STRENGTH * scan_wave * scan_wave;
-        vec3 mask = 1.0 + MASK_STRENGTH * cos(
-            gl_FragCoord.x * TAU / MASK_PERIOD_PX + vec3(0.0, TAU / 3.0, 2.0 * TAU / 3.0)
-        );
-        col *= mask;
-
-        vec2 edge_px = min(uv, 1.0 - uv) * size;
-        float tube = smoothstep(0.0, EDGE_SOFTNESS_PX, min(edge_px.x, edge_px.y));
-        float vignette = 1.0 - VIGNETTE_STRENGTH * pow(clamp(r2 * 0.5, 0.0, 1.0), 1.6);
-        float hum = 1.0 + HUM_STRENGTH * sin((uv.y * 1.35 - u_crt.time_seconds * 0.11) * TAU);
-        col *= tube * vignette * hum * EXPOSURE;
-        // The tube's edge falloff dims coverage as well as colour; everything
-        // else here is a light adjustment and leaves it alone.
-        alpha = sceneSrgb(uv).a * tube;
-
-        float luma = dot(col, vec3(0.2126, 0.7152, 0.0722));
-        vec2 noise_seed = gl_FragCoord.xy + vec2(u_crt.frame * 17.0, u_crt.frame * 59.0);
-        col += (noiseAt(noise_seed) - 0.5) * NOISE_STRENGTH * (0.15 + 0.85 * clamp(luma, 0.0, 1.0));
-    }
-    o_col = vec4(linearToSrgb(clamp(col, 0.0, 1.0)), clamp(alpha, 0.0, 1.0));
-}
diff --git a/shaders/crt.vert.glsl b/shaders/crt.vert.glsl
deleted file mode 100644
index 4e15fcdf..00000000
--- a/shaders/crt.vert.glsl
+++ /dev/null
@@ -1,9 +0,0 @@
-#version 450
-
-// CRT post-process pass: one fullscreen triangle from gl_VertexIndex, no
-// vertex buffer. The fragment shader derives uv from gl_FragCoord.
-
-void main() {
-    vec2 p = vec2(float((gl_VertexIndex << 1) & 2), float(gl_VertexIndex & 2));
-    gl_Position = vec4(p * 2.0 - 1.0, 0.0, 1.0);
-}
diff --git a/shaders/post.vert.glsl b/shaders/post.vert.glsl
new file mode 100644
index 00000000..86739a65
--- /dev/null
+++ b/shaders/post.vert.glsl
@@ -0,0 +1,10 @@
+#version 450
+
+// A post pass (docs/render-pipeline.md §6): one fullscreen triangle from
+// gl_VertexIndex, no vertex buffer. The Shadertoy fragment shader works from
+// gl_FragCoord, y down, as its fragCoord.
+
+void main() {
+    vec2 p = vec2(float((gl_VertexIndex << 1) & 2), float(gl_VertexIndex & 2));
+    gl_Position = vec4(p * 2.0 - 1.0, 0.0, 1.0);
+}
diff --git a/shaders/post/crt.glsl b/shaders/post/crt.glsl
new file mode 100644
index 00000000..16a5cdd9
--- /dev/null
+++ b/shaders/post/crt.glsl
@@ -0,0 +1,79 @@
+// Crt: a slot-mask tube's light, with nothing that moves a pixel. There is
+// no barrel: every click lands where it is drawn, rails and grips at the
+// window's edges included. What is left is light: a beam profile for the
+// scanlines, an aperture mask, a soft bloom of the brightest ink, a faint
+// vignette and the hum of a live tube. Everything is worked out in linear
+// light and dithered back into 8 bits, so the vignette never bands. It is a
+// Shadertoy file: pardes puts its prefix before it (shaders/post/prefix.glsl).
+
+const float TAU = 6.28318530718;
+const float CHROMA_PX = 0.35;       // red and blue apart, at the corners
+const float BLOOM_RADIUS_PX = 1.75;
+const float BLOOM_THRESHOLD = 0.60; // linear-light channel peak
+const float BLOOM_SOFTNESS = 0.25;
+const float BLOOM_STRENGTH = 0.05;
+const float SCAN_PERIOD_PX = 3.0;
+const float SCAN_STRENGTH = 0.07;
+const float MASK_PERIOD_PX = 3.0;
+const float MASK_STRENGTH = 0.018;
+const float VIGNETTE_STRENGTH = 0.12; // at the far corners only
+const float HUM_STRENGTH = 0.004;
+const float HUM_HZ = 0.11;
+const float EXPOSURE = 1.015;
+
+vec3 toLinear(vec3 c) {
+    return mix(pow((c + 0.055) / 1.055, vec3(2.4)), c / 12.92, lessThanEqual(c, vec3(0.04045)));
+}
+
+vec3 toSrgb(vec3 c) {
+    c = max(c, vec3(0.0));
+    return mix(1.055 * pow(c, vec3(1.0 / 2.4)) - 0.055, c * 12.92, lessThanEqual(c, vec3(0.0031308)));
+}
+
+vec3 scene(vec2 uv) {
+    return toLinear(texture(iChannel0, uv).rgb);
+}
+
+vec3 brightPass(vec2 uv) {
+    vec3 c = scene(uv);
+    float peak = max(c.r, max(c.g, c.b));
+    return c * smoothstep(BLOOM_THRESHOLD, BLOOM_THRESHOLD + BLOOM_SOFTNESS, peak);
+}
+
+// Interleaved gradient noise: a dither with no visible pattern.
+float ign(vec2 p) {
+    return fract(52.9829189 * fract(dot(p, vec2(0.06711056, 0.00583715))));
+}
+
+void mainImage(out vec4 fragColor, in vec2 fragCoord) {
+    vec2 size = iResolution.xy;
+    vec2 texel = 1.0 / size;
+    vec2 uv = fragCoord / size;
+    vec2 cc = uv * 2.0 - 1.0;
+    float r2 = dot(cc, cc);
+
+    // The beam converges least at the corners: red and blue drift apart
+    // there, by a third of a pixel.
+    vec2 chroma = cc * (CHROMA_PX * r2 * 0.5) * texel;
+    vec3 col = vec3(scene(uv + chroma).r, scene(uv).g, scene(uv - chroma).b);
+
+    vec2 b = texel * BLOOM_RADIUS_PX;
+    vec3 bloom = brightPass(uv + vec2(b.x, 0.0)) + brightPass(uv - vec2(b.x, 0.0)) +
+        brightPass(uv + vec2(0.0, b.y)) + brightPass(uv - vec2(0.0, b.y));
+    col += bloom * (0.25 * BLOOM_STRENGTH);
+
+    // A beam is brightest on its line and falls off between lines; the
+    // mask is three phosphor stripes a triad. Both average to one, so the
+    // theme keeps its brightness.
+    float line = 0.5 + 0.5 * cos(fragCoord.y * TAU / SCAN_PERIOD_PX);
+    col *= 1.0 - SCAN_STRENGTH * (line * line - 0.375) / 0.625;
+    col *= 1.0 + MASK_STRENGTH * cos(fragCoord.x * TAU / MASK_PERIOD_PX + vec3(0.0, TAU / 3.0, 2.0 * TAU / 3.0));
+
+    float vignette = 1.0 - VIGNETTE_STRENGTH * pow(clamp(r2 * 0.5, 0.0, 1.0), 1.6);
+    float hum = 1.0 + HUM_STRENGTH * sin((uv.y * 1.35 - iTime * HUM_HZ) * TAU);
+    col *= vignette * hum * EXPOSURE;
+
+    vec3 srgb = toSrgb(col);
+    srgb += (ign(fragCoord + float(iFrame % 64) * vec2(5.588238, 5.588238)) - 0.5) / 255.0;
+    fragColor = vec4(clamp(srgb, 0.0, 1.0), texture(iChannel0, uv).a);
+}
diff --git a/shaders/post/glitch.glsl b/shaders/post/glitch.glsl
new file mode 100644
index 00000000..ff9ebcb8
--- /dev/null
+++ b/shaders/post/glitch.glsl
@@ -0,0 +1,60 @@
+// Glitch: now and then the signal slips. Every couple of seconds a short
+// burst tears a few horizontal bands sideways and pulls their red and blue
+// apart; the bands are sized in pixels and the burst eases in and out over
+// a fraction of a second, so it reads as one event rather than a flicker,
+// and it looks the same at 60 or 144 Hz because every step is keyed to
+// iTime, not to frames. Between bursts the page is left exactly as it is.
+// A torn band's brightness dips in linear light. It is a Shadertoy file:
+// pardes puts its prefix before it.
+
+const float PERIOD = 2.4;           // seconds between bursts, on average
+const float BURST = 0.28;           // seconds a burst lasts
+const float STEP_HZ = 24.0;         // how often a burst re-tears
+const float SHIFT_PX = 14.0;
+const float SPLIT_PX = 2.5;
+const float DIP = 0.12;
+
+float hash(vec2 p) {
+    vec3 q = fract(vec3(p.xyx) * 0.1031);
+    q += dot(q, q.yzx + 33.33);
+    return fract((q.x + q.y) * q.z);
+}
+
+vec3 toLinear(vec3 c) {
+    return mix(pow((c + 0.055) / 1.055, vec3(2.4)), c / 12.92, lessThanEqual(c, vec3(0.04045)));
+}
+
+vec3 toSrgb(vec3 c) {
+    c = max(c, vec3(0.0));
+    return mix(1.055 * pow(c, vec3(1.0 / 2.4)) - 0.055, c * 12.92, lessThanEqual(c, vec3(0.0031308)));
+}
+
+void mainImage(out vec4 fragColor, in vec2 fragCoord) {
+    vec2 size = iResolution.xy;
+    vec2 uv = fragCoord / size;
+    // Which burst window this is, when in it the burst starts, and how far
+    // into the burst we are: 0 outside one.
+    float window = floor(iTime / PERIOD);
+    float start = window * PERIOD + hash(vec2(window, 7.0)) * (PERIOD - BURST);
+    float t = (iTime - start) / BURST;
+    float live = step(0.0, t) * step(t, 1.0);
+    float envelope = live * sin(3.14159265 * clamp(t, 0.0, 1.0));
+    if (envelope <= 0.0) {
+        fragColor = texture(iChannel0, uv);
+        return;
+    }
+    // Bands of 6 to 40 px, re-cut at STEP_HZ during the burst; about one
+    // band in four tears.
+    float tick = floor(iTime * STEP_HZ);
+    float band_px = mix(6.0, 40.0, hash(vec2(tick, 3.0)));
+    float band = floor(fragCoord.y / band_px);
+    float roll = hash(vec2(band, tick));
+    float tear = smoothstep(0.72, 0.9, roll) * envelope;
+    float shift = (hash(vec2(tick, band + 11.0)) - 0.5) * 2.0 * SHIFT_PX * tear;
+    vec2 at = vec2(fragCoord.x + shift, fragCoord.y);
+    vec2 split = vec2(SPLIT_PX * tear, 0.0);
+    vec4 center = texture(iChannel0, at / size);
+    vec3 col = vec3(texture(iChannel0, (at + split) / size).r, center.g, texture(iChannel0, (at - split) / size).b);
+    col = toSrgb(toLinear(col) * (1.0 - DIP * tear));
+    fragColor = vec4(col, center.a);
+}
diff --git a/shaders/post/prefix.glsl b/shaders/post/prefix.glsl
new file mode 100644
index 00000000..efa49483
--- /dev/null
+++ b/shaders/post/prefix.glsl
@@ -0,0 +1,67 @@
+#version 450
+// pardes's Shadertoy prefix (docs/render-pipeline.md §6), put before every
+// post pass: a bundled one in shaders/post/ at build time, a user's file at
+// run time. The uniform names, types and std140 order are ghostty 1.3.2's
+// (src/renderer/shaders/shadertoy_prefix.glsl), so a shader written for
+// ghostty runs here; only the bindings are SDL GPU's (a fragment shader's
+// textures in set 2, its uniform blocks in set 3). Y is down everywhere, as
+// on ghostty's Metal renderer: fragCoord, iChannel0's uv and the cursor
+// rectangles share one top-left space, and iCurrentCursor is (left x,
+// BOTTOM-edge y, width, height) in framebuffer pixels.
+
+layout(set = 3, binding = 0, std140) uniform Globals {
+    uniform vec3  iResolution;
+    uniform float iTime;
+    uniform float iTimeDelta;
+    uniform float iFrameRate;
+    uniform int   iFrame;
+    uniform float iChannelTime[4];
+    uniform vec3  iChannelResolution[4];
+    uniform vec4  iMouse;
+    uniform vec4  iDate;
+    uniform float iSampleRate;
+    uniform vec4  iCurrentCursor;
+    uniform vec4  iPreviousCursor;
+    uniform vec4  iCurrentCursorColor;
+    uniform vec4  iPreviousCursorColor;
+    uniform int   iCurrentCursorStyle;
+    uniform int   iPreviousCursorStyle;
+    uniform int   iCursorVisible;
+    uniform float iTimeCursorChange;
+    uniform float iTimeFocus;
+    uniform int iFocus;
+    uniform vec3  iPalette[256];
+    uniform vec3  iBackgroundColor;
+    uniform vec3  iForegroundColor;
+    uniform vec3  iCursorColor;
+    uniform vec3  iCursorText;
+    uniform vec3  iSelectionForegroundColor;
+    uniform vec3  iSelectionBackgroundColor;
+};
+
+// pardes's own: 1 when the window is opaque, so a pass cannot punch holes
+// in it through its alpha.
+layout(set = 3, binding = 1, std140) uniform PardesPost {
+    float pardesOpaque;
+};
+
+#define CURSORSTYLE_BLOCK        0
+#define CURSORSTYLE_BLOCK_HOLLOW 1
+#define CURSORSTYLE_BAR          2
+#define CURSORSTYLE_UNDERLINE    3
+#define CURSORSTYLE_LOCK         4
+
+layout(set = 2, binding = 0) uniform sampler2D iChannel0;
+
+layout(location = 0) out vec4 _fragColor;
+
+#define texture2D texture
+
+void mainImage(out vec4 fragColor, in vec2 fragCoord);
+void main() {
+    mainImage(_fragColor, gl_FragCoord.xy);
+    if (pardesOpaque > 0.5) _fragColor.a = 1.0;
+}
+
+// The shader's own lines count from 1, so glslc's errors name them.
+#line 1
diff --git a/shaders/post/ripple.glsl b/shaders/post/ripple.glsl
new file mode 100644
index 00000000..ffecbf70
--- /dev/null
+++ b/shaders/post/ripple.glsl
@@ -0,0 +1,49 @@
+// Ripple: the page as a still pool a slow swell crosses. Rings travel out
+// from the middle of the window at a fixed speed in pixels, so they look
+// the same at any size and frame rate; the displacement is at most a couple
+// of pixels, so text stays readable, and it eases in over its first half
+// second instead of snapping on. Each ring catches the light a little on its
+// rising side, in linear light, and the result is dithered so the shading
+// never bands. It is a Shadertoy file: pardes puts its prefix before it.
+
+const float TAU = 6.28318530718;
+const float WAVELENGTH_PX = 150.0;
+const float SPEED_PX = 55.0;        // outward, per second
+const float AMPLITUDE_PX = 2.2;
+const float SHADE = 0.035;          // light on a slope, linear
+const float EASE_IN = 0.5;          // seconds
+
+vec3 toLinear(vec3 c) {
+    return mix(pow((c + 0.055) / 1.055, vec3(2.4)), c / 12.92, lessThanEqual(c, vec3(0.04045)));
+}
+
+vec3 toSrgb(vec3 c) {
+    c = max(c, vec3(0.0));
+    return mix(1.055 * pow(c, vec3(1.0 / 2.4)) - 0.055, c * 12.92, lessThanEqual(c, vec3(0.0031308)));
+}
+
+float ign(vec2 p) {
+    return fract(52.9829189 * fract(dot(p, vec2(0.06711056, 0.00583715))));
+}
+
+void mainImage(out vec4 fragColor, in vec2 fragCoord) {
+    vec2 size = iResolution.xy;
+    vec2 center = 0.5 * size;
+    vec2 offset = fragCoord - center;
+    float radius = length(offset);
+    float reach = 0.5 * length(size);
+    // Strongest a third of the way out, fading to nothing at the middle
+    // and at the edges, so the window's frame never wobbles.
+    float envelope = smoothstep(0.0, 0.18, radius / reach) * (1.0 - smoothstep(0.35, 0.95, radius / reach));
+    float ease = smoothstep(0.0, EASE_IN, iTime);
+    float phase = (radius - iTime * SPEED_PX) * TAU / WAVELENGTH_PX;
+    float height = sin(phase);
+    float slope = cos(phase);
+    vec2 dir = offset / max(radius, 1e-3);
+    vec2 moved = fragCoord + dir * height * AMPLITUDE_PX * envelope * ease;
+
+    vec4 s = texture(iChannel0, moved / size);
+    vec3 col = toLinear(s.rgb) * (1.0 + SHADE * slope * envelope * ease);
+    vec3 srgb = toSrgb(col) + (ign(fragCoord + float(iFrame % 64) * 5.588238) - 0.5) / 255.0;
+    fragColor = vec4(clamp(srgb, 0.0, 1.0), s.a);
+}
diff --git a/shaders/prebuilt/crt.frag.glsl b/shaders/prebuilt/crt.frag.glsl
deleted file mode 100644
index b0b0b93b..00000000
--- a/shaders/prebuilt/crt.frag.glsl
+++ /dev/null
@@ -1,175 +0,0 @@
-#version 450
-
-// The Crt builtin's post-process. Screen point cc shows the scene at
-// uv' = cc*(1 + BARREL*r2), and src/gui/crt.zig maps mouse input through that
-// same transform — keep them equal or clicks drift near the edges.
-
-layout(set = 2, binding = 0) uniform sampler2D u_scene;
-layout(std140, set = 3, binding = 0) uniform CrtUniforms {
-    float time_seconds;
-    float frame;
-    vec2 viewport;
-    // x = CRT, y = ripple, z = glitch. One scene pass can combine them.
-    vec4 effects;
-} u_crt;
-
-layout(location = 0) out vec4 o_col;
-
-const float TAU = 6.28318530718;
-const float BARREL = 0.016; // MUST match src/gui/crt.zig barrel
-const float EDGE_SOFTNESS_PX = 3.5;
-const float CHROMA_PX = 0.28; // radial R/B separation in physical pixels at r2=1
-const float BLOOM_RADIUS_PX = 1.75;
-const float BLOOM_THRESHOLD = 0.60; // linear-light channel peak
-const float BLOOM_SOFTNESS = 0.25;
-const float BLOOM_STRENGTH = 0.045;
-const float SCAN_PERIOD_PX = 3.0;
-const float SCAN_STRENGTH = 0.055;
-const float MASK_PERIOD_PX = 3.0;
-const float MASK_STRENGTH = 0.015;
-const float VIGNETTE_STRENGTH = 0.11; // 11% only at the extreme corners
-const float HUM_STRENGTH = 0.0025;
-const float NOISE_STRENGTH = 0.0020;
-const float EXPOSURE = 1.012;
-
-vec3 srgbToLinear(vec3 c) {
-    vec3 low = c / 12.92;
-    vec3 high = pow((c + 0.055) / 1.055, vec3(2.4));
-    return mix(high, low, lessThanEqual(c, vec3(0.04045)));
-}
-
-vec3 linearToSrgb(vec3 c) {
-    c = max(c, vec3(0.0));
-    vec3 low = c * 12.92;
-    vec3 high = 1.055 * pow(c, vec3(1.0 / 2.4)) - 0.055;
-    return mix(high, low, lessThanEqual(c, vec3(0.0031308)));
-}
-
-vec3 sceneLinear(vec2 uv) {
-    return srgbToLinear(texture(u_scene, uv).rgb);
-}
-
-vec3 brightPass(vec2 uv) {
-    vec3 c = sceneLinear(uv);
-    float peak = max(c.r, max(c.g, c.b));
-    return c * smoothstep(BLOOM_THRESHOLD, BLOOM_THRESHOLD + BLOOM_SOFTNESS, peak);
-}
-
-float noiseAt(vec2 p) {
-    vec3 q = fract(vec3(p.xyx) * 0.1031);
-    q += dot(q, q.yzx + 33.33);
-    return fract((q.x + q.y) * q.z);
-}
-
-// The non-CRT scene effects deliberately distort the source coordinates,
-// rather than remapping the final colors. Themes retain their palette and the
-// effects remain composable with the linear-light CRT treatment below.
-vec2 sceneUv(vec2 uv) {
-    if (u_crt.effects.y > 0.5) {
-        vec2 centered = uv - 0.5;
-        float radius = length(centered);
-        float envelope = 1.0 - smoothstep(0.04, 0.72, radius);
-        float wave = sin(radius * 42.0 - u_crt.time_seconds * 5.2);
-        uv += centered / max(radius, 0.00001) * wave * envelope * 0.0032;
-    }
-    if (u_crt.effects.z > 0.5) {
-        float band = floor(uv.y * 96.0);
-        float seed = noiseAt(vec2(band, floor(u_crt.time_seconds * 13.0)));
-        float tear = smoothstep(0.955, 1.0, seed);
-        uv.x += (noiseAt(vec2(seed, band)) - 0.5) * tear * 0.020;
-    }
-    return uv;
-}
-
-// The scene, ALPHA INCLUDED: with a see-through ground the grid arrives
-// premultiplied and partly empty, and a pass that dropped .a would turn the
-// desktop behind a `*_transparent` theme into opaque black the moment Crt,
-// Ripple or Glitch came on.
-vec4 sceneSrgb(vec2 uv) {
-    vec2 warped = sceneUv(uv);
-    vec4 center = texture(u_scene, warped);
-    if (u_crt.effects.z <= 0.5) return center;
-
-    float band = floor(warped.y * 96.0);
-    float seed = noiseAt(vec2(band, floor(u_crt.time_seconds * 13.0)));
-    float tear = smoothstep(0.955, 1.0, seed);
-    vec2 chroma = vec2((0.35 + 1.25 * tear) / u_crt.viewport.x, 0.0);
-    return vec4(
-        texture(u_scene, warped + chroma).r,
-        center.g,
-        texture(u_scene, warped - chroma).b,
-        center.a
-    );
-}
-
-vec3 effectSceneLinear(vec2 uv) {
-    return srgbToLinear(sceneSrgb(uv).rgb);
-}
-
-void main() {
-    vec2 size = u_crt.viewport;
-    vec2 texel = 1.0 / size;
-    vec2 cc = gl_FragCoord.xy / size * 2.0 - 1.0;
-    float r2 = dot(cc, cc);
-    vec2 uv = cc * (1.0 + BARREL * r2 * u_crt.effects.x) * 0.5 + 0.5;
-
-    // Ripple and glitch are useful without the CRT. They only move samples;
-    // skip every tube-specific light/mask/exposure adjustment.
-    if (u_crt.effects.x <= 0.5) {
-        // The scene texture is already sRGB. Avoid a needless transfer-curve
-        // round trip so a coordinate-only effect preserves theme bytes.
-        vec4 s = sceneSrgb(uv);
-        o_col = vec4(clamp(s.rgb, 0.0, 1.0), clamp(s.a, 0.0, 1.0));
-        return;
-    }
-
-    vec3 col = vec3(0.0);
-    // Outside the tube nothing is drawn, so nothing is covered either: the
-    // old opaque black there would have punched a rectangle out of the
-    // compositor's backdrop.
-    float alpha = 0.0;
-    float edge = min(min(uv.x, uv.y), min(1.0 - uv.x, 1.0 - uv.y));
-    if (edge > 0.0) {
-        vec3 center = effectSceneLinear(uv);
-        vec2 chroma = cc * (CHROMA_PX * r2) * texel;
-        // Each radial sample follows the same ripple/glitch path from its own
-        // pre-warp coordinate. This is also how the Metal kernel composes the
-        // effects; sampling a once-warped center here made combined effects
-        // diverge between the two GUI backends.
-        col = vec3(
-            effectSceneLinear(uv + chroma).r,
-            center.g,
-            effectSceneLinear(uv - chroma).b
-        );
-
-        vec2 bloom_px = texel * BLOOM_RADIUS_PX;
-        vec3 bloom = brightPass(uv + vec2(bloom_px.x, 0.0)) +
-            brightPass(uv - vec2(bloom_px.x, 0.0)) +
-            brightPass(uv + vec2(0.0, bloom_px.y)) +
-            brightPass(uv - vec2(0.0, bloom_px.y));
-        col += bloom * (0.25 * BLOOM_STRENGTH);
-
-        // The mask has unit mean and the scan loss stays small; neither needs
-        // the old global lift that remapped every theme toward white.
-        float scan_wave = 0.5 + 0.5 * cos(gl_FragCoord.y * TAU / SCAN_PERIOD_PX);
-        col *= 1.0 - SCAN_STRENGTH * scan_wave * scan_wave;
-        vec3 mask = 1.0 + MASK_STRENGTH * cos(
-            gl_FragCoord.x * TAU / MASK_PERIOD_PX + vec3(0.0, TAU / 3.0, 2.0 * TAU / 3.0)
-        );
-        col *= mask;
-
-        vec2 edge_px = min(uv, 1.0 - uv) * size;
-        float tube = smoothstep(0.0, EDGE_SOFTNESS_PX, min(edge_px.x, edge_px.y));
-        float vignette = 1.0 - VIGNETTE_STRENGTH * pow(clamp(r2 * 0.5, 0.0, 1.0), 1.6);
-        float hum = 1.0 + HUM_STRENGTH * sin((uv.y * 1.35 - u_crt.time_seconds * 0.11) * TAU);
-        col *= tube * vignette * hum * EXPOSURE;
-        // The tube's edge falloff dims coverage as well as colour; everything
-        // else here is a light adjustment and leaves it alone.
-        alpha = sceneSrgb(uv).a * tube;
-
-        float luma = dot(col, vec3(0.2126, 0.7152, 0.0722));
-        vec2 noise_seed = gl_FragCoord.xy + vec2(u_crt.frame * 17.0, u_crt.frame * 59.0);
-        col += (noiseAt(noise_seed) - 0.5) * NOISE_STRENGTH * (0.15 + 0.85 * clamp(luma, 0.0, 1.0));
-    }
-    o_col = vec4(linearToSrgb(clamp(col, 0.0, 1.0)), clamp(alpha, 0.0, 1.0));
-}
diff --git a/shaders/prebuilt/crt.frag.spv b/shaders/prebuilt/crt.frag.spv
deleted file mode 100644
index f0e14627..00000000
Binary files a/shaders/prebuilt/crt.frag.spv and /dev/null differ
diff --git a/shaders/prebuilt/crt.vert.glsl b/shaders/prebuilt/crt.vert.glsl
deleted file mode 100644
index 4e15fcdf..00000000
--- a/shaders/prebuilt/crt.vert.glsl
+++ /dev/null
@@ -1,9 +0,0 @@
-#version 450
-
-// CRT post-process pass: one fullscreen triangle from gl_VertexIndex, no
-// vertex buffer. The fragment shader derives uv from gl_FragCoord.
-
-void main() {
-    vec2 p = vec2(float((gl_VertexIndex << 1) & 2), float(gl_VertexIndex & 2));
-    gl_Position = vec4(p * 2.0 - 1.0, 0.0, 1.0);
-}
diff --git a/shaders/prebuilt/crt.vert.spv b/shaders/prebuilt/crt.vert.spv
deleted file mode 100644
index 8a75ebb3..00000000
Binary files a/shaders/prebuilt/crt.vert.spv and /dev/null differ
diff --git a/shaders/prebuilt/post-crt.frag.glsl b/shaders/prebuilt/post-crt.frag.glsl
new file mode 100644
index 00000000..11b95272
--- /dev/null
+++ b/shaders/prebuilt/post-crt.frag.glsl
@@ -0,0 +1,146 @@
+#version 450
+// pardes's Shadertoy prefix (docs/render-pipeline.md §6), put before every
+// post pass: a bundled one in shaders/post/ at build time, a user's file at
+// run time. The uniform names, types and std140 order are ghostty 1.3.2's
+// (src/renderer/shaders/shadertoy_prefix.glsl), so a shader written for
+// ghostty runs here; only the bindings are SDL GPU's (a fragment shader's
+// textures in set 2, its uniform blocks in set 3). Y is down everywhere, as
+// on ghostty's Metal renderer: fragCoord, iChannel0's uv and the cursor
+// rectangles share one top-left space, and iCurrentCursor is (left x,
+// BOTTOM-edge y, width, height) in framebuffer pixels.
+
+layout(set = 3, binding = 0, std140) uniform Globals {
+    uniform vec3  iResolution;
+    uniform float iTime;
+    uniform float iTimeDelta;
+    uniform float iFrameRate;
+    uniform int   iFrame;
+    uniform float iChannelTime[4];
+    uniform vec3  iChannelResolution[4];
+    uniform vec4  iMouse;
+    uniform vec4  iDate;
+    uniform float iSampleRate;
+    uniform vec4  iCurrentCursor;
+    uniform vec4  iPreviousCursor;
+    uniform vec4  iCurrentCursorColor;
+    uniform vec4  iPreviousCursorColor;
+    uniform int   iCurrentCursorStyle;
+    uniform int   iPreviousCursorStyle;
+    uniform int   iCursorVisible;
+    uniform float iTimeCursorChange;
+    uniform float iTimeFocus;
+    uniform int iFocus;
+    uniform vec3  iPalette[256];
+    uniform vec3  iBackgroundColor;
+    uniform vec3  iForegroundColor;
+    uniform vec3  iCursorColor;
+    uniform vec3  iCursorText;
+    uniform vec3  iSelectionForegroundColor;
+    uniform vec3  iSelectionBackgroundColor;
+};
+
+// pardes's own: 1 when the window is opaque, so a pass cannot punch holes
+// in it through its alpha.
+layout(set = 3, binding = 1, std140) uniform PardesPost {
+    float pardesOpaque;
+};
+
+#define CURSORSTYLE_BLOCK        0
+#define CURSORSTYLE_BLOCK_HOLLOW 1
+#define CURSORSTYLE_BAR          2
+#define CURSORSTYLE_UNDERLINE    3
+#define CURSORSTYLE_LOCK         4
+
+layout(set = 2, binding = 0) uniform sampler2D iChannel0;
+
+layout(location = 0) out vec4 _fragColor;
+
+#define texture2D texture
+
+void mainImage(out vec4 fragColor, in vec2 fragCoord);
+void main() {
+    mainImage(_fragColor, gl_FragCoord.xy);
+    if (pardesOpaque > 0.5) _fragColor.a = 1.0;
+}
+
+// The shader's own lines count from 1, so glslc's errors name them.
+#line 1
+// Crt: a slot-mask tube's light, with nothing that moves a pixel. There is
+// no barrel: every click lands where it is drawn, rails and grips at the
+// window's edges included. What is left is light: a beam profile for the
+// scanlines, an aperture mask, a soft bloom of the brightest ink, a faint
+// vignette and the hum of a live tube. Everything is worked out in linear
+// light and dithered back into 8 bits, so the vignette never bands. It is a
+// Shadertoy file: pardes puts its prefix before it (shaders/post/prefix.glsl).
+
+const float TAU = 6.28318530718;
+const float CHROMA_PX = 0.35;       // red and blue apart, at the corners
+const float BLOOM_RADIUS_PX = 1.75;
+const float BLOOM_THRESHOLD = 0.60; // linear-light channel peak
+const float BLOOM_SOFTNESS = 0.25;
+const float BLOOM_STRENGTH = 0.05;
+const float SCAN_PERIOD_PX = 3.0;
+const float SCAN_STRENGTH = 0.07;
+const float MASK_PERIOD_PX = 3.0;
+const float MASK_STRENGTH = 0.018;
+const float VIGNETTE_STRENGTH = 0.12; // at the far corners only
+const float HUM_STRENGTH = 0.004;
+const float HUM_HZ = 0.11;
+const float EXPOSURE = 1.015;
+
+vec3 toLinear(vec3 c) {
+    return mix(pow((c + 0.055) / 1.055, vec3(2.4)), c / 12.92, lessThanEqual(c, vec3(0.04045)));
+}
+
+vec3 toSrgb(vec3 c) {
+    c = max(c, vec3(0.0));
+    return mix(1.055 * pow(c, vec3(1.0 / 2.4)) - 0.055, c * 12.92, lessThanEqual(c, vec3(0.0031308)));
+}
+
+vec3 scene(vec2 uv) {
+    return toLinear(texture(iChannel0, uv).rgb);
+}
+
+vec3 brightPass(vec2 uv) {
+    vec3 c = scene(uv);
+    float peak = max(c.r, max(c.g, c.b));
+    return c * smoothstep(BLOOM_THRESHOLD, BLOOM_THRESHOLD + BLOOM_SOFTNESS, peak);
+}
+
+// Interleaved gradient noise: a dither with no visible pattern.
+float ign(vec2 p) {
+    return fract(52.9829189 * fract(dot(p, vec2(0.06711056, 0.00583715))));
+}
+
+void mainImage(out vec4 fragColor, in vec2 fragCoord) {
+    vec2 size = iResolution.xy;
+    vec2 texel = 1.0 / size;
+    vec2 uv = fragCoord / size;
+    vec2 cc = uv * 2.0 - 1.0;
+    float r2 = dot(cc, cc);
+
+    // The beam converges least at the corners: red and blue drift apart
+    // there, by a third of a pixel.
+    vec2 chroma = cc * (CHROMA_PX * r2 * 0.5) * texel;
+    vec3 col = vec3(scene(uv + chroma).r, scene(uv).g, scene(uv - chroma).b);
+
+    vec2 b = texel * BLOOM_RADIUS_PX;
+    vec3 bloom = brightPass(uv + vec2(b.x, 0.0)) + brightPass(uv - vec2(b.x, 0.0)) +
+        brightPass(uv + vec2(0.0, b.y)) + brightPass(uv - vec2(0.0, b.y));
+    col += bloom * (0.25 * BLOOM_STRENGTH);
+
+    // A beam is brightest on its line and falls off between lines; the
+    // mask is three phosphor stripes a triad. Both average to one, so the
+    // theme keeps its brightness.
+    float line = 0.5 + 0.5 * cos(fragCoord.y * TAU / SCAN_PERIOD_PX);
+    col *= 1.0 - SCAN_STRENGTH * (line * line - 0.375) / 0.625;
+    col *= 1.0 + MASK_STRENGTH * cos(fragCoord.x * TAU / MASK_PERIOD_PX + vec3(0.0, TAU / 3.0, 2.0 * TAU / 3.0));
+
+    float vignette = 1.0 - VIGNETTE_STRENGTH * pow(clamp(r2 * 0.5, 0.0, 1.0), 1.6);
+    float hum = 1.0 + HUM_STRENGTH * sin((uv.y * 1.35 - iTime * HUM_HZ) * TAU);
+    col *= vignette * hum * EXPOSURE;
+
+    vec3 srgb = toSrgb(col);
+    srgb += (ign(fragCoord + float(iFrame % 64) * vec2(5.588238, 5.588238)) - 0.5) / 255.0;
+    fragColor = vec4(clamp(srgb, 0.0, 1.0), texture(iChannel0, uv).a);
+}
diff --git a/shaders/prebuilt/post-crt.frag.spv b/shaders/prebuilt/post-crt.frag.spv
new file mode 100644
index 00000000..e4d98138
Binary files /dev/null and b/shaders/prebuilt/post-crt.frag.spv differ
diff --git a/shaders/prebuilt/post-glitch.frag.glsl b/shaders/prebuilt/post-glitch.frag.glsl
new file mode 100644
index 00000000..46538452
--- /dev/null
+++ b/shaders/prebuilt/post-glitch.frag.glsl
@@ -0,0 +1,127 @@
+#version 450
+// pardes's Shadertoy prefix (docs/render-pipeline.md §6), put before every
+// post pass: a bundled one in shaders/post/ at build time, a user's file at
+// run time. The uniform names, types and std140 order are ghostty 1.3.2's
+// (src/renderer/shaders/shadertoy_prefix.glsl), so a shader written for
+// ghostty runs here; only the bindings are SDL GPU's (a fragment shader's
+// textures in set 2, its uniform blocks in set 3). Y is down everywhere, as
+// on ghostty's Metal renderer: fragCoord, iChannel0's uv and the cursor
+// rectangles share one top-left space, and iCurrentCursor is (left x,
+// BOTTOM-edge y, width, height) in framebuffer pixels.
+
+layout(set = 3, binding = 0, std140) uniform Globals {
+    uniform vec3  iResolution;
+    uniform float iTime;
+    uniform float iTimeDelta;
+    uniform float iFrameRate;
+    uniform int   iFrame;
+    uniform float iChannelTime[4];
+    uniform vec3  iChannelResolution[4];
+    uniform vec4  iMouse;
+    uniform vec4  iDate;
+    uniform float iSampleRate;
+    uniform vec4  iCurrentCursor;
+    uniform vec4  iPreviousCursor;
+    uniform vec4  iCurrentCursorColor;
+    uniform vec4  iPreviousCursorColor;
+    uniform int   iCurrentCursorStyle;
+    uniform int   iPreviousCursorStyle;
+    uniform int   iCursorVisible;
+    uniform float iTimeCursorChange;
+    uniform float iTimeFocus;
+    uniform int iFocus;
+    uniform vec3  iPalette[256];
+    uniform vec3  iBackgroundColor;
+    uniform vec3  iForegroundColor;
+    uniform vec3  iCursorColor;
+    uniform vec3  iCursorText;
+    uniform vec3  iSelectionForegroundColor;
+    uniform vec3  iSelectionBackgroundColor;
+};
+
+// pardes's own: 1 when the window is opaque, so a pass cannot punch holes
+// in it through its alpha.
+layout(set = 3, binding = 1, std140) uniform PardesPost {
+    float pardesOpaque;
+};
+
+#define CURSORSTYLE_BLOCK        0
+#define CURSORSTYLE_BLOCK_HOLLOW 1
+#define CURSORSTYLE_BAR          2
+#define CURSORSTYLE_UNDERLINE    3
+#define CURSORSTYLE_LOCK         4
+
+layout(set = 2, binding = 0) uniform sampler2D iChannel0;
+
+layout(location = 0) out vec4 _fragColor;
+
+#define texture2D texture
+
+void mainImage(out vec4 fragColor, in vec2 fragCoord);
+void main() {
+    mainImage(_fragColor, gl_FragCoord.xy);
+    if (pardesOpaque > 0.5) _fragColor.a = 1.0;
+}
+
+// The shader's own lines count from 1, so glslc's errors name them.
+#line 1
+// Glitch: now and then the signal slips. Every couple of seconds a short
+// burst tears a few horizontal bands sideways and pulls their red and blue
+// apart; the bands are sized in pixels and the burst eases in and out over
+// a fraction of a second, so it reads as one event rather than a flicker,
+// and it looks the same at 60 or 144 Hz because every step is keyed to
+// iTime, not to frames. Between bursts the page is left exactly as it is.
+// A torn band's brightness dips in linear light. It is a Shadertoy file:
+// pardes puts its prefix before it.
+
+const float PERIOD = 2.4;           // seconds between bursts, on average
+const float BURST = 0.28;           // seconds a burst lasts
+const float STEP_HZ = 24.0;         // how often a burst re-tears
+const float SHIFT_PX = 14.0;
+const float SPLIT_PX = 2.5;
+const float DIP = 0.12;
+
+float hash(vec2 p) {
+    vec3 q = fract(vec3(p.xyx) * 0.1031);
+    q += dot(q, q.yzx + 33.33);
+    return fract((q.x + q.y) * q.z);
+}
+
+vec3 toLinear(vec3 c) {
+    return mix(pow((c + 0.055) / 1.055, vec3(2.4)), c / 12.92, lessThanEqual(c, vec3(0.04045)));
+}
+
+vec3 toSrgb(vec3 c) {
+    c = max(c, vec3(0.0));
+    return mix(1.055 * pow(c, vec3(1.0 / 2.4)) - 0.055, c * 12.92, lessThanEqual(c, vec3(0.0031308)));
+}
+
+void mainImage(out vec4 fragColor, in vec2 fragCoord) {
+    vec2 size = iResolution.xy;
+    vec2 uv = fragCoord / size;
+    // Which burst window this is, when in it the burst starts, and how far
+    // into the burst we are: 0 outside one.
+    float window = floor(iTime / PERIOD);
+    float start = window * PERIOD + hash(vec2(window, 7.0)) * (PERIOD - BURST);
+    float t = (iTime - start) / BURST;
+    float live = step(0.0, t) * step(t, 1.0);
+    float envelope = live * sin(3.14159265 * clamp(t, 0.0, 1.0));
+    if (envelope <= 0.0) {
+        fragColor = texture(iChannel0, uv);
+        return;
+    }
+    // Bands of 6 to 40 px, re-cut at STEP_HZ during the burst; about one
+    // band in four tears.
+    float tick = floor(iTime * STEP_HZ);
+    float band_px = mix(6.0, 40.0, hash(vec2(tick, 3.0)));
+    float band = floor(fragCoord.y / band_px);
+    float roll = hash(vec2(band, tick));
+    float tear = smoothstep(0.72, 0.9, roll) * envelope;
+    float shift = (hash(vec2(tick, band + 11.0)) - 0.5) * 2.0 * SHIFT_PX * tear;
+    vec2 at = vec2(fragCoord.x + shift, fragCoord.y);
+    vec2 split = vec2(SPLIT_PX * tear, 0.0);
+    vec4 center = texture(iChannel0, at / size);
+    vec3 col = vec3(texture(iChannel0, (at + split) / size).r, center.g, texture(iChannel0, (at - split) / size).b);
+    col = toSrgb(toLinear(col) * (1.0 - DIP * tear));
+    fragColor = vec4(col, center.a);
+}
diff --git a/shaders/prebuilt/post-glitch.frag.spv b/shaders/prebuilt/post-glitch.frag.spv
new file mode 100644
index 00000000..8a224958
Binary files /dev/null and b/shaders/prebuilt/post-glitch.frag.spv differ
diff --git a/shaders/prebuilt/post-ripple.frag.glsl b/shaders/prebuilt/post-ripple.frag.glsl
new file mode 100644
index 00000000..28059def
--- /dev/null
+++ b/shaders/prebuilt/post-ripple.frag.glsl
@@ -0,0 +1,116 @@
+#version 450
+// pardes's Shadertoy prefix (docs/render-pipeline.md §6), put before every
+// post pass: a bundled one in shaders/post/ at build time, a user's file at
+// run time. The uniform names, types and std140 order are ghostty 1.3.2's
+// (src/renderer/shaders/shadertoy_prefix.glsl), so a shader written for
+// ghostty runs here; only the bindings are SDL GPU's (a fragment shader's
+// textures in set 2, its uniform blocks in set 3). Y is down everywhere, as
+// on ghostty's Metal renderer: fragCoord, iChannel0's uv and the cursor
+// rectangles share one top-left space, and iCurrentCursor is (left x,
+// BOTTOM-edge y, width, height) in framebuffer pixels.
+
+layout(set = 3, binding = 0, std140) uniform Globals {
+    uniform vec3  iResolution;
+    uniform float iTime;
+    uniform float iTimeDelta;
+    uniform float iFrameRate;
+    uniform int   iFrame;
+    uniform float iChannelTime[4];
+    uniform vec3  iChannelResolution[4];
+    uniform vec4  iMouse;
+    uniform vec4  iDate;
+    uniform float iSampleRate;
+    uniform vec4  iCurrentCursor;
+    uniform vec4  iPreviousCursor;
+    uniform vec4  iCurrentCursorColor;
+    uniform vec4  iPreviousCursorColor;
+    uniform int   iCurrentCursorStyle;
+    uniform int   iPreviousCursorStyle;
+    uniform int   iCursorVisible;
+    uniform float iTimeCursorChange;
+    uniform float iTimeFocus;
+    uniform int iFocus;
+    uniform vec3  iPalette[256];
+    uniform vec3  iBackgroundColor;
+    uniform vec3  iForegroundColor;
+    uniform vec3  iCursorColor;
+    uniform vec3  iCursorText;
+    uniform vec3  iSelectionForegroundColor;
+    uniform vec3  iSelectionBackgroundColor;
+};
+
+// pardes's own: 1 when the window is opaque, so a pass cannot punch holes
+// in it through its alpha.
+layout(set = 3, binding = 1, std140) uniform PardesPost {
+    float pardesOpaque;
+};
+
+#define CURSORSTYLE_BLOCK        0
+#define CURSORSTYLE_BLOCK_HOLLOW 1
+#define CURSORSTYLE_BAR          2
+#define CURSORSTYLE_UNDERLINE    3
+#define CURSORSTYLE_LOCK         4
+
+layout(set = 2, binding = 0) uniform sampler2D iChannel0;
+
+layout(location = 0) out vec4 _fragColor;
+
+#define texture2D texture
+
+void mainImage(out vec4 fragColor, in vec2 fragCoord);
+void main() {
+    mainImage(_fragColor, gl_FragCoord.xy);
+    if (pardesOpaque > 0.5) _fragColor.a = 1.0;
+}
+
+// The shader's own lines count from 1, so glslc's errors name them.
+#line 1
+// Ripple: the page as a still pool a slow swell crosses. Rings travel out
+// from the middle of the window at a fixed speed in pixels, so they look
+// the same at any size and frame rate; the displacement is at most a couple
+// of pixels, so text stays readable, and it eases in over its first half
+// second instead of snapping on. Each ring catches the light a little on its
+// rising side, in linear light, and the result is dithered so the shading
+// never bands. It is a Shadertoy file: pardes puts its prefix before it.
+
+const float TAU = 6.28318530718;
+const float WAVELENGTH_PX = 150.0;
+const float SPEED_PX = 55.0;        // outward, per second
+const float AMPLITUDE_PX = 2.2;
+const float SHADE = 0.035;          // light on a slope, linear
+const float EASE_IN = 0.5;          // seconds
+
+vec3 toLinear(vec3 c) {
+    return mix(pow((c + 0.055) / 1.055, vec3(2.4)), c / 12.92, lessThanEqual(c, vec3(0.04045)));
+}
+
+vec3 toSrgb(vec3 c) {
+    c = max(c, vec3(0.0));
+    return mix(1.055 * pow(c, vec3(1.0 / 2.4)) - 0.055, c * 12.92, lessThanEqual(c, vec3(0.0031308)));
+}
+
+float ign(vec2 p) {
+    return fract(52.9829189 * fract(dot(p, vec2(0.06711056, 0.00583715))));
+}
+
+void mainImage(out vec4 fragColor, in vec2 fragCoord) {
+    vec2 size = iResolution.xy;
+    vec2 center = 0.5 * size;
+    vec2 offset = fragCoord - center;
+    float radius = length(offset);
+    float reach = 0.5 * length(size);
+    // Strongest a third of the way out, fading to nothing at the middle
+    // and at the edges, so the window's frame never wobbles.
+    float envelope = smoothstep(0.0, 0.18, radius / reach) * (1.0 - smoothstep(0.35, 0.95, radius / reach));
+    float ease = smoothstep(0.0, EASE_IN, iTime);
+    float phase = (radius - iTime * SPEED_PX) * TAU / WAVELENGTH_PX;
+    float height = sin(phase);
+    float slope = cos(phase);
+    vec2 dir = offset / max(radius, 1e-3);
+    vec2 moved = fragCoord + dir * height * AMPLITUDE_PX * envelope * ease;
+
+    vec4 s = texture(iChannel0, moved / size);
+    vec3 col = toLinear(s.rgb) * (1.0 + SHADE * slope * envelope * ease);
+    vec3 srgb = toSrgb(col) + (ign(fragCoord + float(iFrame % 64) * 5.588238) - 0.5) / 255.0;
+    fragColor = vec4(clamp(srgb, 0.0, 1.0), s.a);
+}
diff --git a/shaders/prebuilt/post-ripple.frag.spv b/shaders/prebuilt/post-ripple.frag.spv
new file mode 100644
index 00000000..1a105a33
Binary files /dev/null and b/shaders/prebuilt/post-ripple.frag.spv differ
diff --git a/shaders/prebuilt/post.vert.glsl b/shaders/prebuilt/post.vert.glsl
new file mode 100644
index 00000000..86739a65
--- /dev/null
+++ b/shaders/prebuilt/post.vert.glsl
@@ -0,0 +1,10 @@
+#version 450
+
+// A post pass (docs/render-pipeline.md §6): one fullscreen triangle from
+// gl_VertexIndex, no vertex buffer. The Shadertoy fragment shader works from
+// gl_FragCoord, y down, as its fragCoord.
+
+void main() {
+    vec2 p = vec2(float((gl_VertexIndex << 1) & 2), float(gl_VertexIndex & 2));
+    gl_Position = vec4(p * 2.0 - 1.0, 0.0, 1.0);
+}
diff --git a/shaders/prebuilt/post.vert.spv b/shaders/prebuilt/post.vert.spv
new file mode 100644
index 00000000..8a75ebb3
Binary files /dev/null and b/shaders/prebuilt/post.vert.spv differ
diff --git a/src/animation.zig b/src/animation.zig
index d6ef1ec3..948a6679 100644
--- a/src/animation.zig
+++ b/src/animation.zig
@@ -77,12 +77,6 @@ pub const Transition = enum(u8) {
     }
 };
 
-pub const SceneEffect = struct {
-    crt: bool = false,
-    ripple: bool = false,
-    glitch: bool = false,
-};
-
 pub const Phase = enum(u8) {
     opening = 0,
     moving = 1,
diff --git a/src/builtins.zig b/src/builtins.zig
index 6bfc9b26..1864086f 100644
--- a/src/builtins.zig
+++ b/src/builtins.zig
@@ -156,7 +156,7 @@ pub const registry = struct {
             if (@intFromEnum(b) == i) return switch (setting.action) {
                 // a switch flips bare, and DumpDir bare is the default
                 .toggle, .transition, .scene, .dump_dir => false,
-                .shell, .theme, .font, .tagline_size, .window_opacity, .window_blur, .message_ms => true,
+                .shell, .theme, .font, .tagline_size, .window_opacity, .window_blur, .message_ms, .shader, .shader_animation => true,
             };
         unreachable;
     }
diff --git a/src/config.zig b/src/config.zig
index 122c0e75..1d4043ab 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -131,6 +131,8 @@ pub const leader_path = paths: {
         table.set(.Crt, "tr");
         table.set(.Ripple, "tR");
         table.set(.Glitch, "tg");
+        table.set(.Shader, null);
+        table.set(.ShaderAnimation, null);
     }
     if (builtins.EffectCode.enabled) table.set(.EffectCode, null);
     if (builtins.TreeContext.enabled) table.set(.TreeContext, null);
@@ -611,7 +613,64 @@ pub const Runtime = struct {
     } = .{},
 
     panel_transition: animation.Transition = .off,
-    scene_effects: animation.SceneEffect = .{},
+    /// The post chain (docs/render-pipeline.md §6), in the order it runs.
+    post: Post = .{},
+    /// When the chain redraws on its own, past the frames it post-processes:
+    /// never, while the window has the focus, or always (ghostty's
+    /// custom-shader-animation).
+    shader_animation: ShaderAnimation = .on,
+
+    pub const ShaderAnimation = enum { off, on, always };
+
+    /// Each pass a bundled effect (Crt, Ripple, Glitch) or a Shadertoy file.
+    pub const Post = struct {
+        pub const max = 8;
+        pub const Entry = struct {
+            scene: ?Scene = null,
+            path: Text(limits.host_path_cap) = .{},
+        };
+        entries: [max]Entry = @splat(.{}),
+        len: u8 = 0,
+        /// Bumped on every change: a shell compiles the chain again when it
+        /// moves.
+        generation: u32 = 0,
+
+        pub fn list(post: *const Post) []const Entry {
+            return post.entries[0..post.len];
+        }
+
+        pub fn has(post: *const Post, scene: Scene) bool {
+            for (post.list()) |entry| if (entry.scene == scene) return true;
+            return false;
+        }
+
+        /// Puts the pass in the chain, at its end, or takes it out; `want`
+        /// null flips it. False when the chain is full or the path too long.
+        pub fn set(post: *Post, scene: ?Scene, path: []const u8, want: ?bool) bool {
+            const at: ?usize = for (post.list(), 0..) |entry, i| {
+                if (entry.scene == scene and std.mem.eql(u8, entry.path.get(), path)) break i;
+            } else null;
+            const on = want orelse (at == null);
+            if (on == (at != null)) return true;
+            post.generation +%= 1;
+            if (at) |i| {
+                std.mem.copyForwards(Entry, post.entries[i .. post.len - 1], post.entries[i + 1 .. post.len]);
+                post.len -= 1;
+                return true;
+            }
+            if (post.len == max) return false;
+            post.entries[post.len] = .{ .scene = scene };
+            if (!post.entries[post.len].path.set(path)) return false;
+            post.len += 1;
+            return true;
+        }
+
+        pub fn clear(post: *Post) void {
+            if (post.len == 0) return;
+            post.len = 0;
+            post.generation +%= 1;
+        }
+    };
 
     pub fn toggleTransition(state: *Runtime, effect: animation.Transition) void {
         std.debug.assert(effect != .off);
@@ -690,7 +749,8 @@ pub const Runtime = struct {
     pub const MessageTime = enum { linger, fall, dissolve };
 
     pub const Toggle = enum { colors, wrap, tree_context_tag_style, tag_bottom, debug, focus_tint, column_tags, syntax_bold, verbose, message_animation, ligatures };
-    pub const Scene = std.meta.FieldEnum(animation.SceneEffect);
+    /// The bundled post passes, each a Shadertoy file in shaders/post/.
+    pub const Scene = enum { crt, ripple, glitch };
 
     pub const Action = union(enum) {
         toggle: Toggle,
@@ -704,6 +764,10 @@ pub const Runtime = struct {
         dump_dir,
         transition: animation.Transition,
         scene: Scene,
+        /// A Shadertoy file into the post chain or out of it; `off` empties
+        /// it of files.
+        shader,
+        shader_animation,
     };
 
     pub const Setting = struct {
@@ -756,6 +820,8 @@ pub const Runtime = struct {
         .{ .word = "Crt", .action = .{ .scene = .crt }, .availability = .scene_shaders },
         .{ .word = "Ripple", .action = .{ .scene = .ripple }, .availability = .scene_shaders },
         .{ .word = "Glitch", .action = .{ .scene = .glitch }, .availability = .scene_shaders },
+        .{ .word = "Shader", .action = .shader, .availability = .scene_shaders },
+        .{ .word = "ShaderAnimation", .action = .shader_animation, .availability = .scene_shaders },
     };
 
     pub fn find(name: []const u8) ?Setting {
@@ -789,7 +855,7 @@ pub const Runtime = struct {
                     @compileError("window blur must use the window-blur capability"),
                 .transition => if (setting.availability != .panel_transitions)
                     @compileError("panel effects must use the panel-transition capability"),
-                .scene => if (setting.availability != .scene_shaders)
+                .scene, .shader, .shader_animation => if (setting.availability != .scene_shaders)
                     @compileError("scene effects must use the scene-shader capability"),
                 // A toggle is plain state any shell can hold, except one for
                 // what only some shells draw: that one exists where they do.
@@ -815,9 +881,9 @@ pub const Runtime = struct {
         for (std.enums.values(Scene)) |effect| {
             if (actionCount(.{ .scene = effect }) != 1)
                 @compileError("scene effect must occur exactly once: " ++ @tagName(effect));
-            if (@FieldType(animation.SceneEffect, @tagName(effect)) != bool)
-                @compileError("scene effect fields must be booleans: " ++ @tagName(effect));
         }
+        if (actionCount(.shader) != 1 or actionCount(.shader_animation) != 1)
+            @compileError("Shader and ShaderAnimation must each occur exactly once");
     }
 
     pub fn apply(state: *Runtime, setting: Setting, argument: ?[]const u8) bool {
@@ -884,12 +950,24 @@ pub const Runtime = struct {
             },
             .scene => |effect| {
                 const want = switchedTo(argument) catch return false;
-                switch (effect) {
-                    inline else => |field| {
-                        const value = &@field(state.scene_effects, @tagName(field));
-                        value.* = want orelse !value.*;
-                    },
+                return state.post.set(effect, "", want);
+            },
+            .shader => {
+                const path = std.mem.trim(u8, argument orelse return false, " \t\r\n");
+                if (path.len == 0) return false;
+                if (std.mem.eql(u8, path, "off")) {
+                    var i: usize = 0;
+                    while (i < state.post.len) {
+                        const entry = state.post.entries[i];
+                        if (entry.scene == null) _ = state.post.set(null, entry.path.get(), false) else i += 1;
+                    }
+                    return true;
                 }
+                return state.post.set(null, path, null);
+            },
+            .shader_animation => {
+                const text = std.mem.trim(u8, argument orelse return false, " \t\r\n");
+                state.shader_animation = std.meta.stringToEnum(ShaderAnimation, text) orelse return false;
             },
             .theme, .font => return false,
         }
@@ -1041,11 +1119,24 @@ pub const Runtime = struct {
                     try out.print("{s} unsupported\n", .{setting.word});
                     continue;
                 }
-                const enabled = switch (effect) {
-                    inline else => |field| @field(state.scene_effects, @tagName(field)),
+                try out.print("{s} {s}\n", .{ setting.word, onOff(state.post.has(effect)) });
+            },
+            .shader => {
+                if (!setting.enabled(context.capabilities)) {
+                    try out.print("{s} unsupported\n", .{setting.word});
+                    continue;
+                }
+                var files: usize = 0;
+                for (state.post.list()) |entry| if (entry.scene == null) {
+                    try out.print("{s} {s}\n", .{ setting.word, entry.path.get() });
+                    files += 1;
                 };
-                try out.print("{s} {s}\n", .{ setting.word, onOff(enabled) });
+                if (files == 0) try out.print("{s} off\n", .{setting.word});
             },
+            .shader_animation => if (setting.enabled(context.capabilities))
+                try out.print("{s} {s}\n", .{ setting.word, @tagName(state.shader_animation) })
+            else
+                try out.print("{s} unsupported\n", .{setting.word}),
         };
 
         if (context.startup_config_path) |path|
@@ -1092,9 +1183,7 @@ pub const Runtime = struct {
         const scene = findAction(.{ .scene = std.enums.values(Scene)[0] }).?;
         try std.testing.expect(apply(&state, scene, "on"));
         try std.testing.expect(apply(&state, scene, "on"));
-        switch (std.enums.values(Scene)[0]) {
-            inline else => |f| try std.testing.expect(@field(state.scene_effects, @tagName(f))),
-        }
+        try std.testing.expect(state.post.has(std.enums.values(Scene)[0]));
     }
 
     test "a toggle flips when bare and sets when told on or off" {
@@ -1131,7 +1220,30 @@ pub const Runtime = struct {
         try std.testing.expect(apply(&state, find("PanelAscii").?, null));
         try std.testing.expectEqual(animation.Transition.off, state.panel_transition);
         try std.testing.expect(apply(&state, find("Crt").?, null));
-        try std.testing.expect(state.scene_effects.crt);
+        try std.testing.expect(state.post.has(.crt));
+    }
+
+    test "the post chain runs in the order its passes were put in, and Shader off empties it of files" {
+        var state: Runtime = .{};
+        try std.testing.expect(apply(&state, find("Shader").?, " ~/a.glsl\n"));
+        try std.testing.expect(apply(&state, find("Glitch").?, "on"));
+        try std.testing.expect(apply(&state, find("Shader").?, "/b.glsl"));
+        const chain = state.post.list();
+        try std.testing.expectEqual(@as(usize, 3), chain.len);
+        try std.testing.expectEqualStrings("~/a.glsl", chain[0].path.get());
+        try std.testing.expectEqual(Scene.glitch, chain[1].scene.?);
+        try std.testing.expectEqualStrings("/b.glsl", chain[2].path.get());
+        const moved = state.post.generation;
+        // A file named again leaves; the others keep their order.
+        try std.testing.expect(apply(&state, find("Shader").?, "~/a.glsl"));
+        try std.testing.expect(state.post.generation != moved);
+        try std.testing.expectEqual(Scene.glitch, state.post.list()[0].scene.?);
+        try std.testing.expect(apply(&state, find("Shader").?, "off"));
+        try std.testing.expectEqual(@as(usize, 1), state.post.len);
+        try std.testing.expect(!apply(&state, find("Shader").?, null));
+        try std.testing.expect(apply(&state, find("ShaderAnimation").?, "always"));
+        try std.testing.expectEqual(ShaderAnimation.always, state.shader_animation);
+        try std.testing.expect(!apply(&state, find("ShaderAnimation").?, "sometimes"));
     }
 
     test "tagline size validates before mutating live state" {
@@ -1252,6 +1364,8 @@ pub const Runtime = struct {
                 .window_blur => "40",
                 .message_ms => "1500",
                 .dump_dir => "~/dumps",
+                .shader => "~/crt.glsl",
+                .shader_animation => "always",
                 else => null,
             };
             try std.testing.expect(apply(&state, setting, argument));
@@ -1302,6 +1416,8 @@ pub const Runtime = struct {
                     .ripple => "Ripple on\n",
                     .glitch => "Glitch on\n",
                 },
+                .shader => "Shader ~/crt.glsl\n",
+                .shader_animation => "ShaderAnimation always\n",
                 .theme, .font => unreachable,
             };
             try std.testing.expect(std.mem.indexOf(u8, report, expected) != null);
diff --git a/src/effect_sources.zig b/src/effect_sources.zig
index 08680860..6ce11160 100644
--- a/src/effect_sources.zig
+++ b/src/effect_sources.zig
@@ -11,8 +11,11 @@ const ui_vertex_path = shader_dir ++ "ui.vert.glsl";
 const ui_fragment_path = shader_dir ++ "ui.frag.glsl";
 const image_vertex_path = shader_dir ++ "image.vert.glsl";
 const image_fragment_path = shader_dir ++ "image.frag.glsl";
-const scene_vertex_path = shader_dir ++ "crt.vert.glsl";
-const scene_fragment_path = shader_dir ++ "crt.frag.glsl";
+const post_vertex_path = shader_dir ++ "post.vert.glsl";
+// The bundled post passes as compiled: the prefix and the pass together.
+const post_crt_path = shader_dir ++ "post-crt.frag.glsl";
+const post_ripple_path = shader_dir ++ "post-ripple.frag.glsl";
+const post_glitch_path = shader_dir ++ "post-glitch.frag.glsl";
 
 pub const Backend = @TypeOf(build_config.platform);
 pub const backend: Backend = build_config.platform;
@@ -45,13 +48,15 @@ pub const files = switch (backend) {
     },
     .gui => [_]filesystem.Source{
         .{ .path = "src/gui/gui.zig", .contents = @embedFile("gui/gui.zig") },
-        .{ .path = "src/gui/crt.zig", .contents = @embedFile("gui/crt.zig") },
+        .{ .path = "src/gui/Post.zig", .contents = @embedFile("gui/Post.zig") },
         .{ .path = ui_vertex_path, .contents = @embedFile("effect-source-ui.vert.glsl") },
         .{ .path = ui_fragment_path, .contents = @embedFile("effect-source-ui.frag.glsl") },
         .{ .path = image_vertex_path, .contents = @embedFile("effect-source-image.vert.glsl") },
         .{ .path = image_fragment_path, .contents = @embedFile("effect-source-image.frag.glsl") },
-        .{ .path = scene_vertex_path, .contents = @embedFile("effect-source-crt.vert.glsl") },
-        .{ .path = scene_fragment_path, .contents = @embedFile("effect-source-crt.frag.glsl") },
+        .{ .path = post_vertex_path, .contents = @embedFile("effect-source-post.vert.glsl") },
+        .{ .path = post_crt_path, .contents = @embedFile("effect-source-post-crt.frag.glsl") },
+        .{ .path = post_ripple_path, .contents = @embedFile("effect-source-post-ripple.frag.glsl") },
+        .{ .path = post_glitch_path, .contents = @embedFile("effect-source-post-glitch.frag.glsl") },
     },
     .macos => [_]filesystem.Source{
         .{ .path = "src/macos/Sources/PardesView.swift", .contents = @embedFile("macos/Sources/PardesView.swift") },
@@ -69,8 +74,12 @@ pub fn forSetting(setting: config.Runtime.Setting) ?[]const []const u8 {
             .macos => &.{ "src/layout.zig", "src/pardes.zig", "src/macos/Sources/PardesView.swift", "src/macos/Sources/ScenePostprocessor.swift", "shaders/crt.ci.metal" },
             .web, .esp32p4 => null,
         },
-        .scene => switch (backend) {
-            .gui => &.{ "src/gui/crt.zig", "src/gui/gui.zig", scene_vertex_path, scene_fragment_path },
+        .scene => |effect| switch (backend) {
+            .gui => switch (effect) {
+                .crt => &.{ "src/gui/Post.zig", "src/gui/gui.zig", post_vertex_path, post_crt_path },
+                .ripple => &.{ "src/gui/Post.zig", "src/gui/gui.zig", post_vertex_path, post_ripple_path },
+                .glitch => &.{ "src/gui/Post.zig", "src/gui/gui.zig", post_vertex_path, post_glitch_path },
+            },
             .macos => &.{ "src/macos/Sources/PardesView.swift", "src/macos/Sources/ScenePostprocessor.swift", "shaders/crt.ci.metal" },
             .tty, .web, .esp32p4 => null,
         },
diff --git a/src/gui/Post.zig b/src/gui/Post.zig
new file mode 100644
index 00000000..d92623d7
--- /dev/null
+++ b/src/gui/Post.zig
@@ -0,0 +1,559 @@
+//! The post chain (docs/render-pipeline.md §6): Shadertoy passes over the
+//! finished frame, each reading the one before it (the frame first) and the
+//! last one writing the window. A pass is bundled (Crt, Ripple, Glitch:
+//! shaders/post/, compiled with the build) or a user's file (Shader <path>),
+//! compiled when it joins the chain by the build's own glslc invocation on a
+//! thread of its own, never on the frame path. A file whose compile fails
+//! keeps its last good pipeline, and glslc missing is said once.
+//!
+//! The uniforms are ghostty's (Uniforms), so a shader written for ghostty runs
+//! here. Their clock is the shell's and moves only when the chain draws:
+//! with a frame of the core's, or on its own while ShaderAnimation asks for
+//! it (redraw level A, §5.5: the chain alone, over the retained frame).
+const std = @import("std");
+const libc = std.c;
+const ghostty_vt = @import("ghostty-vt");
+const pardes = @import("../pardes.zig");
+const filesystem = @import("../fs.zig");
+const host_io = @import("../host_io.zig");
+const gui = @import("gui.zig");
+const c = gui.c;
+
+const Post = @This();
+const Scene = pardes.config.Runtime.Scene;
+const Chain = pardes.config.Runtime.Post;
+const Pipeline = c.SDL_GPUGraphicsPipeline;
+pub const max = Chain.max;
+
+const prefix = @embedFile("post-prefix.glsl");
+const vert_spv = @embedFile("post.vert.spv");
+const bundled_spv = std.EnumArray(Scene, []const u8).init(.{
+    .crt = @embedFile("post-crt.frag.spv"),
+    .ripple = @embedFile("post-ripple.frag.spv"),
+    .glitch = @embedFile("post-glitch.frag.spv"),
+});
+
+/// ghostty's Shadertoy uniform block, member for member in the GLSL block's
+/// order and std140 layout (shaders/post/prefix.glsl). Filled by the GLSL
+/// names: ghostty's own Zig mirror calls the second-to-last slot
+/// selection_background, so there the two selection colours arrive swapped
+/// (docs §6, open point 1); here each is what its GLSL name says.
+pub const Uniforms = extern struct {
+    resolution: [3]f32 align(16) = .{ 0, 0, 1 },
+    time: f32 align(4) = 0,
+    time_delta: f32 align(4) = 0,
+    frame_rate: f32 align(4) = 60,
+    frame: i32 align(4) = 0,
+    channel_time: [4][4]f32 align(16) = @splat(@splat(0)),
+    channel_resolution: [4][4]f32 align(16) = @splat(@splat(0)),
+    mouse: [4]f32 align(16) = @splat(0),
+    date: [4]f32 align(16) = @splat(0),
+    sample_rate: f32 align(4) = 44100,
+    current_cursor: [4]f32 align(16) = @splat(0),
+    previous_cursor: [4]f32 align(16) = @splat(0),
+    current_cursor_color: [4]f32 align(16) = @splat(0),
+    previous_cursor_color: [4]f32 align(16) = @splat(0),
+    current_cursor_style: i32 align(4) = 0,
+    previous_cursor_style: i32 align(4) = 0,
+    cursor_visible: i32 align(4) = 0,
+    cursor_change_time: f32 align(4) = 0,
+    time_focus: f32 align(4) = 0,
+    focus: i32 align(4) = 1,
+    palette: [256][4]f32 align(16) = @splat(@splat(0)),
+    background_color: [4]f32 align(16) = @splat(0),
+    foreground_color: [4]f32 align(16) = @splat(0),
+    cursor_color: [4]f32 align(16) = @splat(0),
+    cursor_text: [4]f32 align(16) = @splat(0),
+    selection_foreground_color: [4]f32 align(16) = @splat(0),
+    selection_background_color: [4]f32 align(16) = @splat(0),
+};
+
+pub const Pass = struct {
+    scene: ?Scene = null,
+    /// A user's file, owned; empty for a bundled pass.
+    path: []u8 = &.{},
+    pipeline: ?*Pipeline = null,
+};
+
+/// One compile of a chain's new files, on its own thread.
+const Job = struct {
+    const Result = union(enum) { none, spirv: []u8, failed: []u8, missing };
+    io: std.Io,
+    gpa: std.mem.Allocator,
+    paths: [max][]u8 = @splat(&.{}),
+    results: [max]Result = @splat(.none),
+    len: usize = 0,
+    done: std.atomic.Value(bool) = .init(false),
+    thread: std.Thread = undefined,
+};
+
+passes: [max]Pass = @splat(.{}),
+len: usize = 0,
+/// The chain generation `passes` follow; null before the first.
+generation: ?u32 = null,
+bundled: std.EnumArray(Scene, ?*Pipeline) = .initFill(null),
+job: ?*Job = null,
+/// Said once: without glslc, files never compile.
+missing_said: bool = false,
+ping: [2]?*c.SDL_GPUTexture = .{ null, null },
+ping_w: u32 = 0,
+ping_h: u32 = 0,
+uniforms: Uniforms = .{},
+started_ns: ?u64 = null,
+last_ns: u64 = 0,
+
+/// Brings the passes to the chain the core holds, and takes in a finished
+/// compile. Called each loop step, off the frame path.
+pub fn sync(post: *Post, gpa: std.mem.Allocator, io: std.Io, device: *c.SDL_GPUDevice, format: c.SDL_GPUTextureFormat, core: *pardes.Pardes) void {
+    if (post.job) |job| {
+        if (!job.done.load(.acquire)) return;
+        job.thread.join();
+        post.job = null;
+        post.collect(gpa, device, format, core, job);
+    }
+    const chain = &core.settings.post;
+    if (post.generation == chain.generation) return;
+    post.generation = chain.generation;
+    var next: [max]Pass = @splat(.{});
+    for (chain.list(), 0..) |entry, i| {
+        if (entry.scene) |scene| {
+            if (post.bundled.get(scene) == null) post.bundled.set(scene, makePipeline(device, format, bundled_spv.get(scene)) catch null);
+            next[i] = .{ .scene = scene, .pipeline = post.bundled.get(scene) };
+            continue;
+        }
+        // A file already in the chain keeps its pipeline and its path.
+        for (post.passes[0..post.len]) |*pass| {
+            if (pass.scene != null or !std.mem.eql(u8, pass.path, entry.path.get())) continue;
+            next[i] = pass.*;
+            pass.* = .{};
+            break;
+        } else next[i] = .{ .path = gpa.dupe(u8, entry.path.get()) catch &.{} };
+    }
+    for (post.passes[0..post.len]) |pass| {
+        if (pass.scene == null) if (pass.pipeline) |pipeline| c.SDL_ReleaseGPUGraphicsPipeline(device, pipeline);
+        gpa.free(pass.path);
+    }
+    post.passes = next;
+    post.len = chain.len;
+    // An emptied chain's clock starts again with the next pass put in it.
+    if (post.len == 0) {
+        post.started_ns = null;
+        post.last_ns = 0;
+        post.uniforms.frame = 0;
+    }
+    // The new files compile together, on a thread of their own.
+    const job = gpa.create(Job) catch return;
+    job.* = .{ .io = io, .gpa = gpa };
+    for (post.passes[0..post.len]) |pass| {
+        if (pass.scene != null or pass.pipeline != null or pass.path.len == 0) continue;
+        job.paths[job.len] = gpa.dupe(u8, pass.path) catch continue;
+        job.len += 1;
+    }
+    if (job.len == 0) return gpa.destroy(job);
+    job.thread = std.Thread.spawn(.{}, compile, .{job}) catch {
+        for (job.paths[0..job.len]) |path| gpa.free(path);
+        return gpa.destroy(job);
+    };
+    post.job = job;
+}
+
+fn collect(post: *Post, gpa: std.mem.Allocator, device: *c.SDL_GPUDevice, format: c.SDL_GPUTextureFormat, core: *pardes.Pardes, job: *Job) void {
+    defer gpa.destroy(job);
+    for (job.paths[0..job.len], job.results[0..job.len]) |path, result| {
+        defer gpa.free(path);
+        const pass = for (post.passes[0..post.len]) |*pass| {
+            if (pass.scene == null and std.mem.eql(u8, pass.path, path)) break pass;
+        } else null;
+        var buf: [512]u8 = undefined;
+        switch (result) {
+            .none => {},
+            .missing => if (!post.missing_said) {
+                post.missing_said = true;
+                core.setMessage(core.active, "Shader: glslc is not on PATH, so Shadertoy files do not run (Crt, Ripple and Glitch do)");
+            },
+            .failed => |text| {
+                defer gpa.free(text);
+                // glslc's first line says where: in the file's own lines.
+                const first = std.mem.sliceTo(text, '\n');
+                core.setMessage(core.active, std.fmt.bufPrint(&buf, "Shader {s}: {s}", .{ path, first[0..@min(first.len, 400)] }) catch "Shader: compile failed");
+            },
+            .spirv => |spirv| {
+                defer gpa.free(spirv);
+                const target = pass orelse continue;
+                const made = makePipeline(device, format, spirv) catch {
+                    core.setMessage(core.active, std.fmt.bufPrint(&buf, "Shader {s}: the GPU refused it", .{path}) catch "Shader: the GPU refused it");
+                    continue;
+                };
+                if (target.pipeline) |old| c.SDL_ReleaseGPUGraphicsPipeline(device, old);
+                target.pipeline = made;
+            },
+        }
+    }
+}
+
+/// The compile thread: each file behind the prefix, through glslc exactly as
+/// the build calls it (build.zig compileGlsl), its SPIR-V on stdout.
+fn compile(job: *Job) void {
+    defer job.done.store(true, .release);
+    defer {
+        var event = std.mem.zeroes(c.SDL_Event);
+        event.type = c.SDL_EVENT_USER;
+        _ = c.SDL_PushEvent(&event);
+    }
+    for (job.paths[0..job.len], 0..) |path, i| job.results[i] = compileOne(job.gpa, job.io, path, i);
+}
+
+fn compileOne(gpa: std.mem.Allocator, io: std.Io, path: []const u8, index: usize) Job.Result {
+    var home_buf: [4096]u8 = undefined;
+    const expanded = if (std.mem.startsWith(u8, path, "~/")) if (libc.getenv("HOME")) |home|
+        std.fmt.bufPrint(&home_buf, "{s}/{s}", .{ std.mem.span(home), path[2..] }) catch path
+    else
+        path else path;
+    const body = filesystem.readFile(gpa, expanded) catch |err|
+        return .{ .failed = std.fmt.allocPrint(gpa, "cannot read it ({t})", .{err}) catch return .none };
+    defer gpa.free(body);
+    const dir = if (libc.getenv("XDG_RUNTIME_DIR")) |d| std.mem.span(d) else "/tmp";
+    var source_buf: [4096]u8 = undefined;
+    const source = std.fmt.bufPrintSentinel(&source_buf, "{s}/pardes-post-{d}-{d}.frag.glsl", .{ dir, libc.getpid(), index }, 0) catch return .none;
+    defer _ = libc.unlink(source);
+    {
+        const fd = libc.open(source, .{ .ACCMODE = .WRONLY, .CREAT = true, .TRUNC = true }, @as(libc.mode_t, 0o600));
+        if (fd < 0) return .{ .failed = gpa.dupe(u8, "cannot write its source for glslc") catch return .none };
+        defer _ = libc.close(fd);
+        if (!host_io.writeFd(fd, prefix) or !host_io.writeFd(fd, body))
+            return .{ .failed = gpa.dupe(u8, "cannot write its source for glslc") catch return .none };
+    }
+    const run = std.process.run(gpa, io, .{
+        .argv = &.{ "glslc", "-fshader-stage=fragment", source, "-o", "-" },
+        .stdout_limit = .limited(16 << 20),
+        .stderr_limit = .limited(64 << 10),
+    }) catch |err| return switch (err) {
+        error.FileNotFound => .missing,
+        else => .{ .failed = std.fmt.allocPrint(gpa, "glslc did not run ({t})", .{err}) catch return .none },
+    };
+    const clean = switch (run.term) {
+        .exited => |code| code == 0,
+        else => false,
+    };
+    if (clean) {
+        gpa.free(run.stderr);
+        return .{ .spirv = run.stdout };
+    }
+    gpa.free(run.stdout);
+    // glslc names the temporary source; the file is what a person knows.
+    defer gpa.free(run.stderr);
+    const named = std.mem.replaceOwned(u8, gpa, run.stderr, source, path) catch return .{ .failed = gpa.dupe(u8, "glslc failed") catch return .none };
+    return .{ .failed = named };
+}
+
+fn makePipeline(device: *c.SDL_GPUDevice, format: c.SDL_GPUTextureFormat, frag: []const u8) !*Pipeline {
+    const vs = try gui.makeShader(device, vert_spv, c.SDL_GPU_SHADERSTAGE_VERTEX, 0, 0);
+    defer c.SDL_ReleaseGPUShader(device, vs);
+    const fs = try gui.makeShader(device, frag, c.SDL_GPU_SHADERSTAGE_FRAGMENT, 1, 2);
+    defer c.SDL_ReleaseGPUShader(device, fs);
+    var target = c.SDL_GPUColorTargetDescription{ .format = format, .blend_state = std.mem.zeroes(c.SDL_GPUColorTargetBlendState) };
+    var info = std.mem.zeroes(c.SDL_GPUGraphicsPipelineCreateInfo);
+    info.vertex_shader = vs;
+    info.fragment_shader = fs;
+    info.primitive_type = c.SDL_GPU_PRIMITIVETYPE_TRIANGLELIST;
+    info.rasterizer_state.fill_mode = c.SDL_GPU_FILLMODE_FILL;
+    info.rasterizer_state.cull_mode = c.SDL_GPU_CULLMODE_NONE;
+    info.multisample_state.sample_count = c.SDL_GPU_SAMPLECOUNT_1;
+    info.target_info = .{ .color_target_descriptions = &target, .num_color_targets = 1 };
+    return c.SDL_CreateGPUGraphicsPipeline(device, &info) orelse error.GpuCreate;
+}
+
+/// A pass is ready to draw.
+pub fn ready(post: *const Post) bool {
+    for (post.passes[0..post.len]) |pass| if (pass.pipeline != null) return true;
+    return false;
+}
+
+/// The chain redraws on its own (level A) as ShaderAnimation says.
+pub fn animating(post: *const Post, mode: pardes.config.Runtime.ShaderAnimation) bool {
+    return post.ready() and switch (mode) {
+        .off => false,
+        .on => post.uniforms.focus != 0,
+        .always => true,
+    };
+}
+
+/// What a frame of the core's tells the passes: where its cursor is drawn
+/// and in what, and the theme's colours.
+pub const Frame = struct {
+    pub const Cursor = struct { x0: f32, y0: f32, x1: f32, y1: f32, rgb: [3]u8, text: [3]u8, bar: bool };
+    cursor: ?Cursor,
+    background: [3]u8,
+    foreground: [3]u8,
+    selection_foreground: [3]u8,
+    selection_background: [3]u8,
+};
+
+fn rgba(rgb: [3]u8) [4]f32 {
+    return .{ @as(f32, @floatFromInt(rgb[0])) / 255, @as(f32, @floatFromInt(rgb[1])) / 255, @as(f32, @floatFromInt(rgb[2])) / 255, 1 };
+}
+
+/// Takes in a frame of the core's. The cursor's rectangle is (left, BOTTOM
+/// edge, width, height) in framebuffer pixels, y down; a move or a new
+/// colour makes the old one the previous and stamps the change.
+pub fn describe(post: *Post, frame: Frame) void {
+    const u = &post.uniforms;
+    u.background_color = rgba(frame.background);
+    u.foreground_color = rgba(frame.foreground);
+    u.selection_foreground_color = rgba(frame.selection_foreground);
+    u.selection_background_color = rgba(frame.selection_background);
+    if (u.palette[1][3] == 0) for (&u.palette, 0..) |*slot, i| {
+        const color = ghostty_vt.color.default[i];
+        slot.* = rgba(.{ color.r, color.g, color.b });
+    };
+    u.cursor_visible = @intFromBool(frame.cursor != null);
+    const cursor = frame.cursor orelse return;
+    const rect: [4]f32 = .{ cursor.x0, cursor.y1, cursor.x1 - cursor.x0, cursor.y1 - cursor.y0 };
+    const style: i32 = if (cursor.bar) 2 else 0;
+    const color = rgba(cursor.rgb);
+    u.cursor_color = color;
+    u.cursor_text = rgba(cursor.text);
+    if (std.meta.eql(rect, u.current_cursor) and std.meta.eql(color, u.current_cursor_color) and style == u.current_cursor_style) return;
+    u.previous_cursor = u.current_cursor;
+    u.previous_cursor_color = u.current_cursor_color;
+    u.previous_cursor_style = u.current_cursor_style;
+    u.current_cursor = rect;
+    u.current_cursor_color = color;
+    u.current_cursor_style = style;
+    u.cursor_change_time = u.time;
+}
+
+/// The window gained or lost the focus.
+pub fn focus(post: *Post, focused: bool) void {
+    if (focused and post.uniforms.focus == 0) post.uniforms.time_focus = post.uniforms.time;
+    post.uniforms.focus = @intFromBool(focused);
+}
+
+/// The pointer, in framebuffer pixels: Shadertoy's iMouse, xy where it is,
+/// zw where the last press was, negative once released.
+pub fn mouse(post: *Post, x: f32, y: f32, press: ?bool) void {
+    const m = &post.uniforms.mouse;
+    m[0] = x;
+    m[1] = y;
+    if (press) |down| {
+        if (down) {
+            m[2] = x;
+            m[3] = y;
+        } else {
+            m[2] = -@abs(m[2]);
+            m[3] = -@abs(m[3]);
+        }
+    }
+}
+
+/// Runs the passes over `source`, the finished frame, into `target`: each
+/// reads the one before, the ones between write two ping-pong textures that
+/// start cleared, and iTime and iFrame move by this one draw.
+pub fn draw(post: *Post, device: *c.SDL_GPUDevice, cmd: *c.SDL_GPUCommandBuffer, sampler: *c.SDL_GPUSampler, format: c.SDL_GPUTextureFormat, source: *c.SDL_GPUTexture, target: *c.SDL_GPUTexture, w: u32, h: u32, now_ns: u64, opaque_window: bool) !void {
+    var live: usize = 0;
+    for (post.passes[0..post.len]) |pass| live += @intFromBool(pass.pipeline != null);
+    if (live == 0) return;
+    if (live > 1 and (post.ping[0] == null or post.ping_w != w or post.ping_h != h)) {
+        for (&post.ping) |*texture| {
+            if (texture.*) |old| c.SDL_ReleaseGPUTexture(device, old);
+            var info = std.mem.zeroes(c.SDL_GPUTextureCreateInfo);
+            info.type = c.SDL_GPU_TEXTURETYPE_2D;
+            info.format = format;
+            info.usage = c.SDL_GPU_TEXTUREUSAGE_COLOR_TARGET | c.SDL_GPU_TEXTUREUSAGE_SAMPLER;
+            info.width = w;
+            info.height = h;
+            info.layer_count_or_depth = 1;
+            info.num_levels = 1;
+            info.sample_count = c.SDL_GPU_SAMPLECOUNT_1;
+            texture.* = c.SDL_CreateGPUTexture(device, &info) orelse return error.GpuCreate;
+        }
+        post.ping_w = w;
+        post.ping_h = h;
+    }
+    const u = &post.uniforms;
+    const started = post.started_ns orelse now_ns;
+    post.started_ns = started;
+    const elapsed = @as(f64, @floatFromInt(now_ns -| started)) / std.time.ns_per_s;
+    const delta: f32 = if (post.last_ns == 0) 0 else @floatCast(@as(f64, @floatFromInt(now_ns -| post.last_ns)) / std.time.ns_per_s);
+    post.last_ns = now_ns;
+    u.time = @floatCast(elapsed);
+    u.time_delta = delta;
+    u.frame_rate = if (delta > 0) 1 / delta else 60;
+    u.resolution = .{ @floatFromInt(w), @floatFromInt(h), 1 };
+    u.channel_resolution[0] = .{ @floatFromInt(w), @floatFromInt(h), 1, 0 };
+    // UTC: the year, the month from 0, the day, the second of the day.
+    var wall: libc.timespec = undefined;
+    if (libc.clock_gettime(.REALTIME, &wall) != 0) wall.sec = 0;
+    const epoch: std.time.epoch.EpochSeconds = .{ .secs = @intCast(@max(0, wall.sec)) };
+    const day = epoch.getEpochDay().calculateYearDay();
+    const month = day.calculateMonthDay();
+    u.date = .{ @floatFromInt(day.year), @floatFromInt(month.month.numeric() - 1), @floatFromInt(month.day_index + 1), @floatFromInt(epoch.getDaySeconds().secs) };
+    const own: [4]f32 = .{ @floatFromInt(@intFromBool(opaque_window)), 0, 0, 0 };
+
+    var input = source;
+    var index: usize = 0;
+    for (post.passes[0..post.len]) |pass| {
+        const pipeline = pass.pipeline orelse continue;
+        index += 1;
+        const last = index == live;
+        const output = if (last) target else post.ping[index % 2].?;
+        var info = std.mem.zeroes(c.SDL_GPUColorTargetInfo);
+        info.texture = output;
+        info.load_op = if (last) c.SDL_GPU_LOADOP_DONT_CARE else c.SDL_GPU_LOADOP_CLEAR;
+        info.store_op = c.SDL_GPU_STOREOP_STORE;
+        const pass_rp = c.SDL_BeginGPURenderPass(cmd, &info, 1, null);
+        c.SDL_BindGPUGraphicsPipeline(pass_rp, pipeline);
+        const binding = c.SDL_GPUTextureSamplerBinding{ .texture = input, .sampler = sampler };
+        c.SDL_BindGPUFragmentSamplers(pass_rp, 0, &binding, 1);
+        c.SDL_PushGPUFragmentUniformData(cmd, 0, u, @sizeOf(Uniforms));
+        c.SDL_PushGPUFragmentUniformData(cmd, 1, &own, @sizeOf(@TypeOf(own)));
+        c.SDL_DrawGPUPrimitives(pass_rp, 3, 1, 0, 0);
+        c.SDL_EndGPURenderPass(pass_rp);
+        input = output;
+    }
+    u.frame +%= 1;
+}
+
+pub fn deinit(post: *Post, gpa: std.mem.Allocator, device: *c.SDL_GPUDevice) void {
+    if (post.job) |job| {
+        job.thread.join();
+        for (job.paths[0..job.len], job.results[0..job.len]) |path, result| {
+            gpa.free(path);
+            switch (result) {
+                .spirv, .failed => |bytes| gpa.free(bytes),
+                .none, .missing => {},
+            }
+        }
+        gpa.destroy(job);
+    }
+    for (post.passes[0..post.len]) |pass| {
+        if (pass.scene == null) if (pass.pipeline) |pipeline| c.SDL_ReleaseGPUGraphicsPipeline(device, pipeline);
+        gpa.free(pass.path);
+    }
+    for (post.bundled.values) |pipeline| if (pipeline) |p| c.SDL_ReleaseGPUGraphicsPipeline(device, p);
+    for (post.ping) |texture| if (texture) |t| c.SDL_ReleaseGPUTexture(device, t);
+}
+
+/// ghostty 1.3.2's Uniforms (src/renderer/shadertoy.zig), copied: the offsets
+/// ours must match. Its last two names are swapped against its own GLSL.
+const GhosttyUniforms = extern struct {
+    resolution: [3]f32 align(16),
+    time: f32 align(4),
+    time_delta: f32 align(4),
+    frame_rate: f32 align(4),
+    frame: i32 align(4),
+    channel_time: [4][4]f32 align(16),
+    channel_resolution: [4][4]f32 align(16),
+    mouse: [4]f32 align(16),
+    date: [4]f32 align(16),
+    sample_rate: f32 align(4),
+    current_cursor: [4]f32 align(16),
+    previous_cursor: [4]f32 align(16),
+    current_cursor_color: [4]f32 align(16),
+    previous_cursor_color: [4]f32 align(16),
+    current_cursor_style: i32 align(4),
+    previous_cursor_style: i32 align(4),
+    cursor_visible: i32 align(4),
+    cursor_change_time: f32 align(4),
+    time_focus: f32 align(4),
+    focus: i32 align(4),
+    palette: [256][4]f32 align(16),
+    background_color: [4]f32 align(16),
+    foreground_color: [4]f32 align(16),
+    cursor_color: [4]f32 align(16),
+    cursor_text: [4]f32 align(16),
+    selection_background_color: [4]f32 align(16),
+    selection_foreground_color: [4]f32 align(16),
+};
+
+test "the uniform block is ghostty's, offset for offset, and the prefix names it in that order" {
+    const ours = @typeInfo(Uniforms).@"struct".fields;
+    const theirs = @typeInfo(GhosttyUniforms).@"struct".fields;
+    try std.testing.expectEqual(theirs.len, ours.len);
+    try std.testing.expectEqual(@sizeOf(GhosttyUniforms), @sizeOf(Uniforms));
+    inline for (ours, theirs) |a, b| {
+        try std.testing.expectEqual(@offsetOf(GhosttyUniforms, b.name), @offsetOf(Uniforms, a.name));
+        try std.testing.expectEqual(b.type, a.type);
+    }
+    // By NAME: iSelectionForegroundColor sits where ghostty's Zig says
+    // selection_background, which is where its GLSL puts the foreground.
+    try std.testing.expectEqual(@offsetOf(GhosttyUniforms, "selection_background_color"), @offsetOf(Uniforms, "selection_foreground_color"));
+    // The prefix's block, member by member, in ghostty's GLSL names and types.
+    const glsl = [_]struct { []const u8, []const u8 }{
+        .{ "vec3", "iResolution" },               .{ "float", "iTime" },                 .{ "float", "iTimeDelta" },
+        .{ "float", "iFrameRate" },               .{ "int", "iFrame" },                  .{ "float", "iChannelTime[4]" },
+        .{ "vec3", "iChannelResolution[4]" },     .{ "vec4", "iMouse" },                 .{ "vec4", "iDate" },
+        .{ "float", "iSampleRate" },              .{ "vec4", "iCurrentCursor" },         .{ "vec4", "iPreviousCursor" },
+        .{ "vec4", "iCurrentCursorColor" },       .{ "vec4", "iPreviousCursorColor" },   .{ "int", "iCurrentCursorStyle" },
+        .{ "int", "iPreviousCursorStyle" },       .{ "int", "iCursorVisible" },          .{ "float", "iTimeCursorChange" },
+        .{ "float", "iTimeFocus" },               .{ "int", "iFocus" },                  .{ "vec3", "iPalette[256]" },
+        .{ "vec3", "iBackgroundColor" },          .{ "vec3", "iForegroundColor" },       .{ "vec3", "iCursorColor" },
+        .{ "vec3", "iCursorText" },               .{ "vec3", "iSelectionForegroundColor" }, .{ "vec3", "iSelectionBackgroundColor" },
+    };
+    try std.testing.expectEqual(ours.len, glsl.len);
+    const block = prefix[std.mem.indexOf(u8, prefix, "uniform Globals {").?..];
+    var lines = std.mem.tokenizeScalar(u8, block[0..std.mem.indexOfScalar(u8, block, '}').?], '\n');
+    _ = lines.next();
+    for (glsl) |member| {
+        var words = std.mem.tokenizeAny(u8, lines.next().?, " ;");
+        try std.testing.expectEqualStrings("uniform", words.next().?);
+        try std.testing.expectEqualStrings(member[0], words.next().?);
+        try std.testing.expectEqualStrings(member[1], words.next().?);
+    }
+    try std.testing.expect(lines.next() == null);
+}
+
+test "a moved cursor becomes the previous one, stamped with the time of the move" {
+    var post: Post = .{};
+    const frame: Frame = .{ .cursor = .{ .x0 = 10, .y0 = 20, .x1 = 11, .y1 = 40, .rgb = .{ 255, 0, 0 }, .text = .{ 0, 0, 0 }, .bar = true }, .background = .{ 0, 0, 0 }, .foreground = .{ 255, 255, 255 }, .selection_foreground = .{ 1, 2, 3 }, .selection_background = .{ 4, 5, 6 } };
+    post.uniforms.time = 1.5;
+    post.describe(frame);
+    // Left, BOTTOM edge, width, height, in framebuffer pixels, y down.
+    try std.testing.expectEqual([4]f32{ 10, 40, 1, 20 }, post.uniforms.current_cursor);
+    try std.testing.expectEqual(@as(i32, 2), post.uniforms.current_cursor_style);
+    try std.testing.expectEqual(@as(f32, 1.5), post.uniforms.cursor_change_time);
+    post.uniforms.time = 2;
+    post.describe(frame);
+    try std.testing.expectEqual(@as(f32, 1.5), post.uniforms.cursor_change_time);
+    var moved = frame;
+    moved.cursor.?.x0 = 20;
+    moved.cursor.?.x1 = 21;
+    post.describe(moved);
+    try std.testing.expectEqual([4]f32{ 10, 40, 1, 20 }, post.uniforms.previous_cursor);
+    try std.testing.expectEqual(@as(f32, 2), post.uniforms.cursor_change_time);
+    try std.testing.expectEqual([4]f32{ 1.0 / 255.0, 2.0 / 255.0, 3.0 / 255.0, 1 }, post.uniforms.selection_foreground_color);
+}
+
+test "ghostty's test shaders compile behind the prefix, and its invalid one fails with glslc's words" {
+    const gpa = std.testing.allocator;
+    const io = std.testing.io;
+    // ghostty's own test shaders, from its package in zig-pkg.
+    var pkg = std.Io.Dir.cwd().openDir(io, "zig-pkg", .{ .iterate = true }) catch return error.SkipZigTest;
+    defer pkg.close(io);
+    var it = pkg.iterate();
+    const ghostty = while (it.next(io) catch null) |entry| {
+        if (std.mem.startsWith(u8, entry.name, "ghostty-")) break entry.name;
+    } else return error.SkipZigTest;
+    var buf: [512]u8 = undefined;
+    for ([_][]const u8{ "crt", "focus", "invalid" }, 0..) |name, i| {
+        const path = try std.fmt.bufPrint(&buf, "zig-pkg/{s}/src/renderer/shaders/test_shadertoy_{s}.glsl", .{ ghostty, name });
+        const result = compileOne(gpa, io, path, i);
+        switch (result) {
+            .missing => return error.SkipZigTest, // no glslc here
+            .spirv => |spirv| {
+                defer gpa.free(spirv);
+                try std.testing.expect(!std.mem.eql(u8, name, "invalid"));
+                // SPIR-V's magic number, little-endian.
+                try std.testing.expectEqual(@as(u32, 0x07230203), std.mem.readInt(u32, spirv[0..4], .little));
+            },
+            .failed => |text| {
+                defer gpa.free(text);
+                try std.testing.expectEqualStrings("invalid", name);
+                // Named by the file, not by the temporary source glslc read.
+                try std.testing.expect(std.mem.indexOf(u8, text, path) != null);
+                try std.testing.expect(std.mem.indexOf(u8, text, "pardes-post-") == null);
+            },
+            .none => return error.TestUnexpectedResult,
+        }
+    }
+}
diff --git a/src/gui/crt.zig b/src/gui/crt.zig
deleted file mode 100644
index 2a5ea7e4..00000000
--- a/src/gui/crt.zig
+++ /dev/null
@@ -1,101 +0,0 @@
-//! The Crt builtin's screen geometry, shared between the gui shell's input
-//! mapping and its shader: crt.frag.glsl shows the scene point
-//! uv' = cc*(1 + barrel*r2) at screen point cc, so a physical mouse position
-//! must pass through the SAME forward transform before it becomes a cell.
-//! Pure std, so the unit-test step can pin it against the shader formula.
-
-const std = @import("std");
-
-/// MUST match BARREL in shaders/crt.frag.glsl.
-pub const barrel: f32 = 0.016;
-
-pub const Point = struct { x: f32, y: f32 };
-pub const Effects = struct { crt: bool = false, ripple: bool = false, glitch: bool = false };
-pub const Frame = struct { effects: Effects = .{}, time_seconds: f32 = 0 };
-
-fn fract(x: f32) f32 {
-    return x - @floor(x);
-}
-
-fn smoothstep(lo: f32, hi: f32, value: f32) f32 {
-    const t = std.math.clamp((value - lo) / (hi - lo), 0, 1);
-    return t * t * (3 - 2 * t);
-}
-
-/// Match `sceneUv` in crt.frag.glsl. This is a forward screen→sample mapping:
-/// a physical pointer is sent to the logical scene pixel displayed under it.
-pub fn mapScene(x: f32, y: f32, w: f32, h: f32, effects: Effects, time_seconds: f32) ?Point {
-    const safe_w = @max(1, w);
-    const safe_h = @max(1, h);
-    const ccx = x / safe_w * 2.0 - 1.0;
-    const ccy = y / safe_h * 2.0 - 1.0;
-    const s = 1.0 + barrel * (ccx * ccx + ccy * ccy) * @as(f32, @floatFromInt(@intFromBool(effects.crt)));
-    var u = ccx * s * 0.5 + 0.5;
-    var v = ccy * s * 0.5 + 0.5;
-    // The CRT shader paints no scene when this barrel-mapped coordinate lies
-    // on or beyond the tube edge. There is no logical edge cell under those
-    // black pixels, so input must be inert there rather than clamped.
-    if (effects.crt and (u <= 0 or u >= 1 or v <= 0 or v >= 1)) return null;
-    if (effects.ripple) {
-        const cx = u - 0.5;
-        const cy = v - 0.5;
-        const radius = @sqrt(cx * cx + cy * cy);
-        const envelope = 1.0 - smoothstep(0.04, 0.72, radius);
-        const wave = @sin(radius * 42.0 - time_seconds * 5.2);
-        const len = @max(radius, 0.00001);
-        u += cx / len * wave * envelope * 0.0032;
-        v += cy / len * wave * envelope * 0.0032;
-    }
-    if (effects.glitch) {
-        const band = @floor(v * 96.0);
-        const tick = @floor(time_seconds * 13.0);
-        const seed = noiseAt(band, tick);
-        const tear = smoothstep(0.955, 1.0, seed);
-        u += (noiseAt(seed, band) - 0.5) * tear * 0.020;
-    }
-    return .{
-        .x = std.math.clamp(u * safe_w, 0, safe_w - 1),
-        .y = std.math.clamp(v * safe_h, 0, safe_h - 1),
-    };
-}
-
-fn noiseAt(x: f32, y: f32) f32 {
-    var qx = fract(x * 0.1031);
-    var qy = fract(y * 0.1031);
-    var qz = fract(x * 0.1031);
-    const d = qx * (qy + 33.33) + qy * (qz + 33.33) + qz * (qx + 33.33);
-    qx += d;
-    qy += d;
-    qz += d;
-    return fract((qx + qy) * qz);
-}
-
-test "map matches the shader's barrel formula" {
-    // center is a fixed point
-    const center = mapScene(500, 250, 1000, 500, .{ .crt = true }, 0).?;
-    try std.testing.expectApproxEqAbs(@as(f32, 500), center.x, 0.001);
-    try std.testing.expectApproxEqAbs(@as(f32, 250), center.y, 0.001);
-    // Corners barrel beyond the tube and are black/inert in the shader.
-    try std.testing.expect(mapScene(0, 0, 1000, 500, .{ .crt = true }, 0) == null);
-    try std.testing.expect(mapScene(1000, 500, 1000, 500, .{ .crt = true }, 0) == null);
-    // (100,100) of 1000x500: cc=(-0.8,-0.6), r2=1.0, s=1.016 ->
-    // cc'=(-0.8128,-0.6096) -> (93.6, 97.6)
-    const near_edge = mapScene(100, 100, 1000, 500, .{ .crt = true }, 0).?;
-    try std.testing.expectApproxEqAbs(@as(f32, 93.6), near_edge.x, 0.01);
-    try std.testing.expectApproxEqAbs(@as(f32, 97.6), near_edge.y, 0.01);
-    // (900,250): cc=(0.8,0), r2=0.64, s=1.01024 -> x'=904.096
-    const side = mapScene(900, 250, 1000, 500, .{ .crt = true }, 0).?;
-    try std.testing.expectApproxEqAbs(@as(f32, 904.096), side.x, 0.01);
-}
-
-test "scene mapping composes ripple and deterministic glitch" {
-    const plain = mapScene(300, 200, 800, 600, .{}, 2.5).?;
-    try std.testing.expectApproxEqAbs(@as(f32, 300), plain.x, 0.001);
-    try std.testing.expectApproxEqAbs(@as(f32, 200), plain.y, 0.001);
-    const ripple = mapScene(300, 200, 800, 600, .{ .ripple = true }, 2.5).?;
-    try std.testing.expect(ripple.x != plain.x or ripple.y != plain.y);
-    try std.testing.expectEqual(
-        mapScene(300, 200, 800, 600, .{ .glitch = true }, 2.5).?,
-        mapScene(300, 200, 800, 600, .{ .glitch = true }, 2.5).?,
-    );
-}
diff --git a/src/gui/gui.zig b/src/gui/gui.zig
index 2cde5edf..ab1875b7 100644
--- a/src/gui/gui.zig
+++ b/src/gui/gui.zig
@@ -12,7 +12,7 @@ const look = @import("../look.zig");
 const message = pardes.Messages.Message;
 const file_watch = @import("../file_watch.zig");
 const deck = @import("deck.zig");
-const crt = @import("crt.zig");
+const Post = @import("Post.zig");
 const pet = @import("pet.zig");
 const fonts = @import("../fonts.zig"); // the Font builtin's half of the seam
 const selection_pipe = @import("../selection_pipe.zig");
@@ -43,8 +43,6 @@ const overlay_vert_spv = @embedFile("overlay.vert.spv");
 const overlay_frag_spv = @embedFile("overlay.frag.spv");
 const image_vert_spv = @embedFile("image.vert.spv");
 const image_frag_spv = @embedFile("image.frag.spv");
-const crt_vert_spv = @embedFile("crt.vert.spv");
-const crt_frag_spv = @embedFile("crt.frag.spv");
 
 const bg_default = [3]u8{ 18, 18, 18 };
 const fg_default = [3]u8{ 204, 204, 204 };
@@ -202,18 +200,17 @@ const touch_click_flash_max_frames: u8 = 14;
 const touch_click_flash_vertices: usize = 1400;
 const touch_scroll_tick: f32 = 0.02;
 
-test "a persistent scene presents a new panel's frame zero before advancing it" {
+test "a new panel's frame zero is presented before it advances" {
     const core = try pardes.Pardes.init(std.testing.allocator, .{ .tty_only = true });
     defer core.deinit();
     var arena: std.heap.ArenaAllocator = .init(std.testing.allocator);
     defer arena.deinit();
     const frame = pardes.animation.frame_ns;
 
-    core.settings.scene_effects.crt = true;
     core.advance(100);
-    const scene_frame = try core.render(arena.allocator());
-    core.acknowledgePanelPresentation(scene_frame.panelTracks());
-    try std.testing.expectEqual(@as(?u64, 100 + frame), core.nextWake());
+    const idle = try core.render(arena.allocator());
+    core.acknowledgePanelPresentation(idle.panelTracks());
+    try std.testing.expectEqual(@as(?u64, null), core.nextWake());
 
     core.settings.panel_transition = .slide;
     core.update(.{ .command = "Newcol" });
@@ -235,10 +232,9 @@ test "a persistent scene presents a new panel's frame zero before advancing it"
     for (second.panelTracks()) |track| try std.testing.expectEqual(@as(u16, 1), track.frame);
 }
 
-// Per pane: background, rule, two grip strokes, two square rails, and the
-// rule under each of its notice chips.
-const pane_chrome_vertices: usize = 6 * (6 + pardes.Pane.Notices.max);
-const max_overlay_vertices: usize = 24 + pet.max_vertices + pardes.MAX_COLS * 6 + pardes.MAX_PANES * pane_chrome_vertices + touch_click_flash_vertices + max_touch_points * (1100 + max_touch_trail_points * overlay_circle_vertices);
+// The triangle overlay holds only the pet and the touch view: the chrome is
+// decor.
+const max_overlay_vertices: usize = pet.max_vertices + touch_click_flash_vertices + max_touch_points * (1100 + max_touch_trail_points * overlay_circle_vertices);
 
 const font_px_step: f32 = 2.0;
 const font_px_min: f32 = 8.0;
@@ -1765,7 +1761,6 @@ const Gui = struct {
     decor_pipeline: *c.SDL_GPUGraphicsPipeline,
     overlay_pipeline: *c.SDL_GPUGraphicsPipeline,
     image_pipeline: *c.SDL_GPUGraphicsPipeline,
-    crt_pipeline: *c.SDL_GPUGraphicsPipeline,
     atlas_tex: *c.SDL_GPUTexture,
     atlas_sampler: *c.SDL_GPUSampler,
     linear_sampler: *c.SDL_GPUSampler,
@@ -1838,7 +1833,8 @@ const Gui = struct {
     scene_tex_h: u32 = 0,
     scene_failures: u8 = 0,
     scene_target_failed: bool = false,
-    presented_scene: crt.Frame = .{},
+    /// The post chain, run over the frame in scene_tex.
+    post: Post = .{},
     pointer_present: bool = false,
     arrow_cursor: ?*c.SDL_Cursor = null,
     link_cursor: ?*c.SDL_Cursor = null,
@@ -1977,7 +1973,9 @@ fn windowCells(g: *const Gui) GridCells {
     };
 }
 
-fn windowPointToPixels(geometry: WindowGeometry, x: f32, y: f32) crt.Point {
+const Point = struct { x: f32, y: f32 };
+
+fn windowPointToPixels(geometry: WindowGeometry, x: f32, y: f32) Point {
     return .{
         .x = x * geometry.pixel_w / geometry.window_w,
         .y = y * geometry.pixel_h / geometry.window_h,
@@ -1991,7 +1989,7 @@ test "high-density window coordinates map once to render pixels" {
         .pixel_w = 1120,
         .pixel_h = 720,
     };
-    try std.testing.expectEqual(crt.Point{ .x = 700, .y = 240 }, windowPointToPixels(geometry, 350, 120));
+    try std.testing.expectEqual(Point{ .x = 700, .y = 240 }, windowPointToPixels(geometry, 350, 120));
 }
 
 fn fixedCellLayout(g: *const Gui) CellLayout {
@@ -2397,7 +2395,6 @@ fn runNative(init: std.process.Init, opts_in: pardes.Options, attach: ?[]const u
     const decor_pipeline = try makePipeline(device, swapchain_format, decor_frag_spv, 0, backgroundLayerBlend());
     const overlay_pipeline = try makeOverlayPipeline(device, swapchain_format);
     const image_pipeline = try makeImagePipeline(device, swapchain_format);
-    const crt_pipeline = try makeCrtPipeline(device, swapchain_format);
 
     const overlay_buffer_size: u32 = @intCast(max_overlay_vertices * @sizeOf(OverlayVertex));
     var ovb_info = c.SDL_GPUBufferCreateInfo{ .usage = c.SDL_GPU_BUFFERUSAGE_VERTEX, .size = overlay_buffer_size, .props = 0 };
@@ -2427,7 +2424,6 @@ fn runNative(init: std.process.Init, opts_in: pardes.Options, attach: ?[]const u
         .decor_pipeline = decor_pipeline,
         .overlay_pipeline = overlay_pipeline,
         .image_pipeline = image_pipeline,
-        .crt_pipeline = crt_pipeline,
         .atlas_tex = atlas_tex,
         .atlas_sampler = atlas_sampler,
         .linear_sampler = linear_sampler,
@@ -2464,7 +2460,6 @@ fn runNative(init: std.process.Init, opts_in: pardes.Options, attach: ?[]const u
         c.SDL_ReleaseGPUGraphicsPipeline(device, g.pipeline);
         c.SDL_ReleaseGPUGraphicsPipeline(device, g.decor_pipeline);
         c.SDL_ReleaseGPUGraphicsPipeline(device, g.overlay_pipeline);
-        c.SDL_ReleaseGPUGraphicsPipeline(device, g.crt_pipeline);
         c.SDL_ReleaseGPUTexture(device, g.atlas_tex);
         c.SDL_ReleaseGPUSampler(device, g.atlas_sampler);
         c.SDL_ReleaseGPUSampler(device, g.linear_sampler);
@@ -2490,6 +2485,7 @@ fn runNative(init: std.process.Init, opts_in: pardes.Options, attach: ?[]const u
         g.prepared_images.deinit(gpa);
         g.cover.deinit(gpa);
         g.decor.deinit(gpa);
+        g.post.deinit(gpa, device);
     }
     defer c.SDL_ReleaseGPUTransferBuffer(device, g.image_vxfer);
     defer c.SDL_ReleaseGPUBuffer(device, g.image_vbuf);
@@ -2796,7 +2792,6 @@ fn paintAttached(g: *Gui, gpa: std.mem.Allocator, client: *detached_client.Clien
         gpa,
         null,
         &surface,
-        .{},
         false,
     ) catch |err| blk: {
         log.err("render: {t}", .{err});
@@ -3065,23 +3060,14 @@ const StdinFeed = struct {
                     f.fill = len - seq_start;
                     break;
                 };
-                if (parseFinger(body[0..end])) |finger_in| {
-                    var finger = finger_in;
+                if (parseFinger(body[0..end])) |finger| {
                     if (g) |gp| {
                         var wpw: c_int = 0;
                         var wph: c_int = 0;
                         _ = c.SDL_GetWindowSizeInPixels(gp.window, &wpw, &wph);
                         const win_w: f32 = @floatFromInt(@max(wpw, 1));
                         const win_h: f32 = @floatFromInt(@max(wph, 1));
-                        if (mapScenePoint(gp, finger.x * win_w, finger.y * win_h, win_w, win_h)) |m| {
-                            finger.x = m.x / win_w;
-                            finger.y = m.y / win_h;
-                            handleFinger(&gp.touch, in, finger, win_w, win_h, @floatFromInt(gp.cell_w), @floatFromInt(gp.cell_h), @floatFromInt(gp.tagline_width));
-                        } else {
-                            finger.kind = .cancel;
-                            handleFinger(&gp.touch, in, finger, win_w, win_h, @floatFromInt(gp.cell_w), @floatFromInt(gp.cell_h), @floatFromInt(gp.tagline_width));
-                            in.post(.pointer_leave);
-                        }
+                        handleFinger(&gp.touch, in, finger, win_w, win_h, @floatFromInt(gp.cell_w), @floatFromInt(gp.cell_h), @floatFromInt(gp.tagline_width));
                     } else if (in.core) |core| {
                         handleFinger(&grid_touch, in, finger, @floatFromInt(core.screen_w), @floatFromInt(core.screen_h), 1, 1, 1);
                     }
@@ -3288,6 +3274,20 @@ const Input = struct {
 };
 
 fn dispatch(g: *Gui, in: *Input, sev: *const c.SDL_Event) void {
+    // What the post chain sees of the pointer and the focus.
+    switch (sev.type) {
+        c.SDL_EVENT_MOUSE_MOTION => {
+            const at = windowPointToPixels(windowGeometry(g.window), sev.motion.x, sev.motion.y);
+            g.post.mouse(at.x, at.y, null);
+        },
+        c.SDL_EVENT_MOUSE_BUTTON_DOWN, c.SDL_EVENT_MOUSE_BUTTON_UP => {
+            const at = windowPointToPixels(windowGeometry(g.window), sev.button.x, sev.button.y);
+            g.post.mouse(at.x, at.y, sev.button.down);
+        },
+        c.SDL_EVENT_WINDOW_FOCUS_GAINED => g.post.focus(true),
+        c.SDL_EVENT_WINDOW_FOCUS_LOST => g.post.focus(false),
+        else => {},
+    }
     switch (sev.type) {
         c.SDL_EVENT_QUIT, c.SDL_EVENT_WINDOW_CLOSE_REQUESTED => in.close(),
         c.SDL_EVENT_WINDOW_MOUSE_LEAVE => {
@@ -3460,7 +3460,7 @@ fn dispatch(g: *Gui, in: *Input, sev: *const c.SDL_Event) void {
         },
         c.SDL_EVENT_FINGER_DOWN, c.SDL_EVENT_FINGER_MOTION, c.SDL_EVENT_FINGER_UP, c.SDL_EVENT_FINGER_CANCELED => {
             const f = sev.tfinger;
-            var finger: Finger = .{
+            const finger: Finger = .{
                 .kind = switch (sev.type) {
                     c.SDL_EVENT_FINGER_DOWN => .down,
                     c.SDL_EVENT_FINGER_MOTION => .motion,
@@ -3479,15 +3479,7 @@ fn dispatch(g: *Gui, in: *Input, sev: *const c.SDL_Event) void {
             const win_h: f32 = @floatFromInt(@max(ph, 1));
             const fcw: f32 = @floatFromInt(g.cell_w);
             const fch: f32 = @floatFromInt(g.cell_h);
-            if (mapScenePoint(g, finger.x * win_w, finger.y * win_h, win_w, win_h)) |m| {
-                finger.x = m.x / win_w;
-                finger.y = m.y / win_h;
-                handleFinger(&g.touch, in, finger, win_w, win_h, fcw, fch, @floatFromInt(g.tagline_width));
-            } else {
-                finger.kind = .cancel;
-                handleFinger(&g.touch, in, finger, win_w, win_h, fcw, fch, @floatFromInt(g.tagline_width));
-                in.post(.pointer_leave);
-            }
+            handleFinger(&g.touch, in, finger, win_w, win_h, fcw, fch, @floatFromInt(g.tagline_width));
         },
         c.SDL_EVENT_PINCH_BEGIN, c.SDL_EVENT_PINCH_UPDATE => in.post(.{ .pinch = sev.pinch.scale }),
         c.SDL_EVENT_GAMEPAD_ADDED => {
@@ -3747,14 +3739,30 @@ test "tagline pointer mapping retains physical grips and carries logical text co
     try std.testing.expectEqual(pardes.TagKind.workspace, topbar.tag_hit.?.kind);
 }
 
-fn mapScenePoint(g: *const Gui, x: f32, y: f32, w: f32, h: f32) ?crt.Point {
-    return crt.mapScene(x, y, w, h, g.presented_scene.effects, g.presented_scene.time_seconds);
-}
-
+test "a click at the window's corner lands in the corner cell with a post chain on" {
+    const core = try pardes.Pardes.init(std.testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer core.deinit();
+    try std.testing.expect(core.settings.post.set(.crt, "", true));
+    var g: Gui = undefined;
+    g.cell_w = 10;
+    g.cell_h = 20;
+    g.tagline_width = 6;
+    g.tagline_height = 12;
+    const geometry: WindowGeometry = .{ .window_w = 400, .window_h = 240, .pixel_w = 800, .pixel_h = 480 };
+    const last = mouseCellWithGeometry(&g, core, 399.9, 239.9, geometry).?;
+    try std.testing.expectEqual(@as(u16, 79), last.col);
+    try std.testing.expectEqual(@as(u16, 23), last.row);
+    const first = mouseCellWithGeometry(&g, core, 0, 0, geometry).?;
+    try std.testing.expectEqual(@as(u16, 0), first.col);
+    try std.testing.expectEqual(@as(u16, 0), first.row);
+}
+
+/// Where a window point lands: the cell drawn under it. Input is identity:
+/// no post pass moves a pixel (the bundled Crt has no barrel), so a click
+/// is exactly where it looks.
 fn mouseCellWithGeometry(g: *const Gui, core: ?*const pardes.Pardes, x: f32, y: f32, geometry: WindowGeometry) ?MouseCell {
     const physical = windowPointToPixels(geometry, x, y);
-    const mapped = mapScenePoint(g, physical.x, physical.y, geometry.pixel_w, geometry.pixel_h) orelse return null;
-    return gridCellAtPixels(g, core, mapped.x, mapped.y);
+    return gridCellAtPixels(g, core, physical.x, physical.y);
 }
 
 fn mouseCell(g: *const Gui, core: ?*const pardes.Pardes, x: f32, y: f32) ?MouseCell {
@@ -4064,6 +4072,7 @@ fn waitInput(ctx: ?*anyopaque, timeout_ms: u32) void {
         // shell's queue raises for a terminal's output, a completion, a file
         // system request. What the shell moves or times itself polls every
         // frame: a smooth scroll, a gamepad's sticks, the test stdin feed,
+        // a post chain that moves on its own (ShaderAnimation),
         // a retired shell waiting to be killed, a present to retry. A
         // minimized window sleeps through the core's animation too: nothing
         // shows it, and it is caught up at once when the window is back.
@@ -4072,7 +4081,8 @@ fn waitInput(ctx: ?*anyopaque, timeout_ms: u32) void {
         } else for (s.ptys) |slot| {
             if (slot) |pt| if (pt.kill_at != 0) break true;
         } else false;
-        const polls = g.scroll_lag != 0 or g.scroll_delta != 0 or g.gamepad != null or s.test_mode or core.needs_frame or retiring;
+        const polls = g.scroll_lag != 0 or g.scroll_delta != 0 or g.gamepad != null or s.test_mode or core.needs_frame or retiring or
+            g.post.animating(core.settings.shader_animation);
         const minimized = !s.test_mode and c.SDL_GetWindowFlags(g.window) & (c.SDL_WINDOW_MINIMIZED | c.SDL_WINDOW_OCCLUDED) != 0;
         // A latency trace is fed on stdin, whose poll below paces the loop:
         // waiting here too would make every tick cost two frames.
@@ -4157,6 +4167,10 @@ fn pollFrame(ctx: ?*anyopaque) void {
     const geom = windowCells(g);
     if (updateCoreResize(core, geom.cols, geom.rows, g.cell_w, g.cell_h, g.tagline_width, g.tagline_height)) resetScroll(g);
     stepScroll(g, core, s.gpa);
+    g.post.sync(s.gpa, s.io, g.device, g.swapchain_format, core);
+    // Between the core's frames, a chain that moves on its own redraws alone.
+    if (g.post.animating(core.settings.shader_animation) and !core.needs_frame and s.presented and
+        c.SDL_GetTicksNS() -| g.post.last_ns >= pardes.animation.frame_ns) redrawPost(g, s.gpa);
 }
 
 fn finishWindowOpacity(core: *pardes.Pardes, applied: *u8, failure: ?[]const u8) void {
@@ -4216,15 +4230,13 @@ fn present(ctx: ?*anyopaque, surface: *const pardes.Surface) void {
     frame_started_ns = monoNs();
     const frame = @constCast(surface);
     s.surface = frame;
-    const scene_requested = core.settings.scene_effects.crt or
-        core.settings.scene_effects.ripple or core.settings.scene_effects.glitch;
+    const scene_requested = g.post.ready();
     if (!scene_requested) g.scene_failures = 0;
     s.presented = renderFrame(
         g,
         s.gpa,
         core,
         frame,
-        core.settings.scene_effects,
         core.settings.debug,
     ) catch |err| blk: {
         log.err("render: {t}", .{err});
@@ -5190,7 +5202,6 @@ fn renderFrame(
     gpa: std.mem.Allocator,
     core: ?*const pardes.Pardes,
     surface: *pardes.Surface,
-    scene_effects: pardes.animation.SceneEffect,
     debug_on: bool,
 ) !bool {
     if (surface.pointer_shape != g.pointer_shape) {
@@ -5205,48 +5216,19 @@ fn renderFrame(
     defer if (!command_consumed) {
         _ = c.SDL_SubmitGPUCommandBuffer(cmd);
     };
-    var sw: u32 = 0;
-    var sh: u32 = 0;
-    var target: *c.SDL_GPUTexture = undefined;
-    if (g.capture) {
-        sw = @as(u32, surface.cols) * g.cell_w + g.capture_pad;
-        sh = @as(u32, surface.rows) * g.cell_h + g.capture_pad;
-        if (sw == 0 or sh == 0) {
-            command_consumed = true;
-            _ = c.SDL_SubmitGPUCommandBuffer(cmd);
-            return false;
-        }
-        try ensureCaptureTexture(g, sw, sh);
-        target = g.capture_tex.?;
-    } else if (g.soft_present) {
-        var pw: c_int = 0;
-        var ph: c_int = 0;
-        if (!c.SDL_GetWindowSizeInPixels(g.window, &pw, &ph) or pw <= 0 or ph <= 0) {
-            command_consumed = true;
-            _ = c.SDL_SubmitGPUCommandBuffer(cmd);
-            return false;
-        }
-        sw = @intCast(pw);
-        sh = @intCast(ph);
-        try ensureCaptureTexture(g, sw, sh);
-        target = g.capture_tex.?;
-    } else {
-        var swap_tex: ?*c.SDL_GPUTexture = null;
-        if (!c.SDL_AcquireGPUSwapchainTexture(cmd, g.window, &swap_tex, &sw, &sh)) {
-            command_consumed = true;
-            _ = c.SDL_SubmitGPUCommandBuffer(cmd);
-            return false;
-        }
-        target = swap_tex orelse { // swapchain busy: skip the frame
-            command_consumed = true;
-            _ = c.SDL_SubmitGPUCommandBuffer(cmd);
-            return false;
-        };
-    }
+    const frame_target = try acquireTarget(g, cmd, @as(u32, surface.cols) * g.cell_w + g.capture_pad, @as(u32, surface.rows) * g.cell_h + g.capture_pad) orelse {
+        command_consumed = true;
+        _ = c.SDL_SubmitGPUCommandBuffer(cmd);
+        return false;
+    };
+    const target = frame_target.texture;
+    const sw = frame_target.w;
+    const sh = frame_target.h;
     const win_w: f32 = @floatFromInt(sw);
     const win_h: f32 = @floatFromInt(sh);
 
-    var scene_on = scene_effects.crt or scene_effects.ripple or scene_effects.glitch;
+    // The post chain runs over a local frame, from the scene texture.
+    var scene_on = core != null and g.post.ready();
     if (scene_on) ensureSceneTexture(g, sw, sh) catch {
         g.scene_target_failed = true;
         scene_on = false;
@@ -5559,64 +5541,87 @@ fn renderFrame(
     drawOverlayGpu(g, cmd, rp, overlay_count);
     c.SDL_EndGPURenderPass(rp);
 
-    var rendered_scene: crt.Frame = .{};
     if (scene_on) {
-        var crt_target = std.mem.zeroes(c.SDL_GPUColorTargetInfo);
-        crt_target.texture = target;
-        crt_target.load_op = c.SDL_GPU_LOADOP_DONT_CARE;
-        crt_target.store_op = c.SDL_GPU_STOREOP_STORE;
-        const crt_pass = c.SDL_BeginGPURenderPass(cmd, &crt_target, 1, null);
-        c.SDL_BindGPUGraphicsPipeline(crt_pass, g.crt_pipeline);
-        const samp_binding = c.SDL_GPUTextureSamplerBinding{ .texture = g.scene_tex.?, .sampler = g.linear_sampler };
-        c.SDL_BindGPUFragmentSamplers(crt_pass, 0, &samp_binding, 1);
-        const now_ns = c.SDL_GetTicksNS();
-        const time_wrap_ns: u64 = 4096 * std.time.ns_per_s;
-        const time_seconds: f32 = @floatCast(
-            @as(f64, @floatFromInt(now_ns % time_wrap_ns)) / @as(f64, std.time.ns_per_s),
-        );
-        rendered_scene = .{
-            .effects = .{
-                .crt = scene_effects.crt,
-                .ripple = scene_effects.ripple,
-                .glitch = scene_effects.glitch,
-            },
-            .time_seconds = time_seconds,
-        };
-        const crt_uniforms = [8]f32{
-            time_seconds,
-            @floatFromInt((now_ns / (std.time.ns_per_s / 60)) % 65_536),
-            @floatFromInt(sw),
-            @floatFromInt(sh),
-            @floatFromInt(@intFromBool(scene_effects.crt)),
-            @floatFromInt(@intFromBool(scene_effects.ripple)),
-            @floatFromInt(@intFromBool(scene_effects.glitch)),
-            0,
+        if (core) |p| {
+            var boxes: [max_cursors]CursorBox = undefined;
+            const cursors = if (cursors_shown) cursorBoxes(g, surface, layout, win_h, &boxes) else 0;
+            g.post.describe(.{
+                .cursor = if (cursors > 0) boxes[0] else null,
+                .background = chrome.page orelse bg_default,
+                .foreground = chrome.fg orelse fg_default,
+                .selection_foreground = p.theme().sel_fg,
+                .selection_background = p.theme().sel_bg,
+            });
+        }
+        const chain_zone = tracy.zone(@src(), "post chain");
+        defer chain_zone.end();
+        g.post.draw(g.device, cmd, g.linear_sampler, g.swapchain_format, g.scene_tex.?, target, sw, sh, c.SDL_GetTicksNS(), background_opacity >= 1) catch {
+            g.scene_target_failed = true;
         };
-        c.SDL_PushGPUFragmentUniformData(cmd, 0, &crt_uniforms, @sizeOf(@TypeOf(crt_uniforms)));
-        c.SDL_DrawGPUPrimitives(crt_pass, 3, 1, 0, 0);
-        c.SDL_EndGPURenderPass(crt_pass);
     }
+    command_consumed = true;
+    const shown = try finishFrame(g, gpa, cmd, frame_target, if (groups.tracks != 0) groups.items[1].track.?.frame else null);
+    if (shown and groups.tracks == 0) rememberPresentedImages(g, gpa, surface);
+    return shown;
+}
+
+const Target = struct { texture: *c.SDL_GPUTexture, w: u32, h: u32 };
+
+/// What this frame draws into: the capture texture in test mode (the grid's
+/// size plus PARDES_TEST_PAD) or with a soft presenter, else the swapchain's
+/// image; null when there is none to be had this time.
+fn acquireTarget(g: *Gui, cmd: *c.SDL_GPUCommandBuffer, capture_w: u32, capture_h: u32) !?Target {
     if (g.capture) {
-        command_consumed = true;
-        try captureFrame(g, gpa, cmd, target, sw, sh, if (groups.tracks != 0) groups.items[1].track.?.frame else null);
-        g.presented_scene = rendered_scene;
-        if (groups.tracks == 0) rememberPresentedImages(g, gpa, surface);
+        if (capture_w == 0 or capture_h == 0) return null;
+        try ensureCaptureTexture(g, capture_w, capture_h);
+        return .{ .texture = g.capture_tex.?, .w = capture_w, .h = capture_h };
+    }
+    if (g.soft_present) {
+        var pw: c_int = 0;
+        var ph: c_int = 0;
+        if (!c.SDL_GetWindowSizeInPixels(g.window, &pw, &ph) or pw <= 0 or ph <= 0) return null;
+        try ensureCaptureTexture(g, @intCast(pw), @intCast(ph));
+        return .{ .texture = g.capture_tex.?, .w = @intCast(pw), .h = @intCast(ph) };
+    }
+    var swap_tex: ?*c.SDL_GPUTexture = null;
+    var sw: u32 = 0;
+    var sh: u32 = 0;
+    if (!c.SDL_AcquireGPUSwapchainTexture(cmd, g.window, &swap_tex, &sw, &sh)) return null;
+    // A busy swapchain skips the frame.
+    return .{ .texture = swap_tex orelse return null, .w = sw, .h = sh };
+}
+
+/// Submits the frame: captured, handed to the soft presenter, or presented.
+fn finishFrame(g: *Gui, gpa: std.mem.Allocator, cmd: *c.SDL_GPUCommandBuffer, target: Target, transition: ?u16) !bool {
+    if (g.capture) {
+        try captureFrame(g, gpa, cmd, target.texture, target.w, target.h, transition);
         return true;
     }
     if (g.soft_present) {
-        command_consumed = true;
-        try softPresentFrame(g, cmd, target, sw, sh);
-        g.presented_scene = rendered_scene;
-        if (groups.tracks == 0) rememberPresentedImages(g, gpa, surface);
+        try softPresentFrame(g, cmd, target.texture, target.w, target.h);
         return true;
     }
-    command_consumed = true;
-    const submitted = c.SDL_SubmitGPUCommandBuffer(cmd);
-    if (submitted) {
-        g.presented_scene = rendered_scene;
-        if (groups.tracks == 0) rememberPresentedImages(g, gpa, surface);
+    return c.SDL_SubmitGPUCommandBuffer(cmd);
+}
+
+/// Redraw level A (docs §5.5): the post chain alone, over the frame the core
+/// last drew, for a pass that moves on its own. No core render, no cell.
+fn redrawPost(g: *Gui, gpa: std.mem.Allocator) void {
+    const scene = g.scene_tex orelse return;
+    const cmd = c.SDL_AcquireGPUCommandBuffer(g.device) orelse return;
+    const target = (acquireTarget(g, cmd, g.scene_tex_w, g.scene_tex_h) catch null) orelse {
+        _ = c.SDL_SubmitGPUCommandBuffer(cmd);
+        return;
+    };
+    // A window the retained frame no longer fits waits for the core's.
+    if (target.w != g.scene_tex_w or target.h != g.scene_tex_h) {
+        _ = c.SDL_SubmitGPUCommandBuffer(cmd);
+        return;
     }
-    return submitted;
+    const zone = tracy.zone(@src(), "post chain redraw");
+    g.post.draw(g.device, cmd, g.linear_sampler, g.swapchain_format, scene, target.texture, target.w, target.h, c.SDL_GetTicksNS(), backgroundOpacity(g.applied_window_opacity) >= 1) catch {};
+    zone.end();
+    _ = finishFrame(g, gpa, cmd, target, null) catch {};
 }
 
 const ResolvedCell = struct {
@@ -7016,25 +7021,7 @@ fn makeImagePipeline(device: *c.SDL_GPUDevice, color_format: c.SDL_GPUTextureFor
     return c.SDL_CreateGPUGraphicsPipeline(device, &info) orelse error.GpuCreate;
 }
 
-fn makeCrtPipeline(device: *c.SDL_GPUDevice, color_format: c.SDL_GPUTextureFormat) !*c.SDL_GPUGraphicsPipeline {
-    const vs = try makeShader(device, crt_vert_spv, c.SDL_GPU_SHADERSTAGE_VERTEX, 0, 0);
-    defer c.SDL_ReleaseGPUShader(device, vs);
-    const fs = try makeShader(device, crt_frag_spv, c.SDL_GPU_SHADERSTAGE_FRAGMENT, 1, 1);
-    defer c.SDL_ReleaseGPUShader(device, fs);
-
-    var col_desc = c.SDL_GPUColorTargetDescription{ .format = color_format, .blend_state = std.mem.zeroes(c.SDL_GPUColorTargetBlendState) };
-    var info = std.mem.zeroes(c.SDL_GPUGraphicsPipelineCreateInfo);
-    info.vertex_shader = vs;
-    info.fragment_shader = fs;
-    info.primitive_type = c.SDL_GPU_PRIMITIVETYPE_TRIANGLELIST;
-    info.rasterizer_state.fill_mode = c.SDL_GPU_FILLMODE_FILL;
-    info.rasterizer_state.cull_mode = c.SDL_GPU_CULLMODE_NONE;
-    info.multisample_state.sample_count = c.SDL_GPU_SAMPLECOUNT_1;
-    info.target_info = .{ .color_target_descriptions = &col_desc, .num_color_targets = 1 };
-    return c.SDL_CreateGPUGraphicsPipeline(device, &info) orelse error.GpuCreate;
-}
-
-fn makeShader(device: *c.SDL_GPUDevice, code: []const u8, stage: c.SDL_GPUShaderStage, n_samplers: u32, n_uniform_buffers: u32) !*c.SDL_GPUShader {
+pub fn makeShader(device: *c.SDL_GPUDevice, code: []const u8, stage: c.SDL_GPUShaderStage, n_samplers: u32, n_uniform_buffers: u32) !*c.SDL_GPUShader {
     var info = std.mem.zeroes(c.SDL_GPUShaderCreateInfo);
     info.code = code.ptr;
     info.code_size = code.len;
@@ -7519,25 +7506,32 @@ test "decor is read from the regions, each pane's in its own group" {
     try std.testing.expectEqual(@as(u32, 0), groups.items[groups.ink].decor_count);
 }
 
-/// The bar cursors: the grid's where no layer has the cell, and each layer's
-/// at its own pitch.
-fn cursorDecor(g: *Gui, gpa: std.mem.Allocator, surface: *const pardes.Surface, layout: CellLayout, win_w: f32, win_h: f32) !void {
+const CursorBox = Post.Frame.Cursor;
+const max_cursors = 1 + pardes.MAX_PANES + pardes.MAX_TAG_LAYERS;
+
+/// Every cursor on the frame where it is drawn, in window pixels: the grid's
+/// where no layer has its cell, and each layer's at that layer's pitch. A bar
+/// is an eighth of its cell wide, a block the whole cell.
+fn cursorBoxes(g: *const Gui, surface: *const pardes.Surface, layout: CellLayout, win_h: f32, out: *[max_cursors]CursorBox) usize {
     const chrome = &surface.chrome;
+    const page = chrome.page orelse bg_default;
+    var n: usize = 0;
     if (surface.cursor) |cursor| {
-        if (cursor.bar and cursor.x < surface.cols and cursor.y < surface.rows and bodyLayerAt(surface, cursor.x, cursor.y) == null and tagLayerIn(surface.tagLayers(), cursor.x, cursor.y) == null) {
+        if (cursor.x < surface.cols and cursor.y < surface.rows and bodyLayerAt(surface, cursor.x, cursor.y) == null and tagLayerIn(surface.tagLayers(), cursor.x, cursor.y) == null) {
             const cell = &surface.cells[@as(usize, cursor.y) * surface.cols + cursor.x];
             const role = cellFontRole(cell);
             const width: f32 = if (role == .tagline) @floatFromInt(g.tagline_width) else layout.w;
             const height = std.math.clamp(if (role == .tagline) @as(f32, @floatFromInt(g.tagline_height)) else layout.h, 1.0, layout.h);
             const x0 = @as(f32, @floatFromInt(cursor.x)) * layout.w;
             const y0 = @as(f32, @floatFromInt(cursor.y)) * layout.h + @as(f32, @floatFromInt(taglineBandOffset(cursor.y, win_h, @intFromFloat(layout.h), @intFromFloat(height))));
-            try addDecor(g, gpa, x0, y0, x0 + @max(1.0, width / 8.0), y0 + height, cursorColor(chrome, cell, role), 1, null, win_w, win_h);
+            out[n] = .{ .x0 = x0, .y0 = y0, .x1 = x0 + if (cursor.bar) @max(1.0, width / 8.0) else width, .y1 = y0 + height, .rgb = cursorColor(chrome, cell, role), .text = page, .bar = cursor.bar };
+            n += 1;
         }
     }
     for (surface.bodyLayers()) |*layer| {
         if (layer.rows == 0) continue;
         const cursor = layer.cursor orelse continue;
-        if (!cursor.bar or cursor.y >= layer.rows or cursor.x >= layer.cols) continue;
+        if (cursor.y >= layer.rows or cursor.x >= layer.cols) continue;
         const left = @as(f32, @floatFromInt(layer.viewport.x)) * layout.w;
         const bottom = @as(f32, @floatFromInt(layer.viewport.y + layer.viewport.h)) * layout.h;
         const top = layer.rowTop(cursor.y, layout.h, @floatFromInt(g.tagline_height));
@@ -7547,12 +7541,13 @@ fn cursorDecor(g: *Gui, gpa: std.mem.Allocator, surface: *const pardes.Surface,
         const width: f32 = if (role == .tagline) @floatFromInt(g.tagline_width) else layout.w;
         const x = left + @as(f32, @floatFromInt(cursor.x)) * width;
         const cell = &layer.cells[@as(usize, cursor.y) * layer.cols + cursor.x];
-        try addDecor(g, gpa, x, top, x + @max(1, width / 8), @min(bottom, top + height), cursorColor(chrome, cell, role), 1, null, win_w, win_h);
+        out[n] = .{ .x0 = x, .y0 = top, .x1 = x + if (cursor.bar) @max(1, width / 8) else width, .y1 = @min(bottom, top + height), .rgb = cursorColor(chrome, cell, role), .text = page, .bar = cursor.bar };
+        n += 1;
     }
     for (surface.tagLayers()) |*layer| {
         if (layer.rows == 0) continue;
         const cursor = layer.cursor orelse continue;
-        if (!cursor.bar or cursor.x >= layer.cols or cursor.y >= layer.rows) continue;
+        if (cursor.x >= layer.cols or cursor.y >= layer.rows) continue;
         const width: f32 = @floatFromInt(g.tagline_width);
         const left = @as(f32, @floatFromInt(layer.viewport.x)) * layout.w;
         const right = left + @as(f32, @floatFromInt(layer.viewport.w)) * layout.w;
@@ -7560,8 +7555,17 @@ fn cursorDecor(g: *Gui, gpa: std.mem.Allocator, surface: *const pardes.Surface,
         if (x >= right) continue;
         const y = layer.viewport.y + cursor.y;
         const top = @as(f32, @floatFromInt(y)) * layout.h + @as(f32, @floatFromInt(taglineBandOffset(y, win_h, g.cell_h, g.tagline_height)));
-        try addDecor(g, gpa, x, top, @min(right, x + @max(1, width / 8)), top + @as(f32, @floatFromInt(g.tagline_height)), cursorColor(chrome, &layer.cells[@as(usize, cursor.y) * layer.cols + cursor.x], .tagline), 1, null, win_w, win_h);
+        out[n] = .{ .x0 = x, .y0 = top, .x1 = @min(right, x + if (cursor.bar) @max(1, width / 8) else width), .y1 = top + @as(f32, @floatFromInt(g.tagline_height)), .rgb = cursorColor(chrome, &layer.cells[@as(usize, cursor.y) * layer.cols + cursor.x], .tagline), .text = page, .bar = cursor.bar };
+        n += 1;
     }
+    return n;
+}
+
+/// The bar cursors as decor; a block cursor is its cell's own colours.
+fn cursorDecor(g: *Gui, gpa: std.mem.Allocator, surface: *const pardes.Surface, layout: CellLayout, win_w: f32, win_h: f32) !void {
+    var boxes: [max_cursors]CursorBox = undefined;
+    for (boxes[0..cursorBoxes(g, surface, layout, win_h, &boxes)]) |box|
+        if (box.bar) try addDecor(g, gpa, box.x0, box.y0, box.x1, box.y1, box.rgb, 1, null, win_w, win_h);
 }
 
 /// The triangle overlay: the workspace pet and the touch debug view, over
diff --git a/src/macos.zig b/src/macos.zig
index 4d8f2883..0bad86ee 100644
--- a/src/macos.zig
+++ b/src/macos.zig
@@ -850,16 +850,18 @@ export fn pardes_should_quit() bool {
     return st.core.quit;
 }
 
-fn encodeSceneEffects(effects: animation.SceneEffect) u32 {
+// The Metal shell keeps its own CRT, ripple and glitch kernel: the bundled
+// passes of the GUI's post chain, as flags.
+fn encodeSceneEffects(post: *const pardes.config.Runtime.Post) u32 {
     var flags: u32 = 0;
-    if (effects.crt) flags |= scene_flag_crt;
-    if (effects.ripple) flags |= scene_flag_ripple;
-    if (effects.glitch) flags |= scene_flag_glitch;
+    if (post.has(.crt)) flags |= scene_flag_crt;
+    if (post.has(.ripple)) flags |= scene_flag_ripple;
+    if (post.has(.glitch)) flags |= scene_flag_glitch;
     return flags;
 }
 
 fn currentSceneFlags(st: *const State) u32 {
-    return encodeSceneEffects(st.core.settings.scene_effects);
+    return encodeSceneEffects(&st.core.settings.post);
 }
 
 fn advanceSceneClock(st: *State, elapsed_ns: u64) void {
@@ -2912,10 +2914,13 @@ test "pardes.h matches the Zig boundary" {
 
 test "scene effect flags and display clock are compact and independent" {
     const expectEqual = std.testing.expectEqual;
-    try expectEqual(@as(u32, 0), encodeSceneEffects(.{}));
-    try expectEqual(scene_flag_crt, encodeSceneEffects(.{ .crt = true }));
-    try expectEqual(scene_flag_ripple, encodeSceneEffects(.{ .ripple = true }));
-    try expectEqual(scene_flag_glitch, encodeSceneEffects(.{ .glitch = true }));
+    var post: pardes.config.Runtime.Post = .{};
+    try expectEqual(@as(u32, 0), encodeSceneEffects(&post));
+    _ = post.set(.crt, "", true);
+    try expectEqual(scene_flag_crt, encodeSceneEffects(&post));
+    _ = post.set(.ripple, "", true);
+    _ = post.set(.glitch, "", true);
+    try expectEqual(scene_flag_crt | scene_flag_ripple | scene_flag_glitch, encodeSceneEffects(&post));
     try expectEqual(
         scene_flag_crt | scene_flag_ripple | scene_flag_glitch,
         encodeSceneEffects(.{ .crt = true, .ripple = true, .glitch = true }),
diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig
index c1f78bab..ed10dd70 100644
--- a/src/ninep/ctl.zig
+++ b/src/ninep/ctl.zig
@@ -263,7 +263,9 @@ fn writeSettings(p: *Pardes, w: *std.Io.Writer) !void {
             // Bare, it names the default directory.
             .dump_dir => if (s.dump_dir.len > 0) try w.print("{s} {s}\n", .{ word, s.dump_dir.get() }) else try w.print("{s}\n", .{word}),
             .transition => |effect| try w.print("{s} {s}\n", .{ word, if (s.panel_transition == effect) "on" else "off" }),
-            .scene => |effect| try w.print("{s} {s}\n", .{ word, if (@field(s.scene_effects, @tagName(effect))) "on" else "off" }),
+            .scene => |effect| try w.print("{s} {s}\n", .{ word, if (s.post.has(effect)) "on" else "off" }),
+            .shader => for (s.post.list()) |entry| if (entry.scene == null) try w.print("{s} {s}\n", .{ word, entry.path.get() }),
+            .shader_animation => try w.print("{s} {s}\n", .{ word, @tagName(s.shader_animation) }),
         }
     }
     try w.writeAll("LocationsConfig ");
diff --git a/src/pardes.zig b/src/pardes.zig
index 616747fa..5fa3307b 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -584,18 +584,10 @@ test "startup config runs builtin lines in order and isolates bad lines" {
     };
 }
 
-test "scene effects keep the idle frontend animation clock active" {
+test "a post chain keeps no core clock running: the shell animates it" {
     const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true });
     defer p.deinit();
-    try std.testing.expect(!p.animationActive());
-
-    p.settings.scene_effects.crt = true;
-    try std.testing.expect(p.animationActive());
-    p.settings.scene_effects = .{ .ripple = true };
-    try std.testing.expect(p.animationActive());
-    p.settings.scene_effects = .{ .glitch = true };
-    try std.testing.expect(p.animationActive());
-    p.settings.scene_effects = .{};
+    try std.testing.expect(p.settings.post.set(.crt, "", true));
     try std.testing.expect(!p.animationActive());
 }
 
@@ -5443,10 +5435,10 @@ pub const Pardes = struct {
         look.cancelLookHover(p);
     }
 
-    /// A native scene pass proved unavailable. Config reads these exact bits,
-    /// and the idle-clock predicate stops immediately once they are clear.
+    /// A native post pass proved unavailable: the chain is emptied, which
+    /// Config then reports.
     pub fn disableSceneEffects(p: *Pardes) void {
-        p.settings.scene_effects = .{};
+        p.settings.post.clear();
     }
 
     // ---- doc panes ----
@@ -5744,8 +5736,6 @@ pub const Pardes = struct {
     pub fn nextWake(p: *const Pardes) ?u64 {
         const next = p.stepped_ns + animation.frame_ns;
         if (p.chrome_animation.isActive() or p.presentation.animating()) return next;
-        const scene = p.settings.scene_effects;
-        if (scene.crt or scene.ripple or scene.glitch) return next;
         var frames: ?u64 = null;
         if (p.look_hover_wait) |waiting| {
             const delay = config.look_preview_delay_frames orelse return next;
@@ -6953,8 +6943,8 @@ test "core animation keeps wall time at 60, 120 and 144 Hz and across a stall" {
     const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 80, .rows = 24 });
     defer p.deinit();
     const frame = animation.frame_ns;
-    // Something that animates for as long as it is on.
-    p.settings.scene_effects.crt = true;
+    // Something that animates for as long as the test wants: the theme
+    // fade, held at its start before every step.
     for ([_]u64{ 60, 120, 144 }) |hz| {
         const start: u64 = 5 * std.time.ns_per_s;
         p.clock_started = false;
@@ -6963,6 +6953,7 @@ test "core animation keeps wall time at 60, 120 and 144 Hz and across a stall" {
         var at: u64 = 1;
         while (at <= hz) : (at += 1) {
             const before = p.stepped_ns;
+            p.chrome_animation.step = 0;
             p.advance(start + at * std.time.ns_per_s / hz);
             const taken = (p.stepped_ns - before + frame / 2) / frame;
             // Never two steps in one display frame: that is a visible hitch.
@@ -6979,9 +6970,10 @@ test "core animation keeps wall time at 60, 120 and 144 Hz and across a stall" {
     }
     // A stall of minutes is not minutes of frames.
     const before = p.stepped_ns;
+    p.chrome_animation.step = 0;
     p.advance(before + 600 * std.time.ns_per_s);
     try std.testing.expectEqual(before + 600 * std.time.ns_per_s, p.stepped_ns);
-    p.settings.scene_effects.crt = false;
+    p.chrome_animation.step = animation.transition_steps;
     p.advance(p.stepped_ns + frame);
     try std.testing.expectEqual(@as(?u64, null), p.nextWake());
 }
-- 
cgit v1.3


From be09d1ec7abd71f4e52f05942a941d76b6d420f2 Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 16:26:08 -0300
Subject: Post chain review fixes: glslc on stdin, level A at the display's
 refresh

Stage 9 review: a user's Shadertoy file goes to glslc on its stdin, so no
source file is written anywhere (the old predictable name under
XDG_RUNTIME_DIR or /tmp was a symlink-clobber hazard). std's spawn does
all its allocation before fork and searches PATH on the stack after it,
said at the call. Level A redraws are paced by the display's refresh rate
(SDL_GetCurrentDisplayMode), not a fixed 16 ms.

Shared files touched: gui.zig.
---
 docs/render-pipeline.md |  6 ++--
 src/gui/Post.zig        | 83 +++++++++++++++++++++++++++++--------------------
 src/gui/gui.zig         | 21 +++++++++++--
 3 files changed, 71 insertions(+), 39 deletions(-)

(limited to 'src/gui')

diff --git a/docs/render-pipeline.md b/docs/render-pipeline.md
index 254187a3..d991a1ce 100644
--- a/docs/render-pipeline.md
+++ b/docs/render-pipeline.md
@@ -492,11 +492,11 @@ Mirror ghostty 1.3.2 (`zig-pkg/ghostty-*/src/renderer/shadertoy.zig`,
   `crt.zig` is deleted. If the user insists on barrel in the bundled CRT, keep
   `crt.zig`'s inverse keyed to "bundled crt active".
 - **Compile** (decision 3): a user's file is compiled by spawning `glslc` with
-  the build's own invocation (`-fshader-stage=fragment <file> -o -`, SPIR-V on
-  stdout), on a thread of its own when the file joins the chain, never on the
+  the build's own flags, prefix and file on its stdin, SPIR-V on its stdout
+  (no file of ours anywhere; std's spawn allocates before fork), on a thread of its own when the file joins the chain, never on the
   frame path; the result is taken in at the next loop step. The prefix ends in
   `#line 1`, so glslc's errors count the file's own lines, and they name the
-  file, not the temporary source. A failed compile keeps the file's last good
+  file, not `<stdin>`. Level A redraws once a refresh of the window's display. A failed compile keeps the file's last good
   pipeline and says glslc's first line as a message; glslc missing is said
   once, and only files stay off (the bundled passes are compiled with the
   build, through the same prefix). No file watching: `Shader <path>` twice
diff --git a/src/gui/Post.zig b/src/gui/Post.zig
index d92623d7..c529efc0 100644
--- a/src/gui/Post.zig
+++ b/src/gui/Post.zig
@@ -15,7 +15,6 @@ const libc = std.c;
 const ghostty_vt = @import("ghostty-vt");
 const pardes = @import("../pardes.zig");
 const filesystem = @import("../fs.zig");
-const host_io = @import("../host_io.zig");
 const gui = @import("gui.zig");
 const c = gui.c;
 
@@ -191,8 +190,9 @@ fn collect(post: *Post, gpa: std.mem.Allocator, device: *c.SDL_GPUDevice, format
     }
 }
 
-/// The compile thread: each file behind the prefix, through glslc exactly as
-/// the build calls it (build.zig compileGlsl), its SPIR-V on stdout.
+/// The compile thread: each file behind the prefix, through glslc with the
+/// build's own flags (build.zig compileGlsl), source on stdin, SPIR-V on
+/// stdout.
 fn compile(job: *Job) void {
     defer job.done.store(true, .release);
     defer {
@@ -200,10 +200,10 @@ fn compile(job: *Job) void {
         event.type = c.SDL_EVENT_USER;
         _ = c.SDL_PushEvent(&event);
     }
-    for (job.paths[0..job.len], 0..) |path, i| job.results[i] = compileOne(job.gpa, job.io, path, i);
+    for (job.paths[0..job.len], 0..) |path, i| job.results[i] = compileOne(job.gpa, job.io, path);
 }
 
-fn compileOne(gpa: std.mem.Allocator, io: std.Io, path: []const u8, index: usize) Job.Result {
+fn compileOne(gpa: std.mem.Allocator, io: std.Io, path: []const u8) Job.Result {
     var home_buf: [4096]u8 = undefined;
     const expanded = if (std.mem.startsWith(u8, path, "~/")) if (libc.getenv("HOME")) |home|
         std.fmt.bufPrint(&home_buf, "{s}/{s}", .{ std.mem.span(home), path[2..] }) catch path
@@ -212,37 +212,54 @@ fn compileOne(gpa: std.mem.Allocator, io: std.Io, path: []const u8, index: usize
     const body = filesystem.readFile(gpa, expanded) catch |err|
         return .{ .failed = std.fmt.allocPrint(gpa, "cannot read it ({t})", .{err}) catch return .none };
     defer gpa.free(body);
-    const dir = if (libc.getenv("XDG_RUNTIME_DIR")) |d| std.mem.span(d) else "/tmp";
-    var source_buf: [4096]u8 = undefined;
-    const source = std.fmt.bufPrintSentinel(&source_buf, "{s}/pardes-post-{d}-{d}.frag.glsl", .{ dir, libc.getpid(), index }, 0) catch return .none;
-    defer _ = libc.unlink(source);
-    {
-        const fd = libc.open(source, .{ .ACCMODE = .WRONLY, .CREAT = true, .TRUNC = true }, @as(libc.mode_t, 0o600));
-        if (fd < 0) return .{ .failed = gpa.dupe(u8, "cannot write its source for glslc") catch return .none };
-        defer _ = libc.close(fd);
-        if (!host_io.writeFd(fd, prefix) or !host_io.writeFd(fd, body))
-            return .{ .failed = gpa.dupe(u8, "cannot write its source for glslc") catch return .none };
-    }
-    const run = std.process.run(gpa, io, .{
-        .argv = &.{ "glslc", "-fshader-stage=fragment", source, "-o", "-" },
-        .stdout_limit = .limited(16 << 20),
-        .stderr_limit = .limited(64 << 10),
+    // The prefix and the file go to glslc on its stdin: no file of ours is
+    // written anywhere. std's spawn does every allocation before fork and
+    // searches PATH on the stack after it (Io/Threaded.zig spawnPosix,
+    // posixExecv), so a child forked from this thread cannot wedge on a
+    // lock another thread held (the forkShell hazard).
+    var child = std.process.spawn(io, .{
+        .argv = &.{ "glslc", "-fshader-stage=fragment", "-o", "-", "-" },
+        .stdin = .pipe,
+        .stdout = .pipe,
+        .stderr = .pipe,
     }) catch |err| return switch (err) {
         error.FileNotFound => .missing,
         else => .{ .failed = std.fmt.allocPrint(gpa, "glslc did not run ({t})", .{err}) catch return .none },
     };
-    const clean = switch (run.term) {
+    defer child.kill(io);
+    // glslc reads all of its input before it writes a byte, so writing it
+    // first cannot deadlock against a full output pipe.
+    {
+        var stdin = child.stdin.?;
+        child.stdin = null;
+        defer stdin.close(io);
+        var buf: [4096]u8 = undefined;
+        var writer = stdin.writer(io, &buf);
+        writer.interface.writeAll(prefix) catch {};
+        writer.interface.writeAll(body) catch {};
+        writer.interface.flush() catch {};
+    }
+    var streams: std.Io.File.MultiReader.Buffer(2) = undefined;
+    var reader: std.Io.File.MultiReader = undefined;
+    reader.init(gpa, io, streams.toStreams(), &.{ child.stdout.?, child.stderr.? });
+    defer reader.deinit();
+    while (reader.fill(64, .none)) |_| {
+        if (reader.reader(0).buffered().len > 16 << 20 or reader.reader(1).buffered().len > 64 << 10)
+            return .{ .failed = gpa.dupe(u8, "glslc said too much") catch return .none };
+    } else |err| switch (err) {
+        error.EndOfStream => {},
+        else => return .{ .failed = gpa.dupe(u8, "reading glslc failed") catch return .none },
+    }
+    const term = child.wait(io) catch return .{ .failed = gpa.dupe(u8, "glslc did not finish") catch return .none };
+    const clean = switch (term) {
         .exited => |code| code == 0,
         else => false,
     };
-    if (clean) {
-        gpa.free(run.stderr);
-        return .{ .spirv = run.stdout };
-    }
-    gpa.free(run.stdout);
-    // glslc names the temporary source; the file is what a person knows.
-    defer gpa.free(run.stderr);
-    const named = std.mem.replaceOwned(u8, gpa, run.stderr, source, path) catch return .{ .failed = gpa.dupe(u8, "glslc failed") catch return .none };
+    if (clean) return .{ .spirv = reader.toOwnedSlice(0) catch return .none };
+    const said = reader.toOwnedSlice(1) catch return .none;
+    // glslc calls its input <stdin>; the file is what a person knows.
+    defer gpa.free(said);
+    const named = std.mem.replaceOwned(u8, gpa, said, "<stdin>", path) catch return .{ .failed = gpa.dupe(u8, "glslc failed") catch return .none };
     return .{ .failed = named };
 }
 
@@ -535,9 +552,9 @@ test "ghostty's test shaders compile behind the prefix, and its invalid one fail
         if (std.mem.startsWith(u8, entry.name, "ghostty-")) break entry.name;
     } else return error.SkipZigTest;
     var buf: [512]u8 = undefined;
-    for ([_][]const u8{ "crt", "focus", "invalid" }, 0..) |name, i| {
+    for ([_][]const u8{ "crt", "focus", "invalid" }) |name| {
         const path = try std.fmt.bufPrint(&buf, "zig-pkg/{s}/src/renderer/shaders/test_shadertoy_{s}.glsl", .{ ghostty, name });
-        const result = compileOne(gpa, io, path, i);
+        const result = compileOne(gpa, io, path);
         switch (result) {
             .missing => return error.SkipZigTest, // no glslc here
             .spirv => |spirv| {
@@ -549,9 +566,9 @@ test "ghostty's test shaders compile behind the prefix, and its invalid one fail
             .failed => |text| {
                 defer gpa.free(text);
                 try std.testing.expectEqualStrings("invalid", name);
-                // Named by the file, not by the temporary source glslc read.
+                // Named by the file, not by glslc's <stdin>.
                 try std.testing.expect(std.mem.indexOf(u8, text, path) != null);
-                try std.testing.expect(std.mem.indexOf(u8, text, "pardes-post-") == null);
+                try std.testing.expect(std.mem.indexOf(u8, text, "<stdin>") == null);
             },
             .none => return error.TestUnexpectedResult,
         }
diff --git a/src/gui/gui.zig b/src/gui/gui.zig
index ab1875b7..aa39cf32 100644
--- a/src/gui/gui.zig
+++ b/src/gui/gui.zig
@@ -4086,7 +4086,12 @@ fn waitInput(ctx: ?*anyopaque, timeout_ms: u32) void {
         const minimized = !s.test_mode and c.SDL_GetWindowFlags(g.window) & (c.SDL_WINDOW_MINIMIZED | c.SDL_WINDOW_OCCLUDED) != 0;
         // A latency trace is fed on stdin, whose poll below paces the loop:
         // waiting here too would make every tick cost two frames.
-        const ms: c_int = if (latency_fd >= 0) 0 else if (minimized) -1 else if (timeout_ms != 0) @intCast(timeout_ms) else if (polls) 16 else -1;
+        // A chain that moves on its own wakes once a display refresh.
+        const poll_ms: c_int = if (g.post.animating(core.settings.shader_animation))
+            @intCast(@max(1, refreshNs(g) / std.time.ns_per_ms))
+        else
+            16;
+        const ms: c_int = if (latency_fd >= 0) 0 else if (minimized) -1 else if (timeout_ms != 0) @min(@as(c_int, @intCast(@min(timeout_ms, std.math.maxInt(c_int)))), if (polls) poll_ms else std.math.maxInt(c_int)) else if (polls) poll_ms else -1;
         // The wait is the 9P connections' turn with the core.
         pardes.turn.rest();
         const got = c.SDL_WaitEventTimeout(&sev, ms);
@@ -4168,9 +4173,19 @@ fn pollFrame(ctx: ?*anyopaque) void {
     if (updateCoreResize(core, geom.cols, geom.rows, g.cell_w, g.cell_h, g.tagline_width, g.tagline_height)) resetScroll(g);
     stepScroll(g, core, s.gpa);
     g.post.sync(s.gpa, s.io, g.device, g.swapchain_format, core);
-    // Between the core's frames, a chain that moves on its own redraws alone.
+    // Between the core's frames, a chain that moves on its own redraws
+    // alone, once a refresh of the display the window is on (a millisecond
+    // early is on time: the wait that paces it is in whole milliseconds).
     if (g.post.animating(core.settings.shader_animation) and !core.needs_frame and s.presented and
-        c.SDL_GetTicksNS() -| g.post.last_ns >= pardes.animation.frame_ns) redrawPost(g, s.gpa);
+        c.SDL_GetTicksNS() -| g.post.last_ns + std.time.ns_per_ms >= refreshNs(g)) redrawPost(g, s.gpa);
+}
+
+/// One refresh of the display the window is on, in ns; a frame of the
+/// core's where the display does not say.
+fn refreshNs(g: *const Gui) u64 {
+    const mode = c.SDL_GetCurrentDisplayMode(c.SDL_GetDisplayForWindow(g.window)) orelse return pardes.animation.frame_ns;
+    if (!(mode.*.refresh_rate > 1)) return pardes.animation.frame_ns;
+    return @intFromFloat(@as(f64, std.time.ns_per_s) / mode.*.refresh_rate);
 }
 
 fn finishWindowOpacity(core: *pardes.Pardes, applied: *u8, failure: ?[]const u8) void {
-- 
cgit v1.3


From 1ed34e1538f45daecc2c8a551dc0fb7aba5f3f54 Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 16:30:57 -0300
Subject: Crt, Ripple and Glitch take a level, 0 to 3, tunable at run time

Coordinator's request: `Crt 0..3` (likewise Ripple, Glitch), 0 off, `on`
the default level 2 (the polished rewrite), `off` and a bare word as
before. The level is one uniform (pardesLevel, beside pardesOpaque in the
prefix's own block); each pass picks its constants by it. Level 3 is at
least as strong as the old effects, measured as pixels changed by more
than 8 in a channel against a plain frame: Crt 18.3% (old 17.4%), Ripple
11.1% (9.5%), Glitch 9.3% a frame (8.1%); Glitch's level raises how often
it bursts as well as how hard. Config and ctl report `Crt 2` / `Crt off`.

Shared files touched: ninep/ctl.zig (the report line). Not touched:
pardes.zig, Messages.zig, mouse.zig, gui.zig, detached/*.
---
 docs/render-pipeline.md                |   8 +++-
 shaders/post/crt.glsl                  |  40 ++++++++++--------
 shaders/post/glitch.glsl               |  36 +++++++++-------
 shaders/post/prefix.glsl               |  11 ++++-
 shaders/post/ripple.glsl               |  23 +++++-----
 shaders/prebuilt/post-crt.frag.glsl    |  51 +++++++++++++---------
 shaders/prebuilt/post-crt.frag.spv     | Bin 9480 -> 12424 bytes
 shaders/prebuilt/post-glitch.frag.glsl |  47 +++++++++++++--------
 shaders/prebuilt/post-glitch.frag.spv  | Bin 8308 -> 10764 bytes
 shaders/prebuilt/post-ripple.frag.glsl |  34 +++++++++------
 shaders/prebuilt/post-ripple.frag.spv  | Bin 7180 -> 9096 bytes
 src/config.zig                         |  75 +++++++++++++++++++++++++++++----
 src/gui/Post.zig                       |   6 ++-
 src/ninep/ctl.zig                      |   2 +-
 test/output.zig                        |   3 +-
 15 files changed, 227 insertions(+), 109 deletions(-)

(limited to 'src/gui')

diff --git a/docs/render-pipeline.md b/docs/render-pipeline.md
index d991a1ce..2fd6045b 100644
--- a/docs/render-pipeline.md
+++ b/docs/render-pipeline.md
@@ -507,7 +507,13 @@ Mirror ghostty 1.3.2 (`zig-pkg/ghostty-*/src/renderer/shadertoy.zig`,
   the shell redraws its retained Surface (3.1), never a core tick or render.
 - **Existing crt/ripple/glitch** become bundled Shadertoy files in
   `shaders/post/` selected by the same builtins (decision 2: kept, polished);
-  `scene_effects` and `crt.frag.glsl`/`crt.zig` are deleted. The chain is
+  `scene_effects` and `crt.frag.glsl`/`crt.zig` are deleted. Each bundled pass
+  takes a level, `Crt 0..3` (0 off, `on` the default 2, `off` and bare still
+  work), passed as `pardesLevel`: 2 is the polished rewrite, 3 at least as
+  strong as the old effects (pixels changed by more than 8 in a channel,
+  against a plain frame: Crt 18.3% vs 17.4% old, Ripple 11.1% vs 9.5%, Glitch
+  9.3% a frame vs 8.1%); a Glitch level raises how often it slips as well as
+  how hard. The chain is
   `Crt`, `Ripple`, `Glitch` and `Shader <path>` in the order they were put in
   (`Shader off` empties it of files), `ShaderAnimation off|on|always`
   (default on). The core keeps no clock for it: level A redraws are the
diff --git a/shaders/post/crt.glsl b/shaders/post/crt.glsl
index 16a5cdd9..768157ef 100644
--- a/shaders/post/crt.glsl
+++ b/shaders/post/crt.glsl
@@ -7,19 +7,23 @@
 // Shadertoy file: pardes puts its prefix before it (shaders/post/prefix.glsl).
 
 const float TAU = 6.28318530718;
-const float CHROMA_PX = 0.35;       // red and blue apart, at the corners
-const float BLOOM_RADIUS_PX = 1.75;
-const float BLOOM_THRESHOLD = 0.60; // linear-light channel peak
+// Level 3 glows wider and from dimmer ink.
+float bloomRadiusPx() { return pardesByLevel(1.75, 1.75, 3.0); }
+float bloomThreshold() { return pardesByLevel(0.6, 0.6, 0.3); } // linear-light channel peak
 const float BLOOM_SOFTNESS = 0.25;
-const float BLOOM_STRENGTH = 0.05;
 const float SCAN_PERIOD_PX = 3.0;
-const float SCAN_STRENGTH = 0.07;
 const float MASK_PERIOD_PX = 3.0;
-const float MASK_STRENGTH = 0.018;
-const float VIGNETTE_STRENGTH = 0.12; // at the far corners only
-const float HUM_STRENGTH = 0.004;
 const float HUM_HZ = 0.11;
-const float EXPOSURE = 1.015;
+
+// Each strength at levels 1, 2 and 3 (`Crt 1`..`Crt 3`): 2 is the default,
+// 3 as strong as the old barrel CRT looked.
+float chromaPx() { return pardesByLevel(0.2, 0.35, 2.2); }       // red and blue apart, at the corners
+float bloomStrength() { return pardesByLevel(0.03, 0.05, 0.3); }
+float scanStrength() { return pardesByLevel(0.035, 0.07, 0.42); }
+float maskStrength() { return pardesByLevel(0.01, 0.018, 0.12); }
+float vignetteStrength() { return pardesByLevel(0.06, 0.12, 0.42); } // at the far corners only
+float humStrength() { return pardesByLevel(0.002, 0.004, 0.012); }
+float exposure() { return pardesByLevel(1.008, 1.015, 1.1); }
 
 vec3 toLinear(vec3 c) {
     return mix(pow((c + 0.055) / 1.055, vec3(2.4)), c / 12.92, lessThanEqual(c, vec3(0.04045)));
@@ -37,7 +41,7 @@ vec3 scene(vec2 uv) {
 vec3 brightPass(vec2 uv) {
     vec3 c = scene(uv);
     float peak = max(c.r, max(c.g, c.b));
-    return c * smoothstep(BLOOM_THRESHOLD, BLOOM_THRESHOLD + BLOOM_SOFTNESS, peak);
+    return c * smoothstep(bloomThreshold(), bloomThreshold() + BLOOM_SOFTNESS, peak);
 }
 
 // Interleaved gradient noise: a dither with no visible pattern.
@@ -54,24 +58,24 @@ void mainImage(out vec4 fragColor, in vec2 fragCoord) {
 
     // The beam converges least at the corners: red and blue drift apart
     // there, by a third of a pixel.
-    vec2 chroma = cc * (CHROMA_PX * r2 * 0.5) * texel;
+    vec2 chroma = cc * (chromaPx() * r2 * 0.5) * texel;
     vec3 col = vec3(scene(uv + chroma).r, scene(uv).g, scene(uv - chroma).b);
 
-    vec2 b = texel * BLOOM_RADIUS_PX;
+    vec2 b = texel * bloomRadiusPx();
     vec3 bloom = brightPass(uv + vec2(b.x, 0.0)) + brightPass(uv - vec2(b.x, 0.0)) +
         brightPass(uv + vec2(0.0, b.y)) + brightPass(uv - vec2(0.0, b.y));
-    col += bloom * (0.25 * BLOOM_STRENGTH);
+    col += bloom * (0.25 * bloomStrength());
 
     // A beam is brightest on its line and falls off between lines; the
     // mask is three phosphor stripes a triad. Both average to one, so the
     // theme keeps its brightness.
     float line = 0.5 + 0.5 * cos(fragCoord.y * TAU / SCAN_PERIOD_PX);
-    col *= 1.0 - SCAN_STRENGTH * (line * line - 0.375) / 0.625;
-    col *= 1.0 + MASK_STRENGTH * cos(fragCoord.x * TAU / MASK_PERIOD_PX + vec3(0.0, TAU / 3.0, 2.0 * TAU / 3.0));
+    col *= 1.0 - scanStrength() * (line * line - 0.375) / 0.625;
+    col *= 1.0 + maskStrength() * cos(fragCoord.x * TAU / MASK_PERIOD_PX + vec3(0.0, TAU / 3.0, 2.0 * TAU / 3.0));
 
-    float vignette = 1.0 - VIGNETTE_STRENGTH * pow(clamp(r2 * 0.5, 0.0, 1.0), 1.6);
-    float hum = 1.0 + HUM_STRENGTH * sin((uv.y * 1.35 - iTime * HUM_HZ) * TAU);
-    col *= vignette * hum * EXPOSURE;
+    float vignette = 1.0 - vignetteStrength() * pow(clamp(r2 * 0.5, 0.0, 1.0), 1.6);
+    float hum = 1.0 + humStrength() * sin((uv.y * 1.35 - iTime * HUM_HZ) * TAU);
+    col *= vignette * hum * exposure();
 
     vec3 srgb = toSrgb(col);
     srgb += (ign(fragCoord + float(iFrame % 64) * vec2(5.588238, 5.588238)) - 0.5) / 255.0;
diff --git a/shaders/post/glitch.glsl b/shaders/post/glitch.glsl
index ff9ebcb8..8f420d9c 100644
--- a/shaders/post/glitch.glsl
+++ b/shaders/post/glitch.glsl
@@ -1,4 +1,5 @@
-// Glitch: now and then the signal slips. Every couple of seconds a short
+// Glitch: now and then the signal slips. At the default level, every couple
+// of seconds a short
 // burst tears a few horizontal bands sideways and pulls their red and blue
 // apart; the bands are sized in pixels and the burst eases in and out over
 // a fraction of a second, so it reads as one event rather than a flicker,
@@ -7,12 +8,15 @@
 // A torn band's brightness dips in linear light. It is a Shadertoy file:
 // pardes puts its prefix before it.
 
-const float PERIOD = 2.4;           // seconds between bursts, on average
-const float BURST = 0.28;           // seconds a burst lasts
-const float STEP_HZ = 24.0;         // how often a burst re-tears
-const float SHIFT_PX = 14.0;
-const float SPLIT_PX = 2.5;
-const float DIP = 0.12;
+// Each at levels 1, 2 and 3 (`Glitch 1`..`Glitch 3`); 2 is the default. A
+// higher level slips more often and harder.
+float period() { return pardesByLevel(4.5, 2.4, 0.55); }      // seconds between bursts, on average
+float burst() { return pardesByLevel(0.2, 0.28, 0.5); }       // seconds a burst lasts
+float stepHz() { return pardesByLevel(20.0, 24.0, 30.0); }    // how often a burst re-tears
+float shiftPx() { return pardesByLevel(8.0, 14.0, 34.0); }
+float splitPx() { return pardesByLevel(1.5, 2.5, 6.0); }
+float dip() { return pardesByLevel(0.08, 0.12, 0.22); }
+float tearFrom() { return pardesByLevel(0.8, 0.72, 0.35); }   // how few bands tear
 
 float hash(vec2 p) {
     vec3 q = fract(vec3(p.xyx) * 0.1031);
@@ -34,27 +38,27 @@ void mainImage(out vec4 fragColor, in vec2 fragCoord) {
     vec2 uv = fragCoord / size;
     // Which burst window this is, when in it the burst starts, and how far
     // into the burst we are: 0 outside one.
-    float window = floor(iTime / PERIOD);
-    float start = window * PERIOD + hash(vec2(window, 7.0)) * (PERIOD - BURST);
-    float t = (iTime - start) / BURST;
+    float window = floor(iTime / period());
+    float start = window * period() + hash(vec2(window, 7.0)) * (period() - burst());
+    float t = (iTime - start) / burst();
     float live = step(0.0, t) * step(t, 1.0);
     float envelope = live * sin(3.14159265 * clamp(t, 0.0, 1.0));
     if (envelope <= 0.0) {
         fragColor = texture(iChannel0, uv);
         return;
     }
-    // Bands of 6 to 40 px, re-cut at STEP_HZ during the burst; about one
+    // Bands of 6 to 40 px, re-cut at stepHz() during the burst; about one
     // band in four tears.
-    float tick = floor(iTime * STEP_HZ);
+    float tick = floor(iTime * stepHz());
     float band_px = mix(6.0, 40.0, hash(vec2(tick, 3.0)));
     float band = floor(fragCoord.y / band_px);
     float roll = hash(vec2(band, tick));
-    float tear = smoothstep(0.72, 0.9, roll) * envelope;
-    float shift = (hash(vec2(tick, band + 11.0)) - 0.5) * 2.0 * SHIFT_PX * tear;
+    float tear = smoothstep(tearFrom(), tearFrom() + 0.18, roll) * envelope;
+    float shift = (hash(vec2(tick, band + 11.0)) - 0.5) * 2.0 * shiftPx() * tear;
     vec2 at = vec2(fragCoord.x + shift, fragCoord.y);
-    vec2 split = vec2(SPLIT_PX * tear, 0.0);
+    vec2 split = vec2(splitPx() * tear, 0.0);
     vec4 center = texture(iChannel0, at / size);
     vec3 col = vec3(texture(iChannel0, (at + split) / size).r, center.g, texture(iChannel0, (at - split) / size).b);
-    col = toSrgb(toLinear(col) * (1.0 - DIP * tear));
+    col = toSrgb(toLinear(col) * (1.0 - dip() * tear));
     fragColor = vec4(col, center.a);
 }
diff --git a/shaders/post/prefix.glsl b/shaders/post/prefix.glsl
index efa49483..e718a98f 100644
--- a/shaders/post/prefix.glsl
+++ b/shaders/post/prefix.glsl
@@ -39,12 +39,19 @@ layout(set = 3, binding = 0, std140) uniform Globals {
     uniform vec3  iSelectionBackgroundColor;
 };
 
-// pardes's own: 1 when the window is opaque, so a pass cannot punch holes
-// in it through its alpha.
+// pardes's own: pardesOpaque is 1 when the window is opaque, so a pass
+// cannot punch holes in it through its alpha; pardesLevel is a bundled
+// pass's strength, 1 to 3 (`Crt 3`), and 0 for a user's file.
 layout(set = 3, binding = 1, std140) uniform PardesPost {
     float pardesOpaque;
+    float pardesLevel;
 };
 
+// A bundled pass's constant at levels 1, 2 and 3.
+float pardesByLevel(float one, float two, float three) {
+    return pardesLevel < 1.5 ? one : (pardesLevel < 2.5 ? two : three);
+}
+
 #define CURSORSTYLE_BLOCK        0
 #define CURSORSTYLE_BLOCK_HOLLOW 1
 #define CURSORSTYLE_BAR          2
diff --git a/shaders/post/ripple.glsl b/shaders/post/ripple.glsl
index ffecbf70..3236d339 100644
--- a/shaders/post/ripple.glsl
+++ b/shaders/post/ripple.glsl
@@ -1,18 +1,21 @@
 // Ripple: the page as a still pool a slow swell crosses. Rings travel out
 // from the middle of the window at a fixed speed in pixels, so they look
-// the same at any size and frame rate; the displacement is at most a couple
-// of pixels, so text stays readable, and it eases in over its first half
+// the same at any size and frame rate; at the default level the displacement
+// is at most a couple of pixels, so text stays readable, and it eases in over its first half
 // second instead of snapping on. Each ring catches the light a little on its
 // rising side, in linear light, and the result is dithered so the shading
 // never bands. It is a Shadertoy file: pardes puts its prefix before it.
 
 const float TAU = 6.28318530718;
-const float WAVELENGTH_PX = 150.0;
-const float SPEED_PX = 55.0;        // outward, per second
-const float AMPLITUDE_PX = 2.2;
-const float SHADE = 0.035;          // light on a slope, linear
 const float EASE_IN = 0.5;          // seconds
 
+// Each at levels 1, 2 and 3 (`Ripple 1`..`Ripple 3`); 2 is the default.
+float wavelengthPx() { return pardesByLevel(170.0, 150.0, 120.0); }
+float speedPx() { return pardesByLevel(40.0, 55.0, 80.0); }        // outward, per second
+float amplitudePx() { return pardesByLevel(1.2, 2.2, 5.0); }
+float shade() { return pardesByLevel(0.02, 0.035, 0.09); }         // light on a slope, linear
+float reachEnd() { return pardesByLevel(0.85, 0.95, 1.3); }        // how far out it dies away
+
 vec3 toLinear(vec3 c) {
     return mix(pow((c + 0.055) / 1.055, vec3(2.4)), c / 12.92, lessThanEqual(c, vec3(0.04045)));
 }
@@ -34,16 +37,16 @@ void mainImage(out vec4 fragColor, in vec2 fragCoord) {
     float reach = 0.5 * length(size);
     // Strongest a third of the way out, fading to nothing at the middle
     // and at the edges, so the window's frame never wobbles.
-    float envelope = smoothstep(0.0, 0.18, radius / reach) * (1.0 - smoothstep(0.35, 0.95, radius / reach));
+    float envelope = smoothstep(0.0, 0.18, radius / reach) * (1.0 - smoothstep(0.35, reachEnd(), radius / reach));
     float ease = smoothstep(0.0, EASE_IN, iTime);
-    float phase = (radius - iTime * SPEED_PX) * TAU / WAVELENGTH_PX;
+    float phase = (radius - iTime * speedPx()) * TAU / wavelengthPx();
     float height = sin(phase);
     float slope = cos(phase);
     vec2 dir = offset / max(radius, 1e-3);
-    vec2 moved = fragCoord + dir * height * AMPLITUDE_PX * envelope * ease;
+    vec2 moved = fragCoord + dir * height * amplitudePx() * envelope * ease;
 
     vec4 s = texture(iChannel0, moved / size);
-    vec3 col = toLinear(s.rgb) * (1.0 + SHADE * slope * envelope * ease);
+    vec3 col = toLinear(s.rgb) * (1.0 + shade() * slope * envelope * ease);
     vec3 srgb = toSrgb(col) + (ign(fragCoord + float(iFrame % 64) * 5.588238) - 0.5) / 255.0;
     fragColor = vec4(clamp(srgb, 0.0, 1.0), s.a);
 }
diff --git a/shaders/prebuilt/post-crt.frag.glsl b/shaders/prebuilt/post-crt.frag.glsl
index 11b95272..c2cadfa2 100644
--- a/shaders/prebuilt/post-crt.frag.glsl
+++ b/shaders/prebuilt/post-crt.frag.glsl
@@ -39,12 +39,19 @@ layout(set = 3, binding = 0, std140) uniform Globals {
     uniform vec3  iSelectionBackgroundColor;
 };
 
-// pardes's own: 1 when the window is opaque, so a pass cannot punch holes
-// in it through its alpha.
+// pardes's own: pardesOpaque is 1 when the window is opaque, so a pass
+// cannot punch holes in it through its alpha; pardesLevel is a bundled
+// pass's strength, 1 to 3 (`Crt 3`), and 0 for a user's file.
 layout(set = 3, binding = 1, std140) uniform PardesPost {
     float pardesOpaque;
+    float pardesLevel;
 };
 
+// A bundled pass's constant at levels 1, 2 and 3.
+float pardesByLevel(float one, float two, float three) {
+    return pardesLevel < 1.5 ? one : (pardesLevel < 2.5 ? two : three);
+}
+
 #define CURSORSTYLE_BLOCK        0
 #define CURSORSTYLE_BLOCK_HOLLOW 1
 #define CURSORSTYLE_BAR          2
@@ -74,19 +81,23 @@ void main() {
 // Shadertoy file: pardes puts its prefix before it (shaders/post/prefix.glsl).
 
 const float TAU = 6.28318530718;
-const float CHROMA_PX = 0.35;       // red and blue apart, at the corners
-const float BLOOM_RADIUS_PX = 1.75;
-const float BLOOM_THRESHOLD = 0.60; // linear-light channel peak
+// Level 3 glows wider and from dimmer ink.
+float bloomRadiusPx() { return pardesByLevel(1.75, 1.75, 3.0); }
+float bloomThreshold() { return pardesByLevel(0.6, 0.6, 0.3); } // linear-light channel peak
 const float BLOOM_SOFTNESS = 0.25;
-const float BLOOM_STRENGTH = 0.05;
 const float SCAN_PERIOD_PX = 3.0;
-const float SCAN_STRENGTH = 0.07;
 const float MASK_PERIOD_PX = 3.0;
-const float MASK_STRENGTH = 0.018;
-const float VIGNETTE_STRENGTH = 0.12; // at the far corners only
-const float HUM_STRENGTH = 0.004;
 const float HUM_HZ = 0.11;
-const float EXPOSURE = 1.015;
+
+// Each strength at levels 1, 2 and 3 (`Crt 1`..`Crt 3`): 2 is the default,
+// 3 as strong as the old barrel CRT looked.
+float chromaPx() { return pardesByLevel(0.2, 0.35, 2.2); }       // red and blue apart, at the corners
+float bloomStrength() { return pardesByLevel(0.03, 0.05, 0.3); }
+float scanStrength() { return pardesByLevel(0.035, 0.07, 0.42); }
+float maskStrength() { return pardesByLevel(0.01, 0.018, 0.12); }
+float vignetteStrength() { return pardesByLevel(0.06, 0.12, 0.42); } // at the far corners only
+float humStrength() { return pardesByLevel(0.002, 0.004, 0.012); }
+float exposure() { return pardesByLevel(1.008, 1.015, 1.1); }
 
 vec3 toLinear(vec3 c) {
     return mix(pow((c + 0.055) / 1.055, vec3(2.4)), c / 12.92, lessThanEqual(c, vec3(0.04045)));
@@ -104,7 +115,7 @@ vec3 scene(vec2 uv) {
 vec3 brightPass(vec2 uv) {
     vec3 c = scene(uv);
     float peak = max(c.r, max(c.g, c.b));
-    return c * smoothstep(BLOOM_THRESHOLD, BLOOM_THRESHOLD + BLOOM_SOFTNESS, peak);
+    return c * smoothstep(bloomThreshold(), bloomThreshold() + BLOOM_SOFTNESS, peak);
 }
 
 // Interleaved gradient noise: a dither with no visible pattern.
@@ -121,24 +132,24 @@ void mainImage(out vec4 fragColor, in vec2 fragCoord) {
 
     // The beam converges least at the corners: red and blue drift apart
     // there, by a third of a pixel.
-    vec2 chroma = cc * (CHROMA_PX * r2 * 0.5) * texel;
+    vec2 chroma = cc * (chromaPx() * r2 * 0.5) * texel;
     vec3 col = vec3(scene(uv + chroma).r, scene(uv).g, scene(uv - chroma).b);
 
-    vec2 b = texel * BLOOM_RADIUS_PX;
+    vec2 b = texel * bloomRadiusPx();
     vec3 bloom = brightPass(uv + vec2(b.x, 0.0)) + brightPass(uv - vec2(b.x, 0.0)) +
         brightPass(uv + vec2(0.0, b.y)) + brightPass(uv - vec2(0.0, b.y));
-    col += bloom * (0.25 * BLOOM_STRENGTH);
+    col += bloom * (0.25 * bloomStrength());
 
     // A beam is brightest on its line and falls off between lines; the
     // mask is three phosphor stripes a triad. Both average to one, so the
     // theme keeps its brightness.
     float line = 0.5 + 0.5 * cos(fragCoord.y * TAU / SCAN_PERIOD_PX);
-    col *= 1.0 - SCAN_STRENGTH * (line * line - 0.375) / 0.625;
-    col *= 1.0 + MASK_STRENGTH * cos(fragCoord.x * TAU / MASK_PERIOD_PX + vec3(0.0, TAU / 3.0, 2.0 * TAU / 3.0));
+    col *= 1.0 - scanStrength() * (line * line - 0.375) / 0.625;
+    col *= 1.0 + maskStrength() * cos(fragCoord.x * TAU / MASK_PERIOD_PX + vec3(0.0, TAU / 3.0, 2.0 * TAU / 3.0));
 
-    float vignette = 1.0 - VIGNETTE_STRENGTH * pow(clamp(r2 * 0.5, 0.0, 1.0), 1.6);
-    float hum = 1.0 + HUM_STRENGTH * sin((uv.y * 1.35 - iTime * HUM_HZ) * TAU);
-    col *= vignette * hum * EXPOSURE;
+    float vignette = 1.0 - vignetteStrength() * pow(clamp(r2 * 0.5, 0.0, 1.0), 1.6);
+    float hum = 1.0 + humStrength() * sin((uv.y * 1.35 - iTime * HUM_HZ) * TAU);
+    col *= vignette * hum * exposure();
 
     vec3 srgb = toSrgb(col);
     srgb += (ign(fragCoord + float(iFrame % 64) * vec2(5.588238, 5.588238)) - 0.5) / 255.0;
diff --git a/shaders/prebuilt/post-crt.frag.spv b/shaders/prebuilt/post-crt.frag.spv
index e4d98138..6599abd9 100644
Binary files a/shaders/prebuilt/post-crt.frag.spv and b/shaders/prebuilt/post-crt.frag.spv differ
diff --git a/shaders/prebuilt/post-glitch.frag.glsl b/shaders/prebuilt/post-glitch.frag.glsl
index 46538452..7b288237 100644
--- a/shaders/prebuilt/post-glitch.frag.glsl
+++ b/shaders/prebuilt/post-glitch.frag.glsl
@@ -39,12 +39,19 @@ layout(set = 3, binding = 0, std140) uniform Globals {
     uniform vec3  iSelectionBackgroundColor;
 };
 
-// pardes's own: 1 when the window is opaque, so a pass cannot punch holes
-// in it through its alpha.
+// pardes's own: pardesOpaque is 1 when the window is opaque, so a pass
+// cannot punch holes in it through its alpha; pardesLevel is a bundled
+// pass's strength, 1 to 3 (`Crt 3`), and 0 for a user's file.
 layout(set = 3, binding = 1, std140) uniform PardesPost {
     float pardesOpaque;
+    float pardesLevel;
 };
 
+// A bundled pass's constant at levels 1, 2 and 3.
+float pardesByLevel(float one, float two, float three) {
+    return pardesLevel < 1.5 ? one : (pardesLevel < 2.5 ? two : three);
+}
+
 #define CURSORSTYLE_BLOCK        0
 #define CURSORSTYLE_BLOCK_HOLLOW 1
 #define CURSORSTYLE_BAR          2
@@ -65,7 +72,8 @@ void main() {
 
 // The shader's own lines count from 1, so glslc's errors name them.
 #line 1
-// Glitch: now and then the signal slips. Every couple of seconds a short
+// Glitch: now and then the signal slips. At the default level, every couple
+// of seconds a short
 // burst tears a few horizontal bands sideways and pulls their red and blue
 // apart; the bands are sized in pixels and the burst eases in and out over
 // a fraction of a second, so it reads as one event rather than a flicker,
@@ -74,12 +82,15 @@ void main() {
 // A torn band's brightness dips in linear light. It is a Shadertoy file:
 // pardes puts its prefix before it.
 
-const float PERIOD = 2.4;           // seconds between bursts, on average
-const float BURST = 0.28;           // seconds a burst lasts
-const float STEP_HZ = 24.0;         // how often a burst re-tears
-const float SHIFT_PX = 14.0;
-const float SPLIT_PX = 2.5;
-const float DIP = 0.12;
+// Each at levels 1, 2 and 3 (`Glitch 1`..`Glitch 3`); 2 is the default. A
+// higher level slips more often and harder.
+float period() { return pardesByLevel(4.5, 2.4, 0.55); }      // seconds between bursts, on average
+float burst() { return pardesByLevel(0.2, 0.28, 0.5); }       // seconds a burst lasts
+float stepHz() { return pardesByLevel(20.0, 24.0, 30.0); }    // how often a burst re-tears
+float shiftPx() { return pardesByLevel(8.0, 14.0, 34.0); }
+float splitPx() { return pardesByLevel(1.5, 2.5, 6.0); }
+float dip() { return pardesByLevel(0.08, 0.12, 0.22); }
+float tearFrom() { return pardesByLevel(0.8, 0.72, 0.35); }   // how few bands tear
 
 float hash(vec2 p) {
     vec3 q = fract(vec3(p.xyx) * 0.1031);
@@ -101,27 +112,27 @@ void mainImage(out vec4 fragColor, in vec2 fragCoord) {
     vec2 uv = fragCoord / size;
     // Which burst window this is, when in it the burst starts, and how far
     // into the burst we are: 0 outside one.
-    float window = floor(iTime / PERIOD);
-    float start = window * PERIOD + hash(vec2(window, 7.0)) * (PERIOD - BURST);
-    float t = (iTime - start) / BURST;
+    float window = floor(iTime / period());
+    float start = window * period() + hash(vec2(window, 7.0)) * (period() - burst());
+    float t = (iTime - start) / burst();
     float live = step(0.0, t) * step(t, 1.0);
     float envelope = live * sin(3.14159265 * clamp(t, 0.0, 1.0));
     if (envelope <= 0.0) {
         fragColor = texture(iChannel0, uv);
         return;
     }
-    // Bands of 6 to 40 px, re-cut at STEP_HZ during the burst; about one
+    // Bands of 6 to 40 px, re-cut at stepHz() during the burst; about one
     // band in four tears.
-    float tick = floor(iTime * STEP_HZ);
+    float tick = floor(iTime * stepHz());
     float band_px = mix(6.0, 40.0, hash(vec2(tick, 3.0)));
     float band = floor(fragCoord.y / band_px);
     float roll = hash(vec2(band, tick));
-    float tear = smoothstep(0.72, 0.9, roll) * envelope;
-    float shift = (hash(vec2(tick, band + 11.0)) - 0.5) * 2.0 * SHIFT_PX * tear;
+    float tear = smoothstep(tearFrom(), tearFrom() + 0.18, roll) * envelope;
+    float shift = (hash(vec2(tick, band + 11.0)) - 0.5) * 2.0 * shiftPx() * tear;
     vec2 at = vec2(fragCoord.x + shift, fragCoord.y);
-    vec2 split = vec2(SPLIT_PX * tear, 0.0);
+    vec2 split = vec2(splitPx() * tear, 0.0);
     vec4 center = texture(iChannel0, at / size);
     vec3 col = vec3(texture(iChannel0, (at + split) / size).r, center.g, texture(iChannel0, (at - split) / size).b);
-    col = toSrgb(toLinear(col) * (1.0 - DIP * tear));
+    col = toSrgb(toLinear(col) * (1.0 - dip() * tear));
     fragColor = vec4(col, center.a);
 }
diff --git a/shaders/prebuilt/post-glitch.frag.spv b/shaders/prebuilt/post-glitch.frag.spv
index 8a224958..619616a8 100644
Binary files a/shaders/prebuilt/post-glitch.frag.spv and b/shaders/prebuilt/post-glitch.frag.spv differ
diff --git a/shaders/prebuilt/post-ripple.frag.glsl b/shaders/prebuilt/post-ripple.frag.glsl
index 28059def..d29a4c22 100644
--- a/shaders/prebuilt/post-ripple.frag.glsl
+++ b/shaders/prebuilt/post-ripple.frag.glsl
@@ -39,12 +39,19 @@ layout(set = 3, binding = 0, std140) uniform Globals {
     uniform vec3  iSelectionBackgroundColor;
 };
 
-// pardes's own: 1 when the window is opaque, so a pass cannot punch holes
-// in it through its alpha.
+// pardes's own: pardesOpaque is 1 when the window is opaque, so a pass
+// cannot punch holes in it through its alpha; pardesLevel is a bundled
+// pass's strength, 1 to 3 (`Crt 3`), and 0 for a user's file.
 layout(set = 3, binding = 1, std140) uniform PardesPost {
     float pardesOpaque;
+    float pardesLevel;
 };
 
+// A bundled pass's constant at levels 1, 2 and 3.
+float pardesByLevel(float one, float two, float three) {
+    return pardesLevel < 1.5 ? one : (pardesLevel < 2.5 ? two : three);
+}
+
 #define CURSORSTYLE_BLOCK        0
 #define CURSORSTYLE_BLOCK_HOLLOW 1
 #define CURSORSTYLE_BAR          2
@@ -67,19 +74,22 @@ void main() {
 #line 1
 // Ripple: the page as a still pool a slow swell crosses. Rings travel out
 // from the middle of the window at a fixed speed in pixels, so they look
-// the same at any size and frame rate; the displacement is at most a couple
-// of pixels, so text stays readable, and it eases in over its first half
+// the same at any size and frame rate; at the default level the displacement
+// is at most a couple of pixels, so text stays readable, and it eases in over its first half
 // second instead of snapping on. Each ring catches the light a little on its
 // rising side, in linear light, and the result is dithered so the shading
 // never bands. It is a Shadertoy file: pardes puts its prefix before it.
 
 const float TAU = 6.28318530718;
-const float WAVELENGTH_PX = 150.0;
-const float SPEED_PX = 55.0;        // outward, per second
-const float AMPLITUDE_PX = 2.2;
-const float SHADE = 0.035;          // light on a slope, linear
 const float EASE_IN = 0.5;          // seconds
 
+// Each at levels 1, 2 and 3 (`Ripple 1`..`Ripple 3`); 2 is the default.
+float wavelengthPx() { return pardesByLevel(170.0, 150.0, 120.0); }
+float speedPx() { return pardesByLevel(40.0, 55.0, 80.0); }        // outward, per second
+float amplitudePx() { return pardesByLevel(1.2, 2.2, 5.0); }
+float shade() { return pardesByLevel(0.02, 0.035, 0.09); }         // light on a slope, linear
+float reachEnd() { return pardesByLevel(0.85, 0.95, 1.3); }        // how far out it dies away
+
 vec3 toLinear(vec3 c) {
     return mix(pow((c + 0.055) / 1.055, vec3(2.4)), c / 12.92, lessThanEqual(c, vec3(0.04045)));
 }
@@ -101,16 +111,16 @@ void mainImage(out vec4 fragColor, in vec2 fragCoord) {
     float reach = 0.5 * length(size);
     // Strongest a third of the way out, fading to nothing at the middle
     // and at the edges, so the window's frame never wobbles.
-    float envelope = smoothstep(0.0, 0.18, radius / reach) * (1.0 - smoothstep(0.35, 0.95, radius / reach));
+    float envelope = smoothstep(0.0, 0.18, radius / reach) * (1.0 - smoothstep(0.35, reachEnd(), radius / reach));
     float ease = smoothstep(0.0, EASE_IN, iTime);
-    float phase = (radius - iTime * SPEED_PX) * TAU / WAVELENGTH_PX;
+    float phase = (radius - iTime * speedPx()) * TAU / wavelengthPx();
     float height = sin(phase);
     float slope = cos(phase);
     vec2 dir = offset / max(radius, 1e-3);
-    vec2 moved = fragCoord + dir * height * AMPLITUDE_PX * envelope * ease;
+    vec2 moved = fragCoord + dir * height * amplitudePx() * envelope * ease;
 
     vec4 s = texture(iChannel0, moved / size);
-    vec3 col = toLinear(s.rgb) * (1.0 + SHADE * slope * envelope * ease);
+    vec3 col = toLinear(s.rgb) * (1.0 + shade() * slope * envelope * ease);
     vec3 srgb = toSrgb(col) + (ign(fragCoord + float(iFrame % 64) * 5.588238) - 0.5) / 255.0;
     fragColor = vec4(clamp(srgb, 0.0, 1.0), s.a);
 }
diff --git a/shaders/prebuilt/post-ripple.frag.spv b/shaders/prebuilt/post-ripple.frag.spv
index 1a105a33..5f05f9f3 100644
Binary files a/shaders/prebuilt/post-ripple.frag.spv and b/shaders/prebuilt/post-ripple.frag.spv differ
diff --git a/src/config.zig b/src/config.zig
index 1d4043ab..e8c5a705 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -628,7 +628,12 @@ pub const Runtime = struct {
         pub const Entry = struct {
             scene: ?Scene = null,
             path: Text(limits.host_path_cap) = .{},
+            /// A bundled pass's strength, 1 to `max_level`; 0 for a file.
+            level: u8 = 0,
         };
+        pub const max_level = 3;
+        /// What `on` and a bare word turn a bundled pass on at.
+        pub const default_level = 2;
         entries: [max]Entry = @splat(.{}),
         len: u8 = 0,
         /// Bumped on every change: a shell compiles the chain again when it
@@ -640,8 +645,28 @@ pub const Runtime = struct {
         }
 
         pub fn has(post: *const Post, scene: Scene) bool {
-            for (post.list()) |entry| if (entry.scene == scene) return true;
-            return false;
+            return post.level(scene) != 0;
+        }
+
+        /// A bundled pass's level; 0 when it is not in the chain.
+        pub fn level(post: *const Post, scene: Scene) u8 {
+            for (post.list()) |entry| if (entry.scene == scene) return entry.level;
+            return 0;
+        }
+
+        /// Sets a bundled pass's level: 0 takes it out, anything else puts it
+        /// in at the end or changes it where it is.
+        pub fn setLevel(post: *Post, scene: Scene, to: u8) bool {
+            std.debug.assert(to <= max_level);
+            if (to == 0) return post.set(scene, "", false);
+            for (post.entries[0..post.len]) |*entry| if (entry.scene == scene) {
+                if (entry.level != to) post.generation +%= 1;
+                entry.level = to;
+                return true;
+            };
+            if (!post.set(scene, "", true)) return false;
+            post.entries[post.len - 1].level = to;
+            return true;
         }
 
         /// Puts the pass in the chain, at its end, or takes it out; `want`
@@ -949,8 +974,19 @@ pub const Runtime = struct {
                 }
             },
             .scene => |effect| {
-                const want = switchedTo(argument) catch return false;
-                return state.post.set(effect, "", want);
+                // A level, 0 (off) to 3; `on` is the default level, `off` 0,
+                // and bare flips between the two.
+                const text = std.mem.trim(u8, argument orelse "", " \t\r\n");
+                const to: u8 = if (text.len == 0)
+                    (if (state.post.has(effect)) 0 else Post.default_level)
+                else if (std.mem.eql(u8, text, "on"))
+                    Post.default_level
+                else if (std.mem.eql(u8, text, "off"))
+                    0
+                else
+                    std.fmt.parseInt(u8, text, 10) catch return false;
+                if (to > Post.max_level) return false;
+                return state.post.setLevel(effect, to);
             },
             .shader => {
                 const path = std.mem.trim(u8, argument orelse return false, " \t\r\n");
@@ -1119,7 +1155,8 @@ pub const Runtime = struct {
                     try out.print("{s} unsupported\n", .{setting.word});
                     continue;
                 }
-                try out.print("{s} {s}\n", .{ setting.word, onOff(state.post.has(effect)) });
+                const level = state.post.level(effect);
+                if (level == 0) try out.print("{s} off\n", .{setting.word}) else try out.print("{s} {d}\n", .{ setting.word, level });
             },
             .shader => {
                 if (!setting.enabled(context.capabilities)) {
@@ -1246,6 +1283,28 @@ pub const Runtime = struct {
         try std.testing.expect(!apply(&state, find("ShaderAnimation").?, "sometimes"));
     }
 
+    test "a bundled pass takes a level: on is the default, 0 and off take it out, and the old words still flip" {
+        var state: Runtime = .{};
+        const crt = find("Crt").?;
+        try std.testing.expect(apply(&state, crt, "on"));
+        try std.testing.expectEqual(@as(u8, Post.default_level), state.post.level(.crt));
+        try std.testing.expect(apply(&state, find("Glitch").?, "1"));
+        const moved = state.post.generation;
+        try std.testing.expect(apply(&state, crt, "3"));
+        try std.testing.expectEqual(@as(u8, 3), state.post.level(.crt));
+        // A new level keeps its place in the chain.
+        try std.testing.expectEqual(Scene.crt, state.post.list()[0].scene.?);
+        try std.testing.expect(state.post.generation != moved);
+        try std.testing.expect(!apply(&state, crt, "4"));
+        try std.testing.expect(!apply(&state, crt, "loud"));
+        try std.testing.expect(apply(&state, crt, "0"));
+        try std.testing.expect(!state.post.has(.crt));
+        try std.testing.expect(apply(&state, crt, null));
+        try std.testing.expectEqual(@as(u8, Post.default_level), state.post.level(.crt));
+        try std.testing.expect(apply(&state, crt, "off"));
+        try std.testing.expectEqual(@as(u8, 0), state.post.level(.crt));
+    }
+
     test "tagline size validates before mutating live state" {
         const setting = find("TaglineSize").?;
         var state: Runtime = .{};
@@ -1412,9 +1471,9 @@ pub const Runtime = struct {
                     .typewriter => "Panel transition PanelType\n",
                 },
                 .scene => |effect| switch (effect) {
-                    .crt => "Crt on\n",
-                    .ripple => "Ripple on\n",
-                    .glitch => "Glitch on\n",
+                    .crt => "Crt 2\n",
+                    .ripple => "Ripple 2\n",
+                    .glitch => "Glitch 2\n",
                 },
                 .shader => "Shader ~/crt.glsl\n",
                 .shader_animation => "ShaderAnimation always\n",
diff --git a/src/gui/Post.zig b/src/gui/Post.zig
index c529efc0..d9d3d53e 100644
--- a/src/gui/Post.zig
+++ b/src/gui/Post.zig
@@ -69,6 +69,8 @@ pub const Uniforms = extern struct {
 
 pub const Pass = struct {
     scene: ?Scene = null,
+    /// A bundled pass's strength (pardesLevel); 0 for a file.
+    level: u8 = 0,
     /// A user's file, owned; empty for a bundled pass.
     path: []u8 = &.{},
     pipeline: ?*Pipeline = null,
@@ -117,7 +119,7 @@ pub fn sync(post: *Post, gpa: std.mem.Allocator, io: std.Io, device: *c.SDL_GPUD
     for (chain.list(), 0..) |entry, i| {
         if (entry.scene) |scene| {
             if (post.bundled.get(scene) == null) post.bundled.set(scene, makePipeline(device, format, bundled_spv.get(scene)) catch null);
-            next[i] = .{ .scene = scene, .pipeline = post.bundled.get(scene) };
+            next[i] = .{ .scene = scene, .level = entry.level, .pipeline = post.bundled.get(scene) };
             continue;
         }
         // A file already in the chain keeps its pipeline and its path.
@@ -405,7 +407,6 @@ pub fn draw(post: *Post, device: *c.SDL_GPUDevice, cmd: *c.SDL_GPUCommandBuffer,
     const day = epoch.getEpochDay().calculateYearDay();
     const month = day.calculateMonthDay();
     u.date = .{ @floatFromInt(day.year), @floatFromInt(month.month.numeric() - 1), @floatFromInt(month.day_index + 1), @floatFromInt(epoch.getDaySeconds().secs) };
-    const own: [4]f32 = .{ @floatFromInt(@intFromBool(opaque_window)), 0, 0, 0 };
 
     var input = source;
     var index: usize = 0;
@@ -423,6 +424,7 @@ pub fn draw(post: *Post, device: *c.SDL_GPUDevice, cmd: *c.SDL_GPUCommandBuffer,
         const binding = c.SDL_GPUTextureSamplerBinding{ .texture = input, .sampler = sampler };
         c.SDL_BindGPUFragmentSamplers(pass_rp, 0, &binding, 1);
         c.SDL_PushGPUFragmentUniformData(cmd, 0, u, @sizeOf(Uniforms));
+        const own: [4]f32 = .{ @floatFromInt(@intFromBool(opaque_window)), @floatFromInt(pass.level), 0, 0 };
         c.SDL_PushGPUFragmentUniformData(cmd, 1, &own, @sizeOf(@TypeOf(own)));
         c.SDL_DrawGPUPrimitives(pass_rp, 3, 1, 0, 0);
         c.SDL_EndGPURenderPass(pass_rp);
diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig
index ed10dd70..cd327d03 100644
--- a/src/ninep/ctl.zig
+++ b/src/ninep/ctl.zig
@@ -263,7 +263,7 @@ fn writeSettings(p: *Pardes, w: *std.Io.Writer) !void {
             // Bare, it names the default directory.
             .dump_dir => if (s.dump_dir.len > 0) try w.print("{s} {s}\n", .{ word, s.dump_dir.get() }) else try w.print("{s}\n", .{word}),
             .transition => |effect| try w.print("{s} {s}\n", .{ word, if (s.panel_transition == effect) "on" else "off" }),
-            .scene => |effect| try w.print("{s} {s}\n", .{ word, if (s.post.has(effect)) "on" else "off" }),
+            .scene => |effect| if (s.post.level(effect) == 0) try w.print("{s} off\n", .{word}) else try w.print("{s} {d}\n", .{ word, s.post.level(effect) }),
             .shader => for (s.post.list()) |entry| if (entry.scene == null) try w.print("{s} {s}\n", .{ word, entry.path.get() }),
             .shader_animation => try w.print("{s} {s}\n", .{ word, @tagName(s.shader_animation) }),
         }
diff --git a/test/output.zig b/test/output.zig
index 400e9508..0fdd9f4d 100644
--- a/test/output.zig
+++ b/test/output.zig
@@ -667,7 +667,8 @@ test "every enabled setting builtin mutates the State Config reports" {
     else
         "Panel transition unsupported\n";
     try std.testing.expect(std.mem.indexOf(u8, report, transition) != null);
-    const scene_status = if (builtins.capabilities.scene_shaders) "on" else "unsupported";
+    // A bare word turns a bundled pass on at its default level.
+    const scene_status = if (builtins.capabilities.scene_shaders) "2" else "unsupported";
     for ([_][]const u8{ "Crt", "Ripple", "Glitch" }) |name| {
         const line = try std.fmt.bufPrint(&buf, "{s} {s}\n", .{ name, scene_status });
         try std.testing.expect(std.mem.indexOf(u8, report, line) != null);
-- 
cgit v1.3


From a007457cb007b03f310bca55c339e8cd5d9baafc Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 16:44:51 -0300
Subject: Ripple and Glitch are gone; Crt stays

The user tried them live and wants them removed entirely: the builtins,
their levels, config keys and leader paths (tR, tg), their slots in the
built-in chain, their shaders (source and prebuilt), EffectCode paths, and
on macOS their scene flags (pardes.h), the Metal kernel's coordinate warps
and the Swift pointer mapping that mirrored them. Docs say so (decision 8
in docs/render-pipeline.md); config.md documents Crt's levels, Shader and
ShaderAnimation instead.

Shared files touched: macos.zig (flags). Not touched: pardes.zig,
Messages.zig, mouse.zig, gui.zig, detached/*.
---
 build.zig                                  |   5 +-
 docs/config.md                             |  15 ++--
 docs/design.typ                            |   5 +-
 docs/macos.md                              |  21 ++---
 docs/render-pipeline.md                    |  19 ++--
 docs/web.md                                |   2 +-
 shaders/crt.ci.metal                       |  75 ++--------------
 shaders/post/glitch.glsl                   |  64 -------------
 shaders/post/ripple.glsl                   |  52 -----------
 shaders/prebuilt/post-glitch.frag.glsl     | 138 -----------------------------
 shaders/prebuilt/post-glitch.frag.spv      | Bin 10764 -> 0 bytes
 shaders/prebuilt/post-ripple.frag.glsl     | 126 --------------------------
 shaders/prebuilt/post-ripple.frag.spv      | Bin 9096 -> 0 bytes
 src/config.zig                             |  22 ++---
 src/effect_sources.zig                     |   8 +-
 src/gui/Post.zig                           |   8 +-
 src/macos.zig                              |  17 +---
 src/macos/Sources/PardesView.swift         |   2 +-
 src/macos/Sources/ScenePostprocessor.swift |  48 +---------
 src/macos/pardes.h                         |   5 +-
 test/output.zig                            |   2 +-
 21 files changed, 61 insertions(+), 573 deletions(-)
 delete mode 100644 shaders/post/glitch.glsl
 delete mode 100644 shaders/post/ripple.glsl
 delete mode 100644 shaders/prebuilt/post-glitch.frag.glsl
 delete mode 100644 shaders/prebuilt/post-glitch.frag.spv
 delete mode 100644 shaders/prebuilt/post-ripple.frag.glsl
 delete mode 100644 shaders/prebuilt/post-ripple.frag.spv

(limited to 'src/gui')

diff --git a/build.zig b/build.zig
index c1117593..97d51a51 100644
--- a/build.zig
+++ b/build.zig
@@ -51,10 +51,9 @@ const gui_shaders = [_][]const u8{
     "overlay.vert", "overlay.frag",
     "image.vert",   "image.frag",
     "post.vert",
-    // The bundled post passes: shaders/post/<name>.glsl behind the Shadertoy
+    // The bundled post pass: shaders/post/crt.glsl behind the Shadertoy
     // prefix (shaderSource).
-    "post-crt.frag", "post-ripple.frag",
-    "post-glitch.frag",
+    "post-crt.frag",
 };
 
 pub fn build(b: *std.Build) void {
diff --git a/docs/config.md b/docs/config.md
index 9c51f329..16fd59e5 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -513,18 +513,19 @@ immediately and remains the one authoritative geometry. DOM web intentionally
 does not expose these builtins: its renderer is selectable HTML/CSS and has no
 canvas or shader stage.
 
-The scene effects are independent switches and can be combined:
+The scene effect is `Crt`, at a level from 0 (off) to 3; `on` is 2:
 
 ```text
 Crt
-Ripple
-Glitch
+Crt 3
 ```
 
-They share one full-scene shader pass in SDL and macOS. With all three off the
-pass is bypassed. CRT works in linear light with restrained scanlines, mask,
-bloom, curvature, and noise rather than remapping the theme to a strong fixed
-palette; Ripple and Glitch primarily perturb sample coordinates.
+The SDL GUI runs it as the bundled pass of its post chain, which also takes
+Shadertoy files written for ghostty (`Shader ~/crt.glsl`, `Shader off`), and
+`ShaderAnimation off|on|always` says when the chain animates on its own. With
+the chain empty the pass is bypassed. CRT works in linear light with restrained
+scanlines, mask, bloom and vignette, and no curvature, so clicks land where
+they are drawn.
 
 `EffectCode PanelAscii` or `EffectCode Crt` lists the current backend's
 build-embedded source paths under `/virtual`. Look opens each full file;
diff --git a/docs/design.typ b/docs/design.typ
index 234c3692..caa35b37 100644
--- a/docs/design.typ
+++ b/docs/design.typ
@@ -913,8 +913,9 @@ while its geometry moves and placed again on the last active sample.
 SDL supplies old/new glyph data, diff flags, final/presented boxes, and effect
 parameters to the glyph and native-image shaders. Pixel attachments bypass ASCII
 because they have no character byte. macOS passes the same records across its
-plain C ABI and composites old/new panel images in Metal and Core Image. Scene
-`Crt`, `Ripple` and `Glitch` bits share one full-window pass in each native GUI.
+plain C ABI and composites old/new panel images in Metal and Core Image. The
+scene `Crt` is one full-window pass in each native GUI; the SDL GUI's post
+chain also runs Shadertoy files (`Shader`).
 
 DOM web is a separate platform, not a shader GUI: retaining selectable HTML and
 CSS is more important than duplicating the renderer in canvas, so it exposes
diff --git a/docs/macos.md b/docs/macos.md
index e104d3a6..5166e2d5 100644
--- a/docs/macos.md
+++ b/docs/macos.md
@@ -102,8 +102,8 @@ asking for a thin insert caret instead of a block. `Surface.images` crosses
 separately as `pardes_frame_images` / `pardes_frame_image_list` — see "Pixel
 attachments" below.
 
-`pardes_scene` is the matching full-window snapshot: a bit each for CRT,
-ripple, and glitch, plus the 60 Hz time/frame that animates them. It is returned
+`pardes_scene` is the matching full-window snapshot: a bit for CRT, plus the
+60 Hz time/frame that animates it. It is returned
 by value, so the renderer never holds a pointer into live core state. A zero
 flags word is also the fast-path contract: draw the CoreText frame directly.
 
@@ -662,8 +662,7 @@ longer leaves a dark titlebar over a cream grid.
 
 ## Scene effects
 
-`Crt`, `Ripple`, and `Glitch` are three switches over one postprocess, not three
-stacked filters. Their canonical macOS source is `shaders/crt.ci.metal`, which
+`Crt` is one full-window postprocess. Its canonical macOS source is `shaders/crt.ci.metal`, which
 the build installs as `pardes.app/Contents/Resources/crt.ci.metal`. The Swift
 shell loads that exact asset with `CIKernel.kernels(withMetalString:)` and runs
 it through a `CIContext` created from the system Metal device. The source is
@@ -673,14 +672,12 @@ The ordinary CoreText/attachment/cursor pass is one function. With any scene
 bit or panel track it targets a retained, backing-scale bitmap; kernels then
 sample the complete frame into the flipped view. PDFs, image panes, taglines,
 rules, and the caret therefore receive the same effect. With every bit off and
-no panel track the bitmap and Core Image context are bypassed entirely. Ripple
-and glitch alter sample coordinates only, preserving theme colors; CRT works
+no panel track the bitmap and Core Image context are bypassed entirely. CRT works
 in linear light with restrained bloom, scan/mask, vignette, hum, and noise
 instead of applying a broad color remap.
 
 The scene kernel alone receives a `clampedToExtent` image and the final output
-is cropped back to the original finite extent. Coordinate tears and chroma
-samples therefore clamp to the edge exactly like SDL's scene sampler instead
+is cropped back to the original finite extent. Chroma samples therefore clamp to the edge exactly like SDL's scene sampler instead
 of acquiring transparent-black seams from Core Image's finite source image.
 
 The Zig side owns the clock. `pardes_animation_tick` increments its wrapped
@@ -689,8 +686,8 @@ from that integer. Input bursts cannot accelerate the shader.
 
 Pointer input follows the same destination-to-source transform as the last
 presented scene frame before it is divided by the cell metrics. The view keeps
-that exact `pardes_scene_s` snapshot and mirrors the Metal barrel, ripple and
-glitch sampling arithmetic in `ScenePostprocessor.sourcePoint`; pixels outside
+that exact `pardes_scene_s` snapshot and mirrors the Metal barrel arithmetic
+in `ScenePostprocessor.sourcePoint`; pixels outside
 the CRT tube have no cell. The resulting displayed-grid cell then reaches the
 core, whose panel-track mapping resolves it to canonical pane content.
 
@@ -716,8 +713,8 @@ while `pardesComposedInCore` effects only clip the already-composed core cells;
 pixel attachments have no character value and pass through unchanged.
 Because the input is the finished bitmap rather than a glyph-only
 batch, backgrounds, glyphs, taglines, rules, the caret, PDF pages, and image
-panes move and dissolve together. Scene CRT/ripple/glitch runs once after the
-panel composition.
+panes move and dissolve together. The scene CRT runs once after the panel
+composition.
 
 With no scene bit and no panel track the retained bitmap, Core Image context,
 and Metal passes are bypassed. `EffectCode Panel*` links to this Metal
diff --git a/docs/render-pipeline.md b/docs/render-pipeline.md
index 2fd6045b..7c94fbea 100644
--- a/docs/render-pipeline.md
+++ b/docs/render-pipeline.md
@@ -505,16 +505,14 @@ Mirror ghostty 1.3.2 (`zig-pkg/ghostty-*/src/renderer/shadertoy.zig`,
   `custom-shader-animation`): off = redraw only when content changes; on =
   continuous while the window is focused; always = continuous. Continuous means
   the shell redraws its retained Surface (3.1), never a core tick or render.
-- **Existing crt/ripple/glitch** become bundled Shadertoy files in
-  `shaders/post/` selected by the same builtins (decision 2: kept, polished);
-  `scene_effects` and `crt.frag.glsl`/`crt.zig` are deleted. Each bundled pass
-  takes a level, `Crt 0..3` (0 off, `on` the default 2, `off` and bare still
-  work), passed as `pardesLevel`: 2 is the polished rewrite, 3 at least as
-  strong as the old effects (pixels changed by more than 8 in a channel,
-  against a plain frame: Crt 18.3% vs 17.4% old, Ripple 11.1% vs 9.5%, Glitch
-  9.3% a frame vs 8.1%); a Glitch level raises how often it slips as well as
-  how hard. The chain is
-  `Crt`, `Ripple`, `Glitch` and `Shader <path>` in the order they were put in
+- **Existing crt** becomes a bundled Shadertoy file in `shaders/post/` under
+  the same builtin; `scene_effects` and `crt.frag.glsl`/`crt.zig` are deleted.
+  It takes a level, `Crt 0..3` (0 off, `on` the default 2, `off` and bare
+  still work), passed as `pardesLevel`: 2 is the polished rewrite, 3 at least
+  as strong as the old CRT (pixels changed by more than 8 in a channel against
+  a plain frame: 18.3% vs 17.4%). Ripple and Glitch were rewritten too, then
+  removed at the user's word after a live look (decision 8). The chain is
+  `Crt` and `Shader <path>` in the order they were put in
   (`Shader off` empties it of files), `ShaderAnimation off|on|always`
   (default on). The core keeps no clock for it: level A redraws are the
   shell's.
@@ -905,3 +903,4 @@ goldens; ssh/tty byte budgets; wire version bump breaks mixed-version attach.
 5. The animation pacing fix goes into the no-visual-change phase.
 6. Cursor blink is on by default.
 7. The bundled CRT has no barrel distortion, so clicks stay exact.
+8. (After trying them live) Ripple and Glitch are removed entirely; Crt stays.
diff --git a/docs/web.md b/docs/web.md
index 3a68f958..bbbed8a3 100644
--- a/docs/web.md
+++ b/docs/web.md
@@ -42,7 +42,7 @@ shells, and two comptime capability flags say so once each. It exposes no
 `PanelAscii`, `PanelVertical`, `PanelEdges`, `PanelFall`, `PanelWave`,
 `PanelCurtain`, `PanelScramble`, `PanelType`) because
 `capabilities.panel_transitions` is `pardes.hosted`, and no
-`Crt`/`Ripple`/`Glitch` because `capabilities.scene_shaders` is
+`Crt` or `Shader` because `capabilities.scene_shaders` is
 `platform == .gui or platform == .macos` (`builtins.capabilities`; the words
 themselves carry those availabilities in `config.Runtime.settings`).
 Applying either faithfully would require a second canvas renderer and give up
diff --git a/shaders/crt.ci.metal b/shaders/crt.ci.metal
index c7e91a7e..9159af18 100644
--- a/shaders/crt.ci.metal
+++ b/shaders/crt.ci.metal
@@ -1,7 +1,6 @@
 // Native macOS panel and scene postprocess. Panel kernels consume the core's
-// plain tracks; the final full-window kernel ports crt.frag.glsl and combines
-// CRT, ripple and glitch. Scene constants and sampling geometry stay in step
-// with GLSL, while panel easing/noise stays in step with panel_animation.zig.
+// plain tracks; the final full-window kernel is the CRT. Panel easing/noise
+// stays in step with panel_animation.zig.
 //
 // The three entry points are `extern "C" [[stitchable]]`. Both halves are
 // load-bearing: this source is compiled at runtime by
@@ -38,24 +37,6 @@ float pardesCellNoise(float2 serialParts, float colValue, float rowValue) {
     return float(x & 0xffffu) / 65535.0;
 }
 
-float2 pardesSceneUV(float2 uv, float timeSeconds, float rippleOn, float glitchOn) {
-    if (rippleOn > 0.5) {
-        float2 centered = uv - 0.5;
-        float radius = length(centered);
-        // Reversed smoothstep edges are undefined in GLSL and Metal alike.
-        float envelope = 1.0 - smoothstep(0.04, 0.72, radius);
-        float wave = sin(radius * 42.0 - timeSeconds * 5.2);
-        uv += centered / max(radius, 0.00001) * wave * envelope * 0.0032;
-    }
-    if (glitchOn > 0.5) {
-        float band = floor(uv.y * 96.0);
-        float seed = pardesNoise(float2(band, floor(timeSeconds * 13.0)));
-        float tear = smoothstep(0.955, 1.0, seed);
-        uv.x += (pardesNoise(float2(seed, band)) - 0.5) * tear * 0.020;
-    }
-    return uv;
-}
-
 float4 pardesSceneSample(
     coreimage::sampler source,
     float2 origin,
@@ -66,42 +47,13 @@ float4 pardesSceneSample(
         source.sample(source.transform(origin + uv * size)));
 }
 
-// Keep this ordering identical to crt.frag.glsl's sceneSrgb: every caller
-// supplies its own pre-warp coordinate, then ripple/glitch move that sample,
-// then glitch splits its red/blue channels around the moved center.
-float4 pardesSceneSrgb(
-    coreimage::sampler source,
-    float2 origin,
-    float2 size,
-    float2 uv,
-    float timeSeconds,
-    float rippleOn,
-    float glitchOn
-) {
-    float2 warped = pardesSceneUV(uv, timeSeconds, rippleOn, glitchOn);
-    float4 center = pardesSceneSample(source, origin, size, warped);
-    if (glitchOn <= 0.5) return center;
-
-    float band = floor(warped.y * 96.0);
-    float seed = pardesNoise(float2(band, floor(timeSeconds * 13.0)));
-    float tear = smoothstep(0.955, 1.0, seed);
-    float2 chroma = float2((0.35 + 1.25 * tear) / size.x, 0.0);
-    float4 red = pardesSceneSample(source, origin, size, warped + chroma);
-    float4 blue = pardesSceneSample(source, origin, size, warped - chroma);
-    return float4(red.r, center.g, blue.b, center.a);
-}
-
 float3 pardesSceneLinear(
     coreimage::sampler source,
     float2 origin,
     float2 size,
-    float2 uv,
-    float timeSeconds,
-    float rippleOn,
-    float glitchOn
+    float2 uv
 ) {
-    return coreimage::srgb_to_linear(pardesSceneSrgb(
-        source, origin, size, uv, timeSeconds, rippleOn, glitchOn).rgb);
+    return coreimage::srgb_to_linear(pardesSceneSample(source, origin, size, uv).rgb);
 }
 
 bool pardesInside(float2 p, float4 box) {
@@ -242,8 +194,6 @@ extern "C" [[stitchable]] float4 pardesScene(
     float timeSeconds,
     float frame,
     float crtOn,
-    float rippleOn,
-    float glitchOn,
     float2 sceneSize,
     float2 sceneOrigin,
     coreimage::destination destination
@@ -277,24 +227,18 @@ extern "C" [[stitchable]] float4 pardesScene(
     // transparent theme.
     if (crtOn > 0.5 && edge <= 0.0) return float4(0.0, 0.0, 0.0, 1.0);
 
-    float4 center = pardesSceneSrgb(
-        source, origin, size, uv, timeSeconds, rippleOn, glitchOn);
+    float4 center = pardesSceneSample(source, origin, size, uv);
     float3 scene = center.rgb;
 
-    // Ripple/glitch alone are coordinate effects. Returning the sampled sRGB
-    // values directly keeps exact theme colors exact.
+    // Without the CRT the scene passes through, exact.
     if (crtOn <= 0.5) {
         return coreimage::premultiply(float4(clamp(scene, 0.0, 1.0), center.a));
     }
 
     float3 centerLinear = coreimage::srgb_to_linear(scene);
     float2 radialChroma = cc * (chromaPx * r2) * texel;
-    float3 redSample = pardesSceneLinear(
-        source, origin, size, uv + radialChroma,
-        timeSeconds, rippleOn, glitchOn);
-    float3 blueSample = pardesSceneLinear(
-        source, origin, size, uv - radialChroma,
-        timeSeconds, rippleOn, glitchOn);
+    float3 redSample = pardesSceneLinear(source, origin, size, uv + radialChroma);
+    float3 blueSample = pardesSceneLinear(source, origin, size, uv - radialChroma);
     float3 col = float3(
         redSample.r,
         centerLinear.g,
@@ -308,8 +252,7 @@ extern "C" [[stitchable]] float4 pardesScene(
         float2(0.0, bloom.y), float2(0.0, -bloom.y)
     };
     for (uint i = 0; i < 4; i++) {
-        // Deliberately raw, like GLSL brightPass: bloom belongs to the source
-        // image and does not recursively warp through the scene effects.
+        // Deliberately raw, like GLSL brightPass.
         float4 sampleValue = pardesSceneSample(
             source, origin, size, uv + bloomOffsets[i]);
         float3 linearValue = coreimage::srgb_to_linear(sampleValue.rgb);
diff --git a/shaders/post/glitch.glsl b/shaders/post/glitch.glsl
deleted file mode 100644
index 8f420d9c..00000000
--- a/shaders/post/glitch.glsl
+++ /dev/null
@@ -1,64 +0,0 @@
-// Glitch: now and then the signal slips. At the default level, every couple
-// of seconds a short
-// burst tears a few horizontal bands sideways and pulls their red and blue
-// apart; the bands are sized in pixels and the burst eases in and out over
-// a fraction of a second, so it reads as one event rather than a flicker,
-// and it looks the same at 60 or 144 Hz because every step is keyed to
-// iTime, not to frames. Between bursts the page is left exactly as it is.
-// A torn band's brightness dips in linear light. It is a Shadertoy file:
-// pardes puts its prefix before it.
-
-// Each at levels 1, 2 and 3 (`Glitch 1`..`Glitch 3`); 2 is the default. A
-// higher level slips more often and harder.
-float period() { return pardesByLevel(4.5, 2.4, 0.55); }      // seconds between bursts, on average
-float burst() { return pardesByLevel(0.2, 0.28, 0.5); }       // seconds a burst lasts
-float stepHz() { return pardesByLevel(20.0, 24.0, 30.0); }    // how often a burst re-tears
-float shiftPx() { return pardesByLevel(8.0, 14.0, 34.0); }
-float splitPx() { return pardesByLevel(1.5, 2.5, 6.0); }
-float dip() { return pardesByLevel(0.08, 0.12, 0.22); }
-float tearFrom() { return pardesByLevel(0.8, 0.72, 0.35); }   // how few bands tear
-
-float hash(vec2 p) {
-    vec3 q = fract(vec3(p.xyx) * 0.1031);
-    q += dot(q, q.yzx + 33.33);
-    return fract((q.x + q.y) * q.z);
-}
-
-vec3 toLinear(vec3 c) {
-    return mix(pow((c + 0.055) / 1.055, vec3(2.4)), c / 12.92, lessThanEqual(c, vec3(0.04045)));
-}
-
-vec3 toSrgb(vec3 c) {
-    c = max(c, vec3(0.0));
-    return mix(1.055 * pow(c, vec3(1.0 / 2.4)) - 0.055, c * 12.92, lessThanEqual(c, vec3(0.0031308)));
-}
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord) {
-    vec2 size = iResolution.xy;
-    vec2 uv = fragCoord / size;
-    // Which burst window this is, when in it the burst starts, and how far
-    // into the burst we are: 0 outside one.
-    float window = floor(iTime / period());
-    float start = window * period() + hash(vec2(window, 7.0)) * (period() - burst());
-    float t = (iTime - start) / burst();
-    float live = step(0.0, t) * step(t, 1.0);
-    float envelope = live * sin(3.14159265 * clamp(t, 0.0, 1.0));
-    if (envelope <= 0.0) {
-        fragColor = texture(iChannel0, uv);
-        return;
-    }
-    // Bands of 6 to 40 px, re-cut at stepHz() during the burst; about one
-    // band in four tears.
-    float tick = floor(iTime * stepHz());
-    float band_px = mix(6.0, 40.0, hash(vec2(tick, 3.0)));
-    float band = floor(fragCoord.y / band_px);
-    float roll = hash(vec2(band, tick));
-    float tear = smoothstep(tearFrom(), tearFrom() + 0.18, roll) * envelope;
-    float shift = (hash(vec2(tick, band + 11.0)) - 0.5) * 2.0 * shiftPx() * tear;
-    vec2 at = vec2(fragCoord.x + shift, fragCoord.y);
-    vec2 split = vec2(splitPx() * tear, 0.0);
-    vec4 center = texture(iChannel0, at / size);
-    vec3 col = vec3(texture(iChannel0, (at + split) / size).r, center.g, texture(iChannel0, (at - split) / size).b);
-    col = toSrgb(toLinear(col) * (1.0 - dip() * tear));
-    fragColor = vec4(col, center.a);
-}
diff --git a/shaders/post/ripple.glsl b/shaders/post/ripple.glsl
deleted file mode 100644
index 3236d339..00000000
--- a/shaders/post/ripple.glsl
+++ /dev/null
@@ -1,52 +0,0 @@
-// Ripple: the page as a still pool a slow swell crosses. Rings travel out
-// from the middle of the window at a fixed speed in pixels, so they look
-// the same at any size and frame rate; at the default level the displacement
-// is at most a couple of pixels, so text stays readable, and it eases in over its first half
-// second instead of snapping on. Each ring catches the light a little on its
-// rising side, in linear light, and the result is dithered so the shading
-// never bands. It is a Shadertoy file: pardes puts its prefix before it.
-
-const float TAU = 6.28318530718;
-const float EASE_IN = 0.5;          // seconds
-
-// Each at levels 1, 2 and 3 (`Ripple 1`..`Ripple 3`); 2 is the default.
-float wavelengthPx() { return pardesByLevel(170.0, 150.0, 120.0); }
-float speedPx() { return pardesByLevel(40.0, 55.0, 80.0); }        // outward, per second
-float amplitudePx() { return pardesByLevel(1.2, 2.2, 5.0); }
-float shade() { return pardesByLevel(0.02, 0.035, 0.09); }         // light on a slope, linear
-float reachEnd() { return pardesByLevel(0.85, 0.95, 1.3); }        // how far out it dies away
-
-vec3 toLinear(vec3 c) {
-    return mix(pow((c + 0.055) / 1.055, vec3(2.4)), c / 12.92, lessThanEqual(c, vec3(0.04045)));
-}
-
-vec3 toSrgb(vec3 c) {
-    c = max(c, vec3(0.0));
-    return mix(1.055 * pow(c, vec3(1.0 / 2.4)) - 0.055, c * 12.92, lessThanEqual(c, vec3(0.0031308)));
-}
-
-float ign(vec2 p) {
-    return fract(52.9829189 * fract(dot(p, vec2(0.06711056, 0.00583715))));
-}
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord) {
-    vec2 size = iResolution.xy;
-    vec2 center = 0.5 * size;
-    vec2 offset = fragCoord - center;
-    float radius = length(offset);
-    float reach = 0.5 * length(size);
-    // Strongest a third of the way out, fading to nothing at the middle
-    // and at the edges, so the window's frame never wobbles.
-    float envelope = smoothstep(0.0, 0.18, radius / reach) * (1.0 - smoothstep(0.35, reachEnd(), radius / reach));
-    float ease = smoothstep(0.0, EASE_IN, iTime);
-    float phase = (radius - iTime * speedPx()) * TAU / wavelengthPx();
-    float height = sin(phase);
-    float slope = cos(phase);
-    vec2 dir = offset / max(radius, 1e-3);
-    vec2 moved = fragCoord + dir * height * amplitudePx() * envelope * ease;
-
-    vec4 s = texture(iChannel0, moved / size);
-    vec3 col = toLinear(s.rgb) * (1.0 + shade() * slope * envelope * ease);
-    vec3 srgb = toSrgb(col) + (ign(fragCoord + float(iFrame % 64) * 5.588238) - 0.5) / 255.0;
-    fragColor = vec4(clamp(srgb, 0.0, 1.0), s.a);
-}
diff --git a/shaders/prebuilt/post-glitch.frag.glsl b/shaders/prebuilt/post-glitch.frag.glsl
deleted file mode 100644
index 7b288237..00000000
--- a/shaders/prebuilt/post-glitch.frag.glsl
+++ /dev/null
@@ -1,138 +0,0 @@
-#version 450
-// pardes's Shadertoy prefix (docs/render-pipeline.md §6), put before every
-// post pass: a bundled one in shaders/post/ at build time, a user's file at
-// run time. The uniform names, types and std140 order are ghostty 1.3.2's
-// (src/renderer/shaders/shadertoy_prefix.glsl), so a shader written for
-// ghostty runs here; only the bindings are SDL GPU's (a fragment shader's
-// textures in set 2, its uniform blocks in set 3). Y is down everywhere, as
-// on ghostty's Metal renderer: fragCoord, iChannel0's uv and the cursor
-// rectangles share one top-left space, and iCurrentCursor is (left x,
-// BOTTOM-edge y, width, height) in framebuffer pixels.
-
-layout(set = 3, binding = 0, std140) uniform Globals {
-    uniform vec3  iResolution;
-    uniform float iTime;
-    uniform float iTimeDelta;
-    uniform float iFrameRate;
-    uniform int   iFrame;
-    uniform float iChannelTime[4];
-    uniform vec3  iChannelResolution[4];
-    uniform vec4  iMouse;
-    uniform vec4  iDate;
-    uniform float iSampleRate;
-    uniform vec4  iCurrentCursor;
-    uniform vec4  iPreviousCursor;
-    uniform vec4  iCurrentCursorColor;
-    uniform vec4  iPreviousCursorColor;
-    uniform int   iCurrentCursorStyle;
-    uniform int   iPreviousCursorStyle;
-    uniform int   iCursorVisible;
-    uniform float iTimeCursorChange;
-    uniform float iTimeFocus;
-    uniform int iFocus;
-    uniform vec3  iPalette[256];
-    uniform vec3  iBackgroundColor;
-    uniform vec3  iForegroundColor;
-    uniform vec3  iCursorColor;
-    uniform vec3  iCursorText;
-    uniform vec3  iSelectionForegroundColor;
-    uniform vec3  iSelectionBackgroundColor;
-};
-
-// pardes's own: pardesOpaque is 1 when the window is opaque, so a pass
-// cannot punch holes in it through its alpha; pardesLevel is a bundled
-// pass's strength, 1 to 3 (`Crt 3`), and 0 for a user's file.
-layout(set = 3, binding = 1, std140) uniform PardesPost {
-    float pardesOpaque;
-    float pardesLevel;
-};
-
-// A bundled pass's constant at levels 1, 2 and 3.
-float pardesByLevel(float one, float two, float three) {
-    return pardesLevel < 1.5 ? one : (pardesLevel < 2.5 ? two : three);
-}
-
-#define CURSORSTYLE_BLOCK        0
-#define CURSORSTYLE_BLOCK_HOLLOW 1
-#define CURSORSTYLE_BAR          2
-#define CURSORSTYLE_UNDERLINE    3
-#define CURSORSTYLE_LOCK         4
-
-layout(set = 2, binding = 0) uniform sampler2D iChannel0;
-
-layout(location = 0) out vec4 _fragColor;
-
-#define texture2D texture
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord);
-void main() {
-    mainImage(_fragColor, gl_FragCoord.xy);
-    if (pardesOpaque > 0.5) _fragColor.a = 1.0;
-}
-
-// The shader's own lines count from 1, so glslc's errors name them.
-#line 1
-// Glitch: now and then the signal slips. At the default level, every couple
-// of seconds a short
-// burst tears a few horizontal bands sideways and pulls their red and blue
-// apart; the bands are sized in pixels and the burst eases in and out over
-// a fraction of a second, so it reads as one event rather than a flicker,
-// and it looks the same at 60 or 144 Hz because every step is keyed to
-// iTime, not to frames. Between bursts the page is left exactly as it is.
-// A torn band's brightness dips in linear light. It is a Shadertoy file:
-// pardes puts its prefix before it.
-
-// Each at levels 1, 2 and 3 (`Glitch 1`..`Glitch 3`); 2 is the default. A
-// higher level slips more often and harder.
-float period() { return pardesByLevel(4.5, 2.4, 0.55); }      // seconds between bursts, on average
-float burst() { return pardesByLevel(0.2, 0.28, 0.5); }       // seconds a burst lasts
-float stepHz() { return pardesByLevel(20.0, 24.0, 30.0); }    // how often a burst re-tears
-float shiftPx() { return pardesByLevel(8.0, 14.0, 34.0); }
-float splitPx() { return pardesByLevel(1.5, 2.5, 6.0); }
-float dip() { return pardesByLevel(0.08, 0.12, 0.22); }
-float tearFrom() { return pardesByLevel(0.8, 0.72, 0.35); }   // how few bands tear
-
-float hash(vec2 p) {
-    vec3 q = fract(vec3(p.xyx) * 0.1031);
-    q += dot(q, q.yzx + 33.33);
-    return fract((q.x + q.y) * q.z);
-}
-
-vec3 toLinear(vec3 c) {
-    return mix(pow((c + 0.055) / 1.055, vec3(2.4)), c / 12.92, lessThanEqual(c, vec3(0.04045)));
-}
-
-vec3 toSrgb(vec3 c) {
-    c = max(c, vec3(0.0));
-    return mix(1.055 * pow(c, vec3(1.0 / 2.4)) - 0.055, c * 12.92, lessThanEqual(c, vec3(0.0031308)));
-}
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord) {
-    vec2 size = iResolution.xy;
-    vec2 uv = fragCoord / size;
-    // Which burst window this is, when in it the burst starts, and how far
-    // into the burst we are: 0 outside one.
-    float window = floor(iTime / period());
-    float start = window * period() + hash(vec2(window, 7.0)) * (period() - burst());
-    float t = (iTime - start) / burst();
-    float live = step(0.0, t) * step(t, 1.0);
-    float envelope = live * sin(3.14159265 * clamp(t, 0.0, 1.0));
-    if (envelope <= 0.0) {
-        fragColor = texture(iChannel0, uv);
-        return;
-    }
-    // Bands of 6 to 40 px, re-cut at stepHz() during the burst; about one
-    // band in four tears.
-    float tick = floor(iTime * stepHz());
-    float band_px = mix(6.0, 40.0, hash(vec2(tick, 3.0)));
-    float band = floor(fragCoord.y / band_px);
-    float roll = hash(vec2(band, tick));
-    float tear = smoothstep(tearFrom(), tearFrom() + 0.18, roll) * envelope;
-    float shift = (hash(vec2(tick, band + 11.0)) - 0.5) * 2.0 * shiftPx() * tear;
-    vec2 at = vec2(fragCoord.x + shift, fragCoord.y);
-    vec2 split = vec2(splitPx() * tear, 0.0);
-    vec4 center = texture(iChannel0, at / size);
-    vec3 col = vec3(texture(iChannel0, (at + split) / size).r, center.g, texture(iChannel0, (at - split) / size).b);
-    col = toSrgb(toLinear(col) * (1.0 - dip() * tear));
-    fragColor = vec4(col, center.a);
-}
diff --git a/shaders/prebuilt/post-glitch.frag.spv b/shaders/prebuilt/post-glitch.frag.spv
deleted file mode 100644
index 619616a8..00000000
Binary files a/shaders/prebuilt/post-glitch.frag.spv and /dev/null differ
diff --git a/shaders/prebuilt/post-ripple.frag.glsl b/shaders/prebuilt/post-ripple.frag.glsl
deleted file mode 100644
index d29a4c22..00000000
--- a/shaders/prebuilt/post-ripple.frag.glsl
+++ /dev/null
@@ -1,126 +0,0 @@
-#version 450
-// pardes's Shadertoy prefix (docs/render-pipeline.md §6), put before every
-// post pass: a bundled one in shaders/post/ at build time, a user's file at
-// run time. The uniform names, types and std140 order are ghostty 1.3.2's
-// (src/renderer/shaders/shadertoy_prefix.glsl), so a shader written for
-// ghostty runs here; only the bindings are SDL GPU's (a fragment shader's
-// textures in set 2, its uniform blocks in set 3). Y is down everywhere, as
-// on ghostty's Metal renderer: fragCoord, iChannel0's uv and the cursor
-// rectangles share one top-left space, and iCurrentCursor is (left x,
-// BOTTOM-edge y, width, height) in framebuffer pixels.
-
-layout(set = 3, binding = 0, std140) uniform Globals {
-    uniform vec3  iResolution;
-    uniform float iTime;
-    uniform float iTimeDelta;
-    uniform float iFrameRate;
-    uniform int   iFrame;
-    uniform float iChannelTime[4];
-    uniform vec3  iChannelResolution[4];
-    uniform vec4  iMouse;
-    uniform vec4  iDate;
-    uniform float iSampleRate;
-    uniform vec4  iCurrentCursor;
-    uniform vec4  iPreviousCursor;
-    uniform vec4  iCurrentCursorColor;
-    uniform vec4  iPreviousCursorColor;
-    uniform int   iCurrentCursorStyle;
-    uniform int   iPreviousCursorStyle;
-    uniform int   iCursorVisible;
-    uniform float iTimeCursorChange;
-    uniform float iTimeFocus;
-    uniform int iFocus;
-    uniform vec3  iPalette[256];
-    uniform vec3  iBackgroundColor;
-    uniform vec3  iForegroundColor;
-    uniform vec3  iCursorColor;
-    uniform vec3  iCursorText;
-    uniform vec3  iSelectionForegroundColor;
-    uniform vec3  iSelectionBackgroundColor;
-};
-
-// pardes's own: pardesOpaque is 1 when the window is opaque, so a pass
-// cannot punch holes in it through its alpha; pardesLevel is a bundled
-// pass's strength, 1 to 3 (`Crt 3`), and 0 for a user's file.
-layout(set = 3, binding = 1, std140) uniform PardesPost {
-    float pardesOpaque;
-    float pardesLevel;
-};
-
-// A bundled pass's constant at levels 1, 2 and 3.
-float pardesByLevel(float one, float two, float three) {
-    return pardesLevel < 1.5 ? one : (pardesLevel < 2.5 ? two : three);
-}
-
-#define CURSORSTYLE_BLOCK        0
-#define CURSORSTYLE_BLOCK_HOLLOW 1
-#define CURSORSTYLE_BAR          2
-#define CURSORSTYLE_UNDERLINE    3
-#define CURSORSTYLE_LOCK         4
-
-layout(set = 2, binding = 0) uniform sampler2D iChannel0;
-
-layout(location = 0) out vec4 _fragColor;
-
-#define texture2D texture
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord);
-void main() {
-    mainImage(_fragColor, gl_FragCoord.xy);
-    if (pardesOpaque > 0.5) _fragColor.a = 1.0;
-}
-
-// The shader's own lines count from 1, so glslc's errors name them.
-#line 1
-// Ripple: the page as a still pool a slow swell crosses. Rings travel out
-// from the middle of the window at a fixed speed in pixels, so they look
-// the same at any size and frame rate; at the default level the displacement
-// is at most a couple of pixels, so text stays readable, and it eases in over its first half
-// second instead of snapping on. Each ring catches the light a little on its
-// rising side, in linear light, and the result is dithered so the shading
-// never bands. It is a Shadertoy file: pardes puts its prefix before it.
-
-const float TAU = 6.28318530718;
-const float EASE_IN = 0.5;          // seconds
-
-// Each at levels 1, 2 and 3 (`Ripple 1`..`Ripple 3`); 2 is the default.
-float wavelengthPx() { return pardesByLevel(170.0, 150.0, 120.0); }
-float speedPx() { return pardesByLevel(40.0, 55.0, 80.0); }        // outward, per second
-float amplitudePx() { return pardesByLevel(1.2, 2.2, 5.0); }
-float shade() { return pardesByLevel(0.02, 0.035, 0.09); }         // light on a slope, linear
-float reachEnd() { return pardesByLevel(0.85, 0.95, 1.3); }        // how far out it dies away
-
-vec3 toLinear(vec3 c) {
-    return mix(pow((c + 0.055) / 1.055, vec3(2.4)), c / 12.92, lessThanEqual(c, vec3(0.04045)));
-}
-
-vec3 toSrgb(vec3 c) {
-    c = max(c, vec3(0.0));
-    return mix(1.055 * pow(c, vec3(1.0 / 2.4)) - 0.055, c * 12.92, lessThanEqual(c, vec3(0.0031308)));
-}
-
-float ign(vec2 p) {
-    return fract(52.9829189 * fract(dot(p, vec2(0.06711056, 0.00583715))));
-}
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord) {
-    vec2 size = iResolution.xy;
-    vec2 center = 0.5 * size;
-    vec2 offset = fragCoord - center;
-    float radius = length(offset);
-    float reach = 0.5 * length(size);
-    // Strongest a third of the way out, fading to nothing at the middle
-    // and at the edges, so the window's frame never wobbles.
-    float envelope = smoothstep(0.0, 0.18, radius / reach) * (1.0 - smoothstep(0.35, reachEnd(), radius / reach));
-    float ease = smoothstep(0.0, EASE_IN, iTime);
-    float phase = (radius - iTime * speedPx()) * TAU / wavelengthPx();
-    float height = sin(phase);
-    float slope = cos(phase);
-    vec2 dir = offset / max(radius, 1e-3);
-    vec2 moved = fragCoord + dir * height * amplitudePx() * envelope * ease;
-
-    vec4 s = texture(iChannel0, moved / size);
-    vec3 col = toLinear(s.rgb) * (1.0 + shade() * slope * envelope * ease);
-    vec3 srgb = toSrgb(col) + (ign(fragCoord + float(iFrame % 64) * 5.588238) - 0.5) / 255.0;
-    fragColor = vec4(clamp(srgb, 0.0, 1.0), s.a);
-}
diff --git a/shaders/prebuilt/post-ripple.frag.spv b/shaders/prebuilt/post-ripple.frag.spv
deleted file mode 100644
index 5f05f9f3..00000000
Binary files a/shaders/prebuilt/post-ripple.frag.spv and /dev/null differ
diff --git a/src/config.zig b/src/config.zig
index e8c5a705..d1e5f23d 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -129,8 +129,6 @@ pub const leader_path = paths: {
     }
     if (builtins.capabilities.scene_shaders) {
         table.set(.Crt, "tr");
-        table.set(.Ripple, "tR");
-        table.set(.Glitch, "tg");
         table.set(.Shader, null);
         table.set(.ShaderAnimation, null);
     }
@@ -622,7 +620,7 @@ pub const Runtime = struct {
 
     pub const ShaderAnimation = enum { off, on, always };
 
-    /// Each pass a bundled effect (Crt, Ripple, Glitch) or a Shadertoy file.
+    /// Each pass the bundled Crt or a Shadertoy file.
     pub const Post = struct {
         pub const max = 8;
         pub const Entry = struct {
@@ -774,8 +772,8 @@ pub const Runtime = struct {
     pub const MessageTime = enum { linger, fall, dissolve };
 
     pub const Toggle = enum { colors, wrap, tree_context_tag_style, tag_bottom, debug, focus_tint, column_tags, syntax_bold, verbose, message_animation, ligatures };
-    /// The bundled post passes, each a Shadertoy file in shaders/post/.
-    pub const Scene = enum { crt, ripple, glitch };
+    /// The bundled post pass, a Shadertoy file in shaders/post/.
+    pub const Scene = enum { crt };
 
     pub const Action = union(enum) {
         toggle: Toggle,
@@ -843,8 +841,6 @@ pub const Runtime = struct {
         .{ .word = "PanelScramble", .action = .{ .transition = .scramble }, .availability = .panel_transitions },
         .{ .word = "PanelType", .action = .{ .transition = .typewriter }, .availability = .panel_transitions },
         .{ .word = "Crt", .action = .{ .scene = .crt }, .availability = .scene_shaders },
-        .{ .word = "Ripple", .action = .{ .scene = .ripple }, .availability = .scene_shaders },
-        .{ .word = "Glitch", .action = .{ .scene = .glitch }, .availability = .scene_shaders },
         .{ .word = "Shader", .action = .shader, .availability = .scene_shaders },
         .{ .word = "ShaderAnimation", .action = .shader_animation, .availability = .scene_shaders },
     };
@@ -1263,18 +1259,18 @@ pub const Runtime = struct {
     test "the post chain runs in the order its passes were put in, and Shader off empties it of files" {
         var state: Runtime = .{};
         try std.testing.expect(apply(&state, find("Shader").?, " ~/a.glsl\n"));
-        try std.testing.expect(apply(&state, find("Glitch").?, "on"));
+        try std.testing.expect(apply(&state, find("Crt").?, "on"));
         try std.testing.expect(apply(&state, find("Shader").?, "/b.glsl"));
         const chain = state.post.list();
         try std.testing.expectEqual(@as(usize, 3), chain.len);
         try std.testing.expectEqualStrings("~/a.glsl", chain[0].path.get());
-        try std.testing.expectEqual(Scene.glitch, chain[1].scene.?);
+        try std.testing.expectEqual(Scene.crt, chain[1].scene.?);
         try std.testing.expectEqualStrings("/b.glsl", chain[2].path.get());
         const moved = state.post.generation;
         // A file named again leaves; the others keep their order.
         try std.testing.expect(apply(&state, find("Shader").?, "~/a.glsl"));
         try std.testing.expect(state.post.generation != moved);
-        try std.testing.expectEqual(Scene.glitch, state.post.list()[0].scene.?);
+        try std.testing.expectEqual(Scene.crt, state.post.list()[0].scene.?);
         try std.testing.expect(apply(&state, find("Shader").?, "off"));
         try std.testing.expectEqual(@as(usize, 1), state.post.len);
         try std.testing.expect(!apply(&state, find("Shader").?, null));
@@ -1288,7 +1284,7 @@ pub const Runtime = struct {
         const crt = find("Crt").?;
         try std.testing.expect(apply(&state, crt, "on"));
         try std.testing.expectEqual(@as(u8, Post.default_level), state.post.level(.crt));
-        try std.testing.expect(apply(&state, find("Glitch").?, "1"));
+        try std.testing.expect(apply(&state, find("Shader").?, "/after.glsl"));
         const moved = state.post.generation;
         try std.testing.expect(apply(&state, crt, "3"));
         try std.testing.expectEqual(@as(u8, 3), state.post.level(.crt));
@@ -1472,8 +1468,6 @@ pub const Runtime = struct {
                 },
                 .scene => |effect| switch (effect) {
                     .crt => "Crt 2\n",
-                    .ripple => "Ripple 2\n",
-                    .glitch => "Glitch 2\n",
                 },
                 .shader => "Shader ~/crt.glsl\n",
                 .shader_animation => "ShaderAnimation always\n",
@@ -1544,8 +1538,6 @@ pub const Runtime = struct {
         try std.testing.expect(std.mem.indexOf(u8, defaults_report, "Font requested") == null);
         try std.testing.expect(std.mem.indexOf(u8, defaults_report, "Panel transition off\n") != null);
         try std.testing.expect(std.mem.indexOf(u8, defaults_report, "Crt unsupported\n") != null);
-        try std.testing.expect(std.mem.indexOf(u8, defaults_report, "Ripple unsupported\n") != null);
-        try std.testing.expect(std.mem.indexOf(u8, defaults_report, "Glitch unsupported\n") != null);
         try std.testing.expect(std.mem.indexOf(u8, defaults_report, "TaglineSize unsupported\n") != null);
         try std.testing.expect(std.mem.indexOf(u8, defaults_report, "Look hover delay: off\n") != null);
         try std.testing.expect(std.mem.indexOf(u8, defaults_report, "Native images: off\n") != null);
diff --git a/src/effect_sources.zig b/src/effect_sources.zig
index 6ce11160..83bd1313 100644
--- a/src/effect_sources.zig
+++ b/src/effect_sources.zig
@@ -12,10 +12,8 @@ const ui_fragment_path = shader_dir ++ "ui.frag.glsl";
 const image_vertex_path = shader_dir ++ "image.vert.glsl";
 const image_fragment_path = shader_dir ++ "image.frag.glsl";
 const post_vertex_path = shader_dir ++ "post.vert.glsl";
-// The bundled post passes as compiled: the prefix and the pass together.
+// The bundled post pass as compiled: the prefix and the pass together.
 const post_crt_path = shader_dir ++ "post-crt.frag.glsl";
-const post_ripple_path = shader_dir ++ "post-ripple.frag.glsl";
-const post_glitch_path = shader_dir ++ "post-glitch.frag.glsl";
 
 pub const Backend = @TypeOf(build_config.platform);
 pub const backend: Backend = build_config.platform;
@@ -55,8 +53,6 @@ pub const files = switch (backend) {
         .{ .path = image_fragment_path, .contents = @embedFile("effect-source-image.frag.glsl") },
         .{ .path = post_vertex_path, .contents = @embedFile("effect-source-post.vert.glsl") },
         .{ .path = post_crt_path, .contents = @embedFile("effect-source-post-crt.frag.glsl") },
-        .{ .path = post_ripple_path, .contents = @embedFile("effect-source-post-ripple.frag.glsl") },
-        .{ .path = post_glitch_path, .contents = @embedFile("effect-source-post-glitch.frag.glsl") },
     },
     .macos => [_]filesystem.Source{
         .{ .path = "src/macos/Sources/PardesView.swift", .contents = @embedFile("macos/Sources/PardesView.swift") },
@@ -77,8 +73,6 @@ pub fn forSetting(setting: config.Runtime.Setting) ?[]const []const u8 {
         .scene => |effect| switch (backend) {
             .gui => switch (effect) {
                 .crt => &.{ "src/gui/Post.zig", "src/gui/gui.zig", post_vertex_path, post_crt_path },
-                .ripple => &.{ "src/gui/Post.zig", "src/gui/gui.zig", post_vertex_path, post_ripple_path },
-                .glitch => &.{ "src/gui/Post.zig", "src/gui/gui.zig", post_vertex_path, post_glitch_path },
             },
             .macos => &.{ "src/macos/Sources/PardesView.swift", "src/macos/Sources/ScenePostprocessor.swift", "shaders/crt.ci.metal" },
             .tty, .web, .esp32p4 => null,
diff --git a/src/gui/Post.zig b/src/gui/Post.zig
index d9d3d53e..f715965f 100644
--- a/src/gui/Post.zig
+++ b/src/gui/Post.zig
@@ -1,7 +1,7 @@
 //! The post chain (docs/render-pipeline.md §6): Shadertoy passes over the
 //! finished frame, each reading the one before it (the frame first) and the
-//! last one writing the window. A pass is bundled (Crt, Ripple, Glitch:
-//! shaders/post/, compiled with the build) or a user's file (Shader <path>),
+//! last one writing the window. A pass is the bundled Crt (shaders/post/,
+//! compiled with the build) or a user's file (Shader <path>),
 //! compiled when it joins the chain by the build's own glslc invocation on a
 //! thread of its own, never on the frame path. A file whose compile fails
 //! keeps its last good pipeline, and glslc missing is said once.
@@ -28,8 +28,6 @@ const prefix = @embedFile("post-prefix.glsl");
 const vert_spv = @embedFile("post.vert.spv");
 const bundled_spv = std.EnumArray(Scene, []const u8).init(.{
     .crt = @embedFile("post-crt.frag.spv"),
-    .ripple = @embedFile("post-ripple.frag.spv"),
-    .glitch = @embedFile("post-glitch.frag.spv"),
 });
 
 /// ghostty's Shadertoy uniform block, member for member in the GLSL block's
@@ -170,7 +168,7 @@ fn collect(post: *Post, gpa: std.mem.Allocator, device: *c.SDL_GPUDevice, format
             .none => {},
             .missing => if (!post.missing_said) {
                 post.missing_said = true;
-                core.setMessage(core.active, "Shader: glslc is not on PATH, so Shadertoy files do not run (Crt, Ripple and Glitch do)");
+                core.setMessage(core.active, "Shader: glslc is not on PATH, so Shadertoy files do not run (Crt does)");
             },
             .failed => |text| {
                 defer gpa.free(text);
diff --git a/src/macos.zig b/src/macos.zig
index 0bad86ee..6cd7838f 100644
--- a/src/macos.zig
+++ b/src/macos.zig
@@ -112,8 +112,6 @@ const cell_flag_default: u8 = 1;
 const cell_flag_tagline: u8 = 2;
 const cell_flag_hover: u8 = 4;
 const scene_flag_crt: u32 = 1 << 0;
-const scene_flag_ripple: u32 = 1 << 1;
-const scene_flag_glitch: u32 = 1 << 2;
 const scene_frame_hz: u32 = 60;
 
 const scene_wrap_ns: u64 = 4096 * std.time.ns_per_s;
@@ -850,13 +848,11 @@ export fn pardes_should_quit() bool {
     return st.core.quit;
 }
 
-// The Metal shell keeps its own CRT, ripple and glitch kernel: the bundled
-// passes of the GUI's post chain, as flags.
+// The Metal shell keeps its own CRT kernel: the GUI's bundled post pass, as
+// a flag.
 fn encodeSceneEffects(post: *const pardes.config.Runtime.Post) u32 {
     var flags: u32 = 0;
     if (post.has(.crt)) flags |= scene_flag_crt;
-    if (post.has(.ripple)) flags |= scene_flag_ripple;
-    if (post.has(.glitch)) flags |= scene_flag_glitch;
     return flags;
 }
 
@@ -2842,8 +2838,6 @@ test "pardes.h matches the Zig boundary" {
     try expectEqual(@as(u8, c.PARDES_CELL_HOVER), cell_flag_hover);
     try expectEqual(@as(u16, c.PARDES_TOPBAR_H), pardes.TOPBAR_H);
     try expectEqual(@as(u32, c.PARDES_SCENE_CRT), scene_flag_crt);
-    try expectEqual(@as(u32, c.PARDES_SCENE_RIPPLE), scene_flag_ripple);
-    try expectEqual(@as(u32, c.PARDES_SCENE_GLITCH), scene_flag_glitch);
     try expectEqual(@as(u8, c.PARDES_PANEL_OPENING), @intFromEnum(animation.Phase.opening));
     try expectEqual(@as(u8, c.PARDES_PANEL_MOVING), @intFromEnum(animation.Phase.moving));
     try expectEqual(@as(u8, c.PARDES_PANEL_CLOSING), @intFromEnum(animation.Phase.closing));
@@ -2918,13 +2912,6 @@ test "scene effect flags and display clock are compact and independent" {
     try expectEqual(@as(u32, 0), encodeSceneEffects(&post));
     _ = post.set(.crt, "", true);
     try expectEqual(scene_flag_crt, encodeSceneEffects(&post));
-    _ = post.set(.ripple, "", true);
-    _ = post.set(.glitch, "", true);
-    try expectEqual(scene_flag_crt | scene_flag_ripple | scene_flag_glitch, encodeSceneEffects(&post));
-    try expectEqual(
-        scene_flag_crt | scene_flag_ripple | scene_flag_glitch,
-        encodeSceneEffects(.{ .crt = true, .ripple = true, .glitch = true }),
-    );
 
     var st: State = undefined;
     st.scene_ns = scene_wrap_ns - (std.time.ns_per_ms * 5);
diff --git a/src/macos/Sources/PardesView.swift b/src/macos/Sources/PardesView.swift
index 70f467e3..8ba9c84b 100644
--- a/src/macos/Sources/PardesView.swift
+++ b/src/macos/Sources/PardesView.swift
@@ -684,7 +684,7 @@ final class PardesView: NSView {
     private var latchedButton: pardes_mouse_button_e?
     private var latchedCell: GridPoint?
     /// Last physical point delivered by AppKit and its mapping through the
-    /// accepted scene. Ripple/glitch can move a source cell under a stationary
+    /// accepted scene. The CRT's barrel moves a source cell under a stationary
     /// hand, so successful scene presentations reconcile this point again.
     private var pointerPoint: CGPoint?
     private var pointerCell: GridPoint?
diff --git a/src/macos/Sources/ScenePostprocessor.swift b/src/macos/Sources/ScenePostprocessor.swift
index cf7892b3..41d54e34 100644
--- a/src/macos/Sources/ScenePostprocessor.swift
+++ b/src/macos/Sources/ScenePostprocessor.swift
@@ -205,11 +205,9 @@ final class ScenePostprocessor {
 
         if scene.flags != 0 {
             let crt: Float = scene.flags & UInt32(PARDES_SCENE_CRT) != 0 ? 1 : 0
-            let ripple: Float = scene.flags & UInt32(PARDES_SCENE_RIPPLE) != 0 ? 1 : 0
-            let glitch: Float = scene.flags & UInt32(PARDES_SCENE_GLITCH) != 0 ? 1 : 0
             // SDL samples the scene with CLAMP_TO_EDGE. A finite Core Image
             // instead supplies transparent black outside its extent, which
-            // would make ripple/glitch tear dark seams at the window edge.
+            // would tear dark seams at the window edge.
             // Clamp the input only; the kernel still emits true black before
             // sampling when a destination lies outside the CRT tube.
             let sceneInput = filtered.clampedToExtent()
@@ -218,7 +216,7 @@ final class ScenePostprocessor {
                 roiCallback: { _, _ in extent },
                 arguments: [
                     sceneInput, scene.time_seconds, Float(scene.frame),
-                    crt, ripple, glitch,
+                    crt,
                     CIVector(x: extent.width, y: extent.height),
                     CIVector(x: extent.minX, y: extent.minY),
                 ])
@@ -291,7 +289,7 @@ final class ScenePostprocessor {
 
     /// The scene kernel is a destination-to-source mapping. Pointer input must
     /// apply that same mapping before the grid and its panel tracks see a cell,
-    /// otherwise a visible word under ripple/glitch is not the word Look gets.
+    /// otherwise a visible word under the barrel is not the word Look gets.
     static func sourcePoint(
         _ point: CGPoint,
         size: CGSize,
@@ -311,27 +309,8 @@ final class ScenePostprocessor {
         ccY *= barrel
         uvX = ccX * 0.5 + 0.5
         uvY = ccY * 0.5 + 0.5
-        // Only CRT has a black tube. Ripple/glitch without CRT sample through
-        // the texture's clamp-to-edge policy and remain clickable there.
+        // The CRT's black tube has no cell under it.
         if crt > 0.5 && min(min(uvX, uvY), min(1 - uvX, 1 - uvY)) <= 0 { return nil }
-
-        let time = scene.time_seconds
-        if scene.flags & UInt32(PARDES_SCENE_RIPPLE) != 0 {
-            let centeredX = uvX - 0.5
-            let centeredY = uvY - 0.5
-            let radius = sqrtf(centeredX * centeredX + centeredY * centeredY)
-            let envelope = 1 - smoothstep(0.04, 0.72, radius)
-            let wave = sinf(radius * 42 - time * 5.2)
-            let travel = wave * envelope * 0.0032 / max(radius, 0.00001)
-            uvX += centeredX * travel
-            uvY += centeredY * travel
-        }
-        if scene.flags & UInt32(PARDES_SCENE_GLITCH) != 0 {
-            let band = floorf(uvY * 96)
-            let seed = noise(band, floorf(time * 13))
-            let tear = smoothstep(0.955, 1, seed)
-            uvX += (noise(seed, band) - 0.5) * tear * 0.020
-        }
         uvX = min(max(uvX, 0), max(0, 1 - 1 / Float(size.width)))
         uvY = min(max(uvY, 0), max(0, 1 - 1 / Float(size.height)))
         return CGPoint(
@@ -339,23 +318,4 @@ final class ScenePostprocessor {
             y: CGFloat(1 - uvY) * size.height)
     }
 
-    private static func smoothstep(_ edge0: Float, _ edge1: Float, _ x: Float) -> Float {
-        let t = min(max((x - edge0) / (edge1 - edge0), 0), 1)
-        return t * t * (3 - 2 * t)
-    }
-
-    /// Scalar spelling of pardesNoise in crt.ci.metal. Float arithmetic is
-    /// deliberate: the shader's band decision must not move at a Double round.
-    private static func noise(_ x: Float, _ y: Float) -> Float {
-        var qx = fract(x * 0.1031)
-        var qy = fract(y * 0.1031)
-        var qz = fract(x * 0.1031)
-        let d = qx * (qy + 33.33) + qy * (qz + 33.33) + qz * (qx + 33.33)
-        qx += d
-        qy += d
-        qz += d
-        return fract((qx + qy) * qz)
-    }
-
-    private static func fract(_ x: Float) -> Float { x - floorf(x) }
 }
diff --git a/src/macos/pardes.h b/src/macos/pardes.h
index f74330e5..29f8a37d 100644
--- a/src/macos/pardes.h
+++ b/src/macos/pardes.h
@@ -82,8 +82,7 @@ typedef struct {
 // from the background colour, which a real selection shares.
 #define PARDES_CELL_HOVER 0x04u
 
-// One coherent snapshot for the full-window shader pass. The bitmask lets the
-// host run CRT, ripple and glitch in one kernel instead of stacking filters;
+// One coherent snapshot for the full-window shader pass (CRT);
 // time/frame advance only on pardes_animation_tick's display clock.
 typedef struct {
   uint32_t flags;
@@ -92,8 +91,6 @@ typedef struct {
 } pardes_scene_s;
 
 #define PARDES_SCENE_CRT 0x01u
-#define PARDES_SCENE_RIPPLE 0x02u
-#define PARDES_SCENE_GLITCH 0x04u
 
 // One backend-neutral pane transition. Boxes are logical cell rectangles;
 // the native shader converts them to backing pixels using the same measured
diff --git a/test/output.zig b/test/output.zig
index 0fdd9f4d..e49ec4ff 100644
--- a/test/output.zig
+++ b/test/output.zig
@@ -669,7 +669,7 @@ test "every enabled setting builtin mutates the State Config reports" {
     try std.testing.expect(std.mem.indexOf(u8, report, transition) != null);
     // A bare word turns a bundled pass on at its default level.
     const scene_status = if (builtins.capabilities.scene_shaders) "2" else "unsupported";
-    for ([_][]const u8{ "Crt", "Ripple", "Glitch" }) |name| {
+    for ([_][]const u8{"Crt"}) |name| {
         const line = try std.fmt.bufPrint(&buf, "{s} {s}\n", .{ name, scene_status });
         try std.testing.expect(std.mem.indexOf(u8, report, line) != null);
     }
-- 
cgit v1.3