diff --git a/.linux_items/include/EFI/boot/icons/wk_arch.png b/.linux_items/include/EFI/boot/icons/wk_arch.png
new file mode 100644
index 00000000..f417362e
Binary files /dev/null and b/.linux_items/include/EFI/boot/icons/wk_arch.png differ
diff --git a/.linux_items/include/EFI/boot/icons/wk_memtest.png b/.linux_items/include/EFI/boot/icons/wk_memtest.png
new file mode 100644
index 00000000..927930f9
Binary files /dev/null and b/.linux_items/include/EFI/boot/icons/wk_memtest.png differ
diff --git a/.linux_items/include/EFI/boot/icons/wk_win.png b/.linux_items/include/EFI/boot/icons/wk_win.png
new file mode 100644
index 00000000..d086d20c
Binary files /dev/null and b/.linux_items/include/EFI/boot/icons/wk_win.png differ
diff --git a/.linux_items/include/EFI/boot/refind.conf b/.linux_items/include/EFI/boot/refind.conf
new file mode 100644
index 00000000..87ff7daa
--- /dev/null
+++ b/.linux_items/include/EFI/boot/refind.conf
@@ -0,0 +1,39 @@
+# refind.conf
+
+timeout 0
+scanfor manual
+showtools firmware,reboot,shutdown
+default_selection MemTest86
+csr_values 10,77
+#use_graphics_for osx,linux,windows
+
+# Theme
+banner rEFInd.png
+banner_scale fillscreen
+selection_big selection_big.png
+selection_small selection_small.png
+hideui arrows,badges
+
+# Entries
+menuentry "MemTest86" {
+    icon /EFI/boot/icons/wk_memtest.png
+    loader /EFI/memtest86/memtestx64.efi
+}
+menuentry "Linux" {
+    icon /EFI/boot/icons/wk_arch.png
+    loader /arch/boot/x86_64/vmlinuz
+    initrd  /arch/boot/intel_ucode.img
+    initrd /arch/boot/x86_64/archiso.img
+    options "archisobasedir=$INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet copytoram loglevel=3"
+    submenuentry "Linux (i3)" {
+        add_options "i3"
+    }
+    submenuentry "Linux (CLI)" {
+        add_options "nox"
+    }
+}
+menuentry "WindowsPE" {
+    ostype windows
+    icon /EFI/boot/icons/wk_win.png
+    loader /EFI/microsoft/bootx64.efi
+}
diff --git a/.linux_items/include/EFI/boot/selection_big.png b/.linux_items/include/EFI/boot/selection_big.png
new file mode 100644
index 00000000..280b47b8
Binary files /dev/null and b/.linux_items/include/EFI/boot/selection_big.png differ
diff --git a/.linux_items/include/EFI/boot/selection_small.png b/.linux_items/include/EFI/boot/selection_small.png
new file mode 100644
index 00000000..b52c388f
Binary files /dev/null and b/.linux_items/include/EFI/boot/selection_small.png differ
diff --git a/.linux_items/include/syslinux/syslinux.cfg b/.linux_items/include/syslinux/syslinux.cfg
index c379e5e2..2e99dd9c 100644
--- a/.linux_items/include/syslinux/syslinux.cfg
+++ b/.linux_items/include/syslinux/syslinux.cfg
@@ -1,5 +1,5 @@
 DEFAULT loadconfig
 
 LABEL loadconfig
-  CONFIG wklive.cfg
+  CONFIG wk.cfg
   APPEND ../../
diff --git a/.linux_items/include/syslinux/wklive.cfg b/.linux_items/include/syslinux/wk.cfg
similarity index 62%
rename from .linux_items/include/syslinux/wklive.cfg
rename to .linux_items/include/syslinux/wk.cfg
index e702e52f..b9163e25 100644
--- a/.linux_items/include/syslinux/wklive.cfg
+++ b/.linux_items/include/syslinux/wk.cfg
@@ -5,7 +5,7 @@ COM32 boot/syslinux/whichsys.c32
 APPEND -pxe- pxe -sys- sys -iso- sys
 
 LABEL pxe
