Unify borders

125 files changed, 250 insertions, 375 deletions

diff --git a/colors/base16-3024.config b/colors/base16-3024.config
index 3f3000f..5f600fc 100644
--- a/colors/base16-3024.config
+++ b/colors/base16-3024.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#a5a2a2
+
 [urgency=low]
 background-color=#3a3432
 text-color=#5c5855
-border-color=#4a4543
 
 [urgency=normal]
 background-color=#4a4543
 text-color=#a5a2a2
-border-color=#a5a2a2
 
 [urgency=high]
 background-color=#db2d20
 text-color=#d6d5d4
-border-color=#f7f7f7
diff --git a/colors/base16-apathy.config b/colors/base16-apathy.config
index c966bca..63cb78a 100644
--- a/colors/base16-apathy.config
+++ b/colors/base16-apathy.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#81B5AC
+
 [urgency=low]
 background-color=#0B342D
 text-color=#2B685E
-border-color=#184E45
 
 [urgency=normal]
 background-color=#184E45
 text-color=#81B5AC
-border-color=#81B5AC
 
 [urgency=high]
 background-color=#3E9688
 text-color=#A7CEC8
-border-color=#D2E7E4
diff --git a/colors/base16-ashes.config b/colors/base16-ashes.config
index 45b6e84..a83ee81 100644
--- a/colors/base16-ashes.config
+++ b/colors/base16-ashes.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#C7CCD1
+
 [urgency=low]
 background-color=#393F45
 text-color=#747C84
-border-color=#565E65
 
 [urgency=normal]
 background-color=#565E65
 text-color=#C7CCD1
-border-color=#C7CCD1
 
 [urgency=high]
 background-color=#C7AE95
 text-color=#DFE2E5
-border-color=#F3F4F5
diff --git a/colors/base16-atelier-cave-light.config b/colors/base16-atelier-cave-light.config
index 446003e..011f9b1 100644
--- a/colors/base16-atelier-cave-light.config
+++ b/colors/base16-atelier-cave-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#585260
+
 [urgency=low]
 background-color=#e2dfe7
 text-color=#7e7887
-border-color=#8b8792
 
 [urgency=normal]
 background-color=#8b8792
 text-color=#585260
-border-color=#585260
 
 [urgency=high]
 background-color=#be4678
 text-color=#26232a
-border-color=#19171c
diff --git a/colors/base16-atelier-cave.config b/colors/base16-atelier-cave.config
index c887736..7ca1771 100644
--- a/colors/base16-atelier-cave.config
+++ b/colors/base16-atelier-cave.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#8b8792
+
 [urgency=low]
 background-color=#26232a
 text-color=#655f6d
-border-color=#585260
 
 [urgency=normal]
 background-color=#585260
 text-color=#8b8792
-border-color=#8b8792
 
 [urgency=high]
 background-color=#be4678
 text-color=#e2dfe7
-border-color=#efecf4
diff --git a/colors/base16-atelier-dune-light.config b/colors/base16-atelier-dune-light.config
index 5ac35e5..d505653 100644
--- a/colors/base16-atelier-dune-light.config
+++ b/colors/base16-atelier-dune-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#6e6b5e
+
 [urgency=low]
 background-color=#e8e4cf
 text-color=#999580
-border-color=#a6a28c
 
 [urgency=normal]
 background-color=#a6a28c
 text-color=#6e6b5e
-border-color=#6e6b5e
 
 [urgency=high]
 background-color=#d73737
 text-color=#292824
-border-color=#20201d
diff --git a/colors/base16-atelier-dune.config b/colors/base16-atelier-dune.config
index 51631eb..12e023b 100644
--- a/colors/base16-atelier-dune.config
+++ b/colors/base16-atelier-dune.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#a6a28c
+
 [urgency=low]
 background-color=#292824
 text-color=#7d7a68
-border-color=#6e6b5e
 
 [urgency=normal]
 background-color=#6e6b5e
 text-color=#a6a28c
-border-color=#a6a28c
 
 [urgency=high]
 background-color=#d73737
 text-color=#e8e4cf
-border-color=#fefbec
diff --git a/colors/base16-atelier-estuary-light.config b/colors/base16-atelier-estuary-light.config
index 1b5011b..a58a45e 100644
--- a/colors/base16-atelier-estuary-light.config
+++ b/colors/base16-atelier-estuary-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#5f5e4e
+
 [urgency=low]
 background-color=#e7e6df
 text-color=#878573
-border-color=#929181
 
 [urgency=normal]
 background-color=#929181
 text-color=#5f5e4e
-border-color=#5f5e4e
 
 [urgency=high]
 background-color=#ba6236
 text-color=#302f27
-border-color=#22221b
diff --git a/colors/base16-atelier-estuary.config b/colors/base16-atelier-estuary.config
index ace48be..8a456ac 100644
--- a/colors/base16-atelier-estuary.config
+++ b/colors/base16-atelier-estuary.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#929181
+
 [urgency=low]
 background-color=#302f27
 text-color=#6c6b5a
-border-color=#5f5e4e
 
 [urgency=normal]
 background-color=#5f5e4e
 text-color=#929181
-border-color=#929181
 
 [urgency=high]
 background-color=#ba6236
 text-color=#e7e6df
-border-color=#f4f3ec
diff --git a/colors/base16-atelier-forest-light.config b/colors/base16-atelier-forest-light.config
index b53bca9..4524136 100644
--- a/colors/base16-atelier-forest-light.config
+++ b/colors/base16-atelier-forest-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#68615e
+
 [urgency=low]
 background-color=#e6e2e0
 text-color=#9c9491
-border-color=#a8a19f
 
 [urgency=normal]
 background-color=#a8a19f
 text-color=#68615e
-border-color=#68615e
 
 [urgency=high]
 background-color=#f22c40
 text-color=#2c2421
-border-color=#1b1918
diff --git a/colors/base16-atelier-forest.config b/colors/base16-atelier-forest.config
index c93dfc1..2b000d4 100644
--- a/colors/base16-atelier-forest.config
+++ b/colors/base16-atelier-forest.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#a8a19f
+
 [urgency=low]
 background-color=#2c2421
 text-color=#766e6b
-border-color=#68615e
 
 [urgency=normal]
 background-color=#68615e
 text-color=#a8a19f
-border-color=#a8a19f
 
 [urgency=high]
 background-color=#f22c40
 text-color=#e6e2e0
-border-color=#f1efee
diff --git a/colors/base16-atelier-heath-light.config b/colors/base16-atelier-heath-light.config
index 4402310..bfcb657 100644
--- a/colors/base16-atelier-heath-light.config
+++ b/colors/base16-atelier-heath-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#695d69
+
 [urgency=low]
 background-color=#d8cad8
 text-color=#9e8f9e
-border-color=#ab9bab
 
 [urgency=normal]
 background-color=#ab9bab
 text-color=#695d69
-border-color=#695d69
 
 [urgency=high]
 background-color=#ca402b
 text-color=#292329
-border-color=#1b181b
diff --git a/colors/base16-atelier-heath.config b/colors/base16-atelier-heath.config
index 5aff765..a5371b6 100644
--- a/colors/base16-atelier-heath.config
+++ b/colors/base16-atelier-heath.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#ab9bab
+
 [urgency=low]
 background-color=#292329
 text-color=#776977
-border-color=#695d69
 
 [urgency=normal]
 background-color=#695d69
 text-color=#ab9bab
-border-color=#ab9bab
 
 [urgency=high]
 background-color=#ca402b
 text-color=#d8cad8
-border-color=#f7f3f7
diff --git a/colors/base16-atelier-lakeside-light.config b/colors/base16-atelier-lakeside-light.config
index 09b0170..695d6d7 100644
--- a/colors/base16-atelier-lakeside-light.config
+++ b/colors/base16-atelier-lakeside-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#516d7b
+
 [urgency=low]
 background-color=#c1e4f6
 text-color=#7195a8
-border-color=#7ea2b4
 
 [urgency=normal]
 background-color=#7ea2b4
 text-color=#516d7b
-border-color=#516d7b
 
 [urgency=high]
 background-color=#d22d72
 text-color=#1f292e
-border-color=#161b1d
diff --git a/colors/base16-atelier-lakeside.config b/colors/base16-atelier-lakeside.config
index 90c8a6d..37fe9de 100644
--- a/colors/base16-atelier-lakeside.config
+++ b/colors/base16-atelier-lakeside.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#7ea2b4
+
 [urgency=low]
 background-color=#1f292e
 text-color=#5a7b8c
-border-color=#516d7b
 
 [urgency=normal]
 background-color=#516d7b
 text-color=#7ea2b4
-border-color=#7ea2b4
 
 [urgency=high]
 background-color=#d22d72
 text-color=#c1e4f6
