diff --git a/app/src/main/assets/colors/base16-3024-light.properties b/app/src/main/assets/colors/base16-3024-light.properties
index 1f4dfe3..c5fae98 100644
--- a/app/src/main/assets/colors/base16-3024-light.properties
+++ b/app/src/main/assets/colors/base16-3024-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Jan T. Sott (http://github.com/idleberg)
 foreground=#4a4543
 background=#f7f7f7
+variant=light
 cursor=#4a4543
 
 color0=#090300
diff --git a/app/src/main/assets/colors/base16-apathy-light.properties b/app/src/main/assets/colors/base16-apathy-light.properties
index 4bd16ea..4de2040 100644
--- a/app/src/main/assets/colors/base16-apathy-light.properties
+++ b/app/src/main/assets/colors/base16-apathy-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Jannik Siebert (https://github.com/janniks)
 foreground=#184E45
 background=#D2E7E4
+variant=light
 cursor=#184E45
 
 color0=#031A16
diff --git a/app/src/main/assets/colors/base16-ashes-light.properties b/app/src/main/assets/colors/base16-ashes-light.properties
index d168e65..d088e0e 100644
--- a/app/src/main/assets/colors/base16-ashes-light.properties
+++ b/app/src/main/assets/colors/base16-ashes-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Jannik Siebert (https://github.com/janniks)
 foreground=#565E65
 background=#F3F4F5
+variant=light
 cursor=#565E65
 
 color0=#1C2023
diff --git a/app/src/main/assets/colors/base16-atelierdune-light.properties b/app/src/main/assets/colors/base16-atelierdune-light.properties
index 686e871..bf0b47f 100644
--- a/app/src/main/assets/colors/base16-atelierdune-light.properties
+++ b/app/src/main/assets/colors/base16-atelierdune-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/dune)
 foreground=#6e6b5e
 background=#fefbec
+variant=light
 cursor=#6e6b5e
 
 color0=#20201d
diff --git a/app/src/main/assets/colors/base16-atelierforest-light.properties b/app/src/main/assets/colors/base16-atelierforest-light.properties
index f653fc7..e058fe0 100644
--- a/app/src/main/assets/colors/base16-atelierforest-light.properties
+++ b/app/src/main/assets/colors/base16-atelierforest-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/forest)
 foreground=#68615e
 background=#f1efee
+variant=light
 cursor=#68615e
 
 color0=#1b1918
diff --git a/app/src/main/assets/colors/base16-atelierheath-light.properties b/app/src/main/assets/colors/base16-atelierheath-light.properties
index 2423c79..e50b66c 100644
--- a/app/src/main/assets/colors/base16-atelierheath-light.properties
+++ b/app/src/main/assets/colors/base16-atelierheath-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/heath)
 foreground=#695d69
 background=#f7f3f7
+variant=light
 cursor=#695d69
 
 color0=#1b181b
diff --git a/app/src/main/assets/colors/base16-atelierlakeside-light.properties b/app/src/main/assets/colors/base16-atelierlakeside-light.properties
index 29f4e9f..b8ee32b 100644
--- a/app/src/main/assets/colors/base16-atelierlakeside-light.properties
+++ b/app/src/main/assets/colors/base16-atelierlakeside-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/lakeside/)
 foreground=#516d7b
 background=#ebf8ff
+variant=light
 cursor=#516d7b
 
 color0=#161b1d
diff --git a/app/src/main/assets/colors/base16-atelierseaside-light.properties b/app/src/main/assets/colors/base16-atelierseaside-light.properties
index 30f1db6..37d3648 100644
--- a/app/src/main/assets/colors/base16-atelierseaside-light.properties
+++ b/app/src/main/assets/colors/base16-atelierseaside-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/seaside/)
 foreground=#5e6e5e
 background=#f0fff0
+variant=light
 cursor=#5e6e5e
 
 color0=#131513
diff --git a/app/src/main/assets/colors/base16-bespin-light.properties b/app/src/main/assets/colors/base16-bespin-light.properties
index fe4a050..01890c3 100644
--- a/app/src/main/assets/colors/base16-bespin-light.properties
+++ b/app/src/main/assets/colors/base16-bespin-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Jan T. Sott
 foreground=#5e5d5c
 background=#baae9e
+variant=light
 cursor=#5e5d5c
 
 color0=#28211c
