Update configs

140 files changed, 1279 insertions, 991 deletions

diff --git a/colors/base16-3024.config b/colors/base16-3024.config
index 06c0aa3..200d7b8 100644
--- a/colors/base16-3024.config
+++ b/colors/base16-3024.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#4a4543
+background-color=#090300
 text-color=#a5a2a2
-border-color=#a5a2a2
+border-color=#01a0e4
 
 [urgency=low]
-background-color=#3a3432
-text-color=#5c5855
-border-color=#a5a2a2
+background-color=#090300
+text-color=#fded02
+border-color=#01a0e4
 
 [urgency=high]
-background-color=#db2d20
-text-color=#d6d5d4
-border-color=#a5a2a2
+background-color=#090300
+text-color=#db2d20
+border-color=#01a0e4
diff --git a/colors/base16-apathy.config b/colors/base16-apathy.config
index 80bcf79..6ccfad8 100644
--- a/colors/base16-apathy.config
+++ b/colors/base16-apathy.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#184E45
+background-color=#031A16
 text-color=#81B5AC
-border-color=#81B5AC
+border-color=#96883E
 
 [urgency=low]
-background-color=#0B342D
-text-color=#2B685E
-border-color=#81B5AC
+background-color=#031A16
+text-color=#3E4C96
+border-color=#96883E
 
 [urgency=high]
-background-color=#3E9688
-text-color=#A7CEC8
-border-color=#81B5AC
+background-color=#031A16
+text-color=#3E9688
+border-color=#96883E
diff --git a/colors/base16-ashes.config b/colors/base16-ashes.config
index 70605f8..784bfe0 100644
--- a/colors/base16-ashes.config
+++ b/colors/base16-ashes.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#565E65
+background-color=#1C2023
 text-color=#C7CCD1
-border-color=#C7CCD1
+border-color=#AE95C7
 
 [urgency=low]
-background-color=#393F45
-text-color=#747C84
-border-color=#C7CCD1
+background-color=#1C2023
+text-color=#AEC795
+border-color=#AE95C7
 
 [urgency=high]
-background-color=#C7AE95
-text-color=#DFE2E5
-border-color=#C7CCD1
+background-color=#1C2023
+text-color=#C7AE95
+border-color=#AE95C7
diff --git a/colors/base16-atelier-cave-light.config b/colors/base16-atelier-cave-light.config
index 542d883..4af5d70 100644
--- a/colors/base16-atelier-cave-light.config
+++ b/colors/base16-atelier-cave-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#8b8792
+background-color=#efecf4
 text-color=#585260
-border-color=#585260
+border-color=#576ddb
 
 [urgency=low]
-background-color=#e2dfe7
-text-color=#7e7887
-border-color=#585260
+background-color=#efecf4
+text-color=#a06e3b
+border-color=#576ddb
 
 [urgency=high]
-background-color=#be4678
-text-color=#26232a
-border-color=#585260
+background-color=#efecf4
+text-color=#be4678
+border-color=#576ddb
diff --git a/colors/base16-atelier-cave.config b/colors/base16-atelier-cave.config
index 3636dc3..31bebcc 100644
--- a/colors/base16-atelier-cave.config
+++ b/colors/base16-atelier-cave.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#585260
+background-color=#19171c
 text-color=#8b8792
-border-color=#8b8792
+border-color=#576ddb
 
 [urgency=low]
-background-color=#26232a
-text-color=#655f6d
-border-color=#8b8792
+background-color=#19171c
+text-color=#a06e3b
+border-color=#576ddb
 
 [urgency=high]
-background-color=#be4678
-text-color=#e2dfe7
-border-color=#8b8792
+background-color=#19171c
+text-color=#be4678
+border-color=#576ddb
diff --git a/colors/base16-atelier-dune-light.config b/colors/base16-atelier-dune-light.config
index 374a5d7..43b5967 100644
--- a/colors/base16-atelier-dune-light.config
+++ b/colors/base16-atelier-dune-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#a6a28c
+background-color=#fefbec
 text-color=#6e6b5e
-border-color=#6e6b5e
+border-color=#6684e1
 
 [urgency=low]
-background-color=#e8e4cf
-text-color=#999580
-border-color=#6e6b5e
+background-color=#fefbec
+text-color=#ae9513
+border-color=#6684e1
 
 [urgency=high]
-background-color=#d73737
-text-color=#292824
-border-color=#6e6b5e
+background-color=#fefbec
+text-color=#d73737
+border-color=#6684e1
diff --git a/colors/base16-atelier-dune.config b/colors/base16-atelier-dune.config
index a66b742..10dc6d6 100644
--- a/colors/base16-atelier-dune.config
+++ b/colors/base16-atelier-dune.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#6e6b5e
+background-color=#20201d
 text-color=#a6a28c
-border-color=#a6a28c
+border-color=#6684e1
 
 [urgency=low]
-background-color=#292824
-text-color=#7d7a68
-border-color=#a6a28c
+background-color=#20201d
+text-color=#ae9513
+border-color=#6684e1
 
 [urgency=high]
-background-color=#d73737
-text-color=#e8e4cf
-border-color=#a6a28c
+background-color=#20201d
+text-color=#d73737
+border-color=#6684e1
diff --git a/colors/base16-atelier-estuary-light.config b/colors/base16-atelier-estuary-light.config
index d51f090..e7fcc14 100644
--- a/colors/base16-atelier-estuary-light.config
+++ b/colors/base16-atelier-estuary-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#929181
+background-color=#f4f3ec
 text-color=#5f5e4e
-border-color=#5f5e4e
+border-color=#36a166
 
 [urgency=low]
-background-color=#e7e6df
-text-color=#878573
-border-color=#5f5e4e
+background-color=#f4f3ec
+text-color=#a5980d
+border-color=#36a166
 
 [urgency=high]
-background-color=#ba6236
-text-color=#302f27
-border-color=#5f5e4e
+background-color=#f4f3ec
+text-color=#ba6236
+border-color=#36a166
diff --git a/colors/base16-atelier-estuary.config b/colors/base16-atelier-estuary.config
index 94698bc..0526be6 100644
--- a/colors/base16-atelier-estuary.config
+++ b/colors/base16-atelier-estuary.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#5f5e4e
+background-color=#22221b
 text-color=#929181
-border-color=#929181
+border-color=#36a166
 
 [urgency=low]
-background-color=#302f27
-text-color=#6c6b5a
-border-color=#929181
+background-color=#22221b
+text-color=#a5980d
+border-color=#36a166
 
 [urgency=high]
-background-color=#ba6236
-text-color=#e7e6df
-border-color=#929181
+background-color=#22221b
+text-color=#ba6236
+border-color=#36a166
diff --git a/colors/base16-atelier-forest-light.config b/colors/base16-atelier-forest-light.config
index 82e2917..ac0d2bf 100644
--- a/colors/base16-atelier-forest-light.config
+++ b/colors/base16-atelier-forest-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#a8a19f
+background-color=#f1efee
 text-color=#68615e
-border-color=#68615e
+border-color=#407ee7
 
 [urgency=low]
-background-color=#e6e2e0
-text-color=#9c9491
-border-color=#68615e
+background-color=#f1efee
+text-color=#c38418
+border-color=#407ee7
 
 [urgency=high]
-background-color=#f22c40
-text-color=#2c2421
-border-color=#68615e
+background-color=#f1efee
+text-color=#f22c40
+border-color=#407ee7
diff --git a/colors/base16-atelier-forest.config b/colors/base16-atelier-forest.config
index fd65d49..2e043f2 100644
--- a/colors/base16-atelier-forest.config
+++ b/colors/base16-atelier-forest.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#68615e
+background-color=#1b1918
 text-color=#a8a19f
-border-color=#a8a19f
+border-color=#407ee7
 
 [urgency=low]
-background-color=#2c2421
-text-color=#766e6b
-border-color=#a8a19f
+background-color=#1b1918
+text-color=#c38418
+border-color=#407ee7
 
 [urgency=high]
-background-color=#f22c40
-text-color=#e6e2e0
-border-color=#a8a19f
+background-color=#1b1918
+text-color=#f22c40
+border-color=#407ee7
diff --git a/colors/base16-atelier-heath-light.config b/colors/base16-atelier-heath-light.config
index b0b7278..648ed6c 100644
--- a/colors/base16-atelier-heath-light.config
+++ b/colors/base16-atelier-heath-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#ab9bab
+background-color=#f7f3f7
 text-color=#695d69
-border-color=#695d69
+border-color=#516aec
 
 [urgency=low]
-background-color=#d8cad8
-text-color=#9e8f9e
-border-color=#695d69
+background-color=#f7f3f7
+text-color=#bb8a35
+border-color=#516aec
 
 [urgency=high]
-background-color=#ca402b
-text-color=#292329
-border-color=#695d69
+background-color=#f7f3f7
+text-color=#ca402b
+border-color=#516aec
diff --git a/colors/base16-atelier-heath.config b/colors/base16-atelier-heath.config
index 809ff77..3f21cc2 100644
--- a/colors/base16-atelier-heath.config
+++ b/colors/base16-atelier-heath.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#695d69
+background-color=#1b181b
 text-color=#ab9bab
-border-color=#ab9bab
+border-color=#516aec
 
 [urgency=low]
-background-color=#292329
-text-color=#776977
-border-color=#ab9bab
+background-color=#1b181b
+text-color=#bb8a35
+border-color=#516aec
 
 [urgency=high]
-background-color=#ca402b
-text-color=#d8cad8
-border-color=#ab9bab
+background-color=#1b181b
+text-color=#ca402b
+border-color=#516aec
diff --git a/colors/base16-atelier-lakeside-light.config b/colors/base16-atelier-lakeside-light.config
index ee4c23f..2f7b6ee 100644
--- a/colors/base16-atelier-lakeside-light.config
+++ b/colors/base16-atelier-lakeside-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#7ea2b4
+background-color=#ebf8ff
 text-color=#516d7b
-border-color=#516d7b
+border-color=#257fad
 
 [urgency=low]
-background-color=#c1e4f6
-text-color=#7195a8
-border-color=#516d7b
+background-color=#ebf8ff
+text-color=#8a8a0f
+border-color=#257fad
 
 [urgency=high]
-background-color=#d22d72
-text-color=#1f292e
-border-color=#516d7b
+background-color=#ebf8ff
+text-color=#d22d72
+border-color=#257fad
diff --git a/colors/base16-atelier-lakeside.config b/colors/base16-atelier-lakeside.config
index 0b7b92f..bf8c468 100644
--- a/colors/base16-atelier-lakeside.config
+++ b/colors/base16-atelier-lakeside.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#516d7b
+background-color=#161b1d
 text-color=#7ea2b4
-border-color=#7ea2b4
+border-color=#257fad
 
 [urgency=low]
-background-color=#1f292e
-text-color=#5a7b8c
-border-color=#7ea2b4
+background-color=#161b1d
+text-color=#8a8a0f
+border-color=#257fad
 
 [urgency=high]
-background-color=#d22d72
-text-color=#c1e4f6
-border-color=#7ea2b4
+background-color=#161b1d
+text-color=#d22d72
+border-color=#257fad
diff --git a/colors/base16-atelier-plateau-light.config b/colors/base16-atelier-plateau-light.config
index f26793e..d6d0137 100644
--- a/colors/base16-atelier-plateau-light.config
+++ b/colors/base16-atelier-plateau-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#8a8585
+background-color=#f4ecec
 text-color=#585050
-border-color=#585050
+border-color=#7272ca
 
 [urgency=low]
-background-color=#e7dfdf
-text-color=#7e7777
-border-color=#585050
+background-color=#f4ecec
+text-color=#a06e3b
+border-color=#7272ca
 
 [urgency=high]
-background-color=#ca4949
-text-color=#292424
-border-color=#585050
+background-color=#f4ecec
+text-color=#ca4949
+border-color=#7272ca
diff --git a/colors/base16-atelier-plateau.config b/colors/base16-atelier-plateau.config
index 112e969..bdad783 100644
--- a/colors/base16-atelier-plateau.config
+++ b/colors/base16-atelier-plateau.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#585050
+background-color=#1b1818
 text-color=#8a8585
-border-color=#8a8585
+border-color=#7272ca
 
 [urgency=low]
-background-color=#292424
-text-color=#655d5d
-border-color=#8a8585
+background-color=#1b1818
+text-color=#a06e3b
+border-color=#7272ca
 
 [urgency=high]
