diff --git a/common/.config/fish/config.fish b/common/.config/fish/config.fish
index cf55cbf..9a620ea 100644
--- a/common/.config/fish/config.fish
+++ b/common/.config/fish/config.fish
@@ -1,5 +1,27 @@
 #!/usr/bin/env fish
 #
+set -U nightfox_black 393b44
+set -U nightfox_red c94f6d
+set -U nightfox_green 81b29a
+set -U nightfox_yellow dbc074
+set -U nightfox_blue 719cd6
+set -U nightfox_magenta 9d79d6
+set -U nightfox_cyan 63cdcf
+set -U nightfox_white dfdfe0
+set -U nightfox_orange f4a261
+set -U nightfox_pink d67ad2
+set -U nightfox_comment 738091
+set -U nightfox_bg0 131a24
+set -U nightfox_bg1 192330
+set -U nightfox_bg2 212e3f
+set -U nightfox_bg3 29394f
+set -U nightfox_bg4 39506d
+set -U nightfox_fg0 d6d6d7
+set -U nightfox_fg1 cdcecf
+set -U nightfox_fg2 aeafb0
+set -U nightfox_fg3 71839b
+set -U nightfox_sel0 2b3b51
+set -U nightfox_sel1 3c5372
 
 fundle plugin 'edc/bass'
 fundle plugin 'jorgebucaran/nvm.fish'
diff --git a/common/.config/fish/fish_variables b/common/.config/fish/fish_variables
index 5f11fdd..0570da8 100644
--- a/common/.config/fish/fish_variables
+++ b/common/.config/fish/fish_variables
@@ -7,7 +7,7 @@ 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_cwd_root:c94f6d
 SETUVAR fish_color_end:f4a261
 SETUVAR fish_color_error:c94f6d
 SETUVAR fish_color_escape:d67ad2
@@ -50,3 +50,25 @@ 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:
+SETUVAR nightfox_black 393b44
+SETUVAR nightfox_red c94f6d
+SETUVAR nightfox_green 81b29a
+SETUVAR nightfox_yellow dbc074
+SETUVAR nightfox_blue 719cd6
+SETUVAR nightfox_magenta 9d79d6
+SETUVAR nightfox_cyan 63cdcf
+SETUVAR nightfox_white dfdfe0
+SETUVAR nightfox_orange f4a261
+SETUVAR nightfox_pink d67ad2
+SETUVAR nightfox_comment 738091
+SETUVAR nightfox_bg0 131a24
+SETUVAR nightfox_bg1 192330
+SETUVAR nightfox_bg2 212e3f
+SETUVAR nightfox_bg3 29394f
+SETUVAR nightfox_bg4 39506d
+SETUVAR nightfox_fg0 d6d6d7
+SETUVAR nightfox_fg1 cdcecf
+SETUVAR nightfox_fg2 aeafb0
+SETUVAR nightfox_fg3 71839b
+SETUVAR nightfox_sel0 2b3b51
+SETUVAR nightfox_sel1 3c5372
diff --git a/common/.config/fish/functions/cd.fish b/common/.config/fish/functions/cd.fish
deleted file mode 100755
index ff6718b..0000000
--- a/common/.config/fish/functions/cd.fish
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env fish
-#
-
-function cd
-    source "$__fish_data_dir/functions/cd.fish" $argv
-    if test -f venv/bin/activate
-        source venv/bin/activate
-    else if test -f bin/activate
-        source bin/activate
-    else if test -f ../venv/bin/activate
-        source ../venv/bin/activate
-    end
-end
diff --git a/common/.config/fish/functions/fish_prompt.fish b/common/.config/fish/functions/fish_prompt.fish
index 4f939fe..6a778e7 100755
--- a/common/.config/fish/functions/fish_prompt.fish
+++ b/common/.config/fish/functions/fish_prompt.fish
@@ -3,30 +3,14 @@
 # description: based on Astronaut of Radu Potop and on Disco of Fabian Homborg, colors from Nightfox by EdenEast
 
 function fish_prompt --description 'Write out the prompt'
-    set -f color_venv 71839b
+    set -f color_venv $nightfox_fg3
     set -f color_bind normal
-    set -f color_text 131a24
-    set -f color_magenta 9d79d6
-    set -f color_blue 719cd6
-    set -f color_cyan 63cdcf
-    set -f color_green 81b29a
-    set -f color_yellow dbc074
-    set -f color_orange f4a261
-    set -f color_red c94f6d
-    set -f color_pink d67ad2
-    set -f color_white dfdfe0
-    set -f color_bg0 131a24
-    set -f color_bg1 192330
-    set -f color_bg2 212e3f
-    set -f color_bg3 29394f
-    set -f color_bg4 39506d
-    set -f color_sel0 2b3b51
-    set -f color_sel1 3c5372
-    set -f color_status $color_green
-    set -f color_bind $color_green
+    set -f color_text $nightfox_bg0
+    set -f color_status $nightfox_green
+    set -f color_bind $nightfox_green
     set -f color_cwd $fish_color_cwd
-    set -f color_vcs_text $color_yellow
-    set -f color_vcs_bg $color_bg2
+    set -f color_vcs_text $nightfox_yellow
+    set -f color_vcs_bg $nightfox_bg2
     set -f char_bind 'E'
     set -f char_user_cwd '%'
     set -f char_root_cwd '#'
