diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bd6c91..a21596c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## 0.4.1
+`2019-11-9`
+- Add window active and inactive borders (1.40.0)
+
 ## 0.4.0
 `2019-11-4`
 - Fix HTML tag color in certain situations
diff --git a/README.md b/README.md
index 2c20eb0..12ade7e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
 # [Tokyo Night](https://marketplace.visualstudio.com/items?itemName=enkia.tokyo-night)
-A clean, dark Visual Studio Code theme that celebrates the lights of Downtown [Tokyo at night.](https://www.google.com/search?q=tokyo+night&newwindow=1&sxsrf=ACYBGNRiOGCstG_Xohb8CgG5UGwBRpMIQg:1571032079139&source=lnms&tbm=isch&sa=X&ved=0ahUKEwiayIfIhpvlAhUGmuAKHbfRDaIQ_AUIEigB&biw=1280&bih=666&dpr=2) 
-
-**Note:** Many UI elements are intentionally low contrast so as not to distract. I can provide [customization settings](https://code.visualstudio.com/api/references/theme-color) similar to what is shown below to anyone who needs specific text brightened. 
+[![Version](https://vsmarketplacebadge.apphb.com/version/enkia.tokyo-night.svg)](https://marketplace.visualstudio.com/items?itemName=enkia.tokyo-night)
+[![Rating](https://vsmarketplacebadge.apphb.com/rating-star/enkia.tokyo-night.svg)](https://marketplace.visualstudio.com/items?itemName=enkia.tokyo-night)
+[![Issues](https://img.shields.io/github/issues/enkia/tokyo-night-vscode-theme)](https://github.com/enkia/tokyo-night-vscode-theme/issues)
+<br><br>A clean, dark Visual Studio Code theme that celebrates the lights of Downtown [Tokyo at night.](https://www.google.com/search?q=tokyo+night&newwindow=1&sxsrf=ACYBGNRiOGCstG_Xohb8CgG5UGwBRpMIQg:1571032079139&source=lnms&tbm=isch&sa=X&ved=0ahUKEwiayIfIhpvlAhUGmuAKHbfRDaIQ_AUIEigB&biw=1280&bih=666&dpr=2) 
+<br><br>**Note:** Many UI elements are intentionally low contrast so as not to distract. I can provide [customization settings](https://code.visualstudio.com/api/references/theme-color) similar to what is shown below to anyone who needs specific text brightened. 
 
 ## Screenshots
 Tokyo Night
@@ -45,6 +47,17 @@ I prefer my Codelens text fade into the background unless hovered over, but if y
 }
 ```
 
+## Window Active and Inactive borders (vscode 1.40.0)
+macOS dark-mode doesn't play well with these two theme mods so I've chosen to darken them as much as I can to fix the gray border issue on my side. Set them however you like using:
+```javascript
+"workbench.colorCustomizations": {
+    "[Tokyo Night]": { // or "[Tokyo Night Storm]"
+        "window.activeBorder": "#ff0000",
+        "window.inactiveBorder":"#0000ff"
+    }
+}
+```
+
 
 ## Other portings
 **iTerm**  
diff --git a/themes/tokyo-night-color-theme.json b/themes/tokyo-night-color-theme.json
index 16fdc29..bc16e62 100644
--- a/themes/tokyo-night-color-theme.json
+++ b/themes/tokyo-night-color-theme.json
@@ -15,6 +15,8 @@
         "icon.foreground": "#787c99",
         "imagePreview.border": "#9cacff22",
         "settings.headerForeground": "#6183bb",
+        "window.activeBorder": "#0d0f17",
+        "window.inactiveBorder":"#0d0f17",
 
         "extensionButton.prominentBackground": "#3d59a1DD",
         "extensionButton.prominentHoverBackground": "#3d59a1AA",
@@ -49,7 +51,9 @@
 
         "activityBar.background": "#16161e",
         "activityBar.foreground": "#787c99",
-        "activityBar.inactiveForeground": "#3b3e52", //"#35384a",
+        //"activityBar.activeBorder": "#3b3e52",
+        //"activityBar.activeBackground": "#101014",
+        "activityBar.inactiveForeground": "#3b3e52",
         "activityBar.border": "#16161e",
         "activityBar.dropBackground": "#20222c",
         "activityBarBadge.background": "#3d59a1",
diff --git a/themes/tokyo-night-storm-color-theme.json b/themes/tokyo-night-storm-color-theme.json
index 9a6077d..d932ab4 100644
--- a/themes/tokyo-night-storm-color-theme.json
+++ b/themes/tokyo-night-storm-color-theme.json
@@ -15,6 +15,8 @@
         "icon.foreground": "#7982a9",
         "imagePreview.border": "#9cacff33",
         "settings.headerForeground": "#6183bb",
+        "window.activeBorder": "#0d0f17",
+        "window.inactiveBorder":"#0d0f17",
 
         "extensionButton.prominentBackground": "#3d59a1DD",
         "extensionButton.prominentHoverBackground": "#3d59a1AA",
@@ -49,6 +51,8 @@
 
         "activityBar.background": "#1f2335",
         "activityBar.foreground": "#7982a9",
+        //"activityBar.activeBorder": "#41496b",
+        //"activityBar.activeBackground": "#1c2030",
         "activityBar.inactiveForeground": "#41496b", //#3b4261
         "activityBar.border": "#1f2335",
         "activityBar.dropBackground": "#282e44",