diff --git a/app/src/main/assets/colors/base16-brewer-light.properties b/app/src/main/assets/colors/base16-brewer-light.properties
index bff9832..4b8217f 100644
--- a/app/src/main/assets/colors/base16-brewer-light.properties
+++ b/app/src/main/assets/colors/base16-brewer-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Timothée Poisot (http://github.com/tpoisot)
 foreground=#515253
 background=#fcfdfe
+variant=light
 cursor=#515253
 
 color0=#0c0d0e
diff --git a/app/src/main/assets/colors/base16-bright-light.properties b/app/src/main/assets/colors/base16-bright-light.properties
index 1d5b41f..c1ab4ac 100644
--- a/app/src/main/assets/colors/base16-bright-light.properties
+++ b/app/src/main/assets/colors/base16-bright-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Chris Kempson (http://chriskempson.com)
 foreground=#505050
 background=#ffffff
+variant=light
 cursor=#505050
 
 color0=#000000
diff --git a/app/src/main/assets/colors/base16-chalk-light.properties b/app/src/main/assets/colors/base16-chalk-light.properties
index 155cb54..9a44d44 100644
--- a/app/src/main/assets/colors/base16-chalk-light.properties
+++ b/app/src/main/assets/colors/base16-chalk-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Chris Kempson (http://chriskempson.com)
 foreground=#303030
 background=#f5f5f5
+variant=light
 cursor=#303030
 
 color0=#151515
diff --git a/app/src/main/assets/colors/base16-codeschool-light.properties b/app/src/main/assets/colors/base16-codeschool-light.properties
index 080a882..456cf9c 100644
--- a/app/src/main/assets/colors/base16-codeschool-light.properties
+++ b/app/src/main/assets/colors/base16-codeschool-light.properties
@@ -3,6 +3,7 @@
 # Scheme: brettof86
 foreground=#2a343a
 background=#b5d8f6
+variant=light
 cursor=#2a343a
 
 color0=#232c31
diff --git a/app/src/main/assets/colors/base16-colors-light.properties b/app/src/main/assets/colors/base16-colors-light.properties
index 95a2eee..fe6ef02 100644
--- a/app/src/main/assets/colors/base16-colors-light.properties
+++ b/app/src/main/assets/colors/base16-colors-light.properties
@@ -3,6 +3,7 @@
 # Scheme: mrmrs (http://clrs.cc)
 foreground=#555555
 background=#ffffff
+variant=light
 cursor=#555555
 
 color0=#111111
diff --git a/app/src/main/assets/colors/base16-default-light.properties b/app/src/main/assets/colors/base16-default-light.properties
index f854463..343ce5a 100644
--- a/app/src/main/assets/colors/base16-default-light.properties
+++ b/app/src/main/assets/colors/base16-default-light.properties
@@ -1,5 +1,6 @@
 foreground=   #383838
 background=   #f8f8f8
+variant= light
 cursor=  #383838
 
 color0=       #181818
diff --git a/app/src/main/assets/colors/base16-eighties-light.properties b/app/src/main/assets/colors/base16-eighties-light.properties
index 8e5f29b..10de947 100644
--- a/app/src/main/assets/colors/base16-eighties-light.properties
+++ b/app/src/main/assets/colors/base16-eighties-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Chris Kempson (http://chriskempson.com)
 foreground=#515151
 background=#f2f0ec
+variant=light
 cursor=#515151
 
 color0=#2d2d2d
diff --git a/app/src/main/assets/colors/base16-embers-light.properties b/app/src/main/assets/colors/base16-embers-light.properties
index d60ac4a..4af7d11 100644
--- a/app/src/main/assets/colors/base16-embers-light.properties
+++ b/app/src/main/assets/colors/base16-embers-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Jannik Siebert (https://github.com/janniks)
 foreground=#433B32
 background=#DBD6D1
+variant=light
 cursor=#433B32
 
 color0=#16130F
diff --git a/app/src/main/assets/colors/base16-flat-light.properties b/app/src/main/assets/colors/base16-flat-light.properties
index 040cd23..56d384d 100644
--- a/app/src/main/assets/colors/base16-flat-light.properties
+++ b/app/src/main/assets/colors/base16-flat-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Chris Kempson (http://chriskempson.com)
 foreground=#7F8C8D
 background=#ECF0F1
+variant=light
 cursor=#7F8C8D
 
 color0=#2C3E50
diff --git a/app/src/main/assets/colors/base16-google-light.properties b/app/src/main/assets/colors/base16-google-light.properties
index 36e96b8..59d70bd 100644
--- a/app/src/main/assets/colors/base16-google-light.properties
+++ b/app/src/main/assets/colors/base16-google-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Seth Wright (http://sethawright.com)
 foreground=#373b41
 background=#ffffff
+variant=light
 cursor=#373b41
 
 color0=#1d1f21
diff --git a/app/src/main/assets/colors/base16-grayscale-light.properties b/app/src/main/assets/colors/base16-grayscale-light.properties
index 6512c41..4f59b31 100644
--- a/app/src/main/assets/colors/base16-grayscale-light.properties
+++ b/app/src/main/assets/colors/base16-grayscale-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Alexandre Gavioli (https://github.com/Alexx2/)
 foreground=#464646
 background=#f7f7f7
+variant=light
 cursor=#464646
 
 color0=#101010
diff --git a/app/src/main/assets/colors/base16-greenscreen-light.properties b/app/src/main/assets/colors/base16-greenscreen-light.properties
index 7196747..0f47879 100644
--- a/app/src/main/assets/colors/base16-greenscreen-light.properties
+++ b/app/src/main/assets/colors/base16-greenscreen-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Chris Kempson (http://chriskempson.com)
 foreground=#005500
 background=#00ff00
+variant=light
 cursor=#005500
 
 color0=#001100
diff --git a/app/src/main/assets/colors/base16-harmonic16-light.properties b/app/src/main/assets/colors/base16-harmonic16-light.properties
index 64c26ce..be6eace 100644
--- a/app/src/main/assets/colors/base16-harmonic16-light.properties
+++ b/app/src/main/assets/colors/base16-harmonic16-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Jannik Siebert (https://github.com/janniks)
 foreground=#405c79
 background=#f7f9fb
+variant=light
 cursor=#405c79
 
 color0=#0b1c2c
diff --git a/app/src/main/assets/colors/base16-isotope-light.properties b/app/src/main/assets/colors/base16-isotope-light.properties
index 3856f3f..abd0abc 100644
--- a/app/src/main/assets/colors/base16-isotope-light.properties
+++ b/app/src/main/assets/colors/base16-isotope-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Jan T. Sott
 foreground=#606060
 background=#ffffff
+variant=light
 cursor=#606060
 
 color0=#000000
diff --git a/app/src/main/assets/colors/base16-londontube-light.properties b/app/src/main/assets/colors/base16-londontube-light.properties
index 0c27029..0825b33 100644
--- a/app/src/main/assets/colors/base16-londontube-light.properties
+++ b/app/src/main/assets/colors/base16-londontube-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Jan T. Sott
 foreground=#5a5758
 background=#ffffff
+variant=light
 cursor=#5a5758
 
 color0=#231f20
diff --git a/app/src/main/assets/colors/base16-marrakesh-light.properties b/app/src/main/assets/colors/base16-marrakesh-light.properties
index bf68121..bd8177c 100644
--- a/app/src/main/assets/colors/base16-marrakesh-light.properties
+++ b/app/src/main/assets/colors/base16-marrakesh-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Alexandre Gavioli (http://github.com/Alexx2/)
 foreground=#5f5b17
 background=#faf0a5
+variant=light
 cursor=#5f5b17
 
 color0=#201602
diff --git a/app/src/main/assets/colors/base16-mocha-light.properties b/app/src/main/assets/colors/base16-mocha-light.properties
index 9ad25a6..4bc9c31 100644
--- a/app/src/main/assets/colors/base16-mocha-light.properties
+++ b/app/src/main/assets/colors/base16-mocha-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Chris Kempson (http://chriskempson.com)
 foreground=#645240
 background=#f5eeeb
+variant=light
 cursor=#645240
 
 color0=#3B3228
diff --git a/app/src/main/assets/colors/base16-monokai-light.properties b/app/src/main/assets/colors/base16-monokai-light.properties
index 4b69392..c52b4e0 100644
--- a/app/src/main/assets/colors/base16-monokai-light.properties
+++ b/app/src/main/assets/colors/base16-monokai-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Wimer Hazenberg (http://www.monokai.nl)
 foreground=#49483e
 background=#f9f8f5
+variant=light
 cursor=#49483e
 
 color0=#272822
diff --git a/app/src/main/assets/colors/base16-ocean-light.properties b/app/src/main/assets/colors/base16-ocean-light.properties
index c6a2f36..f0a7c76 100644
--- a/app/src/main/assets/colors/base16-ocean-light.properties
+++ b/app/src/main/assets/colors/base16-ocean-light.properties
@@ -1,5 +1,6 @@
 foreground:   #4f5b66
 background:   #eff1f5
+variant: light
 cursor:  #4f5b66
 
 color0:       #2b303b
diff --git a/app/src/main/assets/colors/base16-paraiso-light.properties b/app/src/main/assets/colors/base16-paraiso-light.properties
index a1e43d7..5b6132d 100644
--- a/app/src/main/assets/colors/base16-paraiso-light.properties
+++ b/app/src/main/assets/colors/base16-paraiso-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Jan T. Sott
 foreground=#4f424c
 background=#e7e9db
+variant=light
 cursor=#4f424c
 
 color0=#2f1e2e
diff --git a/app/src/main/assets/colors/base16-railscasts-light.properties b/app/src/main/assets/colors/base16-railscasts-light.properties
index 55fc912..ede2748 100644
--- a/app/src/main/assets/colors/base16-railscasts-light.properties
+++ b/app/src/main/assets/colors/base16-railscasts-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Ryan Bates (http://railscasts.com)
 foreground=#3a4055
 background=#f9f7f3
+variant=light
 cursor=#3a4055
 
 color0=#2b2b2b
diff --git a/app/src/main/assets/colors/base16-shapeshifter-light.properties b/app/src/main/assets/colors/base16-shapeshifter-light.properties
index 0d14d1b..acf6992 100644
--- a/app/src/main/assets/colors/base16-shapeshifter-light.properties
+++ b/app/src/main/assets/colors/base16-shapeshifter-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Tyler Benziger (http://tybenz.com)
 foreground=#102015
 background=#f9f9f9
+variant=light
 cursor=#102015
 
 color0=#000000
diff --git a/app/src/main/assets/colors/base16-solarized-light.properties b/app/src/main/assets/colors/base16-solarized-light.properties
index 4e629f4..6df5582 100644
--- a/app/src/main/assets/colors/base16-solarized-light.properties
+++ b/app/src/main/assets/colors/base16-solarized-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Ethan Schoonover (http://ethanschoonover.com/solarized)
 foreground=#586e75
 background=#fdf6e3
+variant=light
 cursor=#586e75
 
 color0=#002b36
diff --git a/app/src/main/assets/colors/base16-summerfruit-light.properties b/app/src/main/assets/colors/base16-summerfruit-light.properties
index 36fff33..e0fb585 100644
--- a/app/src/main/assets/colors/base16-summerfruit-light.properties
+++ b/app/src/main/assets/colors/base16-summerfruit-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Christopher Corley (http://cscorley.github.io/)
 foreground=#303030
 background=#FFFFFF
+variant=light
 cursor=#303030
 
 color0=#151515
diff --git a/app/src/main/assets/colors/base16-tomorrow-light.properties b/app/src/main/assets/colors/base16-tomorrow-light.properties
index 8b09191..74c9362 100644
--- a/app/src/main/assets/colors/base16-tomorrow-light.properties
+++ b/app/src/main/assets/colors/base16-tomorrow-light.properties
@@ -3,6 +3,7 @@
 # Scheme: Chris Kempson (http://chriskempson.com)
 foreground=#373b41
 background=#ffffff
+variant=light
 cursor=#373b41
 
 color0=#1d1f21
diff --git a/app/src/main/assets/colors/base16-twilight-light.properties b/app/src/main/assets/colors/base16-twilight-light.properties
index e2f38d2..b5a621a 100644
--- a/app/src/main/assets/colors/base16-twilight-light.properties
+++ b/app/src/main/assets/colors/base16-twilight-light.properties
@@ -3,6 +3,7 @@
 # Scheme: David Hart (http://hart-dev.com)
 foreground=#464b50
 background=#ffffff
+variant=light
 cursor=#464b50
 
 color0=#1e1e1e
diff --git a/app/src/main/assets/colors/black-on-white.properties b/app/src/main/assets/colors/black-on-white.properties
index 4532f90..732f6a2 100644
--- a/app/src/main/assets/colors/black-on-white.properties
+++ b/app/src/main/assets/colors/black-on-white.properties
@@ -1,5 +1,6 @@
 background: #FFFFFF
 foreground: #000000
+variant:light
 
 color0:#000000
 color1:#000000
diff --git a/app/src/main/assets/colors/gruvbox-light.properties b/app/src/main/assets/colors/gruvbox-light.properties
index 7283412..4ac62d7 100644
--- a/app/src/main/assets/colors/gruvbox-light.properties
+++ b/app/src/main/assets/colors/gruvbox-light.properties
@@ -11,6 +11,7 @@ background: #f9f5d7
 ! background: #fbf1c7
 ! soft contrast: background: #f2e5bc
 foreground: #3c3836
+variant: light
 ! Black + DarkGrey
 color0:  #fdf4c1
 color8:  #928374
diff --git a/app/src/main/assets/colors/solarized-light.properties b/app/src/main/assets/colors/solarized-light.properties
index e966e68..d33ad1b 100644
--- a/app/src/main/assets/colors/solarized-light.properties
+++ b/app/src/main/assets/colors/solarized-light.properties
@@ -1,6 +1,7 @@
 # https://github.com/altercation/solarized/blob/master/xresources/solarized
 background=#fdf6e3
 foreground=#657b83
+variant=light
 cursor=#586e75
 
 color0=#073642