-border-color=#ebf8ff
diff --git a/colors/base16-atelier-plateau-light.config b/colors/base16-atelier-plateau-light.config
index b955ddf..5195989 100644
--- a/colors/base16-atelier-plateau-light.config
+++ b/colors/base16-atelier-plateau-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#585050
+
 [urgency=low]
 background-color=#e7dfdf
 text-color=#7e7777
-border-color=#8a8585
 
 [urgency=normal]
 background-color=#8a8585
 text-color=#585050
-border-color=#585050
 
 [urgency=high]
 background-color=#ca4949
 text-color=#292424
-border-color=#1b1818
diff --git a/colors/base16-atelier-plateau.config b/colors/base16-atelier-plateau.config
index 6729076..f7a0ea1 100644
--- a/colors/base16-atelier-plateau.config
+++ b/colors/base16-atelier-plateau.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#8a8585
+
 [urgency=low]
 background-color=#292424
 text-color=#655d5d
-border-color=#585050
 
 [urgency=normal]
 background-color=#585050
 text-color=#8a8585
-border-color=#8a8585
 
 [urgency=high]
 background-color=#ca4949
 text-color=#e7dfdf
-border-color=#f4ecec
diff --git a/colors/base16-atelier-savanna-light.config b/colors/base16-atelier-savanna-light.config
index b2e40af..8321add 100644
--- a/colors/base16-atelier-savanna-light.config
+++ b/colors/base16-atelier-savanna-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#526057
+
 [urgency=low]
 background-color=#dfe7e2
 text-color=#78877d
-border-color=#87928a
 
 [urgency=normal]
 background-color=#87928a
 text-color=#526057
-border-color=#526057
 
 [urgency=high]
 background-color=#b16139
 text-color=#232a25
-border-color=#171c19
diff --git a/colors/base16-atelier-savanna.config b/colors/base16-atelier-savanna.config
index f943a2b..679ed00 100644
--- a/colors/base16-atelier-savanna.config
+++ b/colors/base16-atelier-savanna.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#87928a
+
 [urgency=low]
 background-color=#232a25
 text-color=#5f6d64
-border-color=#526057
 
 [urgency=normal]
 background-color=#526057
 text-color=#87928a
-border-color=#87928a
 
 [urgency=high]
 background-color=#b16139
 text-color=#dfe7e2
-border-color=#ecf4ee
diff --git a/colors/base16-atelier-seaside-light.config b/colors/base16-atelier-seaside-light.config
index afd52e7..5df5705 100644
--- a/colors/base16-atelier-seaside-light.config
+++ b/colors/base16-atelier-seaside-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#5e6e5e
+
 [urgency=low]
 background-color=#cfe8cf
 text-color=#809980
-border-color=#8ca68c
 
 [urgency=normal]
 background-color=#8ca68c
 text-color=#5e6e5e
-border-color=#5e6e5e
 
 [urgency=high]
 background-color=#e6193c
 text-color=#242924
-border-color=#131513
diff --git a/colors/base16-atelier-seaside.config b/colors/base16-atelier-seaside.config
index d415e3b..5c2ca8e 100644
--- a/colors/base16-atelier-seaside.config
+++ b/colors/base16-atelier-seaside.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#8ca68c
+
 [urgency=low]
 background-color=#242924
 text-color=#687d68
-border-color=#5e6e5e
 
 [urgency=normal]
 background-color=#5e6e5e
 text-color=#8ca68c
-border-color=#8ca68c
 
 [urgency=high]
 background-color=#e6193c
 text-color=#cfe8cf
-border-color=#f4fbf4
diff --git a/colors/base16-atelier-sulphurpool-light.config b/colors/base16-atelier-sulphurpool-light.config
index c064791..ee85e31 100644
--- a/colors/base16-atelier-sulphurpool-light.config
+++ b/colors/base16-atelier-sulphurpool-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#5e6687
+
 [urgency=low]
 background-color=#dfe2f1
 text-color=#898ea4
-border-color=#979db4
 
 [urgency=normal]
 background-color=#979db4
 text-color=#5e6687
-border-color=#5e6687
 
 [urgency=high]
 background-color=#c94922
 text-color=#293256
-border-color=#202746
diff --git a/colors/base16-atelier-sulphurpool.config b/colors/base16-atelier-sulphurpool.config
index 884f844..fba36a8 100644
--- a/colors/base16-atelier-sulphurpool.config
+++ b/colors/base16-atelier-sulphurpool.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#979db4
+
 [urgency=low]
 background-color=#293256
 text-color=#6b7394
-border-color=#5e6687
 
 [urgency=normal]
 background-color=#5e6687
 text-color=#979db4
-border-color=#979db4
 
 [urgency=high]
 background-color=#c94922
 text-color=#dfe2f1
-border-color=#f5f7ff
diff --git a/colors/base16-atlas.config b/colors/base16-atlas.config
index 6fa3b74..81669af 100644
--- a/colors/base16-atlas.config
+++ b/colors/base16-atlas.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#a1a19a
+
 [urgency=low]
 background-color=#00384d
 text-color=#6C8B91
-border-color=#517F8D
 
 [urgency=normal]
 background-color=#517F8D
 text-color=#a1a19a
-border-color=#a1a19a
 
 [urgency=high]
 background-color=#ff5a67
 text-color=#e6e6dc
-border-color=#fafaf8
diff --git a/colors/base16-bespin.config b/colors/base16-bespin.config
index 4a18ab8..304f127 100644
--- a/colors/base16-bespin.config
+++ b/colors/base16-bespin.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#8a8986
+
 [urgency=low]
 background-color=#36312e
 text-color=#666666
-border-color=#5e5d5c
 
 [urgency=normal]
 background-color=#5e5d5c
 text-color=#8a8986
-border-color=#8a8986
 
 [urgency=high]
 background-color=#cf6a4c
 text-color=#9d9b97
-border-color=#baae9e
diff --git a/colors/base16-black-metal-bathory.config b/colors/base16-black-metal-bathory.config
index 9714335..d5643ff 100644
--- a/colors/base16-black-metal-bathory.config
+++ b/colors/base16-black-metal-bathory.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#c1c1c1
+
 [urgency=low]
 background-color=#121212
 text-color=#333333
-border-color=#222222
 
 [urgency=normal]
 background-color=#222222
 text-color=#c1c1c1
-border-color=#c1c1c1
 
 [urgency=high]
 background-color=#5f8787
 text-color=#999999
-border-color=#c1c1c1
diff --git a/colors/base16-black-metal-burzum.config b/colors/base16-black-metal-burzum.config
index 66fae1f..a2ad8af 100644
--- a/colors/base16-black-metal-burzum.config
+++ b/colors/base16-black-metal-burzum.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#c1c1c1
+
 [urgency=low]
 background-color=#121212
 text-color=#333333
-border-color=#222222
 
 [urgency=normal]
 background-color=#222222
 text-color=#c1c1c1
-border-color=#c1c1c1
 
 [urgency=high]
 background-color=#5f8787
 text-color=#999999
-border-color=#c1c1c1
diff --git a/colors/base16-black-metal-dark-funeral.config b/colors/base16-black-metal-dark-funeral.config
index 37d9b53..f84e114 100644
--- a/colors/base16-black-metal-dark-funeral.config
+++ b/colors/base16-black-metal-dark-funeral.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#c1c1c1
+
 [urgency=low]
 background-color=#121212
 text-color=#333333
-border-color=#222222
 
 [urgency=normal]
 background-color=#222222
 text-color=#c1c1c1
-border-color=#c1c1c1
 
 [urgency=high]
 background-color=#5f8787
 text-color=#999999
-border-color=#c1c1c1
diff --git a/colors/base16-black-metal-gorgoroth.config b/colors/base16-black-metal-gorgoroth.config
index 27623d8..d20868f 100644
--- a/colors/base16-black-metal-gorgoroth.config
+++ b/colors/base16-black-metal-gorgoroth.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#c1c1c1
+
 [urgency=low]
 background-color=#121212
 text-color=#333333
-border-color=#222222
 
 [urgency=normal]
 background-color=#222222
 text-color=#c1c1c1
-border-color=#c1c1c1
 
 [urgency=high]
 background-color=#5f8787
 text-color=#999999
-border-color=#c1c1c1
diff --git a/colors/base16-black-metal-immortal.config b/colors/base16-black-metal-immortal.config
index 7094752..a1c3d3f 100644
--- a/colors/base16-black-metal-immortal.config
+++ b/colors/base16-black-metal-immortal.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#c1c1c1
+
 [urgency=low]
 background-color=#121212
 text-color=#333333
-border-color=#222222
 
 [urgency=normal]
 background-color=#222222
 text-color=#c1c1c1
-border-color=#c1c1c1
 
 [urgency=high]
 background-color=#5f8787
 text-color=#999999
-border-color=#c1c1c1
diff --git a/colors/base16-black-metal-khold.config b/colors/base16-black-metal-khold.config
index a9334ac..edc7a2b 100644
--- a/colors/base16-black-metal-khold.config
+++ b/colors/base16-black-metal-khold.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#c1c1c1
+
 [urgency=low]
 background-color=#121212
 text-color=#333333
