diff --git a/archlive/airootfs/etc/netctl/interfaces/wl-any b/archlive/airootfs/etc/netctl/interfaces/wl-any
new file mode 100644
index 00000000..997c0ab3
--- /dev/null
+++ b/archlive/airootfs/etc/netctl/interfaces/wl-any
@@ -0,0 +1,7 @@
+#!/bin/bash
+for interface in /sys/class/net/wl*; do
+    break
+done
+
+Interface=$(basename $interface)
+echo "wl-any: using interface $Interface"
diff --git a/archlive/airootfs/etc/netctl/wireless b/archlive/airootfs/etc/netctl/wireless
new file mode 100644
index 00000000..b0dee1a9
--- /dev/null
+++ b/archlive/airootfs/etc/netctl/wireless
@@ -0,0 +1,6 @@
+Description='A wpa_supplicant configuration file based wireless connection'
+Interface=wl-any
+Connection=wireless
+Security=wpa-config
+WPAConfigFile='/run/archiso/bootmnt/config/wifi.conf'
+IP=dhcp
diff --git a/archlive/airootfs/etc/nodm.conf b/archlive/airootfs/etc/nodm.conf
deleted file mode 100644
index dfcb5113..00000000
--- a/archlive/airootfs/etc/nodm.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# nodm configuration file
-
-# Controls the user that is used to automatically log in
-NODM_USER='wktech'
-
-# Options to pass to the X server (for example: "vt7 -nolisten tcp")
-NODM_X_OPTIONS='vt7 -nolisten tcp'
-
-# Minimum time (in seconds) that a session should last in order for nodm to
-# decide that it has not quit too soon.  If an X session will run for less than
-# this time, nodm will wait an increasing bit of time before restarting it.
-NODM_MIN_SESSION_TIME=60
-
-# Restart session after it ending?
-NODM_RESTART_SESSION=0
-
-# Path to the xinit program
-NODM_XINIT='/usr/bin/xinit'
-
-# Path to the X session script (useful if using xinit instead of startx).
-# NOTE: This file needs to be executable!
-NODM_XSESSION='/home/wktech/.xinitrc'
diff --git a/archlive/airootfs/etc/pam.d/nodm b/archlive/airootfs/etc/pam.d/nodm
new file mode 100644
index 00000000..f9d49579
--- /dev/null
+++ b/archlive/airootfs/etc/pam.d/nodm
@@ -0,0 +1,5 @@
+#%PAM-1.0
+
+auth      include   system-login
+account   include   system-login
+password  include   system-login
diff --git a/archlive/airootfs/etc/resolv.conf b/archlive/airootfs/etc/resolv.conf
new file mode 100644
index 00000000..db8b0a07
--- /dev/null
+++ b/archlive/airootfs/etc/resolv.conf
@@ -0,0 +1,8 @@
+nameserver 8.8.8.8
+nameserver 8.8.4.4
+#nameserver 2001:4860:4860::8888
+#nameserver 2001:4860:4860::8844
+nameserver 208.67.222.222
+nameserver 208.67.220.220
+#nameserver 2620:0:ccc::2
+#nameserver 2620:0:ccd::2
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index 14332612..aa79af3c 100644
--- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -45,7 +45,6 @@
     </property>
     <property name="plugin-8" type="string" value="systray">
       <property name="names-visible" type="array">
-        <value type="string" value="networkmanager applet"/>
         <value type="string" value="xfce4-power-manager"/>
         <value type="string" value="task manager"/>
         <value type="string" value="notes"/>
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
index bfaccb81..fd93ee1c 100644
--- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
@@ -30,7 +30,8 @@
     <property name="LaunchGNOME" type="bool" value="true"/>
   </property>
   <property name="shutdown" type="empty">
-    <property name="ShowSuspend" type="bool" value="false"/>
     <property name="ShowHibernate" type="bool" value="false"/>
+    <property name="ShowLogout" type="bool" value="false"/>
+    <property name="ShowSuspend" type="bool" value="false"/>
   </property>
 </channel>
diff --git a/archlive/airootfs/etc/skel/.conky_start b/archlive/airootfs/etc/skel/.conky_start
index c7230b17..5c12ed79 100644
--- a/archlive/airootfs/etc/skel/.conky_start
+++ b/archlive/airootfs/etc/skel/.conky_start
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 CONKY_RC="$HOME/.conkyrc"
-if [[ -f "/run/archiso/bootmnt/arch/conky.rc" ]]; then
-    CONKY_RC="/run/archiso/bootmnt/arch/conky.rc"
+if [[ -f "/run/archiso/bootmnt/config/conky.rc" ]]; then
+    CONKY_RC="/run/archiso/bootmnt/config/conky.rc"
 fi
 
 sleep 2s && conky -c "${CONKY_RC}" -dq
