diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 768bbf14434270..7979e0e59c78a0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13201,6 +13201,12 @@
     name = "Jakob Leifhelm";
     keys = [ { fingerprint = "4A82 F68D AC07 9FFD 8BF0  89C4 6817 AA02 3810 0822"; } ];
   };
+  leiserfg = {
+    email = "leiserfg@gmail.com";
+    github = "leiserfg";
+    githubId = 2947276;
+    name = "Leiser Fernández Gallo";
+  };
   leixb = {
     email = "abone9999+nixpkgs@gmail.com";
     matrix = "@leix_b:matrix.org";
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/default.nix b/pkgs/by-name/ki/kitty/package.nix
similarity index 93%
rename from pkgs/applications/terminal-emulators/kitty/default.nix
rename to pkgs/by-name/ki/kitty/package.nix
index c69d58005ecf0a..95a3144df619e1 100644
--- a/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -49,26 +49,28 @@
   nix-update-script,
   makeBinaryWrapper,
   autoSignDarwinBinariesHook,
+  cairo,
+  fetchpatch,
 }:
 
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.39.1";
+  version = "0.40.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     tag = "v${version}";
-    hash = "sha256-Cgbs9tdEGKhDShNh3M8N1UdRJu4aMylr9xLOGLpDAZE=";
+    hash = "sha256-c+u+lMuokDR8kWM0an3jFPC/qoK2RZTKqHZtfEnqtnM=";
   };
 
   goModules =
     (buildGo123Module {
       pname = "kitty-go-modules";
       inherit src version;
-      vendorHash = "sha256-j5ToLPQeaf4xIaziBAROYZNvoaOx2TkTcuY95X4Neqc=";
+      vendorHash = "sha256-gBEzW2k1HDDmg1P1t6u90Lf1lLe1IKGpF2T9iCA31qs=";
     }).goModules;
 
   buildInputs =
@@ -109,6 +111,7 @@ buildPythonApplication rec {
       wayland
       dbus
       libGL
+      cairo
     ];
 
   nativeBuildInputs =
@@ -156,6 +159,18 @@ buildPythonApplication rec {
     # Skip `test_ssh_bootstrap_with_different_launchers` when launcher is `zsh` since it causes:
     # OSError: master_fd is in error condition
     ./disable-test_ssh_bootstrap_with_different_launchers.patch
+
+    # Remove after 0.40.1
+    (fetchpatch {
+      url = "https://github.com/kovidgoyal/kitty/commit/6171ca6.patch";
+      hash = "sha256-OBB0YcgEYgw3Jcg+Dgus6rwQ4gGL6GMr6pd7m9CGq9k=";
+    })
+
+    (fetchpatch {
+      url = "https://github.com/kovidgoyal/kitty/commit/8cbdd003e2.patch";
+      hash = "sha256-pKIJIqIdPfB4kQ6FtpYDumpgjJkMxoLT8fKzfgWYJnw=";
+    })
+
   ];
 
   hardeningDisable = [
@@ -327,6 +342,7 @@ buildPythonApplication rec {
       rvolosatovs
       Luflosi
       kashw2
+      leiserfg
     ];
   };
 }
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;