-border-color=#222222
 
 [urgency=normal]
 background-color=#222222
 text-color=#c1c1c1
-border-color=#c1c1c1
 
 [urgency=high]
 background-color=#5f8787
 text-color=#999999
-border-color=#c1c1c1
diff --git a/colors/base16-black-metal-marduk.config b/colors/base16-black-metal-marduk.config
index 3fdbf78..01e2333 100644
--- a/colors/base16-black-metal-marduk.config
+++ b/colors/base16-black-metal-marduk.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#c1c1c1
+
 [urgency=low]
 background-color=#121212
 text-color=#333333
-border-color=#222222
 
 [urgency=normal]
 background-color=#222222
 text-color=#c1c1c1
-border-color=#c1c1c1
 
 [urgency=high]
 background-color=#5f8787
 text-color=#999999
-border-color=#c1c1c1
diff --git a/colors/base16-black-metal-mayhem.config b/colors/base16-black-metal-mayhem.config
index 52a8fbc..3dcf129 100644
--- a/colors/base16-black-metal-mayhem.config
+++ b/colors/base16-black-metal-mayhem.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#c1c1c1
+
 [urgency=low]
 background-color=#121212
 text-color=#333333
-border-color=#222222
 
 [urgency=normal]
 background-color=#222222
 text-color=#c1c1c1
-border-color=#c1c1c1
 
 [urgency=high]
 background-color=#5f8787
 text-color=#999999
-border-color=#c1c1c1
diff --git a/colors/base16-black-metal-nile.config b/colors/base16-black-metal-nile.config
index 9975727..a5a7562 100644
--- a/colors/base16-black-metal-nile.config
+++ b/colors/base16-black-metal-nile.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#c1c1c1
+
 [urgency=low]
 background-color=#121212
 text-color=#333333
-border-color=#222222
 
 [urgency=normal]
 background-color=#222222
 text-color=#c1c1c1
-border-color=#c1c1c1
 
 [urgency=high]
 background-color=#5f8787
 text-color=#999999
-border-color=#c1c1c1
diff --git a/colors/base16-black-metal-venom.config b/colors/base16-black-metal-venom.config
index 9763e06..544f5ab 100644
--- a/colors/base16-black-metal-venom.config
+++ b/colors/base16-black-metal-venom.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#c1c1c1
+
 [urgency=low]
 background-color=#121212
 text-color=#333333
-border-color=#222222
 
 [urgency=normal]
 background-color=#222222
 text-color=#c1c1c1
-border-color=#c1c1c1
 
 [urgency=high]
 background-color=#5f8787
 text-color=#999999
-border-color=#c1c1c1
diff --git a/colors/base16-black-metal.config b/colors/base16-black-metal.config
index ed8825a..826733e 100644
--- a/colors/base16-black-metal.config
+++ b/colors/base16-black-metal.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#c1c1c1
+
 [urgency=low]
 background-color=#121212
 text-color=#333333
-border-color=#222222
 
 [urgency=normal]
 background-color=#222222
 text-color=#c1c1c1
-border-color=#c1c1c1
 
 [urgency=high]
 background-color=#5f8787
 text-color=#999999
-border-color=#c1c1c1
diff --git a/colors/base16-brewer.config b/colors/base16-brewer.config
index 92bcf65..21098e6 100644
--- a/colors/base16-brewer.config
+++ b/colors/base16-brewer.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#b7b8b9
+
 [urgency=low]
 background-color=#2e2f30
 text-color=#737475
-border-color=#515253
 
 [urgency=normal]
 background-color=#515253
 text-color=#b7b8b9
-border-color=#b7b8b9
 
 [urgency=high]
 background-color=#e31a1c
 text-color=#dadbdc
-border-color=#fcfdfe
diff --git a/colors/base16-bright.config b/colors/base16-bright.config
index 68fc001..36f7c09 100644
--- a/colors/base16-bright.config
+++ b/colors/base16-bright.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#e0e0e0
+
 [urgency=low]
 background-color=#303030
 text-color=#b0b0b0
-border-color=#505050
 
 [urgency=normal]
 background-color=#505050
 text-color=#e0e0e0
-border-color=#e0e0e0
 
 [urgency=high]
 background-color=#fb0120
 text-color=#f5f5f5
-border-color=#ffffff
diff --git a/colors/base16-brogrammer.config b/colors/base16-brogrammer.config
index 76e0427..ba4db39 100644
--- a/colors/base16-brogrammer.config
+++ b/colors/base16-brogrammer.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#4e5ab7
+
 [urgency=low]
 background-color=#f81118
 text-color=#ecba0f
-border-color=#2dc55e
 
 [urgency=normal]
 background-color=#2dc55e
 text-color=#4e5ab7
-border-color=#4e5ab7
 
 [urgency=high]
 background-color=#d6dbe5
 text-color=#1081d6
-border-color=#d6dbe5
diff --git a/colors/base16-brushtrees-dark.config b/colors/base16-brushtrees-dark.config
index ba0792f..6ad93e7 100644
--- a/colors/base16-brushtrees-dark.config
+++ b/colors/base16-brushtrees-dark.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#B0C5C8
+
 [urgency=low]
 background-color=#5A6D7A
 text-color=#8299A1
-border-color=#6D828E
 
 [urgency=normal]
 background-color=#6D828E
 text-color=#B0C5C8
-border-color=#B0C5C8
 
 [urgency=high]
 background-color=#b38686
 text-color=#C9DBDC
-border-color=#E3EFEF
diff --git a/colors/base16-brushtrees.config b/colors/base16-brushtrees.config
index b562868..cb01113 100644
--- a/colors/base16-brushtrees.config
+++ b/colors/base16-brushtrees.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#6D828E
+
 [urgency=low]
 background-color=#C9DBDC
 text-color=#98AFB5
-border-color=#B0C5C8
 
 [urgency=normal]
 background-color=#B0C5C8
 text-color=#6D828E
-border-color=#6D828E
 
 [urgency=high]
 background-color=#b38686
 text-color=#5A6D7A
-border-color=#485867
diff --git a/colors/base16-chalk.config b/colors/base16-chalk.config
index 9bd08ec..7373722 100644
--- a/colors/base16-chalk.config
+++ b/colors/base16-chalk.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#d0d0d0
+
 [urgency=low]
 background-color=#202020
 text-color=#505050
-border-color=#303030
 
 [urgency=normal]
 background-color=#303030
 text-color=#d0d0d0
-border-color=#d0d0d0
 
 [urgency=high]
 background-color=#fb9fb1
 text-color=#e0e0e0
-border-color=#f5f5f5
diff --git a/colors/base16-circus.config b/colors/base16-circus.config
index d61d97a..6f44ea6 100644
--- a/colors/base16-circus.config
+++ b/colors/base16-circus.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#a7a7a7
+
 [urgency=low]
 background-color=#202020
 text-color=#5f5a60
-border-color=#303030
 
 [urgency=normal]
 background-color=#303030
 text-color=#a7a7a7
-border-color=#a7a7a7
 
 [urgency=high]
 background-color=#dc657d
 text-color=#808080
-border-color=#ffffff
diff --git a/colors/base16-classic-dark.config b/colors/base16-classic-dark.config
index f8eee57..41ca8f6 100644
--- a/colors/base16-classic-dark.config
+++ b/colors/base16-classic-dark.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#D0D0D0
+
 [urgency=low]
 background-color=#202020
 text-color=#505050
-border-color=#303030
 
 [urgency=normal]
 background-color=#303030
 text-color=#D0D0D0
-border-color=#D0D0D0
 
 [urgency=high]
 background-color=#AC4142
 text-color=#E0E0E0
-border-color=#F5F5F5
diff --git a/colors/base16-classic-light.config b/colors/base16-classic-light.config
index 8e7821b..124c03d 100644
--- a/colors/base16-classic-light.config
+++ b/colors/base16-classic-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#303030
+
 [urgency=low]
 background-color=#E0E0E0
 text-color=#B0B0B0
-border-color=#D0D0D0
 
 [urgency=normal]
 background-color=#D0D0D0
 text-color=#303030
-border-color=#303030
 
 [urgency=high]
 background-color=#AC4142
 text-color=#202020
-border-color=#151515
diff --git a/colors/base16-codeschool.config b/colors/base16-codeschool.config
index 4d2b2bd..e0383dc 100644
--- a/colors/base16-codeschool.config
+++ b/colors/base16-codeschool.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#9ea7a6
+
 [urgency=low]
 background-color=#1c3657
 text-color=#3f4944
-border-color=#2a343a
 
 [urgency=normal]
 background-color=#2a343a
 text-color=#9ea7a6
-border-color=#9ea7a6
 
 [urgency=high]
 background-color=#2a5491
 text-color=#a7cfa3
