diff --git a/fish/fishfile b/fish/fish_plugins
similarity index 69%
rename from fish/fishfile
rename to fish/fish_plugins
index 29bc98e..6086f9e 100644
--- a/fish/fishfile
+++ b/fish/fish_plugins
@@ -1,3 +1,4 @@
-FabioAntunes/fish-nvm
+jorgebucaran/fisher
 edc/bass
 jethrokuan/fzf
+FabioAntunes/fish-nvm
diff --git a/fish/theme-t31m/cdk.fish b/fish/theme-t31m/functions/cdk.fish
similarity index 100%
rename from fish/theme-t31m/cdk.fish
rename to fish/theme-t31m/functions/cdk.fish
diff --git a/fish/theme-t31m/envAWS.fish b/fish/theme-t31m/functions/envAWS.fish
similarity index 100%
rename from fish/theme-t31m/envAWS.fish
rename to fish/theme-t31m/functions/envAWS.fish
diff --git a/fish/theme-t31m/fish_greeting.fish b/fish/theme-t31m/functions/fish_greeting.fish
similarity index 100%
rename from fish/theme-t31m/fish_greeting.fish
rename to fish/theme-t31m/functions/fish_greeting.fish
diff --git a/fish/theme-t31m/fish_prompt.fish b/fish/theme-t31m/functions/fish_prompt.fish
similarity index 100%
rename from fish/theme-t31m/fish_prompt.fish
rename to fish/theme-t31m/functions/fish_prompt.fish
diff --git a/fish/theme-t31m/fish_right_prompt.fish b/fish/theme-t31m/functions/fish_right_prompt.fish
similarity index 100%
rename from fish/theme-t31m/fish_right_prompt.fish
rename to fish/theme-t31m/functions/fish_right_prompt.fish
diff --git a/fish/theme-t31m/fish_title.fish b/fish/theme-t31m/functions/fish_title.fish
similarity index 100%
rename from fish/theme-t31m/fish_title.fish
rename to fish/theme-t31m/functions/fish_title.fish
diff --git a/fish/theme-t31m/ssm_tunnel.fish b/fish/theme-t31m/functions/ssm_tunnel.fish
similarity index 100%
rename from fish/theme-t31m/ssm_tunnel.fish
rename to fish/theme-t31m/functions/ssm_tunnel.fish
diff --git a/fish/theme-t31m/t31m_prompt.fish b/fish/theme-t31m/functions/t31m_prompt.fish
similarity index 100%
rename from fish/theme-t31m/t31m_prompt.fish
rename to fish/theme-t31m/functions/t31m_prompt.fish
diff --git a/fish/theme-t31m/t31m_prompt_right.fish b/fish/theme-t31m/functions/t31m_prompt_right.fish
similarity index 100%
rename from fish/theme-t31m/t31m_prompt_right.fish
rename to fish/theme-t31m/functions/t31m_prompt_right.fish
diff --git a/fish_setup.sh b/fish_setup.sh
index 1a74f5a..f12f506 100755
--- a/fish_setup.sh
+++ b/fish_setup.sh
@@ -3,41 +3,39 @@
 set -x
 
 # install nvm
-curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.36.0/install.sh | bash
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash
 
 # install pyenv
 git clone https://github.com/pyenv/pyenv.git ~/.pyenv
 
-# install pyenv-virtualenv plugin
-git clone https://github.com/pyenv/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
-
 # install fzf from source
 git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf
 bash ~/.fzf/install --no-update-rc --completion --key-bindings
 
 # install fisher
-curl https://git.io/fisher --create-dirs -sLo ~/.config/fish/functions/fisher.fish
+curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher $plugins
 
 # copy fish config
-if test -f "~/.config/fish/config.fish"; then
+if test -f "~/.config/fish/functions/config.fish"; then
     echo "config.fish already exist, please rename to continue."
     exit 1
 fi
-cp fish/config.fish ~/.config/fish/
+cp fish/config.fish ~/.config/fish/functions/
 
 # copy fishfile
-if test -f "~/.config/fish/fishfile"; then
-    echo "fishfile already exist, please rename to continue."
+if test -f "~/.config/fish/fish_plugins"; then
+    echo "fish_plugins already exist, please rename to continue."
     exit 1
 fi
-cp fish/fishfile ~/.config/fish/
+cp fish/fish_plugins ~/.config/fish/
 
 echo "set --export PYENV_ROOT $HOME/.pyenv" > ~/.config/fish/conf.d/pyenv.fish
 
 # install packages from fishfile
-fish -c "fisher self-update"
-fish -c fisher
-fish -c "fisher add (pwd)/fish/theme-t31m"
+fish -c "fisher install jorgebucaran/fisher"
+fish -c "fisher install (pwd)/fish/theme-t31m"
+fish -c "fisher install FabioAntunes/fish-nvm"
+fish -c "fisher update"
 
 # set fish default shell
 echo "Change your default Shell to FiSH: chsh -s /usr/bin/fish"