diff --git a/autostow.sh b/bootstrap/.config/bootstrap/autostow.sh
similarity index 79%
rename from autostow.sh
rename to bootstrap/.config/bootstrap/autostow.sh
index c5debc3..fbc9746 100755
--- a/autostow.sh
+++ b/bootstrap/.config/bootstrap/autostow.sh
@@ -50,16 +50,16 @@ main() {
   case "$1" in
   -s | --stow)
     have_stow
-    printf "Creating dotfile symlinks   ........................\n"
+    echo "Creating dotfile symlinks ................................................."
     stow_dirs
-    printf "Done creating symlinks   ...........................\n"
+    echo "Done creating symlinks ...................................................."
     exit 0
     ;;
   -d | --delete)
     have_stow
-    printf "Removing dotfile symlinks   ........................\n"
+    echo "Removing dotfile symlinks ................................................."
     unstow_dirs
-    printf "Done removing symlinks   ...........................\n"
+    echo "Done removing symlinks ...................................................."
     exit 0
     ;;
   -h | --help | *)
diff --git a/bootstrap/.config/bootstrap/install b/bootstrap/.config/bootstrap/install_packages.sh
similarity index 90%
rename from bootstrap/.config/bootstrap/install
rename to bootstrap/.config/bootstrap/install_packages.sh
index 5bf818f..33ba4bd 100755
--- a/bootstrap/.config/bootstrap/install
+++ b/bootstrap/.config/bootstrap/install_packages.sh
@@ -7,13 +7,15 @@
 # DESCRIPTION:  Display usage information for this script.
 # PARAMETERS:   see usage function
 #==============================================================================
+packages="${BOOTSTRAP_PACKAGES:-packages.csv}"
+
 main() {
   local cmd=""
   local ret=0
 
   case "$1" in
   -v | --version)
-    printf "Package bootstrap script.\n\n©Marty Oehme\n\nVersion: 0.1\n"
+    printf "Package bootstrap script.\n\n©Marty Oehme\n\nVersion: 0.3\n"
     ;;
   -h | --help)
     printf "Usage: install [-f|--force][-v|--version][-h|--help]\n\n-f     Do not ask for any confirmations but force update and installation.\n"
@@ -58,9 +60,9 @@ update_repos() {
 install_packages() {
   unattended="$1"
   if "$unattended"; then
-    yay -Squ --noconfirm --needed - <packages.csv
+    yay -Squ --noconfirm --needed - <"$packages"
   else
-    yay -Su --needed - <packages.csv
+    yay -Su --needed - <"$packages"
   fi
 }
 
@@ -71,12 +73,11 @@ check_consent() {
     echo "Exiting."
     exit
   fi
-
 }
 
 install() {
   unattended=$1
-  echo "Beginning boostrap ........................................................"
+  echo "Beginning package bootstrap ..............................................."
   if ! "$unattended"; then
     check_consent
   fi
diff --git a/bootstrap/.config/bootstrap/packages.csv b/bootstrap/.config/bootstrap/packages.csv
index 31b4930..722dfb1 100644
--- a/bootstrap/.config/bootstrap/packages.csv
+++ b/bootstrap/.config/bootstrap/packages.csv
@@ -4,10 +4,10 @@ bash
 bibtool
 bison
 bzip2
-chromium
 dhcpcd
 dialog
 docker
+dunst
 exa
 fasd
 feh
@@ -15,26 +15,23 @@ flashfocus-git
 fzf
 gawk
 git
+git-lfs
 gnome-keyring
 gopass
 grep
 gzip
 hugo
 i3-gaps
-i3blocks
 i3lock
-i3status
 jabref-latest
+jpdftweak
 keybase-bin
 less
+libnotify
 libtool
 littler
 logrotate
-mopidy
-mopidy-podcast
-mopidy-scrobbler
-mopidy-spotify
-mopidy-spotify-tunigo
+lynx
 mosh
 mpv
 nano
@@ -42,6 +39,7 @@ neovim
 nerd-fonts-fira-code
 nerd-fonts-iosevka
 nextcloud-client
+ntfs-3g
 nvidia
 nvidia-utils
 openssh
@@ -49,9 +47,8 @@ os-prober
 pacman
 pandoc
 pandoc-citeproc
-papis
 picom
-pkgconf
+playerctl
 polybar
 pulseaudio
 pulseaudio-alsa
@@ -59,7 +56,6 @@ pulsemixer
 python-pip
 python-pybtex
 python-pynvim
-python-pywal
 qutebrowser
 r
 redshift
@@ -70,8 +66,9 @@ rofi-dmenu
 rofi-greenclip
 rofimoji
 scrot
-shellcheck-static
-shfmt
+spotify
+sshfs
+stow
 surfraw
 sxhkd
 tar
@@ -100,7 +97,6 @@ unzip
 vagrant
 vifm
 virtualbox
-weechat
 wget
 which
 xcape
diff --git a/install.sh b/install.sh
new file mode 100755
index 0000000..a7b03e2
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+#
+# install.sh
+#
+# Installs dotfiles and packages for my setup
+#
+# Will first install yay, then all my used packages (read from bootstrap/packages.csv)
+#
+# Will symlink all my dotfiles into their correct places using autostow.sh
+
+main() {
+  local cmd=""
+  local ret=0
+
+  case "$1" in
+  -v | --version)
+    printf "Personal system bootstrap script.\n\n©Marty Oehme\n\nVersion: 0.1\n"
+    ;;
+  -h | --help)
+    printf "Usage: install [-f|--force][-v|--version][-h|--help]\n\n-f     Do not ask for any confirmations but force update and installation.\n"
+    ;;
+  -f | --force)
+    install true
+    ;;
+  *)
+    install false
+    ;;
+  esac
+  shift
+
+  $cmd "$@"
+  ret=$((ret + $?))
+  exit $ret
+}
+
+check_consent() {
+  echo "This will take a while, install many packages and link dotfiles all over the place. Proceed [y/N]?"
+  read -r yes
+  if [[ "$yes" != y* ]]; then
+    echo "Exiting."
+    exit
+  fi
+}
+
+install() {
+  unattended=$1
+  if ! "$unattended"; then
+    check_consent
+  fi
+  echo "====================== BEGINNING INSTALLATION ============================="
+  if ! "$unattended"; then
+    export BOOTSTRAP_PACKAGES="bootstrap/.config/bootstrap/packages.csv"
+    ./bootstrap/.config/bootstrap/install_packages.sh
+  else
+    export BOOTSTRAP_PACKAGES="bootstrap/.config/bootstrap/packages.csv"
+    ./bootstrap/.config/bootstrap/install_packages.sh -f
+  fi
+
+  echo "=================== BEGINNING DOTFILE MANAGEMENT =========================="
+  ./bootstrap/.config/bootstrap/autostow.sh -s
+
+  echo "====================== INSTALLATION FINISHED =============================="
+
+}
+
+main "$@"