diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc
index f6bcfeb..c167aaa 100755
--- a/bspwm/bspwmrc
+++ b/bspwm/bspwmrc
@@ -37,7 +37,7 @@ $HOME/.config/polybar/launch.sh
 
 
 # source wal colors
-. "${HOME}/.cache/wal/colors.sh"
+. "${HOME}/.cache/theme/variables.sh"
 
 # launch picom
 picom -b
@@ -54,9 +54,9 @@ bspc config pointer_action2 resize_side
 
 # change color of border to the bright red
 bspc config normal_border_color "$color15"
-bspc config active_border_color "$color2"
-bspc config focused_border_color "$color1"
-bspc config presel_feedback_color "$color4"
+bspc config active_border_color "$color02"
+bspc config focused_border_color "$color01"
+bspc config presel_feedback_color "$color04"
 
 # set window rules
 bspc rule -a feh state=floating
diff --git a/themectl/config.toml b/themectl/config.toml
index f17068e..b328d7f 100644
--- a/themectl/config.toml
+++ b/themectl/config.toml
@@ -1,15 +1,22 @@
 
-post = "kitty @ set-colors --all --configured .cache/theme/kitty.conf >/dev/null 2>&1"
+post = "kitty @ set-colors --all --configured .cache/theme/kitty.conf"
+
+# TODO: update ttys, fix vim, get all themes from wal/colorschemes/dark
 
 [apps]
+
 vim = "~/.config/nvim/colors/theme.vim"
-shell = { file = "~/.cache/theme/colors.sh", post = "(bspc wm -r &) ; (source ~/.cache/theme/colors.sh)" }
 airline = "~/.config/nvim/autoload/airline/themes/theme.vim"
+
+shell = { file = "~/.cache/theme/colors.sh", post = "(bspc wm -r &) ; (source ~/.cache/theme/colors.sh)" }
+variables = "~/.cache/theme/variables.sh"
+
 xresources = { file = "~/.cache/theme/colors.Xresources", post = "(xrdb -merge -quiet ~/.config/X11/Xresources) ; (spicetify update &) ; (fuck polybar &)" }
 kitty = "~/.cache/theme/kitty.conf"
+
 rofi-custom = "~/.cache/theme/colors-rofi.rasi"
 dunst-custom = { file = "~/.config/dunst/dunstrc", post = "(killall dunst &) ; (dunst &)" }
 zathura-custom = "~/.config/zathura/zathurarc"
+
 discord = { file = "~/.cache/wal/colors.css", post = "pywal-discord &" }
 firefox = { file = "~/.cache/wal/colors.json", post = "pywalfox update &" }
-
diff --git a/themectl/templates/variables.mustache b/themectl/templates/variables.mustache
new file mode 100644
index 0000000..d5039e3
--- /dev/null
+++ b/themectl/templates/variables.mustache
@@ -0,0 +1,19 @@
+
+
+color00='#{{base00-hex}}'
+color01='#{{base08-hex}}'
+color02='#{{base0B-hex}}'
+color03='#{{base0A-hex}}'
+color04='#{{base0D-hex}}'
+color05='#{{base0E-hex}}'
+color06='#{{base0C-hex}}'
+color07='#{{base05-hex}}'
+color08='#{{base03-hex}}'
+color09=$color01
+color10=$color02
+color11=$color03
+color12=$color04
+color13=$color05
+color14=$color06
+color15='#{{base07-hex}}'
+
diff --git a/zsh/zshrc b/zsh/zshrc
index 4890d4e..030ec65 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -12,7 +12,6 @@ alias xsecurelock='XSECURELOCK_NO_COMPOSITE=1 XSECURELOCK_AUTH_BACKGROUND_COLOR=
 
 source ~/.zshenv
 
-# source ~/.cache/wal/colors.sh
-# (cat ~/.cache/wal/sequences &)
+source ~/.cache/theme/variables.sh
 source ~/.cache/theme/colors.sh