-CONFIG boot/syslinux/wklive_pxe.cfg
+CONFIG boot/syslinux/wk_pxe.cfg
 
 LABEL sys
-CONFIG boot/syslinux/wklive_sys.cfg
+CONFIG boot/syslinux/wk_sys.cfg
diff --git a/.linux_items/include/syslinux/wklive_hdt.cfg b/.linux_items/include/syslinux/wk_hdt.cfg
similarity index 100%
rename from .linux_items/include/syslinux/wklive_hdt.cfg
rename to .linux_items/include/syslinux/wk_hdt.cfg
diff --git a/.linux_items/include/syslinux/wklive_head.cfg b/.linux_items/include/syslinux/wk_head.cfg
similarity index 100%
rename from .linux_items/include/syslinux/wklive_head.cfg
rename to .linux_items/include/syslinux/wk_head.cfg
diff --git a/.linux_items/include/syslinux/wk_pxe.cfg b/.linux_items/include/syslinux/wk_pxe.cfg
new file mode 100644
index 00000000..d5efabb4
--- /dev/null
+++ b/.linux_items/include/syslinux/wk_pxe.cfg
@@ -0,0 +1,8 @@
+INCLUDE boot/syslinux/wk_head.cfg
+MENU BACKGROUND pxelinux.png
+
+INCLUDE boot/syslinux/wk_pxe_linux.cfg
+INCLUDE boot/syslinux/wk_pxe_winpe.cfg
+INCLUDE boot/syslinux/wk_pxe_extras_entry.cfg
+
+INCLUDE boot/syslinux/wk_tail.cfg
diff --git a/.linux_items/include/syslinux/wk_pxe_extras.cfg b/.linux_items/include/syslinux/wk_pxe_extras.cfg
new file mode 100644
index 00000000..04cd2ce1
--- /dev/null
+++ b/.linux_items/include/syslinux/wk_pxe_extras.cfg
@@ -0,0 +1,9 @@
+INCLUDE boot/syslinux/wk_head.cfg
+MENU BACKGROUND pxelinux.png
+
+INCLUDE boot/syslinux/wk_pxe_linux.cfg
+INCLUDE boot/syslinux/wk_pxe_linux_extras.cfg
+INCLUDE boot/syslinux/wk_pxe_winpe.cfg
+INCLUDE boot/syslinux/wk_hdt.cfg
+
+INCLUDE boot/syslinux/wk_tail.cfg
diff --git a/.linux_items/include/syslinux/wklive_sys_extras_entry.cfg b/.linux_items/include/syslinux/wk_pxe_extras_entry.cfg
similarity index 54%
rename from .linux_items/include/syslinux/wklive_sys_extras_entry.cfg
rename to .linux_items/include/syslinux/wk_pxe_extras_entry.cfg
index bfc5c15b..ec76c263 100644
--- a/.linux_items/include/syslinux/wklive_sys_extras_entry.cfg
+++ b/.linux_items/include/syslinux/wk_pxe_extras_entry.cfg
@@ -1,7 +1,7 @@
-LABEL wklive_sys_extras
+LABEL wk_pxe_extras
 TEXT HELP
 Show extra boot options
 ENDTEXT
 MENU LABEL Extras
 KERNEL vesamenu.c32
-APPEND boot/syslinux/wklive_sys_extras.cfg
+APPEND boot/syslinux/wk_pxe_extras.cfg
diff --git a/.linux_items/include/syslinux/wklive_pxe_linux.cfg b/.linux_items/include/syslinux/wk_pxe_linux.cfg
similarity index 92%
rename from .linux_items/include/syslinux/wklive_pxe_linux.cfg
rename to .linux_items/include/syslinux/wk_pxe_linux.cfg
index f2103fea..f7bf816d 100644
--- a/.linux_items/include/syslinux/wklive_pxe_linux.cfg
+++ b/.linux_items/include/syslinux/wk_pxe_linux.cfg
@@ -1,4 +1,4 @@
-LABEL wklive_http_linux
+LABEL wk_http_linux
 TEXT HELP
 A live Linux environment
   * HW diagnostics, file-based backups, data recovery, etc
