diff --git a/data/bat/config b/data/bat/config
index 181838f..d441e99 100644
--- a/data/bat/config
+++ b/data/bat/config
@@ -1 +1,2 @@
+--theme="Catppuccin-mocha"
 --style=plain
diff --git a/data/data.toml b/data/data.toml
index 54787f7..f31327c 100644
--- a/data/data.toml
+++ b/data/data.toml
@@ -42,6 +42,10 @@ external = "~/.config/wezterm"
 internal = "data/bat"
 external = "~/.config/bat"
 
+[[apps.bat.paths]]
+internal = "data/bat/themes/Catppuccin-mocha.tmTheme"
+url = "https://raw.githubusercontent.com/catppuccin/bat/main/Catppuccin-mocha.tmTheme"
+
 [[apps.fd.paths]]
 internal = "data/fd/.ignore"
 external = "~/.ignore"
diff --git a/data/nvim/init.lua b/data/nvim/init.lua
index 30dec8e..968dc4b 100644
--- a/data/nvim/init.lua
+++ b/data/nvim/init.lua
@@ -76,37 +76,13 @@ require("lazy").setup({
 	{
 		"catppuccin/nvim",
 		name = "catppuccin",
-		lazy = false,
 		priority = 1000,
 		config = function()
 			require("catppuccin").setup({
-				integrations = {
-					mini = true,
-				},
+				flavour = "mocha",
 			})
-		end,
-	},
 
-	-- https://github.com/f-person/auto-dark-mode.nvim
-	{
-		"f-person/auto-dark-mode.nvim",
-		config = function()
-			require("auto-dark-mode").setup({
-				update_interval = 1000,
-				set_dark_mode = function()
-					vim.api.nvim_set_option("background", "dark")
-					vim.cmd("colorscheme catppuccin-mocha")
-				end,
-				set_light_mode = function()
-					if vim.env.TERM_PROGRAM == "WezTerm" then
-						vim.api.nvim_set_option("background", "light")
-						vim.cmd("colorscheme catppuccin-latte")
-					else
-						vim.api.nvim_set_option("background", "dark")
-						vim.cmd("colorscheme catppuccin-mocha")
-					end
-				end,
-			})
+			vim.cmd("colorscheme catppuccin")
 		end,
 	},
 
diff --git a/data/wezterm/wezterm.lua b/data/wezterm/wezterm.lua
index 58570b1..6532e21 100644
--- a/data/wezterm/wezterm.lua
+++ b/data/wezterm/wezterm.lua
@@ -1,22 +1,6 @@
 local wezterm = require("wezterm")
 local act = wezterm.action
 
-local function get_appearance()
-	if wezterm.gui then
-		return wezterm.gui.get_appearance()
-	end
-
-	return "Dark"
-end
-
-local function scheme_for_appearance(appearance)
-	if appearance:find("Dark") then
-		return "Catppuccin Mocha"
-	else
-		return "Catppuccin Latte"
-	end
-end
-
 return {
 	font = wezterm.font({
 		family = "SF Mono",
@@ -25,7 +9,7 @@ return {
 	line_height = 1.2,
 	use_cap_height_to_scale_fallback_fonts = true,
 
-	color_scheme = scheme_for_appearance(get_appearance()),
+	color_scheme = "Catppuccin Mocha",
 
 	keys = {
 		{
diff --git a/data/zsh/bottom-zshrc b/data/zsh/bottom-zshrc
index 8bdf61b..1d7ec7c 100644
--- a/data/zsh/bottom-zshrc
+++ b/data/zsh/bottom-zshrc
@@ -18,7 +18,7 @@ export PATH=$PATH:$GOPATH/bin
 # export GOPRIVATE=example.company.com
 
 # fzf
-# https://github.com/junegunn/fzf#environment-variables
+# https://github.com/junegunn/fzf
 if command -v fzf &>/dev/null; then
     if command -v fd &>/dev/null; then
         export FZF_DEFAULT_COMMAND="fd --type file"
@@ -26,25 +26,10 @@ if command -v fzf &>/dev/null; then
         export FZF_ALT_C_COMMAND="fd --type directory"
     fi
 
-    # https://github.com/catppuccin/fzf
-    if [[ $(uname) == "Darwin" ]] && [[ ${TERM_PROGRAM} == "WezTerm" ]]; then
-        if defaults read -globalDomain AppleInterfaceStyle &>/dev/null; then
-            export FZF_DEFAULT_OPTS=" \
-            --color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 \
-            --color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc \
-            --color=marker:#f5e0dc,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8"
-        else
-            export FZF_DEFAULT_OPTS=" \
-            --color=bg+:#ccd0da,bg:#eff1f5,spinner:#dc8a78,hl:#d20f39 \
-            --color=fg:#4c4f69,header:#d20f39,info:#8839ef,pointer:#dc8a78 \
-            --color=marker:#dc8a78,fg+:#4c4f69,prompt:#8839ef,hl+:#d20f39"
-        fi
-    else
-        export FZF_DEFAULT_OPTS=" \
+    export FZF_DEFAULT_OPTS=" \
         --color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 \
         --color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc \
         --color=marker:#f5e0dc,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8"
-    fi
 fi
 
 # Alias
@@ -64,15 +49,7 @@ fi
 
 # https://github.com/sharkdp/vivid
 if command -v vivid &>/dev/null; then
-    if [[ $(uname) == "Darwin" ]] && [[ ${TERM_PROGRAM} == "WezTerm" ]]; then
-        if defaults read -globalDomain AppleInterfaceStyle &>/dev/null; then
-            export LS_COLORS="$(vivid generate catppuccin-mocha)"
-        else
-            export LS_COLORS="$(vivid generate catppuccin-latte)"
-        fi
-    else
-        export LS_COLORS="$(vivid generate catppuccin-mocha)"
-    fi
+    export LS_COLORS="$(vivid generate catppuccin-mocha)"
 fi
 
 # https://github.com/jarun/nnn