diff --git a/home/programs/kitty/default.nix b/home/programs/kitty/default.nix
index 0883f7b..754cf45 100644
--- a/home/programs/kitty/default.nix
+++ b/home/programs/kitty/default.nix
@@ -1,6 +1,24 @@
-{ config, ... }: {
+{ config, pkgs, ... }: {
   xdg.configFile."kitty/kitty.conf" = {
     source = config.lib.file.mkOutOfStoreSymlink ./. + "/kitty.conf";
     target = "kitty/kitty.conf";
   };
+  xdg.configFile."kitty/themes/macchiato.conf" = {
+    source = pkgs.fetchFromGitHub
+      {
+        owner = "catppuccin";
+        repo = "kitty";
+        rev = "d7d61716a83cd135344cbb353af9d197c5d7cec1";
+        sha256 = "mRFa+40fuJCUrR1o4zMi7AlgjRtFmii4fNsQyD8hIjM=";
+      } + "/themes/macchiato.conf";
+  };
+  xdg.configFile."kitty/themes/latte.conf" = {
+    source = pkgs.fetchFromGitHub
+      {
+        owner = "catppuccin";
+        repo = "kitty";
+        rev = "d7d61716a83cd135344cbb353af9d197c5d7cec1";
+        sha256 = "mRFa+40fuJCUrR1o4zMi7AlgjRtFmii4fNsQyD8hIjM=";
+      } + "/themes/latte.conf";
+  };
 }
diff --git a/home/programs/kitty/kitty.conf b/home/programs/kitty/kitty.conf
index 4c98f06..af16136 100644
--- a/home/programs/kitty/kitty.conf
+++ b/home/programs/kitty/kitty.conf
@@ -20,73 +20,4 @@ font_size 14.0
 # Window padding
 window_padding_width 10
 
-# The basic colors
-foreground              #CDD6F4
-background              #1E1E2E
-selection_foreground    #1E1E2E
-selection_background    #F5E0DC
-
-# Cursor colors
-cursor                  #F5E0DC
-cursor_text_color       #1E1E2E
-
-# URL underline color when hovering with mouse
-url_color               #F5E0DC
-
-# Kitty window border colors
-active_border_color     #B4BEFE
-inactive_border_color   #6C7086
-bell_border_color       #F9E2AF
-
-# OS Window titlebar colors
-wayland_titlebar_color system
-macos_titlebar_color system
-
-# Tab bar colors
-active_tab_foreground   #11111B
-active_tab_background   #CBA6F7
-inactive_tab_foreground #CDD6F4
-inactive_tab_background #181825
-tab_bar_background      #11111B
-
-# Colors for marks (marked text in the terminal)
-mark1_foreground #1E1E2E
-mark1_background #B4BEFE
-mark2_foreground #1E1E2E
-mark2_background #CBA6F7
-mark3_foreground #1E1E2E
-mark3_background #74C7EC
-
-# The 16 terminal colors
-
-# black
-color0 #45475A
-color8 #585B70
-
-# red
-color1 #F38BA8
-color9 #F38BA8
-
-# green
-color2  #A6E3A1
-color10 #A6E3A1
-
-# yellow
-color3  #F9E2AF
-color11 #F9E2AF
-
-# blue
-color4  #89B4FA
-color12 #89B4FA
-
-# magenta
-color5  #F5C2E7
-color13 #F5C2E7
-
-# cyan
-color6  #94E2D5
-color14 #94E2D5
-
-# white
-color7  #BAC2DE
-color15 #A6ADC8
+include themes/macchiato.conf