diff --git a/fish/vm-qemu b/fish/vm-qemu
index 3dd044b..dd7f758 100644
--- a/fish/vm-qemu
+++ b/fish/vm-qemu
@@ -1,9 +1,9 @@
 #!/usr/bin/env fish
 
 function vm-qemu -d "Frontend to QEMU"
-	$_agw_dir_rc/virtual-machines/QEMU/vm-qemu.rkt $argv
+	$_agw_dir_rc/virtual-machines/QEMU/vm-qemu $argv
 end
 
-complete -c vm-qemu -xa "(ls $_agw_dir_rc/virtual-machines)"
+complete -c vm-qemu -xa "(ls $_agw_dir_rc/virtual-machines/QEMU)"
 
 ## EOF
diff --git a/virtual-machines/Fedora b/virtual-machines/Fedora
deleted file mode 100644
index 69d42dd..0000000
--- a/virtual-machines/Fedora
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env fish
-
-set _arch x86_64
-set _ver 30-1.2
-set _install "$_vm_media/Linux/Fedora/Workstation-Live-x86_64-_ver_.iso"
-set _mem 2G
diff --git a/virtual-machines/Alpine b/virtual-machines/QEMU/Alpine
similarity index 54%
rename from virtual-machines/Alpine
rename to virtual-machines/QEMU/Alpine
index 238813b..ea3f51c 100644
--- a/virtual-machines/Alpine
+++ b/virtual-machines/QEMU/Alpine
@@ -2,6 +2,6 @@
 
 set _arch x86_64
 set _ver 3.10.1
-set _install "$_vm_media/Linux/Alpine/standard-_ver_-x86_64.iso"
+set _install "Linux/Alpine/standard-_ver_-x86_64.iso"
 set _mem 2G
 set _vga qxl
diff --git a/virtual-machines/Arch b/virtual-machines/QEMU/Arch
similarity index 56%
rename from virtual-machines/Arch
rename to virtual-machines/QEMU/Arch
index 724f5b3..b4547ac 100644
--- a/virtual-machines/Arch
+++ b/virtual-machines/QEMU/Arch
@@ -2,5 +2,5 @@
 
 set _arch x86_64
 set _ver 2018.08.01
-set _install "$_vm_media/Linux/Arch/_ver_-x86_64.iso"
+set _install "Linux/Arch/_ver_-x86_64.iso"
 set _mem 2G
diff --git a/virtual-machines/CRUX b/virtual-machines/QEMU/CRUX
similarity index 57%
rename from virtual-machines/CRUX
rename to virtual-machines/QEMU/CRUX
index 9f48fbc..907d07a 100644
--- a/virtual-machines/CRUX
+++ b/virtual-machines/QEMU/CRUX
@@ -2,5 +2,5 @@
 
 set _arch x86_64
 set _ver 3.5
-set _install "$_vm_media/Linux/CRUX/_ver_.iso"
+set _install "Linux/CRUX/_ver_.iso"
 set _mem 2G
diff --git a/virtual-machines/CentOS b/virtual-machines/QEMU/CentOS
similarity index 52%
rename from virtual-machines/CentOS
rename to virtual-machines/QEMU/CentOS
index a6d0284..0af6b67 100644
--- a/virtual-machines/CentOS
+++ b/virtual-machines/QEMU/CentOS
@@ -2,5 +2,5 @@
 
 set _arch x86_64
 set _ver 7-1810
-set _install "$_vm_media/Linux/CentOS/_ver_-x86_64-DVD.iso"
+set _install "Linux/CentOS/_ver_-x86_64-DVD.iso"
 set _mem 2G
diff --git a/virtual-machines/QEMU/Debian b/virtual-machines/QEMU/Debian
new file mode 100644
index 0000000..24b7b47
--- /dev/null
+++ b/virtual-machines/QEMU/Debian
@@ -0,0 +1,6 @@
+#!/usr/bin/env fish
+
+set _arch x86_64
+set _ver 10.0.0
+set _install "Linux/Debian/_ver_-amd64-netinst.iso"
+set _mem 2G
diff --git a/virtual-machines/QEMU/Fedora b/virtual-machines/QEMU/Fedora
new file mode 100644
index 0000000..0b589da
--- /dev/null
+++ b/virtual-machines/QEMU/Fedora
@@ -0,0 +1,6 @@
+#!/usr/bin/env fish
+
+set _arch x86_64
+set _ver 30-1.2
+set _install "Linux/Fedora/Workstation-Live-x86_64-_ver_.iso"
+set _mem 2G
diff --git a/virtual-machines/QEMU/FreeBSD b/virtual-machines/QEMU/FreeBSD
new file mode 100644
index 0000000..febadd5
--- /dev/null
+++ b/virtual-machines/QEMU/FreeBSD
@@ -0,0 +1,6 @@
+#!/usr/bin/env fish
+
+set _arch x86_64
+set _ver 12.0
+set _install "BSD/FreeBSD/FreeBSD-_ver_-RELEASE-amd64-dvd1.iso"
+set _mem 4G
diff --git a/virtual-machines/Gobo b/virtual-machines/QEMU/Gobo
similarity index 55%
rename from virtual-machines/Gobo
rename to virtual-machines/QEMU/Gobo
index c5ae56c..d587390 100644
--- a/virtual-machines/Gobo
+++ b/virtual-machines/QEMU/Gobo
@@ -2,5 +2,5 @@
 
 set _arch x86_64
 set _ver 016.01
