diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 3c7df905..7e4e2db6 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -92,8 +92,8 @@ TESTS = {
         'Status': {},
         },
     'iobenchmark': {
-        'Enabled': False,
         'Data': {},
+        'Enabled': False,
         'Results': {},
         'Status': {},
         },
diff --git a/.bin/Scripts/functions/setup.py b/.bin/Scripts/functions/setup.py
index bc7ab325..915e8407 100644
--- a/.bin/Scripts/functions/setup.py
+++ b/.bin/Scripts/functions/setup.py
@@ -106,10 +106,6 @@ SETTINGS_MOZILLA_FIREFOX_64 = {
         },
     }
 VCR_REDISTS = [
-    {'Name': 'Visual C++ 2008 SP1 x32...',
-        'Cmd': [r'2008sp1\x32\vcredist.exe', '/qb! /norestart']},
-    {'Name': 'Visual C++ 2008 SP1 x64...',
-        'Cmd': [r'2008sp1\x64\vcredist.exe', '/qb! /norestart']},
     {'Name': 'Visual C++ 2010 x32...',
         'Cmd': [r'2010sp1\x32\vcredist.exe', '/passive', '/norestart']},
     {'Name': 'Visual C++ 2010 x64...',
diff --git a/.bin/Scripts/pacinit b/.bin/Scripts/pacinit
new file mode 100755
index 00000000..eda3f960
--- /dev/null
+++ b/.bin/Scripts/pacinit
@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+## Wizard Kit: Update pacman settings to usage in live sessions
+
+# Disable custom repo (used at build-time)
+sudo sed -i -r "s/^(\[custom\])/#\1/" /etc/pacman.conf
+sudo sed -i -r "s/^(SigLevel = Optional TrustAll)/#\1/" /etc/pacman.conf
+sudo sed -i -r "s/^(Server = )/#\1/" /etc/pacman.conf
+
+# Disable signature checks
+sudo sed -i -r "s/^SigLevel.*/SigLevel = Never/" /etc/pacman.conf
+
+# Refresh package databases
+sudo pacman -Sy
+
diff --git a/.linux_items/.gitignore b/.linux_items/.gitignore
deleted file mode 100644
index 5495eced..00000000
--- a/.linux_items/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-wk_tmp
-wk-repo
diff --git a/.linux_items/include/airootfs/etc/skel/.aliases b/.linux_items/include/airootfs/etc/skel/.aliases
index 03d15315..bf7507bc 100644
--- a/.linux_items/include/airootfs/etc/skel/.aliases
+++ b/.linux_items/include/airootfs/etc/skel/.aliases
@@ -16,7 +16,6 @@ alias ls='ls --color=auto'
 alias mkdir='mkdir -p'
 alias mount='sudo mount'
 alias mv='mv -nv'
-alias pacinit='sudo sed -i -r "s/^SigLevel.*/SigLevel = Never/" /etc/pacman.conf; sudo pacman -Sy'
 alias photorec-sort='sudo photorec-sort'
 alias photorec='sudo photorec'
 alias q1='clear && ls -1'
diff --git a/.linux_items/include/syslinux/wk_pxe_extras.cfg b/.linux_items/include/syslinux/wk_pxe_extras.cfg
index d677b4b0..f4118570 100644
--- a/.linux_items/include/syslinux/wk_pxe_extras.cfg
+++ b/.linux_items/include/syslinux/wk_pxe_extras.cfg
@@ -4,6 +4,6 @@ MENU BACKGROUND pxelinux.png
 INCLUDE boot/syslinux/wk_pxe_linux.cfg
 INCLUDE boot/syslinux/wk_pxe_linux_extras.cfg
 #UFD#INCLUDE boot/syslinux/wk_pxe_winpe.cfg
-INCLUDE boot/syslinux/wk_hdt.cfg
+#DISABLED_UPSTREAM_BUG#INCLUDE boot/syslinux/wk_hdt.cfg
 
 INCLUDE boot/syslinux/wk_tail.cfg
diff --git a/.linux_items/include/syslinux/wk_sys_extras.cfg b/.linux_items/include/syslinux/wk_sys_extras.cfg
index 9d77c1d8..fbd69b00 100644
--- a/.linux_items/include/syslinux/wk_sys_extras.cfg
+++ b/.linux_items/include/syslinux/wk_sys_extras.cfg
@@ -5,6 +5,6 @@ INCLUDE boot/syslinux/wk_sys_linux_extras.cfg
 #UFD#INCLUDE boot/syslinux/wk_sys_winpe.cfg
 #UFD#INCLUDE boot/syslinux/1201_hdclone.cfg
 #UFD#INCLUDE boot/syslinux/1201_eset.cfg
-INCLUDE boot/syslinux/wk_hdt.cfg
+#DISABLED_UPSTREAM_BUG#INCLUDE boot/syslinux/wk_hdt.cfg
 
 INCLUDE boot/syslinux/wk_tail.cfg
diff --git a/Build Linux b/Build Linux
index c65ffed0..e6fe5d17 100755
--- a/Build Linux	
+++ b/Build Linux	
@@ -229,7 +229,7 @@ function update_live_env() {
     ssh-keygen -b 4096 -C "$username@$hostname" -N "" -f "$SKEL_DIR/.ssh/id_rsa"
     echo 'rm /root/.ssh/id*' >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
     echo 'rm /root/.zlogin' >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
-    sed -r '/.*PermitRootLogin.*/d' "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
+    sed -i -r 's/^(.*PermitRootLogin.*)$/PermitRootLogin no/' "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
     cp "$ROOT_DIR/.linux_items/authorized_keys" "$SKEL_DIR/.ssh/authorized_keys"
     
     # Root user