diff --git a/common/.config/fish/config.fish b/common/.config/fish/config.fish
index ae8e357..745ceda 100644
--- a/common/.config/fish/config.fish
+++ b/common/.config/fish/config.fish
@@ -16,6 +16,8 @@ set fish_cursor_insert line
 set fish_cursor_replace_one underscore
 set fish_cursor_visual block
 
+set fish_term24bit 1
+
 if test -e ~/.config/fish/config-private.fish
     source ~/.config/fish/config-private.fish
 end
diff --git a/common/.config/fish/fish_variables b/common/.config/fish/fish_variables
index fbaad65..32a1030 100644
--- a/common/.config/fish/fish_variables
+++ b/common/.config/fish/fish_variables
@@ -5,15 +5,15 @@ SETUVAR __fish_initialized:3400
 SETUVAR _tide_left_items:pwd\x1egit\x1enewline\x1echaracter
 SETUVAR _tide_prompt_91028:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b34m\x1b\x5b44m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b34m\ue0b0\x1e\x1b\x5b92m\u276f\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b33m\ue0b2\x1b\x5b30m\x1b\x5b43m\x2012s\x20\x1b\x5b32m\x1b\x5b43m\x1b\x5b30m\x1b\x5b42m\x20\u2b22\x2018\x2e13\x2e0\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b32m
 SETUVAR _tide_right_items:status\x1ecmd_duration\x1econtext\x1ejobs\x1enode\x1evirtual_env\x1erustc\x1ejava\x1ephp\x1ego
-SETUVAR fish_color_autosuggestion:4c566a
-SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:81a1c1
-SETUVAR fish_color_comment:434c5e
-SETUVAR fish_color_cwd:green
-SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:88c0d0
-SETUVAR fish_color_error:ebcb8b
-SETUVAR fish_color_escape:00a6b2
+SETUVAR fish_color_autosuggestion:738091
+SETUVAR fish_color_cancel:9d79d6
+SETUVAR fish_color_command:63cdcf
+SETUVAR fish_color_comment:738091
+SETUVAR fish_color_cwd:81b29a
+SETUVAR fish_color_cwd_root:f4a261
+SETUVAR fish_color_end:f4a261
+SETUVAR fish_color_error:c94f6d
+SETUVAR fish_color_escape:d67ad2
 SETUVAR fish_color_hg_added:green
 SETUVAR fish_color_hg_clean:green
 SETUVAR fish_color_hg_copied:magenta
@@ -24,32 +24,32 @@ SETUVAR fish_color_hg_renamed:magenta
 SETUVAR fish_color_hg_unmerged:red
 SETUVAR fish_color_hg_untracked:yellow
 SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_keyword:81a1c1
-SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:00a6b2
-SETUVAR fish_color_option:eceff4
-SETUVAR fish_color_param:eceff4
-SETUVAR fish_color_quote:a3be8c
-SETUVAR fish_color_redirection:b48ead
-SETUVAR fish_color_search_match:bryellow\x20\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_selection:white\x20\x2d\x2dbold\x20\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_status:red
-SETUVAR fish_color_user:brgreen
-SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_color_host:719cd6
+SETUVAR fish_color_host_remote:f4a261
+SETUVAR fish_color_keyword:9d79d6
+SETUVAR fish_color_match:dbc074
+SETUVAR fish_color_normal:cdcecf
+SETUVAR fish_color_operator:81b29a
+SETUVAR fish_color_option:dfdfe0
+SETUVAR fish_color_param:71839b
+SETUVAR fish_color_quote:dbc074
+SETUVAR fish_color_redirection:cdcecf
+SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d2b3b51
+SETUVAR fish_color_selection:\x2d\x2dbold\x20\x2d\x2dbackground\x3d2b3b51
+SETUVAR fish_color_status:c94f6d
+SETUVAR fish_color_user:63cdcf
+SETUVAR fish_color_valid_path:719cd6\x20\x2d\x2dunderline
 SETUVAR fish_key_bindings:fish_vi_key_bindings
 SETUVAR fish_pager_color_background:
-SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:B3A06D\x20yellow
-SETUVAR fish_pager_color_prefix:normal\x20\x2d\x2dbold\x20\x2d\x2dunderline
-SETUVAR fish_pager_color_progress:brwhite\x20\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_completion:cdcecf
+SETUVAR fish_pager_color_description:738091
+SETUVAR fish_pager_color_prefix:63cdcf\x20\x2d\x2dbold\x20\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:738091
 SETUVAR fish_pager_color_secondary_background:
 SETUVAR fish_pager_color_secondary_completion:
 SETUVAR fish_pager_color_secondary_description:
 SETUVAR fish_pager_color_secondary_prefix:
-SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3d2b3b51
 SETUVAR fish_pager_color_selected_completion:
 SETUVAR fish_pager_color_selected_description:
 SETUVAR fish_pager_color_selected_prefix:
diff --git a/common/.config/fish/themes/Nightfox.theme b/common/.config/fish/themes/Nightfox.theme
index a595937..4c6ab59 100644
--- a/common/.config/fish/themes/Nightfox.theme
+++ b/common/.config/fish/themes/Nightfox.theme
@@ -1,25 +1,34 @@
-# Nightfox Color Palette
-# Style: nightfox
-# Upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/nightfox/nightfox_fish.fish
+# name: Nightfox
+# preferred_background: 131a24
+# url: https://github.com/edeneast/nightfox.nvim/raw/main/extra/nightfox/nightfox_fish.fish
 
-# Syntax Highlighting Colors
 fish_color_normal cdcecf
 fish_color_command 63cdcf
-fish_color_keyword d67ad2
 fish_color_quote dbc074
 fish_color_redirection cdcecf
 fish_color_end f4a261
 fish_color_error c94f6d
-fish_color_param 9d79d6
+fish_color_param 71839b
 fish_color_comment 738091
-fish_color_selection --background=2b3b51
+fish_color_match dbc074
+fish_color_selection --bold --background=2b3b51 
 fish_color_search_match --background=2b3b51
+fish_color_history_current --bold
 fish_color_operator 81b29a
 fish_color_escape d67ad2
+fish_color_cwd 81b29a
+fish_color_cwd_root f4a261
+fish_color_valid_path 719cd6 --underline
 fish_color_autosuggestion 738091
-
-# Completion Pager Colors
-fish_pager_color_progress 738091
-fish_pager_color_prefix 63cdcf
+fish_color_user 63cdcf
+fish_color_host 719cd6
+fish_color_cancel 9d79d6
 fish_pager_color_completion cdcecf
+fish_pager_color_prefix 63cdcf --bold --underline
 fish_pager_color_description 738091
+fish_pager_color_progress 738091
+fish_pager_color_selected_background --background=2b3b51
+fish_color_option dfdfe0
+fish_color_keyword 9d79d6
+fish_color_host_remote f4a261
+fish_color_status c94f6d