diff --git a/modules/home/desktop/theme/default.nix b/modules/home/desktop/theme/default.nix
index 35e304d88..442872ee2 100644
--- a/modules/home/desktop/theme/default.nix
+++ b/modules/home/desktop/theme/default.nix
@@ -69,6 +69,22 @@ in
   };
 
   config = mkIf cfg.enable {
+    #bat 
+    programs.bat = {
+      config.theme = "${cfg.selectedTheme.name}-${cfg.selectedTheme.variant}";
+
+      themes = {
+        "${cfg.selectedTheme.name}-${cfg.selectedTheme.variant}" = {
+          src = cfg.package;
+          file = "/bat/Catppuccin-${cfg.selectedTheme.variant}.tmTheme";
+        };
+      };
+    };
+
+    programs.git.delta.options = {
+      syntax-theme = mkIf config.khanelinix.tools.bat.enable "${cfg.selectedTheme.name}-${cfg.selectedTheme.variant}";
+    };
+
     #bottom
     programs.bottom.settings = builtins.fromTOML (builtins.readFile (cfg.package + "/bottom/${cfg.selectedTheme.variant}.toml"));
 
diff --git a/modules/home/tools/bat/default.nix b/modules/home/tools/bat/default.nix
index 9d5a423ce..c7ec6095d 100644
--- a/modules/home/tools/bat/default.nix
+++ b/modules/home/tools/bat/default.nix
@@ -20,7 +20,6 @@ in
       enable = true;
 
       config = {
-        theme = "catppuccin-macchiato";
         style = "auto,header-filesize";
       };
 
@@ -32,13 +31,6 @@ in
         batwatch
         prettybat
       ];
-
-      themes = {
-        catppuccin-macchiato = {
-          src = pkgs.catppuccin;
-          file = "/bat/Catppuccin-macchiato.tmTheme";
-        };
-      };
     };
 
     home.shellAliases = {
diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix
index 884681eab..6bebb8146 100644
--- a/modules/home/tools/git/default.nix
+++ b/modules/home/tools/git/default.nix
@@ -35,10 +35,6 @@ in
 
         delta = {
           enable = true;
-
-          options = {
-            syntax-theme = mkIf config.khanelinix.tools.bat.enable "catppuccin-macchiato";
-          };
         };
 
         extraConfig = {