diff --git a/payloads/Kexts/Acidanthera/WhateverGreen-v1.6.2A-DEBUG.zip b/payloads/Kexts/Acidanthera/WhateverGreen-v1.6.2A-DEBUG.zip
deleted file mode 100644
index 4b2667a76..000000000
Binary files a/payloads/Kexts/Acidanthera/WhateverGreen-v1.6.2A-DEBUG.zip and /dev/null differ
diff --git a/payloads/Kexts/Acidanthera/WhateverGreen-v1.6.2A-RELEASE.zip b/payloads/Kexts/Acidanthera/WhateverGreen-v1.6.2A-RELEASE.zip
deleted file mode 100644
index 4b2667a76..000000000
Binary files a/payloads/Kexts/Acidanthera/WhateverGreen-v1.6.2A-RELEASE.zip and /dev/null differ
diff --git a/payloads/Kexts/Acidanthera/WhateverGreen-v1.6.3-Navi-DEBUG.zip b/payloads/Kexts/Acidanthera/WhateverGreen-v1.6.3-Navi-DEBUG.zip
new file mode 100644
index 000000000..07daec46b
Binary files /dev/null and b/payloads/Kexts/Acidanthera/WhateverGreen-v1.6.3-Navi-DEBUG.zip differ
diff --git a/payloads/Kexts/Acidanthera/WhateverGreen-v1.6.3-Navi-RELEASE.zip b/payloads/Kexts/Acidanthera/WhateverGreen-v1.6.3-Navi-RELEASE.zip
new file mode 100644
index 000000000..ae8345e90
Binary files /dev/null and b/payloads/Kexts/Acidanthera/WhateverGreen-v1.6.3-Navi-RELEASE.zip differ
diff --git a/resources/build/graphics_audio.py b/resources/build/graphics_audio.py
index 66b173d3c..1db4a8820 100644
--- a/resources/build/graphics_audio.py
+++ b/resources/build/graphics_audio.py
@@ -22,17 +22,18 @@ class build_graphics_audio:
 
 
     def build(self):
+        self.imac_mxm_patching()
         self.graphics_handling()
         self.audio_handling()
         self.firmware_handling()
         self.spoof_handling()
-        self.imac_mxm_patching()
         self.ioaccel_workaround()
 
 
     def graphics_handling(self):
         if self.constants.allow_oc_everywhere is False and self.constants.serial_settings != "None":
-            support.build_support(self.model, self.constants, self.config).enable_kext("WhateverGreen.kext", self.constants.whatevergreen_version, self.constants.whatevergreen_path)
+            if not support.build_support(self.model, self.constants, self.config).get_kext_by_bundle_path("WhateverGreen.kext")["Enabled"] is True:
+                support.build_support(self.model, self.constants, self.config).enable_kext("WhateverGreen.kext", self.constants.whatevergreen_version, self.constants.whatevergreen_path)
 
         # Mac Pro handling
         if self.model in model_array.MacPro:
@@ -146,7 +147,7 @@ class build_graphics_audio:
     def nvidia_mxm_patch(self, backlight_path):
         if not support.build_support(self.model, self.constants, self.config).get_kext_by_bundle_path("WhateverGreen.kext")["Enabled"] is True:
             # Ensure WEG is enabled as we need if for Backlight patching
-            support.build_support(self.model, self.constants, self.config).enable_kext("WhateverGreen.kext", self.constants.whatevergreen_version, self.constants.whatevergreen_path)
+            support.build_support(self.model, self.constants, self.config).enable_kext("WhateverGreen.kext", self.constants.whatevergreen_navi_version, self.constants.whatevergreen_navi_path)
         if self.model in ["iMac11,1", "iMac11,2", "iMac11,3", "iMac10,1"]:
             logging.info("- Adding Nvidia Brightness Control and DRM patches")
             self.config["DeviceProperties"]["Add"][backlight_path] = {
@@ -191,7 +192,7 @@ class build_graphics_audio:
         logging.info("- Adding AMD DRM patches")
         if not support.build_support(self.model, self.constants, self.config).get_kext_by_bundle_path("WhateverGreen.kext")["Enabled"] is True:
             # Ensure WEG is enabled as we need if for Backlight patching
-            support.build_support(self.model, self.constants, self.config).enable_kext("WhateverGreen.kext", self.constants.whatevergreen_version, self.constants.whatevergreen_path)
+            support.build_support(self.model, self.constants, self.config).enable_kext("WhateverGreen.kext", self.constants.whatevergreen_navi_version, self.constants.whatevergreen_navi_path)
 
         if self.computer.dgpu.device_id == 0x7340:
             logging.info(f"- Adding AMD RX5500XT vBIOS injection")
diff --git a/resources/constants.py b/resources/constants.py
index 630362aef..4fbabee89 100644
--- a/resources/constants.py
+++ b/resources/constants.py
@@ -33,7 +33,8 @@ class Constants:
         ## Acidanthera
         ## https://github.com/acidanthera
         self.lilu_version = "1.6.3"  #               Lilu
-        self.whatevergreen_version = "1.6.2A"  #     WhateverGreen
+        self.whatevergreen_version = "1.6.3"  #      WhateverGreen
+        self.whatevergreen_navi_version = "1.6.3-Navi"  # WhateverGreen (Navi Patch)
         self.airportbcrmfixup_version = "2.1.6"  #   AirPortBrcmFixup
         self.nvmefix_version = "1.0.9"  #            NVMeFix
         self.applealc_version = "1.6.3"  #           AppleALC
@@ -302,6 +303,10 @@ class Constants:
     def whatevergreen_path(self):
         return self.payload_kexts_path / Path(f"Acidanthera/WhateverGreen-v{self.whatevergreen_version}-{self.kext_variant}.zip")
 
+    @property
+    def whatevergreen_navi_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/WhateverGreen-v{self.whatevergreen_navi_version}-{self.kext_variant}.zip")
+
     @property
     def airportbcrmfixup_path(self):
         return self.payload_kexts_path / Path(f"Acidanthera/AirportBrcmFixup-v{self.airportbcrmfixup_version}-{self.kext_variant}.zip")