diff --git a/pkgs/applications/terminal-emulators/kitty/themes.nix b/pkgs/by-name/ki/kitty-themes/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/kitty/themes.nix
rename to pkgs/by-name/ki/kitty-themes/package.nix
diff --git a/pkgs/applications/terminal-emulators/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch b/pkgs/by-name/ki/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch
similarity index 100%
rename from pkgs/applications/terminal-emulators/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch
rename to pkgs/by-name/ki/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch
diff --git a/pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch b/pkgs/by-name/ki/kitty/fix-test_ssh_env_vars.patch
similarity index 100%
rename from pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch
rename to pkgs/by-name/ki/kitty/fix-test_ssh_env_vars.patch
diff --git a/pkgs/applications/terminal-emulators/kitty/fix_setup.patch b/pkgs/by-name/ki/kitty/fix_setup.patch
similarity index 100%
rename from pkgs/applications/terminal-emulators/kitty/fix_setup.patch
rename to pkgs/by-name/ki/kitty/fix_setup.patch
diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/by-name/ki/kitty/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/kitty/default.nix
rename to pkgs/by-name/ki/kitty/package.nix
diff --git a/pkgs/applications/terminal-emulators/kitty/zsh-compinit.patch b/pkgs/by-name/ki/kitty/zsh-compinit.patch
similarity index 100%
rename from pkgs/applications/terminal-emulators/kitty/zsh-compinit.patch
rename to pkgs/by-name/ki/kitty/zsh-compinit.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8588c147b93674..75fbcd25b499a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1516,7 +1516,7 @@ with pkgs;
 
   cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
 
-  kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty {
+  kitty = darwin.apple_sdk_11_0.callPackage ../by-name/ki/kitty/package.nix {
     harfbuzz = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; };
     inherit (darwin) autoSignDarwinBinariesHook;
     inherit (darwin.apple_sdk_11_0) Libsystem;
@@ -1528,8 +1528,6 @@ with pkgs;
     ;
   };
 
-  kitty-themes  = callPackage ../applications/terminal-emulators/kitty/themes.nix { };
-
   mlterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/mlterm { };
   mlterm-wayland = mlterm.override {
     enableX11 = false;