diff --git a/.gitignore b/.gitignore
index 93afdc7..15637d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 dist/
-gotop
+/gotop
 
 # snap packaging specific
 /parts/
diff --git a/cmd/gotop/main.go b/cmd/gotop/main.go
index e31e2a8..142c370 100644
--- a/cmd/gotop/main.go
+++ b/cmd/gotop/main.go
@@ -64,6 +64,8 @@ Colorschemes:
   default
   default-dark (for white background)
   solarized
+  solarized16-dark
+  solarized16-light
   monokai
   vice
 `
@@ -147,6 +149,10 @@ func handleColorscheme(c string) (colorschemes.Colorscheme, error) {
 		cs = colorschemes.Default
 	case "solarized":
 		cs = colorschemes.Solarized
+	case "solarized16-light":
+		cs = colorschemes.Solarized16Light
+	case "solarized16-dark":
+		cs = colorschemes.Solarized16Dark
 	case "monokai":
 		cs = colorschemes.Monokai
 	case "vice":
diff --git a/colorschemes/solarized.go b/colorschemes/solarized.go
index 3ce9997..5968310 100644
--- a/colorschemes/solarized.go
+++ b/colorschemes/solarized.go
@@ -1,10 +1,13 @@
 package colorschemes
 
+// This is a neutral version of the Solarized 256-color palette. The exception
+// is that the one grey color uses the average of base0 and base00, which are
+// already middle of the road.
 var Solarized = Colorscheme{
-	Fg: 250,
+	Fg: -1,
 	Bg: -1,
 
-	BorderLabel: 250,
+	BorderLabel: -1,
 	BorderLine:  37,
 
 	CPULines: []int{61, 33, 37, 64, 125, 160, 166, 136},
@@ -18,7 +21,7 @@ var Solarized = Colorscheme{
 
 	Sparkline: 33,
 
-	DiskBar: 245,
+	DiskBar: 243,
 
 	TempLow:  64,
 	TempHigh: 160,
diff --git a/colorschemes/solarized16-dark.go b/colorschemes/solarized16-dark.go
new file mode 100644
index 0000000..f8cdab7
--- /dev/null
+++ b/colorschemes/solarized16-dark.go
@@ -0,0 +1,27 @@
+package colorschemes
+
+// This scheme assumes the terminal already uses Solarized. Only DiskBar is
+// different between dark/light.
+var Solarized16Dark = Colorscheme{
+	Fg: -1,
+	Bg: -1,
+
+	BorderLabel: -1,
+	BorderLine:  6,
+
+	CPULines: []int{13, 4, 6, 2, 5, 1, 9, 3},
+
+	BattLines: []int{13, 4, 6, 2, 5, 1, 9, 3},
+
+	MainMem: 5,
+	SwapMem: 9,
+
+	ProcCursor: 4,
+
+	Sparkline: 4,
+
+	DiskBar: 12, // base0
+
+	TempLow:  2,
+	TempHigh: 1,
+}
diff --git a/colorschemes/solarized16-light.go b/colorschemes/solarized16-light.go
new file mode 100644
index 0000000..8426a95
--- /dev/null
+++ b/colorschemes/solarized16-light.go
@@ -0,0 +1,27 @@
+package colorschemes
+
+// This scheme assumes the terminal already uses Solarized. Only DiskBar is
+// different between dark/light.
+var Solarized16Light = Colorscheme{
+	Fg: -1,
+	Bg: -1,
+
+	BorderLabel: -1,
+	BorderLine:  6,
+
+	CPULines: []int{13, 4, 6, 2, 5, 1, 9, 3},
+
+	BattLines: []int{13, 4, 6, 2, 5, 1, 9, 3},
+
+	MainMem: 5,
+	SwapMem: 9,
+
+	ProcCursor: 4,
+
+	Sparkline: 4,
+
+	DiskBar: 11, // base00
+
+	TempLow:  2,
+	TempHigh: 1,
+}
diff --git a/layout/layout.go b/layout/layout.go
index e918bde..3f892dd 100644
--- a/layout/layout.go
+++ b/layout/layout.go
@@ -29,6 +29,7 @@ type MyGrid struct {
 
 var widgetNames []string = []string{"cpu", "disk", "mem", "temp", "net", "procs", "batt"}
 
+// BUG 2:disk mem\nnet loses the widget from the second line
 func Layout(wl layout, c gotop.Config) (*MyGrid, error) {
 	rowDefs := wl.Rows
 	uiRows := make([]ui.GridItem, 0)