diff --git a/themes/Cyberpunk-Neon.h b/themes/Cyberpunk-Neon.h
deleted file mode 100644
index d77a229..0000000
--- a/themes/Cyberpunk-Neon.h
+++ /dev/null
@@ -1,18 +0,0 @@
-# define ST_FOREGROUND "#0abdc6"
-# define ST_BACKGROUND "#000b1e"
-# define ST_COLOR0 "#123e7c"
-# define ST_COLOR1 "#ff0000"
-# define ST_COLOR2 "#d300c4"
-# define ST_COLOR3 "#f57800"
-# define ST_COLOR4 "#123e7c"
-# define ST_COLOR5 "#711c91"
-# define ST_COLOR6 "#0abdc6"
-# define ST_COLOR7 "#d7d7d5"
-# define ST_COLOR8 "#1c61c2"
-# define ST_COLOR9 "#ff0000"
-# define ST_COLOR10 "#d300c4"
-# define ST_COLOR11 "#f57800"
-# define ST_COLOR12 "#00ff00"
-# define ST_COLOR13 "#711c91"
-# define ST_COLOR14 "#0abdc6"
-# define ST_COLOR15 "#d7d7d5"
diff --git a/themes/catppuccin.h b/themes/catppuccin.h
deleted file mode 100644
index 6642319..0000000
--- a/themes/catppuccin.h
+++ /dev/null
@@ -1,18 +0,0 @@
-# define ST_FOREGROUND "#D9E0EE"
-# define ST_BACKGROUND "#1E1E2E"
-# define ST_COLOR0 "#6E6C7E"
-# define ST_COLOR1 "#F28FAD"
-# define ST_COLOR2 "#ABE9B3"
-# define ST_COLOR3 "#FAE3B0"
-# define ST_COLOR4 "#96CDFB"
-# define ST_COLOR5 "#DDB6F2"
-# define ST_COLOR6 "#F5C2E7"
-# define ST_COLOR7 "#C3BAC6"
-# define ST_COLOR8 "#988BA2"
-# define ST_COLOR9 "#F28FAD"
-# define ST_COLOR10 "#ABE9B3"
-# define ST_COLOR11 "#FAE3B0"
-# define ST_COLOR12 "#96CDFB"
-# define ST_COLOR13 "#DDB6F2"
-# define ST_COLOR14 "#F5C2E7"
-# define ST_COLOR15 "#D9E0EE"
diff --git a/themes/dracula.h b/themes/dracula.h
deleted file mode 100644
index 1961616..0000000
--- a/themes/dracula.h
+++ /dev/null
@@ -1,18 +0,0 @@
-# define ST_FOREGROUND "#F8F8F2"
-# define ST_BACKGROUND "#282A36"
-# define ST_COLOR0 "#000000"
-# define ST_COLOR1 "#FF5555"
-# define ST_COLOR2 "#50FA7B"
-# define ST_COLOR3 "#F1FA8C"
-# define ST_COLOR4 "#BD93F9"
-# define ST_COLOR5 "#FF79C6"
-# define ST_COLOR6 "#8BE9FD"
-# define ST_COLOR7 "#BFBFBF"
-# define ST_COLOR8 "#4D4D4D"
-# define ST_COLOR9 "#FF6E67"
-# define ST_COLOR10 "#5AF78E"
-# define ST_COLOR11 "#F4F99D"
-# define ST_COLOR12 "#CAA9FA"
-# define ST_COLOR13 "#FF92D0"
-# define ST_COLOR14 "#9AEDFE"
-# define ST_COLOR15 "#E6E6E6"
diff --git a/themes/dwan.h b/themes/dwan.h
deleted file mode 100644
index 6446c11..0000000
--- a/themes/dwan.h
+++ /dev/null
@@ -1,19 +0,0 @@
-# define ST_FOREGROUND "#9b9081"
-# define ST_BACKGROUND "#181b20"
-# define ST_CURSORCOLOR "#9b9081"
-# define ST_COLOR0 "#353535"
-# define ST_COLOR1 "#744b40"
-# define ST_COLOR2 "#6d6137"
-# define ST_COLOR3 "#765636"
-# define ST_COLOR4 "#61564b"
-# define ST_COLOR5 "#6b4a49"
-# define ST_COLOR6 "#435861"
-# define ST_COLOR7 "#b3b3b3"
-# define ST_COLOR8 "#5f5f5f"
-# define ST_COLOR9 "#785850"
-# define ST_COLOR10 "#6f6749"
-# define ST_COLOR11 "#776049"
-# define ST_COLOR12 "#696057"
-# define ST_COLOR13 "#6f5a59"
-# define ST_COLOR14 "#525f66"
-# define ST_COLOR15 "#cdcdcd"
diff --git a/themes/gruvbox-dark.h b/themes/gruvbox-dark.h
deleted file mode 100644
index c7901e8..0000000
--- a/themes/gruvbox-dark.h
+++ /dev/null
@@ -1,18 +0,0 @@
-# define ST_FOREGROUND "#ebdbb2"
-# define ST_BACKGROUND "#282828"
-# define ST_COLOR0 "#282828"
-# define ST_COLOR1 "#cc241d"
-# define ST_COLOR2 "#98971a"
-# define ST_COLOR3 "#d79921"
-# define ST_COLOR4 "#458588"
-# define ST_COLOR5 "#b16286"
-# define ST_COLOR6 "#689d6a"
-# define ST_COLOR7 "#a89984"
-# define ST_COLOR8 "#928374"
-# define ST_COLOR9 "#fb4934"
-# define ST_COLOR10 "#b8bb26"
-# define ST_COLOR11 "#fabd2f"
-# define ST_COLOR12 "#83a598"
-# define ST_COLOR13 "#d3869b"
-# define ST_COLOR14 "#8ec07c"
-# define ST_COLOR15 "#ebdbb2"
diff --git a/themes/leet.h b/themes/leet.h
index e149a2d..dbed655 100644
--- a/themes/leet.h
+++ b/themes/leet.h
@@ -1,4 +1,6 @@
-# define ST_ALPHA .75F
+# define ST_FONT "IBM Plex Mono:size=12"
+# define ST_FONT2 {"IBM Plex Mono:size=12", "DejaVu Sans Mono", "monospace", "JoyPixels:size=10:antialias=true:autohint=true", "Symbols Nerd Font:style=2048-em:size=10:antialias=true:autohint=true", "Noto Color Emoji:size=10:style=Regular"}
+# define ST_ALPHA 0.8541019662496846F
 # define ST_FOREGROUND "#FF0000"
 # define ST_BACKGROUND "#080000"
 # define ST_CURSORCOLOR "#D40000"
