diff --git a/README.md b/README.md
index abd9b6f..060e5d7 100644
--- a/README.md
+++ b/README.md
@@ -10,4 +10,7 @@ T31M Dotfiles Repository
 
 ### Contents ###
 * FiSH Shell Setup & Configuration
-  * Based heavily on: omf/theme-sushi check it out
+  * Theme/Prompt Based heavily on: omf/theme-sushi check it out
+  * NVM + NVM FiSH support
+  * edc/bass
+  * fzf
diff --git a/fish/theme-t31m/fish_greeting.fish b/fish/theme-t31m/fish_greeting.fish
new file mode 100644
index 0000000..f340e8f
--- /dev/null
+++ b/fish/theme-t31m/fish_greeting.fish
@@ -0,0 +1,13 @@
+set -g CMD_DURATION 0
+
+function dim
+    set_color -o 4f4f4f
+end
+
+function off
+    set_color -o normal
+end
+
+function fish_greeting
+	echo "Welcome to FiSH "(dim)(uname -nrs)(off)
+end
diff --git a/fish_setup.sh b/fish_setup.sh
index 743e3f8..74ce05b 100755
--- a/fish_setup.sh
+++ b/fish_setup.sh
@@ -11,6 +11,10 @@ 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
 
@@ -34,8 +38,9 @@ fish -c fisher
 fish -c "fisher add (pwd)/fish/theme-t31m"
 
 # set fish default shell
-echo "changing shell to fish, enter password"
-chsh -s /usr/bin/fish
+echo "Change your default Shell to FiSH: chsh -s /usr/bin/fish"
 
+# cp vimrc
+echo "Installing .vimrc"
 cp dot.vimrc ~/.vimrc