diff --git a/flake.lock b/flake.lock
index e318482..d348088 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,20 @@
 {
   "nodes": {
+    "catppuccin": {
+      "locked": {
+        "lastModified": 1714607657,
+        "narHash": "sha256-AnmN+JOzrpHv7Uw7JSPJ9JEjuqF7gjhx29UuuldNpas=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "b0dc7f3181063daa6532dc5f757ded1a605dfbd5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "devshell": {
       "inputs": {
         "flake-utils": "flake-utils_3",
@@ -509,6 +524,7 @@
     },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "home-manager": "home-manager",
         "hosts": "hosts",
         "ide": "ide",
diff --git a/flake.nix b/flake.nix
index f5548e8..a8c148b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,8 +17,9 @@
       url = "github:nix-community/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    catppuccin.url = "github:catppuccin/nix";
   };
-  outputs = { self, nixpkgs, home-manager, hosts, ide, nid, ... }:
+  outputs = { nixpkgs, home-manager, hosts, ide, nid, catppuccin, ... }:
     let
       system = "x86_64-linux";
       my-overlay = self: super: {
@@ -32,7 +33,7 @@
         inherit system nixpkgs pkgs ide my-overlay;
       };
       home = import ./home {
-        inherit system pkgs modules home-manager nid;
+        inherit pkgs modules home-manager nid catppuccin;
       };
       nixos = import ./nixos {
         inherit system nixpkgs modules hosts;
diff --git a/home/default.nix b/home/default.nix
index 055ee68..02a382c 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,6 +1,7 @@
-{ system, pkgs, home-manager, modules, nid, ... }:
+{ pkgs, home-manager, modules, nid, catppuccin, ... }:
 let
   ivand-programs = with modules.home.programs; [
+    bat
     bottom
     browserpass
     carapace
@@ -10,8 +11,11 @@ let
     firefox
     git
     gpg
+    imv
     kitty
     lf
+    mako
+    mpv
     nushell
     nvim
     obs-studio
@@ -33,6 +37,6 @@ in
 {
   ivand = home-manager.lib.homeManagerConfiguration {
     inherit pkgs;
-    modules = [ ./ivand nid.hmModules.nix-index ] ++ ivand-programs ++ ivand-packages;
+    modules = [ ./ivand nid.hmModules.nix-index ] ++ ivand-programs ++ ivand-packages ++ [ catppuccin.homeManagerModules.catppuccin ];
   };
 }
diff --git a/home/ivand/default.nix b/home/ivand/default.nix
index 81afc3a..d838a89 100644
--- a/home/ivand/default.nix
+++ b/home/ivand/default.nix
@@ -2,6 +2,12 @@
 
   programs.home-manager = { enable = true; };
 
+
+  gtk = {
+    enable = true;
+    catppuccin.enable = true;
+  };
+
   home = {
     username = "ivand";
     homeDirectory = "/home/ivand";
@@ -63,6 +69,7 @@
   };
 
   xdg = {
+    enable = true;
     userDirs = {
       enable = true;
       createDirectories = true;
diff --git a/modules/home/packages/dev/default.nix b/modules/home/packages/dev/default.nix
index efdd563..eeb1f0e 100644
--- a/modules/home/packages/dev/default.nix
+++ b/modules/home/packages/dev/default.nix
@@ -1,6 +1,5 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
-    bat
     openssh
     procs
     ripgrep
diff --git a/modules/home/programs/bat/default.nix b/modules/home/programs/bat/default.nix
new file mode 100644
index 0000000..e772849
--- /dev/null
+++ b/modules/home/programs/bat/default.nix
@@ -0,0 +1,6 @@
+{
+  programs.bat = {
+    enable = true;
+    catppuccin.enable = true;
+  };
+}
diff --git a/modules/home/programs/bottom/default.nix b/modules/home/programs/bottom/default.nix
index 2887531..7bdab0b 100644
--- a/modules/home/programs/bottom/default.nix
+++ b/modules/home/programs/bottom/default.nix
@@ -1,6 +1,7 @@
 {
   programs.bottom = {
     enable = true;
+    catppuccin.enable = true;
     settings = {
       flags = {
         rate = "250ms";
diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix
index 1d8925e..ee63b85 100644
--- a/modules/home/programs/default.nix
+++ b/modules/home/programs/default.nix
@@ -3,6 +3,7 @@
   nvim = import ./neovim {
     nvim = ide.nvim.${system}.homeManagerModules.nvim;
   };
+  bat = import ./bat;
   bottom = import ./bottom;
   browserpass = { programs.browserpass.enable = true; };
   carapace = import ./carapace;
@@ -12,8 +13,11 @@
   firefox = import ./firefox { inherit pkgs; };
   git = import ./git;
   gpg = import ./gpg { inherit pkgs; };
+  imv = import ./imv;
+  mako = import ./mako;
   kitty = import ./kitty { inherit pkgs; };
   lf = import ./lf;
+  mpv = import ./mpv;
   nushell = import ./nushell { inherit pkgs; };
   obs-studio = import ./obs-studio { inherit pkgs; };
   pueue = import ./pueue;
@@ -23,6 +27,6 @@
   swaylock = import ./swaylock;
   tealdeer = import ./tealdeer;
   tmux = import ./tmux { inherit pkgs; };
-  waybar = import ./waybar { inherit pkgs; };
+  waybar = import ./waybar;
   zsh = import ./zsh { inherit pkgs; };
 }
diff --git a/modules/home/programs/imv/default.nix b/modules/home/programs/imv/default.nix
new file mode 100644
index 0000000..8225e13
--- /dev/null
+++ b/modules/home/programs/imv/default.nix
@@ -0,0 +1,6 @@
+{
+  programs.imv = {
+    enable = true;
+    catppuccin.enable = true;
+  };
+}
diff --git a/modules/home/programs/kitty/default.nix b/modules/home/programs/kitty/default.nix
index 1b8bee3..78e90f8 100644
--- a/modules/home/programs/kitty/default.nix
+++ b/modules/home/programs/kitty/default.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }: {
   programs.kitty = {
     enable = true;
+    catppuccin.enable = true;
     font = {
       package = pkgs.fira-code;
       name = "FiraCodeNFM-Reg";
diff --git a/modules/home/programs/mako/default.nix b/modules/home/programs/mako/default.nix
new file mode 100644
index 0000000..e330d30
--- /dev/null
+++ b/modules/home/programs/mako/default.nix
@@ -0,0 +1,6 @@
+{
+  services.mako = {
+    enable = true;
+    catppuccin.enable = true;
+  };
+}
diff --git a/modules/home/programs/mpv/default.nix b/modules/home/programs/mpv/default.nix
new file mode 100644
index 0000000..a526ba2
--- /dev/null
+++ b/modules/home/programs/mpv/default.nix
@@ -0,0 +1,6 @@
+{
+  programs.mpv = {
+    enable = true;
+    catppuccin.enable = true;
+  };
+}
diff --git a/modules/home/programs/rofi/default.nix b/modules/home/programs/rofi/default.nix
index 1ab9efb..89b8465 100644
--- a/modules/home/programs/rofi/default.nix
+++ b/modules/home/programs/rofi/default.nix
@@ -1,12 +1,13 @@
 { pkgs, ... }: {
   programs.rofi = {
     enable = true;
+    catppuccin.enable = true;
     package = pkgs.rofi-wayland.override {
       plugins = with pkgs; [
         (
           rofi-calc.override
             {
-              rofi-unwrapped = pkgs.rofi-wayland-unwrapped;
+              rofi-unwrapped = rofi-wayland-unwrapped;
             }
         )
       ];
diff --git a/modules/home/programs/starship/default.nix b/modules/home/programs/starship/default.nix
index 6a6b942..13c9ee4 100644
--- a/modules/home/programs/starship/default.nix
+++ b/modules/home/programs/starship/default.nix
@@ -1,6 +1,7 @@
 {
   programs.starship = {
     enable = true;
+    catppuccin.enable = true;
     enableNushellIntegration = true;
     enableZshIntegration = true;
   };
diff --git a/modules/home/programs/sway/default.nix b/modules/home/programs/sway/default.nix
index f20f20c..8943976 100644
--- a/modules/home/programs/sway/default.nix
+++ b/modules/home/programs/sway/default.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }: {
   wayland.windowManager.sway = {
     enable = true;
+    catppuccin.enable = true;
     systemd.enable = true;
     config = rec {
       menu = "rofi -show run";
@@ -54,11 +55,8 @@
     audacity
     gimp
     grim
-    imv
     libnotify
     libreoffice-qt
-    mako
-    mpv
     mupdf
     pavucontrol
     scripts
diff --git a/modules/home/programs/swaylock/default.nix b/modules/home/programs/swaylock/default.nix
index d1d66eb..44a71c4 100644
--- a/modules/home/programs/swaylock/default.nix
+++ b/modules/home/programs/swaylock/default.nix
@@ -1,9 +1,8 @@
 { config, ... }: {
   programs.swaylock = {
     enable = true;
+    catppuccin.enable = true;
     settings = {
-      color = "000000";
-      line-color = "ffffff";
       show-failed-attempts = true;
       image = config.home.homeDirectory + "/pic/bg.png";
     };
diff --git a/modules/home/programs/waybar/default.nix b/modules/home/programs/waybar/default.nix
index 7072ec7..0d4a6b4 100644
--- a/modules/home/programs/waybar/default.nix
+++ b/modules/home/programs/waybar/default.nix
@@ -1,6 +1,7 @@
-{ pkgs, ... }: {
+{
   programs.waybar = {
     enable = true;
+    catppuccin.enable = true;
     settings = {
       mainBar = {
         layer = "top";