diff --git a/.bin/Scripts/linux-old/mount-all-volumes b/.bin/Scripts/linux-old/mount-all-volumes
deleted file mode 100755
index e746574f..00000000
--- a/.bin/Scripts/linux-old/mount-all-volumes
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-#
-## Wizard Kit: Volume mount tool
-
-# Mount all volumes (read only)
-echo "Mounting all volumes"
-regex="/dev/((h|s)d[a-z]|md)[0-9]+"
-for volume in $(inxi -Dopxx | grep -E "$regex" | sed -r "s#.*($regex).*#\1#" | sort); do
-    if grep -q "$volume" /proc/mounts; then
-        if ! mount | grep "/run/archiso/bootmnt" | grep -q "$volume"; then
-            # Show what's already mounted except the WK_ARCH boot device
-            echo "$volume: (Already) mounted $(mount | grep "$volume" | sed -r 's/^\S+ (on.*) type .*/\1/') ($(df -h "$volume" | tail -1 | awk '{print $3, $4}' | sed -r 's/(K|M|G|T|) (.*[0-9])(K|M|G|T|)$/ \1b used, \2 \3b free/'))"
-        fi
-    else
-        if udevil mount -o ro $volume >/dev/null 2>&1; then
-            echo "$volume: Mounted $(mount | grep "$volume" | sed -r 's/^\S+ (on.*) type .*/\1/') ($(df -h "$volume" | tail -1 | awk '{print $3, $4}' | sed -r 's/(K|M|G|T|) (.*[0-9])(K|M|G|T|)$/ \1b used, \2 \3b free/'))"
-        else
-            echo "$volume: Failed to mount"
-        fi
-    fi
-done
-
-# Open folder?
-if echo "$0" | grep -iq foh; then
-    thunar /media
-fi
-
-echo "Done."
diff --git a/.bin/Scripts/linux-old/mount-all-volumes-foh b/.bin/Scripts/linux-old/mount-all-volumes-foh
deleted file mode 120000
index 8ac53b0c..00000000
--- a/.bin/Scripts/linux-old/mount-all-volumes-foh
+++ /dev/null
@@ -1 +0,0 @@
-mount-all-volumes
\ No newline at end of file
diff --git a/.bin/Scripts/mount-all-volumes b/.bin/Scripts/mount-all-volumes
index 587bc4c9..a183e5c3 100755
--- a/.bin/Scripts/mount-all-volumes
+++ b/.bin/Scripts/mount-all-volumes
@@ -27,7 +27,7 @@ if __name__ == '__main__':
 
         # Done
         print_standard('\nDone.')
-        if 'foh' in __file__:
+        if 'foh' in sys.argv:
             pause("Press Enter to exit...")
             popen_program(['thunar', '/media'])
         exit_script()
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/i3/config b/.linux_items/include/live/airootfs/etc/skel/.config/i3/config
index 016026d3..67423053 100644
--- a/.linux_items/include/live/airootfs/etc/skel/.config/i3/config
+++ b/.linux_items/include/live/airootfs/etc/skel/.config/i3/config
@@ -71,7 +71,7 @@ bindsym $mod+r exec "rofi -combi-modi window,drun,run -show combi -modi combi"
 bindsym $mod+d exec "urxvt -title 'Hardware Diagnostics' -e hw-diags"
 bindsym $mod+f exec "thunar ~"
 bindsym $mod+i exec "hardinfo"
-bindsym $mod+m exec "urxvt -title 'Mount All Volumes' -e mount-all-volumes"
+bindsym $mod+m exec "urxvt -title 'Mount All Volumes' -e mount-all-volumes foh"
 bindsym $mod+s exec "urxvt -title 'Hardware Diagnostics' -e hw-diags foh"
 bindsym $mod+t exec "urxvt"
 bindsym $mod+v exec "urxvt -title 'Hardware Sensors' -e hw-diags-sensors"
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/openbox/rc.xml b/.linux_items/include/live/airootfs/etc/skel/.config/openbox/rc.xml
index a52cb7cc..c48340dd 100644
--- a/.linux_items/include/live/airootfs/etc/skel/.config/openbox/rc.xml
+++ b/.linux_items/include/live/airootfs/etc/skel/.config/openbox/rc.xml
@@ -314,7 +314,7 @@
     </keybind>
     <keybind key="W-m">
       <action name="Execute">
-        <command>urxvt -title "Mount all Volumes" -e mount-all-volumes-foh</command>
+        <command>urxvt -title "Mount all Volumes" -e mount-all-volumes foh</command>
       </action>
     </keybind>
     <keybind key="W-r">