diff --git a/modules/bat/hm.nix b/modules/bat/hm.nix
index 94e554ad..208cc924 100644
--- a/modules/bat/hm.nix
+++ b/modules/bat/hm.nix
@@ -5,12 +5,15 @@
     config.lib.stylix.mkEnableTarget "Bat" config.programs.bat.enable;
 
   config = lib.mkIf config.stylix.targets.bat.enable {
-    # This theme is reused for yazi. Changes to the template 
-    # will need to be applied to modules/yazi/hm.nix
-    programs.bat.themes."base16-stylix".src = config.lib.stylix.colors {
-      template = ./base16-stylix.mustache;
-      extension = ".tmTheme";
+    programs.bat = {
+      # This theme is reused for yazi. Changes to the template 
+      # will need to be applied to modules/yazi/hm.nix
+      themes."base16-stylix".src = config.lib.stylix.colors {
+        template = ./base16-stylix.mustache;
+        extension = ".tmTheme";
+      };
+
+      config.theme = "base16-stylix";
     };
-    home.sessionVariables.BAT_THEME = "base16-stylix";
   };
 }