diff --git a/assets/themes/cave-light.json b/assets/themes/cave-light.json
index 0f46cafdfc..681a969468 100644
--- a/assets/themes/cave-light.json
+++ b/assets/themes/cave-light.json
@@ -35,7 +35,7 @@
       }
     },
     "border": {
-      "color": "#8b8792",
+      "color": "#b7b3bd",
       "width": 1
     },
     "empty": {
@@ -69,7 +69,7 @@
         "size": 14
       },
       "border": {
-        "color": "#8b8792",
+        "color": "#ccc9d2",
         "width": 1
       },
       "padding": {
@@ -117,7 +117,7 @@
         "size": 14
       },
       "border": {
-        "color": "#8b8792",
+        "color": "#b7b3bd",
         "width": 1,
         "left": true,
         "bottom": true,
@@ -143,7 +143,7 @@
         "size": 14
       },
       "border": {
-        "color": "#8b8792",
+        "color": "#b7b3bd",
         "width": 1,
         "left": true,
         "bottom": false,
@@ -162,13 +162,13 @@
       "cursor": "Arrow"
     },
     "sidebar_resize_handle": {
-      "background": "#8b8792",
+      "background": "#b7b3bd",
       "padding": {
         "left": 1
       }
     },
     "pane_divider": {
-      "color": "#8b8792",
+      "color": "#ccc9d2",
       "width": 1
     },
     "status_bar": {
@@ -181,7 +181,7 @@
         "right": 6
       },
       "border": {
-        "color": "#8b8792",
+        "color": "#b7b3bd",
         "width": 1,
         "top": true,
         "overlay": true
@@ -393,14 +393,14 @@
         "width": 12
       },
       "border": {
-        "color": "#8b8792",
+        "color": "#b7b3bd",
         "width": 1,
         "bottom": true,
         "overlay": true
       },
       "sign_in_prompt": {
         "border": {
-          "color": "#8b8792",
+          "color": "#b7b3bd",
           "width": 1
         },
         "corner_radius": 6,
@@ -468,7 +468,7 @@
       "height": 34,
       "background": "#efecf4",
       "border": {
-        "color": "#8b8792",
+        "color": "#ccc9d2",
         "width": 1,
         "bottom": true
       },
@@ -502,7 +502,7 @@
       "corner_radius": 6,
       "padding": 12,
       "border": {
-        "color": "#8b8792",
+        "color": "#b7b3bd",
         "width": 1
       },
       "shadow": {
@@ -578,7 +578,7 @@
       "corner_radius": 8,
       "padding": 4,
       "border": {
-        "color": "#8b8792",
+        "color": "#ccc9d2",
         "width": 1
       },
       "item": {
@@ -624,7 +624,7 @@
       "icon_width_factor": 1.5,
       "text_scale_factor": 0.857,
       "border": {
-        "color": "#8b8792",
+        "color": "#ccc9d2",
         "width": 1,
         "bottom": true,
         "top": true
@@ -672,7 +672,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#8b8792",
+          "color": "#b7b3bd",
           "width": 1,
           "top": true
         }
@@ -695,7 +695,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#8b8792",
+          "color": "#b7b3bd",
           "width": 1,
           "top": true
         }
@@ -718,7 +718,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#8b8792",
+          "color": "#b7b3bd",
           "width": 1,
           "top": true
         }
@@ -741,7 +741,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#8b8792",
+          "color": "#b7b3bd",
           "width": 1,
           "top": true
         }
@@ -764,7 +764,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#8b8792",
+          "color": "#b7b3bd",
           "width": 1,
           "top": true
         }
@@ -787,7 +787,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#8b8792",
+          "color": "#b7b3bd",
           "width": 1,
           "top": true
         }
@@ -810,7 +810,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#8b8792",
+          "color": "#b7b3bd",
           "width": 1,
           "top": true
         }
@@ -833,7 +833,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#8b8792",
+          "color": "#b7b3bd",
           "width": 1,
           "top": true
         }
