diff --git a/hyprland/.config/hypr/hyprland.conf b/hyprland/.config/hypr/hyprland.conf
index a1d2455..c0f31c8 100644
--- a/hyprland/.config/hypr/hyprland.conf
+++ b/hyprland/.config/hypr/hyprland.conf
@@ -39,7 +39,7 @@ binds {
 }
 
 $menu = wofi -S run
-$terminal = alacritty
+$terminal = kitty || alacritty
 
 $mainMod = SUPER
 
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
new file mode 100644
index 0000000..ffbefe1
--- /dev/null
+++ b/kitty/.config/kitty/kitty.conf
@@ -0,0 +1,30 @@
+font_family FiraCode Nerd
+font_size 11
+
+cursor_blink_interval 0
+
+tab_title_template "{fmt.fg.red}{bell_symbol}{activity_symbol}{fmt.fg.tab}{title} {index}"
+
+action_alias launch_tab launch --type=tab --cwd=current
+
+map ctrl+shift+n launch_tab tmux
+map ctrl+shift+t launch_tab tmux attach
+
+map ctrl+shift+h previous_tab
+map ctrl+shift+l next_tab
+map ctrl+shift+p goto_tab -1
+map ctrl+shift+1 goto_tab 1
+map ctrl+shift+2 goto_tab 2
+map ctrl+shift+3 goto_tab 3
+map ctrl+shift+4 goto_tab 4
+map ctrl+shift+5 goto_tab 5
+map ctrl+shift+6 goto_tab 6
+map ctrl+shift+7 goto_tab 7
+map ctrl+shift+8 goto_tab 8
+map ctrl+shift+9 goto_tab 9
+map ctrl+shift+0 goto_tab 10
+
+# BEGIN_KITTY_THEME
+# Afterglow
+include current-theme.conf
+# END_KITTY_THEME
diff --git a/xsession/bin/lupan-set-theme b/xsession/bin/lupan-set-theme
index 2f11c95..6804e4a 100755
--- a/xsession/bin/lupan-set-theme
+++ b/xsession/bin/lupan-set-theme
@@ -27,6 +27,12 @@ if [ -f ~/.config/alacritty/alacritty.toml ]; then
     sed -i "s#^import =.*#import = [\"~/.config/alacritty/$THEME.toml\"]#" ~/.config/alacritty/alacritty.toml
 fi
 
+if [ "$THEME" = dark ]; then
+    kitten themes --reload-in=all Afterglow
+elif [ "$THEME" = light ]; then
+    kitten themes --reload-in=all One Half Light
+fi
+
 # GTK
 if [ -f ~/.config/xsettingsd/xsettingsd.conf ]; then
     sed -i -E "s#(Net/ThemeName) .*#\\1 \"${GTK_THEME}\"#" ~/.config/xsettingsd/xsettingsd.conf