-border-color=#b5d8f6
diff --git a/colors/base16-cupcake.config b/colors/base16-cupcake.config
index 58919e1..1de8699 100644
--- a/colors/base16-cupcake.config
+++ b/colors/base16-cupcake.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#8b8198
+
 [urgency=low]
 background-color=#f2f1f4
 text-color=#bfb9c6
-border-color=#d8d5dd
 
 [urgency=normal]
 background-color=#d8d5dd
 text-color=#8b8198
-border-color=#8b8198
 
 [urgency=high]
 background-color=#D57E85
 text-color=#72677E
-border-color=#585062
diff --git a/colors/base16-cupertino.config b/colors/base16-cupertino.config
index cef59ad..f4e2b20 100644
--- a/colors/base16-cupertino.config
+++ b/colors/base16-cupertino.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#404040
+
 [urgency=low]
 background-color=#c0c0c0
 text-color=#808080
-border-color=#c0c0c0
 
 [urgency=normal]
 background-color=#c0c0c0
 text-color=#404040
-border-color=#404040
 
 [urgency=high]
 background-color=#c41a15
 text-color=#404040
-border-color=#5e5e5e
diff --git a/colors/base16-darktooth.config b/colors/base16-darktooth.config
index e487fd0..1e36220 100644
--- a/colors/base16-darktooth.config
+++ b/colors/base16-darktooth.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#A89984
+
 [urgency=low]
 background-color=#32302F
 text-color=#665C54
-border-color=#504945
 
 [urgency=normal]
 background-color=#504945
 text-color=#A89984
-border-color=#A89984
 
 [urgency=high]
 background-color=#FB543F
 text-color=#D5C4A1
-border-color=#FDF4C1
diff --git a/colors/base16-default-dark.config b/colors/base16-default-dark.config
index f5a55a8..93d3f81 100644
--- a/colors/base16-default-dark.config
+++ b/colors/base16-default-dark.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#d8d8d8
+
 [urgency=low]
 background-color=#282828
 text-color=#585858
-border-color=#383838
 
 [urgency=normal]
 background-color=#383838
 text-color=#d8d8d8
-border-color=#d8d8d8
 
 [urgency=high]
 background-color=#ab4642
 text-color=#e8e8e8
-border-color=#f8f8f8
diff --git a/colors/base16-default-light.config b/colors/base16-default-light.config
index f65cdf9..4fe8c96 100644
--- a/colors/base16-default-light.config
+++ b/colors/base16-default-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#383838
+
 [urgency=low]
 background-color=#e8e8e8
 text-color=#b8b8b8
-border-color=#d8d8d8
 
 [urgency=normal]
 background-color=#d8d8d8
 text-color=#383838
-border-color=#383838
 
 [urgency=high]
 background-color=#ab4642
 text-color=#282828
-border-color=#181818
diff --git a/colors/base16-dracula.config b/colors/base16-dracula.config
index db29b0e..3d778c7 100644
--- a/colors/base16-dracula.config
+++ b/colors/base16-dracula.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#e9e9f4
+
 [urgency=low]
 background-color=#3a3c4e
 text-color=#626483
-border-color=#4d4f68
 
 [urgency=normal]
 background-color=#4d4f68
 text-color=#e9e9f4
-border-color=#e9e9f4
 
 [urgency=high]
 background-color=#ea51b2
 text-color=#f1f2f8
-border-color=#f7f7fb
diff --git a/colors/base16-eighties.config b/colors/base16-eighties.config
index 604c967..f65166a 100644
--- a/colors/base16-eighties.config
+++ b/colors/base16-eighties.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#d3d0c8
+
 [urgency=low]
 background-color=#393939
 text-color=#747369
-border-color=#515151
 
 [urgency=normal]
 background-color=#515151
 text-color=#d3d0c8
-border-color=#d3d0c8
 
 [urgency=high]
 background-color=#f2777a
 text-color=#e8e6df
-border-color=#f2f0ec
diff --git a/colors/base16-embers.config b/colors/base16-embers.config
index 3b992f9..9dfec35 100644
--- a/colors/base16-embers.config
+++ b/colors/base16-embers.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#A39A90
+
 [urgency=low]
 background-color=#2C2620
 text-color=#5A5047
-border-color=#433B32
 
 [urgency=normal]
 background-color=#433B32
 text-color=#A39A90
-border-color=#A39A90
 
 [urgency=high]
 background-color=#826D57
 text-color=#BEB6AE
-border-color=#DBD6D1
diff --git a/colors/base16-flat.config b/colors/base16-flat.config
index 8e86e1d..433c528 100644
--- a/colors/base16-flat.config
+++ b/colors/base16-flat.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#e0e0e0
+
 [urgency=low]
 background-color=#34495E
 text-color=#95A5A6
-border-color=#7F8C8D
 
 [urgency=normal]
 background-color=#7F8C8D
 text-color=#e0e0e0
-border-color=#e0e0e0
 
 [urgency=high]
 background-color=#E74C3C
 text-color=#f5f5f5
-border-color=#ECF0F1
diff --git a/colors/base16-fruit-soda.config b/colors/base16-fruit-soda.config
index 1a0eecb..da00a4f 100644
--- a/colors/base16-fruit-soda.config
+++ b/colors/base16-fruit-soda.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#515151
+
 [urgency=low]
 background-color=#e0dee0
 text-color=#b5b4b6
-border-color=#d8d5d5
 
 [urgency=normal]
 background-color=#d8d5d5
 text-color=#515151
-border-color=#515151
 
 [urgency=high]
 background-color=#fe3e31
 text-color=#474545
-border-color=#2d2c2c
diff --git a/colors/base16-github.config b/colors/base16-github.config
index 904ed3c..3a7bbe5 100644
--- a/colors/base16-github.config
+++ b/colors/base16-github.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#333333
+
 [urgency=low]
 background-color=#f5f5f5
 text-color=#969896
-border-color=#c8c8fa
 
 [urgency=normal]
 background-color=#c8c8fa
 text-color=#333333
-border-color=#333333
 
 [urgency=high]
 background-color=#ed6a43
 text-color=#ffffff
-border-color=#ffffff
diff --git a/colors/base16-google-dark.config b/colors/base16-google-dark.config
index 9e5913e..a6dd9e8 100644
--- a/colors/base16-google-dark.config
+++ b/colors/base16-google-dark.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#c5c8c6
+
 [urgency=low]
 background-color=#282a2e
 text-color=#969896
-border-color=#373b41
 
 [urgency=normal]
 background-color=#373b41
 text-color=#c5c8c6
-border-color=#c5c8c6
 
 [urgency=high]
 background-color=#CC342B
 text-color=#e0e0e0
-border-color=#ffffff
diff --git a/colors/base16-google-light.config b/colors/base16-google-light.config
index b11bb3c..05acafc 100644
--- a/colors/base16-google-light.config
+++ b/colors/base16-google-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#373b41
+
 [urgency=low]
 background-color=#e0e0e0
 text-color=#b4b7b4
-border-color=#c5c8c6
 
 [urgency=normal]
 background-color=#c5c8c6
 text-color=#373b41
-border-color=#373b41
 
 [urgency=high]
 background-color=#CC342B
 text-color=#282a2e
-border-color=#1d1f21
diff --git a/colors/base16-grayscale-dark.config b/colors/base16-grayscale-dark.config
index 19f651b..67c03c3 100644
--- a/colors/base16-grayscale-dark.config
+++ b/colors/base16-grayscale-dark.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#b9b9b9
+
 [urgency=low]
 background-color=#252525
 text-color=#525252
-border-color=#464646
 
 [urgency=normal]
 background-color=#464646
 text-color=#b9b9b9
-border-color=#b9b9b9
 
 [urgency=high]
 background-color=#7c7c7c
 text-color=#e3e3e3
-border-color=#f7f7f7
diff --git a/colors/base16-grayscale-light.config b/colors/base16-grayscale-light.config
index 7298655..2882010 100644
--- a/colors/base16-grayscale-light.config
+++ b/colors/base16-grayscale-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#464646
+
 [urgency=low]
 background-color=#e3e3e3
 text-color=#ababab
-border-color=#b9b9b9
 
 [urgency=normal]
 background-color=#b9b9b9
 text-color=#464646
-border-color=#464646
 
 [urgency=high]
 background-color=#7c7c7c
 text-color=#252525
-border-color=#101010
diff --git a/colors/base16-greenscreen.config b/colors/base16-greenscreen.config
index fc04b34..b36b5a5 100644
--- a/colors/base16-greenscreen.config
+++ b/colors/base16-greenscreen.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#00bb00
+
 [urgency=low]
 background-color=#003300
 text-color=#007700
-border-color=#005500
 
 [urgency=normal]
 background-color=#005500
 text-color=#00bb00
-border-color=#00bb00
 
 [urgency=high]
 background-color=#007700
 text-color=#00dd00