-background-color=#ca4949
-text-color=#e7dfdf
-border-color=#8a8585
+background-color=#1b1818
+text-color=#ca4949
+border-color=#7272ca
diff --git a/colors/base16-atelier-savanna-light.config b/colors/base16-atelier-savanna-light.config
index efea7d1..4521235 100644
--- a/colors/base16-atelier-savanna-light.config
+++ b/colors/base16-atelier-savanna-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#87928a
+background-color=#ecf4ee
 text-color=#526057
-border-color=#526057
+border-color=#478c90
 
 [urgency=low]
-background-color=#dfe7e2
-text-color=#78877d
-border-color=#526057
+background-color=#ecf4ee
+text-color=#a07e3b
+border-color=#478c90
 
 [urgency=high]
-background-color=#b16139
-text-color=#232a25
-border-color=#526057
+background-color=#ecf4ee
+text-color=#b16139
+border-color=#478c90
diff --git a/colors/base16-atelier-savanna.config b/colors/base16-atelier-savanna.config
index 6b56ea3..9c81e7c 100644
--- a/colors/base16-atelier-savanna.config
+++ b/colors/base16-atelier-savanna.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#526057
+background-color=#171c19
 text-color=#87928a
-border-color=#87928a
+border-color=#478c90
 
 [urgency=low]
-background-color=#232a25
-text-color=#5f6d64
-border-color=#87928a
+background-color=#171c19
+text-color=#a07e3b
+border-color=#478c90
 
 [urgency=high]
-background-color=#b16139
-text-color=#dfe7e2
-border-color=#87928a
+background-color=#171c19
+text-color=#b16139
+border-color=#478c90
diff --git a/colors/base16-atelier-seaside-light.config b/colors/base16-atelier-seaside-light.config
index f42bccb..dc7c777 100644
--- a/colors/base16-atelier-seaside-light.config
+++ b/colors/base16-atelier-seaside-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#8ca68c
+background-color=#f4fbf4
 text-color=#5e6e5e
-border-color=#5e6e5e
+border-color=#3d62f5
 
 [urgency=low]
-background-color=#cfe8cf
-text-color=#809980
-border-color=#5e6e5e
+background-color=#f4fbf4
+text-color=#98981b
+border-color=#3d62f5
 
 [urgency=high]
-background-color=#e6193c
-text-color=#242924
-border-color=#5e6e5e
+background-color=#f4fbf4
+text-color=#e6193c
+border-color=#3d62f5
diff --git a/colors/base16-atelier-seaside.config b/colors/base16-atelier-seaside.config
index 8661384..4ac1540 100644
--- a/colors/base16-atelier-seaside.config
+++ b/colors/base16-atelier-seaside.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#5e6e5e
+background-color=#131513
 text-color=#8ca68c
-border-color=#8ca68c
+border-color=#3d62f5
 
 [urgency=low]
-background-color=#242924
-text-color=#687d68
-border-color=#8ca68c
+background-color=#131513
+text-color=#98981b
+border-color=#3d62f5
 
 [urgency=high]
-background-color=#e6193c
-text-color=#cfe8cf
-border-color=#8ca68c
+background-color=#131513
+text-color=#e6193c
+border-color=#3d62f5
diff --git a/colors/base16-atelier-sulphurpool-light.config b/colors/base16-atelier-sulphurpool-light.config
index 3720b5c..e8c7dc1 100644
--- a/colors/base16-atelier-sulphurpool-light.config
+++ b/colors/base16-atelier-sulphurpool-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#979db4
+background-color=#f5f7ff
 text-color=#5e6687
-border-color=#5e6687
+border-color=#3d8fd1
 
 [urgency=low]
-background-color=#dfe2f1
-text-color=#898ea4
-border-color=#5e6687
+background-color=#f5f7ff
+text-color=#c08b30
+border-color=#3d8fd1
 
 [urgency=high]
-background-color=#c94922
-text-color=#293256
-border-color=#5e6687
+background-color=#f5f7ff
+text-color=#c94922
+border-color=#3d8fd1
diff --git a/colors/base16-atelier-sulphurpool.config b/colors/base16-atelier-sulphurpool.config
index d63a388..798acad 100644
--- a/colors/base16-atelier-sulphurpool.config
+++ b/colors/base16-atelier-sulphurpool.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#5e6687
+background-color=#202746
 text-color=#979db4
-border-color=#979db4
+border-color=#3d8fd1
 
 [urgency=low]
-background-color=#293256
-text-color=#6b7394
-border-color=#979db4
+background-color=#202746
+text-color=#c08b30
+border-color=#3d8fd1
 
 [urgency=high]
-background-color=#c94922
-text-color=#dfe2f1
-border-color=#979db4
+background-color=#202746
+text-color=#c94922
+border-color=#3d8fd1
diff --git a/colors/base16-atlas.config b/colors/base16-atlas.config
index 6def90c..89f90d4 100644
--- a/colors/base16-atlas.config
+++ b/colors/base16-atlas.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#517F8D
+background-color=#002635
 text-color=#a1a19a
-border-color=#a1a19a
+border-color=#5dd7b9
 
 [urgency=low]
-background-color=#00384d
-text-color=#6C8B91
-border-color=#a1a19a
+background-color=#002635
+text-color=#ffcc1b
+border-color=#5dd7b9
 
 [urgency=high]
-background-color=#ff5a67
-text-color=#e6e6dc
-border-color=#a1a19a
+background-color=#002635
+text-color=#ff5a67
+border-color=#5dd7b9
diff --git a/colors/base16-bespin.config b/colors/base16-bespin.config
index 6a83fa9..325161b 100644
--- a/colors/base16-bespin.config
+++ b/colors/base16-bespin.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#5e5d5c
+background-color=#28211c
 text-color=#8a8986
-border-color=#8a8986
+border-color=#5ea6ea
 
 [urgency=low]
-background-color=#36312e
-text-color=#666666
-border-color=#8a8986
+background-color=#28211c
+text-color=#f9ee98
+border-color=#5ea6ea
 
 [urgency=high]
-background-color=#cf6a4c
-text-color=#9d9b97
-border-color=#8a8986
+background-color=#28211c
+text-color=#cf6a4c
+border-color=#5ea6ea
diff --git a/colors/base16-black-metal-bathory.config b/colors/base16-black-metal-bathory.config
index 6193cbe..ec4cdf1 100644
--- a/colors/base16-black-metal-bathory.config
+++ b/colors/base16-black-metal-bathory.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#222222
+background-color=#000000
 text-color=#c1c1c1
-border-color=#c1c1c1
+border-color=#888888
 
 [urgency=low]
-background-color=#121212
-text-color=#333333
-border-color=#c1c1c1
+background-color=#000000
+text-color=#e78a53
+border-color=#888888
 
 [urgency=high]
-background-color=#5f8787
-text-color=#999999
-border-color=#c1c1c1
+background-color=#000000
+text-color=#5f8787
+border-color=#888888
diff --git a/colors/base16-black-metal-burzum.config b/colors/base16-black-metal-burzum.config
index a57e244..2bef7f7 100644
--- a/colors/base16-black-metal-burzum.config
+++ b/colors/base16-black-metal-burzum.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#222222
+background-color=#000000
 text-color=#c1c1c1
-border-color=#c1c1c1
+border-color=#888888
 
 [urgency=low]
-background-color=#121212
-text-color=#333333
-border-color=#c1c1c1
+background-color=#000000
+text-color=#99bbaa
+border-color=#888888
 
 [urgency=high]
-background-color=#5f8787
-text-color=#999999
-border-color=#c1c1c1
+background-color=#000000
+text-color=#5f8787
+border-color=#888888
diff --git a/colors/base16-black-metal-dark-funeral.config b/colors/base16-black-metal-dark-funeral.config
index ce2aebb..53bd766 100644
--- a/colors/base16-black-metal-dark-funeral.config
+++ b/colors/base16-black-metal-dark-funeral.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#222222
+background-color=#000000
 text-color=#c1c1c1
-border-color=#c1c1c1
+border-color=#888888
 
 [urgency=low]
-background-color=#121212
-text-color=#333333
-border-color=#c1c1c1
+background-color=#000000
+text-color=#5f81a5
+border-color=#888888
 
 [urgency=high]
-background-color=#5f8787
-text-color=#999999
-border-color=#c1c1c1
+background-color=#000000
+text-color=#5f8787
+border-color=#888888
diff --git a/colors/base16-black-metal-gorgoroth.config b/colors/base16-black-metal-gorgoroth.config
index 8f1b7df..7e00eea 100644
--- a/colors/base16-black-metal-gorgoroth.config
+++ b/colors/base16-black-metal-gorgoroth.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#222222
+background-color=#000000
 text-color=#c1c1c1
-border-color=#c1c1c1
+border-color=#888888
 
 [urgency=low]
-background-color=#121212
-text-color=#333333
-border-color=#c1c1c1
+background-color=#000000
+text-color=#8c7f70
+border-color=#888888
 
 [urgency=high]
-background-color=#5f8787
-text-color=#999999
-border-color=#c1c1c1
+background-color=#000000
+text-color=#5f8787
+border-color=#888888
diff --git a/colors/base16-black-metal-immortal.config b/colors/base16-black-metal-immortal.config
index 96980e9..0304a48 100644
--- a/colors/base16-black-metal-immortal.config
+++ b/colors/base16-black-metal-immortal.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#222222
+background-color=#000000
 text-color=#c1c1c1
-border-color=#c1c1c1
+border-color=#888888
 
 [urgency=low]
-background-color=#121212
-text-color=#333333
-border-color=#c1c1c1
+background-color=#000000
+text-color=#556677
+border-color=#888888
 
 [urgency=high]
-background-color=#5f8787
-text-color=#999999
-border-color=#c1c1c1
+background-color=#000000
+text-color=#5f8787
+border-color=#888888
diff --git a/colors/base16-black-metal-khold.config b/colors/base16-black-metal-khold.config
index ae38c7d..c65e46b 100644
--- a/colors/base16-black-metal-khold.config
+++ b/colors/base16-black-metal-khold.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#222222
+background-color=#000000
 text-color=#c1c1c1
-border-color=#c1c1c1
+border-color=#888888
 
 [urgency=low]
-background-color=#121212
-text-color=#333333
-border-color=#c1c1c1
+background-color=#000000
+text-color=#974b46
+border-color=#888888
 
 [urgency=high]
-background-color=#5f8787
-text-color=#999999
-border-color=#c1c1c1
+background-color=#000000
+text-color=#5f8787
+border-color=#888888
diff --git a/colors/base16-black-metal-marduk.config b/colors/base16-black-metal-marduk.config
index 294e97c..b839c2d 100644
--- a/colors/base16-black-metal-marduk.config
+++ b/colors/base16-black-metal-marduk.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#222222
+background-color=#000000
 text-color=#c1c1c1
-border-color=#c1c1c1
+border-color=#888888
 
 [urgency=low]
-background-color=#121212
-text-color=#333333
-border-color=#c1c1c1
+background-color=#000000
+text-color=#626b67
+border-color=#888888
 
 [urgency=high]
-background-color=#5f8787
-text-color=#999999
-border-color=#c1c1c1
+background-color=#000000
+text-color=#5f8787
+border-color=#888888
diff --git a/colors/base16-black-metal-mayhem.config b/colors/base16-black-metal-mayhem.config
index 8cfaee8..4d802ad 100644
--- a/colors/base16-black-metal-mayhem.config
+++ b/colors/base16-black-metal-mayhem.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#222222
+background-color=#000000
 text-color=#c1c1c1
-border-color=#c1c1c1
+border-color=#888888
 
 [urgency=low]
-background-color=#121212
-text-color=#333333
-border-color=#c1c1c1
+background-color=#000000
+text-color=#eecc6c
+border-color=#888888
 
 [urgency=high]
-background-color=#5f8787
-text-color=#999999
-border-color=#c1c1c1
+background-color=#000000
+text-color=#5f8787
+border-color=#888888
diff --git a/colors/base16-black-metal-nile.config b/colors/base16-black-metal-nile.config
index 8b41138..e74f597 100644
--- a/colors/base16-black-metal-nile.config
+++ b/colors/base16-black-metal-nile.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#222222
+background-color=#000000
 text-color=#c1c1c1
-border-color=#c1c1c1
+border-color=#888888
 
 [urgency=low]
-background-color=#121212
-text-color=#333333
-border-color=#c1c1c1
+background-color=#000000
+text-color=#777755
+border-color=#888888
 
 [urgency=high]
