From 3631f8123654a610a547c3c1b361509b63b513ba Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 26 Jun 2026 08:10:48 +0000
Subject: [PATCH 1/2] Apply better colours to various builtin bits in modes.

---
 mode-tree.c        | 254 +++++++++++++++++++++++++++++----------------
 options-table.c    |  17 ++-
 screen-write.c     |   8 +-
 tmux.1             |   8 ++
 tmux.h             |   3 +-
 window-buffer.c    |  21 ++--
 window-client.c    | 125 +++++++++++++---------
 window-customize.c |  31 ++++--
 window-tree.c      |  95 +++++++++++------
 9 files changed, 364 insertions(+), 198 deletions(-)

diff --git a/mode-tree.c b/mode-tree.c
index 149f9412b..f6e3eb75b 100644
--- a/mode-tree.c
+++ b/mode-tree.c
@@ -36,6 +36,24 @@ enum mode_tree_preview {
 	MODE_TREE_PREVIEW_BIG
 };
 
+#define MODE_TREE_PREFIX_STYLE \
+	"#{?mode_tree_selected,#[default]#[noacs]," \
+	"#[fg=themelightgrey]#[bg=default]#[noacs]}"
+
+#define MODE_TREE_PREFIX_FORMAT \
+	MODE_TREE_PREFIX_STYLE \
+	"#{p/#{mode_tree_key_width}:" \
+	"#{?#{!=:#{mode_tree_key},},(#{mode_tree_key}),}}" \
+	"#{R:#{?mode_tree_parent_last,    ," \
+	"#[acs]x" MODE_TREE_PREFIX_STYLE "   }," \
+	"#{mode_tree_repeat}}" \
+	"#{?mode_tree_branch," \
+	"#[acs]#{?mode_tree_last,mq,tq}" MODE_TREE_PREFIX_STYLE "> ,}" \
+	"#{?mode_tree_has_children," \
+	"#{?mode_tree_expanded,#[fg=themered]-" MODE_TREE_PREFIX_STYLE " ," \
+	"#[fg=themegreen]+" MODE_TREE_PREFIX_STYLE " }," \
+	"#{?mode_tree_flat,,  }}"
+
 struct mode_tree_item;
 struct mode_tree_prompt;
 TAILQ_HEAD(mode_tree_list, mode_tree_item);
@@ -159,31 +177,53 @@ static const struct menu_item mode_tree_menu_items[] = {
 };
 
 static const char* mode_tree_help_start[] = {
-	"#[bold]      Up, k #[default]#[acs]x#[default] Move cursor up",
-	"#[bold]    Down, j #[default]#[acs]x#[default] Move cursor down",
-	"#[bold]          g #[default]#[acs]x#[default] Go to top",
-	"#[bold]          G #[default]#[acs]x#[default] Go to bottom",
-	"#[bold] PPage, C-b #[default]#[acs]x#[default] Page up",
-	"#[bold] NPage, C-f #[default]#[acs]x#[default] Page down",
-	"#[bold]    Left, h #[default]#[acs]x#[default] Collapse %1",
-	"#[bold]   Right, l #[default]#[acs]x#[default] Expand %1",
-	"#[bold]        M-- #[default]#[acs]x#[default] Collapse all %1s",
-	"#[bold]        M-+ #[default]#[acs]x#[default] Expand all %1s",
-	"#[bold]          t #[default]#[acs]x#[default] Toggle %1 tag",
-	"#[bold]          T #[default]#[acs]x#[default] Untag all %1s",
-	"#[bold]        C-t #[default]#[acs]x#[default] Tag all %1s",
-	"#[bold]        C-s #[default]#[acs]x#[default] Search forward",
-	"#[bold]        C-r #[default]#[acs]x#[default] Search backward",
-	"#[bold]          n #[default]#[acs]x#[default] Repeat search forward",
-	"#[bold]          N #[default]#[acs]x#[default] Repeat search backward",
-	"#[bold]          f #[default]#[acs]x#[default] Filter %1s",
-	"#[bold]          O #[default]#[acs]x#[default] Change sort order",
-	"#[bold]          r #[default]#[acs]x#[default] Reverse sort order",
-	"#[bold]          v #[default]#[acs]x#[default] Toggle preview",
+	"#[fg=themelightgrey]"
+	"      Up, k #[#{E:tree-mode-border-style},acs]x#[default] Move cursor up",
+	"#[fg=themelightgrey]"
+	"    Down, j #[#{E:tree-mode-border-style},acs]x#[default] Move cursor down",
+	"#[fg=themelightgrey]"
+	"          g #[#{E:tree-mode-border-style},acs]x#[default] Go to top",
+	"#[fg=themelightgrey]"
+	"          G #[#{E:tree-mode-border-style},acs]x#[default] Go to bottom",
+	"#[fg=themelightgrey]"
+	" PPage, C-b #[#{E:tree-mode-border-style},acs]x#[default] Page up",
+	"#[fg=themelightgrey]"
+	" NPage, C-f #[#{E:tree-mode-border-style},acs]x#[default] Page down",
+	"#[fg=themelightgrey]"
+	"    Left, h #[#{E:tree-mode-border-style},acs]x#[default] Collapse %1",
+	"#[fg=themelightgrey]"
+	"   Right, l #[#{E:tree-mode-border-style},acs]x#[default] Expand %1",
+	"#[fg=themelightgrey]"
+	"        M-- #[#{E:tree-mode-border-style},acs]x#[default] Collapse all %1s",
+	"#[fg=themelightgrey]"
+	"        M-+ #[#{E:tree-mode-border-style},acs]x#[default] Expand all %1s",
+	"#[fg=themelightgrey]"
+	"          t #[#{E:tree-mode-border-style},acs]x#[default] Toggle %1 tag",
+	"#[fg=themelightgrey]"
+	"          T #[#{E:tree-mode-border-style},acs]x#[default] Untag all %1s",
+	"#[fg=themelightgrey]"
+	"        C-t #[#{E:tree-mode-border-style},acs]x#[default] Tag all %1s",
+	"#[fg=themelightgrey]"
+	"        C-s #[#{E:tree-mode-border-style},acs]x#[default] Search forward",
+	"#[fg=themelightgrey]"
+	"        C-r #[#{E:tree-mode-border-style},acs]x#[default] Search backward",
+	"#[fg=themelightgrey]"
+	"          n #[#{E:tree-mode-border-style},acs]x#[default] Repeat search forward",
+	"#[fg=themelightgrey]"
+	"          N #[#{E:tree-mode-border-style},acs]x#[default] Repeat search backward",
+	"#[fg=themelightgrey]"
+	"          f #[#{E:tree-mode-border-style},acs]x#[default] Filter %1s",
+	"#[fg=themelightgrey]"
+	"          O #[#{E:tree-mode-border-style},acs]x#[default] Change sort order",
+	"#[fg=themelightgrey]"
+	"          r #[#{E:tree-mode-border-style},acs]x#[default] Reverse sort order",
+	"#[fg=themelightgrey]"
+	"          v #[#{E:tree-mode-border-style},acs]x#[default] Toggle preview",
 	NULL
 };
 static const char* mode_tree_help_end[] = {
-	"#[bold]  q, Escape #[default]#[acs]x#[default] Exit mode",
+	"#[fg=themelightgrey]"
+	"  q, Escape #[#{E:tree-mode-border-style},acs]x#[default] Exit mode",
 	NULL
 };
 #define MODE_TREE_HELP_DEFAULT_WIDTH 39
@@ -784,12 +824,14 @@ mode_tree_draw(struct mode_tree_data *mtd)
 	struct mode_tree_item	*mti;
 	struct options		*oo = wp->window->options;
 	struct screen_write_ctx	 ctx;
