diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index 70db9f7..9c89a0a 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -2,6 +2,8 @@ font_family HurmitNerdFont
 font_size 11
 
 cursor_blink_interval 0
+enable_audio_bell no
+visual_bell_duration 1.0
 
 tab_bar_style powerline
 tab_bar_filter session:~ or session:^$
@@ -10,6 +12,9 @@ tab_powerline_style round
 
 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
+
 map ctrl+shift+6 no_op
 map ctrl+shift+0 nth_window -1
 
@@ -29,21 +34,28 @@ map ctrl+alt+j neighboring_window down
 map ctrl+alt+k neighboring_window up
 map ctrl+alt+l neighboring_window right
 
-map ctrl+alt+return last_used_layout
+map ctrl+alt+a last_used_layout
 map ctrl+alt+b goto_layout fat
 map ctrl+alt+g goto_layout grid
 map ctrl+alt+r goto_layout tall
 
 map ctrl+alt+space goto_session -1
+map ctrl+alt+return new_window_with_cwd
+map ctrl+alt+d new_tab_with_cwd sh -c 'cd $(kitten choose-file --mode dir) && nvim'
 map ctrl+alt+e new_tab_with_cwd nvim
 map ctrl+alt+i new_tab_with_cwd lazygit
-map ctrl+alt+f new_tab_with_cwd lf
+map ctrl+alt+f new_tab_with_cwd sh -c 'nvim $(kitten choose-file)'
 map ctrl+alt+m toggle_layout stack
 map ctrl+alt+o goto_session ~/.config/kitty/sessions
+map ctrl+alt+/ goto_session --sort-by=alphabetical ~/.config/kitty/sessions
+map ctrl+alt+p new_tab_with_cwd spf
 map ctrl+alt+s launch --stdin-source=@screen_scrollback --type=overlay nvim -R -
 map ctrl+alt+w new_window_with_cwd
 map ctrl+alt+t new_tab_with_cwd
 map ctrl+alt+x close_window_with_confirmation
+map ctrl+alt+u>d launch_tab_home sh -c 'cd $(kitten choose-file --mode dir) && nvim'
+map ctrl+alt+u>f launch_tab_home sh -c 'nvim $(kitten choose-file)'
+map ctrl+alt+v focus_visible_window
 map ctrl+alt+y new_window nvim @selection
 
 map ctrl+alt+shift+s save_as_session --base-dir ~/.config/kitty/sessions --match=session:.
diff --git a/nvim/.config/nvim/lua/config/options.lua b/nvim/.config/nvim/lua/config/options.lua
index dfdcdbc..0c4b20e 100644
--- a/nvim/.config/nvim/lua/config/options.lua
+++ b/nvim/.config/nvim/lua/config/options.lua
@@ -13,3 +13,9 @@ vim.opt.timeout = false
 vim.o.undofile = true
 
 vim.cmd([[autocmd TermOpen * startinsert]]);
+
+vim.filetype.add({
+	extension = {
+		["kitty-session"] = 'kitty',
+	},
+})
diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua
index 7605187..95b9fa6 100644
--- a/nvim/.config/nvim/lua/plugins/telescope.lua
+++ b/nvim/.config/nvim/lua/plugins/telescope.lua
@@ -77,6 +77,9 @@ if ok then
 	set("n", "<leader>es", function()
 		builtin.find_files({ cwd = vim.fs.normalize('~/.config/kitty/sessions') })
 	end, { desc = "Telescope kitty sessions" })
+	set("n", "<leader>eS", function()
+		vim.cmd("Oil " .. vim.fs.normalize('~/.config/kitty/sessions'))
+	end, { desc = "Telescope kitty sessions (dir)" })
 	set("n", "<leader>fa", builtin.git_files, { desc = "Telescope nvim package files" })
 	set("n", "<leader>F", builtin.find_files, { desc = "Telescope find files" })
 	set("n", "<leader>fh", function()
diff --git a/shell/.config/shellconfig/aliases.sh b/shell/.config/shellconfig/aliases.sh
index 4e75f4a..37b2723 100644
--- a/shell/.config/shellconfig/aliases.sh
+++ b/shell/.config/shellconfig/aliases.sh
@@ -72,5 +72,25 @@ tai() {
 }
 
 vf() {
-	nvim $(fzf --multi)
+	if [ "$TERM" = "xterm-kitty" ]; then
+		local FILE=$(kitten choose-file)
+		[ -n "$FILE" ] && nvim "$FILE"
+	else
+		nvim $(fzf --multi)
+	fi
+}
+
+vd() {
+	if [ "$TERM" = "xterm-kitty" ]; then
+		local DIR=$(kitten choose-file --mode dir)
+		[ -n "$DIR" ] && ( cd "$DIR" && exec nvim )
+	else
+		local DIR=$(fzf --walker dir,follow,hidden)
+		[ -n "$DIR" ] && ( cd "$DIR" && exec nvim )
+	fi
+}
+
+vz() {
+	local DIR=$(zoxide query -l | fzf --query "$Q")
+	[ -n "$DIR" ] && ( cd "$DIR" && exec nvim )
 }