-background-color=#5f8787
-text-color=#999999
-border-color=#c1c1c1
+background-color=#000000
+text-color=#5f8787
+border-color=#888888
diff --git a/colors/base16-black-metal-venom.config b/colors/base16-black-metal-venom.config
index 8011007..3f41cbd 100644
--- a/colors/base16-black-metal-venom.config
+++ b/colors/base16-black-metal-venom.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#222222
+background-color=#000000
 text-color=#c1c1c1
-border-color=#c1c1c1
+border-color=#888888
 
 [urgency=low]
-background-color=#121212
-text-color=#333333
-border-color=#c1c1c1
+background-color=#000000
+text-color=#79241f
+border-color=#888888
 
 [urgency=high]
-background-color=#5f8787
-text-color=#999999
-border-color=#c1c1c1
+background-color=#000000
+text-color=#5f8787
+border-color=#888888
diff --git a/colors/base16-black-metal.config b/colors/base16-black-metal.config
index bcb12d3..54482ef 100644
--- a/colors/base16-black-metal.config
+++ b/colors/base16-black-metal.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#222222
+background-color=#000000
 text-color=#c1c1c1
-border-color=#c1c1c1
+border-color=#888888
 
 [urgency=low]
-background-color=#121212
-text-color=#333333
-border-color=#c1c1c1
+background-color=#000000
+text-color=#a06666
+border-color=#888888
 
 [urgency=high]
-background-color=#5f8787
-text-color=#999999
-border-color=#c1c1c1
+background-color=#000000
+text-color=#5f8787
+border-color=#888888
diff --git a/colors/base16-brewer.config b/colors/base16-brewer.config
index 3795e28..22bfc2d 100644
--- a/colors/base16-brewer.config
+++ b/colors/base16-brewer.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#515253
+background-color=#0c0d0e
 text-color=#b7b8b9
-border-color=#b7b8b9
+border-color=#3182bd
 
 [urgency=low]
-background-color=#2e2f30
-text-color=#737475
-border-color=#b7b8b9
+background-color=#0c0d0e
+text-color=#dca060
+border-color=#3182bd
 
 [urgency=high]
-background-color=#e31a1c
-text-color=#dadbdc
-border-color=#b7b8b9
+background-color=#0c0d0e
+text-color=#e31a1c
+border-color=#3182bd
diff --git a/colors/base16-bright.config b/colors/base16-bright.config
index 814c541..6f0f1db 100644
--- a/colors/base16-bright.config
+++ b/colors/base16-bright.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#505050
+background-color=#000000
 text-color=#e0e0e0
-border-color=#e0e0e0
+border-color=#6fb3d2
 
 [urgency=low]
-background-color=#303030
-text-color=#b0b0b0
-border-color=#e0e0e0
+background-color=#000000
+text-color=#fda331
+border-color=#6fb3d2
 
 [urgency=high]
-background-color=#fb0120
-text-color=#f5f5f5
-border-color=#e0e0e0
+background-color=#000000
+text-color=#fb0120
+border-color=#6fb3d2
diff --git a/colors/base16-brogrammer.config b/colors/base16-brogrammer.config
index 9652d26..b7df1d0 100644
--- a/colors/base16-brogrammer.config
+++ b/colors/base16-brogrammer.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#2dc55e
+background-color=#1f1f1f
 text-color=#4e5ab7
-border-color=#4e5ab7
+border-color=#5350b9
 
 [urgency=low]
-background-color=#f81118
-text-color=#ecba0f
-border-color=#4e5ab7
+background-color=#1f1f1f
+text-color=#1dd361
+border-color=#5350b9
 
 [urgency=high]
-background-color=#d6dbe5
-text-color=#1081d6
-border-color=#4e5ab7
+background-color=#1f1f1f
+text-color=#d6dbe5
+border-color=#5350b9
diff --git a/colors/base16-brushtrees-dark.config b/colors/base16-brushtrees-dark.config
index f8f1753..5c1bb9f 100644
--- a/colors/base16-brushtrees-dark.config
+++ b/colors/base16-brushtrees-dark.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#6D828E
+background-color=#485867
 text-color=#B0C5C8
-border-color=#B0C5C8
+border-color=#868cb3
 
 [urgency=low]
-background-color=#5A6D7A
-text-color=#8299A1
-border-color=#B0C5C8
+background-color=#485867
+text-color=#aab386
+border-color=#868cb3
 
 [urgency=high]
-background-color=#b38686
-text-color=#C9DBDC
-border-color=#B0C5C8
+background-color=#485867
+text-color=#b38686
+border-color=#868cb3
diff --git a/colors/base16-brushtrees.config b/colors/base16-brushtrees.config
index 2f6ad90..b4561c4 100644
--- a/colors/base16-brushtrees.config
+++ b/colors/base16-brushtrees.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#B0C5C8
+background-color=#E3EFEF
 text-color=#6D828E
-border-color=#6D828E
+border-color=#868cb3
 
 [urgency=low]
-background-color=#C9DBDC
-text-color=#98AFB5
-border-color=#6D828E
+background-color=#E3EFEF
+text-color=#aab386
+border-color=#868cb3
 
 [urgency=high]
-background-color=#b38686
-text-color=#5A6D7A
-border-color=#6D828E
+background-color=#E3EFEF
+text-color=#b38686
+border-color=#868cb3
diff --git a/colors/base16-chalk.config b/colors/base16-chalk.config
index 13877d1..bdf7eac 100644
--- a/colors/base16-chalk.config
+++ b/colors/base16-chalk.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#303030
+background-color=#151515
 text-color=#d0d0d0
-border-color=#d0d0d0
+border-color=#6fc2ef
 
 [urgency=low]
-background-color=#202020
-text-color=#505050
-border-color=#d0d0d0
+background-color=#151515
+text-color=#ddb26f
+border-color=#6fc2ef
 
 [urgency=high]
-background-color=#fb9fb1
-text-color=#e0e0e0
-border-color=#d0d0d0
+background-color=#151515
+text-color=#fb9fb1
+border-color=#6fc2ef
diff --git a/colors/base16-circus.config b/colors/base16-circus.config
index 961e8f1..04c3ca4 100644
--- a/colors/base16-circus.config
+++ b/colors/base16-circus.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#303030
+background-color=#191919
 text-color=#a7a7a7
-border-color=#a7a7a7
+border-color=#639ee4
 
 [urgency=low]
-background-color=#202020
-text-color=#5f5a60
-border-color=#a7a7a7
+background-color=#191919
+text-color=#c3ba63
+border-color=#639ee4
 
 [urgency=high]
-background-color=#dc657d
-text-color=#808080
-border-color=#a7a7a7
+background-color=#191919
+text-color=#dc657d
+border-color=#639ee4
diff --git a/colors/base16-classic-dark.config b/colors/base16-classic-dark.config
index 2154be8..182be6e 100644
--- a/colors/base16-classic-dark.config
+++ b/colors/base16-classic-dark.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#303030
+background-color=#151515
 text-color=#D0D0D0
-border-color=#D0D0D0
+border-color=#6A9FB5
 
 [urgency=low]
-background-color=#202020
-text-color=#505050
-border-color=#D0D0D0
+background-color=#151515
+text-color=#F4BF75
+border-color=#6A9FB5
 
 [urgency=high]
-background-color=#AC4142
-text-color=#E0E0E0
-border-color=#D0D0D0
+background-color=#151515
+text-color=#AC4142
+border-color=#6A9FB5
diff --git a/colors/base16-classic-light.config b/colors/base16-classic-light.config
index 586ebf2..133e126 100644
--- a/colors/base16-classic-light.config
+++ b/colors/base16-classic-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#D0D0D0
+background-color=#F5F5F5
 text-color=#303030
-border-color=#303030
+border-color=#6A9FB5
 
 [urgency=low]
-background-color=#E0E0E0
-text-color=#B0B0B0
-border-color=#303030
+background-color=#F5F5F5
+text-color=#F4BF75
+border-color=#6A9FB5
 
 [urgency=high]
-background-color=#AC4142
-text-color=#202020
-border-color=#303030
+background-color=#F5F5F5
+text-color=#AC4142
+border-color=#6A9FB5
diff --git a/colors/base16-codeschool.config b/colors/base16-codeschool.config
index 074adda..27b8b7d 100644
--- a/colors/base16-codeschool.config
+++ b/colors/base16-codeschool.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#2a343a
+background-color=#232c31
 text-color=#9ea7a6
-border-color=#9ea7a6
+border-color=#484d79
 
 [urgency=low]
-background-color=#1c3657
-text-color=#3f4944
-border-color=#9ea7a6
+background-color=#232c31
+text-color=#a03b1e
+border-color=#484d79
 
 [urgency=high]
-background-color=#2a5491
-text-color=#a7cfa3
-border-color=#9ea7a6
+background-color=#232c31
+text-color=#2a5491
+border-color=#484d79
diff --git a/colors/base16-cupcake.config b/colors/base16-cupcake.config
index 2e6f7f9..ab3496e 100644
--- a/colors/base16-cupcake.config
+++ b/colors/base16-cupcake.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#d8d5dd
+background-color=#fbf1f2
 text-color=#8b8198
-border-color=#8b8198
+border-color=#7297B9
 
 [urgency=low]
-background-color=#f2f1f4
-text-color=#bfb9c6
-border-color=#8b8198
+background-color=#fbf1f2
+text-color=#DCB16C
+border-color=#7297B9
 
 [urgency=high]
-background-color=#D57E85
-text-color=#72677E
-border-color=#8b8198
+background-color=#fbf1f2
+text-color=#D57E85
+border-color=#7297B9
diff --git a/colors/base16-cupertino.config b/colors/base16-cupertino.config
index 655fead..6dc240d 100644
--- a/colors/base16-cupertino.config
+++ b/colors/base16-cupertino.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#c0c0c0
+background-color=#ffffff
 text-color=#404040
-border-color=#404040
+border-color=#0000ff
 
 [urgency=low]
-background-color=#c0c0c0
-text-color=#808080
-border-color=#404040
+background-color=#ffffff
+text-color=#826b28
+border-color=#0000ff
 
 [urgency=high]
-background-color=#c41a15
-text-color=#404040
-border-color=#404040
+background-color=#ffffff
+text-color=#c41a15
+border-color=#0000ff
diff --git a/colors/base16-darktooth.config b/colors/base16-darktooth.config
index e5c5fe8..983ae6f 100644
--- a/colors/base16-darktooth.config
+++ b/colors/base16-darktooth.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#504945
+background-color=#1D2021
 text-color=#A89984
-border-color=#A89984
+border-color=#0D6678
 
 [urgency=low]
-background-color=#32302F
-text-color=#665C54
-border-color=#A89984
+background-color=#1D2021
+text-color=#FAC03B
+border-color=#0D6678
 
 [urgency=high]
-background-color=#FB543F
-text-color=#D5C4A1
-border-color=#A89984
+background-color=#1D2021
+text-color=#FB543F
+border-color=#0D6678
diff --git a/colors/base16-decaf.config b/colors/base16-decaf.config
new file mode 100644
index 0000000..4c48061
--- /dev/null
+++ b/colors/base16-decaf.config
@@ -0,0 +1,18 @@
+## Base16 Decaf
+# Author: Alex Mirrington (https://github.com/alexmirrington)
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#2d2d2d
+text-color=#cccccc
+border-color=#90bee1
+
+[urgency=low]
+background-color=#2d2d2d
+text-color=#ffd67c
+border-color=#90bee1
+
+[urgency=high]
+background-color=#2d2d2d
+text-color=#ff7f7b
+border-color=#90bee1
diff --git a/colors/base16-default-dark.config b/colors/base16-default-dark.config
index dd5fb36..d38c055 100644
--- a/colors/base16-default-dark.config
+++ b/colors/base16-default-dark.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#383838
+background-color=#181818
 text-color=#d8d8d8
-border-color=#d8d8d8
+border-color=#7cafc2
 
 [urgency=low]
-background-color=#282828
-text-color=#585858
-border-color=#d8d8d8
+background-color=#181818
+text-color=#f7ca88
+border-color=#7cafc2
 
 [urgency=high]
-background-color=#ab4642
-text-color=#e8e8e8
-border-color=#d8d8d8
+background-color=#181818
+text-color=#ab4642
+border-color=#7cafc2
diff --git a/colors/base16-default-light.config b/colors/base16-default-light.config
index df4ee6b..1ff11bc 100644
--- a/colors/base16-default-light.config
+++ b/colors/base16-default-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#d8d8d8
+background-color=#f8f8f8
 text-color=#383838
-border-color=#383838
+border-color=#7cafc2
 
 [urgency=low]
