diff --git a/home/terminal/kitty/default.nix b/home/terminal/kitty/default.nix
index 7b07b49..3e5ecb6 100644
--- a/home/terminal/kitty/default.nix
+++ b/home/terminal/kitty/default.nix
@@ -3,23 +3,93 @@
   pkgs,
   ...
 }: let
-  catppuccin-kitty = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "kitty";
-    rev = "b14e8385c827f2d41660b71c7fec1e92bdcf2676";
-    sha256 = "sha256-59ON7CzVgfZUo7F81qQZQ1r6kpcjR3OPvTl99gzDP8E=";
-  };
+  colors = pkgs.catppuccin.hex.${config.catppuccin.flavor};
+  accent = colors.${config.catppuccin.accent};
 
-  mergedConfig = pkgs.runCommand "mergedConfig" {} ''
-    mkdir -p $out
-    ${pkgs.gnused}/bin/sed 's/#cba6f7/${
-      pkgs.catppuccin.${config.catppuccin.flavor}.${config.catppuccin.accent}
-    }/g' ${catppuccin-kitty}/themes/${config.catppuccin.flavor}.conf > \
-    $out/${config.catppuccinUpper.flavor}${config.catppuccinUpper.accent}.conf
+  # Map Catppuccin colors to Kitty theme structure
+  kitty-colors = ''
+    # vim:ft=kitty
+    ## name:     Kova's Nixified Kitty
+    ## author:   Catppuccin Org & sckova
+    ## license:  MIT
+    ## upstream: https://github.com/catppuccin/kitty
+    ## blurb:    The theme generated from the NixOS configuration!
+
+    # The basic colors
+    foreground              ${colors.text}
+    background              ${colors.base}
+    selection_foreground    ${colors.base}
+    selection_background    ${colors.rosewater}
+
+    # Cursor colors
+    cursor                  ${colors.rosewater}
+    cursor_text_color       ${colors.base}
+
+    # URL underline color when hovering with mouse
+    url_color               ${colors.rosewater}
+
+    # Kitty window border colors
+    active_border_color     ${accent}
+    inactive_border_color   ${colors.overlay0}
+    bell_border_color       ${colors.yellow}
+
+    # Tab bar colors
+    active_tab_foreground   ${colors.crust}
+    active_tab_background   ${accent}
+    inactive_tab_foreground ${colors.text}
+    inactive_tab_background ${colors.mantle}
+    tab_bar_background      ${colors.crust}
+
+    # Colors for marks (marked text in the terminal)
+    mark1_foreground ${colors.base}
+    mark1_background ${accent}
+    mark2_foreground ${colors.base}
+    mark2_background ${colors.blue}
+    mark3_foreground ${colors.base}
+    mark3_background ${colors.sky}
+
+    # The 16 terminal colors
+    # black
+    color0 ${colors.surface1}
+    color8 ${colors.surface2}
+
+    # red
+    color1 ${colors.red}
+    color9 ${colors.red}
+
+    # green
+    color2  ${colors.green}
+    color10 ${colors.green}
+
+    # yellow
+    color3  ${colors.yellow}
+    color11 ${colors.yellow}
+
+    # blue
+    color4  ${colors.blue}
+    color12 ${colors.blue}
+
+    # magenta
+    color5  ${colors.pink}
+    color13 ${colors.pink}
+
+    # cyan
+    color6  ${colors.teal}
+    color14 ${colors.teal}
+
+    # white
+    color7  ${colors.subtext1}
+    color15 ${colors.subtext0}
   '';
+
+  kitty-colors-file = pkgs.writeTextFile {
+    name = "kitty-colors";
+    text = kitty-colors;
+    destination = "/kitty-colors.conf";
+  };
 in {
   home.file.".config/kitty/themes" = {
-    source = mergedConfig;
+    source = kitty-colors-file;
     recursive = true;
   };
 
@@ -37,8 +107,11 @@ in {
       size = config.userOptions.fontMono.size;
     };
     shellIntegration.enableFishIntegration = true;
+    keybindings = {
+      "ctrl+k" = ''combine : clear_terminal scroll active : clear_terminal scrollback active'';
+    };
     settings = {
-      include = "/home/${config.userOptions.username}/.config/kitty/themes/${config.catppuccinUpper.flavor}${config.catppuccinUpper.accent}.conf";
+      include = "/home/${config.userOptions.username}/.config/kitty/themes/kitty-colors.conf";
       scrollback_lines = 10000;
       enable_audio_bell = false;
       update_check_interval = 0;
@@ -50,6 +123,8 @@ in {
       tab_bar_style = "powerline";
       tab_powerline_style = "slanted";
       mouse_hide_wait = "-1.0";
+      wayland_titlebar_color = "system";
+      macos_titlebar_color = "system";
     };
   };
 }