diff --git a/archlive/airootfs/etc/skel/.conkyrc b/archlive/airootfs/etc/skel/.conkyrc
index 4782d0d8..bd492c9b 100644
--- a/archlive/airootfs/etc/skel/.conkyrc
+++ b/archlive/airootfs/etc/skel/.conkyrc
@@ -16,7 +16,7 @@ own_window yes
 own_window_type normal
 own_window_transparent no
 own_window_hints undecorated,below,skip_taskbar,skip_pager,sticky
-own_window_colour 421114
+own_window_colour 000000
 own_window_class Conky
 #own_window_title Bunsen Labs Default Conky
 own_window_title Default Conky
diff --git a/archlive/airootfs/etc/skel/.network_start b/archlive/airootfs/etc/skel/.network_start
index d6e16c7f..057cc627 100644
--- a/archlive/airootfs/etc/skel/.network_start
+++ b/archlive/airootfs/etc/skel/.network_start
@@ -1,5 +1,4 @@
 #!/bin/bash
 
-sudo systemctl start NetworkManager
 connect-to-network
 
diff --git a/archlive/airootfs/etc/skel/.xinitrc b/archlive/airootfs/etc/skel/.xinitrc
index f7420078..a949cf0b 100644
--- a/archlive/airootfs/etc/skel/.xinitrc
+++ b/archlive/airootfs/etc/skel/.xinitrc
@@ -24,4 +24,6 @@ eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
 export SSH_AUTH_SOCK
 
 # Start Xfce4
-exec startxfce4
+if [ -z "$DISPLAY" ] && [ "$(fgconsole)" -eq 1 ]; then
+    exec startxfce4
+fi
diff --git a/archlive/airootfs/etc/skel/.zlogin b/archlive/airootfs/etc/skel/.zlogin
new file mode 100644
index 00000000..a949cf0b
--- /dev/null
+++ b/archlive/airootfs/etc/skel/.zlogin
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+fi
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+# Start GNOME-Keyring
+eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
+export SSH_AUTH_SOCK
+
+# Start Xfce4
+if [ -z "$DISPLAY" ] && [ "$(fgconsole)" -eq 1 ]; then
+    exec startxfce4
+fi
diff --git a/archlive/airootfs/etc/systemd/network/wired.network b/archlive/airootfs/etc/systemd/network/wired.network
new file mode 100644
index 00000000..e11c5e7f
--- /dev/null
+++ b/archlive/airootfs/etc/systemd/network/wired.network
@@ -0,0 +1,9 @@
+[Match]
+Name=en*
+
+[Network]
+DHCP=ipv4
+DNS=8.8.8.8
+DNS=8.8.4.4
+DNS=208.67.222.222
+DNS=208.67.220.220
diff --git a/archlive/airootfs/etc/systemd/system/NetworkManagerFork.service b/archlive/airootfs/etc/systemd/system/NetworkManagerFork.service
deleted file mode 100644
index fe1944f7..00000000
--- a/archlive/airootfs/etc/systemd/system/NetworkManagerFork.service
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=Network Manager
-Wants=network.target
-After=network-pre.target dbus.service
-Before=network.target 
-
-[Service]
-Type=forking
-PIDFile=/var/run/NetworkManager.pid
-BusName=org.freedesktop.NetworkManager
-ExecReload=/bin/kill -HUP $MAINPID
-ExecStart=/usr/bin/NetworkManager --pid-file=/var/run/NetworkManager.pid --no-daemon
-REstart=on-failure
-# NM doesn't want systemd to kill its children for it
-KillMode=process
-CapabilityBoundingSet=CAP_NET_ADMIN CAP_DAC_OVERRIDE CAP_NET_RAW CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_MODULE CAP_AUDIT_WRITE CAP_KILL CAP_SYS_CHROOT
-ProtectSystem=true
-ProtectHome=read-only
-
-[Install]
-WantedBy=multi-user.target
-Alias=dbus-org.freedesktop.NetworkManager.service
-Also=NetworkManager-dispatcher.service
diff --git a/archlive/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service b/archlive/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
deleted file mode 100644
index a7e5cd4e..00000000
--- a/archlive/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/NetworkManager-dispatcher.service
\ No newline at end of file
diff --git a/archlive/airootfs/etc/systemd/system/display-manager.service b/archlive/airootfs/etc/systemd/system/display-manager.service
deleted file mode 100644
index 0ce57dc6..00000000
--- a/archlive/airootfs/etc/systemd/system/display-manager.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/nodm.service
\ No newline at end of file
diff --git a/archlive/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service b/archlive/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
new file mode 100644
index 00000000..4c158e62
--- /dev/null
+++ b/archlive/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/systemd-networkd.service
\ No newline at end of file
diff --git a/archlive/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/archlive/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket
new file mode 100644
index 00000000..51942c8e
--- /dev/null
+++ b/archlive/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket
@@ -0,0 +1 @@
+/usr/lib/systemd/system/systemd-networkd.socket
\ No newline at end of file
diff --git a/archlive/airootfs/etc/udev/rules.d/81-dhcpcd.rules b/archlive/airootfs/etc/udev/rules.d/81-dhcpcd.rules
deleted file mode 100644
index 1c4053c0..00000000
--- a/archlive/airootfs/etc/udev/rules.d/81-dhcpcd.rules
+++ /dev/null
@@ -1 +0,0 @@
-ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="en*|eth*", ENV{SYSTEMD_WANTS}="dhcpcd@$name.service"
diff --git a/archlive/airootfs/etc/vconsole.conf b/archlive/airootfs/etc/vconsole.conf
index 0a6a8587..9cec5feb 100644
--- a/archlive/airootfs/etc/vconsole.conf
+++ b/archlive/airootfs/etc/vconsole.conf
@@ -1,3 +1,2 @@
 KEYMAP=us
 FONT=ter-u16n