-border-color=#00ff00
diff --git a/colors/base16-gruvbox-dark-hard.config b/colors/base16-gruvbox-dark-hard.config
index 7c7d969..b8ae557 100644
--- a/colors/base16-gruvbox-dark-hard.config
+++ b/colors/base16-gruvbox-dark-hard.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#d5c4a1
+
 [urgency=low]
 background-color=#3c3836
 text-color=#665c54
-border-color=#504945
 
 [urgency=normal]
 background-color=#504945
 text-color=#d5c4a1
-border-color=#d5c4a1
 
 [urgency=high]
 background-color=#fb4934
 text-color=#ebdbb2
-border-color=#fbf1c7
diff --git a/colors/base16-gruvbox-dark-medium.config b/colors/base16-gruvbox-dark-medium.config
index d754acb..e0a3f18 100644
--- a/colors/base16-gruvbox-dark-medium.config
+++ b/colors/base16-gruvbox-dark-medium.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#d5c4a1
+
 [urgency=low]
 background-color=#3c3836
 text-color=#665c54
-border-color=#504945
 
 [urgency=normal]
 background-color=#504945
 text-color=#d5c4a1
-border-color=#d5c4a1
 
 [urgency=high]
 background-color=#fb4934
 text-color=#ebdbb2
-border-color=#fbf1c7
diff --git a/colors/base16-gruvbox-dark-pale.config b/colors/base16-gruvbox-dark-pale.config
index f75a8d9..a3faf94 100644
--- a/colors/base16-gruvbox-dark-pale.config
+++ b/colors/base16-gruvbox-dark-pale.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#dab997
+
 [urgency=low]
 background-color=#3a3a3a
 text-color=#8a8a8a
-border-color=#4e4e4e
 
 [urgency=normal]
 background-color=#4e4e4e
 text-color=#dab997
-border-color=#dab997
 
 [urgency=high]
 background-color=#d75f5f
 text-color=#d5c4a1
-border-color=#ebdbb2
diff --git a/colors/base16-gruvbox-dark-soft.config b/colors/base16-gruvbox-dark-soft.config
index bace115..3b89d96 100644
--- a/colors/base16-gruvbox-dark-soft.config
+++ b/colors/base16-gruvbox-dark-soft.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#d5c4a1
+
 [urgency=low]
 background-color=#3c3836
 text-color=#665c54
-border-color=#504945
 
 [urgency=normal]
 background-color=#504945
 text-color=#d5c4a1
-border-color=#d5c4a1
 
 [urgency=high]
 background-color=#fb4934
 text-color=#ebdbb2
-border-color=#fbf1c7
diff --git a/colors/base16-gruvbox-light-hard.config b/colors/base16-gruvbox-light-hard.config
index 3458836..d96de45 100644
--- a/colors/base16-gruvbox-light-hard.config
+++ b/colors/base16-gruvbox-light-hard.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#504945
+
 [urgency=low]
 background-color=#ebdbb2
 text-color=#bdae93
-border-color=#d5c4a1
 
 [urgency=normal]
 background-color=#d5c4a1
 text-color=#504945
-border-color=#504945
 
 [urgency=high]
 background-color=#9d0006
 text-color=#3c3836
-border-color=#282828
diff --git a/colors/base16-gruvbox-light-medium.config b/colors/base16-gruvbox-light-medium.config
index 80007ba..711e674 100644
--- a/colors/base16-gruvbox-light-medium.config
+++ b/colors/base16-gruvbox-light-medium.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#504945
+
 [urgency=low]
 background-color=#ebdbb2
 text-color=#bdae93
-border-color=#d5c4a1
 
 [urgency=normal]
 background-color=#d5c4a1
 text-color=#504945
-border-color=#504945
 
 [urgency=high]
 background-color=#9d0006
 text-color=#3c3836
-border-color=#282828
diff --git a/colors/base16-gruvbox-light-soft.config b/colors/base16-gruvbox-light-soft.config
index 0c8afdc..2536080 100644
--- a/colors/base16-gruvbox-light-soft.config
+++ b/colors/base16-gruvbox-light-soft.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#504945
+
 [urgency=low]
 background-color=#ebdbb2
 text-color=#bdae93
-border-color=#d5c4a1
 
 [urgency=normal]
 background-color=#d5c4a1
 text-color=#504945
-border-color=#504945
 
 [urgency=high]
 background-color=#9d0006
 text-color=#3c3836
-border-color=#282828
diff --git a/colors/base16-harmonic-dark.config b/colors/base16-harmonic-dark.config
index 82dd9e7..a1b908e 100644
--- a/colors/base16-harmonic-dark.config
+++ b/colors/base16-harmonic-dark.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#cbd6e2
+
 [urgency=low]
 background-color=#223b54
 text-color=#627e99
-border-color=#405c79
 
 [urgency=normal]
 background-color=#405c79
 text-color=#cbd6e2
-border-color=#cbd6e2
 
 [urgency=high]
 background-color=#bf8b56
 text-color=#e5ebf1
-border-color=#f7f9fb
diff --git a/colors/base16-harmonic-light.config b/colors/base16-harmonic-light.config
index cd05a09..f40d89d 100644
--- a/colors/base16-harmonic-light.config
+++ b/colors/base16-harmonic-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#405c79
+
 [urgency=low]
 background-color=#e5ebf1
 text-color=#aabcce
-border-color=#cbd6e2
 
 [urgency=normal]
 background-color=#cbd6e2
 text-color=#405c79
-border-color=#405c79
 
 [urgency=high]
 background-color=#bf8b56
 text-color=#223b54
-border-color=#0b1c2c
diff --git a/colors/base16-heetch-light.config b/colors/base16-heetch-light.config
index 1cc4423..a368ee6 100644
--- a/colors/base16-heetch-light.config
+++ b/colors/base16-heetch-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#5a496e
+
 [urgency=low]
 background-color=#392551
 text-color=#9c92a8
-border-color=#7b6d8b
 
 [urgency=normal]
 background-color=#7b6d8b
 text-color=#5a496e
-border-color=#5a496e
 
 [urgency=high]
 background-color=#27d9d5
 text-color=#470546
-border-color=#190134
diff --git a/colors/base16-heetch.config b/colors/base16-heetch.config
index 6bb02d9..df5b869 100644
--- a/colors/base16-heetch.config
+++ b/colors/base16-heetch.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#BDB6C5
+
 [urgency=low]
 background-color=#392551
 text-color=#7B6D8B
-border-color=#5A496E
 
 [urgency=normal]
 background-color=#5A496E
 text-color=#BDB6C5
-border-color=#BDB6C5
 
 [urgency=high]
 background-color=#27D9D5
 text-color=#DEDAE2
-border-color=#FEFFFF
diff --git a/colors/base16-hopscotch.config b/colors/base16-hopscotch.config
index 86b1b60..299db1b 100644
--- a/colors/base16-hopscotch.config
+++ b/colors/base16-hopscotch.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#b9b5b8
+
 [urgency=low]
 background-color=#433b42
 text-color=#797379
-border-color=#5c545b
 
 [urgency=normal]
 background-color=#5c545b
 text-color=#b9b5b8
-border-color=#b9b5b8
 
 [urgency=high]
 background-color=#dd464c
 text-color=#d5d3d5
-border-color=#ffffff
diff --git a/colors/base16-ia-dark.config b/colors/base16-ia-dark.config
index 4a589b5..e2986b1 100644
--- a/colors/base16-ia-dark.config
+++ b/colors/base16-ia-dark.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#cccccc
+
 [urgency=low]
 background-color=#222222
 text-color=#767676
-border-color=#1d414d
 
 [urgency=normal]
 background-color=#1d414d
 text-color=#cccccc
-border-color=#cccccc
 
 [urgency=high]
 background-color=#d88568
 text-color=#e8e8e8
-border-color=#f8f8f8
diff --git a/colors/base16-ia-light.config b/colors/base16-ia-light.config
index bbd15f6..d72afc6 100644
--- a/colors/base16-ia-light.config
+++ b/colors/base16-ia-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#181818
+
 [urgency=low]
 background-color=#dedede
 text-color=#898989
-border-color=#bde5f2
 
 [urgency=normal]
 background-color=#bde5f2
 text-color=#181818
-border-color=#181818
 
 [urgency=high]
 background-color=#9c5a02
 text-color=#e8e8e8
-border-color=#f8f8f8
diff --git a/colors/base16-icy.config b/colors/base16-icy.config
index daf04c6..12fbab9 100644
--- a/colors/base16-icy.config
+++ b/colors/base16-icy.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#095b67
+
 [urgency=low]
 background-color=#031619
 text-color=#052e34
-border-color=#041f23
 
 [urgency=normal]
 background-color=#041f23
 text-color=#095b67
-border-color=#095b67
 
 [urgency=high]
 background-color=#16c1d9
 text-color=#0c7c8c
-border-color=#109cb0
diff --git a/colors/base16-irblack.config b/colors/base16-irblack.config
index 51fd155..385ff98 100644
--- a/colors/base16-irblack.config
+++ b/colors/base16-irblack.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#b5b3aa
+
 [urgency=low]
 background-color=#242422
 text-color=#6c6c66
