diff --git a/dotfiles/hypr/hyprland.conf b/dotfiles/hypr/hyprland.conf
index e5cba71..79c051f 100644
--- a/dotfiles/hypr/hyprland.conf
+++ b/dotfiles/hypr/hyprland.conf
@@ -25,7 +25,7 @@ monitor=,preferred,auto,auto
 # See https://wiki.hyprland.org/Configuring/Keywords/
 
 # Set programs that you use
-$terminal = ghostty
+$terminal = kitty
 $fileManager = dolphin
 $menu = wofi --show drun
 
diff --git a/home/shahab/common/core/default.nix b/home/shahab/common/core/default.nix
index ea98a83..8cd96cb 100644
--- a/home/shahab/common/core/default.nix
+++ b/home/shahab/common/core/default.nix
@@ -2,7 +2,7 @@
   imports = lib.flatten [
     (map lib.custom.relativeToRoot [ "modules/common" "modules/home-manager" ])
 
-    ./ghostty.nix
+    ./kitty.nix
     ./direnv.nix
     ./git.nix
     ./fonts.nix
@@ -21,33 +21,33 @@
       VISUAL = "nvim";
       EDITOR = "nvim";
     };
-  };
 
-  home.packages = with pkgs; [
-    nh
-    btop
-    eza
-    ripgrep
-    rm-improved
-    dust
-    zoxide
-    xcp
-    unzip
-    tmux
-    gcc
-    zig
-    gparted
-    gnupg
-    dig
-    bash
-    kdePackages.dolphin
-    font-awesome
-    tree
-    wl-clipboard-rs
-    brightnessctl
-    age
-    nerd-fonts.jetbrains-mono
-  ];
+    packages = with pkgs; [
+      nh
+      btop
+      eza
+      ripgrep
+      rm-improved
+      dust
+      zoxide
+      xcp
+      unzip
+      tmux
+      gcc
+      zig
+      gparted
+      gnupg
+      dig
+      bash
+      kdePackages.dolphin
+      font-awesome
+      tree
+      wl-clipboard-rs
+      brightnessctl
+      age
+      nerd-fonts.jetbrains-mono
+    ];
+  };
 
   nix = {
     package = lib.mkDefault pkgs.nix;
diff --git a/home/shahab/common/core/kitty.nix b/home/shahab/common/core/kitty.nix
new file mode 100644
index 0000000..f79463a
--- /dev/null
+++ b/home/shahab/common/core/kitty.nix
@@ -0,0 +1,19 @@
+{
+  config,
+  ...
+}:
+
+{
+  programs.kitty = {
+    enable = true;
+
+    shellIntegration.enableZshIntegration = true;
+    settings = {
+      font = config.hostSpec.font;
+      shell = "tmux";
+      font-size = 16.0;
+      active_border_color = "#44ffff";
+      single_window_margin_width = 0;
+    };
+  };
+}