aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Eddie Barraco <e.barraco@ubitransport.com>2019-03-27 15:58:42 +0100
committerLibravatar Eddie Barraco <e.barraco@ubitransport.com>2019-03-27 15:58:42 +0100
commitd0208990cc3eac1cce6c8cc87b4011eb75aef5c8 (patch)
treed277dfeb156bdccd43102efa5980bf51096b38ae
parent7a7934cb4a2614fb29e46c213b06a07df035b059 (diff)
The normal urgency color is not the default one
-rw-r--r--colors/base16-3024.config9
-rw-r--r--colors/base16-apathy.config9
-rw-r--r--colors/base16-ashes.config9
-rw-r--r--colors/base16-atelier-cave-light.config9
-rw-r--r--colors/base16-atelier-cave.config9
-rw-r--r--colors/base16-atelier-dune-light.config9
-rw-r--r--colors/base16-atelier-dune.config9
-rw-r--r--colors/base16-atelier-estuary-light.config9
-rw-r--r--colors/base16-atelier-estuary.config9
-rw-r--r--colors/base16-atelier-forest-light.config9
-rw-r--r--colors/base16-atelier-forest.config9
-rw-r--r--colors/base16-atelier-heath-light.config9
-rw-r--r--colors/base16-atelier-heath.config9
-rw-r--r--colors/base16-atelier-lakeside-light.config9
-rw-r--r--colors/base16-atelier-lakeside.config9
-rw-r--r--colors/base16-atelier-plateau-light.config9
-rw-r--r--colors/base16-atelier-plateau.config9
-rw-r--r--colors/base16-atelier-savanna-light.config9
-rw-r--r--colors/base16-atelier-savanna.config9
-rw-r--r--colors/base16-atelier-seaside-light.config9
-rw-r--r--colors/base16-atelier-seaside.config9
-rw-r--r--colors/base16-atelier-sulphurpool-light.config9
-rw-r--r--colors/base16-atelier-sulphurpool.config9
-rw-r--r--colors/base16-atlas.config9
-rw-r--r--colors/base16-bespin.config9
-rw-r--r--colors/base16-black-metal-bathory.config9
-rw-r--r--colors/base16-black-metal-burzum.config9
-rw-r--r--colors/base16-black-metal-dark-funeral.config9
-rw-r--r--colors/base16-black-metal-gorgoroth.config9
-rw-r--r--colors/base16-black-metal-immortal.config9
-rw-r--r--colors/base16-black-metal-khold.config9
-rw-r--r--colors/base16-black-metal-marduk.config9
-rw-r--r--colors/base16-black-metal-mayhem.config9
-rw-r--r--colors/base16-black-metal-nile.config9
-rw-r--r--colors/base16-black-metal-venom.config9
-rw-r--r--colors/base16-black-metal.config9
-rw-r--r--colors/base16-brewer.config9
-rw-r--r--colors/base16-bright.config9
-rw-r--r--colors/base16-brogrammer.config9
-rw-r--r--colors/base16-brushtrees-dark.config9
-rw-r--r--colors/base16-brushtrees.config9
-rw-r--r--colors/base16-chalk.config9
-rw-r--r--colors/base16-circus.config9
-rw-r--r--colors/base16-classic-dark.config9
-rw-r--r--colors/base16-classic-light.config9
-rw-r--r--colors/base16-codeschool.config9
-rw-r--r--colors/base16-cupcake.config9
-rw-r--r--colors/base16-cupertino.config7
-rw-r--r--colors/base16-darktooth.config9
-rw-r--r--colors/base16-default-dark.config9
-rw-r--r--colors/base16-default-light.config9
-rw-r--r--colors/base16-dracula.config9
-rw-r--r--colors/base16-eighties.config9
-rw-r--r--colors/base16-embers.config9
-rw-r--r--colors/base16-flat.config9
-rw-r--r--colors/base16-fruit-soda.config9
-rw-r--r--colors/base16-github.config9
-rw-r--r--colors/base16-google-dark.config9
-rw-r--r--colors/base16-google-light.config9
-rw-r--r--colors/base16-grayscale-dark.config9
-rw-r--r--colors/base16-grayscale-light.config9
-rw-r--r--colors/base16-greenscreen.config9
-rw-r--r--colors/base16-gruvbox-dark-hard.config9
-rw-r--r--colors/base16-gruvbox-dark-medium.config9
-rw-r--r--colors/base16-gruvbox-dark-pale.config9
-rw-r--r--colors/base16-gruvbox-dark-soft.config9
-rw-r--r--colors/base16-gruvbox-light-hard.config9
-rw-r--r--colors/base16-gruvbox-light-medium.config9
-rw-r--r--colors/base16-gruvbox-light-soft.config9
-rw-r--r--colors/base16-harmonic-dark.config9
-rw-r--r--colors/base16-harmonic-light.config9
-rw-r--r--colors/base16-heetch-light.config9
-rw-r--r--colors/base16-heetch.config9
-rw-r--r--colors/base16-hopscotch.config9
-rw-r--r--colors/base16-ia-dark.config9
-rw-r--r--colors/base16-ia-light.config9
-rw-r--r--colors/base16-icy.config9
-rw-r--r--colors/base16-irblack.config9
-rw-r--r--colors/base16-isotope.config9
-rw-r--r--colors/base16-macintosh.config7
-rw-r--r--colors/base16-marrakesh.config9
-rw-r--r--colors/base16-materia.config9
-rw-r--r--colors/base16-material-darker.config9
-rw-r--r--colors/base16-material-lighter.config9
-rw-r--r--colors/base16-material-palenight.config9
-rw-r--r--colors/base16-material-vivid.config9
-rw-r--r--colors/base16-material.config9
-rw-r--r--colors/base16-mellow-purple.config9
-rw-r--r--colors/base16-mexico-light.config9
-rw-r--r--colors/base16-mocha.config9
-rw-r--r--colors/base16-monokai.config9
-rw-r--r--colors/base16-nord.config9
-rw-r--r--colors/base16-ocean.config9
-rw-r--r--colors/base16-oceanicnext.config9
-rw-r--r--colors/base16-one-light.config9
-rw-r--r--colors/base16-onedark.config9
-rw-r--r--colors/base16-outrun-dark.config9
-rw-r--r--colors/base16-papercolor-dark.config9
-rw-r--r--colors/base16-papercolor-light.config9
-rw-r--r--colors/base16-paraiso.config9
-rw-r--r--colors/base16-phd.config9
-rw-r--r--colors/base16-pico.config9
-rw-r--r--colors/base16-pop.config9
-rw-r--r--colors/base16-porple.config9
-rw-r--r--colors/base16-railscasts.config9
-rw-r--r--colors/base16-rebecca.config9
-rw-r--r--colors/base16-seti.config9
-rw-r--r--colors/base16-shapeshifter.config9
-rw-r--r--colors/base16-snazzy.config9
-rw-r--r--colors/base16-solarflare.config9
-rw-r--r--colors/base16-solarized-dark.config9
-rw-r--r--colors/base16-solarized-light.config9
-rw-r--r--colors/base16-spacemacs.config9
-rw-r--r--colors/base16-summerfruit-dark.config9
-rw-r--r--colors/base16-summerfruit-light.config9
-rw-r--r--colors/base16-tomorrow-night.config9
-rw-r--r--colors/base16-tomorrow.config9
-rw-r--r--colors/base16-tube.config9
-rw-r--r--colors/base16-twilight.config9
-rw-r--r--colors/base16-unikitty-dark.config9
-rw-r--r--colors/base16-unikitty-light.config9
-rw-r--r--colors/base16-woodland.config9
-rw-r--r--colors/base16-xcode-dusk.config9
-rw-r--r--colors/base16-zenburn.config9
-rw-r--r--templates/default.mustache9
125 files changed, 498 insertions, 623 deletions
diff --git a/colors/base16-3024.config b/colors/base16-3024.config
index bab7e07..06c0aa3 100644
--- a/colors/base16-3024.config
+++ b/colors/base16-3024.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#4a4543
+text-color=#a5a2a2
+border-color=#a5a2a2
+
[urgency=low]
background-color=#3a3432
text-color=#5c5855
border-color=#a5a2a2
-[urgency=normal]
-background-color=#4a4543
-text-color=#a5a2a2
-border-color=#a5a2a2
-
[urgency=high]
background-color=#db2d20
text-color=#d6d5d4
diff --git a/colors/base16-apathy.config b/colors/base16-apathy.config
index c13c107..80bcf79 100644
--- a/colors/base16-apathy.config
+++ b/colors/base16-apathy.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#184E45
+text-color=#81B5AC
+border-color=#81B5AC
+
[urgency=low]
background-color=#0B342D
text-color=#2B685E
border-color=#81B5AC
-[urgency=normal]
-background-color=#184E45
-text-color=#81B5AC
-border-color=#81B5AC
-
[urgency=high]
background-color=#3E9688
text-color=#A7CEC8
diff --git a/colors/base16-ashes.config b/colors/base16-ashes.config
index 50a6735..70605f8 100644
--- a/colors/base16-ashes.config
+++ b/colors/base16-ashes.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#565E65
+text-color=#C7CCD1
+border-color=#C7CCD1
+
[urgency=low]
background-color=#393F45
text-color=#747C84
border-color=#C7CCD1
-[urgency=normal]
-background-color=#565E65
-text-color=#C7CCD1
-border-color=#C7CCD1
-
[urgency=high]
background-color=#C7AE95
text-color=#DFE2E5
diff --git a/colors/base16-atelier-cave-light.config b/colors/base16-atelier-cave-light.config
index 7c94904..542d883 100644
--- a/colors/base16-atelier-cave-light.config
+++ b/colors/base16-atelier-cave-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#8b8792
+text-color=#585260
+border-color=#585260
+
[urgency=low]
background-color=#e2dfe7
text-color=#7e7887
border-color=#585260
-[urgency=normal]
-background-color=#8b8792
-text-color=#585260
-border-color=#585260
-
[urgency=high]
background-color=#be4678
text-color=#26232a
diff --git a/colors/base16-atelier-cave.config b/colors/base16-atelier-cave.config
index ff265d3..3636dc3 100644
--- a/colors/base16-atelier-cave.config
+++ b/colors/base16-atelier-cave.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#585260
+text-color=#8b8792
+border-color=#8b8792
+
[urgency=low]
background-color=#26232a
text-color=#655f6d
border-color=#8b8792
-[urgency=normal]
-background-color=#585260
-text-color=#8b8792
-border-color=#8b8792
-
[urgency=high]
background-color=#be4678
text-color=#e2dfe7
diff --git a/colors/base16-atelier-dune-light.config b/colors/base16-atelier-dune-light.config
index 0d51e8d..374a5d7 100644
--- a/colors/base16-atelier-dune-light.config
+++ b/colors/base16-atelier-dune-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#a6a28c
+text-color=#6e6b5e
+border-color=#6e6b5e
+
[urgency=low]
background-color=#e8e4cf
text-color=#999580
border-color=#6e6b5e
-[urgency=normal]
-background-color=#a6a28c
-text-color=#6e6b5e
-border-color=#6e6b5e
-
[urgency=high]
background-color=#d73737
text-color=#292824
diff --git a/colors/base16-atelier-dune.config b/colors/base16-atelier-dune.config
index d33d2a3..a66b742 100644
--- a/colors/base16-atelier-dune.config
+++ b/colors/base16-atelier-dune.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#6e6b5e
+text-color=#a6a28c
+border-color=#a6a28c
+
[urgency=low]
background-color=#292824
text-color=#7d7a68
border-color=#a6a28c
-[urgency=normal]
-background-color=#6e6b5e
-text-color=#a6a28c
-border-color=#a6a28c
-
[urgency=high]
background-color=#d73737
text-color=#e8e4cf
diff --git a/colors/base16-atelier-estuary-light.config b/colors/base16-atelier-estuary-light.config
index 077132e..d51f090 100644
--- a/colors/base16-atelier-estuary-light.config
+++ b/colors/base16-atelier-estuary-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#929181
+text-color=#5f5e4e
+border-color=#5f5e4e
+
[urgency=low]
background-color=#e7e6df
text-color=#878573
border-color=#5f5e4e
-[urgency=normal]
-background-color=#929181
-text-color=#5f5e4e
-border-color=#5f5e4e
-
[urgency=high]
background-color=#ba6236
text-color=#302f27
diff --git a/colors/base16-atelier-estuary.config b/colors/base16-atelier-estuary.config
index 90a5b2d..94698bc 100644
--- a/colors/base16-atelier-estuary.config
+++ b/colors/base16-atelier-estuary.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#5f5e4e
+text-color=#929181
+border-color=#929181
+
[urgency=low]
background-color=#302f27
text-color=#6c6b5a
border-color=#929181
-[urgency=normal]
-background-color=#5f5e4e
-text-color=#929181
-border-color=#929181
-
[urgency=high]
background-color=#ba6236
text-color=#e7e6df
diff --git a/colors/base16-atelier-forest-light.config b/colors/base16-atelier-forest-light.config
index ee05059..82e2917 100644
--- a/colors/base16-atelier-forest-light.config
+++ b/colors/base16-atelier-forest-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#a8a19f
+text-color=#68615e
+border-color=#68615e
+
[urgency=low]
background-color=#e6e2e0
text-color=#9c9491
border-color=#68615e
-[urgency=normal]
-background-color=#a8a19f
-text-color=#68615e
-border-color=#68615e
-
[urgency=high]
background-color=#f22c40
text-color=#2c2421
diff --git a/colors/base16-atelier-forest.config b/colors/base16-atelier-forest.config
index 66402d2..fd65d49 100644
--- a/colors/base16-atelier-forest.config
+++ b/colors/base16-atelier-forest.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#68615e
+text-color=#a8a19f
+border-color=#a8a19f
+
[urgency=low]
background-color=#2c2421
text-color=#766e6b
border-color=#a8a19f
-[urgency=normal]
-background-color=#68615e
-text-color=#a8a19f
-border-color=#a8a19f
-
[urgency=high]
background-color=#f22c40
text-color=#e6e2e0
diff --git a/colors/base16-atelier-heath-light.config b/colors/base16-atelier-heath-light.config
index 0a92e8b..b0b7278 100644
--- a/colors/base16-atelier-heath-light.config
+++ b/colors/base16-atelier-heath-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#ab9bab
+text-color=#695d69
+border-color=#695d69
+
[urgency=low]
background-color=#d8cad8
text-color=#9e8f9e
border-color=#695d69
-[urgency=normal]
-background-color=#ab9bab
-text-color=#695d69
-border-color=#695d69
-
[urgency=high]
background-color=#ca402b
text-color=#292329
diff --git a/colors/base16-atelier-heath.config b/colors/base16-atelier-heath.config
index 16cab89..809ff77 100644
--- a/colors/base16-atelier-heath.config
+++ b/colors/base16-atelier-heath.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#695d69
+text-color=#ab9bab
+border-color=#ab9bab
+
[urgency=low]
background-color=#292329
text-color=#776977
border-color=#ab9bab
-[urgency=normal]
-background-color=#695d69
-text-color=#ab9bab
-border-color=#ab9bab
-
[urgency=high]
background-color=#ca402b
text-color=#d8cad8
diff --git a/colors/base16-atelier-lakeside-light.config b/colors/base16-atelier-lakeside-light.config
index df65ea6..ee4c23f 100644
--- a/colors/base16-atelier-lakeside-light.config
+++ b/colors/base16-atelier-lakeside-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#7ea2b4
+text-color=#516d7b
+border-color=#516d7b
+
[urgency=low]
background-color=#c1e4f6
text-color=#7195a8
border-color=#516d7b
-[urgency=normal]
-background-color=#7ea2b4
-text-color=#516d7b
-border-color=#516d7b
-
[urgency=high]
background-color=#d22d72
text-color=#1f292e
diff --git a/colors/base16-atelier-lakeside.config b/colors/base16-atelier-lakeside.config
index 4735286..0b7b92f 100644
--- a/colors/base16-atelier-lakeside.config
+++ b/colors/base16-atelier-lakeside.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#516d7b
+text-color=#7ea2b4
+border-color=#7ea2b4
+
[urgency=low]
background-color=#1f292e
text-color=#5a7b8c
border-color=#7ea2b4
-[urgency=normal]
-background-color=#516d7b
-text-color=#7ea2b4
-border-color=#7ea2b4
-
[urgency=high]
background-color=#d22d72
text-color=#c1e4f6
diff --git a/colors/base16-atelier-plateau-light.config b/colors/base16-atelier-plateau-light.config
index cd10c09..f26793e 100644
--- a/colors/base16-atelier-plateau-light.config
+++ b/colors/base16-atelier-plateau-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#8a8585
+text-color=#585050
+border-color=#585050
+
[urgency=low]
background-color=#e7dfdf
text-color=#7e7777
border-color=#585050
-[urgency=normal]
-background-color=#8a8585
-text-color=#585050
-border-color=#585050
-
[urgency=high]
background-color=#ca4949
text-color=#292424
diff --git a/colors/base16-atelier-plateau.config b/colors/base16-atelier-plateau.config
index 19f8e67..112e969 100644
--- a/colors/base16-atelier-plateau.config
+++ b/colors/base16-atelier-plateau.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#585050
+text-color=#8a8585
+border-color=#8a8585
+
[urgency=low]
background-color=#292424
text-color=#655d5d
border-color=#8a8585
-[urgency=normal]
-background-color=#585050
-text-color=#8a8585
-border-color=#8a8585
-
[urgency=high]
background-color=#ca4949
text-color=#e7dfdf
diff --git a/colors/base16-atelier-savanna-light.config b/colors/base16-atelier-savanna-light.config
index 51b603c..efea7d1 100644
--- a/colors/base16-atelier-savanna-light.config
+++ b/colors/base16-atelier-savanna-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#87928a
+text-color=#526057
+border-color=#526057
+
[urgency=low]
background-color=#dfe7e2
text-color=#78877d
border-color=#526057
-[urgency=normal]
-background-color=#87928a
-text-color=#526057
-border-color=#526057
-
[urgency=high]
background-color=#b16139
text-color=#232a25
diff --git a/colors/base16-atelier-savanna.config b/colors/base16-atelier-savanna.config
index 5848b26..6b56ea3 100644
--- a/colors/base16-atelier-savanna.config
+++ b/colors/base16-atelier-savanna.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#526057
+text-color=#87928a
+border-color=#87928a
+
[urgency=low]
background-color=#232a25
text-color=#5f6d64
border-color=#87928a
-[urgency=normal]
-background-color=#526057
-text-color=#87928a
-border-color=#87928a
-
[urgency=high]
background-color=#b16139
text-color=#dfe7e2
diff --git a/colors/base16-atelier-seaside-light.config b/colors/base16-atelier-seaside-light.config
index 2f2e6d0..f42bccb 100644
--- a/colors/base16-atelier-seaside-light.config
+++ b/colors/base16-atelier-seaside-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#8ca68c
+text-color=#5e6e5e
+border-color=#5e6e5e
+
[urgency=low]
background-color=#cfe8cf
text-color=#809980
border-color=#5e6e5e
-[urgency=normal]
-background-color=#8ca68c
-text-color=#5e6e5e
-border-color=#5e6e5e
-
[urgency=high]
background-color=#e6193c
text-color=#242924
diff --git a/colors/base16-atelier-seaside.config b/colors/base16-atelier-seaside.config
index 412e8ad..8661384 100644
--- a/colors/base16-atelier-seaside.config
+++ b/colors/base16-atelier-seaside.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#5e6e5e
+text-color=#8ca68c
+border-color=#8ca68c
+
[urgency=low]
background-color=#242924
text-color=#687d68
border-color=#8ca68c
-[urgency=normal]
-background-color=#5e6e5e
-text-color=#8ca68c
-border-color=#8ca68c
-
[urgency=high]
background-color=#e6193c
text-color=#cfe8cf
diff --git a/colors/base16-atelier-sulphurpool-light.config b/colors/base16-atelier-sulphurpool-light.config
index 2eb8997..3720b5c 100644
--- a/colors/base16-atelier-sulphurpool-light.config
+++ b/colors/base16-atelier-sulphurpool-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#979db4
+text-color=#5e6687
+border-color=#5e6687
+
[urgency=low]
background-color=#dfe2f1
text-color=#898ea4
border-color=#5e6687
-[urgency=normal]
-background-color=#979db4
-text-color=#5e6687
-border-color=#5e6687
-
[urgency=high]
background-color=#c94922
text-color=#293256
diff --git a/colors/base16-atelier-sulphurpool.config b/colors/base16-atelier-sulphurpool.config
index 9223e59..d63a388 100644
--- a/colors/base16-atelier-sulphurpool.config
+++ b/colors/base16-atelier-sulphurpool.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#5e6687
+text-color=#979db4
+border-color=#979db4
+
[urgency=low]
background-color=#293256
text-color=#6b7394
border-color=#979db4
-[urgency=normal]
-background-color=#5e6687
-text-color=#979db4
-border-color=#979db4
-
[urgency=high]
background-color=#c94922
text-color=#dfe2f1
diff --git a/colors/base16-atlas.config b/colors/base16-atlas.config
index 9efffa1..6def90c 100644
--- a/colors/base16-atlas.config
+++ b/colors/base16-atlas.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#517F8D
+text-color=#a1a19a
+border-color=#a1a19a
+
[urgency=low]
background-color=#00384d
text-color=#6C8B91
border-color=#a1a19a
-[urgency=normal]
-background-color=#517F8D
-text-color=#a1a19a
-border-color=#a1a19a
-
[urgency=high]
background-color=#ff5a67
text-color=#e6e6dc
diff --git a/colors/base16-bespin.config b/colors/base16-bespin.config
index f4e9ae2..6a83fa9 100644
--- a/colors/base16-bespin.config
+++ b/colors/base16-bespin.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#5e5d5c
+text-color=#8a8986
+border-color=#8a8986
+
[urgency=low]
background-color=#36312e
text-color=#666666
border-color=#8a8986
-[urgency=normal]
-background-color=#5e5d5c
-text-color=#8a8986
-border-color=#8a8986
-
[urgency=high]
background-color=#cf6a4c
text-color=#9d9b97
diff --git a/colors/base16-black-metal-bathory.config b/colors/base16-black-metal-bathory.config
index b59add9..6193cbe 100644
--- a/colors/base16-black-metal-bathory.config
+++ b/colors/base16-black-metal-bathory.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#222222
+text-color=#c1c1c1
+border-color=#c1c1c1
+
[urgency=low]
background-color=#121212
text-color=#333333
border-color=#c1c1c1
-[urgency=normal]
-background-color=#222222
-text-color=#c1c1c1
-border-color=#c1c1c1
-
[urgency=high]
background-color=#5f8787
text-color=#999999
diff --git a/colors/base16-black-metal-burzum.config b/colors/base16-black-metal-burzum.config
index b7065b7..a57e244 100644
--- a/colors/base16-black-metal-burzum.config
+++ b/colors/base16-black-metal-burzum.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#222222
+text-color=#c1c1c1
+border-color=#c1c1c1
+
[urgency=low]
background-color=#121212
text-color=#333333
border-color=#c1c1c1
-[urgency=normal]
-background-color=#222222
-text-color=#c1c1c1
-border-color=#c1c1c1
-
[urgency=high]
background-color=#5f8787
text-color=#999999
diff --git a/colors/base16-black-metal-dark-funeral.config b/colors/base16-black-metal-dark-funeral.config
index f5adecc..ce2aebb 100644
--- a/colors/base16-black-metal-dark-funeral.config
+++ b/colors/base16-black-metal-dark-funeral.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#222222
+text-color=#c1c1c1
+border-color=#c1c1c1
+
[urgency=low]
background-color=#121212
text-color=#333333
border-color=#c1c1c1
-[urgency=normal]
-background-color=#222222
-text-color=#c1c1c1
-border-color=#c1c1c1
-
[urgency=high]
background-color=#5f8787
text-color=#999999
diff --git a/colors/base16-black-metal-gorgoroth.config b/colors/base16-black-metal-gorgoroth.config
index 6feada9..8f1b7df 100644
--- a/colors/base16-black-metal-gorgoroth.config
+++ b/colors/base16-black-metal-gorgoroth.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#222222
+text-color=#c1c1c1
+border-color=#c1c1c1
+
[urgency=low]
background-color=#121212
text-color=#333333
border-color=#c1c1c1
-[urgency=normal]
-background-color=#222222
-text-color=#c1c1c1
-border-color=#c1c1c1
-
[urgency=high]
background-color=#5f8787
text-color=#999999
diff --git a/colors/base16-black-metal-immortal.config b/colors/base16-black-metal-immortal.config
index a57e802..96980e9 100644
--- a/colors/base16-black-metal-immortal.config
+++ b/colors/base16-black-metal-immortal.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#222222
+text-color=#c1c1c1
+border-color=#c1c1c1
+
[urgency=low]
background-color=#121212
text-color=#333333
border-color=#c1c1c1
-[urgency=normal]
-background-color=#222222
-text-color=#c1c1c1
-border-color=#c1c1c1
-
[urgency=high]
background-color=#5f8787
text-color=#999999
diff --git a/colors/base16-black-metal-khold.config b/colors/base16-black-metal-khold.config
index 437a776..ae38c7d 100644
--- a/colors/base16-black-metal-khold.config
+++ b/colors/base16-black-metal-khold.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#222222
+text-color=#c1c1c1
+border-color=#c1c1c1
+
[urgency=low]
background-color=#121212
text-color=#333333
border-color=#c1c1c1
-[urgency=normal]
-background-color=#222222
-text-color=#c1c1c1
-border-color=#c1c1c1
-
[urgency=high]
background-color=#5f8787
text-color=#999999
diff --git a/colors/base16-black-metal-marduk.config b/colors/base16-black-metal-marduk.config
index 73df427..294e97c 100644
--- a/colors/base16-black-metal-marduk.config
+++ b/colors/base16-black-metal-marduk.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#222222
+text-color=#c1c1c1
+border-color=#c1c1c1
+
[urgency=low]
background-color=#121212
text-color=#333333
border-color=#c1c1c1
-[urgency=normal]
-background-color=#222222
-text-color=#c1c1c1
-border-color=#c1c1c1
-
[urgency=high]
background-color=#5f8787
text-color=#999999
diff --git a/colors/base16-black-metal-mayhem.config b/colors/base16-black-metal-mayhem.config
index 339e65d..8cfaee8 100644
--- a/colors/base16-black-metal-mayhem.config
+++ b/colors/base16-black-metal-mayhem.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#222222
+text-color=#c1c1c1
+border-color=#c1c1c1
+
[urgency=low]
background-color=#121212
text-color=#333333
border-color=#c1c1c1
-[urgency=normal]
-background-color=#222222
-text-color=#c1c1c1
-border-color=#c1c1c1
-
[urgency=high]
background-color=#5f8787
text-color=#999999
diff --git a/colors/base16-black-metal-nile.config b/colors/base16-black-metal-nile.config
index 3e0c01f..8b41138 100644
--- a/colors/base16-black-metal-nile.config
+++ b/colors/base16-black-metal-nile.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#222222
+text-color=#c1c1c1
+border-color=#c1c1c1
+
[urgency=low]
background-color=#121212
text-color=#333333
border-color=#c1c1c1
-[urgency=normal]
-background-color=#222222
-text-color=#c1c1c1
-border-color=#c1c1c1
-
[urgency=high]
background-color=#5f8787
text-color=#999999
diff --git a/colors/base16-black-metal-venom.config b/colors/base16-black-metal-venom.config
index bd5b4d3..8011007 100644
--- a/colors/base16-black-metal-venom.config
+++ b/colors/base16-black-metal-venom.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#222222
+text-color=#c1c1c1
+border-color=#c1c1c1
+
[urgency=low]
background-color=#121212
text-color=#333333
border-color=#c1c1c1
-[urgency=normal]
-background-color=#222222
-text-color=#c1c1c1
-border-color=#c1c1c1
-
[urgency=high]
background-color=#5f8787
text-color=#999999
diff --git a/colors/base16-black-metal.config b/colors/base16-black-metal.config
index d5cfec5..bcb12d3 100644
--- a/colors/base16-black-metal.config
+++ b/colors/base16-black-metal.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#222222
+text-color=#c1c1c1
+border-color=#c1c1c1
+
[urgency=low]
background-color=#121212
text-color=#333333
border-color=#c1c1c1
-[urgency=normal]
-background-color=#222222
-text-color=#c1c1c1
-border-color=#c1c1c1
-
[urgency=high]
background-color=#5f8787
text-color=#999999
diff --git a/colors/base16-brewer.config b/colors/base16-brewer.config
index 5764d51..3795e28 100644
--- a/colors/base16-brewer.config
+++ b/colors/base16-brewer.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#515253
+text-color=#b7b8b9
+border-color=#b7b8b9
+
[urgency=low]
background-color=#2e2f30
text-color=#737475
border-color=#b7b8b9
-[urgency=normal]
-background-color=#515253
-text-color=#b7b8b9
-border-color=#b7b8b9
-
[urgency=high]
background-color=#e31a1c
text-color=#dadbdc
diff --git a/colors/base16-bright.config b/colors/base16-bright.config
index 5e6ab01..814c541 100644
--- a/colors/base16-bright.config
+++ b/colors/base16-bright.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#505050
+text-color=#e0e0e0
+border-color=#e0e0e0
+
[urgency=low]
background-color=#303030
text-color=#b0b0b0
border-color=#e0e0e0
-[urgency=normal]
-background-color=#505050
-text-color=#e0e0e0
-border-color=#e0e0e0
-
[urgency=high]
background-color=#fb0120
text-color=#f5f5f5
diff --git a/colors/base16-brogrammer.config b/colors/base16-brogrammer.config
index cdfc6e0..9652d26 100644
--- a/colors/base16-brogrammer.config
+++ b/colors/base16-brogrammer.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#2dc55e
+text-color=#4e5ab7
+border-color=#4e5ab7
+
[urgency=low]
background-color=#f81118
text-color=#ecba0f
border-color=#4e5ab7
-[urgency=normal]
-background-color=#2dc55e
-text-color=#4e5ab7
-border-color=#4e5ab7
-
[urgency=high]
background-color=#d6dbe5
text-color=#1081d6
diff --git a/colors/base16-brushtrees-dark.config b/colors/base16-brushtrees-dark.config
index c2ecdae..f8f1753 100644
--- a/colors/base16-brushtrees-dark.config
+++ b/colors/base16-brushtrees-dark.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#6D828E
+text-color=#B0C5C8
+border-color=#B0C5C8
+
[urgency=low]
background-color=#5A6D7A
text-color=#8299A1
border-color=#B0C5C8
-[urgency=normal]
-background-color=#6D828E
-text-color=#B0C5C8
-border-color=#B0C5C8
-
[urgency=high]
background-color=#b38686
text-color=#C9DBDC
diff --git a/colors/base16-brushtrees.config b/colors/base16-brushtrees.config
index d7c5b86..2f6ad90 100644
--- a/colors/base16-brushtrees.config
+++ b/colors/base16-brushtrees.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#B0C5C8
+text-color=#6D828E
+border-color=#6D828E
+
[urgency=low]
background-color=#C9DBDC
text-color=#98AFB5
border-color=#6D828E
-[urgency=normal]
-background-color=#B0C5C8
-text-color=#6D828E
-border-color=#6D828E
-
[urgency=high]
background-color=#b38686
text-color=#5A6D7A
diff --git a/colors/base16-chalk.config b/colors/base16-chalk.config
index a0f76cc..13877d1 100644
--- a/colors/base16-chalk.config
+++ b/colors/base16-chalk.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#303030
+text-color=#d0d0d0
+border-color=#d0d0d0
+
[urgency=low]
background-color=#202020
text-color=#505050
border-color=#d0d0d0
-[urgency=normal]
-background-color=#303030
-text-color=#d0d0d0
-border-color=#d0d0d0
-
[urgency=high]
background-color=#fb9fb1
text-color=#e0e0e0
diff --git a/colors/base16-circus.config b/colors/base16-circus.config
index 065839d..961e8f1 100644
--- a/colors/base16-circus.config
+++ b/colors/base16-circus.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#303030
+text-color=#a7a7a7
+border-color=#a7a7a7
+
[urgency=low]
background-color=#202020
text-color=#5f5a60
border-color=#a7a7a7
-[urgency=normal]
-background-color=#303030
-text-color=#a7a7a7
-border-color=#a7a7a7
-
[urgency=high]
background-color=#dc657d
text-color=#808080
diff --git a/colors/base16-classic-dark.config b/colors/base16-classic-dark.config
index f0b63f8..2154be8 100644
--- a/colors/base16-classic-dark.config
+++ b/colors/base16-classic-dark.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#303030
+text-color=#D0D0D0
+border-color=#D0D0D0
+
[urgency=low]
background-color=#202020
text-color=#505050
border-color=#D0D0D0
-[urgency=normal]
-background-color=#303030
-text-color=#D0D0D0
-border-color=#D0D0D0
-
[urgency=high]
background-color=#AC4142
text-color=#E0E0E0
diff --git a/colors/base16-classic-light.config b/colors/base16-classic-light.config
index dd57195..586ebf2 100644
--- a/colors/base16-classic-light.config
+++ b/colors/base16-classic-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#D0D0D0
+text-color=#303030
+border-color=#303030
+
[urgency=low]
background-color=#E0E0E0
text-color=#B0B0B0
border-color=#303030
-[urgency=normal]
-background-color=#D0D0D0
-text-color=#303030
-border-color=#303030
-
[urgency=high]
background-color=#AC4142
text-color=#202020
diff --git a/colors/base16-codeschool.config b/colors/base16-codeschool.config
index d543d8c..074adda 100644
--- a/colors/base16-codeschool.config
+++ b/colors/base16-codeschool.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#2a343a
+text-color=#9ea7a6
+border-color=#9ea7a6
+
[urgency=low]
background-color=#1c3657
text-color=#3f4944
border-color=#9ea7a6
-[urgency=normal]
-background-color=#2a343a
-text-color=#9ea7a6
-border-color=#9ea7a6
-
[urgency=high]
background-color=#2a5491
text-color=#a7cfa3
diff --git a/colors/base16-cupcake.config b/colors/base16-cupcake.config
index b46e3bb..2e6f7f9 100644
--- a/colors/base16-cupcake.config
+++ b/colors/base16-cupcake.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#d8d5dd
+text-color=#8b8198
+border-color=#8b8198
+
[urgency=low]
background-color=#f2f1f4
text-color=#bfb9c6
border-color=#8b8198
-[urgency=normal]
-background-color=#d8d5dd
-text-color=#8b8198
-border-color=#8b8198
-
[urgency=high]
background-color=#D57E85
text-color=#72677E
diff --git a/colors/base16-cupertino.config b/colors/base16-cupertino.config
index 6efa1ac..655fead 100644
--- a/colors/base16-cupertino.config
+++ b/colors/base16-cupertino.config
@@ -3,14 +3,13 @@
#
# You can use these variables anywhere in the mako configuration file.
-[urgency=low]
background-color=#c0c0c0
-text-color=#808080
+text-color=#404040
border-color=#404040
-[urgency=normal]
+[urgency=low]
background-color=#c0c0c0
-text-color=#404040
+text-color=#808080
border-color=#404040
[urgency=high]
diff --git a/colors/base16-darktooth.config b/colors/base16-darktooth.config
index d0b6e01..e5c5fe8 100644
--- a/colors/base16-darktooth.config
+++ b/colors/base16-darktooth.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#504945
+text-color=#A89984
+border-color=#A89984
+
[urgency=low]
background-color=#32302F
text-color=#665C54
border-color=#A89984
-[urgency=normal]
-background-color=#504945
-text-color=#A89984
-border-color=#A89984
-
[urgency=high]
background-color=#FB543F
text-color=#D5C4A1
diff --git a/colors/base16-default-dark.config b/colors/base16-default-dark.config
index 19a6fa9..dd5fb36 100644
--- a/colors/base16-default-dark.config
+++ b/colors/base16-default-dark.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#383838
+text-color=#d8d8d8
+border-color=#d8d8d8
+
[urgency=low]
background-color=#282828
text-color=#585858
border-color=#d8d8d8
-[urgency=normal]
-background-color=#383838
-text-color=#d8d8d8
-border-color=#d8d8d8
-
[urgency=high]
background-color=#ab4642
text-color=#e8e8e8
diff --git a/colors/base16-default-light.config b/colors/base16-default-light.config
index 064aa07..df4ee6b 100644
--- a/colors/base16-default-light.config
+++ b/colors/base16-default-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#d8d8d8
+text-color=#383838
+border-color=#383838
+
[urgency=low]
background-color=#e8e8e8
text-color=#b8b8b8
border-color=#383838
-[urgency=normal]
-background-color=#d8d8d8
-text-color=#383838
-border-color=#383838
-
[urgency=high]
background-color=#ab4642
text-color=#282828
diff --git a/colors/base16-dracula.config b/colors/base16-dracula.config
index 9b2fa53..50dc598 100644
--- a/colors/base16-dracula.config
+++ b/colors/base16-dracula.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#4d4f68
+text-color=#e9e9f4
+border-color=#e9e9f4
+
[urgency=low]
background-color=#3a3c4e
text-color=#626483
border-color=#e9e9f4
-[urgency=normal]
-background-color=#4d4f68
-text-color=#e9e9f4
-border-color=#e9e9f4
-
[urgency=high]
background-color=#ea51b2
text-color=#f1f2f8
diff --git a/colors/base16-eighties.config b/colors/base16-eighties.config
index 4bcfd12..750187d 100644
--- a/colors/base16-eighties.config
+++ b/colors/base16-eighties.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#515151
+text-color=#d3d0c8
+border-color=#d3d0c8
+
[urgency=low]
background-color=#393939
text-color=#747369
border-color=#d3d0c8
-[urgency=normal]
-background-color=#515151
-text-color=#d3d0c8
-border-color=#d3d0c8
-
[urgency=high]
background-color=#f2777a
text-color=#e8e6df
diff --git a/colors/base16-embers.config b/colors/base16-embers.config
index f93fcdc..8e7d6df 100644
--- a/colors/base16-embers.config
+++ b/colors/base16-embers.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#433B32
+text-color=#A39A90
+border-color=#A39A90
+
[urgency=low]
background-color=#2C2620
text-color=#5A5047
border-color=#A39A90
-[urgency=normal]
-background-color=#433B32
-text-color=#A39A90
-border-color=#A39A90
-
[urgency=high]
background-color=#826D57
text-color=#BEB6AE
diff --git a/colors/base16-flat.config b/colors/base16-flat.config
index c7df9bd..4a10c75 100644
--- a/colors/base16-flat.config
+++ b/colors/base16-flat.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#7F8C8D
+text-color=#e0e0e0
+border-color=#e0e0e0
+
[urgency=low]
background-color=#34495E
text-color=#95A5A6
border-color=#e0e0e0
-[urgency=normal]
-background-color=#7F8C8D
-text-color=#e0e0e0
-border-color=#e0e0e0
-
[urgency=high]
background-color=#E74C3C
text-color=#f5f5f5
diff --git a/colors/base16-fruit-soda.config b/colors/base16-fruit-soda.config
index 120bc1c..f99c51d 100644
--- a/colors/base16-fruit-soda.config
+++ b/colors/base16-fruit-soda.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#d8d5d5
+text-color=#515151
+border-color=#515151
+
[urgency=low]
background-color=#e0dee0
text-color=#b5b4b6
border-color=#515151
-[urgency=normal]
-background-color=#d8d5d5
-text-color=#515151
-border-color=#515151
-
[urgency=high]
background-color=#fe3e31
text-color=#474545
diff --git a/colors/base16-github.config b/colors/base16-github.config
index 34c096c..c52830c 100644
--- a/colors/base16-github.config
+++ b/colors/base16-github.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#c8c8fa
+text-color=#333333
+border-color=#333333
+
[urgency=low]
background-color=#f5f5f5
text-color=#969896
border-color=#333333
-[urgency=normal]
-background-color=#c8c8fa
-text-color=#333333
-border-color=#333333
-
[urgency=high]
background-color=#ed6a43
text-color=#ffffff
diff --git a/colors/base16-google-dark.config b/colors/base16-google-dark.config
index 4f97abc..92db19e 100644
--- a/colors/base16-google-dark.config
+++ b/colors/base16-google-dark.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#373b41
+text-color=#c5c8c6
+border-color=#c5c8c6
+
[urgency=low]
background-color=#282a2e
text-color=#969896
border-color=#c5c8c6
-[urgency=normal]
-background-color=#373b41
-text-color=#c5c8c6
-border-color=#c5c8c6
-
[urgency=high]
background-color=#CC342B
text-color=#e0e0e0
diff --git a/colors/base16-google-light.config b/colors/base16-google-light.config
index b3dca22..acb2d3e 100644
--- a/colors/base16-google-light.config
+++ b/colors/base16-google-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#c5c8c6
+text-color=#373b41
+border-color=#373b41
+
[urgency=low]
background-color=#e0e0e0
text-color=#b4b7b4
border-color=#373b41
-[urgency=normal]
-background-color=#c5c8c6
-text-color=#373b41
-border-color=#373b41
-
[urgency=high]
background-color=#CC342B
text-color=#282a2e
diff --git a/colors/base16-grayscale-dark.config b/colors/base16-grayscale-dark.config
index e8a3fb5..087277a 100644
--- a/colors/base16-grayscale-dark.config
+++ b/colors/base16-grayscale-dark.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#464646
+text-color=#b9b9b9
+border-color=#b9b9b9
+
[urgency=low]
background-color=#252525
text-color=#525252
border-color=#b9b9b9
-[urgency=normal]
-background-color=#464646
-text-color=#b9b9b9
-border-color=#b9b9b9
-
[urgency=high]
background-color=#7c7c7c
text-color=#e3e3e3
diff --git a/colors/base16-grayscale-light.config b/colors/base16-grayscale-light.config
index 3557221..e8d5d69 100644
--- a/colors/base16-grayscale-light.config
+++ b/colors/base16-grayscale-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#b9b9b9
+text-color=#464646
+border-color=#464646
+
[urgency=low]
background-color=#e3e3e3
text-color=#ababab
border-color=#464646
-[urgency=normal]
-background-color=#b9b9b9
-text-color=#464646
-border-color=#464646
-
[urgency=high]
background-color=#7c7c7c
text-color=#252525
diff --git a/colors/base16-greenscreen.config b/colors/base16-greenscreen.config
index 7cd5d0f..e2e6110 100644
--- a/colors/base16-greenscreen.config
+++ b/colors/base16-greenscreen.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#005500
+text-color=#00bb00
+border-color=#00bb00
+
[urgency=low]
background-color=#003300
text-color=#007700
border-color=#00bb00
-[urgency=normal]
-background-color=#005500
-text-color=#00bb00
-border-color=#00bb00
-
[urgency=high]
background-color=#007700
text-color=#00dd00
diff --git a/colors/base16-gruvbox-dark-hard.config b/colors/base16-gruvbox-dark-hard.config
index 2ddc8a2..a6bd261 100644
--- a/colors/base16-gruvbox-dark-hard.config
+++ b/colors/base16-gruvbox-dark-hard.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#504945
+text-color=#d5c4a1
+border-color=#d5c4a1
+
[urgency=low]
background-color=#3c3836
text-color=#665c54
border-color=#d5c4a1
-[urgency=normal]
-background-color=#504945
-text-color=#d5c4a1
-border-color=#d5c4a1
-
[urgency=high]
background-color=#fb4934
text-color=#ebdbb2
diff --git a/colors/base16-gruvbox-dark-medium.config b/colors/base16-gruvbox-dark-medium.config
index 91f76ab..d65f1cd 100644
--- a/colors/base16-gruvbox-dark-medium.config
+++ b/colors/base16-gruvbox-dark-medium.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#504945
+text-color=#d5c4a1
+border-color=#d5c4a1
+
[urgency=low]
background-color=#3c3836
text-color=#665c54
border-color=#d5c4a1
-[urgency=normal]
-background-color=#504945
-text-color=#d5c4a1
-border-color=#d5c4a1
-
[urgency=high]
background-color=#fb4934
text-color=#ebdbb2
diff --git a/colors/base16-gruvbox-dark-pale.config b/colors/base16-gruvbox-dark-pale.config
index 0213b95..64d8f81 100644
--- a/colors/base16-gruvbox-dark-pale.config
+++ b/colors/base16-gruvbox-dark-pale.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#4e4e4e
+text-color=#dab997
+border-color=#dab997
+
[urgency=low]
background-color=#3a3a3a
text-color=#8a8a8a
border-color=#dab997
-[urgency=normal]
-background-color=#4e4e4e
-text-color=#dab997
-border-color=#dab997
-
[urgency=high]
background-color=#d75f5f
text-color=#d5c4a1
diff --git a/colors/base16-gruvbox-dark-soft.config b/colors/base16-gruvbox-dark-soft.config
index 658d62e..37d733d 100644
--- a/colors/base16-gruvbox-dark-soft.config
+++ b/colors/base16-gruvbox-dark-soft.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#504945
+text-color=#d5c4a1
+border-color=#d5c4a1
+
[urgency=low]
background-color=#3c3836
text-color=#665c54
border-color=#d5c4a1
-[urgency=normal]
-background-color=#504945
-text-color=#d5c4a1
-border-color=#d5c4a1
-
[urgency=high]
background-color=#fb4934
text-color=#ebdbb2
diff --git a/colors/base16-gruvbox-light-hard.config b/colors/base16-gruvbox-light-hard.config
index d626f9e..ceabacf 100644
--- a/colors/base16-gruvbox-light-hard.config
+++ b/colors/base16-gruvbox-light-hard.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#d5c4a1
+text-color=#504945
+border-color=#504945
+
[urgency=low]
background-color=#ebdbb2
text-color=#bdae93
border-color=#504945
-[urgency=normal]
-background-color=#d5c4a1
-text-color=#504945
-border-color=#504945
-
[urgency=high]
background-color=#9d0006
text-color=#3c3836
diff --git a/colors/base16-gruvbox-light-medium.config b/colors/base16-gruvbox-light-medium.config
index 0f24cf3..d08f659 100644
--- a/colors/base16-gruvbox-light-medium.config
+++ b/colors/base16-gruvbox-light-medium.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#d5c4a1
+text-color=#504945
+border-color=#504945
+
[urgency=low]
background-color=#ebdbb2
text-color=#bdae93
border-color=#504945
-[urgency=normal]
-background-color=#d5c4a1
-text-color=#504945
-border-color=#504945
-
[urgency=high]
background-color=#9d0006
text-color=#3c3836
diff --git a/colors/base16-gruvbox-light-soft.config b/colors/base16-gruvbox-light-soft.config
index bd11dd6..c0e18b4 100644
--- a/colors/base16-gruvbox-light-soft.config
+++ b/colors/base16-gruvbox-light-soft.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#d5c4a1
+text-color=#504945
+border-color=#504945
+
[urgency=low]
background-color=#ebdbb2
text-color=#bdae93
border-color=#504945
-[urgency=normal]
-background-color=#d5c4a1
-text-color=#504945
-border-color=#504945
-
[urgency=high]
background-color=#9d0006
text-color=#3c3836
diff --git a/colors/base16-harmonic-dark.config b/colors/base16-harmonic-dark.config
index 617c421..7f1bf79 100644
--- a/colors/base16-harmonic-dark.config
+++ b/colors/base16-harmonic-dark.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#405c79
+text-color=#cbd6e2
+border-color=#cbd6e2
+
[urgency=low]
background-color=#223b54
text-color=#627e99
border-color=#cbd6e2
-[urgency=normal]
-background-color=#405c79
-text-color=#cbd6e2
-border-color=#cbd6e2
-
[urgency=high]
background-color=#bf8b56
text-color=#e5ebf1
diff --git a/colors/base16-harmonic-light.config b/colors/base16-harmonic-light.config
index da14f78..5abcf59 100644
--- a/colors/base16-harmonic-light.config
+++ b/colors/base16-harmonic-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#cbd6e2
+text-color=#405c79
+border-color=#405c79
+
[urgency=low]
background-color=#e5ebf1
text-color=#aabcce
border-color=#405c79
-[urgency=normal]
-background-color=#cbd6e2
-text-color=#405c79
-border-color=#405c79
-
[urgency=high]
background-color=#bf8b56
text-color=#223b54
diff --git a/colors/base16-heetch-light.config b/colors/base16-heetch-light.config
index 4268368..3ce615c 100644
--- a/colors/base16-heetch-light.config
+++ b/colors/base16-heetch-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#7b6d8b
+text-color=#5a496e
+border-color=#5a496e
+
[urgency=low]
background-color=#392551
text-color=#9c92a8
border-color=#5a496e
-[urgency=normal]
-background-color=#7b6d8b
-text-color=#5a496e
-border-color=#5a496e
-
[urgency=high]
background-color=#27d9d5
text-color=#470546
diff --git a/colors/base16-heetch.config b/colors/base16-heetch.config
index f77a4a3..5d53bc5 100644
--- a/colors/base16-heetch.config
+++ b/colors/base16-heetch.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#5A496E
+text-color=#BDB6C5
+border-color=#BDB6C5
+
[urgency=low]
background-color=#392551
text-color=#7B6D8B
border-color=#BDB6C5
-[urgency=normal]
-background-color=#5A496E
-text-color=#BDB6C5
-border-color=#BDB6C5
-
[urgency=high]
background-color=#27D9D5
text-color=#DEDAE2
diff --git a/colors/base16-hopscotch.config b/colors/base16-hopscotch.config
index d40e59a..7985e7e 100644
--- a/colors/base16-hopscotch.config
+++ b/colors/base16-hopscotch.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#5c545b
+text-color=#b9b5b8
+border-color=#b9b5b8
+
[urgency=low]
background-color=#433b42
text-color=#797379
border-color=#b9b5b8
-[urgency=normal]
-background-color=#5c545b
-text-color=#b9b5b8
-border-color=#b9b5b8
-
[urgency=high]
background-color=#dd464c
text-color=#d5d3d5
diff --git a/colors/base16-ia-dark.config b/colors/base16-ia-dark.config
index ad66738..a808912 100644
--- a/colors/base16-ia-dark.config
+++ b/colors/base16-ia-dark.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#1d414d
+text-color=#cccccc
+border-color=#cccccc
+
[urgency=low]
background-color=#222222
text-color=#767676
border-color=#cccccc
-[urgency=normal]
-background-color=#1d414d
-text-color=#cccccc
-border-color=#cccccc
-
[urgency=high]
background-color=#d88568
text-color=#e8e8e8
diff --git a/colors/base16-ia-light.config b/colors/base16-ia-light.config
index adec292..873c677 100644
--- a/colors/base16-ia-light.config
+++ b/colors/base16-ia-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#bde5f2
+text-color=#181818
+border-color=#181818
+
[urgency=low]
background-color=#dedede
text-color=#898989
border-color=#181818
-[urgency=normal]
-background-color=#bde5f2
-text-color=#181818
-border-color=#181818
-
[urgency=high]
background-color=#9c5a02
text-color=#e8e8e8
diff --git a/colors/base16-icy.config b/colors/base16-icy.config
index 245c696..34d0da5 100644
--- a/colors/base16-icy.config
+++ b/colors/base16-icy.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#041f23
+text-color=#095b67
+border-color=#095b67
+
[urgency=low]
background-color=#031619
text-color=#052e34
border-color=#095b67
-[urgency=normal]
-background-color=#041f23
-text-color=#095b67
-border-color=#095b67
-
[urgency=high]
background-color=#16c1d9
text-color=#0c7c8c
diff --git a/colors/base16-irblack.config b/colors/base16-irblack.config
index c295a8c..1702575 100644
--- a/colors/base16-irblack.config
+++ b/colors/base16-irblack.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#484844
+text-color=#b5b3aa
+border-color=#b5b3aa
+
[urgency=low]
background-color=#242422
text-color=#6c6c66
border-color=#b5b3aa
-[urgency=normal]
-background-color=#484844
-text-color=#b5b3aa
-border-color=#b5b3aa
-
[urgency=high]
background-color=#ff6c60
text-color=#d9d7cc
diff --git a/colors/base16-isotope.config b/colors/base16-isotope.config
index 1687140..be9d46f 100644
--- a/colors/base16-isotope.config
+++ b/colors/base16-isotope.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#606060
+text-color=#d0d0d0
+border-color=#d0d0d0
+
[urgency=low]
background-color=#404040
text-color=#808080
border-color=#d0d0d0
-[urgency=normal]
-background-color=#606060
-text-color=#d0d0d0
-border-color=#d0d0d0
-
[urgency=high]
background-color=#ff0000
text-color=#e0e0e0
diff --git a/colors/base16-macintosh.config b/colors/base16-macintosh.config
index f74dd91..a392895 100644
--- a/colors/base16-macintosh.config
+++ b/colors/base16-macintosh.config
@@ -3,14 +3,13 @@
#
# You can use these variables anywhere in the mako configuration file.
-[urgency=low]
background-color=#404040
-text-color=#808080
+text-color=#c0c0c0
border-color=#c0c0c0
-[urgency=normal]
+[urgency=low]
background-color=#404040
-text-color=#c0c0c0
+text-color=#808080
border-color=#c0c0c0
[urgency=high]
diff --git a/colors/base16-marrakesh.config b/colors/base16-marrakesh.config
index 9f635cd..d50ae84 100644
--- a/colors/base16-marrakesh.config
+++ b/colors/base16-marrakesh.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#5f5b17
+text-color=#948e48
+border-color=#948e48
+
[urgency=low]
background-color=#302e00
text-color=#6c6823
border-color=#948e48
-[urgency=normal]
-background-color=#5f5b17
-text-color=#948e48
-border-color=#948e48
-
[urgency=high]
background-color=#c35359
text-color=#ccc37a
diff --git a/colors/base16-materia.config b/colors/base16-materia.config
index 19cef20..23d33ae 100644
--- a/colors/base16-materia.config
+++ b/colors/base16-materia.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#37474F
+text-color=#CDD3DE
+border-color=#CDD3DE
+
[urgency=low]
background-color=#2C393F
text-color=#707880
border-color=#CDD3DE
-[urgency=normal]
-background-color=#37474F
-text-color=#CDD3DE
-border-color=#CDD3DE
-
[urgency=high]
background-color=#EC5F67
text-color=#D5DBE5
diff --git a/colors/base16-material-darker.config b/colors/base16-material-darker.config
index a058430..49648f8 100644
--- a/colors/base16-material-darker.config
+++ b/colors/base16-material-darker.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#353535
+text-color=#EEFFFF
+border-color=#EEFFFF
+
[urgency=low]
background-color=#303030
text-color=#4A4A4A
border-color=#EEFFFF
-[urgency=normal]
-background-color=#353535
-text-color=#EEFFFF
-border-color=#EEFFFF
-
[urgency=high]
background-color=#F07178
text-color=#EEFFFF
diff --git a/colors/base16-material-lighter.config b/colors/base16-material-lighter.config
index 95ca4ea..c73c306 100644
--- a/colors/base16-material-lighter.config
+++ b/colors/base16-material-lighter.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#CCEAE7
+text-color=#80CBC4
+border-color=#80CBC4
+
[urgency=low]
background-color=#E7EAEC
text-color=#CCD7DA
border-color=#80CBC4
-[urgency=normal]
-background-color=#CCEAE7
-text-color=#80CBC4
-border-color=#80CBC4
-
[urgency=high]
background-color=#FF5370
text-color=#80CBC4
diff --git a/colors/base16-material-palenight.config b/colors/base16-material-palenight.config
index c7d3136..6832441 100644
--- a/colors/base16-material-palenight.config
+++ b/colors/base16-material-palenight.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#32374D
+text-color=#959DCB
+border-color=#959DCB
+
[urgency=low]
background-color=#444267
text-color=#676E95
border-color=#959DCB
-[urgency=normal]
-background-color=#32374D
-text-color=#959DCB
-border-color=#959DCB
-
[urgency=high]
background-color=#F07178
text-color=#959DCB
diff --git a/colors/base16-material-vivid.config b/colors/base16-material-vivid.config
index ae72a95..218ebb2 100644
--- a/colors/base16-material-vivid.config
+++ b/colors/base16-material-vivid.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#323639
+text-color=#80868b
+border-color=#80868b
+
[urgency=low]
background-color=#27292c
text-color=#44464d
border-color=#80868b
-[urgency=normal]
-background-color=#323639
-text-color=#80868b
-border-color=#80868b
-
[urgency=high]
background-color=#f44336
text-color=#9e9e9e
diff --git a/colors/base16-material.config b/colors/base16-material.config
index d753b50..43701cb 100644
--- a/colors/base16-material.config
+++ b/colors/base16-material.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#314549
+text-color=#EEFFFF
+border-color=#EEFFFF
+
[urgency=low]
background-color=#2E3C43
text-color=#546E7A
border-color=#EEFFFF
-[urgency=normal]
-background-color=#314549
-text-color=#EEFFFF
-border-color=#EEFFFF
-
[urgency=high]
background-color=#F07178
text-color=#EEFFFF
diff --git a/colors/base16-mellow-purple.config b/colors/base16-mellow-purple.config
index 1f82827..9c86986 100644
--- a/colors/base16-mellow-purple.config
+++ b/colors/base16-mellow-purple.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#331354
+text-color=#ffeeff
+border-color=#ffeeff
+
[urgency=low]
background-color=#1A092D
text-color=#320f55
border-color=#ffeeff
-[urgency=normal]
-background-color=#331354
-text-color=#ffeeff
-border-color=#ffeeff
-
[urgency=high]
background-color=#00d9e9
text-color=#ffeeff
diff --git a/colors/base16-mexico-light.config b/colors/base16-mexico-light.config
index d7b49f1..5e8801c 100644
--- a/colors/base16-mexico-light.config
+++ b/colors/base16-mexico-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#d8d8d8
+text-color=#383838
+border-color=#383838
+
[urgency=low]
background-color=#e8e8e8
text-color=#b8b8b8
border-color=#383838
-[urgency=normal]
-background-color=#d8d8d8
-text-color=#383838
-border-color=#383838
-
[urgency=high]
background-color=#ab4642
text-color=#282828
diff --git a/colors/base16-mocha.config b/colors/base16-mocha.config
index ae11e73..05ff6a9 100644
--- a/colors/base16-mocha.config
+++ b/colors/base16-mocha.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#645240
+text-color=#d0c8c6
+border-color=#d0c8c6
+
[urgency=low]
background-color=#534636
text-color=#7e705a
border-color=#d0c8c6
-[urgency=normal]
-background-color=#645240
-text-color=#d0c8c6
-border-color=#d0c8c6
-
[urgency=high]
background-color=#cb6077
text-color=#e9e1dd
diff --git a/colors/base16-monokai.config b/colors/base16-monokai.config
index 9146465..d842a63 100644
--- a/colors/base16-monokai.config
+++ b/colors/base16-monokai.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#49483e
+text-color=#f8f8f2
+border-color=#f8f8f2
+
[urgency=low]
background-color=#383830
text-color=#75715e
border-color=#f8f8f2
-[urgency=normal]
-background-color=#49483e
-text-color=#f8f8f2
-border-color=#f8f8f2
-
[urgency=high]
background-color=#f92672
text-color=#f5f4f1
diff --git a/colors/base16-nord.config b/colors/base16-nord.config
index ac1e73a..40249b5 100644
--- a/colors/base16-nord.config
+++ b/colors/base16-nord.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#434C5E
+text-color=#E5E9F0
+border-color=#E5E9F0
+
[urgency=low]
background-color=#3B4252
text-color=#4C566A
border-color=#E5E9F0
-[urgency=normal]
-background-color=#434C5E
-text-color=#E5E9F0
-border-color=#E5E9F0
-
[urgency=high]
background-color=#88C0D0
text-color=#ECEFF4
diff --git a/colors/base16-ocean.config b/colors/base16-ocean.config
index 87b74eb..7c1cb7d 100644
--- a/colors/base16-ocean.config
+++ b/colors/base16-ocean.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#4f5b66
+text-color=#c0c5ce
+border-color=#c0c5ce
+
[urgency=low]
background-color=#343d46
text-color=#65737e
border-color=#c0c5ce
-[urgency=normal]
-background-color=#4f5b66
-text-color=#c0c5ce
-border-color=#c0c5ce
-
[urgency=high]
background-color=#bf616a
text-color=#dfe1e8
diff --git a/colors/base16-oceanicnext.config b/colors/base16-oceanicnext.config
index 5a8e94c..375bbaa 100644
--- a/colors/base16-oceanicnext.config
+++ b/colors/base16-oceanicnext.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#4F5B66
+text-color=#C0C5CE
+border-color=#C0C5CE
+
[urgency=low]
background-color=#343D46
text-color=#65737E
border-color=#C0C5CE
-[urgency=normal]
-background-color=#4F5B66
-text-color=#C0C5CE
-border-color=#C0C5CE
-
[urgency=high]
background-color=#EC5f67
text-color=#CDD3DE
diff --git a/colors/base16-one-light.config b/colors/base16-one-light.config
index ba6558f..f0f7906 100644
--- a/colors/base16-one-light.config
+++ b/colors/base16-one-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#e5e5e6
+text-color=#383a42
+border-color=#383a42
+
[urgency=low]
background-color=#f0f0f1
text-color=#a0a1a7
border-color=#383a42
-[urgency=normal]
-background-color=#e5e5e6
-text-color=#383a42
-border-color=#383a42
-
[urgency=high]
background-color=#ca1243
text-color=#202227
diff --git a/colors/base16-onedark.config b/colors/base16-onedark.config
index 58a2621..7768e92 100644
--- a/colors/base16-onedark.config
+++ b/colors/base16-onedark.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#3e4451
+text-color=#abb2bf
+border-color=#abb2bf
+
[urgency=low]
background-color=#353b45
text-color=#545862
border-color=#abb2bf
-[urgency=normal]
-background-color=#3e4451
-text-color=#abb2bf
-border-color=#abb2bf
-
[urgency=high]
background-color=#e06c75
text-color=#b6bdca
diff --git a/colors/base16-outrun-dark.config b/colors/base16-outrun-dark.config
index 85626a1..0e1a1bd 100644
--- a/colors/base16-outrun-dark.config
+++ b/colors/base16-outrun-dark.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#30305A
+text-color=#D0D0FA
+border-color=#D0D0FA
+
[urgency=low]
background-color=#20204A
text-color=#50507A
border-color=#D0D0FA
-[urgency=normal]
-background-color=#30305A
-text-color=#D0D0FA
-border-color=#D0D0FA
-
[urgency=high]
background-color=#FF4242
text-color=#E0E0FF
diff --git a/colors/base16-papercolor-dark.config b/colors/base16-papercolor-dark.config
index 929a036..e16d800 100644
--- a/colors/base16-papercolor-dark.config
+++ b/colors/base16-papercolor-dark.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#5faf00
+text-color=#808080
+border-color=#808080
+
[urgency=low]
background-color=#af005f
text-color=#d7af5f
border-color=#808080
-[urgency=normal]
-background-color=#5faf00
-text-color=#808080
-border-color=#808080
-
[urgency=high]
background-color=#585858
text-color=#d7875f
diff --git a/colors/base16-papercolor-light.config b/colors/base16-papercolor-light.config
index 8b670a2..e5480ad 100644
--- a/colors/base16-papercolor-light.config
+++ b/colors/base16-papercolor-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#008700
+text-color=#878787
+border-color=#878787
+
[urgency=low]
background-color=#af0000
text-color=#5f8700
border-color=#878787
-[urgency=normal]
-background-color=#008700
-text-color=#878787
-border-color=#878787
-
[urgency=high]
background-color=#bcbcbc
text-color=#005f87
diff --git a/colors/base16-paraiso.config b/colors/base16-paraiso.config
index 9d6cf14..05d6c5b 100644
--- a/colors/base16-paraiso.config
+++ b/colors/base16-paraiso.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#4f424c
+text-color=#a39e9b
+border-color=#a39e9b
+
[urgency=low]
background-color=#41323f
text-color=#776e71
border-color=#a39e9b
-[urgency=normal]
-background-color=#4f424c
-text-color=#a39e9b
-border-color=#a39e9b
-
[urgency=high]
background-color=#ef6155
text-color=#b9b6b0
diff --git a/colors/base16-phd.config b/colors/base16-phd.config
index b9c1357..52c2a36 100644
--- a/colors/base16-phd.config
+++ b/colors/base16-phd.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#4d5666
+text-color=#b8bbc2
+border-color=#b8bbc2
+
[urgency=low]
background-color=#2a3448
text-color=#717885
border-color=#b8bbc2
-[urgency=normal]
-background-color=#4d5666
-text-color=#b8bbc2
-border-color=#b8bbc2
-
[urgency=high]
background-color=#d07346
text-color=#dbdde0
diff --git a/colors/base16-pico.config b/colors/base16-pico.config
index 4561726..c17bb1a 100644
--- a/colors/base16-pico.config
+++ b/colors/base16-pico.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#7e2553
+text-color=#5f574f
+border-color=#5f574f
+
[urgency=low]
background-color=#1d2b53
text-color=#008751
border-color=#5f574f
-[urgency=normal]
-background-color=#7e2553
-text-color=#5f574f
-border-color=#5f574f
-
[urgency=high]
background-color=#ff004d
text-color=#c2c3c7
diff --git a/colors/base16-pop.config b/colors/base16-pop.config
index a33e965..3ec48a6 100644
--- a/colors/base16-pop.config
+++ b/colors/base16-pop.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#303030
+text-color=#d0d0d0
+border-color=#d0d0d0
+
[urgency=low]
background-color=#202020
text-color=#505050
border-color=#d0d0d0
-[urgency=normal]
-background-color=#303030
-text-color=#d0d0d0
-border-color=#d0d0d0
-
[urgency=high]
background-color=#eb008a
text-color=#e0e0e0
diff --git a/colors/base16-porple.config b/colors/base16-porple.config
index d463dd8..6095ea4 100644
--- a/colors/base16-porple.config
+++ b/colors/base16-porple.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#474160
+text-color=#d8d8d8
+border-color=#d8d8d8
+
[urgency=low]
background-color=#333344
text-color=#65568a
border-color=#d8d8d8
-[urgency=normal]
-background-color=#474160
-text-color=#d8d8d8
-border-color=#d8d8d8
-
[urgency=high]
background-color=#f84547
text-color=#e8e8e8
diff --git a/colors/base16-railscasts.config b/colors/base16-railscasts.config
index bff279d..c29fb62 100644
--- a/colors/base16-railscasts.config
+++ b/colors/base16-railscasts.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#3a4055
+text-color=#e6e1dc
+border-color=#e6e1dc
+
[urgency=low]
background-color=#272935
text-color=#5a647e
border-color=#e6e1dc
-[urgency=normal]
-background-color=#3a4055
-text-color=#e6e1dc
-border-color=#e6e1dc
-
[urgency=high]
background-color=#da4939
text-color=#f4f1ed
diff --git a/colors/base16-rebecca.config b/colors/base16-rebecca.config
index 1a2284b..5639b2f 100644
--- a/colors/base16-rebecca.config
+++ b/colors/base16-rebecca.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#383a62
+text-color=#f1eff8
+border-color=#f1eff8
+
[urgency=low]
background-color=#663399
text-color=#666699
border-color=#f1eff8
-[urgency=normal]
-background-color=#383a62
-text-color=#f1eff8
-border-color=#f1eff8
-
[urgency=high]
background-color=#a0a0c5
text-color=#ccccff
diff --git a/colors/base16-seti.config b/colors/base16-seti.config
index 202b405..c328c5b 100644
--- a/colors/base16-seti.config
+++ b/colors/base16-seti.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#3B758C
+text-color=#d6d6d6
+border-color=#d6d6d6
+
[urgency=low]
background-color=#282a2b
text-color=#41535B
border-color=#d6d6d6
-[urgency=normal]
-background-color=#3B758C
-text-color=#d6d6d6
-border-color=#d6d6d6
-
[urgency=high]
background-color=#Cd3f45
text-color=#eeeeee
diff --git a/colors/base16-shapeshifter.config b/colors/base16-shapeshifter.config
index f7773a2..0017aee 100644
--- a/colors/base16-shapeshifter.config
+++ b/colors/base16-shapeshifter.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#ababab
+text-color=#102015
+border-color=#102015
+
[urgency=low]
background-color=#e0e0e0
text-color=#555555
border-color=#102015
-[urgency=normal]
-background-color=#ababab
-text-color=#102015
-border-color=#102015
-
[urgency=high]
background-color=#e92f2f
text-color=#040404
diff --git a/colors/base16-snazzy.config b/colors/base16-snazzy.config
index 28f2e39..c0585f3 100644
--- a/colors/base16-snazzy.config
+++ b/colors/base16-snazzy.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#43454f
+text-color=#e2e4e5
+border-color=#e2e4e5
+
[urgency=low]
background-color=#34353e
text-color=#78787e
border-color=#e2e4e5
-[urgency=normal]
-background-color=#43454f
-text-color=#e2e4e5
-border-color=#e2e4e5
-
[urgency=high]
background-color=#ff5c57
text-color=#eff0eb
diff --git a/colors/base16-solarflare.config b/colors/base16-solarflare.config
index 7ba23e3..a36dcc8 100644
--- a/colors/base16-solarflare.config
+++ b/colors/base16-solarflare.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#586875
+text-color=#A6AFB8
+border-color=#A6AFB8
+
[urgency=low]
background-color=#222E38
text-color=#667581
border-color=#A6AFB8
-[urgency=normal]
-background-color=#586875
-text-color=#A6AFB8
-border-color=#A6AFB8
-
[urgency=high]
background-color=#EF5253
text-color=#E8E9ED
diff --git a/colors/base16-solarized-dark.config b/colors/base16-solarized-dark.config
index 7c74c8d..3edfff4 100644
--- a/colors/base16-solarized-dark.config
+++ b/colors/base16-solarized-dark.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#586e75
+text-color=#93a1a1
+border-color=#93a1a1
+
[urgency=low]
background-color=#073642
text-color=#657b83
border-color=#93a1a1
-[urgency=normal]
-background-color=#586e75
-text-color=#93a1a1
-border-color=#93a1a1
-
[urgency=high]
background-color=#dc322f
text-color=#eee8d5
diff --git a/colors/base16-solarized-light.config b/colors/base16-solarized-light.config
index 1e6ab78..fecd679 100644
--- a/colors/base16-solarized-light.config
+++ b/colors/base16-solarized-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#93a1a1
+text-color=#586e75
+border-color=#586e75
+
[urgency=low]
background-color=#eee8d5
text-color=#839496
border-color=#586e75
-[urgency=normal]
-background-color=#93a1a1
-text-color=#586e75
-border-color=#586e75
-
[urgency=high]
background-color=#dc322f
text-color=#073642
diff --git a/colors/base16-spacemacs.config b/colors/base16-spacemacs.config
index 8daba0f..81f04a4 100644
--- a/colors/base16-spacemacs.config
+++ b/colors/base16-spacemacs.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#444155
+text-color=#a3a3a3
+border-color=#a3a3a3
+
[urgency=low]
background-color=#282828
text-color=#585858
border-color=#a3a3a3
-[urgency=normal]
-background-color=#444155
-text-color=#a3a3a3
-border-color=#a3a3a3
-
[urgency=high]
background-color=#f2241f
text-color=#e8e8e8
diff --git a/colors/base16-summerfruit-dark.config b/colors/base16-summerfruit-dark.config
index 363b242..a41188f 100644
--- a/colors/base16-summerfruit-dark.config
+++ b/colors/base16-summerfruit-dark.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#303030
+text-color=#D0D0D0
+border-color=#D0D0D0
+
[urgency=low]
background-color=#202020
text-color=#505050
border-color=#D0D0D0
-[urgency=normal]
-background-color=#303030
-text-color=#D0D0D0
-border-color=#D0D0D0
-
[urgency=high]
background-color=#FF0086
text-color=#E0E0E0
diff --git a/colors/base16-summerfruit-light.config b/colors/base16-summerfruit-light.config
index 868a9b6..de8c806 100644
--- a/colors/base16-summerfruit-light.config
+++ b/colors/base16-summerfruit-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#D0D0D0
+text-color=#101010
+border-color=#101010
+
[urgency=low]
background-color=#E0E0E0
text-color=#B0B0B0
border-color=#101010
-[urgency=normal]
-background-color=#D0D0D0
-text-color=#101010
-border-color=#101010
-
[urgency=high]
background-color=#FF0086
text-color=#151515
diff --git a/colors/base16-tomorrow-night.config b/colors/base16-tomorrow-night.config
index b5f6888..a04f95b 100644
--- a/colors/base16-tomorrow-night.config
+++ b/colors/base16-tomorrow-night.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#373b41
+text-color=#c5c8c6
+border-color=#c5c8c6
+
[urgency=low]
background-color=#282a2e
text-color=#969896
border-color=#c5c8c6
-[urgency=normal]
-background-color=#373b41
-text-color=#c5c8c6
-border-color=#c5c8c6
-
[urgency=high]
background-color=#cc6666
text-color=#e0e0e0
diff --git a/colors/base16-tomorrow.config b/colors/base16-tomorrow.config
index 64fd77b..86ba23b 100644
--- a/colors/base16-tomorrow.config
+++ b/colors/base16-tomorrow.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#d6d6d6
+text-color=#4d4d4c
+border-color=#4d4d4c
+
[urgency=low]
background-color=#e0e0e0
text-color=#8e908c
border-color=#4d4d4c
-[urgency=normal]
-background-color=#d6d6d6
-text-color=#4d4d4c
-border-color=#4d4d4c
-
[urgency=high]
background-color=#c82829
text-color=#282a2e
diff --git a/colors/base16-tube.config b/colors/base16-tube.config
index 23c2e63..ed3b8fb 100644
--- a/colors/base16-tube.config
+++ b/colors/base16-tube.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#5a5758
+text-color=#d9d8d8
+border-color=#d9d8d8
+
[urgency=low]
background-color=#1c3f95
text-color=#737171
border-color=#d9d8d8
-[urgency=normal]
-background-color=#5a5758
-text-color=#d9d8d8
-border-color=#d9d8d8
-
[urgency=high]
background-color=#ee2e24
text-color=#e7e7e8
diff --git a/colors/base16-twilight.config b/colors/base16-twilight.config
index fe45572..709dafb 100644
--- a/colors/base16-twilight.config
+++ b/colors/base16-twilight.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#464b50
+text-color=#a7a7a7
+border-color=#a7a7a7
+
[urgency=low]
background-color=#323537
text-color=#5f5a60
border-color=#a7a7a7
-[urgency=normal]
-background-color=#464b50
-text-color=#a7a7a7
-border-color=#a7a7a7
-
[urgency=high]
background-color=#cf6a4c
text-color=#c3c3c3
diff --git a/colors/base16-unikitty-dark.config b/colors/base16-unikitty-dark.config
index 011253b..d07aed7 100644
--- a/colors/base16-unikitty-dark.config
+++ b/colors/base16-unikitty-dark.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#666369
+text-color=#bcbabe
+border-color=#bcbabe
+
[urgency=low]
background-color=#4a464d
text-color=#838085
border-color=#bcbabe
-[urgency=normal]
-background-color=#666369
-text-color=#bcbabe
-border-color=#bcbabe
-
[urgency=high]
background-color=#d8137f
text-color=#d8d7da
diff --git a/colors/base16-unikitty-light.config b/colors/base16-unikitty-light.config
index 06717aa..7ce201e 100644
--- a/colors/base16-unikitty-light.config
+++ b/colors/base16-unikitty-light.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#c4c3c5
+text-color=#6c696e
+border-color=#6c696e
+
[urgency=low]
background-color=#e1e1e2
text-color=#a7a5a8
border-color=#6c696e
-[urgency=normal]
-background-color=#c4c3c5
-text-color=#6c696e
-border-color=#6c696e
-
[urgency=high]
background-color=#d8137f
text-color=#4f4b51
diff --git a/colors/base16-woodland.config b/colors/base16-woodland.config
index 245e37b..4b87459 100644
--- a/colors/base16-woodland.config
+++ b/colors/base16-woodland.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#48413a
+text-color=#cabcb1
+border-color=#cabcb1
+
[urgency=low]
background-color=#302b25
text-color=#9d8b70
border-color=#cabcb1
-[urgency=normal]
-background-color=#48413a
-text-color=#cabcb1
-border-color=#cabcb1
-
[urgency=high]
background-color=#d35c5c
text-color=#d7c8bc
diff --git a/colors/base16-xcode-dusk.config b/colors/base16-xcode-dusk.config
index e515440..d9c69ae 100644
--- a/colors/base16-xcode-dusk.config
+++ b/colors/base16-xcode-dusk.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#53555D
+text-color=#939599
+border-color=#939599
+
[urgency=low]
background-color=#3D4048
text-color=#686A71
border-color=#939599
-[urgency=normal]
-background-color=#53555D
-text-color=#939599
-border-color=#939599
-
[urgency=high]
background-color=#B21889
text-color=#A9AAAE
diff --git a/colors/base16-zenburn.config b/colors/base16-zenburn.config
index 8a060c5..67b1f75 100644
--- a/colors/base16-zenburn.config
+++ b/colors/base16-zenburn.config
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#606060
+text-color=#dcdccc
+border-color=#dcdccc
+
[urgency=low]
background-color=#404040
text-color=#6f6f6f
border-color=#dcdccc
-[urgency=normal]
-background-color=#606060
-text-color=#dcdccc
-border-color=#dcdccc
-
[urgency=high]
background-color=#dca3a3
text-color=#c0c0c0
diff --git a/templates/default.mustache b/templates/default.mustache
index 9a05cff..e6126b1 100644
--- a/templates/default.mustache
+++ b/templates/default.mustache
@@ -3,16 +3,15 @@
#
# You can use these variables anywhere in the mako configuration file.
+background-color=#{{base02-hex}}
+text-color=#{{base05-hex}}
+border-color=#{{base05-hex}}
+
[urgency=low]
background-color=#{{base01-hex}}
text-color=#{{base03-hex}}
border-color=#{{base05-hex}}
-[urgency=normal]
-background-color=#{{base02-hex}}
-text-color=#{{base05-hex}}
-border-color=#{{base05-hex}}
-
[urgency=high]
background-color=#{{base08-hex}}
text-color=#{{base06-hex}}