diff --git a/.config/scripts/bootstrap/install.sh b/.config/scripts/bootstrap/install.sh
deleted file mode 100755
index c4d828f..0000000
--- a/.config/scripts/bootstrap/install.sh
+++ /dev/null
@@ -1,284 +0,0 @@
-#!/bin/sh
-# Luke's Auto Rice Boostrapping Script (LARBS)
-# by Luke Smith <luke@lukesmith.xyz>
-# License: GNU GPLv3
-
-### OPTIONS AND VARIABLES ###
-
-# unset our temp variables, just in case they were used for something else in shell
-unset pkgfiles dotfilesrepo targetuser targetpassword targetdeployment quietmode aurhelper loginshell
-
-while getopts ":a:r:f:F:t:s:h" o; do case "${o}" in
-    h) printf "Optional arguments for custom use:\\n  -r: Dotfiles repository (local file or url)\\n  -f: Dependencies and programs csv alongside defaults (local file or url)\\n  -F: Dependencies and programs csv replacing defaults (local file or url)\\n  -a: AUR helper (must have pacman-like syntax), defaults to yay\\n  -t: Target deployment (laptop, desktop, headless, none) to set up relevant package function groups\\n  -s: Default user shell. Must be a full path to the shell (/bin/zsh by default).\n  -h: Show this message\\n" && exit ;;
-	r) dotfilesrepo=${OPTARG} && git ls-remote "$dotfilesrepo" || exit ;;
-	a) aurhelper=${OPTARG} ;;
-    f) pkgfiles=${OPTARG} ;;
-    F) pkgfiles=${OPTARG} && exclusivepkgfiles=true ;;
-    t) targetdeployment=${OPTARG} ;;
-    s) loginshell=${OPTARG} ;;
-	*) printf "Invalid option: -%s\\n" "$OPTARG" && exit ;;
-esac done
-
-# DEFAULTS:
-[ -z "$dotfilesrepo" ] && dotfilesrepo="https://gitlab.com/marty-oehme/dotfiles.git"
-[ -z "$pkgfiles" ] && pkgfiles=""
-[ -z "$aurhelper" ] && aurhelper="yay"
-[ -z "$loginshell" ] && loginshell="/bin/zsh"
-
-### FUNCTIONS ###
-
-error() { clear; printf "ERROR:\\n%s\\n" "$1"; exit;}
-
-welcomemsg() { \
-	dialog --title "Welcome!" --msgbox "Welcome to Bootstrapping!\\n\\nThis script will automatically install necessary arch setup and a base package selection." 10 60
-	}
-
-getuserandpass() { \
-	# Prompts user for new username an password.
-	name=$(dialog --inputbox "First, please enter a name for the user account." 10 60 3>&1 1>&2 2>&3 3>&1) || exit
-	while ! echo "$name" | grep "^[a-z_][a-z0-9_-]*$" >/dev/null 2>&1; do
-		name=$(dialog --no-cancel --inputbox "Username not valid. Give a username beginning with a letter, with only lowercase letters, - or _." 10 60 3>&1 1>&2 2>&3 3>&1)
-	done
-	pass1=$(dialog --no-cancel --passwordbox "Enter a password for that user." 10 60 3>&1 1>&2 2>&3 3>&1)
-	pass2=$(dialog --no-cancel --passwordbox "Retype password." 10 60 3>&1 1>&2 2>&3 3>&1)
-	while ! [ "$pass1" = "$pass2" ]; do
-		unset pass2
-		pass1=$(dialog --no-cancel --passwordbox "Passwords do not match.\\n\\nEnter password again." 10 60 3>&1 1>&2 2>&3 3>&1)
-		pass2=$(dialog --no-cancel --passwordbox "Retype password." 10 60 3>&1 1>&2 2>&3 3>&1)
-	done ;}
-
-usercheck() { \
-	! (id -u "$name" >/dev/null) 2>&1 ||
-	dialog --colors --title "WARNING!" --yes-label "CONTINUE" --no-label "No wait..." --yesno "The user \`$name\` already exists on this system. LARBS can install for a user already existing, but it will \\Zboverwrite\\Zn any conflicting settings/dotfiles on the user account.\\n\\nLARBS will \\Zbnot\\Zn overwrite your user files, documents, videos, etc., so don't worry about that, but only click <CONTINUE> if you don't mind your settings being overwritten.\\n\\nNote also that LARBS will change $name's password to the one you just gave." 14 70
-	}
-
-preinstallmsg() { \
-	dialog --title "Let's get this party started!" --yes-label "Let's go!" --no-label "No, nevermind!" --yesno "The rest of the installation will now be totally automated, so you can sit back and relax.\\n\\nIt will take some time, but when done, you can relax even more with your complete system.\\n\\nNow just press <Let's go!> and the system will begin installation!" 13 60 || { clear; exit; }
-	}
-
-adduserandpass() { \
-	# Adds user `$name` with password $pass1.
-	dialog --infobox "Adding user \"$name\"..." 4 50
-	useradd -m -g wheel -s /bin/bash "$name" >/dev/null 2>&1 ||
-	usermod -a -G wheel "$name" && mkdir -p /home/"$name" && chown "$name":wheel /home/"$name"
-	echo "$name:$pass1" | chpasswd
-	unset pass1 pass2 ;}
-
-deploydialog() {
-    targetdeployment=$(dialog --title "Deployment Configuration" --radiolist "Select a target package configuration." 0 0 5 desktop "base, network, shell, gui, multimedia, development" on laptop "base, network, shell, gui, multimedia, development, battery, touchpad" off headless "base, network, shell" off none "Installs no packages." off 3>&1 1>&2 2>&3 3>&1) 
-}
-
-refreshkeys() { \
-	dialog --infobox "Refreshing Arch Keyring..." 4 40
-	pacman --noconfirm -Sy archlinux-keyring >/dev/null 2>&1
-	}
-
-newperms() { # Set special sudoers settings for install (or after).
-	sed -i "/#LARBS/d" /etc/sudoers
-	echo "$* #LARBS" >> /etc/sudoers ;}
-
-manualinstall() { # Installs $1 manually if not installed. Used only for AUR helper here.
-	[ -f "/usr/bin/$1" ] || (
-	dialog --infobox "Installing \"$1\", an AUR helper..." 4 50
-	cd /tmp || exit
-	rm -rf /tmp/"$1"*
-	curl -sO https://aur.archlinux.org/cgit/aur.git/snapshot/"$1".tar.gz &&
-	sudo -u "$name" tar -xvf "$1".tar.gz >/dev/null 2>&1 &&
-	cd "$1" &&
-	sudo -u "$name" makepkg --noconfirm -si >/dev/null 2>&1
-	cd /tmp || return) ;}
-
-maininstall() { # Installs all needed programs from main repo.
-	dialog --title "LARBS Installation" --infobox "Installing \`$1\` ($n of $total). $1 $2" 5 70
-	pacman --noconfirm --needed -S "$1" >/dev/null 2>&1
-	}
-
-gitmakeinstall() {
-	dir=$(mktemp -d)
-	dialog --title "LARBS Installation" --infobox "Installing \`$(basename "$1")\` ($n of $total) via \`git\` and \`make\`. $(basename "$1") $2" 5 70
-	git clone --depth 1 "$1" "$dir" >/dev/null 2>&1
-	cd "$dir" || exit
-	make >/dev/null 2>&1
-	make install >/dev/null 2>&1
-	cd /tmp || return ;}
-
-aurinstall() { \
-	dialog --title "LARBS Installation" --infobox "Installing \`$1\` ($n of $total) from the AUR. $1 $2" 5 70
-	echo "$aurinstalled" | grep "^$1$" >/dev/null 2>&1 && return
-	sudo -u "$name" $aurhelper -S --noconfirm "$1" >/dev/null 2>&1
-	}
-
-# get the link to the package collection
-getpackagegrouplink() {
-    case "$1" in
-        "none") pkggroup="";;
-        "desktop") pkggroup="https://gitlab.com/marty-oehme/dotfiles/snippets/1828258/raw" ;;
-        "laptop") pkggroup="https://gitlab.com/marty-oehme/dotfiles/snippets/1834307/raw" ;;
-        "headless") pkggroup="https://gitlab.com/marty-oehme/dotfiles/snippets/1834308/raw" ;;
-    esac
-}
-
-# can be called with as many csv files filled with packages as necessary
-# appends them all to one temporary file for the installation
-gatherpackages() {
-    concfile=$1
-	shift
-    touch $concfile
-    for progs in "$@"; do
-        ([ -f "$progs" ] && cat "$progs" >> $concfile) || curl -Ls "$progs" | sed '/^#/d' >> $concfile
-    done
-}
-
-installationloop() { \
-	total=$(wc -l < $1)
-	aurinstalled=$(pacman -Qm | awk '{print $1}')
-	while IFS=, read -r tag program comment; do
-		n=$((n+1))
-		echo "$comment" | grep "^\".*\"$" >/dev/null 2>&1 && comment="$(echo "$comment" | sed "s/\(^\"\|\"$\)//g")"
-		case "$tag" in
-			"") maininstall "$program" "$comment" ;;
-			"A") aurinstall "$program" "$comment" ;;
-			"G") gitmakeinstall "$program" "$comment" ;;
-		esac
-	done < $1 ;}
-
-dotfiles() { \
-	gpath=$1
-	shift
-	/usr/bin/git --git-dir=$gpath/.dotfiles --work-tree=$gpath $@
-}
-
-putgitrepo() { # Downlods a gitrepo $1 and places the files in $2 only overwriting conflicts
-	dialog --infobox "Downloading and installing config files..." 4 60
-	dir=$(mktemp -d)
-	dfdir="$2"
-	[ ! -d "$2" ] && mkdir -p "$2" && chown -R "$name:wheel" "$2"
-	chown -R "$name:wheel" "$dir"
-	sudo -u "$name" git clone --bare "$1" "$dir/gitrepo" >/dev/null 2>&1 &&
-	sudo -u "$name" cp -rfT "$dir/gitrepo" $dfdir/.dotfiles
-
-	sudo -u "$name" dotfiles $dfdir checkout
-	if [ $? = 0 ]; then
-		echo "Checked out dotfiles.";
-	else
-		echo "Backing up existing dotfiles.";
-		mkdir -p $2/.dotfiles-backup
-		sudo -u "$name" dotfiles $dfdir checkout 2>&1 | egrep "\s+\." | awk {'print $1'} | xargs -I{} mv {} $2/.dotfiles-backup/{}
-	fi;
-	sudo -u "$name" dotfiles $dfdir checkout
-	sudo -u "$name" dotfiles $dfdir config status.showUntrackedFiles no
-	}
-
-serviceinit() { for service in "$@"; do
-	dialog --infobox "Enabling \"$service\"..." 4 40
-	systemctl enable "$service"
-	systemctl start "$service"
-	done ;}
-
-systembeepoff() { dialog --infobox "Getting rid of error beep sound..." 10 50
-	rmmod pcspkr
-	echo "blacklist pcspkr" > /etc/modprobe.d/nobeep.conf ;}
-
-resetpulse() { dialog --infobox "Reseting Pulseaudio..." 4 50
-	killall pulseaudio
-	sudo -n "$name" pulseaudio --start ;}
-
-finalize(){ \
-	dialog --infobox "Preparing welcome message..." 4 50
-	dialog --title "All done!" --msgbox "Congrats! Provided there were no hidden errors, the script completed successfully and all the programs and configuration files should be in place.\\n\\nTo run the new graphical environment, log out and log back in as your new user, then run the command \"startx\" to start the graphical environment (it will start automatically in tty1).\\n\\n.t Luke" 12 80
-	}
-
-### THE ACTUAL SCRIPT ###
-
-### This is how everything happens in an intuitive format and order.
-
-# Check if user is root on Arch distro. Install dialog.
-pacman -Syu --noconfirm --needed dialog ||  error "Are you sure you're running this as the root user? Are you sure you're using an Arch-based distro? ;-) Are you sure you have an internet connection? Are you sure your Arch keyring is updated?"
-
-# Welcome user.
-welcomemsg || error "User exited."
-
-# Get and verify username and password.
-getuserandpass || error "User exited."
-
-# Give warning if user already exists.
-usercheck || error "User exited."
-
-# Let user select groups of packages to pre-install.
-if [ -z "$targetdeployment" ]; then
-   deploydialog || error "User exited."
-fi
-
-# Last chance for user to back out before install.
-preinstallmsg || error "User exited."
-
-### The rest of the script requires no user input.
-
-adduserandpass || error "Error adding username and/or password."
-
-# Refresh Arch keyrings.
-refreshkeys || error "Error automatically refreshing Arch keyring. Consider doing so manually."
-
-dialog --title "LARBS Installation" --infobox "Installing \`basedevel\` and \`git\` for installing other software." 5 70
-pacman --noconfirm --needed -S base-devel git >/dev/null 2>&1
-[ -f /etc/sudoers.pacnew ] && cp /etc/sudoers.pacnew /etc/sudoers # Just in case
-
-# Allow user to run sudo without password. Since AUR programs must be installed
-# in a fakeroot environment, this is required for all builds with AUR.
-newperms "%wheel ALL=(ALL) NOPASSWD: ALL"
-
-# Make pacman and yay colorful and adds eye candy on the progress bar because why not.
-sed -i "s/^#Color/Color/g;/#VerbosePkgLists/a ILoveCandy" /etc/pacman.conf
-
-# Use all cores for compilation.
-sed -i "s/-j2/-j$(nproc)/;s/^#MAKEFLAGS/MAKEFLAGS/" /etc/makepkg.conf
-
-manualinstall $aurhelper || error "Failed to install AUR helper."
-
-# the command that sets the correct link to gather our package files from
-# correct link depends on target deployment: desktop, laptop, server,..
-getpackagegrouplink $targetdeployment
-
-# append the default packages to whatever custom package csv links were passed in or 
-# only use the custom packages if forced with -F
-[ ! "$exclusivepkgfiles" ] && pkgfiles="$(curl -Ls $pkggroup | cat ) $pkgfiles"
-
-tmpfile=/tmp/pkgs.csv
-# actually gather the individual package installation lines from the various links and files
-gatherpackages $tmpfile $pkgfiles
-
-# The command that does all the installing. Reads the progs.csv file and
-# installs each needed program the way required. Be sure to run this only after
-# the user has been created and has privileges to run sudo without a password
-# and all build dependencies are installed.
-installationloop $tmpfile
-
-# Install the dotfiles in the user's home directory
-putgitrepo "$dotfilesrepo" "/home/$name"
-rm "/home/$name/README.md" 
-
-# Set user login shell to desired shell - usually zsh
-chsh -s $loginshell $name
-
-# Pulseaudio, if/when initially installed, often needs a restart to work immediately.
-[ -f /usr/bin/pulseaudio ] && resetpulse
-
-# Enable services here.
-serviceinit NetworkManager cronie
-
-# Most important command! Get rid of the beep!
-systembeepoff
-
-# This line, overwriting the `newperms` command above will allow the user to run
-# serveral important commands, `shutdown`, `reboot`, updating, etc. without a password.
-newperms "%wheel ALL=(ALL) ALL #LARBS
-%wheel ALL=(ALL) NOPASSWD: /usr/bin/shutdown,/usr/bin/reboot,/usr/bin/systemctl suspend,/usr/bin/wifi-menu,/usr/bin/mount,/usr/bin/umount,/usr/bin/pacman -Syu,/usr/bin/pacman -Syyu,/usr/bin/packer -Syu,/usr/bin/packer -Syyu,/usr/bin/systemctl restart NetworkManager,/usr/bin/rc-service NetworkManager restart,/usr/bin/pacman -Syyu --noconfirm,/usr/bin/loadkeys,/usr/bin/yay,/usr/bin/pacman -Syyuw --noconfirm"
-
-# Install vim `plugged` plugins.
-dialog --infobox "Installing (neo)vim plugins..." 4 50
-(sleep 30 && killall nvim) &
-sudo -u "$name" nvim -E -c "PlugUpdate|visual|q|q" >/dev/null 2>&1
-
-# Last message! Install complete!
-finalize
-clear
diff --git a/.config/scripts/bootstrap/pkg/base.csv b/.config/scripts/bootstrap/pkg/base.csv
deleted file mode 100644
index 45c8ad7..0000000
--- a/.config/scripts/bootstrap/pkg/base.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-,ntfs-3g,"allows accessing NTFS partitions."
-,dosfstools,"allows your computer to access dos-like filesystems."
-,topgrade,"tries to be your universal updater running everything in one go."
diff --git a/.config/scripts/bootstrap/pkg/dev.csv b/.config/scripts/bootstrap/pkg/dev.csv
deleted file mode 100644
index 418002d..0000000
--- a/.config/scripts/bootstrap/pkg/dev.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-,code,"is an open source gui code editor in the style of atom/sublime - but better."
-,vagrant,"is a development environment provisioning system which easily spins up virtual machines for you."
-,virtualbox,"is a virtual machine framework which is mainly used by vagrant."
-,docker,"should need no introduction, but allows you to run everything in a container."
-,docker-compose,"allows you to run many, many containers much more easily."
diff --git a/.config/scripts/bootstrap/pkg/media.csv b/.config/scripts/bootstrap/pkg/media.csv
deleted file mode 100644
index 980f135..0000000
--- a/.config/scripts/bootstrap/pkg/media.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-,pulseaudio,"is the audio system (>inb4 bloat)."
-,pulseaudio-alsa,"is an audio interface with ALSA."
-,pulsemixer,"is an intuitive ncurses audio controller."
-,mopidy,"is an extensible music server written in python."
-,ncmpcpp,"is a client for the mopidy music server (or, optionally, for mpd)"
-A,mopidy-spotify,"is a mopidy extension to play music from spotify."
-A,mopidy-scrobbler,"is a mopidy extension to scrobble to last.fm."
-A,mopidy-spotify-tunigo,"is a mopidy extension to enable spotify browsing."
-A,mopidy-podcast,"is a mopidy extension to search and browse podcasts."
-,mpv,"is the patrician's choice video/gif player."
-,youtube-dl,"can download any YouTube video (or playlist or channel) when given the link."
diff --git a/.config/scripts/bootstrap/pkg/network.csv b/.config/scripts/bootstrap/pkg/network.csv
deleted file mode 100644
index ea62e26..0000000
--- a/.config/scripts/bootstrap/pkg/network.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-,networkmanager,"does exactly what it sounds like."
-,openssh,"allows using ssh connections to connect to others or be connected to."
diff --git a/.config/scripts/bootstrap/pkg/shell.csv b/.config/scripts/bootstrap/pkg/shell.csv
deleted file mode 100644
index 19deaff..0000000
--- a/.config/scripts/bootstrap/pkg/shell.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-,zsh,"is a shell alternative to bash."
-,tmux,"is a terminal multiplexer and the dropdown window in LARBS."
-,neovim,"a tidier vim with some useful features"
-,ranger,"is an extensive terminal file manager that everyone likes."
-,fzf,"is a fuzzy finder tool."
-,unrar,"extracts rar's."
-,unzip,"unzips zips."
-,atool,"manages and gives information about archives."
diff --git a/.config/scripts/bootstrap/pkg/testing.csv b/.config/scripts/bootstrap/pkg/testing.csv
deleted file mode 100644
index f78d70d..0000000
--- a/.config/scripts/bootstrap/pkg/testing.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-#TAG,NAME IN REPO (or git url),PURPOSE (should be a verb phrase to sound right while installing)
-A,enpass-bin,"is a cross-platform personal password manager with gui."
-,gtk3,"is a gui toolkit, necessary for enpass-bin to work. (enpass forgets to install it)"
-,compton,"is a compositor for X that works well with i3."
-A,flashfocus,"is a simple toll that flashes any window which gains focus."
-,feh,"is a simple image viewer. Unfortunately it does not play well with tiled windows."
diff --git a/.config/scripts/bootstrap/pkg/x.csv b/.config/scripts/bootstrap/pkg/x.csv
deleted file mode 100644
index 521e541..0000000
--- a/.config/scripts/bootstrap/pkg/x.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-,xorg-server,"is the graphical server."
-,xorg-xinit,"starts the graphical server."
-,xorg-xauth,"manages X authentication settings."
-,xclip,"allows for copying and pasting from the command line."
-,xdotool,"provides window action utilities on the command line."
-,xcape,"allows using keys for different things whether pressed on their own or with others. For example, map capslock to escape."
-,i3-gaps,"is the main graphical user interface and window manager."
-,i3blocks,"is the status bar block provider for i3."
-,i3status,"is the status bar for i3."
-,i3lock,"is the i3 screen lock provider."
-A,j4-dmenu-desktop,"is a faster dmenu replacement, the application launcher of the i3 suite."
-A,nerd-fonts-iosevka,"is the mono-space font of choice, patched with embedded icon symbols."
-,alacritty,"is an efficient, unicode compatible terminal emulator."
-,qutebrowser,"is a keyboard focused browser with vim-keys enabled."