diff --git a/common/.config/kitty/get_layout.py b/common/.config/kitty/get_layout.py
deleted file mode 100755
index d02c103..0000000
--- a/common/.config/kitty/get_layout.py
+++ /dev/null
@@ -1,9 +0,0 @@
-def main():
-    pass
-
-
-def handle_result(args, result, target_window_id, boss):
-    return boss.active_tab.current_layout.name 
-
-
-handle_result.no_ui = True
diff --git a/common/.config/kitty/kitty.conf b/common/.config/kitty/kitty.conf
index 0071702..6bc848e 100644
--- a/common/.config/kitty/kitty.conf
+++ b/common/.config/kitty/kitty.conf
@@ -265,7 +265,7 @@ disable_ligatures never
 ###########################################################
 
 # "Nerd Fonts - Pomicons"
-symbol_map  U+E000-U+E00D Symbols Nerd Font
+symbol_map U+E000-U+E00D Symbols Nerd Font
 
 # "Nerd Fonts - Powerline"
 symbol_map U+e0a0-U+e0a2,U+e0b0-U+e0b3 Symbols Nerd Font
@@ -1029,10 +1029,14 @@ window_border_width 0.2pt
 
 # New splits open in the same directory as the current window
 map kitty_mod+enter new_window_with_cwd
-map kitty_mod+0 new_window_with_cwd
-map shift+F2 toggle_layout stack # Zoom the current window
+map kitty_mod+up resize_window taller
+map kitty_mod+down resize_window shorter
+map kitty_mod+right resize_window wider
+map kitty_mod+left resize_window narrower
+map kitty_mod+0 resize_window reset
 
 enabled_layouts fat:bias=75;full_size=1,stack,tall:bias=50;full_size=2
+map kitty_mod+z toggle_layout stack
 map F11 toggle_layout stack
 
 # Sync split navigation with VIM: https://github.com/knubie/vim-kitty-navigator
@@ -1040,10 +1044,6 @@ map kitty_mod+j kitten pass_keys.py bottom ctrl+shift+j
 map kitty_mod+k kitten pass_keys.py top    ctrl+shift+k
 map kitty_mod+h kitten pass_keys.py left   ctrl+shift+h
 map kitty_mod+l kitten pass_keys.py right  ctrl+shift+l
-map kitty_mod+j kitten pass_keys.py bottom ctrl+shift+j "^.* - nvim$"
-map kitty_mod+k kitten pass_keys.py top    ctrl+shift+k "^.* - nvim$"
-map kitty_mod+h kitten pass_keys.py left   ctrl+shift+h "^.* - nvim$"
-map kitty_mod+l kitten pass_keys.py right  ctrl+shift+l "^.* - nvim$"
 
 # Redundant, they are used for scrollback.nvim as well
 # But, this would work even if we uninstall scrollback.nvim
@@ -1213,7 +1213,26 @@ allow_remote_control yes
 
 #: }}}
 
-tab_title_template "{fmt.fg.red}{bell_symbol}{activity_symbol}{fmt.fg.tab}{title[title.rfind('/')+1:]} : {tab.active_exe}{sup.index}"
+tab_bar_style powerline
+tab_powerline_style slanted
+
+tab_title_template "{index}. {title[title.rfind('/')+1:]} : {tab.active_exe}"
+bell_on_tab "🔔"
+
+# Go to specific tab by number
+map ctrl+1 goto_tab 1
+map ctrl+2 goto_tab 2
+map ctrl+3 goto_tab 3
+map ctrl+4 goto_tab 4
+map ctrl+5 goto_tab 5
+map ctrl+6 goto_tab 6
+map ctrl+7 goto_tab 7
+map ctrl+8 goto_tab 8
+map ctrl+9 goto_tab 9
+map kitty_mod+] next_tab
+map kitty_mod+[ previous_tab
+map kitty_mod+left move_tab_backward
+map kitty_mod+right move_tab_forward
 
 #: Color scheme {{{
 
@@ -2565,7 +2584,8 @@ map kitty_mod+n nth_window +1
 
 # These are needed for NeoVim
 map ctrl+shift+f send_text all \x1b[70;5u
-map ctrl+shift+p send_text all \x1b[80;5u
+
+map ctrl+alt+, load_config_file
 
 # BEGIN_KITTY_THEME
 # Catppuccin-Mocha