diff --git a/.linux_items/include/syslinux/wklive_pxe_linux_extras.cfg b/.linux_items/include/syslinux/wk_pxe_linux_extras.cfg
similarity index 91%
rename from .linux_items/include/syslinux/wklive_pxe_linux_extras.cfg
rename to .linux_items/include/syslinux/wk_pxe_linux_extras.cfg
index 2b966e36..f29b2724 100644
--- a/.linux_items/include/syslinux/wklive_pxe_linux_extras.cfg
+++ b/.linux_items/include/syslinux/wk_pxe_linux_extras.cfg
@@ -1,4 +1,4 @@
-LABEL wklive_http_linux_i3
+LABEL wk_http_linux_i3
 TEXT HELP
 A live Linux environment (i3)
   * HW diagnostics, file-based backups, data recovery, etc
@@ -9,7 +9,7 @@ INITRD boot/intel_ucode.img,boot/x86_64/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ quiet i3
 SYSAPPEND 3
 
-LABEL wklive_http_linux_cli
+LABEL wk_http_linux_cli
 TEXT HELP
 A live Linux environment (CLI)
   * HW diagnostics, file-based backups, data recovery, etc
diff --git a/.linux_items/include/syslinux/wklive_pxe_winpe.cfg b/.linux_items/include/syslinux/wk_pxe_winpe.cfg
similarity index 91%
rename from .linux_items/include/syslinux/wklive_pxe_winpe.cfg
rename to .linux_items/include/syslinux/wk_pxe_winpe.cfg
index e1afbd2e..91d615d7 100644
--- a/.linux_items/include/syslinux/wklive_pxe_winpe.cfg
+++ b/.linux_items/include/syslinux/wk_pxe_winpe.cfg
@@ -1,4 +1,4 @@
-LABEL wklive_http_winpe
+LABEL wk_http_winpe
 TEXT HELP
 A live Windows environment
   * Create partition backups, Install Windows, etc
diff --git a/.linux_items/include/syslinux/wk_sys.cfg b/.linux_items/include/syslinux/wk_sys.cfg
new file mode 100644
index 00000000..beefb77d
--- /dev/null
+++ b/.linux_items/include/syslinux/wk_sys.cfg
@@ -0,0 +1,7 @@
+INCLUDE boot/syslinux/wk_head.cfg
+
+INCLUDE boot/syslinux/wk_sys_linux.cfg
+INCLUDE boot/syslinux/wk_sys_winpe.cfg
+INCLUDE boot/syslinux/wk_sys_extras_entry.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
new file mode 100644
index 00000000..422bd053
--- /dev/null
+++ b/.linux_items/include/syslinux/wk_sys_extras.cfg
@@ -0,0 +1,8 @@
+INCLUDE boot/syslinux/wk_head.cfg
+
+INCLUDE boot/syslinux/wk_sys_linux.cfg
+INCLUDE boot/syslinux/wk_sys_linux_extras.cfg
+INCLUDE boot/syslinux/wk_sys_winpe.cfg
+INCLUDE boot/syslinux/wk_hdt.cfg
+
+INCLUDE boot/syslinux/wk_tail.cfg
diff --git a/.linux_items/include/syslinux/wklive_pxe_extras_entry.cfg b/.linux_items/include/syslinux/wk_sys_extras_entry.cfg
similarity index 54%
rename from .linux_items/include/syslinux/wklive_pxe_extras_entry.cfg
rename to .linux_items/include/syslinux/wk_sys_extras_entry.cfg
index f81692f6..ce8fd3ac 100644
--- a/.linux_items/include/syslinux/wklive_pxe_extras_entry.cfg
+++ b/.linux_items/include/syslinux/wk_sys_extras_entry.cfg
@@ -1,7 +1,7 @@
-LABEL wklive_pxe_extras
+LABEL wk_sys_extras
 TEXT HELP
 Show extra boot options
 ENDTEXT
 MENU LABEL Extras
 KERNEL vesamenu.c32
