1 files changed, 91 insertions, 49 deletions
diff --git a/test/snapshots/psearch.golden b/test/snapshots/psearch.golden
index d1a28996..b0827d7c 100644
--- a/test/snapshots/psearch.golden
+++ b/test/snapshots/psearch.golden
@@ -1,62 +1,104 @@
 == snap output grid=140x31 cursor=4,9
 |Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
-|New Tty Find Grep Joincol
-|  /tmp/pardes-snap/psearch/cwd Save Tty Del Togglettymode Filter Collapse
+|   New Tty Find Grep Joincol Delcol
+|   /tmp/pardes-snap/psearch/cwd Tty Save Mode Filter Collapse Del
 |  printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
 |  x MARK a
 |  zz
 |  x MARK b
 |  zz
 |  x MARK c
-== snap typing grid=140x31 cursor=8,30
-|30:    /MARK
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|   /+New Save Tty Collapse Del
+|     1
+== snap typing grid=140x31 cursor=139,3
+|3:                                                                                                                                       /MARK
+|4:   printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
+|5:   x MARK a
+|6:   zz
+|7:   x MARK b
+|8:   zz
+|9:   x MARK c
 == snap results grid=140x31 cursor=7,4
-|27:   /tmp/pardes-snap/psearch/cwd/+Search Save Tty Del Collapse
-|28:      1 @p0:2:3-6 x MARK a
-|29:      2 @p0:4:3-6 x MARK b
-|30:      3 @p0:6:3-6 x MARK c
+|3:   printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
+|4:   x MARK a
+|5:   zz
+|6:   x MARK b
+|7:   zz
+|8:   x MARK c
+|9:
+|14:    /tmp/pardes-snap/psearch/cwd/+Search Save Tty Collapse Del LocationsConfig
+|15:                                                                                                                                         Look
+|16:      1 @p0:2:3-6
+|17:      2 x MARK a
+|18:      3 @p0:4:3-6
+|19:      4 x MARK b
+|20:      5 @p0:6:3-6
 == style results grid=140x31
 |0: 0-70 #b2c3b8,#1d2824, 71-139 d,#1d2824,
