diff --git a/kiosk_skeleton/build.sh b/kiosk_skeleton/build.sh
index e04fa08..84a2a79 100755
--- a/kiosk_skeleton/build.sh
+++ b/kiosk_skeleton/build.sh
@@ -3,7 +3,7 @@
 
 apt update
 APT_LISTCHANGES_FRONTEND=none DEBIAN_FRONTEND=noninteractive apt dist-upgrade -y
-DEBIAN_FRONTEND=noninteractive apt install -y lightdm openbox nginx php-fpm php-cli chromium autossh unclutter x11-xserver-utils xdotool htop nano openssh-server rsync x11vnc lm-sensors ntpdate scrot
+DEBIAN_FRONTEND=noninteractive apt install -y lightdm openbox nginx php-fpm php-cli chromium autossh unclutter x11-xserver-utils xdotool htop nano openssh-server rsync x11vnc lm-sensors ntpdate scrot wireless-regdb
 
 rsync -a --chown=root:root "/kiosk_skeleton/." "/"
 chown -hR pi:pi /home/pi
@@ -60,10 +60,10 @@ ln -sf /tmp/wpa_supplicant.conf /etc/wpa_supplicant/wpa_supplicant.conf
 systemctl daemon-reload
 
 # remove unneccessary clutter
-systemctl disable dphys-swapfile
-systemctl disable ModemManager
-systemctl disable avahi-daemon
-systemctl disable bluetooth
+systemctl disable dphys-swapfile || true
+systemctl disable ModemManager || true
+systemctl disable avahi-daemon || true
+systemctl disable bluetooth || true
 
 systemctl enable kiosk-ssh-keys
 systemctl enable kiosk-wifi
diff --git a/kiosk_skeleton/etc/systemd/system/systemd-rfkill.service.d/override.conf b/kiosk_skeleton/etc/systemd/system/systemd-rfkill.service.d/override.conf
new file mode 100644
index 0000000..4e9e21a
--- /dev/null
+++ b/kiosk_skeleton/etc/systemd/system/systemd-rfkill.service.d/override.conf
@@ -0,0 +1,2 @@
+[Service]
+StateDirectory=
diff --git a/kiosk_skeleton/etc/default/grub.d/anotterkiosk.cfg b/x86_skeleton/etc/default/grub.d/anotterkiosk.cfg
similarity index 100%
rename from kiosk_skeleton/etc/default/grub.d/anotterkiosk.cfg
rename to x86_skeleton/etc/default/grub.d/anotterkiosk.cfg
diff --git a/x86_skeleton/setup.sh b/x86_skeleton/setup.sh
index 3a54b5d..6c89cc7 100755
--- a/x86_skeleton/setup.sh
+++ b/x86_skeleton/setup.sh
@@ -5,7 +5,7 @@ apt update
 apt install -y polkitd locales zstd dhcpcd wpasupplicant
 locale-gen en_US.UTF-8
 
-apt install -y firmware-amd-graphics firmware-iwlwifi firmware-brcm80211 firmware-atheros firmware-misc-nonfree firmware-realtek
+apt install -y firmware-amd-graphics firmware-iwlwifi firmware-brcm80211 firmware-atheros firmware-misc-nonfree firmware-realtek firmware-ath9k-htc
 
 echo "grub-efi-amd64 grub2/force_efi_extra_removable boolean true" | debconf-set-selections
 update-grub