diff --git a/color b/color
index 480fb9f..7923ba3 100644
--- a/color
+++ b/color
@@ -1,19 +1,20 @@
-rioback	dddddd
-back	9a9a9a
-high	cccccc
-border	909090
-text	ffffff
-htext	ffffff
-title	404040
-ltitle	898a8a
-hold	000000
-lhold	d6d7d7
-palehold	ededed
-paletext	ffffff
-size	ffffff
-menubar	8b8d8d
-menuback	6d6f6e
-menuhigh	000000
-menubord	5d5e5e
-menutext	000000
-menuhtext	ffffff
+rioback	cec6c2
+back	e8e7e6
+high	bbb4a9
+border	bbb4a9
+text	54524b
+htext	e8e7e6
+title	a79375
+ltitle	54524b
+hold	cd664d
+lhold	d49b82
+palehold	d49b82
+paletext	8d8371
+size	cd664d
+menubar	846d21
+menuback	e8e7e6
+menuhigh	cd664d
+menubord	cd664d
+menutext	54524b
+menuhtext	e8e7e6
+
diff --git a/patches/acme.patch b/patches/acme.patch
index 4df7c25..9bcad4a 100644
--- a/patches/acme.patch
+++ b/patches/acme.patch
@@ -1,16 +1,16 @@
-diff -r 297026d9dc30 sys/src/cmd/acme/acme.c
---- a/sys/src/cmd/acme/acme.c	Thu Feb 18 21:40:30 2021 +0100
-+++ b/sys/src/cmd/acme/acme.c	Thu Feb 25 12:25:27 2021 -0800
-@@ -876,17 +876,17 @@
+diff -r b31369df5d7d sys/src/cmd/acme/acme.c
+--- a/sys/src/cmd/acme/acme.c	Sun Apr 18 16:20:04 2021 +0200
++++ b/sys/src/cmd/acme/acme.c	Sun Apr 18 16:10:28 2021 -0700
+@@ -876,16 +876,16 @@
  	Image *tmp;
  
  	/* Blue */
 -	tagcols[BACK] = allocimagemix(display, DPalebluegreen, DWhite);
 -	tagcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DPalegreygreen);
 -	tagcols[BORD] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DPurpleblue);
-+	tagcols[BACK] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xddddddFF);
-+	tagcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x404040FF);
-+	tagcols[BORD] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x404040FF);
++	tagcols[BACK] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xe8e7e6FF);
++	tagcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1,  0xbbb4a9FF);
++	tagcols[BORD] = allocimage(display, Rect(0,0,1,1), screen->chan, 1,  0xbbb4a9FF);
  	tagcols[TEXT] = display->black;
  	tagcols[HTEXT] = display->black;
  
@@ -18,26 +18,24 @@ diff -r 297026d9dc30 sys/src/cmd/acme/acme.c
 -	textcols[BACK] = allocimagemix(display, DPaleyellow, DWhite);
 -	textcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DDarkyellow);
 -	textcols[BORD] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DYellowgreen);
--	textcols[TEXT] = display->black;
-+	textcols[BACK] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x9a9a9aFF);
-+	textcols[HIGH] =  allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xddddddFF);
-+	textcols[BORD] =  allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xddddddFF);
-+	textcols[TEXT] = display->white;
++	textcols[BACK] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xe8e7e6FF);
++	textcols[HIGH] =  allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xbbb4a9FF);
++	textcols[BORD] =  allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xbbb4a9FF);
+ 	textcols[TEXT] = display->black;
  	textcols[HTEXT] = display->black;
  
- 	if(button){
 @@ -907,12 +907,12 @@
  	r.max.x -= 2;
  	border(modbutton, r, 2, tagcols[BORD], ZP);
  	r = insetrect(r, 2);
 -	tmp = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DMedblue);
-+	tmp = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x404040FF);
++	tmp = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xa79375FF);
  	draw(modbutton, r, tmp, nil, ZP);
  	freeimage(tmp);
  
  	r = button->r;
 -	colbutton = allocimage(display, r, screen->chan, 0, DPurpleblue);
-+	colbutton = allocimage(display, r, screen->chan, 0, 0x404040FF);
++	colbutton = allocimage(display, r, screen->chan, 0, 0xa79375FF);
  
  	but2col = allocimage(display, r, screen->chan, 1, 0xAA0000FF);
  	but3col = allocimage(display, r, screen->chan, 1, 0x006600FF);
