diff --git a/fix-raspian-defaults/install-packages.sh b/fix-raspian-defaults/install-packages.sh
deleted file mode 100644
index 3e4e25d..0000000
--- a/fix-raspian-defaults/install-packages.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-PKGS="
-    bash-completion
-    build-essential
-    byobu
-    command-not-found
-    cryptsetup-bin
-    daemontools
-    golang-go
-    iptables-persistent
-    iptraf-ng
-    jq
-    less
-    lsof
-    mosh
-    ntp
-    pbzip2
-    pv
-    runit
-    runit-systemd
-    socat
-    vim
-    wget
-"
-
-export DEBIAN_FRONTEND=noninteractive
-
-sudo apt update
-sudo apt install -y $PKGS
diff --git a/fix-raspian-defaults/root/boot/setup-scripts/05-packages.sh b/fix-raspian-defaults/root/boot/setup-scripts/05-packages.sh
index c1f922a..7463729 100644
--- a/fix-raspian-defaults/root/boot/setup-scripts/05-packages.sh
+++ b/fix-raspian-defaults/root/boot/setup-scripts/05-packages.sh
@@ -1,36 +1,13 @@
-PKGS="
-    apt-transport-https
-    byobu
-    ca-certificates
-    cryptsetup-bin
-    curl
-    dirmngr
-    dnsutils
-    gnupg-agent
-    gnupg2
-    haveged
-    inetutils-ping
-    jq
-    lsof
-    man-db
-    mosh
-    nmap
-    opensc
-    pcscd
-    pinentry-curses
-    pv
-    rsync
-    runit
-    runit-systemd
-    scdaemon
-    screen
-    software-properties-common
-    usbmount
-    vim
-    wget
-"
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+PKGS="$(cat $DIR/packages.txt)"
 
 export DEBIAN_FRONTEND=noninteractive
+
 apt update
+
 apt upgrade -y
-apt install -y $PKGS
+
+for PKG in $PKGS ; do
+    apt install -y $PKG
+done
diff --git a/fix-raspian-defaults/root/boot/setup-scripts/20-install-nvm-and-node.sh b/fix-raspian-defaults/root/boot/setup-scripts/20-install-nvm-and-node.sh
deleted file mode 100644
index 70c9b10..0000000
--- a/fix-raspian-defaults/root/boot/setup-scripts/20-install-nvm-and-node.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-
-export DEBIAN_FRONTEND=noninteractive
-apt update
-apt install -y git
-
-export HOME=/root
-git clone https://github.com/creationix/nvm.git /root/.nvm
-
-cat >> /root/.bashrc <<'EOF'
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-EOF
-
-source /root/.bashrc
-
-nvm install 10
-nvm use 10
-
-npm install -g npm@latest
-npm install -g yarn
diff --git a/fix-raspian-defaults/root/boot/setup-scripts/30-install-signoffline.sh b/fix-raspian-defaults/root/boot/setup-scripts/30-install-signoffline.sh
deleted file mode 100644
index 6113638..0000000
--- a/fix-raspian-defaults/root/boot/setup-scripts/30-install-signoffline.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-export NVM_DIR="$HOME/.nvm"
-source "$NVM_DIR/nvm.sh"
-
-nvm use 8
-
-# @next as of 14 nov 2018
-VERSION="5cd9d6be4f05831f76a12cc833e1fbd5b6e143cd"
-
-unzip -d /var/lib/signoffline /boot/signoffline.zip
-cd /var/lib/signoffline
-git checkout $VERSION
-yarn install
diff --git a/fix-raspian-defaults/root/boot/setup-scripts/99-disable-swap.sh b/fix-raspian-defaults/root/boot/setup-scripts/99-disable-swap.sh
deleted file mode 100644
index 08855de..0000000
--- a/fix-raspian-defaults/root/boot/setup-scripts/99-disable-swap.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-/sbin/dphys-swapfile swapoff
-/sbin/dphys-swapfile uninstall
-apt purge -y dphys-swapfile
-swapoff -a
-rm /var/swap
diff --git a/fix-raspian-defaults/setup-keys.sh b/fix-raspian-defaults/root/boot/setup-scripts/99-setup-keys.sh
similarity index 100%
rename from fix-raspian-defaults/setup-keys.sh
rename to fix-raspian-defaults/root/boot/setup-scripts/99-setup-keys.sh
diff --git a/fix-raspian-defaults/root/boot/setup-scripts/packagelist.txt b/fix-raspian-defaults/root/boot/setup-scripts/packagelist.txt
new file mode 100644
index 0000000..05d3d6c
--- /dev/null
+++ b/fix-raspian-defaults/root/boot/setup-scripts/packagelist.txt
@@ -0,0 +1,40 @@
+apt-transport-https
+bash-completion
+build-essential
+byobu
+ca-certificates
+command-not-found
+cryptsetup-bin
+curl
+daemontools
+dirmngr
+dnsutils
+gnupg-agent
+gnupg2
+golang-go
+haveged
+inetutils-ping
+iptables-persistent
+iptraf-ng
+jq
+less
+lsof
+man-db
+mosh
+nmap
+ntp
+opensc
+pbzip2
+pcscd
+pinentry-curses
+pv
+rsync
+runit
+runit-systemd
+scdaemon
+screen
+socat
+software-properties-common
+usbmount
+vim
+wget
diff --git a/fix-raspian-defaults/root/etc/default/crda b/fix-raspian-defaults/root/etc/default/crda
new file mode 100644
index 0000000..c9dbdb4
--- /dev/null
+++ b/fix-raspian-defaults/root/etc/default/crda
@@ -0,0 +1 @@
+REGDOMAIN=US
diff --git a/fix-raspian-defaults/root/etc/default/keyboard b/fix-raspian-defaults/root/etc/default/keyboard
index e69de29..3fecbcc 100644
--- a/fix-raspian-defaults/root/etc/default/keyboard
+++ b/fix-raspian-defaults/root/etc/default/keyboard
@@ -0,0 +1,10 @@
+# KEYBOARD CONFIGURATION FILE
+
+# Consult the keyboard(5) manual page.
+
+XKBMODEL="pc105"
+XKBLAYOUT="us"
+XKBVARIANT=""
+XKBOPTIONS=""
+
+BACKSPACE="guess"