diff --git a/virtual-machines/Alpine b/virtual-machines/Alpine
index adf93e6..4011c7c 100755
--- a/virtual-machines/Alpine
+++ b/virtual-machines/Alpine
@@ -3,10 +3,7 @@
 
 set _arch x86_64
 set _install "$_vm_media/Linux/Alpine/standard-3.10.1-x86_64.iso"
-set _args \
-	-m 2048 \
-	--usb \
-	--vga qxl
+set _mem 2048
 source $_vm_setup
 
 ## EOF
diff --git a/virtual-machines/Arch b/virtual-machines/Arch
index 8e0bf39..4a6b754 100755
--- a/virtual-machines/Arch
+++ b/virtual-machines/Arch
@@ -3,10 +3,7 @@
 
 set _arch x86_64
 set _install "$_vm_media/Linux/Arch/2018.08.01-x86_64.iso"
-set _args \
-	-m 2048 \
-	--usb \
-	--vga qxl
+set _mem 2048
 source $_vm_setup
 
 ## EOF
diff --git a/virtual-machines/CRUX b/virtual-machines/CRUX
index 62c3f0b..26a8ae7 100755
--- a/virtual-machines/CRUX
+++ b/virtual-machines/CRUX
@@ -3,10 +3,7 @@
 
 set _arch x86_64
 set _install "$_vm_media/Linux/CRUX/3.5.iso"
-set _args \
-	-m 2048 \
-	--usb \
-	--vga qxl
+set _mem 2048
 source $_vm_setup
 
 ## EOF
diff --git a/virtual-machines/CentOS b/virtual-machines/CentOS
index 75e3996..497f77e 100755
--- a/virtual-machines/CentOS
+++ b/virtual-machines/CentOS
@@ -3,10 +3,7 @@
 
 set _arch x86_64
 set _install "$_vm_media/Linux/CentOS/7-x86_64-DVD-1810.iso"
-set _args \
-	-m 2048 \
-	--usb \
-	--vga qxl
+set _mem 2048
 source $_vm_setup
 
 ## EOF
diff --git a/virtual-machines/NetBSD b/virtual-machines/NetBSD
index fbf78f1..461d7b6 100755
--- a/virtual-machines/NetBSD
+++ b/virtual-machines/NetBSD
@@ -3,9 +3,7 @@
 
 set _arch x86_64
 set _install "$_vm_media/BSD/NetBSD/NetBSD-8.1-amd64.iso"
-set _args \
-	-m 4096 \
-	--usb
+set _mem 4096
 source $_vm_setup
 
 ## EOF
diff --git a/virtual-machines/Void b/virtual-machines/Void
index 4cb9dd0..75abc48 100755
--- a/virtual-machines/Void
+++ b/virtual-machines/Void
@@ -3,9 +3,7 @@
 
 set _arch x86_64
 set _install "$_vm_media/Linux/Void/live-x86_64-musl-20181111.iso"
-set _args \
-	-m 2048 \
-	--usb
+set _mem 2048
 source $_vm_setup
 
 ## EOF
diff --git a/virtual-machines/Win2000 b/virtual-machines/Win2000
index 901d4fb..51d1fbb 100755
--- a/virtual-machines/Win2000
+++ b/virtual-machines/Win2000
@@ -3,13 +3,12 @@
 
 set _arch i386
 set _install "$_vm_media/MS Windows/2000 Pro/5.00.2195.iso"
+set _mem 512
+set _vga cirrus
+set _soundhw ac97
 set _args \
-	-m 512 \
-	--usb \
-	--vga cirrus \
 	--net nic,model=rtl8139 \
-	--net user \
-	--soundhw ac97
+	--net user
 source $_vm_setup
 
 ## EOF
diff --git a/virtual-machines/Win98 b/virtual-machines/Win98
index 5b47fa9..6293f7e 100755
--- a/virtual-machines/Win98
+++ b/virtual-machines/Win98
@@ -4,13 +4,12 @@
 set _arch i386
 set _boot "$_vm_media/Boot Disks/Win/98SE.img"
 set _install "$_vm_media/MS Windows/98 2nd Edition/98SE.iso"
+set _mem 512
+set _vga cirrus
+set _soundhw sb16
 set _args \
-	-m 512 \
-	--usb \
-	--vga cirrus \
 	--net nic,model=rtl8139 \
-	--net user \
-	--soundhw ac97
+	--net user
 source $_vm_setup
 
 ## EOF
diff --git a/virtual-machines/qemu-setup b/virtual-machines/qemu-setup
index 5aae158..b60644c 100644
--- a/virtual-machines/qemu-setup
+++ b/virtual-machines/qemu-setup
@@ -11,7 +11,15 @@ for opt in $_vm_args
 	end
 end
 
-set _boot_order c
+set vga vmware
+set soundhw hda
+set boot_order c
+
+test "$_vga"
+and set vga $_vga
+
+test "$_soundhw"
+and set soundhw $_soundhw
 
 set _args \
 	--display sdl,gl=on \
@@ -20,18 +28,19 @@ set _args \
 if test $_arch = "i386" || test $_arch = "x86_64"
 	set _args \
 		--machine accel=kvm \
+		--usb \
 		$_args
 end
 
 if test $_use_install
-	set _boot_order d
+	set boot_order d
 	set _args \
 		--drive file="$_install",media=cdrom,readonly \
 		$_args
 end
 
 if test $_boot
-	set _boot_order a
+	set boot_order a
 	set _args \
 		--drive file="$_boot",format=raw,if=floppy,readonly \
 		$_args
@@ -39,7 +48,10 @@ end
 
 env QEMU_AUDIO_DRV=pa "qemu-system-$_arch" \
 	--drive file="$_vm_img",format=qcow2,media=disk \
-	--boot order=$_boot_order \
+	--boot order="$boot_order" \
+	-m "$_mem" \
+	--soundhw "$soundhw" \
+	--vga "$vga" \
 	$_args
 
 ## EOF