@@ -959,7 +959,7 @@
       "corner_radius": 4,
       "background": "#efecf4",
       "border": {
-        "color": "#8b8792",
+        "color": "#ccc9d2",
         "width": 1
       },
       "padding": {
@@ -1151,7 +1151,7 @@
         "corner_radius": 6,
         "padding": 4,
         "border": {
-          "color": "#8b8792",
+          "color": "#b7b3bd",
           "width": 1
         },
         "shadow": {
@@ -1242,7 +1242,7 @@
         "selection": "#576ddb3d"
       },
       "border": {
-        "color": "#8b8792",
+        "color": "#ccc9d2",
         "width": 1
       },
       "padding": {
@@ -1276,7 +1276,7 @@
         "selection": "#576ddb3d"
       },
       "border": {
-        "color": "#8b8792",
+        "color": "#ccc9d2",
         "width": 1
       },
       "padding": {
@@ -1440,7 +1440,7 @@
       }
     },
     "border": {
-      "color": "#8b8792",
+      "color": "#b7b3bd",
       "width": 1
     },
     "empty": {
@@ -1474,7 +1474,7 @@
         "size": 14
       },
       "border": {
-        "color": "#8b8792",
+        "color": "#ccc9d2",
         "width": 1
       },
       "padding": {
@@ -1531,7 +1531,7 @@
       "background": "#ccc9d2",
       "corner_radius": 6,
       "border": {
-        "color": "#8b8792",
+        "color": "#ccc9d2",
         "width": 1
       },
       "margin": {
@@ -1549,7 +1549,7 @@
         "size": 14,
         "background": "#a19da7",
         "border": {
-          "color": "#655f6d",
+          "color": "#e2dfe7",
           "width": 1
         }
       },
@@ -1559,7 +1559,7 @@
         "size": 14,
         "background": "#b7b3bd",
         "border": {
-          "color": "#655f6d",
+          "color": "#e2dfe7",
           "width": 1
         }
       }
@@ -1584,7 +1584,7 @@
         "size": 14
       },
       "border": {
-        "color": "#8b8792",
+        "color": "#ccc9d2",
         "width": 1
       },
       "margin": {
diff --git a/assets/themes/solarized-light.json b/assets/themes/solarized-light.json
index f0a69dcf3c..33a9c4959b 100644
--- a/assets/themes/solarized-light.json
+++ b/assets/themes/solarized-light.json
@@ -35,7 +35,7 @@
       }
     },
     "border": {
-      "color": "#93a1a1",
+      "color": "#c1c5bb",
       "width": 1
     },
     "empty": {
@@ -69,7 +69,7 @@
         "size": 14
       },
       "border": {
-        "color": "#93a1a1",
+        "color": "#d7d6c8",
         "width": 1
       },
       "padding": {
@@ -117,7 +117,7 @@
         "size": 14
       },
       "border": {
-        "color": "#93a1a1",
+        "color": "#c1c5bb",
         "width": 1,
         "left": true,
         "bottom": true,
@@ -143,7 +143,7 @@
         "size": 14
       },
       "border": {
-        "color": "#93a1a1",
+        "color": "#c1c5bb",
         "width": 1,
         "left": true,
         "bottom": false,
@@ -162,13 +162,13 @@
       "cursor": "Arrow"
     },
     "sidebar_resize_handle": {
-      "background": "#93a1a1",
+      "background": "#c1c5bb",
       "padding": {
         "left": 1
       }
     },
     "pane_divider": {
-      "color": "#93a1a1",
+      "color": "#d7d6c8",
       "width": 1
     },
     "status_bar": {
@@ -181,7 +181,7 @@
         "right": 6
       },
       "border": {
-        "color": "#93a1a1",
+        "color": "#c1c5bb",
         "width": 1,
         "top": true,
         "overlay": true
@@ -393,14 +393,14 @@
         "width": 12
       },
       "border": {
-        "color": "#93a1a1",
+        "color": "#c1c5bb",
         "width": 1,
         "bottom": true,
         "overlay": true
       },
       "sign_in_prompt": {
         "border": {
-          "color": "#93a1a1",
+          "color": "#c1c5bb",
           "width": 1
         },
         "corner_radius": 6,
@@ -468,7 +468,7 @@
       "height": 34,
       "background": "#fdf6e3",
       "border": {
-        "color": "#93a1a1",
+        "color": "#d7d6c8",
         "width": 1,
         "bottom": true
       },
@@ -502,7 +502,7 @@
       "corner_radius": 6,
       "padding": 12,
       "border": {
-        "color": "#93a1a1",
+        "color": "#c1c5bb",
         "width": 1
       },
       "shadow": {
@@ -578,7 +578,7 @@
       "corner_radius": 8,
       "padding": 4,
       "border": {
-        "color": "#93a1a1",
+        "color": "#d7d6c8",
         "width": 1
       },
       "item": {
@@ -624,7 +624,7 @@
       "icon_width_factor": 1.5,
       "text_scale_factor": 0.857,
       "border": {
-        "color": "#93a1a1",
+        "color": "#d7d6c8",
         "width": 1,
         "bottom": true,
         "top": true
@@ -672,7 +672,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#93a1a1",
+          "color": "#c1c5bb",
           "width": 1,
           "top": true
         }
@@ -695,7 +695,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#93a1a1",
+          "color": "#c1c5bb",
           "width": 1,
           "top": true
         }
@@ -718,7 +718,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#93a1a1",
+          "color": "#c1c5bb",
           "width": 1,
           "top": true
         }
@@ -741,7 +741,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#93a1a1",
+          "color": "#c1c5bb",
           "width": 1,
           "top": true
         }