diff --git a/themes/redish.h b/themes/redish.h
index 51fedfc..3906833 100644
--- a/themes/redish.h
+++ b/themes/redish.h
@@ -1,3 +1,6 @@
+# define ST_FONT "terminus:size=16"
+# define ST_FONT2 {"IBM Plex Mono:size=12", "DejaVu Sans Mono", "monospace", "JoyPixels:size=10:antialias=true:autohint=true", "Symbols Nerd Font:style=2048-em:size=10:antialias=true:autohint=true", "Noto Color Emoji:size=10:style=Regular"}
+# define ST_ALPHA 0.95
 # define ST_FOREGROUND "#FF0000"
 # define ST_BACKGROUND "#1C0F0F"
 # define ST_CURSORCOLOR "#D40000"
diff --git a/themes/solarized-dark.h b/themes/solarized-dark.h
index 4dabf4b..9e4c1ef 100644
--- a/themes/solarized-dark.h
+++ b/themes/solarized-dark.h
@@ -1,6 +1,10 @@
+# define ST_FONT "IBM Plex Mono:size=12"
+# define ST_FONT2 {"IBM Plex Mono:size=12", "DejaVu Sans Mono", "monospace", "JoyPixels:size=10:antialias=true:autohint=true", "Symbols Nerd Font:style=2048-em:size=10:antialias=true:autohint=true", "Noto Color Emoji:size=10:style=Regular"}
+# define ST_ALPHA 0.95
 # define ST_FOREGROUND "#839496"
 # define ST_BACKGROUND "#002b36"
 # define ST_CURSORCOLOR "#93a1a1"
+# define ST_REVCURCOLOR "#586e75"
 # define ST_COLOR0 "#073642"
 # define ST_COLOR1 "#dc322f"
 # define ST_COLOR2 "#859900"
diff --git a/themes/solarized-light.h b/themes/solarized-light.h
new file mode 100644
index 0000000..12a8f36
--- /dev/null
+++ b/themes/solarized-light.h
@@ -0,0 +1,23 @@
+# define ST_FONT "IBM Plex Mono:size=12"
+# define ST_FONT2 {"IBM Plex Mono:size=12", "DejaVu Sans Mono", "monospace", "JoyPixels:size=10:antialias=true:autohint=true", "Symbols Nerd Font:style=2048-em:size=10:antialias=true:autohint=true", "Noto Color Emoji:size=10:style=Regular"}
+# define ST_ALPHA 0.95
+# define ST_FOREGROUND "#657b83"
+# define ST_BACKGROUND "#fdf6e3"
+# define ST_CURSORCOLOR "#586e75"
+# define ST_REVCURCOLOR "#93a1a1"
+# define ST_COLOR0 "#eee8d5"
+# define ST_COLOR1 "#dc322f"
+# define ST_COLOR2 "#859900"
+# define ST_COLOR3 "#b58900"
+# define ST_COLOR4 "#268bd2"
+# define ST_COLOR5 "#d33682"
+# define ST_COLOR6 "#2aa198"
+# define ST_COLOR7 "#073642"
+# define ST_COLOR8 "#fdf6e3"
+# define ST_COLOR9 "#cb4b16"
+# define ST_COLOR10 "#93a1a1"
+# define ST_COLOR11 "#839496"
+# define ST_COLOR12 "#657b83"
+# define ST_COLOR13 "#6c71c4"
+# define ST_COLOR14 "#586e75"
+# define ST_COLOR15 "#002b36"
diff --git a/themes/sweetlove.h b/themes/sweetlove.h
deleted file mode 100644
index 5c85bd0..0000000
--- a/themes/sweetlove.h
+++ /dev/null
@@ -1,19 +0,0 @@
-# define ST_FOREGROUND "#c0b18b"
-# define ST_BACKGROUND "#1f1f1f"
-# define ST_CURSORCOLOR "#c0b18b"
-# define ST_COLOR0 "#4a3637"
-# define ST_COLOR1 "#d17b49"
-# define ST_COLOR2 "#7b8748"
-# define ST_COLOR3 "#af865a"
-# define ST_COLOR4 "#535c5c"
-# define ST_COLOR5 "#775759"
-# define ST_COLOR6 "#6d715e"
-# define ST_COLOR7 "#c0b18b"
-# define ST_COLOR8 "#402e2e"
-# define ST_COLOR9 "#ac5d2f"
-# define ST_COLOR10 "#647035"
-# define ST_COLOR11 "#8f6840"
-# define ST_COLOR12 "#444b4b"
-# define ST_COLOR13 "#614445"
-# define ST_COLOR14 "#585c49"
-# define ST_COLOR15 "#978965"