-FONT_MAP=8859-2
diff --git a/archlive/airootfs/etc/xdg/xfce4/kiosk/kioskrc b/archlive/airootfs/etc/xdg/xfce4/kiosk/kioskrc
new file mode 100644
index 00000000..fec17f8a
--- /dev/null
+++ b/archlive/airootfs/etc/xdg/xfce4/kiosk/kioskrc
@@ -0,0 +1,3 @@
+[xfce4-session]
+SaveSession=None
+
diff --git a/archlive/airootfs/root/customize_airootfs.sh b/archlive/airootfs/root/customize_airootfs.sh
index 2f6ec861..ba4b425c 100644
--- a/archlive/airootfs/root/customize_airootfs.sh
+++ b/archlive/airootfs/root/customize_airootfs.sh
@@ -21,7 +21,7 @@ echo "root:Abracadabra" | chpasswd
 groupadd -r autologin
 
 # Add wktech user
-useradd -m -s /bin/zsh -G autologin,storage,wheel -U wktech
+useradd -m -s /bin/zsh -G autologin,power,storage,wheel -U wktech
 echo "wktech:Abracadabra" | chpasswd
 
 # Enable sudo for %wheel
@@ -42,6 +42,24 @@ sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/systemd/logind.conf
 sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/systemd/logind.conf
 sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' /etc/systemd/logind.conf
 
+# DNS Settings
+#echo "nameserver 8.8.8.8" > /etc/resolv.conf
+#echo "nameserver 8.8.4.4" >> /etc/resolv.conf
+#echo "nameserver 2001:4860:4860::8888" >> /etc/resolv.conf
+#echo "nameserver 2001:4860:4860::8844" >> /etc/resolv.conf
+#echo "nameserver 208.67.222.222" >> /etc/resolv.conf
+#echo "nameserver 208.67.220.220" >> /etc/resolv.conf
+#echo "nameserver 2620:0:ccc::2" >> /etc/resolv.conf
+#echo "nameserver 2620:0:ccd::2" >> /etc/resolv.conf
+
 # Startup settings
-#systemctl set-default multi-user.target
-systemctl set-default graphical.target
+systemctl set-default multi-user.target
+#systemctl set-default graphical.target
+
+# archiso cleanup
+for file in /etc/systemd/system/{pacman-init.service,etc-pacman.d-gnupg.mount} /etc/systemd/scripts/choose-mirror /etc/udev/rules.d/81-dhcpcd.rules /etc/initcpio; do
+    if [ -e "$file" ]; then
+        rm "$file" -R
+    fi
+done
+
diff --git a/archlive/airootfs/usr/local/bin/connect-to-network b/archlive/airootfs/usr/local/bin/connect-to-network
index 94a6d257..95daacf4 100644
--- a/archlive/airootfs/usr/local/bin/connect-to-network
+++ b/archlive/airootfs/usr/local/bin/connect-to-network
@@ -12,8 +12,8 @@ die () {
 }
 
 # Load settings
-if [[ -f "/run/archiso/bootmnt/arch/arch.conf" ]]; then
-    source "/run/archiso/bootmnt/arch/arch.conf" || \
+if [[ -f "/run/archiso/bootmnt/config/arch.conf" ]]; then
+    source "/run/archiso/bootmnt/config/arch.conf" || \
         die "ERROR: ARCH_WK media may be damaged. Please reboot or try another UFD"
 else
     source "/usr/local/bin/arch.conf" || \
@@ -48,7 +48,7 @@ if ! ip a | grep -Eq '(192.168|10.[0-9]+).[0-9]+.[0-9]+'; then
         ## Skip if we're already connected (i.e. the code above worked)
         if ! ip a | grep -Eq '(192.168|10.[0-9]+).[0-9]+.[0-9]+'; then
             echo "Attempting to connect to ${WIFI_SSID}..."