-|1: 0-24 #becfc4,#26362d, 25-139 d,#26362d,
-|2: 0-1 #000000,#adcc91, 2-72 #becfc4,#26362d, 73-139 d,#26362d,
-|3: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|4: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-3 #e5eee5,#0d1410, 4-7 #f5f7ee,#405d4b, 8-139 #e5eee5,#0d1410,
-|5: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|6: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|7: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|8: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|9: 0-0 d,#637f6a, 1-139 d,#0d1410,
-|10: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|11: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|12: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|13: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|14: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|15: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|16: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|17: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|18: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|19: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|20: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|21: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|22: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|23: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|24: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|25: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|26: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
-|27: 0-1 #ffffff,#4c6356, 2-59 #b2c3b8,#1d2824, 60-139 d,#1d2824,
-|28: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-15 #59675c,#0d1410, 16-18 #e5eee5,#0d1410, 19-22 #f7e4a5,#57472a, 23-24 #e5eee5,#0d1410, 25-139 d,#0d1410,
-|29: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-15 #59675c,#0d1410, 16-18 #e5eee5,#0d1410, 19-22 #f7e4a5,#57472a, 23-24 #e5eee5,#0d1410, 25-139 d,#0d1410,
-|30: 0-0 d,#152019, 1-1 d,#0d1410, 2-15 #59675c,#0d1410, 16-18 #e5eee5,#0d1410, 19-22 #f7e4a5,#57472a, 23-24 #e5eee5,#0d1410, 25-139 d,#0d1410,
+|1: 0-1 #ffffff,#887455, 2-2 d,#26362d, 3-34 #becfc4,#26362d, 35-139 d,#26362d,
+|2: 0-1 #000000,#add38a, 2-2 d,#26362d, 3-31 #becfc4,#26362d, 32-34 #dfbce5,#26362d, 35-64 #becfc4,#26362d, 65-139 d,#26362d,
+|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-3 #e5eee5,#0d1410, 4-7 #f5f7ee,#3c614a, 8-139 #e5eee5,#0d1410,
+|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|6: 0-0 d,#608269, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|7: 0-0 d,#608269, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|8: 0-0 d,#608269, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|9: 0-0 d,#608269, 1-139 d,#0d1410,
+|10: 0-0 d,#608269, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|11: 0-0 d,#608269, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|12: 0-0 d,#608269, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|13: 0-0 d,#608269, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|14: 0-1 #ffffff,#496656, 2-2 d,#1d2824, 3-31 #b2c3b8,#1d2824, 32-38 #d3b0d9,#1d2824, 39-76 #b2c3b8,#1d2824, 77-139 d,#1d2824,
+|15: 0-0 d,#152019, 1-1 d,#0d1410, 2-135 d,#1d2824, 136-139 #b2c3b8,#1d2824,
+|16: 0-0 d,#608269, 1-1 d,#0d1410, 2-15 #59675c,#0d1410, 16-139 d,#0d1410,
+|17: 0-0 d,#608269, 1-1 d,#0d1410, 2-6 #59675c,#0d1410, 7-8 #e5eee5,#0d1410, 9-12 #f7e4a5,#5e4923, 13-14 #e5eee5,#0d1410, 15-139 d,#0d1410,
+|18: 0-0 d,#608269, 1-1 d,#0d1410, 2-15 #59675c,#0d1410, 16-139 d,#0d1410,
+|19: 0-0 d,#608269, 1-1 d,#0d1410, 2-6 #59675c,#0d1410, 7-8 #e5eee5,#0d1410, 9-12 #f7e4a5,#5e4923, 13-14 #e5eee5,#0d1410, 15-139 d,#0d1410,
+|20: 0-0 d,#152019, 1-1 d,#0d1410, 2-15 #59675c,#0d1410, 16-139 d,#0d1410,
+|21: 0-1 #ffffff,#496656, 2-2 d,#1d2824, 3-3 #b2c3b8,#1d2824, 4-7 #d3b0d9,#1d2824, 8-29 #b2c3b8,#1d2824, 30-139 d,#1d2824,
+|22: 0-0 d,#608269, 1-1 d,#0d1410, 2-6 #59675c,#0d1410, 7-139 d,#0d1410,
+|23: 0-0 d,#608269, 1-1 d,#0d1410, 2-6 #59675c,#0d1410, 7-139 d,#0d1410,
+|24: 0-0 d,#608269, 1-1 d,#0d1410, 2-6 #59675c,#0d1410, 7-139 d,#0d1410,
+|25: 0-0 d,#608269, 1-1 d,#0d1410, 2-6 #59675c,#0d1410, 7-139 d,#0d1410,
+|26: 0-0 d,#608269, 1-1 d,#0d1410, 2-6 #59675c,#0d1410, 7-139 d,#0d1410,
+|27: 0-0 d,#608269, 1-1 d,#0d1410, 2-6 #59675c,#0d1410, 7-139 d,#0d1410,
+|28: 0-0 d,#608269, 1-1 d,#0d1410, 2-6 #59675c,#0d1410, 7-139 d,#0d1410,
+|29: 0-0 d,#608269, 1-1 d,#0d1410, 2-6 #59675c,#0d1410, 7-139 d,#0d1410,
+|30: 0-0 d,#608269, 1-1 d,#0d1410, 2-6 #59675c,#0d1410, 7-139 d,#0d1410,
 == snap second grid=140x31 cursor=7,6
 == snap back grid=140x31 cursor=7,4
-== snap nomatch grid=140x31 cursor=7,29
-|25:   /tmp/pardes-snap/psearch/cwd/+Search Save Tty Del Collapse
-|26:      1
-== snap ttyinert grid=140x31 cursor=4,9
-|2: $ /tmp/pardes-snap/psearch/cwd Save Tty Del Togglettymode Filter Collapse
-|3:   $ printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
-|9:   $
-== snap rightsearch grid=140x31 cursor=7,6
-|2:   /tmp/pardes-snap/psearch/cwd Save Tty Del Togglettymode Filter Collapse
-|3:   printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
-|9:
+== snap nomatch grid=140x31 cursor=7,17
+|12:    /tmp/pardes-snap/psearch/cwd/+Search Save Tty Collapse Del LocationsConfig
+|13:      1
+|15:      1 @p0:2:3-6
+|16:      2 x MARK a
+|17:      3 @p0:4:3-6
+|18:      4 x MARK b
+|19:      5 @p0:6:3-6
+|20:      6 x MARK c
+== snap ttyinert grid=140x31 cursor=4,10
+|2: $  /tmp/pardes-snap/psearch/cwd Tty Save Mode Filter Collapse Del
+|3:                                                                                                                                         Look
+|4:   $ printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
+|5:   x MARK a
+|6:   zz
+|7:   x MARK b
+|8:   zz
+|9:   x MARK c
+|10:   $
+== snap rightsearch grid=140x31 cursor=7,7
+|2:    /tmp/pardes-snap/psearch/cwd Tty Save Mode Filter Collapse Del
+|4:   printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
+|10: