diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1377554
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.swp
diff --git a/i3/link_config.sh b/i3/link_config.sh
index d4ce5f3..4e22ac7 100755
--- a/i3/link_config.sh
+++ b/i3/link_config.sh
@@ -5,9 +5,20 @@
 #
 # Distributed under terms of the MIT license.
 #
+mkdir -p $HOME/.config/i3
+mkdir -p $HOME/.config/polybar
+
 ln -s $PWD/i3config ~/.config/i3/config
 ln -s $PWD/polybarconfig ~/.config/polybar/config
 ln -s $PWD/.xinitrc ~/.xinitrc
+while true; do
+    read -p "Is this your laptop? [y/n]" yn
+    case $yn in
+        [Yy]* ) break;;
+        [Nn]* ) exit;;
+        * ) echo "Please answer yes or no.";;
+    esac
+done
 sudo ln -s $PWD/auto_monitor.sh /usr/local/bin/auto_monitor.sh
 sudo ln -s $PWD/switch_monitors.sh /usr/local/bin/switch_monitors.sh
 sudo ln -s $PWD/98-monitor-hotplug.rules /etc/udev/rules.d/98-monitor-hotplug.rules
diff --git a/setup_arch.sh b/setup_arch.sh
index 2586a54..32794e6 100755
--- a/setup_arch.sh
+++ b/setup_arch.sh
@@ -9,10 +9,22 @@
 sudo pacman --needed -Sy archlinux-keyring --noconfirm
 sudo pacman --needed -Syu --noconfirm
 yes | sudo pacman --needed -Sy vte3-ng
-sudo pacman --needed -Sy base-devel xorg xorg-xinit gnome gnome-extra gvim zsh tmux openssh termite powerline powerline-fonts --noconfirm
+sudo pacman --needed -Sy base-devel xorg xorg-xinit gnome gnome-extra gvim zsh tmux openssh termite powerline powerline-fonts i3 rofi nitrogen --noconfirm
 ./clone_and_link.sh
 cp zsh/.powerline_config_arch.example zsh/.powerline_config
 cp vim/.vimrc_config_powerline_arch.example vim/.vimrc_config_powerline 
 if [ $SHELL != "/bin/zsh" ]; then
     chsh -s /usr/bin/zsh;
 fi
+
+for filename in zsh/.*_arch.example; do
+    cp $filename ${filename:0:-13}
+done
+
+for filename in tmux/.*_arch.example; do
+    cp $filename ${filename:0:-13}
+done
+
+for filename in vim/.*_arch.example; do
+    cp $filename ${filename:0:-13}
+done
diff --git a/setup_remotes.sh b/setup_remotes.sh
new file mode 100755
index 0000000..e59dab0
--- /dev/null
+++ b/setup_remotes.sh
@@ -0,0 +1,13 @@
+#! /bin/sh
+#
+# setup_remotes.sh
+# Copyright (C) 2017 Fabian Ising <fabian@murgi.de>
+#
+# Distributed under terms of the Apache v2.0 license.
+#
+
+git remote add i3 git@vcs.murgi.de:dotfiles_fabian/i3config.git
+git remote add tmux git@vcs.murgi.de:dotfiles_fabian/tmux.git
+git remote add tmux git@vcs.murgi.de:dotfiles_fabian/tmux.git
+git remote add vim git@vcs.murgi.de:dotfiles_fabian/vim.git 
+git remote add zsh git@vcs.murgi.de:dotfiles_fabian/zsh.git 
diff --git a/zsh/.virtual_env_config.zsh.arch.example b/zsh/.virtual_env_config.zsh_arch.example
similarity index 100%
rename from zsh/.virtual_env_config.zsh.arch.example
rename to zsh/.virtual_env_config.zsh_arch.example
diff --git a/zsh/.virtual_env_config.zsh.debian.example b/zsh/.virtual_env_config.zsh_debian.example
similarity index 100%
rename from zsh/.virtual_env_config.zsh.debian.example
rename to zsh/.virtual_env_config.zsh_debian.example