diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix
index 42a9518..6a0d009 100755
--- a/roles/common/configuration.nix
+++ b/roles/common/configuration.nix
@@ -64,6 +64,21 @@
 	# Set up time zone.
 	time.timeZone = "Europe/Madrid";
 
+	nixpkgs.overlays = [
+		(
+			final: prev: {
+				catppuccin = prev.catppuccin.override {
+					accent = "mauve";
+					variant = "mocha";
+					themeList = [
+						"bat"
+						"btop"
+					];
+				};
+			}
+		)
+	];
+
 	home-manager = {
 		backupFileExtension = "hm-backup";
 		useGlobalPkgs = true;
diff --git a/roles/common/programs/bat.nix b/roles/common/programs/bat.nix
index 2075753..2a8224d 100644
--- a/roles/common/programs/bat.nix
+++ b/roles/common/programs/bat.nix
@@ -9,13 +9,8 @@
 			};
 			themes = {
 				catppuccin-mocha = {
-					src = pkgs.fetchFromGitHub {
-						owner = "catppuccin";
-						repo = "bat";
-						rev = "master";
-						hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
-					};
-					file = "Catppuccin-mocha.tmTheme";
+					src = pkgs.catppuccin;
+					file = "bat/Catppuccin-mocha.tmTheme";
 				};
 			};
 		};
diff --git a/roles/common/programs/btop.nix b/roles/common/programs/btop.nix
index 291d05e..5150cbf 100644
--- a/roles/common/programs/btop.nix
+++ b/roles/common/programs/btop.nix
@@ -1,15 +1,5 @@
 { pkgs, ... }:
-let
-  catppuccinBtop = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "btop";
-    # I know fetiching from master is not best practice but idc this is not going to change often
-    # Latest commit rn is c6469190f2ecf25f017d6120bf4e050e6b1d17af
-    rev = "master";
-    hash = "sha256-jodJl4f2T9ViNqsY9fk8IV62CrpC5hy7WK3aRpu70Cs=";
-};
 
-in
 {
   home-manager = {
     users.toast = {
@@ -20,7 +10,7 @@ in
         };
       };
       xdg.configFile = {
-        "btop/themes".source = "${catppuccinBtop}/themes";
+        "btop/themes".source = "${pkgs.catppuccin}/btop";
       };
     };
   };