-background-color=#e8e8e8
-text-color=#b8b8b8
-border-color=#383838
+background-color=#f8f8f8
+text-color=#f7ca88
+border-color=#7cafc2
 
 [urgency=high]
-background-color=#ab4642
-text-color=#282828
-border-color=#383838
+background-color=#f8f8f8
+text-color=#ab4642
+border-color=#7cafc2
diff --git a/colors/base16-dracula.config b/colors/base16-dracula.config
index 50dc598..34d803b 100644
--- a/colors/base16-dracula.config
+++ b/colors/base16-dracula.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#4d4f68
+background-color=#282936
 text-color=#e9e9f4
-border-color=#e9e9f4
+border-color=#62d6e8
 
 [urgency=low]
-background-color=#3a3c4e
-text-color=#626483
-border-color=#e9e9f4
+background-color=#282936
+text-color=#00f769
+border-color=#62d6e8
 
 [urgency=high]
-background-color=#ea51b2
-text-color=#f1f2f8
-border-color=#e9e9f4
+background-color=#282936
+text-color=#ea51b2
+border-color=#62d6e8
diff --git a/colors/base16-edge-dark.config b/colors/base16-edge-dark.config
new file mode 100644
index 0000000..3648a55
--- /dev/null
+++ b/colors/base16-edge-dark.config
@@ -0,0 +1,18 @@
+## Base16 Edge Dark
+# Author: cjayross (https://github.com/cjayross)
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#262729
+text-color=#b7bec9
+border-color=#73b3e7
+
+[urgency=low]
+background-color=#262729
+text-color=#dbb774
+border-color=#73b3e7
+
+[urgency=high]
+background-color=#262729
+text-color=#e77171
+border-color=#73b3e7
diff --git a/colors/base16-edge-light.config b/colors/base16-edge-light.config
new file mode 100644
index 0000000..6e88278
--- /dev/null
+++ b/colors/base16-edge-light.config
@@ -0,0 +1,18 @@
+## Base16 Edge Light
+# Author: cjayross (https://github.com/cjayross)
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#fafafa
+text-color=#5e646f
+border-color=#6587bf
+
+[urgency=low]
+background-color=#fafafa
+text-color=#d69822
+border-color=#6587bf
+
+[urgency=high]
+background-color=#fafafa
+text-color=#db7070
+border-color=#6587bf
diff --git a/colors/base16-eighties.config b/colors/base16-eighties.config
index 750187d..fa9117b 100644
--- a/colors/base16-eighties.config
+++ b/colors/base16-eighties.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#515151
+background-color=#2d2d2d
 text-color=#d3d0c8
-border-color=#d3d0c8
+border-color=#6699cc
 
 [urgency=low]
-background-color=#393939
-text-color=#747369
-border-color=#d3d0c8
+background-color=#2d2d2d
+text-color=#ffcc66
+border-color=#6699cc
 
 [urgency=high]
-background-color=#f2777a
-text-color=#e8e6df
-border-color=#d3d0c8
+background-color=#2d2d2d
+text-color=#f2777a
+border-color=#6699cc
diff --git a/colors/base16-embers.config b/colors/base16-embers.config
index 8e7d6df..5b5f034 100644
--- a/colors/base16-embers.config
+++ b/colors/base16-embers.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#433B32
+background-color=#16130F
 text-color=#A39A90
-border-color=#A39A90
+border-color=#6D5782
 
 [urgency=low]
-background-color=#2C2620
-text-color=#5A5047
-border-color=#A39A90
+background-color=#16130F
+text-color=#6D8257
+border-color=#6D5782
 
 [urgency=high]
-background-color=#826D57
-text-color=#BEB6AE
-border-color=#A39A90
+background-color=#16130F
+text-color=#826D57
+border-color=#6D5782
diff --git a/colors/base16-espresso.config b/colors/base16-espresso.config
new file mode 100644
index 0000000..6a13984
--- /dev/null
+++ b/colors/base16-espresso.config
@@ -0,0 +1,18 @@
+## Base16 Espresso
+# Author: Alex Mirrington (https://github.com/alexmirrington)
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#2d2d2d
+text-color=#cccccc
+border-color=#6c99bb
+
+[urgency=low]
+background-color=#2d2d2d
+text-color=#ffc66d
+border-color=#6c99bb
+
+[urgency=high]
+background-color=#2d2d2d
+text-color=#d25252
+border-color=#6c99bb
diff --git a/colors/base16-flat.config b/colors/base16-flat.config
index 4a10c75..0e2fad5 100644
--- a/colors/base16-flat.config
+++ b/colors/base16-flat.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#7F8C8D
+background-color=#2C3E50
 text-color=#e0e0e0
-border-color=#e0e0e0
+border-color=#3498DB
 
 [urgency=low]
-background-color=#34495E
-text-color=#95A5A6
-border-color=#e0e0e0
+background-color=#2C3E50
+text-color=#F1C40F
+border-color=#3498DB
 
 [urgency=high]
-background-color=#E74C3C
-text-color=#f5f5f5
-border-color=#e0e0e0
+background-color=#2C3E50
+text-color=#E74C3C
+border-color=#3498DB
diff --git a/colors/base16-framer.config b/colors/base16-framer.config
new file mode 100644
index 0000000..d3b1bfe
--- /dev/null
+++ b/colors/base16-framer.config
@@ -0,0 +1,18 @@
+## Base16 Framer
+# Author: Framer (Maintained by Jesse Hoyos)
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#181818
+text-color=#D0D0D0
+border-color=#20BCFC
+
+[urgency=low]
+background-color=#181818
+text-color=#FECB6E
+border-color=#20BCFC
+
+[urgency=high]
+background-color=#181818
+text-color=#FD886B
+border-color=#20BCFC
diff --git a/colors/base16-fruit-soda.config b/colors/base16-fruit-soda.config
index f99c51d..ef057d2 100644
--- a/colors/base16-fruit-soda.config
+++ b/colors/base16-fruit-soda.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#d8d5d5
+background-color=#f1ecf1
 text-color=#515151
-border-color=#515151
+border-color=#2931df
 
 [urgency=low]
-background-color=#e0dee0
-text-color=#b5b4b6
-border-color=#515151
+background-color=#f1ecf1
+text-color=#f7e203
+border-color=#2931df
 
 [urgency=high]
-background-color=#fe3e31
-text-color=#474545
-border-color=#515151
+background-color=#f1ecf1
+text-color=#fe3e31
+border-color=#2931df
diff --git a/colors/base16-gigavolt.config b/colors/base16-gigavolt.config
new file mode 100644
index 0000000..427c41c
--- /dev/null
+++ b/colors/base16-gigavolt.config
@@ -0,0 +1,18 @@
+## Base16 Gigavolt
+# Author: Aidan Swope (http://github.com/Whillikers)
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#202126
+text-color=#e9e7e1
+border-color=#40bfff
+
+[urgency=low]
+background-color=#202126
+text-color=#ffdc2d
+border-color=#40bfff
+
+[urgency=high]
+background-color=#202126
+text-color=#ff661a
+border-color=#40bfff
diff --git a/colors/base16-github.config b/colors/base16-github.config
index c52830c..3d0b680 100644
--- a/colors/base16-github.config
+++ b/colors/base16-github.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#c8c8fa
+background-color=#ffffff
 text-color=#333333
-border-color=#333333
+border-color=#795da3
 
 [urgency=low]
-background-color=#f5f5f5
-text-color=#969896
-border-color=#333333
+background-color=#ffffff
+text-color=#795da3
+border-color=#795da3
 
 [urgency=high]
-background-color=#ed6a43
-text-color=#ffffff
-border-color=#333333
+background-color=#ffffff
+text-color=#ed6a43
+border-color=#795da3
diff --git a/colors/base16-google-dark.config b/colors/base16-google-dark.config
index 92db19e..025ad87 100644
--- a/colors/base16-google-dark.config
+++ b/colors/base16-google-dark.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#373b41
+background-color=#1d1f21
 text-color=#c5c8c6
-border-color=#c5c8c6
+border-color=#3971ED
 
 [urgency=low]
-background-color=#282a2e
-text-color=#969896
-border-color=#c5c8c6
+background-color=#1d1f21
+text-color=#FBA922
+border-color=#3971ED
 
 [urgency=high]
-background-color=#CC342B
-text-color=#e0e0e0
-border-color=#c5c8c6
+background-color=#1d1f21
+text-color=#CC342B
+border-color=#3971ED
diff --git a/colors/base16-google-light.config b/colors/base16-google-light.config
index acb2d3e..d3ef3f1 100644
--- a/colors/base16-google-light.config
+++ b/colors/base16-google-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#c5c8c6
+background-color=#ffffff
 text-color=#373b41
-border-color=#373b41
+border-color=#3971ED
 
 [urgency=low]
-background-color=#e0e0e0
-text-color=#b4b7b4
-border-color=#373b41
+background-color=#ffffff
+text-color=#FBA922
+border-color=#3971ED
 
 [urgency=high]
-background-color=#CC342B
-text-color=#282a2e
-border-color=#373b41
+background-color=#ffffff
+text-color=#CC342B
+border-color=#3971ED
diff --git a/colors/base16-grayscale-dark.config b/colors/base16-grayscale-dark.config
index 087277a..c2969a1 100644
--- a/colors/base16-grayscale-dark.config
+++ b/colors/base16-grayscale-dark.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#464646
+background-color=#101010
 text-color=#b9b9b9
-border-color=#b9b9b9
+border-color=#686868
 
 [urgency=low]
-background-color=#252525
-text-color=#525252
-border-color=#b9b9b9
+background-color=#101010
+text-color=#a0a0a0
+border-color=#686868
 
 [urgency=high]
-background-color=#7c7c7c
-text-color=#e3e3e3
-border-color=#b9b9b9
+background-color=#101010
+text-color=#7c7c7c
+border-color=#686868
diff --git a/colors/base16-grayscale-light.config b/colors/base16-grayscale-light.config
index e8d5d69..53d30fd 100644
--- a/colors/base16-grayscale-light.config
+++ b/colors/base16-grayscale-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#b9b9b9
+background-color=#f7f7f7
 text-color=#464646
-border-color=#464646
+border-color=#686868
 
 [urgency=low]
-background-color=#e3e3e3
-text-color=#ababab
-border-color=#464646
+background-color=#f7f7f7
+text-color=#a0a0a0
+border-color=#686868
 
 [urgency=high]
-background-color=#7c7c7c
-text-color=#252525
-border-color=#464646
+background-color=#f7f7f7
+text-color=#7c7c7c
+border-color=#686868
diff --git a/colors/base16-greenscreen.config b/colors/base16-greenscreen.config
index e2e6110..25cedd2 100644
--- a/colors/base16-greenscreen.config
+++ b/colors/base16-greenscreen.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#005500
+background-color=#001100
 text-color=#00bb00
-border-color=#00bb00
+border-color=#009900
 
 [urgency=low]
-background-color=#003300
+background-color=#001100
 text-color=#007700
-border-color=#00bb00
+border-color=#009900
 
 [urgency=high]
-background-color=#007700
-text-color=#00dd00
-border-color=#00bb00
+background-color=#001100
+text-color=#007700
+border-color=#009900
diff --git a/colors/base16-gruvbox-dark-hard.config b/colors/base16-gruvbox-dark-hard.config
index a6bd261..cc692ab 100644
--- a/colors/base16-gruvbox-dark-hard.config
+++ b/colors/base16-gruvbox-dark-hard.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#504945
+background-color=#1d2021
 text-color=#d5c4a1
-border-color=#d5c4a1
+border-color=#83a598
 
 [urgency=low]
-background-color=#3c3836
-text-color=#665c54
-border-color=#d5c4a1
+background-color=#1d2021
+text-color=#fabd2f
+border-color=#83a598
 
 [urgency=high]
-background-color=#fb4934
-text-color=#ebdbb2
-border-color=#d5c4a1
+background-color=#1d2021
+text-color=#fb4934
+border-color=#83a598
diff --git a/colors/base16-gruvbox-dark-medium.config b/colors/base16-gruvbox-dark-medium.config
index d65f1cd..a78d93d 100644
--- a/colors/base16-gruvbox-dark-medium.config
+++ b/colors/base16-gruvbox-dark-medium.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#504945
+background-color=#282828
 text-color=#d5c4a1
-border-color=#d5c4a1
+border-color=#83a598
 
 [urgency=low]
-background-color=#3c3836
-text-color=#665c54
-border-color=#d5c4a1
+background-color=#282828
+text-color=#fabd2f
+border-color=#83a598
 
 [urgency=high]
