diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index 9c89a0a..9305b45 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -5,7 +5,9 @@ cursor_blink_interval 0
 enable_audio_bell no
 visual_bell_duration 1.0
 
+tab_bar_min_tabs 1
 tab_bar_style powerline
+tab_bar_edge top
 tab_bar_filter session:~ or session:^$
 tab_title_template "{index}:{session_name}:{bell_symbol}{activity_symbol}{title}"
 tab_powerline_style round
@@ -15,6 +17,8 @@ open_url_with qutebrowser
 action_alias launch_tab_home launch --type tab --cwd=~
 kitten_alias hints hints --hints-background-color red --hints-foreground-color white
 
+cursor_trail 1
+
 map ctrl+shift+6 no_op
 map ctrl+shift+0 nth_window -1
 
@@ -64,6 +68,6 @@ map ctrl+alt+shift+w detach_window
 map ctrl+alt+shift+x close_session .
 
 # BEGIN_KITTY_THEME
-# Kanagawa
+# Flexoki (Dark)
 include current-theme.conf
 # END_KITTY_THEME
diff --git a/nvim/.config/nvim/lua/plugins/colorscheme.lua b/nvim/.config/nvim/lua/plugins/colorscheme.lua
index e6774ca..b5f1953 100644
--- a/nvim/.config/nvim/lua/plugins/colorscheme.lua
+++ b/nvim/.config/nvim/lua/plugins/colorscheme.lua
@@ -1,5 +1,9 @@
-vim.pack.add({ "https://github.com/EdenEast/nightfox.nvim", "https://github.com/rebelot/kanagawa.nvim" })
+vim.pack.add({
+	"https://github.com/EdenEast/nightfox.nvim",
+	"https://github.com/rebelot/kanagawa.nvim",
+	"https://github.com/kepano/flexoki-neovim",
+})
 
 local cs = require("config.colorscheme")
-cs.set_colorschemes("kanagawa-wave", "dayfox")
+cs.set_colorschemes("flexoki", "flexoki")
 cs.update_colorscheme()
diff --git a/nvim/.config/nvim/nvim-pack-lock.json b/nvim/.config/nvim/nvim-pack-lock.json
index 5b77876..1f393c8 100644
--- a/nvim/.config/nvim/nvim-pack-lock.json
+++ b/nvim/.config/nvim/nvim-pack-lock.json
@@ -21,6 +21,10 @@
       "rev": "fcea7ff883235d9024dc41e638f164a450c14ca2",
       "src": "https://github.com/folke/flash.nvim"
     },
+    "flexoki-neovim": {
+      "rev": "c3e2251e813d29d885a7cbbe9808a7af234d845d",
+      "src": "https://github.com/kepano/flexoki-neovim"
+    },
     "guess-indent.nvim": {
       "rev": "84a4987ff36798c2fc1169cbaff67960aed9776f",
       "src": "https://github.com/NMAC427/guess-indent.nvim"
diff --git a/xsession/bin/lupan-set-theme b/xsession/bin/lupan-set-theme
index a20506e..d91b78b 100755
--- a/xsession/bin/lupan-set-theme
+++ b/xsession/bin/lupan-set-theme
@@ -46,9 +46,9 @@ fi
 
 XSET=$(readlink -e ~/.config/xsettingsd/xsettingsd.conf)
 if [ "$THEME" = dark ]; then
-    kitten themes --reload-in=all Kanagawa
+    kitten themes --reload-in=all 'Flexoki (Dark)'
 elif [ "$THEME" = light ]; then
-    kitten themes --reload-in=all Dayfox
+    kitten themes --reload-in=all 'Flexoki (Light)'
 fi
 
 # GTK