diff --git a/themes/jetbrains-darcula b/themes/jetbrains-darcula
index 306b1e9d..82528498 100644
--- a/themes/jetbrains-darcula
+++ b/themes/jetbrains-darcula
@@ -24,5 +24,5 @@ bright4=6d9df1   # bright blue
 bright5=fb82ff   # bright magenta
 bright6=60d3d1   # bright cyan
 bright7=eeeeee   # bright white
-selection-foreground=202020
-selection-background=1a3272
+# selection-foreground=202020
+# selection-background=1a3272
diff --git a/themes/material-design b/themes/material-design
index 6d81e339..4a9e008a 100644
--- a/themes/material-design
+++ b/themes/material-design
@@ -5,8 +5,6 @@
 [colors]
 foreground=ECEFF1
 background=263238
-selection-foreground=ECEFF1
-selection-background=607D8B
 regular0=546E7A  # black
 regular1=FF5252  # red
 regular2=5CF19E  # green
@@ -23,3 +21,5 @@ bright4=80D8FF   # bright blue
 bright5=FF80AB   # bright magenta
 bright6=A7FDEB   # bright cyan
 bright7=FFFFFF   # bright white
+# selection-foreground=ECEFF1
+# selection-background=607D8B
diff --git a/themes/moonfly b/themes/moonfly
index c622ab45..870de9d0 100644
--- a/themes/moonfly
+++ b/themes/moonfly
@@ -8,8 +8,9 @@ color = 080808 9e9e9e
 [colors]
 foreground = b2b2b2
 background = 080808
-selection-foreground = 080808
-selection-background = b2ceee
+
+# selection-foreground = 080808
+# selection-background = b2ceee
 
 regular0 = 323437
 regular1 = ff5454
diff --git a/themes/nightfly b/themes/nightfly
index 50f95125..2a27fb2d 100644
--- a/themes/nightfly
+++ b/themes/nightfly
@@ -8,8 +8,9 @@ color = 080808 9ca1aa
 [colors]
 foreground = acb4c2
 background = 011627
-selection-foreground = 080808
-selection-background = b2ceee
+
+# selection-foreground = 080808
+# selection-background = b2ceee
 
 regular0 = 1d3b53
 regular1 = fc514e
diff --git a/themes/nord b/themes/nord
index af09f727..4ce3a53e 100644
--- a/themes/nord
+++ b/themes/nord
@@ -12,8 +12,9 @@ color = 2e3440 d8dee9
 [colors]
 foreground = d8dee9
 background = 2e3440
-#selection-foreground = d8dee9
-#selection-background = 4c566a
+
+# selection-foreground = d8dee9
+# selection-background = 4c566a
 
 regular0 = 3b4252
 regular1 = bf616a
diff --git a/themes/solarized-dark b/themes/solarized-dark
index e2395bdc..cad2945e 100644
--- a/themes/solarized-dark
+++ b/themes/solarized-dark
@@ -24,7 +24,7 @@ bright5=    6c71c4
 bright6=    93a1a1
 bright7=    fdf6e3
 
-## Enable if prefer solarized colors instead of inverterd fg/bg for
-## highlighting (mouse selection)
+# Enable if prefer solarized colors instead of inverterd fg/bg for
+# highlighting (mouse selection)
 # selection-foreground=93a1a1
 # selection-background=073642
diff --git a/themes/solarized-dark-normal-brights b/themes/solarized-dark-normal-brights
index 405a6e49..1ab7d375 100644
--- a/themes/solarized-dark-normal-brights
+++ b/themes/solarized-dark-normal-brights
@@ -26,7 +26,7 @@ bright5=    dc619d
 bright6=    32c1b6
 bright7=    ffffff
 
-## Enable if prefer solarized colors instead of inverterd fg/bg for
-## highlighting (mouse selection)
+# Enable if prefer solarized colors instead of inverterd fg/bg for
+# highlighting (mouse selection)
 # selection-foreground=93a1a1
 # selection-background=073642