@@ -764,7 +764,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#93a1a1",
+          "color": "#c1c5bb",
           "width": 1,
           "top": true
         }
@@ -787,7 +787,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#93a1a1",
+          "color": "#c1c5bb",
           "width": 1,
           "top": true
         }
@@ -810,7 +810,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#93a1a1",
+          "color": "#c1c5bb",
           "width": 1,
           "top": true
         }
@@ -833,7 +833,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#93a1a1",
+          "color": "#c1c5bb",
           "width": 1,
           "top": true
         }
@@ -959,7 +959,7 @@
       "corner_radius": 4,
       "background": "#fdf6e3",
       "border": {
-        "color": "#93a1a1",
+        "color": "#d7d6c8",
         "width": 1
       },
       "padding": {
@@ -1151,7 +1151,7 @@
         "corner_radius": 6,
         "padding": 4,
         "border": {
-          "color": "#93a1a1",
+          "color": "#c1c5bb",
           "width": 1
         },
         "shadow": {
@@ -1242,7 +1242,7 @@
         "selection": "#268bd23d"
       },
       "border": {
-        "color": "#93a1a1",
+        "color": "#d7d6c8",
         "width": 1
       },
       "padding": {
@@ -1276,7 +1276,7 @@
         "selection": "#268bd23d"
       },
       "border": {
-        "color": "#93a1a1",
+        "color": "#d7d6c8",
         "width": 1
       },
       "padding": {
@@ -1440,7 +1440,7 @@
       }
     },
     "border": {
-      "color": "#93a1a1",
+      "color": "#c1c5bb",
       "width": 1
     },
     "empty": {
@@ -1474,7 +1474,7 @@
         "size": 14
       },
       "border": {
-        "color": "#93a1a1",
+        "color": "#d7d6c8",
         "width": 1
       },
       "padding": {
@@ -1531,7 +1531,7 @@
       "background": "#d7d6c8",
       "corner_radius": 6,
       "border": {
-        "color": "#93a1a1",
+        "color": "#d7d6c8",
         "width": 1
       },
       "margin": {
@@ -1549,7 +1549,7 @@
         "size": 14,
         "background": "#aab3ae",
         "border": {
-          "color": "#657b83",
+          "color": "#eee8d5",
           "width": 1
         }
       },
@@ -1559,7 +1559,7 @@
         "size": 14,
         "background": "#c1c5bb",
         "border": {
-          "color": "#657b83",
+          "color": "#eee8d5",
           "width": 1
         }
       }