-background-color=#fb4934
-text-color=#ebdbb2
-border-color=#d5c4a1
+background-color=#282828
+text-color=#fb4934
+border-color=#83a598
diff --git a/colors/base16-gruvbox-dark-pale.config b/colors/base16-gruvbox-dark-pale.config
index 64d8f81..bca7c80 100644
--- a/colors/base16-gruvbox-dark-pale.config
+++ b/colors/base16-gruvbox-dark-pale.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#4e4e4e
+background-color=#262626
 text-color=#dab997
-border-color=#dab997
+border-color=#83adad
 
 [urgency=low]
-background-color=#3a3a3a
-text-color=#8a8a8a
-border-color=#dab997
+background-color=#262626
+text-color=#ffaf00
+border-color=#83adad
 
 [urgency=high]
-background-color=#d75f5f
-text-color=#d5c4a1
-border-color=#dab997
+background-color=#262626
+text-color=#d75f5f
+border-color=#83adad
diff --git a/colors/base16-gruvbox-dark-soft.config b/colors/base16-gruvbox-dark-soft.config
index 37d733d..0fd0007 100644
--- a/colors/base16-gruvbox-dark-soft.config
+++ b/colors/base16-gruvbox-dark-soft.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#504945
+background-color=#32302f
 text-color=#d5c4a1
-border-color=#d5c4a1
+border-color=#83a598
 
 [urgency=low]
-background-color=#3c3836
-text-color=#665c54
-border-color=#d5c4a1
+background-color=#32302f
+text-color=#fabd2f
+border-color=#83a598
 
 [urgency=high]
-background-color=#fb4934
-text-color=#ebdbb2
-border-color=#d5c4a1
+background-color=#32302f
+text-color=#fb4934
+border-color=#83a598
diff --git a/colors/base16-gruvbox-light-hard.config b/colors/base16-gruvbox-light-hard.config
index ceabacf..a7d9202 100644
--- a/colors/base16-gruvbox-light-hard.config
+++ b/colors/base16-gruvbox-light-hard.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#d5c4a1
+background-color=#f9f5d7
 text-color=#504945
-border-color=#504945
+border-color=#076678
 
 [urgency=low]
-background-color=#ebdbb2
-text-color=#bdae93
-border-color=#504945
+background-color=#f9f5d7
+text-color=#b57614
+border-color=#076678
 
 [urgency=high]
-background-color=#9d0006
-text-color=#3c3836
-border-color=#504945
+background-color=#f9f5d7
+text-color=#9d0006
+border-color=#076678
diff --git a/colors/base16-gruvbox-light-medium.config b/colors/base16-gruvbox-light-medium.config
index d08f659..a64343b 100644
--- a/colors/base16-gruvbox-light-medium.config
+++ b/colors/base16-gruvbox-light-medium.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#d5c4a1
+background-color=#fbf1c7
 text-color=#504945
-border-color=#504945
+border-color=#076678
 
 [urgency=low]
-background-color=#ebdbb2
-text-color=#bdae93
-border-color=#504945
+background-color=#fbf1c7
+text-color=#b57614
+border-color=#076678
 
 [urgency=high]
-background-color=#9d0006
-text-color=#3c3836
-border-color=#504945
+background-color=#fbf1c7
+text-color=#9d0006
+border-color=#076678
diff --git a/colors/base16-gruvbox-light-soft.config b/colors/base16-gruvbox-light-soft.config
index c0e18b4..c562678 100644
--- a/colors/base16-gruvbox-light-soft.config
+++ b/colors/base16-gruvbox-light-soft.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#d5c4a1
+background-color=#f2e5bc
 text-color=#504945
-border-color=#504945
+border-color=#076678
 
 [urgency=low]
-background-color=#ebdbb2
-text-color=#bdae93
-border-color=#504945
+background-color=#f2e5bc
+text-color=#b57614
+border-color=#076678
 
 [urgency=high]
-background-color=#9d0006
-text-color=#3c3836
-border-color=#504945
+background-color=#f2e5bc
+text-color=#9d0006
+border-color=#076678
diff --git a/colors/base16-hardcore.config b/colors/base16-hardcore.config
new file mode 100644
index 0000000..dcaf0d7
--- /dev/null
+++ b/colors/base16-hardcore.config
@@ -0,0 +1,18 @@
+## Base16 Hardcore
+# Author: Chris Caller
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#212121
+text-color=#cdcdcd
+border-color=#66d9ef
+
+[urgency=low]
+background-color=#212121
+text-color=#e6db74
+border-color=#66d9ef
+
+[urgency=high]
+background-color=#212121
+text-color=#f92672
+border-color=#66d9ef
diff --git a/colors/base16-harmonic-dark.config b/colors/base16-harmonic-dark.config
index 7f1bf79..031a248 100644
--- a/colors/base16-harmonic-dark.config
+++ b/colors/base16-harmonic-dark.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#405c79
+background-color=#0b1c2c
 text-color=#cbd6e2
-border-color=#cbd6e2
+border-color=#8b56bf
 
 [urgency=low]
-background-color=#223b54
-text-color=#627e99
-border-color=#cbd6e2
+background-color=#0b1c2c
+text-color=#8bbf56
+border-color=#8b56bf
 
 [urgency=high]
-background-color=#bf8b56
-text-color=#e5ebf1
-border-color=#cbd6e2
+background-color=#0b1c2c
+text-color=#bf8b56
+border-color=#8b56bf
diff --git a/colors/base16-harmonic-light.config b/colors/base16-harmonic-light.config
index 5abcf59..dd578a6 100644
--- a/colors/base16-harmonic-light.config
+++ b/colors/base16-harmonic-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#cbd6e2
+background-color=#f7f9fb
 text-color=#405c79
-border-color=#405c79
+border-color=#8b56bf
 
 [urgency=low]
-background-color=#e5ebf1
-text-color=#aabcce
-border-color=#405c79
+background-color=#f7f9fb
+text-color=#8bbf56
+border-color=#8b56bf
 
 [urgency=high]
-background-color=#bf8b56
-text-color=#223b54
-border-color=#405c79
+background-color=#f7f9fb
+text-color=#bf8b56
+border-color=#8b56bf
diff --git a/colors/base16-heetch-light.config b/colors/base16-heetch-light.config
index 3ce615c..75a01fe 100644
--- a/colors/base16-heetch-light.config
+++ b/colors/base16-heetch-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#7b6d8b
+background-color=#feffff
 text-color=#5a496e
-border-color=#5a496e
+border-color=#47f9f5
 
 [urgency=low]
-background-color=#392551
-text-color=#9c92a8
-border-color=#5a496e
+background-color=#feffff
+text-color=#5ba2b6
+border-color=#47f9f5
 
 [urgency=high]
-background-color=#27d9d5
-text-color=#470546
-border-color=#5a496e
+background-color=#feffff
+text-color=#27d9d5
+border-color=#47f9f5
diff --git a/colors/base16-heetch.config b/colors/base16-heetch.config
index 5d53bc5..af3d326 100644
--- a/colors/base16-heetch.config
+++ b/colors/base16-heetch.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#5A496E
+background-color=#190134
 text-color=#BDB6C5
-border-color=#BDB6C5
+border-color=#BD0152
 
 [urgency=low]
-background-color=#392551
-text-color=#7B6D8B
-border-color=#BDB6C5
+background-color=#190134
+text-color=#8F6C97
+border-color=#BD0152
 
 [urgency=high]
-background-color=#27D9D5
-text-color=#DEDAE2
-border-color=#BDB6C5
+background-color=#190134
+text-color=#27D9D5
+border-color=#BD0152
diff --git a/colors/base16-helios.config b/colors/base16-helios.config
new file mode 100644
index 0000000..0020d82
--- /dev/null
+++ b/colors/base16-helios.config
@@ -0,0 +1,18 @@
+## Base16 Helios
+# Author: Alex Meyer (https://github.com/reyemxela)
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#1d2021
+text-color=#d5d5d5
+border-color=#1e8bac
+
+[urgency=low]
+background-color=#1d2021
+text-color=#f19d1a
+border-color=#1e8bac
+
+[urgency=high]
+background-color=#1d2021
+text-color=#d72638
+border-color=#1e8bac
diff --git a/colors/base16-hopscotch.config b/colors/base16-hopscotch.config
index 7985e7e..9791ef5 100644
--- a/colors/base16-hopscotch.config
+++ b/colors/base16-hopscotch.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#5c545b
+background-color=#322931
 text-color=#b9b5b8
-border-color=#b9b5b8
+border-color=#1290bf
 
 [urgency=low]
-background-color=#433b42
-text-color=#797379
-border-color=#b9b5b8
+background-color=#322931
+text-color=#fdcc59
+border-color=#1290bf
 
 [urgency=high]
-background-color=#dd464c
-text-color=#d5d3d5
-border-color=#b9b5b8
+background-color=#322931
+text-color=#dd464c
+border-color=#1290bf
diff --git a/colors/base16-horizon-dark.config b/colors/base16-horizon-dark.config
new file mode 100644
index 0000000..434875b
--- /dev/null
+++ b/colors/base16-horizon-dark.config
@@ -0,0 +1,18 @@
+## Base16 Horizon Dark
+# Author: Michaël Ball (http://github.com/michael-ball/)
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#1C1E26
+text-color=#CBCED0
+border-color=#DF5273
+
+[urgency=low]
+background-color=#1C1E26
+text-color=#EFB993
+border-color=#DF5273
+
+[urgency=high]
+background-color=#1C1E26
+text-color=#E93C58
+border-color=#DF5273
diff --git a/colors/base16-horizon-light.config b/colors/base16-horizon-light.config
new file mode 100644
index 0000000..be040ba
--- /dev/null
+++ b/colors/base16-horizon-light.config
@@ -0,0 +1,18 @@
+## Base16 Horizon Light
+# Author: Michaël Ball (http://github.com/michael-ball/)
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#FDF0ED
+text-color=#403C3D
+border-color=#DA103F
+
+[urgency=low]
+background-color=#FDF0ED
+text-color=#FBE0D9
+border-color=#DA103F
+
+[urgency=high]
+background-color=#FDF0ED
+text-color=#F7939B
+border-color=#DA103F
diff --git a/colors/base16-horizon-terminal-dark.config b/colors/base16-horizon-terminal-dark.config
new file mode 100644
index 0000000..338536c
--- /dev/null
+++ b/colors/base16-horizon-terminal-dark.config
@@ -0,0 +1,18 @@
+## Base16 Horizon Dark
+# Author: Michaël Ball (http://github.com/michael-ball/)
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#1C1E26
+text-color=#CBCED0
+border-color=#26BBD9
+
+[urgency=low]
+background-color=#1C1E26
+text-color=#FAC29A
+border-color=#26BBD9
+
+[urgency=high]
+background-color=#1C1E26
+text-color=#E95678
+border-color=#26BBD9
diff --git a/colors/base16-horizon-terminal-light.config b/colors/base16-horizon-terminal-light.config
new file mode 100644
index 0000000..dc614e2
--- /dev/null
+++ b/colors/base16-horizon-terminal-light.config
@@ -0,0 +1,18 @@
+## Base16 Horizon Light
+# Author: Michaël Ball (http://github.com/michael-ball/)
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#FDF0ED
+text-color=#403C3D
+border-color=#26BBD9
+
+[urgency=low]
+background-color=#FDF0ED
+text-color=#FADAD1
+border-color=#26BBD9
+
+[urgency=high]
+background-color=#FDF0ED
+text-color=#E95678
+border-color=#26BBD9
diff --git a/colors/base16-ia-dark.config b/colors/base16-ia-dark.config
index a808912..5b78518 100644
--- a/colors/base16-ia-dark.config
+++ b/colors/base16-ia-dark.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#1d414d
+background-color=#1a1a1a
 text-color=#cccccc
-border-color=#cccccc
+border-color=#8eccdd
 
 [urgency=low]
-background-color=#222222
-text-color=#767676
-border-color=#cccccc
+background-color=#1a1a1a
+text-color=#b99353
+border-color=#8eccdd
 
 [urgency=high]
-background-color=#d88568
-text-color=#e8e8e8
-border-color=#cccccc
+background-color=#1a1a1a
+text-color=#d88568
+border-color=#8eccdd
diff --git a/colors/base16-ia-light.config b/colors/base16-ia-light.config
index 873c677..e1d113a 100644
--- a/colors/base16-ia-light.config
+++ b/colors/base16-ia-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#bde5f2
+background-color=#f6f6f6
 text-color=#181818
-border-color=#181818
+border-color=#48bac2
 
 [urgency=low]