diff --git a/patches/faces.patch b/patches/faces.patch
index bc68c6a..dd162cd 100644
--- a/patches/faces.patch
+++ b/patches/faces.patch
@@ -1,13 +1,13 @@
-diff -r 297026d9dc30 sys/src/cmd/faces/main.c
---- a/sys/src/cmd/faces/main.c	Thu Feb 18 21:40:30 2021 +0100
-+++ b/sys/src/cmd/faces/main.c	Thu Feb 25 11:29:25 2021 -0800
+diff -r b31369df5d7d sys/src/cmd/faces/main.c
+--- a/sys/src/cmd/faces/main.c	Sun Apr 18 16:20:04 2021 +0200
++++ b/sys/src/cmd/faces/main.c	Sun Apr 18 15:37:56 2021 -0700
 @@ -98,8 +98,8 @@
  	initplumb();
  
  	/* make background color */
 -	bgrnd = allocimagemix(display, DPalebluegreen, DWhite);
 -	blue = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x008888FF);	/* blue-green */
-+	bgrnd = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x9a9a9aFF);
++	bgrnd = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xe8e7e6FF);
 +	blue = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x404040FF);	/* blue-green */
  	left = allocimage(display, leftright, GREY1, 0, DWhite);
  	right = allocimage(display, leftright, GREY1, 0, DWhite);
diff --git a/patches/samterm.patch b/patches/samterm.patch
index 42ab8ca..7d9aff7 100644
--- a/patches/samterm.patch
+++ b/patches/samterm.patch
@@ -1,7 +1,7 @@
-diff -r 297026d9dc30 sys/src/cmd/samterm/flayer.c
---- a/sys/src/cmd/samterm/flayer.c	Thu Feb 18 21:40:30 2021 +0100
-+++ b/sys/src/cmd/samterm/flayer.c	Thu Feb 25 14:51:19 2021 -0800
-@@ -29,16 +29,16 @@
+diff -r b31369df5d7d sys/src/cmd/samterm/flayer.c
+--- a/sys/src/cmd/samterm/flayer.c	Sun Apr 18 16:20:04 2021 +0200
++++ b/sys/src/cmd/samterm/flayer.c	Sun Apr 18 15:24:19 2021 -0700
+@@ -29,18 +29,22 @@
  	lDrect = r;
  
  	/* Main text is yellowish */
@@ -9,19 +9,77 @@ diff -r 297026d9dc30 sys/src/cmd/samterm/flayer.c
 -	maincols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DDarkyellow);
 -	maincols[BORD] = allocimage(display, Rect(0,0,2,2), screen->chan, 1, DYellowgreen);
 -	maincols[TEXT] = display->black;
-+	maincols[BACK] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x9a9a9aFF);
-+	maincols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xddddddFF);
-+	maincols[BORD] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xddddddFF);
-+	maincols[TEXT] = display->white;
- 	maincols[HTEXT] = display->black;
+-	maincols[HTEXT] = display->black;
++	maincols[BACK] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xE8E7E6FF);
++	maincols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xCD664DFF);
++ 	maincols[BORD] = allocimage(display, Rect(0,0,2,2), CMAP8, 1, 0xA79375FF);
++ 	draw(maincols[BORD], Rect(1,1,2,2), allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xE8E7E6FF), nil, ZP);
++ 	draw(maincols[BORD], Rect(0,0,1,1), allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xE8E7E6FF), nil, ZP);
++	maincols[TEXT] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x54524BFF);
++	maincols[HTEXT] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xE8E7E6FF);
  
  	/* Command text is blueish */
 -	cmdcols[BACK] = allocimagemix(display, DPalebluegreen, DWhite);
 -	cmdcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DPalegreygreen);
 -	cmdcols[BORD] = allocimage(display, Rect(0,0,2,2), screen->chan, 1, DPurpleblue);
