diff --git a/setup.sh b/setup.sh
index ff54286..041a609 100755
--- a/setup.sh
+++ b/setup.sh
@@ -10,7 +10,13 @@ git clone https://github.com/id101010/LinuxDotFiles.git $DOTFILES
 
 # setup i3
 if [ ! -e "$HOME/.i3" ]; then
-    ln -s $DOTFILES/i3wm/ $HOME/.i3
+    cp -r $DOTFILES/i3wm/Authenticator      $HOME/.i3/
+    cp -r $DOTFILES/i3wm/i3blur.py          $HOME/.i3/
+    cp -r $DOTFILES/i3wm/i3dmenu-wrapper.sh $HOME/.i3/
+    cp -r $DOTFILES/i3wm/i3status.conf      $HOME/.i3/
+    cp -r $DOTFILES/i3wm/volnotid.sh        $HOME/.i3/
+    
+    ln -s $DOTFILES/i3wm/config $HOME/.i3/config
 fi
 
 # setup tmux
@@ -27,3 +33,6 @@ fi
 if [ ! -e "$HOME/.zshrc" ]; then
     ln -s $DOTFILES/zsh/zshrc $HOME/.zshrc
 fi
+
+# setup urxvt
+ln -s $DOTFILES/urxvt/Xdefaults $HOME/.Xdefaults
diff --git a/zsh/zshrc b/zsh/zshrc
index 118abc3..b08b511 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -8,6 +8,11 @@
 #                              #
 ################################
 
+# Autoload stuff
+autoload -U compinit promptinit
+compinit
+promptinit
+
 # History
 export HISTSIZE=100000
 export HISTFILE="$HOME/.history"
@@ -113,8 +118,5 @@ setopt autopushd pushdsilent pushdtohome
 setopt pushdignoredups
 setopt pushdminus
 setopt nohashdirs
-autoload -U compinit promptinit
-compinit
-promptinit
 source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 rehash