-APPEND boot/syslinux/wklive_pxe_extras.cfg
+APPEND boot/syslinux/wk_sys_extras.cfg
diff --git a/.linux_items/include/syslinux/wklive_sys_linux.cfg b/.linux_items/include/syslinux/wk_sys_linux.cfg
similarity index 93%
rename from .linux_items/include/syslinux/wklive_sys_linux.cfg
rename to .linux_items/include/syslinux/wk_sys_linux.cfg
index 2a1d308e..4b3b08c9 100644
--- a/.linux_items/include/syslinux/wklive_sys_linux.cfg
+++ b/.linux_items/include/syslinux/wk_sys_linux.cfg
@@ -1,4 +1,4 @@
-LABEL wklive_linux
+LABEL wk_linux
 TEXT HELP
 A live Linux environment
   * HW diagnostics, file-based backups, data recovery, etc
diff --git a/.linux_items/include/syslinux/wklive_sys_linux_extras.cfg b/.linux_items/include/syslinux/wk_sys_linux_extras.cfg
similarity index 93%
rename from .linux_items/include/syslinux/wklive_sys_linux_extras.cfg
rename to .linux_items/include/syslinux/wk_sys_linux_extras.cfg
index 258fc216..882c705e 100644
--- a/.linux_items/include/syslinux/wklive_sys_linux_extras.cfg
+++ b/.linux_items/include/syslinux/wk_sys_linux_extras.cfg
@@ -1,4 +1,4 @@
-LABEL wklive_linux_i3
+LABEL wk_linux_i3
 TEXT HELP
 A live Linux environment (i3)
   * HW diagnostics, file-based backups, data recovery, etc
@@ -9,7 +9,7 @@ INITRD boot/intel_ucode.img,boot/x86_64/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet copytoram loglevel=3 i3
 SYSAPPEND 3
 
-LABEL wklive_linux_cli
+LABEL wk_linux_cli
 TEXT HELP
 A live Linux environment (CLI)
   * HW diagnostics, file-based backups, data recovery, etc
diff --git a/.linux_items/include/syslinux/wklive_sys_winpe.cfg b/.linux_items/include/syslinux/wk_sys_winpe.cfg
similarity index 93%
rename from .linux_items/include/syslinux/wklive_sys_winpe.cfg
rename to .linux_items/include/syslinux/wk_sys_winpe.cfg
index 942565ab..3c2034d9 100644
--- a/.linux_items/include/syslinux/wklive_sys_winpe.cfg
+++ b/.linux_items/include/syslinux/wk_sys_winpe.cfg
@@ -1,4 +1,4 @@
-LABEL wklive_winpe
+LABEL wk_winpe
 TEXT HELP
 A live Windows environment
   * Create partition backups, Install Windows, etc