@@ -35,7 +19,7 @@ function fish_prompt --description 'Write out the prompt'
     set -f normal (set_color normal)
     set -f prompt_status "✔"
 
-    set -g __fish_git_prompt_color $color_blue
+    set -g __fish_git_prompt_color $nightfox_blue
     set -g __fish_git_prompt_showstashstate 1
     set -g __fish_git_prompt_showdirtystate 1
     set -g __fish_git_prompt_showuntrackedfiles 1
@@ -55,22 +39,22 @@ function fish_prompt --description 'Write out the prompt'
     set -g __fish_git_prompt_char_upstream_equal "=="
 
     set -g __fish_git_prompt_color_branch -b $color_vcs_bg $color_vcs_text
-    set -g __fish_git_prompt_color_branch_detached -b $color_vcs_bg $color_red
-    set -g __fish_git_prompt_color_branch_dirty -b $color_vcs_bg $color_blue
-    set -g __fish_git_prompt_color_branch_staged -b $color_vcs_bg $color_green
+    set -g __fish_git_prompt_color_branch_detached -b $color_vcs_bg $nightfox_red
+    set -g __fish_git_prompt_color_branch_dirty -b $color_vcs_bg $nightfox_blue
+    set -g __fish_git_prompt_color_branch_staged -b $color_vcs_bg $nightfox_green
     set -g __fish_git_prompt_color_flags -b $color_vcs_bg $color_vcs_text
 
     set -g __fish_git_prompt_color -b $color_vcs_bg $color_vcs_text
     set -g __fish_git_prompt_color_prefix -b $color_vcs_bg $color_vcs_text
     set -g __fish_git_prompt_color_suffix -b $color_vcs_bg $color_vcs_text
-    set -g __fish_git_prompt_color_bare -b $color_vcs_bg $color_magenta --bold
-    set -g __fish_git_prompt_color_merging -b $color_vcs_bg $color_red --bold
+    set -g __fish_git_prompt_color_bare -b $color_vcs_bg $nightfox_magenta --bold
+    set -g __fish_git_prompt_color_merging -b $color_vcs_bg $nightfox_red --bold
     set -g __fish_git_prompt_color_cleanstate -b $color_vcs_bg $color_vcs_text --bold
-    set -g __fish_git_prompt_color_dirtystate -b $color_vcs_bg $color_blue --bold
-    set -g __fish_git_prompt_color_invalidstate -b $color_vcs_bg $color_red --bold
-    set -g __fish_git_prompt_color_stagedstate -b $color_vcs_bg $color_green --bold
-    set -g __fish_git_prompt_color_stashstate -b $color_vcs_bg $color_orange --bold
-    set -g __fish_git_prompt_color_untrackedfiles -b $color_vcs_bg $color_blue --bold
+    set -g __fish_git_prompt_color_dirtystate -b $color_vcs_bg $nightfox_blue --bold
+    set -g __fish_git_prompt_color_invalidstate -b $color_vcs_bg $nightfox_red --bold
+    set -g __fish_git_prompt_color_stagedstate -b $color_vcs_bg $nightfox_green --bold
+    set -g __fish_git_prompt_color_stashstate -b $color_vcs_bg $nightfox_orange --bold
+    set -g __fish_git_prompt_color_untrackedfiles -b $color_vcs_bg $nightfox_blue --bold
     set -g __fish_git_prompt_color_upstream -b $color_vcs_bg $color_vcs_text --bold
 
     set -g __fish_git_prompt_color_prefix_done $normal
@@ -102,7 +86,7 @@ function fish_prompt --description 'Write out the prompt'
 
     # Color the prompt in red on error
     if test $last_status -ne 0
-        set -f color_status $color_red
+        set -f color_status $nightfox_red
         set -f prompt_status "[" $last_status "]"
     end
 
@@ -140,19 +124,19 @@ function fish_prompt --description 'Write out the prompt'
         or test "$fish_key_bindings" = fish_hybrid_key_bindings
         switch $fish_bind_mode
             case default
-                set -f color_bind $color_red
+                set -f color_bind $nightfox_red
                 set -f char_bind 'N'
             case insert
-                set -f color_bind $color_yellow
+                set -f color_bind $nightfox_yellow
                 set -f char_bind 'I'
             case replace_one
-                set -f color_bind $color_cyan
+                set -f color_bind $nightfox_cyan
                 set -f char_bind 'r'
             case replace
-                set -f color_bind $color_blue
+                set -f color_bind $nightfox_blue
                 set -f char_bind 'R'
             case visual
-                set -f color_bind $color_magenta
+                set -f color_bind $nightfox_magenta
                 set -f char_bind 'V'
         end
     end
diff --git a/common/.config/fish/functions/prompt_login.fish b/common/.config/fish/functions/prompt_login.fish
index f67bea3..2759f8b 100755
--- a/common/.config/fish/functions/prompt_login.fish
+++ b/common/.config/fish/functions/prompt_login.fish
@@ -3,8 +3,8 @@
 # From official prompt_login.fish of fish
 
 function prompt_login --description "display user name for the prompt"
-    set -f color_dark_text 131a24
-    set -f color_venv 71839b
+    set -f color_dark_text $nightfox_bg0
+    set -f color_venv $nightfox_fg3
     set -f color_cwd $fish_color_cwd
     set -f color_user $fish_color_user
     if functions -q fish_is_root_user; and fish_is_root_user