diff --git a/setup.sh b/setup.sh
index 758c4bf..01fa1ba 100755
--- a/setup.sh
+++ b/setup.sh
@@ -3,171 +3,141 @@
 dotfiles_dir=$(cd "$(dirname "$0")" && pwd)
 sys=`uname -s | tr A-Z a-z`
 
-skipitems=( \
-    '.*\.orig' \
-    '.*~' \
-    Alfred \
-    Ansible \
-    bin \
-    Colors \
-    Dotfiles \
-    Fortune \
-    LaunchAgents \
-    py \
-    Python \
-    README.md \
-    setup.sh \
-    Web \
-    Xcode \
+items=( \
+    emacs           .config/emacs \
+    fish            .config/fish \
+    git             .config/git \
+    hgrc            .hgrc
+    mutt            .config/mutt \
+    nethackrc       .nethackrc \
+    nvim            .config/nvim \
+    tmux            .config/tmux \
+    vim             .config/vim \
+    zsh/zprofile    .zprofile \
+    zsh/zshenv      .zshenv \
+    zsh/zshrc       .zshrc \
 )
 
-function link {
-    local action
-    local dest
-
-    if [[ -z $2 ]]; then
-        local dotfile_basename=`basename "$1"`
-        dest="$HOME/.$dotfile_basename"
-    else
-        dest="$2"
-    fi
-
-    if [[ ! -e "$dest" ]]; then
-        action='Linking'
-        ln -fs "$1" "$dest"
-    else
-        action='Skipping'
-    fi
-
-    printf "  %8s: %s\n" $action "$dest"
+function print-heading
+{
+    print -P "%B==>%b $@"
 }
 
-function matches_skip_item {
-    local string_to_match=$1
+# link --
+#
+# Link a source file (in the repo) to a destination path in the user's home
+# directory. If the file already exists AND it's a symlink AND it points to the
+# source path, it will be skipped.
+#
+# Arguments:
+#   $1 : a "source" path to a file, relative to the dotfiles repo root
+#   $2 : a "destination" path, relative to the user's home directory
+#
+# Returns: 0 if the dotfile was installed, 1 otherwise
+function link
+{
+    local src="$dotfiles_dir/$1"
+    local dst="$HOME/$2"
 
-    for item in $skipitems; do
-        if [[ $string_to_match =~ $item ]]; then
-            return 0
+    local should_install=1
+    if [[ -e "$dst" ]]; then
+        if [[ -h "$dst" ]]; then
+            local link_target=$(readlink "$dst")
+            if [[ "$link_target" == "$src" ]]; then
+                should_install=0
+            fi
+        elif [[ -f "$dst" ]]; then
+            should_install=0
+        else
+            echo "$dst is not a regular file or symbolic link"
+            return 1
         fi
-    done
+    fi
 
-    return 1
+    if (( $should_install )); then
+        print "Link $dst"
+        install -ls "$src" "$dst"
+        return 0
+    else
+        print "Skip $dst"
+        return 1
+    fi
 }
 
 function build_fortunes {
-    echo "Building fortunes file"
+    print-heading Building fortunes file
     (cd Fortune && make)
 }
 
 print -P "      %BHome:%b $HOME"
-print -P "  %BDotfiles:%b $dotfiles_dir"
-print -P "%BSkip Items:%b $skipitems\n"
+print -P "  %BDotfiles:%b $dotfiles_dir\n"
 
-print -P "%BRemoving stray dotfile symlinks from $HOME%b"
-local link_dest
-local link_dirname
-local did_remove_at_least_one_symlink=0
-for file in ~/.?*; do
-    link_dest=`readlink "$file"`
-    if [[ $? -ne 0 ]]; then
-        # Not a symlink.
-        continue
-    fi
+print-heading Symlinking config files
 
-    link_dirname=`dirname "$link_dest"`
-    if [[ "$link_dirname" != "$dotfiles_dir" ]]; then
-        continue
-    fi
-
-    if ! matches_skip_item `basename "$link_dest"`; then
-        if [[ -e "$link_dest" ]]; then
-            continue
-        fi
-    fi
-
-    printf "  Removing: %s\n" "$file"
-    rm "$file"
-    did_remove_at_least_one_symlink=1
-done
-
-if [[ $did_remove_at_least_one_symlink -ne 1 ]]; then
-    print "  Nothing to remove"
-fi
-
-print -P "%BSymlinking config files%b"
 local did_link_at_least_one_dotfile=0
-for dotfile in $dotfiles_dir/*; do
-    local dotfile_basename=`basename "$dotfile"`
+for (( idx = 1; idx <= $#items; idx += 2 )); do
+    local dotfile=$items[$idx]
+    local dest=$items[$idx+1]
 
-    if matches_skip_item "$dotfile_basename"; then
-        continue
+    if link "$dotfile" "$dest"; then
+        did_link_at_least_one_dotfile=1
     fi
-
-    if [[ "$dotfile_basename" == "config" ]]; then
-        # Recurse into config and link each item individually
-        mkdir -p "$HOME/.config"
-        for config_dotfile in $dotfiles_dir/config/*; do
-            config_dotfile_basename=`basename "$config_dotfile"`
-            link "$config_dotfile" "$HOME/.config/$config_dotfile_basename"
-        done
-    else
-        link "$dotfile"
-    fi
-
-    did_link_at_least_one_dotfile=1
 done
 
-if [[ ! -f "$HOME/.hushlogin" ]]; then
-    print "  touch $HOME/.hushlogin"
-    touch "$HOME/.hushlogin"
-    did_link_at_least_one_dotfile=1
-fi
-
-if [[ $did_link_at_least_one_dotfile -ne 1 ]]; then
-    print "  Nothing to link"
-fi
-
 local configure_vim=1
-while getopts "v" arg $@; do
+local hush_login=0
+while getopts "vl" arg $@; do
     case $arg in
         "v") configure_vim=1 ;;
         "+v") configure_vim=0 ;;
+        "l") hush_login=1 ;;
+        "+l") hush_login=0 ;;
         *)
-            echo "Usage: setup.sh [+v|-v]"
-            echo "  +v|-v    Configure (Neo)vim. Default yes; +v skips."
+            local script_name=$(basename $0)
+            echo "Usage: $script_name [+l|-l] [+v|-v]"
+            echo "  +l|-l    Tell the shell not to print last login information. (default: no)"
+            echo "  +v|-v    Install (neo)vim plugins. (default: yes)"
+            exit 1
             ;;
     esac
 done
 
-print "Creating Python virtual environment"
-local venv_path=~/.local/share/python-virtual-environments/eryn
-python3 -m venv --system-site-packages "$venv_path"
-"$venv_path/bin/pip" install "$dotfiles_dir/Python/eryntools"
+if (( $hush_login )); then
+    if [[ ! -a "$HOME/.hushlogin" ]]; then
+        print "  touch $HOME/.hushlogin"
+        touch "$HOME/.hushlogin"
+    fi
+fi
+
+local venv_path="${XDG_DATA_HOME:-$HOME/.local/share}/python-virtual-environments/eryn"
+if [[ ! -d "$venv_path" ]]; then
+    print-heading "Creating Python virtual environment"
+    python3 -m venv --system-site-packages "$venv_path"
+    "$venv_path/bin/pip" install "$dotfiles_dir/Python/eryntools"
+fi
 
 if (( $configure_vim )); then
-    print -P "%BConfiguring Vim%b"
+    print-heading Configuring neovim and vim
 
-    VIM=nvim
-    if ! whence -cp nvim >& -; then
-        VIM=vim
+    print-heading "Downloading vim-plug from Github"
+
+    local tmp_file="/tmp/vim-plug.vim"
+    curl --create-dirs -fL \
+        -o "$tmp_file" \
+        "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" \
+        1>/dev/null
+
+    # nvim
+    install -m 0644 "$tmp_file" "${XDG_DATA_HOME:-$HOME/.local/share}/nvim/site/autoload/plug.vim"
+    # vim
+    install -m 0644 "$tmp_file" "${XDG_CONFIG_HOME:-$HOME/.config}/vim/autoload/plug.vim"
+
+    if whence -cp python3 >/dev/null; then
+        print-heading "Installing Python modules for vim and nvim"
+        python3 -m pip install --user --upgrade pynvim pyvim
     fi
 
-    if [[ $VIM = "nvim" ]]; then
-        print -P "  Downloading vim-plug from Github"
-        curl --create-dirs -fL \
-            -o "${XDG_DATA_HOME:-$HOME/.local/share}/nvim/site/autoload/plug.vim" \
-            "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" \
-            1>/dev/null
-
-        if whence -cp python3 >& -; then
-            print -P "  Installing pynvim"
-            python3 -m pip install --user --upgrade pynvim 1>/dev/null
-        fi
-    fi
-
-    $VIM +PlugInstall +qall
+    command nvim +PlugInstall +qall
 fi
 
 build_fortunes
-
-exit 0