-	struct grid_cell	 gc0, gc;
-	u_int			 w, h, i, j, sy, box_x, box_y, width;
-	char			*text, *start, *key;
-	const char		*tag, *symbol;
-	size_t			 size, n;
-	int			 keylen, pad, alignlen[mtd->maxdepth + 1];
+	struct format_tree	*ft;
+	struct grid_cell	 gc0, gc, box_gc;
+	u_int			 w, h, i, sy, box_x, box_y;
+	u_int			 width, text_width, prefix_width, left;
+	char			*text, *prefix;
+	const char		*tag, *separator;
+	size_t			 n;
+	int			 keylen, alignlen[mtd->maxdepth + 1];
 
 	if (mtd->line_size == 0)
 		return;
@@ -797,12 +839,15 @@ mode_tree_draw(struct mode_tree_data *mtd)
 	memcpy(&gc0, &grid_default_cell, sizeof gc0);
 	memcpy(&gc, &grid_default_cell, sizeof gc);
 	style_apply(&gc, oo, "mode-style", NULL);
+	memcpy(&box_gc, &grid_default_cell, sizeof box_gc);
+	style_apply(&box_gc, oo, "tree-mode-border-style", NULL);
 
 	w = mtd->width;
 	h = mtd->height;
 
 	screen_write_start(&ctx, s);
 	screen_write_clearscreen(&ctx, 8);