diff --git a/themes/tempus-autumn b/themes/tempus-autumn
index 3f706d0e..9c1f8797 100644
--- a/themes/tempus-autumn
+++ b/themes/tempus-autumn
@@ -25,5 +25,5 @@ bright4 = 958fdf
 bright5 = ce7dc4
 bright6 = 2fa6b7
 bright7 = a9a2a6
-#selection-foreground = a8948a
-#selection-background = 36302a
+# selection-foreground = a8948a
+# selection-background = 36302a
diff --git a/themes/tempus-classic b/themes/tempus-classic
index 66fb886a..0164605b 100644
--- a/themes/tempus-classic
+++ b/themes/tempus-classic
@@ -25,5 +25,5 @@ bright4 = 8e9cc0
 bright5 = d58888
 bright6 = 7aa880
 bright7 = aeadaf
-#selection-foreground = 949d9f
-#selection-background = 312e30
+# selection-foreground = 949d9f
+# selection-background = 312e30
diff --git a/themes/tempus-dawn b/themes/tempus-dawn
index fa368b13..cf143fba 100644
--- a/themes/tempus-dawn
+++ b/themes/tempus-dawn
@@ -25,5 +25,5 @@ bright4 = 5c59b2
 bright5 = 8e45a8
 bright6 = 3f649c
 bright7 = eff0f2
-#selection-foreground = 676364
-#selection-background = dee2e0
+# selection-foreground = 676364
+# selection-background = dee2e0
diff --git a/themes/tempus-day b/themes/tempus-day
index 6002a8e2..b287d45c 100644
--- a/themes/tempus-day
+++ b/themes/tempus-day
@@ -25,5 +25,5 @@ bright4 = 0f64c4
 bright5 = 8050a7
 bright6 = 336c87
 bright7 = f8f2e5
-#selection-foreground = 68607d
-#selection-background = e7e3d7
+# selection-foreground = 68607d
+# selection-background = e7e3d7
diff --git a/themes/tempus-dusk b/themes/tempus-dusk
index e9f94725..2c0308e1 100644
--- a/themes/tempus-dusk
+++ b/themes/tempus-dusk
@@ -25,5 +25,5 @@ bright4 = 9ca5de
 bright5 = c69ac6
 bright6 = 8caeb6
 bright7 = a2a8ba
-#selection-foreground = a29899
-#selection-background = 2c3150
+# selection-foreground = a29899
+# selection-background = 2c3150
diff --git a/themes/tempus-fugit b/themes/tempus-fugit
index 1a6ae9e7..9ebbcee7 100644
--- a/themes/tempus-fugit
+++ b/themes/tempus-fugit
@@ -25,5 +25,5 @@ bright4 = 485adf
 bright5 = a234c0
 bright6 = 00756a
 bright7 = fff5f3
-#selection-foreground = 796271
-#selection-background = efe6e4
+# selection-foreground = 796271
+# selection-background = efe6e4
diff --git a/themes/tempus-future b/themes/tempus-future
index c0cdaad9..3dd8c7a6 100644
--- a/themes/tempus-future
+++ b/themes/tempus-future
@@ -25,5 +25,5 @@ bright4 = 8ba7ea
 bright5 = e08bd6
 bright6 = 2cbab6
 bright7 = b4abac
-#selection-foreground = a7a2c4
-#selection-background = 2b1329
+# selection-foreground = a7a2c4
+# selection-background = 2b1329
diff --git a/themes/tempus-night b/themes/tempus-night
index a431fbc6..de7be5ff 100644
--- a/themes/tempus-night
+++ b/themes/tempus-night
@@ -25,5 +25,5 @@ bright4 = 8cb4f0
 bright5 = de99f0
 bright6 = 00ca9a
 bright7 = e0e0e0
