diff --git a/flake.lock b/flake.lock
index 6fd741d..3c79fa3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -4,14 +4,14 @@
       "locked": {
         "lastModified": 1713323853,
         "narHash": "sha256-EfUm65RRsoch0tpfHZtEyqo+iWIYhuSX39U/fi0/4WU=",
-        "owner": "zackartz",
-        "repo": "nix-catppuccin",
+        "owner": "catppuccin",
+        "repo": "nix",
         "rev": "372decb578f3187d7aad837885ed98e73e8abd60",
         "type": "github"
       },
       "original": {
-        "owner": "zackartz",
-        "repo": "nix-catppuccin",
+        "owner": "catppuccin",
+        "repo": "nix",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 592a6ab..4117a55 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,7 +18,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    catppuccin.url = "github:zackartz/nix-catppuccin";
+    catppuccin.url = "github:catppuccin/nix";
 
     hyprland = {
       url = "github:hyprwm/Hyprland/";
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index fc97c9a..f885fe6 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -147,26 +147,28 @@
     EDITOR = "nvim";
   };
 
+  xdg.enable = true;
+
   programs.zoxide = {
     enable = true;
     enableZshIntegration = true;
     options = ["--cmd cd"];
   };
 
-  # programs.btop = {
-  #   enable = true;
-  #   catppuccin.enable = true;
-  # };
-  #
-  # programs.lazygit = {
-  #   enable = true;
-  #   catppuccin.enable = true;
-  # };
-  #
-  # programs.fzf = {
-  #   enable = true;
-  #   catppuccin.enable = true;
-  # };
+  programs.btop = {
+    enable = true;
+    catppuccin.enable = true;
+  };
+
+  programs.lazygit = {
+    enable = true;
+    catppuccin.enable = true;
+  };
+
+  programs.fzf = {
+    enable = true;
+    catppuccin.enable = true;
+  };
 
   systemd.user.services.kb-gui = {
     Unit = {
diff --git a/modules/shell/tmux.nix b/modules/shell/tmux.nix
index 7f7e000..b35b895 100644
--- a/modules/shell/tmux.nix
+++ b/modules/shell/tmux.nix
@@ -29,6 +29,8 @@ in {
       set-option -sa terminal-overrides ",xterm*:Tc"
       set -g mouse on
 
+      set -g @catppuccin-flavor 'macchiato'
+
       set -g base-index 1
       set -g pane-base-index 1
       set-window-option -g pane-base-index 1