-border-color=#484844
 
 [urgency=normal]
 background-color=#484844
 text-color=#b5b3aa
-border-color=#b5b3aa
 
 [urgency=high]
 background-color=#ff6c60
 text-color=#d9d7cc
-border-color=#fdfbee
diff --git a/colors/base16-isotope.config b/colors/base16-isotope.config
index e9b56a1..b84ed90 100644
--- a/colors/base16-isotope.config
+++ b/colors/base16-isotope.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#d0d0d0
+
 [urgency=low]
 background-color=#404040
 text-color=#808080
-border-color=#606060
 
 [urgency=normal]
 background-color=#606060
 text-color=#d0d0d0
-border-color=#d0d0d0
 
 [urgency=high]
 background-color=#ff0000
 text-color=#e0e0e0
-border-color=#ffffff
diff --git a/colors/base16-macintosh.config b/colors/base16-macintosh.config
index e8f0d8b..b3245d7 100644
--- a/colors/base16-macintosh.config
+++ b/colors/base16-macintosh.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#c0c0c0
+
 [urgency=low]
 background-color=#404040
 text-color=#808080
-border-color=#404040
 
 [urgency=normal]
 background-color=#404040
 text-color=#c0c0c0
-border-color=#c0c0c0
 
 [urgency=high]
 background-color=#dd0907
 text-color=#c0c0c0
-border-color=#ffffff
diff --git a/colors/base16-marrakesh.config b/colors/base16-marrakesh.config
index f5ac31a..9eb7ad4 100644
--- a/colors/base16-marrakesh.config
+++ b/colors/base16-marrakesh.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#948e48
+
 [urgency=low]
 background-color=#302e00
 text-color=#6c6823
-border-color=#5f5b17
 
 [urgency=normal]
 background-color=#5f5b17
 text-color=#948e48
-border-color=#948e48
 
 [urgency=high]
 background-color=#c35359
 text-color=#ccc37a
-border-color=#faf0a5
diff --git a/colors/base16-materia.config b/colors/base16-materia.config
index d91e7eb..ed72a89 100644
--- a/colors/base16-materia.config
+++ b/colors/base16-materia.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#CDD3DE
+
 [urgency=low]
 background-color=#2C393F
 text-color=#707880
-border-color=#37474F
 
 [urgency=normal]
 background-color=#37474F
 text-color=#CDD3DE
-border-color=#CDD3DE
 
 [urgency=high]
 background-color=#EC5F67
 text-color=#D5DBE5
-border-color=#FFFFFF
diff --git a/colors/base16-material-darker.config b/colors/base16-material-darker.config
index d94efef..a566949 100644
--- a/colors/base16-material-darker.config
+++ b/colors/base16-material-darker.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#EEFFFF
+
 [urgency=low]
 background-color=#303030
 text-color=#4A4A4A
-border-color=#353535
 
 [urgency=normal]
 background-color=#353535
 text-color=#EEFFFF
-border-color=#EEFFFF
 
 [urgency=high]
 background-color=#F07178
 text-color=#EEFFFF
-border-color=#FFFFFF
diff --git a/colors/base16-material-lighter.config b/colors/base16-material-lighter.config
index b80a49b..9172ca6 100644
--- a/colors/base16-material-lighter.config
+++ b/colors/base16-material-lighter.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#80CBC4
+
 [urgency=low]
 background-color=#E7EAEC
 text-color=#CCD7DA
-border-color=#CCEAE7
 
 [urgency=normal]
 background-color=#CCEAE7
 text-color=#80CBC4
-border-color=#80CBC4
 
 [urgency=high]
 background-color=#FF5370
 text-color=#80CBC4
-border-color=#FFFFFF
diff --git a/colors/base16-material-palenight.config b/colors/base16-material-palenight.config
index 0acc3a8..f44b909 100644
--- a/colors/base16-material-palenight.config
+++ b/colors/base16-material-palenight.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#959DCB
+
 [urgency=low]
 background-color=#444267
 text-color=#676E95
-border-color=#32374D
 
 [urgency=normal]
 background-color=#32374D
 text-color=#959DCB
-border-color=#959DCB
 
 [urgency=high]
 background-color=#F07178
 text-color=#959DCB
-border-color=#FFFFFF
diff --git a/colors/base16-material-vivid.config b/colors/base16-material-vivid.config
index 0f2dd66..c942f70 100644
--- a/colors/base16-material-vivid.config
+++ b/colors/base16-material-vivid.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#80868b
+
 [urgency=low]
 background-color=#27292c
 text-color=#44464d
-border-color=#323639
 
 [urgency=normal]
 background-color=#323639
 text-color=#80868b
-border-color=#80868b
 
 [urgency=high]
 background-color=#f44336
 text-color=#9e9e9e
-border-color=#ffffff
diff --git a/colors/base16-material.config b/colors/base16-material.config
index d964ab9..b7f30c2 100644
--- a/colors/base16-material.config
+++ b/colors/base16-material.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#EEFFFF
+
 [urgency=low]
 background-color=#2E3C43
 text-color=#546E7A
-border-color=#314549
 
 [urgency=normal]
 background-color=#314549
 text-color=#EEFFFF
-border-color=#EEFFFF
 
 [urgency=high]
 background-color=#F07178
 text-color=#EEFFFF
-border-color=#FFFFFF
diff --git a/colors/base16-mellow-purple.config b/colors/base16-mellow-purple.config
index b5e04bb..7d08dd6 100644
--- a/colors/base16-mellow-purple.config
+++ b/colors/base16-mellow-purple.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#ffeeff
+
 [urgency=low]
 background-color=#1A092D
 text-color=#320f55
-border-color=#331354
 
 [urgency=normal]
 background-color=#331354
 text-color=#ffeeff
-border-color=#ffeeff
 
 [urgency=high]
 background-color=#00d9e9
 text-color=#ffeeff
-border-color=#f8c0ff
diff --git a/colors/base16-mexico-light.config b/colors/base16-mexico-light.config
index e199e5d..644c87d 100644
--- a/colors/base16-mexico-light.config
+++ b/colors/base16-mexico-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#383838
+
 [urgency=low]
 background-color=#e8e8e8
 text-color=#b8b8b8
-border-color=#d8d8d8
 
 [urgency=normal]
 background-color=#d8d8d8
 text-color=#383838
-border-color=#383838
 
 [urgency=high]
 background-color=#ab4642
 text-color=#282828
-border-color=#181818
diff --git a/colors/base16-mocha.config b/colors/base16-mocha.config
index 00e4173..bd0034b 100644
--- a/colors/base16-mocha.config
+++ b/colors/base16-mocha.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#d0c8c6
+
 [urgency=low]
 background-color=#534636
 text-color=#7e705a
-border-color=#645240
 
 [urgency=normal]
 background-color=#645240
 text-color=#d0c8c6
-border-color=#d0c8c6
 
 [urgency=high]
 background-color=#cb6077
 text-color=#e9e1dd
-border-color=#f5eeeb
diff --git a/colors/base16-monokai.config b/colors/base16-monokai.config
index 9886c00..a1269b1 100644
--- a/colors/base16-monokai.config
+++ b/colors/base16-monokai.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#f8f8f2
+
 [urgency=low]
 background-color=#383830
 text-color=#75715e
-border-color=#49483e
 
 [urgency=normal]
 background-color=#49483e
 text-color=#f8f8f2
-border-color=#f8f8f2
 
 [urgency=high]
 background-color=#f92672
 text-color=#f5f4f1
-border-color=#f9f8f5
diff --git a/colors/base16-nord.config b/colors/base16-nord.config
index e57aa87..6390d4c 100644
--- a/colors/base16-nord.config
+++ b/colors/base16-nord.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#E5E9F0
+
 [urgency=low]
 background-color=#3B4252
 text-color=#4C566A
-border-color=#434C5E
 
 [urgency=normal]
 background-color=#434C5E
 text-color=#E5E9F0
-border-color=#E5E9F0
 
 [urgency=high]
 background-color=#88C0D0
 text-color=#ECEFF4
-border-color=#8FBCBB
diff --git a/colors/base16-ocean.config b/colors/base16-ocean.config
index b6026fc..5d96af7 100644
--- a/colors/base16-ocean.config
+++ b/colors/base16-ocean.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#c0c5ce
+
 [urgency=low]
 background-color=#343d46
 text-color=#65737e
-border-color=#4f5b66
 
 [urgency=normal]
 background-color=#4f5b66
 text-color=#c0c5ce
-border-color=#c0c5ce
 
 [urgency=high]
 background-color=#bf616a
 text-color=#dfe1e8
-border-color=#eff1f5
diff --git a/colors/base16-oceanicnext.config b/colors/base16-oceanicnext.config
index 4182317..c2f10c3 100644
--- a/colors/base16-oceanicnext.config
+++ b/colors/base16-oceanicnext.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#C0C5CE
+
 [urgency=low]
 background-color=#343D46
 text-color=#65737E