-#selection-foreground = c4bdaf
-#selection-background = 242536
+# selection-foreground = c4bdaf
+# selection-background = 242536
diff --git a/themes/tempus-past b/themes/tempus-past
index 8f8ddcb1..8c66f54d 100644
--- a/themes/tempus-past
+++ b/themes/tempus-past
@@ -25,5 +25,5 @@ bright4 = 5559bb
 bright5 = b022a7
 bright6 = 07707a
 bright7 = f3f2f4
-#selection-foreground = 80565d
-#selection-background = eae2de
+# selection-foreground = 80565d
+# selection-background = eae2de
diff --git a/themes/tempus-rift b/themes/tempus-rift
index 6d1ed3a2..3657a7fe 100644
--- a/themes/tempus-rift
+++ b/themes/tempus-rift
@@ -25,5 +25,5 @@ bright4 = 56bdad
 bright5 = cca0ba
 bright6 = 10c480
 bright7 = bbbcbc
-#selection-foreground = ab9aa9
-#selection-background = 283431
+# selection-foreground = ab9aa9
+# selection-background = 283431
diff --git a/themes/tempus-spring b/themes/tempus-spring
index 207434e9..d50e6d06 100644
--- a/themes/tempus-spring
+++ b/themes/tempus-spring
@@ -25,5 +25,5 @@ bright4 = 70afef
 bright5 = d095e2
 bright6 = 3cbfaf
 bright7 = b5b8b7
-#selection-foreground = 99afae
-#selection-background = 2a453d
+# selection-foreground = 99afae
+# selection-background = 2a453d
diff --git a/themes/tempus-summer b/themes/tempus-summer
index 3a852e46..7da1d8c4 100644
--- a/themes/tempus-summer
+++ b/themes/tempus-summer
@@ -25,5 +25,5 @@ bright4 = 8599ef
 bright5 = cc82d7
 bright6 = 2aacbf
 bright7 = a0abae
-#selection-foreground = 949cbf
-#selection-background = 39304f
+# selection-foreground = 949cbf
+# selection-background = 39304f
diff --git a/themes/tempus-tempest b/themes/tempus-tempest
index 15b3d881..57c300aa 100644
--- a/themes/tempus-tempest
+++ b/themes/tempus-tempest
@@ -25,5 +25,5 @@ bright4 = 74e4cd
 bright5 = d2d4aa
 bright6 = 9bdfc4
 bright7 = b6e0ca
-#selection-foreground = b0c8ca
-#selection-background = 323535
+# selection-foreground = b0c8ca
+# selection-background = 323535
diff --git a/themes/tempus-totus b/themes/tempus-totus
index 5ccac91d..01e84692 100644
--- a/themes/tempus-totus
+++ b/themes/tempus-totus
@@ -25,5 +25,5 @@ bright4 = 2d45b0
 bright5 = 700dc9
 bright6 = 005289
 bright7 = ffffff
-#selection-foreground = 5e4b4f
-#selection-background = efefef
+# selection-foreground = 5e4b4f
+# selection-background = efefef
diff --git a/themes/tempus-warp b/themes/tempus-warp
index d4c7a94b..fa8c21c2 100644
--- a/themes/tempus-warp
+++ b/themes/tempus-warp
@@ -25,5 +25,5 @@ bright4 = 8887f0
 bright5 = d85cf2
 bright6 = 1da1af
 bright7 = a29fa0
-#selection-foreground = 968282
-#selection-background = 261c2c
+# selection-foreground = 968282
+# selection-background = 261c2c
diff --git a/themes/tempus-winter b/themes/tempus-winter
index 22cdd6d9..8db97057 100644
--- a/themes/tempus-winter
+++ b/themes/tempus-winter
@@ -25,5 +25,5 @@ bright4 = 329fcb
 bright5 = ca77c5
 bright6 = 1ba6a4
 bright7 = 8da3b8
-#selection-foreground = 91959b
-#selection-background = 2a2e38
+# selection-foreground = 91959b
+# selection-background = 2a2e38