diff --git a/.config/bat/config b/.config/bat/config
index 20fd7154..c484861b 100644
--- a/.config/bat/config
+++ b/.config/bat/config
@@ -4,7 +4,7 @@
 
 # Specify desired highlighting theme (e.g. "TwoDark"). Run `bat --list-themes`
 # for a list of all available themes
---theme="Catppuccin-macchiato"
+--theme="Catppuccin Macchiato"
 
 # Enable this to use italic text on the terminal. This is not supported on all
 # terminal emulators (like tmux, by default):
diff --git a/.config/bat/themes/Catppuccin-macchiato.tmTheme b/.config/bat/themes/Catppuccin Macchiato.tmTheme
similarity index 97%
rename from .config/bat/themes/Catppuccin-macchiato.tmTheme
rename to .config/bat/themes/Catppuccin Macchiato.tmTheme
index 21ec5aa7..b1f70563 100644
--- a/.config/bat/themes/Catppuccin-macchiato.tmTheme
+++ b/.config/bat/themes/Catppuccin Macchiato.tmTheme	
@@ -24,13 +24,13 @@
           <key>caret</key>
           <string>#f4dbd6</string>
           <key>lineHighlight</key>
-          <string>#cad3f512</string>
+          <string>#363a4f</string>
           <key>misspelling</key>
           <string>#ed8796</string>
           <key>accent</key>
           <string>#c6a0f6</string>
           <key>selection</key>
-          <string>#5b607866</string>
+          <string>#939ab740</string>
           <key>activeGuide</key>
           <string>#494d64</string>
           <key>findHighlight</key>
@@ -1989,6 +1989,60 @@
           <string>#cad3f5</string>
         </dict>
       </dict>
+      <dict>
+        <key>scope</key>
+        <string>markup.heading.synopsis.man, markup.heading.title.man, markup.heading.other.man, markup.heading.env.man</string>
+        <key>settings</key>
+        <dict>
+          <key>foreground</key>
+          <string>#c6a0f6</string>
+        </dict>
+      </dict>
+      <dict>
+        <key>scope</key>
+        <string>markup.heading.commands.man</string>
+        <key>settings</key>
+        <dict>
+          <key>foreground</key>
+          <string>#8aadf4</string>
+        </dict>
+      </dict>
+      <dict>
+        <key>scope</key>
+        <string>markup.heading.env.man</string>
+        <key>settings</key>
+        <dict>
+          <key>foreground</key>
+          <string>#f5bde6</string>
+        </dict>
+      </dict>
+      <dict>
+        <key>scope</key>
+        <string>markup.heading.1.markdown</string>
+        <key>settings</key>
+        <dict>
+          <key>foreground</key>
+          <string>#ed8796</string>
+        </dict>
+      </dict>
+      <dict>
+        <key>scope</key>
+        <string>markup.heading.2.markdown</string>
+        <key>settings</key>
+        <dict>
+          <key>foreground</key>
+          <string>#f5a97f</string>
+        </dict>
+      </dict>
+      <dict>
+        <key>scope</key>
+        <string>markup.heading.markdown</string>
+        <key>settings</key>
+        <dict>
+          <key>foreground</key>
+          <string>#eed49f</string>
+        </dict>
+      </dict>
     </array>
   </dict>
 </plist>
\ No newline at end of file
diff --git a/.config/fish/user_variables.fish b/.config/fish/user_variables.fish
index d204caba..25abcab1 100644
--- a/.config/fish/user_variables.fish
+++ b/.config/fish/user_variables.fish
@@ -82,5 +82,4 @@ set -xg _ZO_FZF_OPTS $FZF_DEFAULT_OPTS '--preview "{$fzf_preview_dir_cmd} {2}"'
 if type -q vivid
     set -xg LS_COLORS (vivid generate catppuccin-macchiato)
 end
-set -xg BAT_THEME Catppuccin-macchiato
 set -xg STARSHIP_LOG error