-border-color=#4F5B66
 
 [urgency=normal]
 background-color=#4F5B66
 text-color=#C0C5CE
-border-color=#C0C5CE
 
 [urgency=high]
 background-color=#EC5f67
 text-color=#CDD3DE
-border-color=#D8DEE9
diff --git a/colors/base16-one-light.config b/colors/base16-one-light.config
index 618f56a..dc06a0a 100644
--- a/colors/base16-one-light.config
+++ b/colors/base16-one-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#383a42
+
 [urgency=low]
 background-color=#f0f0f1
 text-color=#a0a1a7
-border-color=#e5e5e6
 
 [urgency=normal]
 background-color=#e5e5e6
 text-color=#383a42
-border-color=#383a42
 
 [urgency=high]
 background-color=#ca1243
 text-color=#202227
-border-color=#090a0b
diff --git a/colors/base16-onedark.config b/colors/base16-onedark.config
index 2b8d3f2..3b93deb 100644
--- a/colors/base16-onedark.config
+++ b/colors/base16-onedark.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#abb2bf
+
 [urgency=low]
 background-color=#353b45
 text-color=#545862
-border-color=#3e4451
 
 [urgency=normal]
 background-color=#3e4451
 text-color=#abb2bf
-border-color=#abb2bf
 
 [urgency=high]
 background-color=#e06c75
 text-color=#b6bdca
-border-color=#c8ccd4
diff --git a/colors/base16-outrun-dark.config b/colors/base16-outrun-dark.config
index 672736f..2bc179a 100644
--- a/colors/base16-outrun-dark.config
+++ b/colors/base16-outrun-dark.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#D0D0FA
+
 [urgency=low]
 background-color=#20204A
 text-color=#50507A
-border-color=#30305A
 
 [urgency=normal]
 background-color=#30305A
 text-color=#D0D0FA
-border-color=#D0D0FA
 
 [urgency=high]
 background-color=#FF4242
 text-color=#E0E0FF
-border-color=#F5F5FF
diff --git a/colors/base16-papercolor-dark.config b/colors/base16-papercolor-dark.config
index ff00db1..5570469 100644
--- a/colors/base16-papercolor-dark.config
+++ b/colors/base16-papercolor-dark.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#808080
+
 [urgency=low]
 background-color=#af005f
 text-color=#d7af5f
-border-color=#5faf00
 
 [urgency=normal]
 background-color=#5faf00
 text-color=#808080
-border-color=#808080
 
 [urgency=high]
 background-color=#585858
 text-color=#d7875f
-border-color=#d0d0d0
diff --git a/colors/base16-papercolor-light.config b/colors/base16-papercolor-light.config
index 200adb6..6918df5 100644
--- a/colors/base16-papercolor-light.config
+++ b/colors/base16-papercolor-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#878787
+
 [urgency=low]
 background-color=#af0000
 text-color=#5f8700
-border-color=#008700
 
 [urgency=normal]
 background-color=#008700
 text-color=#878787
-border-color=#878787
 
 [urgency=high]
 background-color=#bcbcbc
 text-color=#005f87
-border-color=#444444
diff --git a/colors/base16-paraiso.config b/colors/base16-paraiso.config
index a742d08..cfda209 100644
--- a/colors/base16-paraiso.config
+++ b/colors/base16-paraiso.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#a39e9b
+
 [urgency=low]
 background-color=#41323f
 text-color=#776e71
-border-color=#4f424c
 
 [urgency=normal]
 background-color=#4f424c
 text-color=#a39e9b
-border-color=#a39e9b
 
 [urgency=high]
 background-color=#ef6155
 text-color=#b9b6b0
-border-color=#e7e9db
diff --git a/colors/base16-phd.config b/colors/base16-phd.config
index cb28792..a194612 100644
--- a/colors/base16-phd.config
+++ b/colors/base16-phd.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#b8bbc2
+
 [urgency=low]
 background-color=#2a3448
 text-color=#717885
-border-color=#4d5666
 
 [urgency=normal]
 background-color=#4d5666
 text-color=#b8bbc2
-border-color=#b8bbc2
 
 [urgency=high]
 background-color=#d07346
 text-color=#dbdde0
-border-color=#ffffff
diff --git a/colors/base16-pico.config b/colors/base16-pico.config
index 4f12b13..8cc8376 100644
--- a/colors/base16-pico.config
+++ b/colors/base16-pico.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#5f574f
+
 [urgency=low]
 background-color=#1d2b53
 text-color=#008751
-border-color=#7e2553
 
 [urgency=normal]
 background-color=#7e2553
 text-color=#5f574f
-border-color=#5f574f
 
 [urgency=high]
 background-color=#ff004d
 text-color=#c2c3c7
-border-color=#fff1e8
diff --git a/colors/base16-pop.config b/colors/base16-pop.config
index 3444cab..a42a3ac 100644
--- a/colors/base16-pop.config
+++ b/colors/base16-pop.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#d0d0d0
+
 [urgency=low]
 background-color=#202020
 text-color=#505050
-border-color=#303030
 
 [urgency=normal]
 background-color=#303030
 text-color=#d0d0d0
-border-color=#d0d0d0
 
 [urgency=high]
 background-color=#eb008a
 text-color=#e0e0e0
-border-color=#ffffff
diff --git a/colors/base16-porple.config b/colors/base16-porple.config
index 5bba13c..4d2f74e 100644
--- a/colors/base16-porple.config
+++ b/colors/base16-porple.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#d8d8d8
+
 [urgency=low]
 background-color=#333344
 text-color=#65568a
-border-color=#474160
 
 [urgency=normal]
 background-color=#474160
 text-color=#d8d8d8
-border-color=#d8d8d8
 
 [urgency=high]
 background-color=#f84547
 text-color=#e8e8e8
-border-color=#f8f8f8
diff --git a/colors/base16-railscasts.config b/colors/base16-railscasts.config
index 59fbfb8..83781dd 100644
--- a/colors/base16-railscasts.config
+++ b/colors/base16-railscasts.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#e6e1dc
+
 [urgency=low]
 background-color=#272935
 text-color=#5a647e
-border-color=#3a4055
 
 [urgency=normal]
 background-color=#3a4055
 text-color=#e6e1dc
-border-color=#e6e1dc
 
 [urgency=high]
 background-color=#da4939
 text-color=#f4f1ed
-border-color=#f9f7f3
diff --git a/colors/base16-rebecca.config b/colors/base16-rebecca.config
index 5b882eb..f12dd1d 100644
--- a/colors/base16-rebecca.config
+++ b/colors/base16-rebecca.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#f1eff8
+
 [urgency=low]
 background-color=#663399
 text-color=#666699
-border-color=#383a62
 
 [urgency=normal]
 background-color=#383a62
 text-color=#f1eff8
-border-color=#f1eff8
 
 [urgency=high]
 background-color=#a0a0c5
 text-color=#ccccff
-border-color=#53495d
diff --git a/colors/base16-seti.config b/colors/base16-seti.config
index 19992b3..2a91b17 100644
--- a/colors/base16-seti.config
+++ b/colors/base16-seti.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#d6d6d6
+
 [urgency=low]
 background-color=#282a2b
 text-color=#41535B
-border-color=#3B758C
 
 [urgency=normal]
 background-color=#3B758C
 text-color=#d6d6d6
-border-color=#d6d6d6
 
 [urgency=high]
 background-color=#Cd3f45
 text-color=#eeeeee
-border-color=#ffffff
diff --git a/colors/base16-shapeshifter.config b/colors/base16-shapeshifter.config
index e6dd81d..1387bfb 100644
--- a/colors/base16-shapeshifter.config
+++ b/colors/base16-shapeshifter.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#102015
+
 [urgency=low]
 background-color=#e0e0e0
 text-color=#555555
-border-color=#ababab
 
 [urgency=normal]
 background-color=#ababab
 text-color=#102015
-border-color=#102015
 
 [urgency=high]
 background-color=#e92f2f
 text-color=#040404
-border-color=#000000
diff --git a/colors/base16-snazzy.config b/colors/base16-snazzy.config
index a0a582f..9ddfb30 100644
--- a/colors/base16-snazzy.config
+++ b/colors/base16-snazzy.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#e2e4e5
+
 [urgency=low]
 background-color=#34353e
 text-color=#78787e
-border-color=#43454f
 
 [urgency=normal]
 background-color=#43454f
 text-color=#e2e4e5
-border-color=#e2e4e5
 
 [urgency=high]
 background-color=#ff5c57
 text-color=#eff0eb
-border-color=#f1f1f0
diff --git a/colors/base16-solarflare.config b/colors/base16-solarflare.config
index 2a9f7d1..76079a6 100644
--- a/colors/base16-solarflare.config
+++ b/colors/base16-solarflare.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#A6AFB8
+
 [urgency=low]
 background-color=#222E38
 text-color=#667581
