diff --git a/modules/gui/kitty.nix b/modules/gui/kitty.nix
index e54a136..0791e6e 100644
--- a/modules/gui/kitty.nix
+++ b/modules/gui/kitty.nix
@@ -2,26 +2,21 @@
   programs.kitty = {
     enable = true;
     settings = {
+      font_size = 12;
+      cursor_shape = "beam";
       hide_window_decorations = "yes";
 
       enable_audio_bell = false;
       cursor_blink_interval = 0;
       confirm_os_window_close = 0;
       disable_ligatures = "always";
-      #placement_strategy bottom-center
-
-      tab_bar_min_tabs = 3;
-      tab_bar_style = "separator";
-      tab_bar_edge = "top";
-      dynamic_background_opacity = true;
+      placement_strategy = "bottom";
     };
     # Use ghostty one instead
     shellIntegration.enableZshIntegration = false;
 
     extraConfig = ''
-      font_size 12
       clear_all_shortcuts yes
-      kitty_mod alt
       map ctrl+shift+c copy_to_clipboard
       map ctrl+shift+v paste_from_clipboard
 
@@ -29,25 +24,11 @@
       map ctrl+plus change_font_size current +1.0
       map ctrl+minus change_font_size current -1.0
       map ctrl+backspace change_font_size current 0
-
-      map kitty_mod+e scroll_line_up
-      map kitty_mod+y scroll_line_down
-
-      map kitty_mod+o scroll_to_prompt -1
-      map kitty_mod+i scroll_to_prompt 1
-      map kitty_mod+space show_last_command_output
-
-      cursor_shape beam
-      include light.conf
-      include theme.conf
     '';
   };
 
-  xdg.configFile."kitty/light.conf".source = "${pkgs.kitty-themes}/share/kitty-themes/themes/Catppuccin-Latte.conf";
-  xdg.configFile."kitty/dark.conf".source = "${pkgs.kitty-themes}/share/kitty-themes/themes/Catppuccin-Mocha.conf";
-
-  # programs.zsh.shellAliases = {
-  #   ssh = "kitty +kitten ssh";
-  # };
+  xdg.configFile."kitty/light-theme.auto.conf".source = "${pkgs.kitty-themes}/share/kitty-themes/themes/Catppuccin-Latte.conf";
+  xdg.configFile."kitty/dark-theme.auto.conf".source = "${pkgs.kitty-themes}/share/kitty-themes/themes/Catppuccin-Mocha.conf";
+  xdg.configFile."kitty/no-preference-theme.auto.conf".source = "${pkgs.kitty-themes}/share/kitty-themes/themes/Catppuccin-Mocha.conf";
 }
 
diff --git a/modules/wm/home.nix b/modules/wm/home.nix
index 695f804..8d69ebe 100644
--- a/modules/wm/home.nix
+++ b/modules/wm/home.nix
@@ -29,10 +29,6 @@ in {
           then ""
           else "-dark";
       in "${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3${suffix}";
-      kit = ''
-        ${pkgs.coreutils}/bin/ln -sf $XDG_CONFIG_HOME/kitty/${theme}.conf $XDG_CONFIG_HOME/kitty/theme.conf
-        ${pkgs.procps}/bin/pkill -USR1 kitty
-      '';
     };
   in {
     enable = true;