+	ft = format_create_defaults(NULL, NULL, NULL, NULL, wp);
 
 	keylen = 0;
 	for (i = 0; i < mtd->line_size; i++) {
@@ -833,52 +878,53 @@ mode_tree_draw(struct mode_tree_data *mtd)
 
 		screen_write_cursormove(&ctx, 0, i - mtd->offset, 0);
 
-		pad = keylen - 2 - mti->keylen;
 		if (mti->key != KEYC_NONE)
-			xasprintf(&key, "(%s)%*s", mti->keystr, pad, "");
+			format_add(ft, "mode_tree_key", "%s", mti->keystr);
 		else
-			key = xstrdup("");
-
-		if (line->flat)
-			symbol = "";
-		else if (TAILQ_EMPTY(&mti->children))
-			symbol = "  ";
-		else if (mti->expanded)
-			symbol = "- ";
-		else
-			symbol = "+ ";
-
-		if (line->depth == 0)
-			start = xstrdup(symbol);
-		else {
-			size = (4 * line->depth) + 32;
-
-			start = xcalloc(1, size);
-			for (j = 1; j < line->depth; j++) {
-				if (mti->parent != NULL &&
-				    mtd->line_list[mti->parent->line].last)
-					strlcat(start, "    ", size);
-				else
-					strlcat(start, "\001x\001   ", size);
-			}
-			if (line->last)
-				strlcat(start, "\001mq\001> ", size);
+			format_add(ft, "mode_tree_key", "%s", "");
+		format_add(ft, "mode_tree_key_width", "%d", keylen);
+		format_add(ft, "mode_tree_selected", "%d", i == mtd->current);
+		if (line->depth == 0) {
+			format_add(ft, "mode_tree_repeat", "%u", 0);
+			format_add(ft, "mode_tree_branch", "0");
+			format_add(ft, "mode_tree_parent_last", "0");
+		} else {
+			format_add(ft, "mode_tree_repeat", "%u",
+			    line->depth - 1);
+			format_add(ft, "mode_tree_branch", "1");
+			if (mti->parent != NULL &&
+			    mtd->line_list[mti->parent->line].last)
+				format_add(ft, "mode_tree_parent_last", "1");
 			else
-				strlcat(start, "\001tq\001> ", size);
-			strlcat(start, symbol, size);
+				format_add(ft, "mode_tree_parent_last", "0");
 		}
+		if (TAILQ_EMPTY(&mti->children))
+			format_add(ft, "mode_tree_has_children", "0");
+		else
+			format_add(ft, "mode_tree_has_children", "1");
+		format_add(ft, "mode_tree_last", "%d", line->last);
+		format_add(ft, "mode_tree_expanded", "%d", mti->expanded);
+		format_add(ft, "mode_tree_flat", "%d", line->flat);
+		prefix = format_expand(ft, MODE_TREE_PREFIX_FORMAT);
+		prefix_width = format_width(prefix);
+		if (prefix_width > w)
+			prefix_width = w;
 
 		if (mti->tagged)
 			tag = "*";
 		else
 			tag = "";
-		xasprintf(&text, "%-*s%s%*s%s%s", keylen, key, start,
-		    mti->align * alignlen[line->depth], mti->name, tag,
-		    (mti->text != NULL) ? ": " : "" );
-		width = utf8_cstrwidth(text);
-		if (width > w)
-			width = w;
-		free(start);
+		if (mti->text != NULL)
+			separator = "#[fg=themelightgrey]: #[default]";
+		else
+			separator = "";
+		xasprintf(&text, "%*s%s%s",
+		    mti->align * alignlen[line->depth], mti->name, tag, separator);
+		text_width = format_width(text);
+		left = (prefix_width < w) ? (w - prefix_width) : 0;
+		if (text_width > left)
+			text_width = left;
+		width = prefix_width + text_width;
 
 		if (mti->tagged) {
 			gc.attr ^= GRID_ATTR_BRIGHT;
@@ -887,27 +933,43 @@ mode_tree_draw(struct mode_tree_data *mtd)
 
 		if (i != mtd->current) {
 			screen_write_clearendofline(&ctx, 8);
-			screen_write_nputs(&ctx, w, &gc0, "%s", text);
-			if (mti->text != NULL) {
-				format_draw(&ctx, &gc0, w - width, mti->text,
-				    NULL, 0);
+			format_draw(&ctx, &grid_default_cell, prefix_width,
+			    prefix, NULL, 0);
+			if (left != 0) {
+				screen_write_cursormove(&ctx, prefix_width,
+				    i - mtd->offset, 0);
+				format_draw(&ctx, &gc0, left, text, NULL, 0);
+				if (mti->text != NULL && width < w) {
+					screen_write_cursormove(&ctx, width,
+					    i - mtd->offset, 0);
+					format_draw(&ctx, &gc0, w - width,
+					    mti->text, NULL, 0);
+				}
 			}
 		} else {
 			screen_write_clearendofline(&ctx, gc.bg);
-			screen_write_nputs(&ctx, w, &gc, "%s", text);
-			if (mti->text != NULL) {
-				format_draw(&ctx, &gc, w - width, mti->text,
-				    NULL, 0);
+			format_draw(&ctx, &gc, prefix_width, prefix, NULL, 0);
+			if (left != 0) {
+				screen_write_cursormove(&ctx, prefix_width,
+				    i - mtd->offset, 0);
+				format_draw(&ctx, &gc, left, text, NULL, 0);
+				if (mti->text != NULL && width < w) {
+					screen_write_cursormove(&ctx, width,
+					    i - mtd->offset, 0);
+					format_draw(&ctx, &gc, w - width,
+					    mti->text, NULL, 0);
+				}
 			}
 		}
 		free(text);
-		free(key);
+		free(prefix);
 
 		if (mti->tagged) {
 			gc.attr ^= GRID_ATTR_BRIGHT;
 			gc0.attr ^= GRID_ATTR_BRIGHT;
 		}
 	}
+	format_free(ft);
 
 	if (mtd->preview == MODE_TREE_PREVIEW_OFF)
 		goto done;
@@ -922,7 +984,7 @@ mode_tree_draw(struct mode_tree_data *mtd)
 		mti = mti->parent;
 
 	screen_write_cursormove(&ctx, 0, h, 0);
-	screen_write_box(&ctx, w, sy - h, BOX_LINES_DEFAULT, NULL, NULL);
+	screen_write_box(&ctx, w, sy - h, BOX_LINES_DEFAULT, &box_gc, NULL);
 
 	if (mtd->sort_crit.order_seq != NULL) {
 		xasprintf(&text, " %s (sort: %s%s)%s%s%s", mti->name,
@@ -935,21 +997,21 @@ mode_tree_draw(struct mode_tree_data *mtd)
 		xasprintf(&text, " %s", mti->name);
 	if (w - 2 >= strlen(text)) {
 		screen_write_cursormove(&ctx, 1, h, 0);
-		screen_write_puts(&ctx, &gc0, "%s", text);
+		screen_write_puts(&ctx, &box_gc, "%s", text);
 
 		if (mtd->no_matches)
 			n = (sizeof "no matches") - 1;
 		else
 			n = (sizeof "active") - 1;
 		if (mtd->filter != NULL && w - 2 >= strlen(text) + 10 + n + 2) {
-			screen_write_puts(&ctx, &gc0, " (filter: ");
+			screen_write_puts(&ctx, &box_gc, " (filter: ");
 			if (mtd->no_matches)
-				screen_write_puts(&ctx, &gc, "no matches");
+				screen_write_puts(&ctx, &box_gc, "no matches");
 			else
-				screen_write_puts(&ctx, &gc0, "active");
-			screen_write_puts(&ctx, &gc0, ") ");
+				screen_write_puts(&ctx, &box_gc, "active");
+			screen_write_puts(&ctx, &box_gc, ") ");
 		} else
-			screen_write_puts(&ctx, &gc0, " ");
+			screen_write_puts(&ctx, &box_gc, " ");
 	}
 	free(text);
 
@@ -1353,12 +1415,14 @@ mode_tree_display_menu(struct mode_tree_data *mtd, struct client *c, u_int x,
 
 static void
 mode_tree_draw_help_line(struct screen_write_ctx *ctx,
-    const struct grid_cell *gc, const char *line, const char *item, u_int x,
-    u_int y, u_int w)
+    const struct grid_cell *gc, struct format_tree *ft, const char *line,
+    const char *item, u_int x, u_int y, u_int w)
 {
-	char	*expanded;
+	char	*expanded, *replaced;
 
-	expanded = cmd_template_replace(line, item, 1);
+	replaced = cmd_template_replace(line, item, 1);
+	expanded = format_expand(ft, replaced);
+	free(replaced);
 	screen_write_cursormove(ctx, x, y, 0);
 	screen_write_clearcharacter(ctx, w, gc->bg);
 	screen_write_cursormove(ctx, x, y, 0);
@@ -1370,7 +1434,9 @@ static void
 mode_tree_draw_help(struct mode_tree_data *mtd, struct screen_write_ctx *ctx)
 {
 	struct screen		 *s = &mtd->screen;
-	struct grid_cell	  gc;
+	struct options		 *oo = mtd->wp->window->options;
+	struct grid_cell	  box_gc, gc;
+	struct format_tree	 *ft;
 	const char		**line, **lines = NULL, *item = "item";
 	u_int			  sx = screen_size_x(s), sy = screen_size_y(s);
 	u_int			  x, y, w, h = 0, box_w, box_h;
@@ -1396,18 +1462,22 @@ mode_tree_draw_help(struct mode_tree_data *mtd, struct screen_write_ctx *ctx)
 	x = (sx - box_w) / 2;
 	y = (sy - box_h) / 2;
 
+	memcpy(&box_gc, &grid_default_cell, sizeof box_gc);
+	style_apply(&box_gc, oo, "tree-mode-border-style", NULL);
 	memcpy(&gc, &grid_default_cell, sizeof gc);
+	ft = format_create_defaults(NULL, NULL, NULL, NULL, mtd->wp);
 	screen_write_cursormove(ctx, x, y, 0);
-	screen_write_box(ctx, box_w, box_h, BOX_LINES_DEFAULT, &gc, NULL);
+	screen_write_box(ctx, box_w, box_h, BOX_LINES_DEFAULT, &box_gc, NULL);
 
 	y++;
 	x++;
 	for (line = mode_tree_help_start; *line != NULL; line++, y++)
-		mode_tree_draw_help_line(ctx, &gc, *line, item, x, y, w);
+		mode_tree_draw_help_line(ctx, &gc, ft, *line, item, x, y, w);
 	for (line = lines; line != NULL && *line != NULL; line++, y++)
-		mode_tree_draw_help_line(ctx, &gc, *line, item, x, y, w);
+		mode_tree_draw_help_line(ctx, &gc, ft, *line, item, x, y, w);
 	for (line = mode_tree_help_end; *line != NULL; line++, y++)
-		mode_tree_draw_help_line(ctx, &gc, *line, item, x, y, w);
+		mode_tree_draw_help_line(ctx, &gc, ft, *line, item, x, y, w);
+	format_free(ft);
 }
 
 static void
@@ -1488,6 +1558,10 @@ mode_tree_key(struct mode_tree_data *mtd, struct client *c, key_code *key,
 			*key = KEYC_NONE;
 			return (0);
 		}
+		if (*key == KEYC_FOCUS_IN || *key == KEYC_FOCUS_OUT) {
+			*key = KEYC_NONE;
+			return (0);
+		}
 		mtd->help = 0;
 		mode_tree_draw(mtd);
 		*key = KEYC_NONE;
diff --git a/options-table.c b/options-table.c
index 40e3a7162..d47bd03ca 100644
--- a/options-table.c
+++ b/options-table.c
@@ -594,7 +594,7 @@ const struct options_table_entry options_table[] = {
 	  .type = OPTIONS_TABLE_STRING,
 	  .scope = OPTIONS_TABLE_SERVER,
 	  .flags = OPTIONS_TABLE_IS_COLOUR,
-	  .default_str = "#{?#{e|>=:#{client_colours},256},darkkhaki,yellow}",
+	  .default_str = "#{?#{e|>=:#{client_colours},256},darkgoldenrod,yellow}",
 	  .text = "Dark theme colour for yellow."
 	},
 
@@ -1504,8 +1504,8 @@ const struct options_table_entry options_table[] = {
 	  .type = OPTIONS_TABLE_STRING,
 	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
 	  .default_str = "fg=#{?pane_marked,thememagenta,"
-	                 "#{?synchronize-panes,themered,"
-	                 "#{?pane_in_mode,themeyellow,themegreen}}}",
+			 "#{?synchronize-panes,themered,"
+			 "#{?pane_in_mode,themeyellow,themegreen}}}",
 	  .flags = OPTIONS_TABLE_IS_STYLE,
 	  .separator = ",",
 	  .text = "Style of the active pane border."
@@ -1615,7 +1615,7 @@ const struct options_table_entry options_table[] = {
 	{ .name = "popup-border-style",
 	  .type = OPTIONS_TABLE_STRING,
 	  .scope = OPTIONS_TABLE_WINDOW,
-	  .default_str = "fg=themelightgrey",
+	  .default_str = "bg=themedarkgrey,fg=themelightgrey",
 	  .flags = OPTIONS_TABLE_IS_STYLE,
 	  .separator = ",",
 	  .text = "Default style of popup borders."
@@ -1678,6 +1678,15 @@ const struct options_table_entry options_table[] = {
 		  "A value of 0 means no limit."
 	},
 
+	{ .name = "tree-mode-border-style",
+	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_WINDOW,
+	  .default_str = "bg=themedarkgrey,fg=themelightgrey",
+	  .flags = OPTIONS_TABLE_IS_STYLE,
+	  .separator = ",",
+	  .text = "Style of borders in tree mode."
+	},
+
 	{ .name = "tree-mode-preview-format",
 	  .type = OPTIONS_TABLE_STRING,
 	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
diff --git a/screen-write.c b/screen-write.c
index f00619f3f..45d126a6f 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -749,7 +749,8 @@ screen_write_hline(struct screen_write_ctx *ctx, u_int nx, int left, int right,
 
 /* Draw a vertical line on screen. */
 void
-screen_write_vline(struct screen_write_ctx *ctx, u_int ny, int top, int bottom)
+screen_write_vline(struct screen_write_ctx *ctx, u_int ny, int top, int bottom,
+    const struct grid_cell *gcp)
 {
 	struct screen		*s = ctx->s;
 	struct grid_cell	 gc;
@@ -758,7 +759,10 @@ screen_write_vline(struct screen_write_ctx *ctx, u_int ny, int top, int bottom)
 	cx = s->cx;
 	cy = s->cy;
 
-	memcpy(&gc, &grid_default_cell, sizeof gc);
+	if (gcp != NULL)
+		memcpy(&gc, gcp, sizeof gc);
+	else
+		memcpy(&gc, &grid_default_cell, sizeof gc);
 	gc.attr |= GRID_ATTR_CHARSET;
 
 	screen_write_putc(ctx, &gc, top ? 'w' : 'x');
diff --git a/tmux.1 b/tmux.1
index fe5265e50..27c5e6924 100644
--- a/tmux.1
+++ b/tmux.1
@@ -5851,6 +5851,14 @@ A value of 0 (the default) means no limit.
 When a limit is set, panes are arranged to not exceed this number of columns,
 with additional panes stacked in extra rows.
 .Pp
+.It Ic tree\-mode\-border\-style Ar style
+Set the style of borders in tree mode.
+For how to specify
+.Ar style ,
+see the
+.Sx STYLES
+section.
+.Pp
 .It Ic tree\-mode\-preview\-format Ar format
 Format of the preview indicator in tree mode.
 .Pp
diff --git a/tmux.h b/tmux.h
index 3ebf8ce70..c6b4c6469 100644
--- a/tmux.h
+++ b/tmux.h
@@ -3367,7 +3367,8 @@ void	 screen_write_fast_copy(struct screen_write_ctx *, struct screen *,
 	     u_int, u_int, u_int, u_int);
 void	 screen_write_hline(struct screen_write_ctx *, u_int, int, int,
 	     enum box_lines, const struct grid_cell *);
-void	 screen_write_vline(struct screen_write_ctx *, u_int, int, int);
+void	 screen_write_vline(struct screen_write_ctx *, u_int, int, int,
+	     const struct grid_cell *);
 void	 screen_write_menu(struct screen_write_ctx *, struct menu *, int,
 	     enum box_lines, const struct grid_cell *, const struct grid_cell *,
 	     const struct grid_cell *);
diff --git a/window-buffer.c b/window-buffer.c
index 5c0424c2e..6798e2027 100644
--- a/window-buffer.c
+++ b/window-buffer.c
@@ -336,13 +336,20 @@ window_buffer_sort(struct sort_criteria *sort_crit)
 }
 
 static const char* window_buffer_help_lines[] = {
-	"#[bold]      Enter #[default]#[acs]x#[default] Paste selected %1",
-	"#[bold]          p #[default]#[acs]x#[default] Paste selected %1",
-	"#[bold]          P #[default]#[acs]x#[default] Paste tagged %1s",
-	"#[bold]          d #[default]#[acs]x#[default] Delete selected %1",
-	"#[bold]          D #[default]#[acs]x#[default] Delete tagged %1s",
-	"#[bold]          e #[default]#[acs]x#[default] Open %1 in editor",
-	"#[bold]          f #[default]#[acs]x#[default] Enter a filter",
+	"#[fg=themelightgrey]"
+	"      Enter #[#{E:tree-mode-border-style},acs]x#[default] Paste selected %1",
+	"#[fg=themelightgrey]"
+	"          p #[#{E:tree-mode-border-style},acs]x#[default] Paste selected %1",
+	"#[fg=themelightgrey]"
+	"          P #[#{E:tree-mode-border-style},acs]x#[default] Paste tagged %1s",
+	"#[fg=themelightgrey]"
+	"          d #[#{E:tree-mode-border-style},acs]x#[default] Delete selected %1",
+	"#[fg=themelightgrey]"
+	"          D #[#{E:tree-mode-border-style},acs]x#[default] Delete tagged %1s",
+	"#[fg=themelightgrey]"
+	"          e #[#{E:tree-mode-border-style},acs]x#[default] Open %1 in editor",
+	"#[fg=themelightgrey]"
+	"          f #[#{E:tree-mode-border-style},acs]x#[default] Enter a filter",
 	NULL
 };
 
diff --git a/window-client.c b/window-client.c
index bf7bbf173..85d12d743 100644
--- a/window-client.c
+++ b/window-client.c
@@ -49,87 +49,91 @@ static void		 window_client_key(struct window_mode_entry *,
 
 #define WINDOW_CLIENT_FEATURE(f) \
 	"#{?#{I/f:" #f "}," \
-	"#[fg=green],#[dim]}#{p/15:#{l:" #f "}}" \
+	"#[fg=themegreen],#[fg=themelightgrey]}#{p/15:#{l:" #f "}}" \
 	"#[default]"
 static const char *window_client_info_lines[] = {
-	"Client Name   #[acs]x#[default] "
+	"Client Name   #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{client_name} "
-	"#[dim](PID #{client_pid})#[default]",
-	"Session       #[acs]x#[default] "
+	"#[fg=themelightgrey](PID #{client_pid})#[default]",
+	"Session       #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{session_name}",
-	"Attach Time   #[acs]x#[default] "
+	"Attach Time   #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{t:client_created} "
-	"#[dim](#{t/r:client_created})#[default]",
-	"Activity Time #[acs]x#[default] "
+	"#[fg=themelightgrey](#{t/r:client_created})#[default]",
+	"Activity Time #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{t:client_activity} "
-	"#[dim](#{t/r:client_activity})#[default]",
-	"Terminal Type #[acs]x#[default] "
+	"#[fg=themelightgrey](#{t/r:client_activity})#[default]",
+	"Terminal Type #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{?client_termtype,#{client_termtype},Unknown}",
-	"TERM          #[acs]x#[default] "
+	"TERM          #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{client_termname}",
-	"Size          #[acs]x#[default] "
+	"Size          #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{client_width}x#{client_height} "
-	"#[dim](cell #{client_cell_width}x#{client_cell_height})#[default]",
-	"Bytes Written #[acs]x#[default] "
+	"#[fg=themelightgrey](cell #{client_cell_width}x"
+	"#{client_cell_height})#[default]",
+	"Bytes Written #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{client_written} "
-	"#[dim](#{client_discarded} discarded)#[default]",
+	"#[fg=themelightgrey](#{client_discarded} discarded)#[default]",
 
-	"Features      #[acs]x#[default] "
+	"Features      #[#{E:tree-mode-border-style},acs]x#[default] "
 	WINDOW_CLIENT_FEATURE(256) " "
 	WINDOW_CLIENT_FEATURE(RGB) " "
 	WINDOW_CLIENT_FEATURE(bpaste) " "
 	WINDOW_CLIENT_FEATURE(ccolour),
-	"              #[acs]x#[default] "
+	"              #[#{E:tree-mode-border-style},acs]x#[default] "
 	WINDOW_CLIENT_FEATURE(clipboard) " "
 	WINDOW_CLIENT_FEATURE(cstyle) " "
 	WINDOW_CLIENT_FEATURE(extkeys) " "
 	WINDOW_CLIENT_FEATURE(focus),
-	"              #[acs]x#[default] "
+	"              #[#{E:tree-mode-border-style},acs]x#[default] "
 	WINDOW_CLIENT_FEATURE(hyperlinks) " "
 	WINDOW_CLIENT_FEATURE(ignorefkeys) " "
 	WINDOW_CLIENT_FEATURE(margins) " "
 	WINDOW_CLIENT_FEATURE(mouse),
-	"              #[acs]x#[default] "
+	"              #[#{E:tree-mode-border-style},acs]x#[default] "
 	WINDOW_CLIENT_FEATURE(osc7) " "
 	WINDOW_CLIENT_FEATURE(overline) " "
 	WINDOW_CLIENT_FEATURE(progressbar) " "
 	WINDOW_CLIENT_FEATURE(rectfill),
-	"              #[acs]x#[default] "
+	"              #[#{E:tree-mode-border-style},acs]x#[default] "
 	WINDOW_CLIENT_FEATURE(sixel) " "
 	WINDOW_CLIENT_FEATURE(strikethrough) " "
 	WINDOW_CLIENT_FEATURE(sync) " "
 	WINDOW_CLIENT_FEATURE(title),
-	"              #[acs]x#[default] "
+	"              #[#{E:tree-mode-border-style},acs]x#[default] "
 	WINDOW_CLIENT_FEATURE(usstyle),
-	"#[acs]qqqqqqqqqqqqqqn#{R:q,#{window_width}}#[default]",
+	"#[#{E:tree-mode-border-style},acs]qqqqqqqqqqqqqqn#{R:q,#{window_width}}#[default]",
 
-	"prefix        #[acs]x#[default] "
+	"prefix        #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{prefix}",
 
-	"mouse         #[acs]x#[default] "
-	"#{?mouse,#{?#{I/c:kmous},,#[fg=red]}on,#[dim]off} "
+	"mouse         #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#{?mouse,#{?#{I/c:kmous},,#[fg=themered]}on,#[fg=themelightgrey]off} "
 	"#{?#{I/c:kmous},,#[align=right]unavailable: [kmous] missing}",
 
-	"set-clipboard #[acs]x#[default] "
-	"#{?#{!=:#{set-clipboard},off},#{?#{I/f:clipboard},,#[fg=red]}#{set-clipboard},#[dim]off} "
+	"set-clipboard #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#{?#{!=:#{set-clipboard},off},#{?#{I/f:clipboard},,"
+	"#[fg=themered]}#{set-clipboard},#[fg=themelightgrey]off} "
 	"#{?#{I/f:clipboard},,#[align=right]unavailable: [Ms] missing}",
 
-	"get-clipboard #[acs]x#[default] "
-	"#{?#{!=:#{get-clipboard},off},#{?#{I/f:clipboard},,#[fg=red]}#{get-clipboard},#[dim]off} "
+	"get-clipboard #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#{?#{!=:#{get-clipboard},off},#{?#{I/f:clipboard},,"
+	"#[fg=themered]}#{get-clipboard},#[fg=themelightgrey]off} "
 	"#{?#{I/f:clipboard},,#[align=right]unavailable: [Ms] missing}",
 
-	"focus-events  #[acs]x#[default] "
-	"#{?focus-events,#{?#{I/f:focus},,#[fg=red]}on,#[dim]off} "
+	"focus-events  #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#{?focus-events,#{?#{I/f:focus},,#[fg=themered]}on,#[fg=themelightgrey]off} "
 	"#{?#{I/f:focus},,#[align=right]unavailable: [Enfcs] or [Dcfcs] missing}",
 
-	"extended-keys #[acs]x#[default] "
-	"#{?#{!=:#{extended-keys},off},#{?#{I/f:extkeys},,#[fg=red]}#{extended-keys},#[dim]off} "
+	"extended-keys #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#{?#{!=:#{extended-keys},off},#{?#{I/f:extkeys},,"
+	"#[fg=themered]}#{extended-keys},#[fg=themelightgrey]off} "
 	"#{?#{I/f:extkeys},,#[align=right]unavailable: [Eneks] or [Dseks] missing}",
 
-	"set-titles    #[acs]x#[default] "
-	"#{?set-titles,on,#[dim]off}",
+	"set-titles    #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#{?set-titles,on,#[fg=themelightgrey]off}",
 
-	"escape-time   #[acs]x#[default] "
+	"escape-time   #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{escape-time} ms",
 };
 
@@ -258,6 +262,8 @@ window_client_draw_info(__unused void *modedata, void *itemdata,
 	struct window_client_itemdata	*item = itemdata;
 	struct client			*c = item->c;
 	struct screen			*s = ctx->s;
+	struct window			*w = c->session->curw->window;
+	struct grid_cell		 gc;
 	u_int				 cx = s->cx, cy = s->cy, i;
 	struct format_tree		*ft;
 	char				*expanded;
@@ -273,6 +279,12 @@ window_client_draw_info(__unused void *modedata, void *itemdata,
 		format_draw(ctx, &grid_default_cell, sx, expanded, NULL, 0);
 		free(expanded);
 	}
+	if (sx > 14 && i < sy) {
+		memcpy(&gc, &grid_default_cell, sizeof gc);
+		style_apply(&gc, w->options, "tree-mode-border-style", NULL);
+		screen_write_cursormove(ctx, cx + 14, cy + i, 0);
+		screen_write_vline(ctx, sy - i, 0, 0, &gc);
+	}
 
 	format_free(ft);
 }
@@ -284,20 +296,24 @@ window_client_draw(void *modedata, void *itemdata,
 	struct window_client_modedata	*data = modedata;
 	struct window_client_itemdata	*item = itemdata;
 	struct client			*c = item->c;
+	struct session			*session = c->session;
 	struct screen			*s = ctx->s;
+	struct window			*w;
 	struct window_pane		*wp;
+	struct grid_cell		 gc;
 	u_int				 cx = s->cx, cy = s->cy, lines, at;
 
-	if (c->session == NULL || (c->flags & CLIENT_UNATTACHEDFLAGS))
+	if (session == NULL || (c->flags & CLIENT_UNATTACHEDFLAGS))
 		return;
 	if (data->preview_is_info) {
 		window_client_draw_info(modedata, itemdata, ctx, sx, sy);
 		return;
 	}
-	wp = c->session->curw->window->active;
+	w = session->curw->window;
+	wp = w->active;
 	if (data->hide_preview_this_pane && wp == data->wp) {
-		if (!TAILQ_EMPTY(&c->session->curw->window->last_panes))
-			wp = TAILQ_FIRST(&c->session->curw->window->last_panes);
+		if (!TAILQ_EMPTY(&w->last_panes))
+			wp = TAILQ_FIRST(&w->last_panes);
 		else
 			wp = NULL;
 	}
@@ -318,7 +334,9 @@ window_client_draw(void *modedata, void *itemdata,
 		screen_write_cursormove(ctx, cx, cy + 2, 0);
 	else
 		screen_write_cursormove(ctx, cx, cy + sy - 1 - lines, 0);
-	screen_write_hline(ctx, sx, 0, 0, BOX_LINES_DEFAULT, NULL);
+	memcpy(&gc, &grid_default_cell, sizeof gc);
+	style_apply(&gc, w->options, "tree-mode-border-style", NULL);
+	screen_write_hline(ctx, sx, 0, 0, BOX_LINES_DEFAULT, &gc);
 
 	if (at != 0)
 		screen_write_cursormove(ctx, cx, cy, 0);
@@ -369,15 +387,24 @@ window_client_sort(struct sort_criteria *sort_crit)
 }
 
 static const char* window_client_help_lines[] = {
-	"#[bold]          i #[default]#[acs]x#[default] Toggle info view",
-	"#[bold]      Enter #[default]#[acs]x#[default] Choose selected %1",
-	"#[bold]          d #[default]#[acs]x#[default] Detach selected %1",
-	"#[bold]          D #[default]#[acs]x#[default] Detach tagged %1s",
-	"#[bold]          x #[default]#[acs]x#[default] Detach selected %1",
-	"#[bold]          X #[default]#[acs]x#[default] Detach tagged %1s",
-	"#[bold]          z #[default]#[acs]x#[default] Suspend selected %1",
-	"#[bold]          Z #[default]#[acs]x#[default] Suspend tagged %1s",
-	"#[bold]          f #[default]#[acs]x#[default] Enter a filter",
+	"#[fg=themelightgrey]"
+	"          i #[#{E:tree-mode-border-style},acs]x#[default] Toggle info view",
+	"#[fg=themelightgrey]"
+	"      Enter #[#{E:tree-mode-border-style},acs]x#[default] Choose selected %1",
+	"#[fg=themelightgrey]"
+	"          d #[#{E:tree-mode-border-style},acs]x#[default] Detach selected %1",
+	"#[fg=themelightgrey]"
+	"          D #[#{E:tree-mode-border-style},acs]x#[default] Detach tagged %1s",
+	"#[fg=themelightgrey]"
+	"          x #[#{E:tree-mode-border-style},acs]x#[default] Detach selected %1",
+	"#[fg=themelightgrey]"
+	"          X #[#{E:tree-mode-border-style},acs]x#[default] Detach tagged %1s",
+	"#[fg=themelightgrey]"
+	"          z #[#{E:tree-mode-border-style},acs]x#[default] Suspend selected %1",
+	"#[fg=themelightgrey]"
+	"          Z #[#{E:tree-mode-border-style},acs]x#[default] Suspend tagged %1s",
+	"#[fg=themelightgrey]"
+	"          f #[#{E:tree-mode-border-style},acs]x#[default] Enter a filter",
 	NULL
 };
 
diff --git a/window-customize.c b/window-customize.c
index 9796cbf0b..32caae9a3 100644
--- a/window-customize.c
+++ b/window-customize.c
@@ -36,8 +36,8 @@ static void		 window_customize_key(struct window_mode_entry *,
 #define WINDOW_CUSTOMIZE_DEFAULT_FORMAT \
 	"#{?is_option," \
 		"#{?option_is_global,,#[reverse](#{option_scope})#[default] }" \
-		"#[ignore]" \
-		"#{option_value}#{?option_unit, #{option_unit},}" \
+		"#[fg=themelightgrey]#[ignore]#{option_value}" \
+		"#{?option_unit, #{option_unit},}" \
 	"," \
 		"#{key}" \
 	"}"
@@ -881,15 +881,24 @@ window_customize_height(__unused void *modedata, __unused u_int height)
 }
 
 static const char* window_customize_help_lines[] = {
-	"#[bold]   Enter, s #[default]#[acs]x#[default] Set %1 value",
-	"#[bold]          S #[default]#[acs]x#[default] Set global %1 value",
-	"#[bold]          w #[default]#[acs]x#[default] Set window %1 value",
-	"#[bold]          d #[default]#[acs]x#[default] Set to default value",
-	"#[bold]          D #[default]#[acs]x#[default] Set tagged %1s to default value",
-	"#[bold]          u #[default]#[acs]x#[default] Unset an %1",
-	"#[bold]          U #[default]#[acs]x#[default] Unset tagged %1s",
-	"#[bold]          f #[default]#[acs]x#[default] Enter a filter",
-	"#[bold]          v #[default]#[acs]x#[default] Toggle information",
+	"#[fg=themelightgrey]"
+	"   Enter, s #[#{E:tree-mode-border-style},acs]x#[default] Set %1 value",
+	"#[fg=themelightgrey]"
+	"          S #[#{E:tree-mode-border-style},acs]x#[default] Set global %1 value",
+	"#[fg=themelightgrey]"
+	"          w #[#{E:tree-mode-border-style},acs]x#[default] Set window %1 value",
+	"#[fg=themelightgrey]"
+	"          d #[#{E:tree-mode-border-style},acs]x#[default] Set to default value",
+	"#[fg=themelightgrey]"
+	"          D #[#{E:tree-mode-border-style},acs]x#[default] Set tagged %1s to default value",
+	"#[fg=themelightgrey]"
+	"          u #[#{E:tree-mode-border-style},acs]x#[default] Unset an %1",
+	"#[fg=themelightgrey]"
+	"          U #[#{E:tree-mode-border-style},acs]x#[default] Unset tagged %1s",
+	"#[fg=themelightgrey]"
+	"          f #[#{E:tree-mode-border-style},acs]x#[default] Enter a filter",
+	"#[fg=themelightgrey]"
+	"          v #[#{E:tree-mode-border-style},acs]x#[default] Toggle information",
 	NULL
 };
 
diff --git a/window-tree.c b/window-tree.c
index 58a8bbb9b..c808af99d 100644
--- a/window-tree.c
+++ b/window-tree.c
@@ -401,7 +401,8 @@ window_tree_build(void *modedata, struct sort_criteria *sort_crit,
 
 static void
 window_tree_draw_label(struct screen_write_ctx *ctx, u_int px, u_int py,
-    u_int sx, u_int sy, const struct grid_cell *gc, const char *label)
+    u_int sx, u_int sy, const struct grid_cell *border_gc,
+    const struct grid_cell *label_gc, const char *label)
 {
 	u_int	 width, ox, oy;
 	char	*new_label = NULL;
@@ -420,14 +421,22 @@ window_tree_draw_label(struct screen_write_ctx *ctx, u_int px, u_int py,
 
 	screen_write_cursormove(ctx, px + ox - 2, py + oy - 1, 0);
 	screen_write_box(ctx, width + 4, 3, BOX_LINES_DEFAULT,
-	    NULL, NULL);
+	    border_gc, NULL);
 	screen_write_cursormove(ctx, px + ox - 1, py + oy, 0);
-	screen_write_clearcharacter(ctx, width + 2, 8);
+	screen_write_clearcharacter(ctx, width + 2, border_gc->bg);
 	screen_write_cursormove(ctx, px + ox, py + oy, 0);
-	format_draw(ctx, gc, width, label, NULL, 0);
+	format_draw(ctx, label_gc, width, label, NULL, 0);
 	free(new_label);
 }
 
+static void
+window_tree_border_cell(struct grid_cell *gc, struct options *oo,
+    struct format_tree *ft)
+{
+	memcpy(gc, &grid_default_cell, sizeof *gc);
+	style_apply(gc, oo, "tree-mode-border-style", ft);
+}
+
 static void
 window_tree_draw_session(struct window_tree_modedata *data, struct session *s,
     struct screen_write_ctx *ctx, u_int sx, u_int sy)
@@ -437,7 +446,7 @@ window_tree_draw_session(struct window_tree_modedata *data, struct session *s,
 	u_int			 cx = ctx->s->cx, cy = ctx->s->cy;
 	u_int			 loop, total, visible, each, width, offset;
 	u_int			 current, start, end, remaining, i;
-	struct grid_cell	 gc;
+	struct grid_cell	 gc, label_gc;
 	int			 left, right;
 	char			*label;
 	const char		*format;
@@ -495,20 +504,21 @@ window_tree_draw_session(struct window_tree_modedata *data, struct session *s,
 	if (each == 0)
 		return;
 
+	window_tree_border_cell(&gc, data->wp->window->options, NULL);
 	if (left) {
 		data->left = cx + 2;
 		screen_write_cursormove(ctx, cx + 2, cy, 0);
-		screen_write_vline(ctx, sy, 0, 0);
+		screen_write_vline(ctx, sy, 0, 0, &gc);
 		screen_write_cursormove(ctx, cx, cy + sy / 2, 0);
-		screen_write_puts(ctx, &grid_default_cell, "<");
+		screen_write_puts(ctx, &gc, "<");
 	} else
 		data->left = -1;
 	if (right) {
 		data->right = cx + sx - 3;
 		screen_write_cursormove(ctx, cx + sx - 3, cy, 0);
-		screen_write_vline(ctx, sy, 0, 0);
+		screen_write_vline(ctx, sy, 0, 0, &gc);
 		screen_write_cursormove(ctx, cx + sx - 1, cy + sy / 2, 0);
-		screen_write_puts(ctx, &grid_default_cell, ">");
+		screen_write_puts(ctx, &gc, ">");
 	} else
 		data->right = -1;
 
@@ -530,8 +540,10 @@ window_tree_draw_session(struct window_tree_modedata *data, struct session *s,
 		ft = format_create(NULL, NULL, FORMAT_WINDOW|w->id, 0);
 		format_defaults(ft, NULL, s, wl, NULL);
 
-		memcpy(&gc, &grid_default_cell, sizeof gc);
-		style_apply(&gc, oo, "tree-mode-preview-style", ft);
+		window_tree_border_cell(&gc, oo, ft);
+		memcpy(&label_gc, &grid_default_cell, sizeof label_gc);
+		style_apply(&label_gc, oo, "tree-mode-preview-style", ft);
+		label_gc.bg = gc.bg;
 
 		if (left)
 			offset = 3 + (i * each);
@@ -550,7 +562,7 @@ window_tree_draw_session(struct window_tree_modedata *data, struct session *s,
 			label = format_expand(ft, format);
 			if (*label != '\0') {
 				window_tree_draw_label(ctx, cx + offset, cy,
-				    width, sy, &gc, label);
+				    width, sy, &gc, &label_gc, label);
 			}
 			free(label);
 		}
@@ -558,7 +570,7 @@ window_tree_draw_session(struct window_tree_modedata *data, struct session *s,
 		if (loop != end - 1) {
 			screen_write_cursormove(ctx, cx + offset + width, cy,
 			    0);
-			screen_write_vline(ctx, sy, 0, 0);
+			screen_write_vline(ctx, sy, 0, 0, &gc);
 		}
 		loop++;
 
@@ -575,7 +587,7 @@ window_tree_draw_window(struct window_tree_modedata *data, struct session *s,
 	u_int			 cx = ctx->s->cx, cy = ctx->s->cy;
 	u_int			 loop, total, visible, each, width, offset;
 	u_int			 current, start, end, remaining, i;
-	struct grid_cell	 gc;
+	struct grid_cell	 gc, label_gc;
 	int			 left, right;
 	char			*label;
 	const char		*format;
@@ -639,20 +651,21 @@ window_tree_draw_window(struct window_tree_modedata *data, struct session *s,
 	if (each == 0)
 		return;
 
+	window_tree_border_cell(&gc, data->wp->window->options, NULL);
 	if (left) {
 		data->left = cx + 2;
 		screen_write_cursormove(ctx, cx + 2, cy, 0);
-		screen_write_vline(ctx, sy, 0, 0);
+		screen_write_vline(ctx, sy, 0, 0, &gc);
 		screen_write_cursormove(ctx, cx, cy + sy / 2, 0);
-		screen_write_puts(ctx, &grid_default_cell, "<");
+		screen_write_puts(ctx, &gc, "<");
 	} else
 		data->left = -1;
 	if (right) {
 		data->right = cx + sx - 3;
 		screen_write_cursormove(ctx, cx + sx - 3, cy, 0);
-		screen_write_vline(ctx, sy, 0, 0);
+		screen_write_vline(ctx, sy, 0, 0, &gc);
 		screen_write_cursormove(ctx, cx + sx - 1, cy + sy / 2, 0);
-		screen_write_puts(ctx, &grid_default_cell, ">");
+		screen_write_puts(ctx, &gc, ">");
 	} else
 		data->right = -1;
 
@@ -675,8 +688,10 @@ window_tree_draw_window(struct window_tree_modedata *data, struct session *s,
 		ft = format_create(NULL, NULL, FORMAT_PANE|wp->id, 0);
 		format_defaults(ft, NULL, s, wl, wp);
 
-		memcpy(&gc, &grid_default_cell, sizeof gc);
-		style_apply(&gc, oo, "tree-mode-preview-style", ft);
+		window_tree_border_cell(&gc, oo, ft);
+		memcpy(&label_gc, &grid_default_cell, sizeof label_gc);
+		style_apply(&label_gc, oo, "tree-mode-preview-style", ft);
+		label_gc.bg = gc.bg;
 
 		if (left)
 			offset = 3 + (i * each);
@@ -695,7 +710,7 @@ window_tree_draw_window(struct window_tree_modedata *data, struct session *s,
 			label = format_expand(ft, format);
 			if (*label != '\0') {
 				window_tree_draw_label(ctx, cx + offset, cy,
-				    width, sy, &gc, label);
+				    width, sy, &gc, &label_gc, label);
 			}
 			free(label);
 		}
@@ -703,7 +718,7 @@ window_tree_draw_window(struct window_tree_modedata *data, struct session *s,
 		if (loop != end - 1) {
 			screen_write_cursormove(ctx, cx + offset + width, cy,
 			    0);
-			screen_write_vline(ctx, sy, 0, 0);
+			screen_write_vline(ctx, sy, 0, 0, &gc);
 		}
 		loop++;
 
@@ -889,18 +904,30 @@ window_tree_sort(struct sort_criteria *sort_crit)
 }
 
 static const char* window_tree_help_lines[] = {
-	"#[bold]      Enter #[default]#[acs]x#[default] Choose selected item",
-	"#[bold]       S-Up #[default]#[acs]x#[default] Swap current and previous window",
-	"#[bold]     S-Down #[default]#[acs]x#[default] Swap current and next window",
-	"#[bold]          x #[default]#[acs]x#[default] Kill selected item",
-	"#[bold]          X #[default]#[acs]x#[default] Kill tagged items",
-	"#[bold]          < #[default]#[acs]x#[default] Scroll previews left",
-	"#[bold]          > #[default]#[acs]x#[default] Scroll previews right",
-	"#[bold]          m #[default]#[acs]x#[default] Set the marked pane",
-	"#[bold]          M #[default]#[acs]x#[default] Clear the marked pane",
-	"#[bold]          : #[default]#[acs]x#[default] Run a command for each tagged item",
-	"#[bold]          f #[default]#[acs]x#[default] Enter a format",
-	"#[bold]          H #[default]#[acs]x#[default] Jump to the starting pane",
+	"#[fg=themelightgrey]"
+	"      Enter #[#{E:tree-mode-border-style},acs]x#[default] Choose selected item",
+	"#[fg=themelightgrey]"
+	"       S-Up #[#{E:tree-mode-border-style},acs]x#[default] Swap current and previous window",
+	"#[fg=themelightgrey]"
+	"     S-Down #[#{E:tree-mode-border-style},acs]x#[default] Swap current and next window",
+	"#[fg=themelightgrey]"
+	"          x #[#{E:tree-mode-border-style},acs]x#[default] Kill selected item",
+	"#[fg=themelightgrey]"
+	"          X #[#{E:tree-mode-border-style},acs]x#[default] Kill tagged items",
+	"#[fg=themelightgrey]"
+	"          < #[#{E:tree-mode-border-style},acs]x#[default] Scroll previews left",
+	"#[fg=themelightgrey]"
+	"          > #[#{E:tree-mode-border-style},acs]x#[default] Scroll previews right",
+	"#[fg=themelightgrey]"
+	"          m #[#{E:tree-mode-border-style},acs]x#[default] Set the marked pane",
+	"#[fg=themelightgrey]"
+	"          M #[#{E:tree-mode-border-style},acs]x#[default] Clear the marked pane",
+	"#[fg=themelightgrey]"
+	"          : #[#{E:tree-mode-border-style},acs]x#[default] Run a command for each tagged item",
+	"#[fg=themelightgrey]"
+	"          f #[#{E:tree-mode-border-style},acs]x#[default] Enter a format",
+	"#[fg=themelightgrey]"
+	"          H #[#{E:tree-mode-border-style},acs]x#[default] Jump to the starting pane",
 	NULL
 };
 

From f5e9bcc1fc59f06014f911bab66fa0b0ebf99362 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 26 Jun 2026 08:19:44 +0000
Subject: [PATCH 2/2] Another couple of bits look nicer in grey.

---
 window-client.c | 38 +++++++++++++++++++-------------------
 window-tree.c   |  6 +++---
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/window-client.c b/window-client.c
index 85d12d743..a780222e3 100644
--- a/window-client.c
+++ b/window-client.c
@@ -38,7 +38,7 @@ static void		 window_client_key(struct window_mode_entry *,
 #define WINDOW_CLIENT_DEFAULT_COMMAND "detach-client -t '%%'"
 
 #define WINDOW_CLIENT_DEFAULT_FORMAT \
-	"#{t/p:client_activity}: session #{session_name}"
+	"#[fg=themelightgrey]#{t/p:client_activity}: session #[default]#{session_name}"
 
 #define WINDOW_CLIENT_DEFAULT_KEY_FORMAT \
 	"#{?#{e|<:#{line},10}," \
@@ -52,30 +52,30 @@ static void		 window_client_key(struct window_mode_entry *,
 	"#[fg=themegreen],#[fg=themelightgrey]}#{p/15:#{l:" #f "}}" \
 	"#[default]"
 static const char *window_client_info_lines[] = {
-	"Client Name   #[#{E:tree-mode-border-style},acs]x#[default] "
-	"#{client_name} "
+	"#[fg=themelightgrey]Client Name   #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#{client_name} #[fg=themelightgrey]"
 	"#[fg=themelightgrey](PID #{client_pid})#[default]",
-	"Session       #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#[fg=themelightgrey]Session       #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{session_name}",
-	"Attach Time   #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#[fg=themelightgrey]Attach Time   #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{t:client_created} "
 	"#[fg=themelightgrey](#{t/r:client_created})#[default]",
-	"Activity Time #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#[fg=themelightgrey]Activity Time #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{t:client_activity} "
 	"#[fg=themelightgrey](#{t/r:client_activity})#[default]",
-	"Terminal Type #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#[fg=themelightgrey]Terminal Type #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{?client_termtype,#{client_termtype},Unknown}",
-	"TERM          #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#[fg=themelightgrey]TERM          #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{client_termname}",
-	"Size          #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#[fg=themelightgrey]Size          #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{client_width}x#{client_height} "
 	"#[fg=themelightgrey](cell #{client_cell_width}x"
 	"#{client_cell_height})#[default]",
-	"Bytes Written #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#[fg=themelightgrey]Bytes Written #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{client_written} "
 	"#[fg=themelightgrey](#{client_discarded} discarded)#[default]",
 
-	"Features      #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#[fg=themelightgrey]Features      #[#{E:tree-mode-border-style},acs]x#[default] "
 	WINDOW_CLIENT_FEATURE(256) " "
 	WINDOW_CLIENT_FEATURE(RGB) " "
 	WINDOW_CLIENT_FEATURE(bpaste) " "
@@ -104,36 +104,36 @@ static const char *window_client_info_lines[] = {
 	WINDOW_CLIENT_FEATURE(usstyle),
 	"#[#{E:tree-mode-border-style},acs]qqqqqqqqqqqqqqn#{R:q,#{window_width}}#[default]",
 
-	"prefix        #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#[fg=themelightgrey]prefix        #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{prefix}",
 
-	"mouse         #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#[fg=themelightgrey]mouse         #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{?mouse,#{?#{I/c:kmous},,#[fg=themered]}on,#[fg=themelightgrey]off} "
 	"#{?#{I/c:kmous},,#[align=right]unavailable: [kmous] missing}",
 
-	"set-clipboard #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#[fg=themelightgrey]set-clipboard #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{?#{!=:#{set-clipboard},off},#{?#{I/f:clipboard},,"
 	"#[fg=themered]}#{set-clipboard},#[fg=themelightgrey]off} "
 	"#{?#{I/f:clipboard},,#[align=right]unavailable: [Ms] missing}",
 
-	"get-clipboard #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#[fg=themelightgrey]get-clipboard #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{?#{!=:#{get-clipboard},off},#{?#{I/f:clipboard},,"
 	"#[fg=themered]}#{get-clipboard},#[fg=themelightgrey]off} "
 	"#{?#{I/f:clipboard},,#[align=right]unavailable: [Ms] missing}",
 
-	"focus-events  #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#[fg=themelightgrey]focus-events  #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{?focus-events,#{?#{I/f:focus},,#[fg=themered]}on,#[fg=themelightgrey]off} "
 	"#{?#{I/f:focus},,#[align=right]unavailable: [Enfcs] or [Dcfcs] missing}",
 
-	"extended-keys #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#[fg=themelightgrey]extended-keys #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{?#{!=:#{extended-keys},off},#{?#{I/f:extkeys},,"
 	"#[fg=themered]}#{extended-keys},#[fg=themelightgrey]off} "
 	"#{?#{I/f:extkeys},,#[align=right]unavailable: [Eneks] or [Dseks] missing}",
 
-	"set-titles    #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#[fg=themelightgrey]set-titles    #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{?set-titles,on,#[fg=themelightgrey]off}",
 
-	"escape-time   #[#{E:tree-mode-border-style},acs]x#[default] "
+	"#[fg=themelightgrey]escape-time   #[#{E:tree-mode-border-style},acs]x#[default] "
 	"#{escape-time} ms",
 };
 
diff --git a/window-tree.c b/window-tree.c
index c808af99d..31cef5dca 100644
--- a/window-tree.c
+++ b/window-tree.c
@@ -39,14 +39,14 @@ static void		 window_tree_key(struct window_mode_entry *,
 #define WINDOW_TREE_DEFAULT_FORMAT \
 	"#{?pane_format," \
 		"#{?pane_marked,#[reverse],}#{?pane_floating_flag,#[italics],}" \
-		"#{pane_current_command}#{pane_flags}" \
+		"#{pane_current_command}#[fg=themelightgrey]#{pane_flags}" \
 		"#{?#{&&:#{pane_title},#{!=:#{pane_title},#{host_short}}},: \"#{pane_title}\",}" \
 	",window_format," \
 		"#{?window_marked_flag,#[reverse],}" \
-		"#{window_name}#{window_flags}" \
+		"#{window_name}#[fg=themelightgrey]#{window_flags}" \
 		"#{?#{&&:#{==:#{window_panes},1},#{&&:#{pane_title},#{!=:#{pane_title},#{host_short}}}},: \"#{pane_title}\",}" \
 	"," \
-		"#{session_windows} windows" \
+		"#[fg=themelightgrey]#{session_windows} windows" \
 		"#{?session_grouped, " \
 			"(group #{session_group}: " \
 			"#{session_group_list})," \