-background-color=#dedede
-text-color=#898989
-border-color=#181818
+background-color=#f6f6f6
+text-color=#c48218
+border-color=#48bac2
 
 [urgency=high]
-background-color=#9c5a02
-text-color=#e8e8e8
-border-color=#181818
+background-color=#f6f6f6
+text-color=#9c5a02
+border-color=#48bac2
diff --git a/colors/base16-icy.config b/colors/base16-icy.config
index 34d0da5..0e27b31 100644
--- a/colors/base16-icy.config
+++ b/colors/base16-icy.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#041f23
+background-color=#021012
 text-color=#095b67
-border-color=#095b67
+border-color=#00bcd4
 
 [urgency=low]
-background-color=#031619
-text-color=#052e34
-border-color=#095b67
+background-color=#021012
+text-color=#80deea
+border-color=#00bcd4
 
 [urgency=high]
-background-color=#16c1d9
-text-color=#0c7c8c
-border-color=#095b67
+background-color=#021012
+text-color=#16c1d9
+border-color=#00bcd4
diff --git a/colors/base16-irblack.config b/colors/base16-irblack.config
index 1702575..5e1eba6 100644
--- a/colors/base16-irblack.config
+++ b/colors/base16-irblack.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#484844
+background-color=#000000
 text-color=#b5b3aa
-border-color=#b5b3aa
+border-color=#96cbfe
 
 [urgency=low]
-background-color=#242422
-text-color=#6c6c66
-border-color=#b5b3aa
+background-color=#000000
+text-color=#ffffb6
+border-color=#96cbfe
 
 [urgency=high]
-background-color=#ff6c60
-text-color=#d9d7cc
-border-color=#b5b3aa
+background-color=#000000
+text-color=#ff6c60
+border-color=#96cbfe
diff --git a/colors/base16-isotope.config b/colors/base16-isotope.config
index be9d46f..da2271c 100644
--- a/colors/base16-isotope.config
+++ b/colors/base16-isotope.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#606060
+background-color=#000000
 text-color=#d0d0d0
-border-color=#d0d0d0
+border-color=#0066ff
 
 [urgency=low]
-background-color=#404040
-text-color=#808080
-border-color=#d0d0d0
+background-color=#000000
+text-color=#ff0099
+border-color=#0066ff
 
 [urgency=high]
-background-color=#ff0000
-text-color=#e0e0e0
-border-color=#d0d0d0
+background-color=#000000
+text-color=#ff0000
+border-color=#0066ff
diff --git a/colors/base16-macintosh.config b/colors/base16-macintosh.config
index a392895..8caa8ec 100644
--- a/colors/base16-macintosh.config
+++ b/colors/base16-macintosh.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#404040
+background-color=#000000
 text-color=#c0c0c0
-border-color=#c0c0c0
+border-color=#0000d3
 
 [urgency=low]
-background-color=#404040
-text-color=#808080
-border-color=#c0c0c0
+background-color=#000000
+text-color=#fbf305
+border-color=#0000d3
 
 [urgency=high]
-background-color=#dd0907
-text-color=#c0c0c0
-border-color=#c0c0c0
+background-color=#000000
+text-color=#dd0907
+border-color=#0000d3
diff --git a/colors/base16-marrakesh.config b/colors/base16-marrakesh.config
index d50ae84..7481548 100644
--- a/colors/base16-marrakesh.config
+++ b/colors/base16-marrakesh.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#5f5b17
+background-color=#201602
 text-color=#948e48
-border-color=#948e48
+border-color=#477ca1
 
 [urgency=low]
-background-color=#302e00
-text-color=#6c6823
-border-color=#948e48
+background-color=#201602
+text-color=#a88339
+border-color=#477ca1
 
 [urgency=high]
-background-color=#c35359
-text-color=#ccc37a
-border-color=#948e48
+background-color=#201602
+text-color=#c35359
+border-color=#477ca1
diff --git a/colors/base16-materia.config b/colors/base16-materia.config
index 23d33ae..fe338b4 100644
--- a/colors/base16-materia.config
+++ b/colors/base16-materia.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#37474F
+background-color=#263238
 text-color=#CDD3DE
-border-color=#CDD3DE
+border-color=#89DDFF
 
 [urgency=low]
-background-color=#2C393F
-text-color=#707880
-border-color=#CDD3DE
+background-color=#263238
+text-color=#FFCC00
+border-color=#89DDFF
 
 [urgency=high]
-background-color=#EC5F67
-text-color=#D5DBE5
-border-color=#CDD3DE
+background-color=#263238
+text-color=#EC5F67
+border-color=#89DDFF
diff --git a/colors/base16-material-darker.config b/colors/base16-material-darker.config
index 49648f8..4a6654d 100644
--- a/colors/base16-material-darker.config
+++ b/colors/base16-material-darker.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#353535
+background-color=#212121
 text-color=#EEFFFF
-border-color=#EEFFFF
+border-color=#82AAFF
 
 [urgency=low]
-background-color=#303030
-text-color=#4A4A4A
-border-color=#EEFFFF
+background-color=#212121
+text-color=#FFCB6B
+border-color=#82AAFF
 
 [urgency=high]
-background-color=#F07178
-text-color=#EEFFFF
-border-color=#EEFFFF
+background-color=#212121
+text-color=#F07178
+border-color=#82AAFF
diff --git a/colors/base16-material-lighter.config b/colors/base16-material-lighter.config
index c73c306..47f13f8 100644
--- a/colors/base16-material-lighter.config
+++ b/colors/base16-material-lighter.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#CCEAE7
+background-color=#FAFAFA
 text-color=#80CBC4
-border-color=#80CBC4
+border-color=#6182B8
 
 [urgency=low]
-background-color=#E7EAEC
-text-color=#CCD7DA
-border-color=#80CBC4
+background-color=#FAFAFA
+text-color=#FFB62C
+border-color=#6182B8
 
 [urgency=high]
-background-color=#FF5370
-text-color=#80CBC4
-border-color=#80CBC4
+background-color=#FAFAFA
+text-color=#FF5370
+border-color=#6182B8
diff --git a/colors/base16-material-palenight.config b/colors/base16-material-palenight.config
index 6832441..4918ff6 100644
--- a/colors/base16-material-palenight.config
+++ b/colors/base16-material-palenight.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#32374D
+background-color=#292D3E
 text-color=#959DCB
-border-color=#959DCB
+border-color=#82AAFF
 
 [urgency=low]
-background-color=#444267
-text-color=#676E95
-border-color=#959DCB
+background-color=#292D3E
+text-color=#FFCB6B
+border-color=#82AAFF
 
 [urgency=high]
-background-color=#F07178
-text-color=#959DCB
-border-color=#959DCB
+background-color=#292D3E
+text-color=#F07178
+border-color=#82AAFF
diff --git a/colors/base16-material-vivid.config b/colors/base16-material-vivid.config
index 218ebb2..e855f74 100644
--- a/colors/base16-material-vivid.config
+++ b/colors/base16-material-vivid.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#323639
+background-color=#202124
 text-color=#80868b
-border-color=#80868b
+border-color=#2196f3
 
 [urgency=low]
-background-color=#27292c
-text-color=#44464d
-border-color=#80868b
+background-color=#202124
+text-color=#ffeb3b
+border-color=#2196f3
 
 [urgency=high]
-background-color=#f44336
-text-color=#9e9e9e
-border-color=#80868b
+background-color=#202124
+text-color=#f44336
+border-color=#2196f3
diff --git a/colors/base16-material.config b/colors/base16-material.config
index 43701cb..1f5b3a1 100644
--- a/colors/base16-material.config
+++ b/colors/base16-material.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#314549
+background-color=#263238
 text-color=#EEFFFF
-border-color=#EEFFFF
+border-color=#82AAFF
 
 [urgency=low]
-background-color=#2E3C43
-text-color=#546E7A
-border-color=#EEFFFF
+background-color=#263238
+text-color=#FFCB6B
+border-color=#82AAFF
 
 [urgency=high]
-background-color=#F07178
-text-color=#EEFFFF
-border-color=#EEFFFF
+background-color=#263238
+text-color=#F07178
+border-color=#82AAFF
diff --git a/colors/base16-mellow-purple.config b/colors/base16-mellow-purple.config
index 9c86986..5523abe 100644
--- a/colors/base16-mellow-purple.config
+++ b/colors/base16-mellow-purple.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#331354
+background-color=#1e0528
 text-color=#ffeeff
-border-color=#ffeeff
+border-color=#550068
 
 [urgency=low]
-background-color=#1A092D
-text-color=#320f55
-border-color=#ffeeff
+background-color=#1e0528
+text-color=#955ae7
+border-color=#550068
 
 [urgency=high]
-background-color=#00d9e9
-text-color=#ffeeff
-border-color=#ffeeff
+background-color=#1e0528
+text-color=#00d9e9
+border-color=#550068
diff --git a/colors/base16-mexico-light.config b/colors/base16-mexico-light.config
index 5e8801c..7238448 100644
--- a/colors/base16-mexico-light.config
+++ b/colors/base16-mexico-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#d8d8d8
+background-color=#f8f8f8
 text-color=#383838
-border-color=#383838
+border-color=#7cafc2
 
 [urgency=low]
-background-color=#e8e8e8
-text-color=#b8b8b8
-border-color=#383838
+background-color=#f8f8f8
+text-color=#f79a0e
+border-color=#7cafc2
 
 [urgency=high]
-background-color=#ab4642
-text-color=#282828
-border-color=#383838
+background-color=#f8f8f8
+text-color=#ab4642
+border-color=#7cafc2
diff --git a/colors/base16-mocha.config b/colors/base16-mocha.config
index 05ff6a9..c48a7bf 100644
--- a/colors/base16-mocha.config
+++ b/colors/base16-mocha.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#645240
+background-color=#3B3228
 text-color=#d0c8c6
-border-color=#d0c8c6
+border-color=#8ab3b5
 
 [urgency=low]
-background-color=#534636
-text-color=#7e705a
-border-color=#d0c8c6
+background-color=#3B3228
+text-color=#f4bc87
+border-color=#8ab3b5
 
 [urgency=high]
-background-color=#cb6077
-text-color=#e9e1dd
-border-color=#d0c8c6
+background-color=#3B3228
+text-color=#cb6077
+border-color=#8ab3b5
diff --git a/colors/base16-monokai.config b/colors/base16-monokai.config
index d842a63..cdba8f4 100644
--- a/colors/base16-monokai.config
+++ b/colors/base16-monokai.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#49483e
+background-color=#272822
 text-color=#f8f8f2
-border-color=#f8f8f2
+border-color=#66d9ef
 
 [urgency=low]
-background-color=#383830
-text-color=#75715e
-border-color=#f8f8f2
+background-color=#272822
+text-color=#f4bf75
+border-color=#66d9ef
 
 [urgency=high]
-background-color=#f92672
-text-color=#f5f4f1
-border-color=#f8f8f2
+background-color=#272822
+text-color=#f92672
+border-color=#66d9ef
diff --git a/colors/base16-nord.config b/colors/base16-nord.config
index 40249b5..ff40ccc 100644
--- a/colors/base16-nord.config
+++ b/colors/base16-nord.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#434C5E
+background-color=#2E3440
 text-color=#E5E9F0
-border-color=#E5E9F0
+border-color=#EBCB8B
 
 [urgency=low]
-background-color=#3B4252
-text-color=#4C566A
-border-color=#E5E9F0
+background-color=#2E3440
+text-color=#5E81AC
+border-color=#EBCB8B
 
 [urgency=high]
-background-color=#88C0D0
-text-color=#ECEFF4
-border-color=#E5E9F0
+background-color=#2E3440
+text-color=#88C0D0
+border-color=#EBCB8B
diff --git a/colors/base16-nova.config b/colors/base16-nova.config
new file mode 100644
index 0000000..7153857
--- /dev/null
+++ b/colors/base16-nova.config
@@ -0,0 +1,18 @@
+## Base16 Nova
+# Author: George Essig (https://github.com/gessig), Trevor D. Miller (https://trevordmiller.com)
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#3C4C55
+text-color=#C5D4DD
+border-color=#83AFE5
+
+[urgency=low]
+background-color=#3C4C55
+text-color=#A8CE93
+border-color=#83AFE5
+
+[urgency=high]
+background-color=#3C4C55
+text-color=#83AFE5
+border-color=#83AFE5
diff --git a/colors/base16-ocean.config b/colors/base16-ocean.config
index 7c1cb7d..42c3bea 100644
--- a/colors/base16-ocean.config
+++ b/colors/base16-ocean.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#4f5b66
+background-color=#2b303b
 text-color=#c0c5ce