diff --git a/.linux_items/include/syslinux/wklive_tail.cfg b/.linux_items/include/syslinux/wk_tail.cfg
similarity index 100%
rename from .linux_items/include/syslinux/wklive_tail.cfg
rename to .linux_items/include/syslinux/wk_tail.cfg
diff --git a/.linux_items/include/syslinux/wklive_pxe.cfg b/.linux_items/include/syslinux/wklive_pxe.cfg
deleted file mode 100644
index 7ad1198c..00000000
--- a/.linux_items/include/syslinux/wklive_pxe.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-INCLUDE boot/syslinux/wklive_head.cfg
-MENU BACKGROUND pxelinux.png
-
-INCLUDE boot/syslinux/wklive_pxe_linux.cfg
-INCLUDE boot/syslinux/wklive_pxe_winpe.cfg
-INCLUDE boot/syslinux/wklive_pxe_extras_entry.cfg
-
-INCLUDE boot/syslinux/wklive_tail.cfg
diff --git a/.linux_items/include/syslinux/wklive_pxe_extras.cfg b/.linux_items/include/syslinux/wklive_pxe_extras.cfg
deleted file mode 100644
index d5a953a5..00000000
--- a/.linux_items/include/syslinux/wklive_pxe_extras.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-INCLUDE boot/syslinux/wklive_head.cfg
-MENU BACKGROUND pxelinux.png
-
-INCLUDE boot/syslinux/wklive_pxe_linux.cfg
-INCLUDE boot/syslinux/wklive_pxe_linux_extras.cfg
-INCLUDE boot/syslinux/wklive_pxe_winpe.cfg
-INCLUDE boot/syslinux/wklive_hdt.cfg
-
-INCLUDE boot/syslinux/wklive_tail.cfg
diff --git a/.linux_items/include/syslinux/wklive_sys.cfg b/.linux_items/include/syslinux/wklive_sys.cfg
deleted file mode 100644
index 607e1a3d..00000000
--- a/.linux_items/include/syslinux/wklive_sys.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-INCLUDE boot/syslinux/wklive_head.cfg
-
-INCLUDE boot/syslinux/wklive_sys_linux.cfg
-INCLUDE boot/syslinux/wklive_sys_winpe.cfg
-INCLUDE boot/syslinux/wklive_sys_extras_entry.cfg
-
-INCLUDE boot/syslinux/wklive_tail.cfg
diff --git a/.linux_items/include/syslinux/wklive_sys_extras.cfg b/.linux_items/include/syslinux/wklive_sys_extras.cfg
deleted file mode 100644
index 90614bfa..00000000
--- a/.linux_items/include/syslinux/wklive_sys_extras.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-INCLUDE boot/syslinux/wklive_head.cfg
-
-INCLUDE boot/syslinux/wklive_sys_linux.cfg
-INCLUDE boot/syslinux/wklive_sys_linux_extras.cfg
-INCLUDE boot/syslinux/wklive_sys_winpe.cfg
-INCLUDE boot/syslinux/wklive_hdt.cfg
-
-INCLUDE boot/syslinux/wklive_tail.cfg
diff --git a/.linux_items/packages/dependencies b/.linux_items/packages/dependencies
index 9cdf5910..564053e8 100644
--- a/.linux_items/packages/dependencies
+++ b/.linux_items/packages/dependencies
@@ -8,4 +8,5 @@ libewf
 openssh
 p7zip
 progsreiserfs
+refind-efi
 rsync