@@ -1584,7 +1584,7 @@
         "size": 14
       },
       "border": {
-        "color": "#93a1a1",
+        "color": "#d7d6c8",
         "width": 1
       },
       "margin": {
diff --git a/assets/themes/sulphurpool-light.json b/assets/themes/sulphurpool-light.json
index 9ec1da7c6c..8f65cb8e75 100644
--- a/assets/themes/sulphurpool-light.json
+++ b/assets/themes/sulphurpool-light.json
@@ -35,7 +35,7 @@
       }
     },
     "border": {
-      "color": "#979db4",
+      "color": "#bbc0d3",
       "width": 1
     },
     "empty": {
@@ -69,7 +69,7 @@
         "size": 14
       },
       "border": {
-        "color": "#979db4",
+        "color": "#cdd1e2",
         "width": 1
       },
       "padding": {
@@ -117,7 +117,7 @@
         "size": 14
       },
       "border": {
-        "color": "#979db4",
+        "color": "#bbc0d3",
         "width": 1,
         "left": true,
         "bottom": true,
@@ -143,7 +143,7 @@
         "size": 14
       },
       "border": {
-        "color": "#979db4",
+        "color": "#bbc0d3",
         "width": 1,
         "left": true,
         "bottom": false,
@@ -162,13 +162,13 @@
       "cursor": "Arrow"
     },
     "sidebar_resize_handle": {
-      "background": "#979db4",
+      "background": "#bbc0d3",
       "padding": {
         "left": 1
       }
     },
     "pane_divider": {
-      "color": "#979db4",
+      "color": "#cdd1e2",
       "width": 1
     },
     "status_bar": {
@@ -181,7 +181,7 @@
         "right": 6
       },
       "border": {
-        "color": "#979db4",
+        "color": "#bbc0d3",
         "width": 1,
         "top": true,
         "overlay": true
@@ -393,14 +393,14 @@
         "width": 12
       },
       "border": {
-        "color": "#979db4",
+        "color": "#bbc0d3",
         "width": 1,
         "bottom": true,
         "overlay": true
       },
       "sign_in_prompt": {
         "border": {
-          "color": "#979db4",
+          "color": "#bbc0d3",
           "width": 1
         },
         "corner_radius": 6,
@@ -468,7 +468,7 @@
       "height": 34,
       "background": "#f5f7ff",
       "border": {
-        "color": "#979db4",
+        "color": "#cdd1e2",
         "width": 1,
         "bottom": true
       },
@@ -502,7 +502,7 @@
       "corner_radius": 6,
       "padding": 12,
       "border": {
-        "color": "#979db4",
+        "color": "#bbc0d3",
         "width": 1
       },
       "shadow": {
@@ -578,7 +578,7 @@
       "corner_radius": 8,
       "padding": 4,
       "border": {
-        "color": "#979db4",
+        "color": "#cdd1e2",
         "width": 1
       },
       "item": {
@@ -624,7 +624,7 @@
       "icon_width_factor": 1.5,
       "text_scale_factor": 0.857,
       "border": {
-        "color": "#979db4",
+        "color": "#cdd1e2",
         "width": 1,
         "bottom": true,
         "top": true
@@ -672,7 +672,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#979db4",
+          "color": "#bbc0d3",
           "width": 1,
           "top": true
         }
@@ -695,7 +695,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#979db4",
+          "color": "#bbc0d3",
           "width": 1,
           "top": true
         }
@@ -718,7 +718,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#979db4",
+          "color": "#bbc0d3",
           "width": 1,
           "top": true
         }
@@ -741,7 +741,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#979db4",
+          "color": "#bbc0d3",
           "width": 1,
           "top": true
         }
@@ -764,7 +764,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#979db4",
+          "color": "#bbc0d3",
           "width": 1,
           "top": true
         }
@@ -787,7 +787,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#979db4",
+          "color": "#bbc0d3",
           "width": 1,
           "top": true
         }
