diff --git a/xero-plasma.sh b/xero-plasma.sh
index 9451982..7f146df 100644
--- a/xero-plasma.sh
+++ b/xero-plasma.sh
@@ -145,145 +145,26 @@ echo "Detecting if you are using a VM"
 echo
 result=$(systemd-detect-virt)
 
-while [ -e "/var/lib/pacman/db.lck" ];
-do
-    echo 'Pacman is not ready yet. Will try again in 5 seconds.'
-    seconds=$(($seconds + 5))
-    sleep 5
-    if [[ "$seconds" == "30" ]]; then
-        echo 'Warning: removing pacman db.lck!'
-        rm /var/lib/pacman/db.lck
-    fi
-done
-
-echo "You are working on "$result
-
-if [ $result = "oracle" ];
-	then
-		#remove vmware
-		if pacman -Qi open-vm-tools &> /dev/null; then
-			systemctl disable vmtoolsd.service
-			echo "Disabled vmtoolsd.service"
-			pacman -Rns open-vm-tools --noconfirm
-			echo "Removed open-vm-tools"
-		fi
-
-		if pacman -Qi xf86-video-vmware &> /dev/null; then
-			pacman -Rns xf86-video-vmware --noconfirm
-			echo "Removed xf86-video-vmware"
-		fi
-
-		if [ -f /etc/systemd/system/multi-user.target.wants/vmtoolsd.service ]; then
-	   		rm /etc/systemd/system/multi-user.target.wants/vmtoolsd.service
-			echo "Removed vmtoolsd.service if still exists"
-		fi
-
-		#remove qemu
-		if pacman -Qi qemu-guest-agent &> /dev/null; then
-			systemctl disable qemu-guest-agent.service
-			pacman -Rns qemu-guest-agent --noconfirm
-			echo "Removed qemu-guest-agent"
-		fi
-fi
-
-if [ $result = "kvm" ];
-	then
-		#install kvm stuff
-		pacman -S --noconfirm qemu-guest-agent spice-vdagent
-  
-    		#remove vmware
-		if pacman -Qi open-vm-tools &> /dev/null; then
-			systemctl disable vmtoolsd.service
-			echo "Disabled vmtoolsd.service"
-			pacman -Rns open-vm-tools --noconfirm
-			echo "Removed open-vm-tools"
-		fi
-
-		if pacman -Qi xf86-video-vmware &> /dev/null; then
-			pacman -Rns xf86-video-vmware --noconfirm
-			echo "Removed xf86-video-vmware"
-		fi
-
-		if [ -f /etc/systemd/system/multi-user.target.wants/vmtoolsd.service ]; then
-	   		rm /etc/systemd/system/multi-user.target.wants/vmtoolsd.service
-			echo "Removed vmtoolsd.service if still exists"
-		fi
-
-		#remove virtualbox
-		if pacman -Qi virtualbox-guest-utils &> /dev/null; then
-			systemctl disable vboxservice.service
-			pacman -Rns virtualbox-guest-utils --noconfirm
-			echo "Removed virtualbox-guest-utils"
-		fi
-		if pacman -Qi virtualbox-guest-utils-nox &> /dev/null; then
-			systemctl disable vboxservice.service
-			pacman -Rns virtualbox-guest-utils-nox --noconfirm
-			echo "Removed virtualbox-guest-utils-nox"
-		fi
-fi
-
-if [ $result = "vmware" ];
-	then
-		#remove virtualbox
-		if pacman -Qi virtualbox-guest-utils &> /dev/null; then
-			systemctl disable vboxservice.service
-			pacman -Rns virtualbox-guest-utils --noconfirm
-			echo "Removed virtualbox-guest-utils"
-		fi
-		if pacman -Qi virtualbox-guest-utils-nox &> /dev/null; then
-			systemctl disable vboxservice.service
-			pacman -Rns virtualbox-guest-utils-nox --noconfirm
-			echo "Removed virtualbox-guest-utils-nox"
-		fi
-
-		#remove qemu
-		if pacman -Qi qemu-guest-agent &> /dev/null; then
-			systemctl disable qemu-guest-agent.service
-			pacman -Rns qemu-guest-agent --noconfirm
-			echo "Removed qemu-guest-agent"
-		fi
-fi
-
-if [ $result = "none" ];
-	then
-		#remove virtualbox
-		if pacman -Qi virtualbox-guest-utils &> /dev/null; then
-			systemctl disable vboxservice.service
-			pacman -Rns virtualbox-guest-utils --noconfirm
-			echo "Removed virtualbox-guest-utils"
-		fi
-
-		if pacman -Qi virtualbox-guest-utils-nox &> /dev/null; then
-			systemctl disable vboxservice.service
-			pacman -Rns virtualbox-guest-utils-nox --noconfirm
-			echo "Removed virtualbox-guest-utils-nox"
-		fi
-
-		#remove vmware
-		if pacman -Qi open-vm-tools &> /dev/null; then
-			systemctl disable vmtoolsd.service
-			echo "Disabled vmtoolsd.service"
-			pacman -Rns open-vm-tools --noconfirm
-			echo "Removed open-vm-tools"
-		fi
-
-		if pacman -Qi xf86-video-vmware &> /dev/null; then
-			pacman -Rns xf86-video-vmware --noconfirm
-			echo "Removed xf86-video-vmware"
-		fi
-
-		if [ -f /etc/systemd/system/multi-user.target.wants/vmtoolsd.service ]; then
-	   		rm /etc/systemd/system/multi-user.target.wants/vmtoolsd.service
-			echo "Removed vmtoolsd.service if still exists"
-		fi
-
-		#remove qemu
-		if pacman -Qi qemu-guest-agent &> /dev/null; then
-			systemctl disable qemu-guest-agent.service
-			pacman -Rns qemu-guest-agent --noconfirm
-			echo "Removed qemu-guest-agent"
-		fi
-fi
+case $result in
+    oracle)
+        echo "Installing virtualbox-guest-utils..."
+        sudo pacman -S --noconfirm --needed virtualbox-guest-utils
+        ;;
+    kvm)
+        echo "Installing qemu-guest-agent and spice-vdagent..."
+        sudo pacman -S --noconfirm --needed qemu-guest-agent spice-vdagent qemu-hw-display-qxl xf86-video-qxl
+        ;;
+    vmware)
+        echo "Installing xf86-video-vmware and open-vm-tools..."
+        sudo pacman -S --noconfirm --needed xf86-video-vmware open-vm-tools xf86-input-vmmouse
+        echo "Enabling vmtoolsd.service..."
+        sudo systemctl enable vmtoolsd.service
+        ;;
+    *)
+        echo "You are not running in a VM."
+        exit 1
+        ;;
+esac
 echo
 echo "#############################################"
 echo "          Done, now exit and reboot          "