diff --git a/fish/setup.sh b/fish/setup.sh
index db79f0e..b9b68c4 100755
--- a/fish/setup.sh
+++ b/fish/setup.sh
@@ -1,21 +1,26 @@
 #!/usr/bin/env bash
 
-function setup_fish()
+function main()
 {
-  brew install fish
+  # Install fish shell
+  if ! brew list | grep fish >/dev/null; then
+    brew install fish
+  fi
+
+  # Add to list of shells and set as default
   if ! grep /usr/local/bin/fish < /etc/shells >/dev/null; then
     echo /usr/local/bin/fish | sudo tee -a /etc/shells
     chsh -s /usr/local/bin/fish
   fi
+
+  # Install configuration files
+  if [ ! -d ${HOME}/.config ]; then
+    mkdir ${HOME}/.config
+  fi
+  if [ ! -e ${HOME}/.config/fish ]; then
+    rm -rf ${HOME}/.config/fish
+    ln -s ${DOTFILES}/fish ${HOME}/.config/.
+  fi
 }
 
-function link_config()
-{
-  mkdir ${HOME}/.config
-  ln -s ${DOTFILES}/fish ${HOME}/.config/.
-}
-
-
-export DOTFILES=/Users/thomas/dotfiles
-setup_fish
-link_config
+main "$@"
diff --git a/git/setup.sh b/git/setup.sh
index 8b9a4bb..c51ddc7 100755
--- a/git/setup.sh
+++ b/git/setup.sh
@@ -1,16 +1,19 @@
 #!/usr/bin/env bash
 
-function setup_git()
+function main()
 {
-  brew install git
+  if ! brew list | grep git >/dev/null; then
+    brew install git
+  fi
 
-  cat << EOF > ${HOME}/.gitconfig
+  if [ ! -f "${HOME}/.gitconfig" ]; then
+    cat << EOF > ${HOME}/.gitconfig
 [include]
   path = ${DOTFILES}/git/gitconfig
 [core]
   excludesfile = ${DOTFILES}/git/gitignore_global
 EOF
+  fi
 }
 
-export DOTFILES=/Users/thomas/dotfiles
-setup_git
+main "$@"
diff --git a/install.sh b/install.sh
index dca542a..99dd197 100755
--- a/install.sh
+++ b/install.sh
@@ -41,8 +41,8 @@ function setup_kitty()
 
 export DOTFILES=/Users/thomas/dotfiles
 
-#ssh/setup.sh
-#git/setup.sh
+ssh/setup.sh
+git/setup.sh
 NAS_mounts/setup.sh
-#fish/setup.sh
+fish/setup.sh
 wm/setup.sh
diff --git a/ssh/ssh_config b/ssh/config
similarity index 100%
rename from ssh/ssh_config
rename to ssh/config
diff --git a/ssh/setup.sh b/ssh/setup.sh
index 024e2a9..c4c3374 100755
--- a/ssh/setup.sh
+++ b/ssh/setup.sh
@@ -1,13 +1,15 @@
 #!/usr/bin/env bash
 
-function setup_ssh()
+function main()
 {
   # copy private key to .ssh
   # cp ${KEYFILE} ~/.ssh/thomas_rsa
   # chmod 400 ~/.ssh/thomas_rsa
   # ssh-add -K ~/.ssh/thomas_rsa
-  ln -s ${DOTFILES}/ssh/ssh_config ${HOME}/.ssh/config
+  if [ ! -e ${HOME}/.ssh/config ]; then
+    rm -f ${HOME}/.ssh/config
+    ln -s ${DOTFILES}/ssh/config ${HOME}/.ssh/config
+  fi
 }
 
-export DOTFILES=/Users/thomas/dotfiles
-setup_ssh
+main "$@"
diff --git a/wm/setup.sh b/wm/setup.sh
index f0c429c..a92e317 100755
--- a/wm/setup.sh
+++ b/wm/setup.sh
@@ -23,4 +23,4 @@ function main()
   fi
 }
 
-main
+main "$@"