diff --git a/fish/conf.d/bat.fish b/fish/conf.d/bat.fish
index 9f52ba1..d81d85f 100644
--- a/fish/conf.d/bat.fish
+++ b/fish/conf.d/bat.fish
@@ -13,5 +13,8 @@ abbr b bat
 # Highlight help messages
 abbr --position anywhere -- --help '--help | bat -plhelp'
 
+# Use bat for man pages
+set -gx MANPAGER "sh -c 'sed -u -e \"s/\\x1B\[[0-9;]*m//g; s/.\\x08//g\" | bat -p -lman'"
+
 # Make less more usable
 set -gx LESS "--ignore-case --no-histdups --color=s+y"
diff --git a/fish/conf.d/theme.fish b/fish/conf.d/theme.fish
index c1373d9..1a9f3e3 100644
--- a/fish/conf.d/theme.fish
+++ b/fish/conf.d/theme.fish
@@ -23,9 +23,6 @@ function __so_apply_theme --on-variable fish_terminal_color_theme
     # Bat and delta both use `BAT_THEME`.
     set -gx BAT_THEME "rose-pine-$theme_variant"
 
-    # Use Solarized for man pages because Rosé Pine doesn't support man page highlighting.
-    set -gx MANPAGER "sh -c 'sed -u -e \"s/\\x1B\[[0-9;]*m//g; s/.\\x08//g\" | bat -p -lman --theme \"Solarized ($appearance)\"'"
-
     # delta can detect the background color of the terminal automatically.
     #
     # But this doesn't work when Delta is embedded in other tools or when its