@@ -29,8 +29,6 @@ jobs:
           rm -rf *pay*.dmg
           /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m pip install -r requirements.txt
 
-          aria2c -x 16 "https://github.com/hackdoc/PatcherSupportPkg/releases/download/1.10.1/Universal-Binaries.dmg"
-
       - name: Force Universal2 charset for Python
         run: |
           /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m pip uninstall -y charset_normalizer
@@ -69,8 +67,8 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           #tag_name: push-${{ github.sha }}
-          tag_name: 3.0.0Pre
-          name: 3.0.0 Tahoe Test Version
+          tag_name: 3.0.1
+          name: 3.0.1 Tahoe Test
           body: ${{ github.event.head_commit.message }}
           prerelease: true
           files: |
 
@@ -1,13 +1,11 @@
 name: CI - Validation
-
 on:
   push:
     paths-ignore: 
       - 'docs/**'
   workflow_dispatch:
   release:
     types: [published]
-#/usr/local/aria2/bin/
 jobs:
   build:
     name: Validate
@@ -24,6 +22,4 @@ jobs:
           /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m pip install --upgrade pip
           /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m pip install -r requirements.txt
           /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m pip install packaging
-          rm -rf Univ*
-          aria2c -x 16 "https://github.com/hackdoc/PatcherSupportPkg/releases/download/1.10.1/Universal-Binaries.dmg"
           /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 OCLP-R-GUI.command --validate
@@ -17,8 +17,8 @@ def __init__(self) -> None:
         self.metallib_api_link:               str = ""
 
         # Patcher Versioning
-        self.patcher_version:                 str = "3.0.0"  # OCLP-R
-        self.patcher_support_pkg_version:     str = "1.10.1-pre"  # PatcherSupportPkg
+        self.patcher_version:                 str = "3.0.1"  # OCLP-R
+        self.patcher_support_pkg_version:     str = "1.11.0"  # PatcherSupportPkg
         self.copyright_date:                  str = "Copyright © 2020-2025 Dortania and Hackdoc"
         self.patcher_name:                    str = "OCLP-R"
 
@@ -129,7 +129,7 @@ def __init__(self) -> None:
         ## flagersgit
         ## https://github.com/flagersgit/KDKlessWorkaround
         self.kdkless_version: str = "1.0.0"
-        self.audio_type :  str ="AppleHDA"#AppleALC || VoodooHDA
+        
         ## Jazzzny
         self.legacy_keyboard: str = "1.0.0"  # LegacyKeyboardInjector - Jazzzny
 
@@ -141,6 +141,7 @@ def __init__(self) -> None:
 
         # Patcher Settings
         ## Internal settings
+        self.audio_type :  str ="AppleHDA"
         self.change_control_center:     bool = False
         self.allow_oc_everywhere:       bool = False  # Set whether Patcher can be run on unsupported Macs
         self.gui_mode:                  bool = False  # Determine whether running in a GUI or TUI
 
@@ -97,7 +97,7 @@ class HardwarePatchsetValidation(StrEnum):
     NVDA_DRV_MISSING              = "Validation: nvda_drv(_vrl) variable missing"
     PATCHING_NOT_POSSIBLE         = "Validation: Patching not possible"
     UNPATCHING_NOT_POSSIBLE       = "Validation: Unpatching not possible"
-    REPATCHING_NOT_SUPPORTED      = "Validation: Root volume dirty, unpatch to continue"
+    REPATCHING_NOT_SUPPORTED      = "Validation: Root volume dirty"
 
 
 class HardwarePatchsetDetection:
 
@@ -28,7 +28,6 @@ def present(self) -> bool:
             self._computer.wifi.chipset in [
                 device_probe.Broadcom.Chipsets.AirPortBrcm4360,
                 device_probe.Broadcom.Chipsets.AirportBrcmNIC,
-                # We don't officially support this chipset, however we'll throw a bone to hackintosh users
                 device_probe.Broadcom.Chipsets.AirPortBrcmNICThirdParty,
             ]
         ) or isinstance(self._computer.wifi, device_probe.IntelWirelessCard) and (
@@ -42,62 +41,35 @@ def native_os(self) -> bool:
         Dropped support with macOS 14, Sonoma
         """
         return self._xnu_major < os_data.sonoma.value
-    
-    def extended_os(self) -> bool:
-        """
-        Extended support with macOS 14, Sonoma
-        """
-        return self._xnu_major == os_data.sonoma.value
-
+ 
     def hardware_variant(self) -> HardwareVariant:
         """
         Type of hardware variant
         """
         return HardwareVariant.NETWORKING
 
-    def _patches_modern_wireless_sonoma(self) -> dict:
-        """
-        Extended modern wireless patches
-        """
-        if self.native_os() is True or self.extended_os() is False:
-            return {}
-
-        return {
-            "Modern Wireless Extended": {
-                PatchType.OVERWRITE_SYSTEM_VOLUME: {
-                    "/usr/libexec": {
-                        "airportd": f"13.7.2-{self._xnu_major}",
-                    },
-                },
-                PatchType.MERGE_SYSTEM_VOLUME: {
-                    "/System/Library/Frameworks": {
-                        "CoreWLAN.framework": f"13.7.2-{self._xnu_major}",
-                    },
-                    "/System/Library/PrivateFrameworks": {
-                        "CoreWiFi.framework":  f"13.7.2-{self._xnu_major}",
-                    },
-                },
-            },
-        }
-
     def _patches_modern_wireless(self) -> dict:
         """
         Common modern wireless patches
         """
         if self.native_os() is True:
             return {}
-
         return {
-            "Modern Wireless Common": {
+            "Modern Wireless": {
                 PatchType.OVERWRITE_SYSTEM_VOLUME: {
                     "/usr/libexec": {
                         "wifip2pd": f"13.7.2-{self._xnu_major}",
+                        **({ "airportd": f"13.7.2-{self._xnu_major}" } if self._xnu_major == os_data.sonoma else {}),
                     },
                 },
                 PatchType.MERGE_SYSTEM_VOLUME: {
                     "/System/Library/PrivateFrameworks": {
                         "IO80211.framework":        f"13.7.2-{self._xnu_major}",
                         "WiFiPeerToPeer.framework": f"13.7.2-{self._xnu_major}",
+                        **({ "CoreWiFi.framework": f"13.7.2-{self._xnu_major}" } if self._xnu_major == os_data.sonoma else {}),
+                    },
+                    "/System/Library/Frameworks": {
+                       **({ "CoreWLAN.framework": f"13.7.2-{self._xnu_major}" } if self._xnu_major == os_data.sonoma else {}),
                     },
                 },
             },
@@ -107,14 +79,7 @@ def patches(self) -> dict:
         """
         Dictionary of patches
         """
-
         _base = {
             **self._patches_modern_wireless(),
         }
-
-        if self._xnu_major == os_data.sonoma.value:
-            _base.update({
-                **self._patches_modern_wireless_sonoma(),
-            })
-
         return _base