diff --git a/modules/home/programs/kitty/default.nix b/modules/home/programs/kitty/default.nix
index c3cd25b..455b6c6 100644
--- a/modules/home/programs/kitty/default.nix
+++ b/modules/home/programs/kitty/default.nix
@@ -16,7 +16,11 @@ in {
   config = mkIf cfg.enable {
     programs.kitty = {
       enable = true;
-      catppuccin.enable = true;
+      # Set theme with `extraConfig` instead of `theme` to avoid IFD.
+      # See here: https://github.com/nix-community/home-manager/issues/5110
+      extraConfig = ''
+        include ${pkgs.kitty-themes}/share/kitty-themes/themes/Catppuccin-Mocha.conf
+      '';
       font = {
         size = 12;
         package = pkgs.nerdfonts.override {fonts = ["Hack"];};
diff --git a/modules/home/programs/waybar/default.nix b/modules/home/programs/waybar/default.nix
index 43c3495..25fc523 100644
--- a/modules/home/programs/waybar/default.nix
+++ b/modules/home/programs/waybar/default.nix
@@ -20,13 +20,13 @@ in {
   };
 
   config = mkIf cfg.enable {
+    xdg.configFile."waybar/catppuccin.css".source = "${pkgs.aa.catppuccin-waybar}/catppuccin.css";
+
     programs.waybar = {
       enable = true;
       systemd.enable = true;
 
-      style =
-        builtins.readFile "${pkgs.aa.catppuccin-waybar}/catppuccin.css"
-        + builtins.readFile ./waybar_style.css;
+      style = builtins.readFile ./waybar_style.css;
 
       settings = [
         {
diff --git a/modules/home/programs/waybar/waybar_style.css b/modules/home/programs/waybar/waybar_style.css
index 92054da..9671fac 100644
--- a/modules/home/programs/waybar/waybar_style.css
+++ b/modules/home/programs/waybar/waybar_style.css
@@ -1,3 +1,5 @@
+@import "./catppuccin.css";
+
 * {
     border: none;
     font-family: Hack Nerd Font, sans-serif;
diff --git a/modules/home/services/swaync/default.nix b/modules/home/services/swaync/default.nix
index 780d2ae..205ef5d 100644
--- a/modules/home/services/swaync/default.nix
+++ b/modules/home/services/swaync/default.nix
@@ -21,7 +21,7 @@ in {
       settings = {
         widgets = ["title" "dnd" "notifications" "mpris"];
       };
-      style = builtins.readFile "${pkgs.aa.catppuccin-swaync}/catppuccin.css";
+      style = "${pkgs.aa.catppuccin-swaync}/catppuccin.css";
     };
   };
 }