-set _install "$_vm_media/Linux/Gobo/_ver_-x86_64.iso"
+set _install "Linux/Gobo/_ver_-x86_64.iso"
 set _mem 2G
diff --git a/virtual-machines/Kali b/virtual-machines/QEMU/Kali
similarity index 53%
rename from virtual-machines/Kali
rename to virtual-machines/QEMU/Kali
index 3e6853b..b87e485 100644
--- a/virtual-machines/Kali
+++ b/virtual-machines/QEMU/Kali
@@ -2,5 +2,5 @@
 
 set _arch x86_64
 set _ver 2019.2
-set _install "$_vm_media/Linux/Kali/kde-_ver_-amd64.iso"
+set _install "Linux/Kali/kde-_ver_-amd64.iso"
 set _mem 2G
diff --git a/virtual-machines/Kubuntu b/virtual-machines/QEMU/Kubuntu
similarity index 54%
rename from virtual-machines/Kubuntu
rename to virtual-machines/QEMU/Kubuntu
index 9de1907..29d52bf 100644
--- a/virtual-machines/Kubuntu
+++ b/virtual-machines/QEMU/Kubuntu
@@ -2,6 +2,6 @@
 
 set _arch x86_64
 set _ver 19.04
-set _install "$_vm_media/Linux/Kubuntu/_ver_-desktop-amd64.iso"
+set _install "Linux/Kubuntu/_ver_-desktop-amd64.iso"
 set _mem 8G
 set _vga qxl
diff --git a/virtual-machines/NetBSD b/virtual-machines/QEMU/NetBSD
similarity index 51%
rename from virtual-machines/NetBSD
rename to virtual-machines/QEMU/NetBSD
index a021937..ca314ff 100644
--- a/virtual-machines/NetBSD
+++ b/virtual-machines/QEMU/NetBSD
@@ -2,5 +2,5 @@
 
 set _arch x86_64
 set _ver 8.1
-set _install "$_vm_media/BSD/NetBSD/NetBSD-_ver_-amd64.iso"
+set _install "BSD/NetBSD/NetBSD-_ver_-amd64.iso"
 set _mem 4G
diff --git a/virtual-machines/QEMU/NixOS b/virtual-machines/QEMU/NixOS
new file mode 100644
index 0000000..86bacf5
--- /dev/null
+++ b/virtual-machines/QEMU/NixOS
@@ -0,0 +1,6 @@
+#!/usr/bin/env fish
+
+set _arch x86_64
+set _ver 19.03
+set _install "Linux/NixOS/graphical-_ver_-x86_64.iso"
+set _mem 4G
diff --git a/virtual-machines/QEMU/OpenBSD b/virtual-machines/QEMU/OpenBSD
new file mode 100644
index 0000000..0b1ee50
--- /dev/null
+++ b/virtual-machines/QEMU/OpenBSD
@@ -0,0 +1,7 @@
+#!/usr/bin/env fish
+
+set _arch x86_64
+set _ver 65
+set _install "BSD/OpenBSD/install_ver_.iso"
+set _mem 4G
+set _devs usb-mouse
diff --git a/virtual-machines/QEMU/Slackware b/virtual-machines/QEMU/Slackware
new file mode 100644
index 0000000..8ca020a
--- /dev/null
+++ b/virtual-machines/QEMU/Slackware
@@ -0,0 +1,6 @@
+#!/usr/bin/env fish
+
+set _arch x86_64
+set _ver 14.2
+set _install "Linux/Slackware/64-_ver_-install-dvd.iso"
+set _mem 2G
diff --git a/virtual-machines/QEMU/Ubuntu b/virtual-machines/QEMU/Ubuntu
new file mode 100644
index 0000000..96bb4a0
--- /dev/null
+++ b/virtual-machines/QEMU/Ubuntu
@@ -0,0 +1,6 @@
+#!/usr/bin/env fish
+
+set _arch x86_64
+set _ver 19.04
+set _install "Linux/Ubuntu/_ver_-desktop-amd64.iso"
+set _mem 8G
diff --git a/virtual-machines/QEMU/Void b/virtual-machines/QEMU/Void
new file mode 100644
index 0000000..f048241
--- /dev/null
+++ b/virtual-machines/QEMU/Void
@@ -0,0 +1,6 @@
+#!/usr/bin/env fish
+
+set _arch x86_64
+set _ver musl-20181111
+set _install "Linux/Void/live-x86_64-_ver_.iso"
+set _mem 2G
diff --git a/virtual-machines/Win2000 b/virtual-machines/QEMU/Win2000
similarity index 69%
rename from virtual-machines/Win2000
rename to virtual-machines/QEMU/Win2000
index c03445f..ef67a76 100644
--- a/virtual-machines/Win2000
+++ b/virtual-machines/QEMU/Win2000
@@ -1,7 +1,7 @@
 #!/usr/bin/env fish
 
 set _arch i386