-+	cmdcols[BACK] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xddddddFF);
-+	cmdcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x404040FF);
-+	cmdcols[BORD] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xddddddFF);
- 	cmdcols[TEXT] = display->black;
- 	cmdcols[HTEXT] = display->black;
+-	cmdcols[TEXT] = display->black;
+-	cmdcols[HTEXT] = display->black;
++	cmdcols[BACK] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x54524BFF);
++	cmdcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xE8E7E6FF);
++	cmdcols[BORD] = allocimage(display, Rect(0,0,2,2), CMAP8, 1, 0xA79375FF);
++ 	draw(cmdcols[BORD], Rect(1,1,2,2), allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xE8E7E6FF), nil, ZP);
++ 	draw(cmdcols[BORD], Rect(0,0,1,1), allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xE8E7E6FF), nil, ZP);
++	cmdcols[TEXT] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xE8E7E6FF);
++	cmdcols[HTEXT] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xCD664DFF);
  }
+ 
+ void
+diff -r b31369df5d7d sys/src/cmd/samterm/menu.c
+--- a/sys/src/cmd/samterm/menu.c	Sun Apr 18 16:20:04 2021 +0200
++++ b/sys/src/cmd/samterm/menu.c	Sun Apr 18 15:24:19 2021 -0700
+@@ -45,21 +45,21 @@
+ };
+ 
+ char	*menu2str[] = {
+-	"cut",
+-	"paste",
+-	"snarf",
+-	"plumb",
+-	"look",
++	"Cut",
++	"Paste",
++	"Snarf",
++	"Plumb",
++	"Look",
+ 	"<rio>",
+ 	0,		/* storage for last pattern */
+ };
+ 
+ char	*menu3str[] = {
+-	"new",
+-	"zerox",
+-	"resize",
+-	"close",
+-	"write",
++	"New",
++	"Zerox",
++	"Resize",
++	"Close",
++	"Write",
+ };
+ 
+ Menu	menu2 =	{0, genmenu2};
+diff -r b31369df5d7d sys/src/cmd/samterm/scroll.c
+--- a/sys/src/cmd/samterm/scroll.c	Sun Apr 18 16:20:04 2021 +0200
++++ b/sys/src/cmd/samterm/scroll.c	Sun Apr 18 15:24:19 2021 -0700
+@@ -93,8 +93,9 @@
+ 	if(!eqrect(r2, l->lastsr)){
+ 		l->lastsr = r2;
+ 		draw(b, r1, l->f.cols[BORD], nil, ZP);
+-		draw(b, r2, l->f.cols[BACK], nil, r2.min);
++		draw(b, r2, allocimage(display, Rect(0,0,2,2), screen->chan, 1, 0xA79375FF), nil, r2.min);
+ 		r2 = r1;
++		r2.max.x = r2.max.x+1;
+ 		r2.min.x = r2.max.x-1;
+ 		draw(b, r2, l->f.cols[BORD], nil, ZP);
+ 		if(b!=l->f.b)
diff --git a/patches/winwatch.patch b/patches/winwatch.patch
index 9839daa..b962385 100644
--- a/patches/winwatch.patch
+++ b/patches/winwatch.patch
@@ -1,21 +1,21 @@
-diff -r 297026d9dc30 sys/src/cmd/winwatch.c
---- a/sys/src/cmd/winwatch.c	Thu Feb 18 21:40:30 2021 +0100
-+++ b/sys/src/cmd/winwatch.c	Thu Feb 25 10:45:25 2021 -0800
+diff -r b31369df5d7d sys/src/cmd/winwatch.c
+--- a/sys/src/cmd/winwatch.c	Sun Apr 18 16:20:04 2021 +0200
++++ b/sys/src/cmd/winwatch.c	Sun Apr 18 15:55:06 2021 -0700
 @@ -339,12 +339,12 @@
  
  	if(initdraw(0, fontname, "winwatch") < 0)
  		sysfatal("initdraw: %r");
 -	lightblue = allocimagemix(display, DPalebluegreen, DWhite);
-+	lightblue = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x9a9a9aFF);
++	lightblue = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xe8e7e6FF);
  
 -	statecol[0] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xCCCCCCFF);
 -	statecol[1] = lightblue;
 -	statecol[2] = lightblue;
 -	statecol[3] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DPalegreygreen);
 +	statecol[0] = lightblue;
-+	statecol[1] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x777777FF);
-+	statecol[2] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xaaaaaaFF);
-+	statecol[3] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xccccccFF);
++	statecol[1] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xbbb4a9FF);
++	statecol[2] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xe8e7e6FF);
++	statecol[3] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xa79375FF);
  
  	for(i=0; i<nelem(statecol); i++)
  		if(statecol[i] == nil)