@@ -810,7 +810,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#979db4",
+          "color": "#bbc0d3",
           "width": 1,
           "top": true
         }
@@ -833,7 +833,7 @@
       "text_scale_factor": 0.857,
       "header": {
         "border": {
-          "color": "#979db4",
+          "color": "#bbc0d3",
           "width": 1,
           "top": true
         }
@@ -959,7 +959,7 @@
       "corner_radius": 4,
       "background": "#f5f7ff",
       "border": {
-        "color": "#979db4",
+        "color": "#cdd1e2",
         "width": 1
       },
       "padding": {
@@ -1151,7 +1151,7 @@
         "corner_radius": 6,
         "padding": 4,
         "border": {
-          "color": "#979db4",
+          "color": "#bbc0d3",
           "width": 1
         },
         "shadow": {
@@ -1242,7 +1242,7 @@
         "selection": "#3d8fd13d"
       },
       "border": {
-        "color": "#979db4",
+        "color": "#cdd1e2",
         "width": 1
       },
       "padding": {
@@ -1276,7 +1276,7 @@
         "selection": "#3d8fd13d"
       },
       "border": {
-        "color": "#979db4",
+        "color": "#cdd1e2",
         "width": 1
       },
       "padding": {
@@ -1440,7 +1440,7 @@
       }
     },
     "border": {
-      "color": "#979db4",
+      "color": "#bbc0d3",
       "width": 1
     },
     "empty": {
@@ -1474,7 +1474,7 @@
         "size": 14
       },
       "border": {
-        "color": "#979db4",
+        "color": "#cdd1e2",
         "width": 1
       },
       "padding": {
@@ -1531,7 +1531,7 @@
       "background": "#cdd1e2",
       "corner_radius": 6,
       "border": {
-        "color": "#979db4",
+        "color": "#cdd1e2",
         "width": 1
       },
       "margin": {
@@ -1549,7 +1549,7 @@
         "size": 14,
         "background": "#a9aec3",
         "border": {
-          "color": "#6b7394",
+          "color": "#dfe2f1",
           "width": 1
         }
       },
@@ -1559,7 +1559,7 @@
         "size": 14,
         "background": "#bbc0d3",
         "border": {
-          "color": "#6b7394",
+          "color": "#dfe2f1",
           "width": 1
         }
       }
@@ -1584,7 +1584,7 @@
         "size": 14
       },
       "border": {
-        "color": "#979db4",
+        "color": "#cdd1e2",
         "width": 1
       },
       "margin": {
diff --git a/styles/src/themes/common/base16.ts b/styles/src/themes/common/base16.ts
index 7fd485b0c3..525b39f214 100644
--- a/styles/src/themes/common/base16.ts
+++ b/styles/src/themes/common/base16.ts
@@ -13,8 +13,6 @@ export function colorRamp(color: Color): Scale {
     .mode("hsl");
 }
 
-// Neutral. 8 stops from 0 to 1.
-
 export function createTheme(name: string, isLight: boolean, ramps: { [rampName: string]: Scale }, blend?: number): Theme {
   if (isLight) {
     for (var rampName in ramps) {
@@ -85,9 +83,9 @@ export function createTheme(name: string, isLight: boolean, ramps: { [rampName:
   };
 
   const borderColor = {
-    primary: rampColor(ramps.neutral, isLight ? 2 : 0),
-    secondary: rampColor(ramps.neutral, isLight ? 2 : 1),
-    muted: rampColor(ramps.neutral, isLight ? 4 : 3),
+    primary: rampColor(ramps.neutral, isLight ? 1.5 : 0),
+    secondary: rampColor(ramps.neutral, isLight ? 1.25 : 1),
+    muted: rampColor(ramps.neutral, isLight ? 1 : 3),
     active: rampColor(ramps.neutral, isLight ? 4 : 3),
     onMedia: withOpacity(rampColor(ramps.neutral, 0), 0.1),
     ok: withOpacity(rampColor(ramps.green, 0.5), 0.15),