-set _install "$_vm_media/MS Windows/2000 Pro/5.00.2195.iso"
+set _install "MS Windows/2000 Pro/5.00.2195.iso"
 set _mem 512M
 set _vga cirrus
 set _soundhw ac97
diff --git a/virtual-machines/QEMU/Xubuntu b/virtual-machines/QEMU/Xubuntu
new file mode 100644
index 0000000..4e733f6
--- /dev/null
+++ b/virtual-machines/QEMU/Xubuntu
@@ -0,0 +1,6 @@
+#!/usr/bin/env fish
+
+set _arch x86_64
+set _ver 19.04
+set _install "Linux/Xubuntu/_ver_-desktop-amd64.iso"
+set _mem 8G
diff --git a/virtual-machines/elementaryOS b/virtual-machines/QEMU/elementaryOS
similarity index 56%
rename from virtual-machines/elementaryOS
rename to virtual-machines/QEMU/elementaryOS
index 0a4f112..398c452 100644
--- a/virtual-machines/elementaryOS
+++ b/virtual-machines/QEMU/elementaryOS
@@ -2,5 +2,5 @@
 
 set _arch x86_64
 set _ver 5.0.20181016
-set _install "$_vm_media/Linux/elementaryOS/_ver_.iso"
+set _install "Linux/elementaryOS/_ver_.iso"
 set _mem 4G
diff --git a/virtual-machines/QEMU/openSUSE b/virtual-machines/QEMU/openSUSE
new file mode 100644
index 0000000..215bf7a
--- /dev/null
+++ b/virtual-machines/QEMU/openSUSE
@@ -0,0 +1,7 @@
+#!/usr/bin/env fish
+
+set _arch x86_64
+set _ver Snapshot20190814
+set _install "Linux/openSUSE/DVD-x86_64-_ver_-Media.iso"
+set _mem 4G
+set _vga qxl
diff --git a/virtual-machines/qemu-setup b/virtual-machines/QEMU/vm-qemu
similarity index 77%
rename from virtual-machines/qemu-setup
rename to virtual-machines/QEMU/vm-qemu
index 474076e..cc511a7 100755
--- a/virtual-machines/qemu-setup
+++ b/virtual-machines/QEMU/vm-qemu
@@ -4,18 +4,17 @@
 argparse \
 	--name "vm-qemu" \
 	--min-args 1 \
-	--max-args 1 \
 	'V/version=' \
 	'i/install' \
 	-- \
 	$argv
 or exit 1
 
-set cfg $argv
+set cfg $argv[1]
+set -e argv[1]
 
 # Config
-set _vm_media "/mnt/s/osmedia"
-source $_agw_dir_rc/virtual-machines/$cfg
+source $_agw_dir_rc/virtual-machines/QEMU/$cfg
 
 # Devices
 test "$_vga"
@@ -51,28 +50,31 @@ set image "/mnt/s/vm/$cfg/image$ver"
 set boot_order c
 
 # Install Media
+set media   "/mnt/s/osmedia"
 set install (string replace "_ver_" "$ver" "$_install")
 set boot    (string replace "_ver_" "$ver" "$_boot")
 
 if test "$_flag_install"
 	set boot_order d
-	set -p _args --drive file="$install",media=cdrom,readonly
+	set -p _args --drive file="$media/$install",media=cdrom,readonly
 
 	if test "$boot"
 		set boot_order a
-		set -p _args --drive file="$boot",format=raw,if=floppy,readonly
+		set -p _args --drive file="$media/$boot",format=raw,if=floppy,readonly
 	end
 end
 
 # Run!
+set -a _args $argv
+
 env QEMU_AUDIO_DRV=pa "qemu-system-$_arch" \
 	--boot order="$boot_order" \
 	--cpu "$cpu" \
 	--display sdl,gl=on \
 	--drive file="$image",format=qcow2,media=disk \
 	--monitor stdio \
-	--soundhw $soundhw \
-	--vga $vga \
+	--soundhw "$soundhw" \
+	--vga "$vga" \
 	-m "$_mem" \
 	$_args
 
diff --git a/virtual-machines/Void b/virtual-machines/Void
deleted file mode 100644
index 1bcce09..0000000
--- a/virtual-machines/Void
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env fish
-
-set _arch x86_64
-set _ver 20181111
-set _install "$_vm_media/Linux/Void/live-x86_64-musl-_ver_.iso"
-set _mem 2G