diff --git a/Build Linux b/Build Linux
index 47b80ae7..0564f18a 100755
--- a/Build Linux	
+++ b/Build Linux	
@@ -126,18 +126,26 @@ function run_elevated() {
 function update_live_env() {
     hostname="$(echo "${KIT_NAME_SHORT}-linux" | tr "[:upper:]" "[:lower:]")"
     username="$(echo "${KIT_NAME_SHORT}tech" | tr "[:upper:]" "[:lower:]")"
+    label="${KIT_NAME_SHORT}_LINUX"
+    install_dir="$(echo "${KIT_NAME_SHORT}linux" | tr "[:upper:]" "[:lower:]")"
 
     # Boot config (legacy)
-    mkdir -p "$LIVE_DIR/wklive"
-    cp "$ROOT_DIR/Images/Pxelinux.png" "$LIVE_DIR/wklive/pxelinux.png"
-    cp "$ROOT_DIR/Images/Syslinux.png" "$LIVE_DIR/wklive/syslinux.png"
-    sed -i -r "s/_+/$KIT_NAME_FULL/" "$LIVE_DIR/syslinux/wklive_head.cfg"
+    mkdir -p "$LIVE_DIR/$install_dir"
+    cp "$ROOT_DIR/Images/Pxelinux.png" "$LIVE_DIR/$install_dir/pxelinux.png"
+    cp "$ROOT_DIR/Images/Syslinux.png" "$LIVE_DIR/$install_dir/syslinux.png"
+    sed -i -r "s/_+/$KIT_NAME_FULL/" "$LIVE_DIR/syslinux/wk_head.cfg"
     mkdir -p "$TEMP_DIR" 2>/dev/null
     curl -Lo "$TEMP_DIR/wimboot.zip" "http://git.ipxe.org/releases/wimboot/wimboot-latest.zip"
-    7z e "$TEMP_DIR/wimboot.zip" -o"$LIVE_DIR/wklive/boot" 'wimboot*/LICENSE.txt' 'wimboot*/README.txt' 'wimboot*/wimboot'
+    7z e "$TEMP_DIR/wimboot.zip" -o"$LIVE_DIR/$install_dir/boot" 'wimboot*/LICENSE.txt' 'wimboot*/README.txt' 'wimboot*/wimboot'
 
     # Boot config (UEFI)
     mkdir -p "$LIVE_DIR/EFI/boot"
+    cp  "/usr/share/refind/refind_x64.efi" "$LIVE_DIR/EFI/boot/bootx64.efi"
+    cp "$ROOT_DIR/Images/rEFInd.png" "$LIVE_DIR/EFI/boot/rEFInd.png"
+    rsync -aI "/usr/share/refind/drivers_x64/" "$LIVE_DIR/EFI/boot/drivers_x64/"
+    rsync -aI "/usr/share/refind/icons/" "$LIVE_DIR/EFI/boot/icons/" --exclude "/usr/share/refind/icons/svg"
+    sed -i "s/%ARCHISO_LABEL%/${label}/;
+            s/%INSTALL_DIR%/${install_dir}/" "$LIVE_DIR/EFI/boot/refind.conf"
 
     # Memtest86
     mkdir -p "$LIVE_DIR/EFI/memtest86/Benchmark"
@@ -151,9 +159,9 @@ function update_live_env() {
     mv "$TEMP_DIR/memtest86/UNIFONT.BIN" "$LIVE_DIR/EFI/memtest86/unifont.bin"
 
     # build.sh
-    if ! grep -iq 'wklive additions' "$LIVE_DIR/build.sh"; then
-        sed -i -r 's/^(run_once make_iso)$/# wklive additions\n\1/' "$LIVE_DIR/build.sh"
-        sed -i '/# wklive additions/r .linux_items/build_additions.txt' "$LIVE_DIR/build.sh"
+    if ! grep -iq 'wizardkit additions' "$LIVE_DIR/build.sh"; then
+        sed -i -r 's/^(run_once make_iso)$/# wizardkit additions\n\1/' "$LIVE_DIR/build.sh"
+        sed -i '/# wizardkit additions/r .linux_items/build_additions.txt' "$LIVE_DIR/build.sh"
     fi
 
     # Hostname
@@ -288,11 +296,12 @@ function build_iso() {
     # Build ISO
     prefix="$(< "$LIVE_DIR/airootfs/etc/hostname")"
     label="${KIT_NAME_SHORT}_LINUX"
-    "$LIVE_DIR/build.sh" -N "$prefix" -V "$DATE" -L "$label" -D "wklive" -w "$TEMP_DIR/WKLive" -o "$OUT_DIR" -v | tee -a "$LOG_DIR/$DATETIME.log"
+    install_dir="$(echo "${KIT_NAME_SHORT}linux" | tr "[:upper:]" "[:lower:]")"
+    "$LIVE_DIR/build.sh" -N "$prefix" -V "$DATE" -L "$label" -D "$install_dir" -w "$TEMP_DIR/Linux" -o "$OUT_DIR" -v | tee -a "$LOG_DIR/$DATETIME.log"
 
     # Cleanup
     echo "Removing temp files..."
-    rm "$TEMP_DIR/WKLive" -Rf | tee -a "$LOG_DIR/$DATETIME.log"
+    rm "$TEMP_DIR/Linux" -Rf | tee -a "$LOG_DIR/$DATETIME.log"
 
     echo "Reverting permissions..."
     chown $REAL_USER:$REAL_USER "$LIVE_DIR" -R
diff --git a/Images/rEFInd.png b/Images/rEFInd.png
index 700b477d..673e2069 100644
Binary files a/Images/rEFInd.png and b/Images/rEFInd.png differ