-            nmcli dev wifi con "${WIFI_SSID}" password "${WIFI_PASS}"
+            netctl start wireless
             sleep 5s
         fi
     fi
diff --git a/archlive/airootfs/usr/local/bin/hw-diags-inner b/archlive/airootfs/usr/local/bin/hw-diags-inner
index c805ce1a..2381af57 100644
--- a/archlive/airootfs/usr/local/bin/hw-diags-inner
+++ b/archlive/airootfs/usr/local/bin/hw-diags-inner
@@ -8,8 +8,8 @@ die () {
 }
 
 # Load settings
-if [[ -f "/run/archiso/bootmnt/arch/arch.conf" ]]; then
-    source "/run/archiso/bootmnt/arch/arch.conf" || \
+if [[ -f "/run/archiso/bootmnt/config/arch.conf" ]]; then
+    source "/run/archiso/bootmnt/config/arch.conf" || \
         die "ERROR: ARCH_WK media may be damaged. Please reboot or try another UFD"
 else
     source "/usr/local/bin/arch.conf" || \
@@ -288,9 +288,9 @@ fi
 # SMART
 if [[ "$TEST_SMART" == "True" ]]; then
     clear
-    SMART_ERRORS="False"
     echo "Checking SMART status..."
     for d in "${DRIVES[@]}"; do
+        SMART_ERRORS="False"
         tmp_device="${d##*/}"
         eval "${tmp_device}_smart_result=Working"
         inxi -Dxx | grep "/dev/${tmp_device}" | sed -r "s#.*/dev/${tmp_device} (.*)#  \1#" > "${tmp_device}_report.out"
diff --git a/archlive/airootfs/usr/local/bin/mount-backup-shares b/archlive/airootfs/usr/local/bin/mount-backup-shares
index 3e372bb3..79f51bad 100644
--- a/archlive/airootfs/usr/local/bin/mount-backup-shares
+++ b/archlive/airootfs/usr/local/bin/mount-backup-shares
@@ -8,8 +8,8 @@ die () {
 }
 
 # Load settings
-if [[ -f "/run/archiso/bootmnt/arch/arch.conf" ]]; then
-    source "/run/archiso/bootmnt/arch/arch.conf" || \
+if [[ -f "/run/archiso/bootmnt/config/arch.conf" ]]; then
+    source "/run/archiso/bootmnt/config/arch.conf" || \
         die "ERROR: ARCH_WK media may be damaged. Please reboot or try another UFD"
 else
     source "/usr/local/bin/arch.conf" || \
diff --git a/archlive/airootfs/usr/local/bin/wifi.conf b/archlive/airootfs/usr/local/bin/wifi.conf
new file mode 100644
index 00000000..0b0d5850
--- /dev/null
+++ b/archlive/airootfs/usr/local/bin/wifi.conf
@@ -0,0 +1,9 @@
+ctrl_interface=/var/run/wpa_supplicant
+eapol_version=1
+ap_scan=1
+fast_reauth=1
+network={
+    ssid="SomeWiFi"
+    psk="Abracadabra"
+    priority=5
+}
diff --git a/archlive/packages.both b/archlive/packages.both
index 979ae849..6010db11 100644
--- a/archlive/packages.both
+++ b/archlive/packages.both
@@ -1,8 +1,9 @@
 arch-install-scripts
+aic94xx-firmware
 alsa-utils
 antiword
 arc-icon-theme-git
-b43-fwcutter
+b43-firmware
 btrfs-progs
 chntpw
 clonezilla
@@ -40,6 +41,7 @@ hdparm
 hexedit
 hfsprogs
 htop
+ifplugd
 inxi
 ipw2100-fw
 ipw2200-fw
@@ -49,6 +51,7 @@ lftp
 libewf
 librsvg
 linux-atm
+linux-firmware
 lm_sensors
 lsscsi
 mc
@@ -64,19 +67,15 @@ mtools
 mupdf
 ncdu
 ndisc6
-network-manager-applet
-networkmanager
 nfs-utils
 nilfs-utils
 nmap
-nodm
 noto-fonts
 ntfs-3g
 ntp
 numix-circle-icon-theme-git
 openconnect
 openssh
-openvpn
 p7zip
 partclone
 parted
@@ -109,9 +108,9 @@ unzip
 usb_modeswitch
 vim
 vpnc
+wd719x-firmware
 wget
 wireless_tools
-wpa_actiond
 wpa_supplicant
 wvdial
 xf86-input-synaptics
diff --git a/archlive/packages.x86_64 b/archlive/packages.x86_64
index 36c41284..aa6a8d31 100644
--- a/archlive/packages.x86_64
+++ b/archlive/packages.x86_64
@@ -1 +1,2 @@
+broadcom-wl
 gputest