-border-color=#586875
 
 [urgency=normal]
 background-color=#586875
 text-color=#A6AFB8
-border-color=#A6AFB8
 
 [urgency=high]
 background-color=#EF5253
 text-color=#E8E9ED
-border-color=#F5F7FA
diff --git a/colors/base16-solarized-dark.config b/colors/base16-solarized-dark.config
index 4d12e59..aab8589 100644
--- a/colors/base16-solarized-dark.config
+++ b/colors/base16-solarized-dark.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#93a1a1
+
 [urgency=low]
 background-color=#073642
 text-color=#657b83
-border-color=#586e75
 
 [urgency=normal]
 background-color=#586e75
 text-color=#93a1a1
-border-color=#93a1a1
 
 [urgency=high]
 background-color=#dc322f
 text-color=#eee8d5
-border-color=#fdf6e3
diff --git a/colors/base16-solarized-light.config b/colors/base16-solarized-light.config
index d89fadc..9b36ca0 100644
--- a/colors/base16-solarized-light.config
+++ b/colors/base16-solarized-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#586e75
+
 [urgency=low]
 background-color=#eee8d5
 text-color=#839496
-border-color=#93a1a1
 
 [urgency=normal]
 background-color=#93a1a1
 text-color=#586e75
-border-color=#586e75
 
 [urgency=high]
 background-color=#dc322f
 text-color=#073642
-border-color=#002b36
diff --git a/colors/base16-spacemacs.config b/colors/base16-spacemacs.config
index 19b14b4..5f3e3d8 100644
--- a/colors/base16-spacemacs.config
+++ b/colors/base16-spacemacs.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#a3a3a3
+
 [urgency=low]
 background-color=#282828
 text-color=#585858
-border-color=#444155
 
 [urgency=normal]
 background-color=#444155
 text-color=#a3a3a3
-border-color=#a3a3a3
 
 [urgency=high]
 background-color=#f2241f
 text-color=#e8e8e8
-border-color=#f8f8f8
diff --git a/colors/base16-summerfruit-dark.config b/colors/base16-summerfruit-dark.config
index fc4d90c..35b225b 100644
--- a/colors/base16-summerfruit-dark.config
+++ b/colors/base16-summerfruit-dark.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#D0D0D0
+
 [urgency=low]
 background-color=#202020
 text-color=#505050
-border-color=#303030
 
 [urgency=normal]
 background-color=#303030
 text-color=#D0D0D0
-border-color=#D0D0D0
 
 [urgency=high]
 background-color=#FF0086
 text-color=#E0E0E0
-border-color=#FFFFFF
diff --git a/colors/base16-summerfruit-light.config b/colors/base16-summerfruit-light.config
index 4b155c3..d958c84 100644
--- a/colors/base16-summerfruit-light.config
+++ b/colors/base16-summerfruit-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#101010
+
 [urgency=low]
 background-color=#E0E0E0
 text-color=#B0B0B0
-border-color=#D0D0D0
 
 [urgency=normal]
 background-color=#D0D0D0
 text-color=#101010
-border-color=#101010
 
 [urgency=high]
 background-color=#FF0086
 text-color=#151515
-border-color=#202020
diff --git a/colors/base16-tomorrow-night.config b/colors/base16-tomorrow-night.config
index 7513e4e..7cf1fbe 100644
--- a/colors/base16-tomorrow-night.config
+++ b/colors/base16-tomorrow-night.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#c5c8c6
+
 [urgency=low]
 background-color=#282a2e
 text-color=#969896
-border-color=#373b41
 
 [urgency=normal]
 background-color=#373b41
 text-color=#c5c8c6
-border-color=#c5c8c6
 
 [urgency=high]
 background-color=#cc6666
 text-color=#e0e0e0
-border-color=#ffffff
diff --git a/colors/base16-tomorrow.config b/colors/base16-tomorrow.config
index f8f645b..5758b3d 100644
--- a/colors/base16-tomorrow.config
+++ b/colors/base16-tomorrow.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#4d4d4c
+
 [urgency=low]
 background-color=#e0e0e0
 text-color=#8e908c
-border-color=#d6d6d6
 
 [urgency=normal]
 background-color=#d6d6d6
 text-color=#4d4d4c
-border-color=#4d4d4c
 
 [urgency=high]
 background-color=#c82829
 text-color=#282a2e
-border-color=#1d1f21
diff --git a/colors/base16-tube.config b/colors/base16-tube.config
index 0b524eb..3e63c0a 100644
--- a/colors/base16-tube.config
+++ b/colors/base16-tube.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#d9d8d8
+
 [urgency=low]
 background-color=#1c3f95
 text-color=#737171
-border-color=#5a5758
 
 [urgency=normal]
 background-color=#5a5758
 text-color=#d9d8d8
-border-color=#d9d8d8
 
 [urgency=high]
 background-color=#ee2e24
 text-color=#e7e7e8
-border-color=#ffffff
diff --git a/colors/base16-twilight.config b/colors/base16-twilight.config
index ddd2394..b287601 100644
--- a/colors/base16-twilight.config
+++ b/colors/base16-twilight.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#a7a7a7
+
 [urgency=low]
 background-color=#323537
 text-color=#5f5a60
-border-color=#464b50
 
 [urgency=normal]
 background-color=#464b50
 text-color=#a7a7a7
-border-color=#a7a7a7
 
 [urgency=high]
 background-color=#cf6a4c
 text-color=#c3c3c3
-border-color=#ffffff
diff --git a/colors/base16-unikitty-dark.config b/colors/base16-unikitty-dark.config
index ef91fec..5d204f5 100644
--- a/colors/base16-unikitty-dark.config
+++ b/colors/base16-unikitty-dark.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#bcbabe
+
 [urgency=low]
 background-color=#4a464d
 text-color=#838085
-border-color=#666369
 
 [urgency=normal]
 background-color=#666369
 text-color=#bcbabe
-border-color=#bcbabe
 
 [urgency=high]
 background-color=#d8137f
 text-color=#d8d7da
-border-color=#f5f4f7
diff --git a/colors/base16-unikitty-light.config b/colors/base16-unikitty-light.config
index 334eb2a..9eb5e4b 100644
--- a/colors/base16-unikitty-light.config
+++ b/colors/base16-unikitty-light.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#6c696e
+
 [urgency=low]
 background-color=#e1e1e2
 text-color=#a7a5a8
-border-color=#c4c3c5
 
 [urgency=normal]
 background-color=#c4c3c5
 text-color=#6c696e
-border-color=#6c696e
 
 [urgency=high]
 background-color=#d8137f
 text-color=#4f4b51
-border-color=#322d34
diff --git a/colors/base16-woodland.config b/colors/base16-woodland.config
index b9546f8..ea8c7b5 100644
--- a/colors/base16-woodland.config
+++ b/colors/base16-woodland.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#cabcb1
+
 [urgency=low]
 background-color=#302b25
 text-color=#9d8b70
-border-color=#48413a
 
 [urgency=normal]
 background-color=#48413a
 text-color=#cabcb1
-border-color=#cabcb1
 
 [urgency=high]
 background-color=#d35c5c
 text-color=#d7c8bc
-border-color=#e4d4c8
diff --git a/colors/base16-xcode-dusk.config b/colors/base16-xcode-dusk.config
index 9769449..551c65c 100644
--- a/colors/base16-xcode-dusk.config
+++ b/colors/base16-xcode-dusk.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#939599
+
 [urgency=low]
 background-color=#3D4048
 text-color=#686A71
-border-color=#53555D
 
 [urgency=normal]
 background-color=#53555D
 text-color=#939599
-border-color=#939599
 
 [urgency=high]
 background-color=#B21889
 text-color=#A9AAAE
-border-color=#BEBFC2
diff --git a/colors/base16-zenburn.config b/colors/base16-zenburn.config
index d58ccf7..ece76ce 100644
--- a/colors/base16-zenburn.config
+++ b/colors/base16-zenburn.config
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#dcdccc
+
 [urgency=low]
 background-color=#404040
 text-color=#6f6f6f
-border-color=#606060
 
 [urgency=normal]
 background-color=#606060
 text-color=#dcdccc
-border-color=#dcdccc
 
 [urgency=high]
 background-color=#dca3a3
 text-color=#c0c0c0
-border-color=#ffffff
diff --git a/templates/default.mustache b/templates/default.mustache
index 4c5a53f..e8bc9f2 100644
--- a/templates/default.mustache
+++ b/templates/default.mustache
@@ -3,17 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
+border-color=#{{base05-hex}}
+
 [urgency=low]
 background-color=#{{base01-hex}}
 text-color=#{{base03-hex}}
-border-color=#{{base02-hex}}
 
 [urgency=normal]
 background-color=#{{base02-hex}}
 text-color=#{{base05-hex}}
-border-color=#{{base05-hex}}
 
 [urgency=high]
 background-color=#{{base08-hex}}
 text-color=#{{base06-hex}}
-border-color=#{{base07-hex}}