-border-color=#c0c5ce
+border-color=#8fa1b3
 
 [urgency=low]
-background-color=#343d46
-text-color=#65737e
-border-color=#c0c5ce
+background-color=#2b303b
+text-color=#ebcb8b
+border-color=#8fa1b3
 
 [urgency=high]
-background-color=#bf616a
-text-color=#dfe1e8
-border-color=#c0c5ce
+background-color=#2b303b
+text-color=#bf616a
+border-color=#8fa1b3
diff --git a/colors/base16-oceanicnext.config b/colors/base16-oceanicnext.config
index 375bbaa..622ec03 100644
--- a/colors/base16-oceanicnext.config
+++ b/colors/base16-oceanicnext.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#4F5B66
+background-color=#1B2B34
 text-color=#C0C5CE
-border-color=#C0C5CE
+border-color=#6699CC
 
 [urgency=low]
-background-color=#343D46
-text-color=#65737E
-border-color=#C0C5CE
+background-color=#1B2B34
+text-color=#FAC863
+border-color=#6699CC
 
 [urgency=high]
-background-color=#EC5f67
-text-color=#CDD3DE
-border-color=#C0C5CE
+background-color=#1B2B34
+text-color=#EC5f67
+border-color=#6699CC
diff --git a/colors/base16-one-light.config b/colors/base16-one-light.config
index f0f7906..9bf4ca9 100644
--- a/colors/base16-one-light.config
+++ b/colors/base16-one-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#e5e5e6
+background-color=#fafafa
 text-color=#383a42
-border-color=#383a42
+border-color=#4078f2
 
 [urgency=low]
-background-color=#f0f0f1
-text-color=#a0a1a7
-border-color=#383a42
+background-color=#fafafa
+text-color=#c18401
+border-color=#4078f2
 
 [urgency=high]
-background-color=#ca1243
-text-color=#202227
-border-color=#383a42
+background-color=#fafafa
+text-color=#ca1243
+border-color=#4078f2
diff --git a/colors/base16-onedark.config b/colors/base16-onedark.config
index 7768e92..a3a7e17 100644
--- a/colors/base16-onedark.config
+++ b/colors/base16-onedark.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#3e4451
+background-color=#282c34
 text-color=#abb2bf
-border-color=#abb2bf
+border-color=#61afef
 
 [urgency=low]
-background-color=#353b45
-text-color=#545862
-border-color=#abb2bf
+background-color=#282c34
+text-color=#e5c07b
+border-color=#61afef
 
 [urgency=high]
-background-color=#e06c75
-text-color=#b6bdca
-border-color=#abb2bf
+background-color=#282c34
+text-color=#e06c75
+border-color=#61afef
diff --git a/colors/base16-outrun-dark.config b/colors/base16-outrun-dark.config
index 0e1a1bd..e02f65c 100644
--- a/colors/base16-outrun-dark.config
+++ b/colors/base16-outrun-dark.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#30305A
+background-color=#00002A
 text-color=#D0D0FA
-border-color=#D0D0FA
+border-color=#66B0FF
 
 [urgency=low]
-background-color=#20204A
-text-color=#50507A
-border-color=#D0D0FA
+background-color=#00002A
+text-color=#F3E877
+border-color=#66B0FF
 
 [urgency=high]
-background-color=#FF4242
-text-color=#E0E0FF
-border-color=#D0D0FA
+background-color=#00002A
+text-color=#FF4242
+border-color=#66B0FF
diff --git a/colors/base16-papercolor-dark.config b/colors/base16-papercolor-dark.config
index e16d800..74e63bb 100644
--- a/colors/base16-papercolor-dark.config
+++ b/colors/base16-papercolor-dark.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#5faf00
+background-color=#1c1c1c
 text-color=#808080
-border-color=#808080
+border-color=#ff5faf
 
 [urgency=low]
-background-color=#af005f
-text-color=#d7af5f
-border-color=#808080
+background-color=#1c1c1c
+text-color=#afd700
+border-color=#ff5faf
 
 [urgency=high]
-background-color=#585858
-text-color=#d7875f
-border-color=#808080
+background-color=#1c1c1c
+text-color=#585858
+border-color=#ff5faf
diff --git a/colors/base16-papercolor-light.config b/colors/base16-papercolor-light.config
index e5480ad..25e6853 100644
--- a/colors/base16-papercolor-light.config
+++ b/colors/base16-papercolor-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#008700
+background-color=#eeeeee
 text-color=#878787
-border-color=#878787
+border-color=#d75f00
 
 [urgency=low]
-background-color=#af0000
-text-color=#5f8700
-border-color=#878787
+background-color=#eeeeee
+text-color=#d70087
+border-color=#d75f00
 
 [urgency=high]
-background-color=#bcbcbc
-text-color=#005f87
-border-color=#878787
+background-color=#eeeeee
+text-color=#bcbcbc
+border-color=#d75f00
diff --git a/colors/base16-paraiso.config b/colors/base16-paraiso.config
index 05d6c5b..7e16100 100644
--- a/colors/base16-paraiso.config
+++ b/colors/base16-paraiso.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#4f424c
+background-color=#2f1e2e
 text-color=#a39e9b
-border-color=#a39e9b
+border-color=#06b6ef
 
 [urgency=low]
-background-color=#41323f
-text-color=#776e71
-border-color=#a39e9b
+background-color=#2f1e2e
+text-color=#fec418
+border-color=#06b6ef
 
 [urgency=high]
-background-color=#ef6155
-text-color=#b9b6b0
-border-color=#a39e9b
+background-color=#2f1e2e
+text-color=#ef6155
+border-color=#06b6ef
diff --git a/colors/base16-phd.config b/colors/base16-phd.config
index 52c2a36..b8f046d 100644
--- a/colors/base16-phd.config
+++ b/colors/base16-phd.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#4d5666
+background-color=#061229
 text-color=#b8bbc2
-border-color=#b8bbc2
+border-color=#5299bf
 
 [urgency=low]
-background-color=#2a3448
-text-color=#717885
-border-color=#b8bbc2
+background-color=#061229
+text-color=#fbd461
+border-color=#5299bf
 
 [urgency=high]
-background-color=#d07346
-text-color=#dbdde0
-border-color=#b8bbc2
+background-color=#061229
+text-color=#d07346
+border-color=#5299bf
diff --git a/colors/base16-pico.config b/colors/base16-pico.config
index c17bb1a..6b2f282 100644
--- a/colors/base16-pico.config
+++ b/colors/base16-pico.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#7e2553
+background-color=#000000
 text-color=#5f574f
-border-color=#5f574f
+border-color=#83769c
 
 [urgency=low]
-background-color=#1d2b53
-text-color=#008751
-border-color=#5f574f
+background-color=#000000
+text-color=#fff024
+border-color=#83769c
 
 [urgency=high]
-background-color=#ff004d
-text-color=#c2c3c7
-border-color=#5f574f
+background-color=#000000
+text-color=#ff004d
+border-color=#83769c
diff --git a/colors/base16-pop.config b/colors/base16-pop.config
index 3ec48a6..6a022fb 100644
--- a/colors/base16-pop.config
+++ b/colors/base16-pop.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#303030
+background-color=#000000
 text-color=#d0d0d0
-border-color=#d0d0d0
+border-color=#0e5a94
 
 [urgency=low]
-background-color=#202020
-text-color=#505050
-border-color=#d0d0d0
+background-color=#000000
+text-color=#f8ca12
+border-color=#0e5a94
 
 [urgency=high]
-background-color=#eb008a
-text-color=#e0e0e0
-border-color=#d0d0d0
+background-color=#000000
+text-color=#eb008a
+border-color=#0e5a94
diff --git a/colors/base16-porple.config b/colors/base16-porple.config
index 6095ea4..205f211 100644
--- a/colors/base16-porple.config
+++ b/colors/base16-porple.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#474160
+background-color=#292c36
 text-color=#d8d8d8
-border-color=#d8d8d8
+border-color=#8485ce
 
 [urgency=low]
-background-color=#333344
-text-color=#65568a
-border-color=#d8d8d8
+background-color=#292c36
+text-color=#efa16b
+border-color=#8485ce
 
 [urgency=high]
-background-color=#f84547
-text-color=#e8e8e8
-border-color=#d8d8d8
+background-color=#292c36
+text-color=#f84547
+border-color=#8485ce
diff --git a/colors/base16-railscasts.config b/colors/base16-railscasts.config
index c29fb62..7c6d76a 100644
--- a/colors/base16-railscasts.config
+++ b/colors/base16-railscasts.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#3a4055
+background-color=#2b2b2b
 text-color=#e6e1dc
-border-color=#e6e1dc
+border-color=#6d9cbe
 
 [urgency=low]
-background-color=#272935
-text-color=#5a647e
-border-color=#e6e1dc
+background-color=#2b2b2b
+text-color=#ffc66d
+border-color=#6d9cbe
 
 [urgency=high]
-background-color=#da4939
-text-color=#f4f1ed
-border-color=#e6e1dc
+background-color=#2b2b2b
+text-color=#da4939
+border-color=#6d9cbe
diff --git a/colors/base16-rebecca.config b/colors/base16-rebecca.config
index 5639b2f..f3ac0c3 100644
--- a/colors/base16-rebecca.config
+++ b/colors/base16-rebecca.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#383a62
+background-color=#292a44
 text-color=#f1eff8
-border-color=#f1eff8
+border-color=#2de0a7
 
 [urgency=low]
-background-color=#663399
-text-color=#666699
-border-color=#f1eff8
+background-color=#292a44
+text-color=#ae81ff
+border-color=#2de0a7
 
 [urgency=high]
-background-color=#a0a0c5
-text-color=#ccccff
-border-color=#f1eff8
+background-color=#292a44
+text-color=#a0a0c5
+border-color=#2de0a7
diff --git a/colors/base16-sandcastle.config b/colors/base16-sandcastle.config
new file mode 100644
index 0000000..0bf92d2
--- /dev/null
+++ b/colors/base16-sandcastle.config
@@ -0,0 +1,18 @@
+## Base16 Sandcastle
+# Author: George Essig (https://github.com/gessig)
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#282c34
+text-color=#a89984
+border-color=#83a598
+
+[urgency=low]
+background-color=#282c34
+text-color=#a07e3b
+border-color=#83a598
+
+[urgency=high]
+background-color=#282c34
+text-color=#83a598
+border-color=#83a598
diff --git a/colors/base16-seti.config b/colors/base16-seti.config
index c328c5b..7b7aca9 100644
--- a/colors/base16-seti.config
+++ b/colors/base16-seti.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#3B758C
+background-color=#151718
 text-color=#d6d6d6
-border-color=#d6d6d6
+border-color=#55b5db
 
 [urgency=low]
-background-color=#282a2b
-text-color=#41535B
-border-color=#d6d6d6
+background-color=#151718
+text-color=#e6cd69
+border-color=#55b5db
 
 [urgency=high]
-background-color=#Cd3f45
-text-color=#eeeeee
-border-color=#d6d6d6
+background-color=#151718
+text-color=#Cd3f45
+border-color=#55b5db
diff --git a/colors/base16-shapeshifter.config b/colors/base16-shapeshifter.config
index 0017aee..97fa4eb 100644
--- a/colors/base16-shapeshifter.config
+++ b/colors/base16-shapeshifter.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#ababab
+background-color=#f9f9f9
 text-color=#102015
-border-color=#102015
+border-color=#3b48e3
 
 [urgency=low]
-background-color=#e0e0e0
-text-color=#555555
-border-color=#102015
+background-color=#f9f9f9
+text-color=#dddd13
+border-color=#3b48e3
 
 [urgency=high]
-background-color=#e92f2f
-text-color=#040404
-border-color=#102015
+background-color=#f9f9f9
+text-color=#e92f2f
+border-color=#3b48e3
diff --git a/colors/base16-snazzy.config b/colors/base16-snazzy.config
index c0585f3..b543a9a 100644
--- a/colors/base16-snazzy.config
+++ b/colors/base16-snazzy.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#43454f
+background-color=#282a36
 text-color=#e2e4e5
-border-color=#e2e4e5
+border-color=#57c7ff
 
 [urgency=low]
-background-color=#34353e
-text-color=#78787e
-border-color=#e2e4e5
+background-color=#282a36
+text-color=#f3f99d
+border-color=#57c7ff
 
 [urgency=high]
