diff --git a/bashrc b/bashrc
index 9caad76..0624737 100644
--- a/bashrc
+++ b/bashrc
@@ -11,7 +11,6 @@ tmux_title $(hostname -s)
 GIT_PROMPT_ONLY_IN_REPO=1
 GIT_PROMPT_FETCH_REMOTE_STATUS=0
 GIT_PROMPT_IGNORE_STASH=1
-GIT_PROMPT_THEME=Single_line
 GIT_PROMPT_THEME=Noldorized
 source ~/.bash-git-prompt/gitprompt.sh
 
diff --git a/setup.sh b/setup.sh
index 7402573..953c8d6 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,16 +1,18 @@
 #!/bin/bash
 
 LINK_FILES=(bashrc vimrc tmux.conf gitconfig)
-mkdir ~/.home-git-back
+mkdir ~/.home-git-back 2>/dev/null
 for file in ${LINK_FILES[@]}; do
-    [ -f ~/.${file} ] && mv -v ~/.${file} ~/.home-git-back
-    ln -s $(PWD)/${file} ~/.${file}
+	if  [ ! -L ~/.${file} ] ; then
+		mv -v ~/.${file} ~/.home-git-back
+    	ln -s $(pwd)/${file} ~/.${file}
+	fi
 done
 
-# git clones
-git clone https://github.com/magicmonty/bash-git-prompt.git ~/.bash-git-prompt
 
-mkdir ~./vim
-git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle
+[ ! -d ~/.bash-git-prompt ] && git clone https://github.com/nold360/bash-git-prompt.git ~/.bash-git-prompt
+
+mkdir ~/.vim 2>/dev/null
+[ ! -d ~/.vim/bundle ] && git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle
 
 vim -c ":PluginInstall" -c ":q" -c ":q"