diff --git a/Makefile b/Makefile
index 1ecd7ff..20857a6 100644
--- a/Makefile
+++ b/Makefile
@@ -13,38 +13,42 @@ backup:
 	mv ~/.gitignore ~/.gitignore.bak || true
 
 bash:
-	ln -s $(PWD)/subbash ~/.subbash || true
-	ln -s $(PWD)/bashrc ~/.bashrc || true
+	test -e ~/.subbash && false
+	ln -s $(PWD)/subbash ~/.subbash
+	ln -s $(PWD)/bashrc ~/.bashrc
 
 zsh:
-	ln -s $(PWD)/subzsh ~/.subzsh || true
-	ln -s $(PWD)/zshrc ~/.zshrc || true
-	mkdir ~/.subzsh/plugins || true
-	git clone https://github.com/zsh-users/zsh-autosuggestions $(PWD)/subzsh/plugins/zsh-autosuggestions || true
-	git clone https://github.com/zsh-users/zsh-syntax-highlighting $(PWD)/subzsh/plugins/zsh-syntax-highlighting
+	test -e ~/.subzsh && false
+	ln -s $(PWD)/subzsh ~/.subzsh
+	ln -s $(PWD)/zshrc ~/.zshrc
+	mkdir ~/.subzsh/plugins
+	git clone https://github.com/zsh-users/zsh-autosuggestions ~/.subzsh/plugins/zsh-autosuggestions
+	git clone https://github.com/zsh-users/zsh-syntax-highlighting ~/.subzsh/plugins/zsh-syntax-highlighting
 
 
 tmux:
-	ln -s $(PWD)/tmux.conf ~/.tmux.conf || true
+	ln -s $(PWD)/tmux.conf ~/.tmux.conf
 
 vim:
-	ln -s $(PWD)/subvim ~/.vim && \
-	ln -s $(PWD)/subvim/.vimrc ~/.vimrc && \
-	mkdir -p ~/.config/nvim && \
-	ln -s $(PWD)/subvim/.vimrc ~/.config/nvim/init.vim && \
-	git clone https://github.com/VundleVim/Vundle.vim.git $(PWD)/subvim/bundle/Vundle.vim && \
+	test -e ~/.vim && false
+	ln -s $(PWD)/subvim ~/.vim
+	ln -s $(PWD)/subvim/.vimrc ~/.vimrc
+	mkdir -p ~/.config/nvim
+	ln -s $(PWD)/subvim/.vimrc ~/.config/nvim/init.vim
+	git clone https://github.com/VundleVim/Vundle.vim.git $(PWD)/subvim/bundle/Vundle.vim
 	vim +PluginInstall +qall
 
 ssh:
-	echo -e "\n" >> ~/.ssh/config && cat $(PWD)/subssh/config >> ~/.ssh/config
+	cat $(PWD)/subssh/config >> ~/.ssh/config
 
 git:
-	ln -s $(PWD)/subgit/gitconfig ~/.gitconfig || true
-	ln -s $(PWD)/subgit/gitignore ~/.gitignore || true
+	ln -s $(PWD)/subgit/gitconfig ~/.gitconfig
+	ln -s $(PWD)/subgit/gitignore ~/.gitignore
 
 ranger:
-	mkdir -p ~/.config/ranger || true
-	ln -s $(PWD)/subranger/rc.conf ~/.config/ranger || true
-	mkdir -p ~/.config/ranger/plugins || true
+	test -e ~/.config/ranger && false
+	mkdir -p ~/.config/ranger
+	ln -s $(PWD)/subranger/rc.conf ~/.config/ranger
+	mkdir -p ~/.config/ranger/plugins
 	git clone https://github.com/alexanderjeurissen/ranger_devicons ~/.config/ranger/plugins/ranger_devicons