diff --git a/Amelia.sh b/Amelia.sh
index 91748fe..d3c5be7 100644
--- a/Amelia.sh
+++ b/Amelia.sh
@@ -2,7 +2,7 @@
 
 # Amelia Installer
 # Source: https://gitlab.com/prism7/archery
-# Version: 9.9.1
+# Version: 9.9.2
 
         set -euo pipefail
 ###################################################################################################
@@ -7248,11 +7248,21 @@ set_vars() {
 #--------------------------------------------------------------------------------------------------
     # GFX CONFIGURATION
 
-        # Nvidia
-        if [[ "${nvdprop}" == "y"  ]]; then
+        # Nvidia Proprietary Drivers
+        if [[ "${nvdprop}" == "y" ]]; then
             MODULES+=(nvidia nvidia_modeset nvidia_uvm nvidia_drm)
             gfx_bootopts+=(nvidia.NVreg_UsePageAttributeTable=1)
 
+            # Multi-Graphics including Intel
+            if [[ "${vendors}" =~ "Intel" ]]; then
+                MODULES+=(i915)
+            fi
+
+            # Multi-Graphics including AMD
+            if [[ "${vendors}" =~ "AMD" ]]; then
+                MODULES+=(amdgpu)
+            fi
+
             # Disable GSP Firmware
             if [[ "${nogsp}" == "y" ]]; then
                 gfx_bootopts+=(nvidia.NVreg_EnableGpuFirmware=0)
@@ -7266,12 +7276,14 @@ set_vars() {
 
         # AMD
         if [[ "${vendor}" == "AMD" || "${vendors}" =~ "AMD" ]]; then
-            if [[ -n "${islands}" ]]; then
+            if [[ -n "${islands}" && -z "${nvdprop}" ]]; then
                 MODULES+=(amdgpu)
             fi
+
             # 'Southern Islands' support
             if [[ "${islands}" == "1" ]]; then
                 gfx_bootopts+=(amdgpu.dc=1 radeon.si_support=0 amdgpu.si_support=1)
+
             # 'Sea Islands' support
             elif [[ "${islands}" == "2" ]]; then
                 gfx_bootopts+=(amdgpu.dc=1 radeon.cik_support=0 amdgpu.cik_support=1)