-background-color=#ff5c57
-text-color=#eff0eb
-border-color=#e2e4e5
+background-color=#282a36
+text-color=#ff5c57
+border-color=#57c7ff
diff --git a/colors/base16-solarflare.config b/colors/base16-solarflare.config
index a36dcc8..52a4e71 100644
--- a/colors/base16-solarflare.config
+++ b/colors/base16-solarflare.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#586875
+background-color=#18262F
 text-color=#A6AFB8
-border-color=#A6AFB8
+border-color=#33B5E1
 
 [urgency=low]
-background-color=#222E38
-text-color=#667581
-border-color=#A6AFB8
+background-color=#18262F
+text-color=#E4B51C
+border-color=#33B5E1
 
 [urgency=high]
-background-color=#EF5253
-text-color=#E8E9ED
-border-color=#A6AFB8
+background-color=#18262F
+text-color=#EF5253
+border-color=#33B5E1
diff --git a/colors/base16-solarized-dark.config b/colors/base16-solarized-dark.config
index 3edfff4..97c8537 100644
--- a/colors/base16-solarized-dark.config
+++ b/colors/base16-solarized-dark.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#586e75
+background-color=#002b36
 text-color=#93a1a1
-border-color=#93a1a1
+border-color=#268bd2
 
 [urgency=low]
-background-color=#073642
-text-color=#657b83
-border-color=#93a1a1
+background-color=#002b36
+text-color=#b58900
+border-color=#268bd2
 
 [urgency=high]
-background-color=#dc322f
-text-color=#eee8d5
-border-color=#93a1a1
+background-color=#002b36
+text-color=#dc322f
+border-color=#268bd2
diff --git a/colors/base16-solarized-light.config b/colors/base16-solarized-light.config
index fecd679..18ef1fe 100644
--- a/colors/base16-solarized-light.config
+++ b/colors/base16-solarized-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#93a1a1
+background-color=#fdf6e3
 text-color=#586e75
-border-color=#586e75
+border-color=#268bd2
 
 [urgency=low]
-background-color=#eee8d5
-text-color=#839496
-border-color=#586e75
+background-color=#fdf6e3
+text-color=#b58900
+border-color=#268bd2
 
 [urgency=high]
-background-color=#dc322f
-text-color=#073642
-border-color=#586e75
+background-color=#fdf6e3
+text-color=#dc322f
+border-color=#268bd2
diff --git a/colors/base16-spacemacs.config b/colors/base16-spacemacs.config
index 81f04a4..8a1ee68 100644
--- a/colors/base16-spacemacs.config
+++ b/colors/base16-spacemacs.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#444155
+background-color=#1f2022
 text-color=#a3a3a3
-border-color=#a3a3a3
+border-color=#4f97d7
 
 [urgency=low]
-background-color=#282828
-text-color=#585858
-border-color=#a3a3a3
+background-color=#1f2022
+text-color=#b1951d
+border-color=#4f97d7
 
 [urgency=high]
-background-color=#f2241f
-text-color=#e8e8e8
-border-color=#a3a3a3
+background-color=#1f2022
+text-color=#f2241f
+border-color=#4f97d7
diff --git a/colors/base16-summerfruit-dark.config b/colors/base16-summerfruit-dark.config
index a41188f..b2ffa61 100644
--- a/colors/base16-summerfruit-dark.config
+++ b/colors/base16-summerfruit-dark.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#303030
+background-color=#151515
 text-color=#D0D0D0
-border-color=#D0D0D0
+border-color=#3777E6
 
 [urgency=low]
-background-color=#202020
-text-color=#505050
-border-color=#D0D0D0
+background-color=#151515
+text-color=#ABA800
+border-color=#3777E6
 
 [urgency=high]
-background-color=#FF0086
-text-color=#E0E0E0
-border-color=#D0D0D0
+background-color=#151515
+text-color=#FF0086
+border-color=#3777E6
diff --git a/colors/base16-summerfruit-light.config b/colors/base16-summerfruit-light.config
index de8c806..4b6a609 100644
--- a/colors/base16-summerfruit-light.config
+++ b/colors/base16-summerfruit-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#D0D0D0
+background-color=#FFFFFF
 text-color=#101010
-border-color=#101010
+border-color=#3777E6
 
 [urgency=low]
-background-color=#E0E0E0
-text-color=#B0B0B0
-border-color=#101010
+background-color=#FFFFFF
+text-color=#ABA800
+border-color=#3777E6
 
 [urgency=high]
-background-color=#FF0086
-text-color=#151515
-border-color=#101010
+background-color=#FFFFFF
+text-color=#FF0086
+border-color=#3777E6
diff --git a/colors/base16-synth-midnight-dark.config b/colors/base16-synth-midnight-dark.config
new file mode 100644
index 0000000..8e6f17c
--- /dev/null
+++ b/colors/base16-synth-midnight-dark.config
@@ -0,0 +1,18 @@
+## Base16 Synth Midnight Dark
+# Author: Michaël Ball (http://github.com/michael-ball/)
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#040404
+text-color=#DFDBDF
+border-color=#03AEFF
+
+[urgency=low]
+background-color=#040404
+text-color=#DAE84D
+border-color=#03AEFF
+
+[urgency=high]
+background-color=#040404
+text-color=#B53B50
+border-color=#03AEFF
diff --git a/colors/base16-tomorrow-night-eighties.config b/colors/base16-tomorrow-night-eighties.config
new file mode 100644
index 0000000..cf7ec51
--- /dev/null
+++ b/colors/base16-tomorrow-night-eighties.config
@@ -0,0 +1,18 @@
+## Base16 Tomorrow Night
+# Author: Chris Kempson (http://chriskempson.com)
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#2d2d2d
+text-color=#cccccc
+border-color=#6699cc
+
+[urgency=low]
+background-color=#2d2d2d
+text-color=#ffcc66
+border-color=#6699cc
+
+[urgency=high]
+background-color=#2d2d2d
+text-color=#f2777a
+border-color=#6699cc
diff --git a/colors/base16-tomorrow-night.config b/colors/base16-tomorrow-night.config
index a04f95b..3409d11 100644
--- a/colors/base16-tomorrow-night.config
+++ b/colors/base16-tomorrow-night.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#373b41
+background-color=#1d1f21
 text-color=#c5c8c6
-border-color=#c5c8c6
+border-color=#81a2be
 
 [urgency=low]
-background-color=#282a2e
-text-color=#969896
-border-color=#c5c8c6
+background-color=#1d1f21
+text-color=#f0c674
+border-color=#81a2be
 
 [urgency=high]
-background-color=#cc6666
-text-color=#e0e0e0
-border-color=#c5c8c6
+background-color=#1d1f21
+text-color=#cc6666
+border-color=#81a2be
diff --git a/colors/base16-tomorrow.config b/colors/base16-tomorrow.config
index 86ba23b..e05a789 100644
--- a/colors/base16-tomorrow.config
+++ b/colors/base16-tomorrow.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#d6d6d6
+background-color=#ffffff
 text-color=#4d4d4c
-border-color=#4d4d4c
+border-color=#4271ae
 
 [urgency=low]
-background-color=#e0e0e0
-text-color=#8e908c
-border-color=#4d4d4c
+background-color=#ffffff
+text-color=#eab700
+border-color=#4271ae
 
 [urgency=high]
-background-color=#c82829
-text-color=#282a2e
-border-color=#4d4d4c
+background-color=#ffffff
+text-color=#c82829
+border-color=#4271ae
diff --git a/colors/base16-tube.config b/colors/base16-tube.config
index ed3b8fb..3430348 100644
--- a/colors/base16-tube.config
+++ b/colors/base16-tube.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#5a5758
+background-color=#231f20
 text-color=#d9d8d8
-border-color=#d9d8d8
+border-color=#009ddc
 
 [urgency=low]
-background-color=#1c3f95
-text-color=#737171
-border-color=#d9d8d8
+background-color=#231f20
+text-color=#ffd204
+border-color=#009ddc
 
 [urgency=high]
-background-color=#ee2e24
-text-color=#e7e7e8
-border-color=#d9d8d8
+background-color=#231f20
+text-color=#ee2e24
+border-color=#009ddc
diff --git a/colors/base16-twilight.config b/colors/base16-twilight.config
index 709dafb..5023002 100644
--- a/colors/base16-twilight.config
+++ b/colors/base16-twilight.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#464b50
+background-color=#1e1e1e
 text-color=#a7a7a7
-border-color=#a7a7a7
+border-color=#7587a6
 
 [urgency=low]
-background-color=#323537
-text-color=#5f5a60
-border-color=#a7a7a7
+background-color=#1e1e1e
+text-color=#f9ee98
+border-color=#7587a6
 
 [urgency=high]
-background-color=#cf6a4c
-text-color=#c3c3c3
-border-color=#a7a7a7
+background-color=#1e1e1e
+text-color=#cf6a4c
+border-color=#7587a6
diff --git a/colors/base16-unikitty-dark.config b/colors/base16-unikitty-dark.config
index d07aed7..af8c58c 100644
--- a/colors/base16-unikitty-dark.config
+++ b/colors/base16-unikitty-dark.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#666369
+background-color=#2e2a31
 text-color=#bcbabe
-border-color=#bcbabe
+border-color=#796af5
 
 [urgency=low]
-background-color=#4a464d
-text-color=#838085
-border-color=#bcbabe
+background-color=#2e2a31
+text-color=#dc8a0e
+border-color=#796af5
 
 [urgency=high]
-background-color=#d8137f
-text-color=#d8d7da
-border-color=#bcbabe
+background-color=#2e2a31
+text-color=#d8137f
+border-color=#796af5
diff --git a/colors/base16-unikitty-light.config b/colors/base16-unikitty-light.config
index 7ce201e..10c08b1 100644
--- a/colors/base16-unikitty-light.config
+++ b/colors/base16-unikitty-light.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#c4c3c5
+background-color=#ffffff
 text-color=#6c696e
-border-color=#6c696e
+border-color=#775dff
 
 [urgency=low]
-background-color=#e1e1e2
-text-color=#a7a5a8
-border-color=#6c696e
+background-color=#ffffff
+text-color=#dc8a0e
+border-color=#775dff
 
 [urgency=high]
-background-color=#d8137f
-text-color=#4f4b51
-border-color=#6c696e
+background-color=#ffffff
+text-color=#d8137f
+border-color=#775dff
diff --git a/colors/base16-woodland.config b/colors/base16-woodland.config
index 4b87459..686eca5 100644
--- a/colors/base16-woodland.config
+++ b/colors/base16-woodland.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#48413a
+background-color=#231e18
 text-color=#cabcb1
-border-color=#cabcb1
+border-color=#88a4d3
 
 [urgency=low]
-background-color=#302b25
-text-color=#9d8b70
-border-color=#cabcb1
+background-color=#231e18
+text-color=#e0ac16
+border-color=#88a4d3
 
 [urgency=high]
-background-color=#d35c5c
-text-color=#d7c8bc
-border-color=#cabcb1
+background-color=#231e18
+text-color=#d35c5c
+border-color=#88a4d3
diff --git a/colors/base16-xcode-dusk.config b/colors/base16-xcode-dusk.config
index d9c69ae..e29bc8e 100644
--- a/colors/base16-xcode-dusk.config
+++ b/colors/base16-xcode-dusk.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#53555D
+background-color=#282B35
 text-color=#939599
-border-color=#939599
+border-color=#790EAD
 
 [urgency=low]
-background-color=#3D4048
-text-color=#686A71
-border-color=#939599
+background-color=#282B35
+text-color=#438288
+border-color=#790EAD
 
 [urgency=high]
-background-color=#B21889
-text-color=#A9AAAE
-border-color=#939599
+background-color=#282B35
+text-color=#B21889
+border-color=#790EAD
diff --git a/colors/base16-zenburn.config b/colors/base16-zenburn.config
index 67b1f75..08e7759 100644
--- a/colors/base16-zenburn.config
+++ b/colors/base16-zenburn.config
@@ -3,16 +3,16 @@
 #
 # You can use these variables anywhere in the mako configuration file.
 
-background-color=#606060
+background-color=#383838
 text-color=#dcdccc
-border-color=#dcdccc
+border-color=#7cb8bb
 
 [urgency=low]
-background-color=#404040
-text-color=#6f6f6f
-border-color=#dcdccc
+background-color=#383838
+text-color=#e0cf9f
+border-color=#7cb8bb
 
 [urgency=high]
-background-color=#dca3a3
-text-color=#c0c0c0
-border-color=#dcdccc
+background-color=#383838
+text-color=#dca3a3
+border-color=#7cb8bb