sys_patch_dict.py: Fix comparison

Sync PatcherSupportPkg
Small fix
2026-04-15 13:18:56 +10:00 · 2024-03-10 17:06:07 -06:00 · 2024-03-10 14:14:38 -06:00 · 2024-03-10 21:10:10 +02:00 · 2024-03-10 21:07:51 +02:00 · 2024-03-10 12:01:23 -06:00
96 changed files with 14994 additions and 6555 deletions
--- a/Build-Binary.command
+++ b/Build-Binary.command
@@ -8,7 +8,6 @@ import sys
 import time
 import argparse
 import plistlib
-import platform
 import subprocess

 from pathlib import Path
@@ -127,7 +126,7 @@ class CreateBinary:
        if Path(f"./dist/OpenCore-Patcher.app").exists():
            print("Found OpenCore-Patcher.app, removing...")
            rm_output = subprocess.run(
-                ["rm", "-rf", "./dist/OpenCore-Patcher.app"],
+                ["/bin/rm", "-rf", "./dist/OpenCore-Patcher.app"],
                stdout=subprocess.PIPE, stderr=subprocess.PIPE
            )
            if rm_output.returncode != 0:
@@ -153,13 +152,11 @@ class CreateBinary:
        print("Embedding icns...")
        for file in Path("payloads/Icon/AppIcons").glob("*.icns"):
            subprocess.run(
-                ["cp", str(file), "./dist/OpenCore-Patcher.app/Contents/Resources/"],
+                ["/bin/cp", str(file), "./dist/OpenCore-Patcher.app/Contents/Resources/"],
                stdout=subprocess.PIPE, stderr=subprocess.PIPE
            )


-
-
    def _embed_key(self):
        """
        Embed developer key into binary
@@ -236,11 +233,10 @@ class CreateBinary:
            "Kexts",
            "OpenCore",
            "Tools",
+            "Launch Services",
        ]

        whitelist_files = [
-            "com.dortania.opencore-legacy-patcher.auto-patch.plist",
-            "com.dortania.opencore-legacy-patcher.rsr-monitor.plist",
            "entitlements.plist",
            "launcher.sh",
            "OC-Patcher-TUI.icns",
@@ -254,12 +250,12 @@ class CreateBinary:
                if file.name in whitelist_folders:
                    continue
                print(f"- Deleting {file.name}")
-                subprocess.run(["rm", "-rf", file])
+                subprocess.run(["/bin/rm", "-rf", file])
            else:
                if file.name in whitelist_files:
                    continue
                print(f"- Deleting {file.name}")
-                subprocess.run(["rm", "-f", file])
+                subprocess.run(["/bin/rm", "-f", file])


    def _download_resources(self):
@@ -281,7 +277,7 @@ class CreateBinary:
                    assert resource, "Resource cannot be empty"
                    assert resource not in ("/", "."), "Resource cannot be root"
                    rm_output = subprocess.run(
-                        ["rm", "-rf", f"./{resource}"],
+                        ["/bin/rm", "-rf", f"./{resource}"],
                        stdout=subprocess.PIPE, stderr=subprocess.PIPE
                    )
                    if rm_output.returncode != 0:
@@ -295,7 +291,7 @@ class CreateBinary:

            download_result = subprocess.run(
                [
-                    "curl", "-LO",
+                    "/usr/bin/curl", "-LO",
                    f"https://github.com/dortania/PatcherSupportPkg/releases/download/{patcher_support_pkg_version}/{resource}"
                ],
                stdout=subprocess.PIPE, stderr=subprocess.PIPE
@@ -324,7 +320,7 @@ class CreateBinary:

            print("- Removing old payloads.dmg")
            rm_output = subprocess.run(
-                ["rm", "-rf", "./payloads.dmg"],
+                ["/bin/rm", "-rf", "./payloads.dmg"],
                stdout=subprocess.PIPE, stderr=subprocess.PIPE
            )
            if rm_output.returncode != 0:
@@ -334,7 +330,7 @@ class CreateBinary:

        print("- Generating DMG...")
        dmg_output = subprocess.run([
-            'hdiutil', 'create', './payloads.dmg',
+            '/usr/bin/hdiutil', 'create', './payloads.dmg',
            '-megabytes', '32000',  # Overlays can only be as large as the disk image allows
            '-format', 'UDZO', '-ov',
            '-volname', 'OpenCore Patcher Resources (Base)',
@@ -412,7 +408,7 @@ class CreateBinary:
        path = "./dist/OpenCore-Patcher"
        print(f"- Removing {path}")
        rm_output = subprocess.run(
-            ["rm", "-rf", path],
+            ["/bin/rm", "-rf", path],
            stdout=subprocess.PIPE, stderr=subprocess.PIPE
        )
        if rm_output.returncode != 0:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,116 @@
 # OpenCore Legacy Patcher changelog

+## 1.4.2
+- Resolve Auto-Join support for Modern Wireless on macOS 14.4
+  - Applicable for BCM94360, 4360, 4350, 4331 and 43224 chipsets
+- Resolve WiFi support for Legacy Wireless on macOS 12.7.4 and 13.6.5
+  - Applicable for BCM94328, BCM94322 and Atheros chipsets
+- Resolve USB 1.1 on macOS Ventura regression from OCLP 1.4.0
+- Increment Binaries:
+  - PatcherSupportPkg 1.4.8 - release
+
+## 1.4.1
+- Update updater implementation
+- Resolve Keyboard/Trackpad support for MacBookAir6,x running macOS 14.4 and newer
+  - Expands SPI Keyboard and Trackpad patch to include MacBookAir6,x
+- Publish Bluetooth NVRAM variables for BCM2046 and BCM2070 chipsets
+  - Reduces need for NVRAM reset to restore Bluetooth support in newer OSes (Thanks @ausdauersportler)
+
+## 1.4.0
+- Refactor subprocess invocations
+- Resolve RecoveryOS support (Regression resolved in OpenCorePkg)
+- Restore SPI Keyboard and Trackpad support for macOS 14.4 and newer
+  - Applicable for MacBook8,1, MacBookAir7,x and MacBookPro12,1-14,x
+- Restore support for T1 on macOS 14.4 and newer
+  - Applicable for MacBookPro13,2, MacBookPro13,3, MacBookPro14,2, MacBookPro14,3
+- Restore support for legacy Metal GPUs on macOS 14.4 and newer
+  - Applicable for:
+    - Intel Ivy Bridge through Skylake
+    - Nvidia Kepler
+    - AMD legacy GCN
+- Restore support for USB 1.1 on macOS 14.4 and newer
+  - Applicable for Penryn Macs, Xserve3,1 and MacPro4,1/5,1
+- Resolve support for legacy and modern WiFi on macOS 14.4 and newer
+  - Applicable for all WiFi-equipped Macs
+  - Note with 14.4: Auto-Join may not work until you forget and rejoin the network
+- Increment binaries:
+  - OpenCorePkg 0.9.7 - release
+
+## 1.3.0
+- Resolve mismatched `CFBundleExecutable` and binary name for kexts.
+  - Resolves ProperTree binary detection (Thanks @CorpNewt).
+  - Applicable extensions:
+    - corecrypto_T1.kext
+    - corecaptureElCap.kext
+    - IO80211ElCap.kext
+- Resolve 3802-GPU support for macOS 14.2 Beta 2 and newer.
+  - Applicable GPUs:
+    - Intel Ivy Bridge and Haswell iGPUs
+    - Nvidia Kepler dGPUs
+- Increment Binaries:
+  - PatcherSupportPkg 1.4.6 - release
+
+## 1.2.1
+- Resolve `TeraScale 2 Acceleration` checkbox in Settings not being saved
+  - Thanks @rtd1250
+- Resolve Auto Patcher failing to launch after updating macOS
+  - Regression from 1.2.0
+
+## 1.2.0
+- Resolve application not existing if user dismisses an update instead of installing
+- Resolve lldb crashes on extracted binaries
+  - Remove MH_DYLIB_IN_CACHE flag from binaries extracted with DSCE
+- Add support for detecting T1 Security Chips in DFU mode
+- Resolve macOS 14.2 coreauthd crashes on T1 Macs
+- Resolve missing NFC firmware on T1 Macs
+- Update non-Metal Binaries for macOS Sonoma:
+  - Resolve Photos app crash
+  - Resolve loginwindow crashes
+  - Workaround tile window popup freezing apps by disabling the feature
+  - Workaround monochrome desktop widgets rendering issues by enforcing full color (can be disabled in OCLP settings)
+- Add new arguments:
+  - `--cache_os`: Cache necessary patcher files for OS to be installed (ex. KDKs)
+  - `--prepare_for_update`: Clean up patcher files for OS to be installed (ex. /Library/Extensions)
+- Add new Launch Daemons for handling macOS updates:
+  - `macos-update.plist`:
+    - Resolves KDKless Macs failing to boot after updating from 14.0 to 14.x
+    - Adds support for KDK caching for OS to be installed
+    - Invoked when update is staged
+    - `/Library/LaunchDaemons/com.dortania.opencore-legacy-patcher.macos-update.plist`
+  - `os-caching.plist`
+    - Resolves unsupported/old KDKs from being used post-update
+    - Invoked when update is downloading
+    - `/Library/LaunchDaemons/com.dortania.opencore-legacy-patcher.os-caching.plist`
+- Load UI icons from local path
+  - Resolves macOS downloader crash on slower machines
+- Resolve iMac18,2 internal 4K display support
+- Remove News Widget removal from Control Centre
+  - News Widget no longer crashes on 3802-based GPUs
+- Resolve i210 NIC support for macOS Sonoma
+- Increment Binaries:
+  - PatcherSupportPkg 1.4.5 - release
+  - OpenCorePkg 0.9.6 - release
+
+## 1.1.0
+- Resolve rendering issues on Intel Broadwell iGPUs
+- Update non-Metal Binaries for macOS Sonoma:
+  - Resolve unresponsive Weather app
+  - Resolve full screen menubar covering the app toolbar
+  - Resolve unfocused password windows
+- Resolve USB 1.1 kernel panics on macOS 14.1
+- Resolve PCIe FaceTime camera support on macOS 14.1
+- Resolve T1 Security Chip support on macOS 14
+  - Applicable for MacBookPro13,2, MacBookPro13,3, MacBookPro14,2, MacBookPro14,3
+- Add support for stand alone OpenCore Vaulting without Xcode Command Line Tools (Jazzzny)
+- Re-allow NVMeFix for macOS 14
+- Remove `-lilubetaall` argument for machines without AppleALC
+- Increment Binaries:
+  - PatcherSupportPkg 1.4.2 - release
+  - AirportBrcmFixup 2.1.8 - release
+  - BlueToolFixup 2.6.8 - release
+  - RestrictEvents 1.1.3 - release
+  - AMFIPass 1.4.0 - release
+
 ## 1.0.1
 - Resolve rendering issues on Intel Ivy Bridge iGPUs
 - Update non-Metal Binaries for macOS Sonoma:
@@ -11,7 +122,7 @@
 - Add error handling for corrupted patcher settings
 - Remove CoreImage patch for 3802 GPUs on Ventura
 - Avoid listing PCIe FaceTime camera patch on pre-Sonoma OSes
-  - Only cometic in Root Patching UI, however removed to avoid confusion
+  - Only cosmetic in Root Patching UI, however it has been removed to avoid confusion

 ## 1.0.0
 - Resolve BCM2046 and BCM2070 support on macOS 13.3 and newer
@@ -52,6 +163,7 @@
  - CPUFriend 1.2.7 - release
  - BlueToolFixup 2.6.8 - rolling (2305aaa)
  - CryptexFixup 1.0.2 - release
+  - NVMeFix 1.1.1 - release
  - PatcherSupportPkg 1.3.2 - release
 - Build Server Changes:
  - Upgrade Python backend to 3.11.5
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,5 +1,5 @@
-Copyright (c) 2020-2023, Dhinak G
-Copyright (c) 2020-2023, Mykola Grymalyuk
+Copyright (c) 2020-2024, Dhinak G
+Copyright (c) 2020-2024, Mykola Grymalyuk

 All rights reserved.

--- a/OpenCore-Patcher-GUI.spec
+++ b/OpenCore-Patcher-GUI.spec
@@ -1,16 +1,28 @@
 # -*- mode: python ; coding: utf-8 -*-

-import sys, os, time, subprocess, pathlib
+import os
+import sys
+import time
+import subprocess
+
+from pathlib import Path
+
+from PyInstaller.building.api import PYZ, EXE, COLLECT
+from PyInstaller.building.osx import BUNDLE
+from PyInstaller.building.build_main import Analysis
+
 sys.path.append(os.path.abspath(os.getcwd()))
+
 from resources import constants
+
 block_cipher = None

 datas = [
   ('payloads.dmg', '.'),
   ('Universal-Binaries.dmg', '.'),
-
 ]
-if pathlib.Path("DortaniaInternalResources.dmg").exists():
+
+if Path("DortaniaInternalResources.dmg").exists():
   datas.append(('DortaniaInternalResources.dmg', '.'))


@@ -27,8 +39,10 @@ a = Analysis(['OpenCore-Patcher-GUI.command'],
             win_private_assemblies=False,
             cipher=block_cipher,
             noarchive=False)
-pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
+
+pyz = PYZ(a.pure,
+          a.zipped_data,
+          cipher=block_cipher)

 exe = EXE(pyz,
          a.scripts,
@@ -43,7 +57,8 @@ exe = EXE(pyz,
          disable_windowed_traceback=False,
          target_arch="universal2",
          codesign_identity=None,
-          entitlements_file=None )
+          entitlements_file=None)
+
 coll = COLLECT(exe,
               a.binaries,
               a.zipfiles,
@@ -52,6 +67,7 @@ coll = COLLECT(exe,
               upx=True,
               upx_exclude=[],
               name='OpenCore-Patcher')
+
 app = BUNDLE(coll,
             name='OpenCore-Patcher.app',
             icon="payloads/OC-Patcher.icns",
@@ -64,6 +80,6 @@ app = BUNDLE(coll,
                "NSRequiresAquaSystemAppearance": False,
                "NSHighResolutionCapable": True,
                "Build Date": time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),
-                "BuildMachineOSBuild": subprocess.run("sw_vers -buildVersion".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode().strip(),
+                "BuildMachineOSBuild": subprocess.run(["/usr/bin/sw_vers", "-buildVersion"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode().strip(),
                "NSPrincipalClass": "NSApplication",
             })
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Our project's main goal is to breathe new life into Macs no longer supported by

 Noteworthy features of OpenCore Legacy Patcher:

-* Support for macOS Big Sur, Monterey and Ventura
+* Support for macOS Big Sur, Monterey, Ventura, and Sonoma
 * Native Over the Air (OTA) System Updates
 * Supports Penryn and newer Macs
 * Full support for WPA Wi-Fi and Personal Hotspot on BCM943224 and newer wireless chipsets
@@ -32,7 +32,7 @@ Note: Only clean-installs and upgrades are supported. macOS Big Sur installs alr

 * You can, however, reinstall macOS with this patcher and retain your original data

-Note 2: Currently, OpenCore Legacy Patcher officially supports patching to run macOS Big Sur through Ventura installs. For older OSes, OpenCore may function; however, support is currently not provided from Dortania.
+Note 2: Currently, OpenCore Legacy Patcher officially supports patching to run macOS Big Sur through Sonoma installs. For older OSes, OpenCore may function; however, support is currently not provided from Dortania.

 * For macOS Mojave and Catalina support, we recommend the use of [dosdude1's patchers](http://dosdude1.com)

@@ -100,6 +100,7 @@ To run the project from source, see here: [Build and run from source](./SOURCE.m
  * Pre-Ivy Bridge Aquantia Ethernet Patch
  * Non-Metal Photo Booth Patch for Monterey+
  * GUI and Backend Development
+  * Vaulting implementation
 * Amazing users who've graciously donate hardware:
  * [JohnD](https://forums.macrumors.com/members/johnd.53633/) - 2013 Mac Pro
  * [SpiGAndromeda](https://github.com/SpiGAndromeda) - AMD Vega 64
--- a/data/css_data.py
+++ b/data/css_data.py
--- a/data/smbios_data.py
+++ b/data/smbios_data.py
@@ -2363,7 +2363,7 @@ smbios_dictionary = {
        "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
        "Ethernet Chipset": "Broadcom",
-        "5K Display": True,
+        "Dual DisplayPort Display": True,
        "Stock GPUs": [
            device_probe.Intel.Archs.Haswell,
            device_probe.AMD.Archs.Legacy_GCN_7000,
@@ -2382,7 +2382,7 @@ smbios_dictionary = {
        "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
        "Ethernet Chipset": "Broadcom",
-        "5K Display": True,
+        "Dual DisplayPort Display": True,
        "Stock GPUs": [
            device_probe.Intel.Archs.Haswell,
            device_probe.AMD.Archs.Legacy_GCN_7000,
@@ -2438,7 +2438,7 @@ smbios_dictionary = {
        "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
        "Ethernet Chipset": "Broadcom",
-        "5K Display": True,
+        "Dual DisplayPort Display": True,
        "Stock GPUs": [
            device_probe.Intel.Archs.Skylake,
            device_probe.AMD.Archs.Legacy_GCN_8000,
@@ -2458,7 +2458,7 @@ smbios_dictionary = {
        "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
        "Ethernet Chipset": "Broadcom",
-        "5K Display": True,
+        "Dual DisplayPort Display": True,
        "Stock GPUs": [
            device_probe.Intel.Archs.Skylake,
            device_probe.AMD.Archs.Legacy_GCN_8000,
@@ -2478,7 +2478,7 @@ smbios_dictionary = {
        "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
        "Ethernet Chipset": "Broadcom",
-        "5K Display": True,
+        "Dual DisplayPort Display": True,
        "Stock GPUs": [
            device_probe.Intel.Archs.Skylake,
            device_probe.AMD.Archs.Legacy_GCN_8000,
@@ -2517,6 +2517,7 @@ smbios_dictionary = {
        "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703,
        "Ethernet Chipset": "Broadcom",
+        "Dual DisplayPort Display": True,
        "Stock GPUs": [
            device_probe.Intel.Archs.Kaby_Lake,
            device_probe.AMD.Archs.Polaris,
@@ -2536,7 +2537,7 @@ smbios_dictionary = {
        "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703,
        "Ethernet Chipset": "Broadcom",
-        "5K Display": True,
+        "Dual DisplayPort Display": True,
        "Stock GPUs": [
            device_probe.Intel.Archs.Kaby_Lake,
            device_probe.AMD.Archs.Polaris,
@@ -2556,7 +2557,7 @@ smbios_dictionary = {
        "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe,
        "Bluetooth Model": bluetooth_data.bluetooth_data.UART,
        "Ethernet Chipset": "Broadcom",
-        "5K Display": True,
+        "Dual DisplayPort Display": True,
        "Stock GPUs": [
            device_probe.Intel.Archs.Coffee_Lake,
            device_probe.AMD.Archs.Polaris,
@@ -2577,7 +2578,7 @@ smbios_dictionary = {
        "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe,
        "Bluetooth Model": bluetooth_data.bluetooth_data.UART,
        "Ethernet Chipset": "Broadcom",
-        "5K Display": True,
+        "Dual DisplayPort Display": True,
        "Stock GPUs": [
            device_probe.Intel.Archs.Coffee_Lake,
            device_probe.AMD.Archs.Polaris,
@@ -2598,6 +2599,7 @@ smbios_dictionary = {
        "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe,
        "Bluetooth Model": bluetooth_data.bluetooth_data.UART,
        "Ethernet Chipset": "Broadcom",
+        "Dual DisplayPort Display": True,
        "Stock GPUs": [
            device_probe.Intel.Archs.Coffee_Lake,
            device_probe.AMD.Archs.Polaris,
@@ -2618,7 +2620,7 @@ smbios_dictionary = {
        "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe,
        "Bluetooth Model": bluetooth_data.bluetooth_data.UART,
        "Ethernet Chipset": "Broadcom",
-        "5K Display": True,
+        "Dual DisplayPort Display": True,
        "Stock GPUs": [
            device_probe.Intel.Archs.Comet_Lake,
            device_probe.AMD.Archs.Navi,
@@ -2637,7 +2639,7 @@ smbios_dictionary = {
        "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe,
        "Bluetooth Model": bluetooth_data.bluetooth_data.UART,
        "Ethernet Chipset": "Broadcom",
-        "5K Display": True,
+        "Dual DisplayPort Display": True,
        "Stock GPUs": [
            device_probe.Intel.Archs.Comet_Lake,
            device_probe.AMD.Archs.Navi,
@@ -2684,7 +2686,7 @@ smbios_dictionary = {
        "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe,
        "Bluetooth Model": bluetooth_data.bluetooth_data.UART,
        "Ethernet Chipset": "Aquantia",
-        "5K Display": True,
+        "Dual DisplayPort Display": True,
        "Stock GPUs": [
            device_probe.AMD.Archs.Vega,
        ],
--- a/data/sys_patch_dict.py
+++ b/data/sys_patch_dict.py
@@ -1,6 +1,8 @@
 # Dictionary defining patch sets used during Root Volume patching (sys_patch.py)
 # Copyright (C) 2022-2023, Mykola Grymalyuk

+import packaging.version
+
 from data import os_data


@@ -9,11 +11,11 @@ class SystemPatchDictionary():
    Library for generating patch sets for sys_patch.py and supporting modules

    Usage:
-        >>> patchsets = SystemPatchDictionary(22, 0, [20, 21, 22]).patchset_dict
+        >>> patchsets = SystemPatchDictionary(22, 0, [20, 21, 22], "13.0").patchset_dict


    Patchset Schema:
-        Supports 6 types of higher level keys:
+        Supports following types of higher level keys:
        - OS Support: Supported OSes by patches
            - Minimum OS Support:  Minimum supported OS version
                - OS Major:          Major XNU Kernel version
@@ -30,6 +32,9 @@ class SystemPatchDictionary():
        - Remove: Files to remove
            - Location:
                - File (array: [ "File" ])
+        - Remove Non-Root: Files to remove from data partition
+            - Location:
+                - File (array: [ "File" ])
        - Processes: Additional processes to run
            - Process (dict: { "Process": "Requires Root" })
        - Display Name: User-friendly name (string, "" if user-friendly name is not required)
@@ -46,12 +51,13 @@ class SystemPatchDictionary():
    Note: Stubbed binaries are OS specific, thus use the 'self.os_major' variable to denounce which folder variant to use
    """

-    def __init__(self, os_major: int, os_minor: int, non_metal_os_support: list) -> None:
+    def __init__(self, os_major: int, os_minor: int, non_metal_os_support: list, marketing_version: str) -> None:
        """
        Parameters:
            os_major              (int): Major XNU Kernel version
            os_minor              (int): Minor XNU Kernel version
            non_metal_os_support (list): List of supported non-metal OSes (XNU Major Versions)
+            marketing_version     (str): Marketing version of the OS

        'non_metal_os_support' is assumed to be sorted from oldest to newest
        """
@@ -61,16 +67,86 @@ class SystemPatchDictionary():
        self.os_float:            float = float(f"{self.os_major}.{self.os_minor}")
        self.non_metal_os_support: list = non_metal_os_support
        self.patchset_dict:        dict = {}
+        self.marketing_version:     str = marketing_version
+
+        self.affected_by_cve_2024_23227: bool = self.__is_affect_by_cve_2024_23227()

        # XNU Kernel versions
        self.macOS_12_0_B7:       float = 21.1
        self.macOS_12_4:          float = 21.5
        self.macOS_12_5:          float = 21.6
        self.macOS_13_3:          float = 22.4
+        self.macOS_14_1:          float = 23.1
+        self.macOS_14_2:          float = 23.2
+        self.macOS_14_4:          float = 23.4

        self._generate_sys_patch_dict()


+    def __resolve_ivy_bridge_framebuffers(self) -> str:
+        """
+        Resolve patchset directory for Ivy Bridge framebuffers:
+        - AppleIntelFramebufferCapri.kext
+        - AppleIntelHD4000Graphics.kext
+        """
+        if self.os_major < os_data.os_data.sonoma:
+            return "11.4"
+        if self.os_float < self.macOS_14_4:
+            return "11.4-23"
+        return "11.4-23.4"
+
+
+    def __resolve_kepler_geforce_framebuffers(self) -> str:
+        """
+        Resolve patchset directory for GeForce.kext
+        """
+        if self.os_major < os_data.os_data.sonoma:
+            return "12.0 Beta 6"
+        if self.os_float < self.macOS_14_4:
+            return "12.0 Beta 6-23"
+        return "12.0 Beta 6-23.4"
+
+
+    def __resolve_monterey_framebuffers(self) -> str:
+        """
+        Resolve patchset directory for framebuffers last supported in Monterey:
+        - AppleIntelBDWGraphics.kext
+        - AppleIntelBDWGraphicsFramebuffer.kext
+        - AppleIntelFramebufferAzul.kext
+        - AppleIntelHD5000Graphics.kext
+        - AppleIntelSKLGraphics.kext
+        - AppleIntelSKLGraphicsFramebuffer.kext
+        - AMDRadeonX4000.kext
+        - AMDRadeonX5000.kext
+        """
+        if self.os_major < os_data.os_data.sonoma:
+            return "12.5"
+        if self.os_float < self.macOS_14_4:
+            return "12.5-23"
+        return "12.5-23.4"
+
+
+    def __is_affect_by_cve_2024_23227(self) -> bool:
+        """
+        CVE-2024-23227 broke our airportd patches for 12.7.4, 13.6.5 and 14.4
+
+        Note that since the XNU version's security patch level is not increment
+        """
+
+        if self.os_major > os_data.os_data.sonoma:
+            return True
+
+        parsed_version = packaging.version.parse(self.marketing_version)
+        if self.marketing_version.startswith("12"):
+            return parsed_version >= packaging.version.parse("12.7.4")
+        if self.marketing_version.startswith("13"):
+            return parsed_version >= packaging.version.parse("13.6.5")
+        if self.marketing_version.startswith("14"):
+            return parsed_version >= packaging.version.parse("14.4")
+
+        return False
+
+
    def _generate_sys_patch_dict(self):
        """
        Generates the sys_patch_dict dictionary
@@ -151,6 +227,7 @@ class SystemPatchDictionary():
                        "defaults write /Library/Preferences/.GlobalPreferences.plist WebKitExperimentalUseGPUProcessForCanvasRenderingEnabled -bool false": True,
                        **({"defaults write /Library/Preferences/.GlobalPreferences.plist WebKitPreferences.acceleratedDrawingEnabled -bool false": True} if self.os_major >= os_data.os_data.sonoma else {}),
                        **({"defaults write /Library/Preferences/.GlobalPreferences.plist NSEnableAppKitMenus -bool false": True} if self.os_major >= os_data.os_data.sonoma else {}),
+                        **({"defaults write /Library/Preferences/.GlobalPreferences.plist NSZoomButtonShowMenu -bool false": True} if self.os_major >= os_data.os_data.sonoma else {}),
                    },
                },
                "Non-Metal IOAccelerator Common": {
@@ -383,6 +460,11 @@ class SystemPatchDictionary():
                            **({  "MTLCompiler.framework": "13.2.1" } if self.os_major == os_data.os_data.ventura else {}),
                            **({  "GPUCompiler.framework": "13.2.1" } if self.os_major == os_data.os_data.ventura else {}),
                            "RenderBox.framework": "13.2.1-3802"      if self.os_major == os_data.os_data.ventura else "14.0-3802",
+
+                            # More issues for 3802, now with 14.2 Beta 2+...
+                            # If there is a god, they clearly despise us and legacy Macs.
+                            **({  "MTLCompiler.framework": "14.2 Beta 1" } if self.os_float >= self.macOS_14_2 else {}),
+                            **({  "GPUCompiler.framework": "14.2 Beta 1" } if self.os_float >= self.macOS_14_2 else {}),
                        },
                    },
                },
@@ -573,7 +655,7 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/System/Library/Extensions": {
-                            "GeForce.kext":            "12.0 Beta 6" if self.os_major < os_data.os_data.sonoma else "12.0 Beta 6-23",
+                            "GeForce.kext":            self.__resolve_kepler_geforce_framebuffers(),
                            "NVDAGF100Hal.kext":       "12.0 Beta 6",
                            "NVDAGK100Hal.kext":       "12.0 Beta 6",
                            "NVDAResman.kext":         "12.0 Beta 6",
@@ -770,7 +852,7 @@ class SystemPatchDictionary():
                            "AMD9000Controller.kext":        "12.5",
                            "AMD9500Controller.kext":        "12.5",
                            "AMD10000Controller.kext":       "12.5",
-                            "AMDRadeonX4000.kext":           "12.5" if self.os_major < os_data.os_data.sonoma else "12.5-23",
+                            "AMDRadeonX4000.kext":           self.__resolve_monterey_framebuffers(),
                            "AMDRadeonX4000HWServices.kext": "12.5",
                            "AMDFramebuffer.kext":           "12.5" if self.os_float < self.macOS_13_3 else "12.5-GCN",
                            "AMDSupport.kext":               "12.5",
@@ -833,7 +915,7 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/System/Library/Extensions": {
-                            "AMDRadeonX4000.kext":           "12.5" if self.os_major < os_data.os_data.sonoma else "12.5-23",
+                            "AMDRadeonX4000.kext":           self.__resolve_monterey_framebuffers(),
                            "AMDRadeonX4000HWServices.kext": "12.5",

                            "AMDRadeonVADriver2.bundle":     "12.5",
@@ -857,7 +939,7 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/System/Library/Extensions": {
-                            "AMDRadeonX5000.kext":            "12.5" if self.os_major < os_data.os_data.sonoma else "12.5-23",
+                            "AMDRadeonX5000.kext":            self.__resolve_monterey_framebuffers(),

                            "AMDRadeonVADriver2.bundle":      "12.5",
                            "AMDRadeonX5000GLDriver.bundle":  "12.5",
@@ -951,8 +1033,8 @@ class SystemPatchDictionary():
                            "AppleIntelHD4000GraphicsGLDriver.bundle":  "11.0 Beta 6",
                            "AppleIntelHD4000GraphicsMTLDriver.bundle": "11.0 Beta 6" if self.os_major < os_data.os_data.ventura else "11.0-beta 6-22",
                            "AppleIntelHD4000GraphicsVADriver.bundle":  "11.3 Beta 1",
-                            "AppleIntelFramebufferCapri.kext":          "11.4" if self.os_major < os_data.os_data.sonoma else "11.4-23",
-                            "AppleIntelHD4000Graphics.kext":            "11.4" if self.os_major < os_data.os_data.sonoma else "11.4-23",
+                            "AppleIntelFramebufferCapri.kext":          self.__resolve_ivy_bridge_framebuffers(),
+                            "AppleIntelHD4000Graphics.kext":            self.__resolve_ivy_bridge_framebuffers(),
                            "AppleIntelIVBVA.bundle":                   "11.4",
                            "AppleIntelGraphicsShared.bundle":          "11.4", # libIGIL-Metal.dylib pulled from 11.0 Beta 6
                        },
@@ -972,8 +1054,8 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/System/Library/Extensions": {
-                            "AppleIntelFramebufferAzul.kext":           "12.5" if self.os_major < os_data.os_data.sonoma else "12.5-23",
-                            "AppleIntelHD5000Graphics.kext":            "12.5" if self.os_major < os_data.os_data.sonoma else "12.5-23",
+                            "AppleIntelFramebufferAzul.kext":           self.__resolve_monterey_framebuffers(),
+                            "AppleIntelHD5000Graphics.kext":            self.__resolve_monterey_framebuffers(),
                            "AppleIntelHD5000GraphicsGLDriver.bundle":  "12.5",
                            "AppleIntelHD5000GraphicsMTLDriver.bundle": "12.5",
                            "AppleIntelHD5000GraphicsVADriver.bundle":  "12.5",
@@ -996,10 +1078,10 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/System/Library/Extensions": {
-                            "AppleIntelBDWGraphics.kext":            "12.5" if self.os_major < os_data.os_data.sonoma else "12.5-23",
-                            "AppleIntelBDWGraphicsFramebuffer.kext": "12.5" if self.os_major < os_data.os_data.sonoma else "12.5-23",
+                            "AppleIntelBDWGraphics.kext":            self.__resolve_monterey_framebuffers(),
+                            "AppleIntelBDWGraphicsFramebuffer.kext": self.__resolve_monterey_framebuffers(),
                            "AppleIntelBDWGraphicsGLDriver.bundle":  "12.5",
-                            "AppleIntelBDWGraphicsMTLDriver.bundle": "12.5",
+                            "AppleIntelBDWGraphicsMTLDriver.bundle": "12.5-22",
                            "AppleIntelBDWGraphicsVADriver.bundle":  "12.5",
                            "AppleIntelBDWGraphicsVAME.bundle":      "12.5",
                            "AppleIntelGraphicsShared.bundle":       "12.5",
@@ -1020,8 +1102,8 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/System/Library/Extensions": {
-                            "AppleIntelSKLGraphics.kext":            "12.5" if self.os_major < os_data.os_data.sonoma else "12.5-23",
-                            "AppleIntelSKLGraphicsFramebuffer.kext": "12.5" if self.os_major < os_data.os_data.sonoma else "12.5-23",
+                            "AppleIntelSKLGraphics.kext":            self.__resolve_monterey_framebuffers(),
+                            "AppleIntelSKLGraphicsFramebuffer.kext": self.__resolve_monterey_framebuffers(),
                            "AppleIntelSKLGraphicsGLDriver.bundle":  "12.5",
                            "AppleIntelSKLGraphicsMTLDriver.bundle": "12.5",
                            "AppleIntelSKLGraphicsVADriver.bundle":  "12.5",
@@ -1096,10 +1178,10 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/usr/libexec": {
-                            "airportd": "11.7.1",
+                            "airportd": "11.7.10" if self.affected_by_cve_2024_23227 is False else "11.7.10-Sandbox",
                        },
                        "/System/Library/CoreServices": {
-                            "WiFiAgent.app": "11.7.1",
+                            "WiFiAgent.app": "11.7.10",
                        },
                    },
                    "Install Non-Root": {
@@ -1123,19 +1205,16 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/usr/libexec": {
-                            "wps": "12.6.2",
-                            "wifip2pd":       "12.6.2",
-                            "wifianalyticsd": "13.5",
+                            "wps":      "12.7.2",
+                            "wifip2pd": "12.7.2",
                        },
                        "/System/Library/Frameworks": {
-                            "CoreWLAN.framework": "12.6.2",
+                            "CoreWLAN.framework": "12.7.2",
                        },
                        "/System/Library/PrivateFrameworks": {
-                            "CoreWiFi.framework": "12.6.2",
-                            "IO80211.framework":  "12.6.2",
-                            "WiFiPeerToPeer.framework":  "12.6.2",
-                            **({ "CoreAnalytics.framework": "13.5"} if self.os_major >= os_data.os_data.sonoma else {}),
-                            **({ "WiFiAnalytics.framework": "13.5"} if self.os_major >= os_data.os_data.sonoma else {}),
+                            "CoreWiFi.framework": "12.7.2",
+                            "IO80211.framework":  "12.7.2",
+                            "WiFiPeerToPeer.framework":  "12.7.2",
                        },
                    },
                },
@@ -1155,20 +1234,16 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/usr/libexec": {
-                            "airportd":       "13.5",
-                            "wifianalyticsd": "13.5",
-                            "wifip2pd":       "13.5",
+                            "airportd":       "13.6.5",
+                            "wifip2pd":       "13.6.5",
                        },
                        "/System/Library/Frameworks": {
-                            "CoreWLAN.framework": "13.5",
+                            "CoreWLAN.framework": "13.6.5",
                        },
                        "/System/Library/PrivateFrameworks": {
-                            "CoreAnalytics.framework":  "13.5",
-                            "CoreWiFi.framework":       "13.5",
-                            "IO80211.framework":        "13.5",
-                            "WiFiAnalytics.framework":  "13.5",
-                            "WiFiPolicy.framework":     "13.5",
-                            "WiFiPeerToPeer.framework": "13.5",
+                            "CoreWiFi.framework":       "13.6.5",
+                            "IO80211.framework":        "13.6.5",
+                            "WiFiPeerToPeer.framework": "13.6.5",
                        },
                    },
                },
@@ -1260,10 +1335,33 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/System/Library/Extensions": {
-                            "IOUSBHostFamily.kext": "12.6.2",
+                            "IOUSBHostFamily.kext": "12.6.2" if self.os_float < self.macOS_14_4 else "12.6.2-23.4",
                        },
                    },
                },
+                # Injection of UHCI/OHCI causes a panic on 14.1+
+                "Legacy USB 1.1 Extended": {
+                    "Display Name": "",
+                    "OS Support": {
+                        "Minimum OS Support": {
+                            "OS Major": os_data.os_data.sonoma,
+                            "OS Minor": 1 # macOS 14.1 (XNU 23.1)
+                        },
+                        "Maximum OS Support": {
+                            "OS Major": os_data.os_data.max_os,
+                            "OS Minor": 99
+                        },
+                    },
+                    "Install": {
+                        "/System/Library/Extensions/IOUSBHostFamily.kext/Contents/PlugIns": {
+                            "AppleUSBOHCI.kext":    "12.6.2-USB",
+                            "AppleUSBOHCIPCI.kext": "12.6.2-USB",
+                            "AppleUSBUHCI.kext":    "12.6.2-USB",
+                            "AppleUSBUHCIPCI.kext": "12.6.2-USB",
+                        },
+                    },
+                },
+                # With macOS 14.1, daemon won't load if not on root volume
                "PCIe FaceTime Camera": {
                    "Display Name": "Miscellaneous: PCIe FaceTime Camera",
                    "OS Support": {
@@ -1276,14 +1374,66 @@ class SystemPatchDictionary():
                            "OS Minor": 99
                        },
                    },
-                    "Install Non-Root": {
-                        "/Library/CoreMediaIO/Plug-Ins/DAL": {
+                    "Install": {
+                        "/System/Library/Frameworks/CoreMediaIO.framework/Versions/A/Resources": {
                            "AppleCamera.plugin":  "14.0 Beta 1"
                        },
-                        "/Library/LaunchDaemons": {
+                        "/System/Library/LaunchDaemons": {
                            "com.apple.cmio.AppleCameraAssistant.plist":  "14.0 Beta 1"
                        },
                    },
+                    "Remove Non-Root": {
+                        "/Library/CoreMediaIO/Plug-Ins/DAL": [
+                            "AppleCamera.plugin"
+                        ],
+                        "/Library/LaunchDaemons": [
+                            "com.apple.cmio.AppleCameraAssistant.plist"
+                        ],
+                    }
+                },
+                "T1 Security Chip": {
+                    "Display Name": "Miscellaneous: T1 Security Chip",
+                    "OS Support": {
+                        "Minimum OS Support": {
+                            "OS Major": os_data.os_data.sonoma,
+                            "OS Minor": 0
+                        },
+                        "Maximum OS Support": {
+                            "OS Major": os_data.os_data.max_os,
+                            "OS Minor": 99
+                        },
+                    },
+                    "Install": {
+                        "/System/Library/Frameworks": {
+                            "LocalAuthentication.framework": "13.6"  # Required for Password Authentication (SharedUtils.framework)
+                        },
+                        "/System/Library/PrivateFrameworks": {
+                            "EmbeddedOSInstall.framework": "13.6"  # Required for biometrickitd
+                        },
+                        # Required for Apple Pay
+                        "/usr/lib": {
+                            "libNFC_Comet.dylib":          "13.6",
+                            "libNFC_HAL.dylib":            "13.6",
+
+                            "libnfshared.dylib":           "13.6",
+                            "libnfshared.dylibOld.dylib":  "13.6",
+                            "libnfstorage.dylib":          "13.6",
+                            "libnfrestore.dylib":          "13.6",
+
+                            "libPN548_API.dylib":          "13.6"
+                        },
+                        "/usr/libexec": {
+                            "biometrickitd":        "13.6",  # Required for Touch ID
+                            "nfcd":               "13.6",    # Required for Apple Pay
+                            "nfrestore_service":  "13.6",    # Required for Apple Pay
+                        },
+                        "/usr/standalone/firmware/nfrestore/firmware/fw": {
+                            "PN549_FW_02_01_5A_rev88207.bin":         "13.6",
+                            "SN100V_FW_A3_01_01_81_rev127208.bin":    "13.6",
+                            "SN200V_FW_B1_02_01_86_rev127266.bin":    "13.6",
+                            "SN300V_FW_B0_02_01_22_rev129172.bin":    "13.6",
+                        }
+                    },
                },
            },
        }
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -149,7 +149,6 @@ module.exports = {
            sidebarDepth: 1,
            children: [
 				'ISSUES-HOLD',
-				'TESTED',
 				'TERMS',
 				'HOW',
 				'PATCHEXPLAIN',
--- a/docs/ACCEL.md
+++ b/docs/ACCEL.md
@@ -70,7 +70,7 @@ This issue is fully resolved for 13.2.1 and lower starting from 0.2.5.

 ::: details Workaround for 0.2.4, Ventura 13.3+

-Due to the usage of amfi_get_out_of_my_way=1, macOS will fail to prompt users for special permissions upon application start as well as omit the entires in System Preferences. To work around this, we recommend users install tccplus to manage permissions.
+Due to the usage of amfi_get_out_of_my_way=1, macOS will fail to prompt users for special permissions upon application start as well as omit the entries in System Preferences. To work around this, we recommend users install tccplus to manage permissions.

 [Download TCCPlus](https://github.com/jslegendre/tccplus)

--- a/docs/DONATE.md
+++ b/docs/DONATE.md
@@ -1,18 +1,7 @@
 # Supporting the patcher

-OpenCore Legacy Patcher is a hobby project for us developers, and while we love helping out the community, it's very difficult for us to troubleshoot issues remotely. The best way for us to get to work on the patcher, fix issues and add enhancements is having the hardware in-hand. As a hobby project, neither of the main developers can afford to buy every legacy Mac to test on.
+We have opened OpenCollective in order to manage donations as well as be transparent about where the donated money is going. If you want to support the patcher with money donation, you can do so below.

-The best way to support us in all honesty is to donate any old hardware you no longer need, as this allows us to have machines to test locally and push fixes much faster. While we appreciate cash donations, this makes it much more difficult for us to handle as an organization.
+[OpenCollective](https://opencollective.com/opencore-legacy-patcher)

-Main sections of help we'd appreciate:
-
-* Donating any Mac you own
-  * Does require SSE4,1 CPU to test on Sierra and newer however
-
-Additionally, hardware info dumps are greatly beneficial for us to determine what patches a machine might need:
-
-* [IORegistryExplorer](https://github.com/khronokernel/IORegistryClone/blob/master/ioreg-210.zip?raw=true)
-  * `File -> SaveAs` and open an issue on Github
-  * Note: We want IOReg dumps of hardware not running on OpenCore, instead running a clean, officially supported OS by the machine
-
-If you have any legacy hardware you're willing to donate or want to buy us hardware, please reach out on our Discord server.
+If you wish, you can also donate legacy hardware you don't need anymore as long as it makes sense logistically. In this case, reach out on the Discord server.
--- a/docs/INSTALLER.md
+++ b/docs/INSTALLER.md
@@ -26,7 +26,7 @@ For this example, we'll assume you'll need an installer. Selecting this option w
 | :--- | :--- | :--- |
 | ![OCLP GUI Installer Download Catalog](../images/OCLP-GUI-Installer-Download-Catalog.png) | ![OCLP GUI Installer Download Listed Products](../images/OCLP-GUI-Installer-Download-Listed-Products.png) | ![](../images/OCLP-GUI-Installer-Download-Unsupported.png)

-Since the patcher officially supports Big Sur and newer for patching, only those entires will be shown. For ourselves, we'll select macOS 12 as that's the latest public release at the time of writing. This will download and install the macOS installer to your applications folder.
+Since the patcher officially supports Big Sur and newer for patching, only those entries will be shown. For ourselves, we'll select macOS 12 as that's the latest public release at the time of writing. This will download and install the macOS installer to your applications folder.

 * Note that some machines (namely 2012 and older) may not be currently supported on macOS Ventura. If you see this prompt, you'll need to use an older version of macOS.

--- a/docs/MODELS.md
+++ b/docs/MODELS.md
@@ -15,94 +15,94 @@ The below tables can be used to reference issues with a particular model, and se

 ::: details OpenCore Patcher application
 The patcher application requires **OS X Yosemite 10.10** or later to run.
-* **OS X El Capitan 10.11** or later is required to make macOS Ventura installers.
+* **OS X El Capitan 10.11** or later is required to make installers for macOS Ventura and later.

-The patcher is designed to target **macOS Big Sur 11.x to macOS Ventura 13.x**.
+The patcher is designed to target **macOS Big Sur 11.x to macOS Sonoma 14.x**.
 * Other versions may work, albeit in a broken state. No support is provided for any version outside of the above.
 :::


 ### MacBook

-| Model Name | Identifier | Tagged Issues | 
-| :--- | :--- | :--- | 
-| MacBook (13-inch, Late 2008) | `MacBook5,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021)|
-| MacBook (13-inch, Early 2009)<br>MacBook (13-inch, Mid 2009) | `MacBook5,2` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021)<br>- Trackpad gestures are partially broken | 
-| MacBook (13-inch, Late 2009) | `MacBook6,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021) | 
-| MacBook (13-inch, Mid 2010) | `MacBook7,1` | ^^ | 
-| MacBook (Retina, 12-inch, Early 2015) | `MacBook8,1` | - [Legacy Metal (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1008) | 
-| MacBook (Retina, 12-inch, Early 2016) | `MacBook9,1` | ^^ | 
-| MacBook (Retina, 12-inch, 2017) | `MacBook10,1` | Supported by Apple | 
+| Model Name | Identifier | Tagged Issues |
+| :--- | :--- | :--- |
+| MacBook (13-inch, Aluminum, Late 2008) | `MacBook5,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021)|
+| MacBook (13-inch, Early 2009)<br>MacBook (13-inch, Mid 2009) | `MacBook5,2` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021)<br>- Trackpad gestures are partially broken |
+| MacBook (13-inch, Late 2009) | `MacBook6,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021) |
+| MacBook (13-inch, Mid 2010) | `MacBook7,1` | ^^ |
+| MacBook (Retina, 12-inch, Early 2015) | `MacBook8,1` | - [Legacy Metal (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1008) |
+| MacBook (Retina, 12-inch, Early 2016) | `MacBook9,1` | ^^ |
+| MacBook (Retina, 12-inch, 2017) | `MacBook10,1` | - Supported by OpenCore Legacy Patcher |

 ### MacBook Air

 | Model Name | Identifier | Tagged Issues |
 | :--- | :--- | :--- |
-| MacBook Air (13-inch, Late 2008)<br>MacBook Air (13-inch, Mid 2009) | `MacBookAir2,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021)| 
-| MacBook Air (11-inch, Late 2010) | `MacBookAir3,1` | ^^ | 
-| MacBook Air (13-inch, Late 2010) | `MacBookAir3,2` | ^^ | 
-| MacBook Air (11-inch, Mid 2011) | `MacBookAir4,1` | ^^ | 
-| MacBook Air (13-inch, Mid 2011) | `MacBookAir4,2` | ^^ | 
+| MacBook Air (13-inch, Late 2008)<br>MacBook Air (13-inch, Mid 2009) | `MacBookAir2,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021)|
+| MacBook Air (11-inch, Late 2010) | `MacBookAir3,1` | ^^ |
+| MacBook Air (13-inch, Late 2010) | `MacBookAir3,2` | ^^ |
+| MacBook Air (11-inch, Mid 2011) | `MacBookAir4,1` | ^^ |
+| MacBook Air (13-inch, Mid 2011) | `MacBookAir4,2` | ^^ |
 | MacBook Air (11-inch, Mid 2012) | `MacBookAir5,1` | - [Legacy Metal (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1008) |
-| MacBook Air (13-inch, Mid 2012) | `MacBookAir5,2` | ^^ | 
-| MacBook Air (11-inch, Mid 2013)<br>MacBook Air (11-inch, Early 2014) | `MacBookAir6,1` | ^^ | 
-| MacBook Air (13-inch, Mid 2013)<br>MacBook Air (13-inch, Early 2014) | `MacBookAir6,2` | ^^ | 
-| MacBook Air (11-inch, Early 2015) | `MacBookAir7,1` | ^^ | 
-| MacBook Air (13-inch, Early 2015)<br>MacBook Air (13-inch, 2017) | `MacBookAir7,2` | ^^ | 
-| MacBook Air (Retina, 13-inch, 2018) | `MacBookAir8,1` | - Supported by Apple | 
-| MacBook Air (Retina, 13-inch, 2019) | `MacBookAir9,1` | ^^ | 
-| MacBook Air (Retina, 13-inch, 2020) | `MacBookAir10,1` | ^^ | 
+| MacBook Air (13-inch, Mid 2012) | `MacBookAir5,2` | ^^ |
+| MacBook Air (11-inch, Mid 2013)<br>MacBook Air (11-inch, Early 2014) | `MacBookAir6,1` | ^^ |
+| MacBook Air (13-inch, Mid 2013)<br>MacBook Air (13-inch, Early 2014) | `MacBookAir6,2` | ^^ |
+| MacBook Air (11-inch, Early 2015) | `MacBookAir7,1` | ^^ |
+| MacBook Air (13-inch, Early 2015)<br>MacBook Air (13-inch, 2017) | `MacBookAir7,2` | ^^ |
+| MacBook Air (Retina, 13-inch, 2018) | `MacBookAir8,1` | - Supported by Apple |
+| MacBook Air (Retina, 13-inch, 2019) | `MacBookAir9,1` | ^^ |
+| MacBook Air (Retina, 13-inch, 2020) | `MacBookAir10,1` | ^^ |

 ### MacBook Pro

 | Model Name | Identifier | Tagged Issues |
 | :--- | :--- | :--- |
 | MacBook Pro (15-inch, Early 2008)<br>MacBook Pro (17-inch, Early 2008) | `MacBookPro4,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021)|
-| MacBook Pro (15-inch, Late 2008) | `MacBookPro5,1` | ^^ | 
-| MacBook Pro (17-inch, Early 2009)<br>MacBook Pro (17-inch, Mid 2009) | `MacBookPro5,2` | ^^ | 
-| MacBook Pro (15-inch, Mid 2009) | `MacBookPro5,3` | ^^ | 
-| MacBook Pro (13-inch, Mid 2009) | `MacBookPro5,5` | ^^ | 
-| MacBook Pro (17-inch, Mid 2010) | `MacBookPro6,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108) | 
-| MacBook Pro (15-inch, Mid 2010) | `MacBookPro6,2` | ^^ | 
-| MacBook Pro (13-inch, Mid 2010) | `MacBookPro7,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021) | 
-| MacBook Pro (13-inch, Early 2011)<br>MacBook Pro (13-inch, Late 2011) | `MacBookPro8,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108) | 
-| MacBook Pro (15-inch, Early 2011)<br>MacBook Pro (15-inch, Late 2011) | `MacBookPro8,2` | ^^ | 
-| MacBook Pro (17-inch, Early 2011)<br> | `MacBookPro8,3` | ^^ | 
-| MacBook Pro (15-inch, Mid 2012) | `MacBookPro9,1` | - [Legacy Metal (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1008) | 
-| MacBook Pro (13-inch, Mid 2012) | `MacBookPro9,2` | ^^ | 
-| MacBook Pro (Retina, 15-inch, Mid 2012)<br>MacBook Pro (Retina, 15-inch, Early 2013) | `MacBookPro10,1` | ^^ | 
-| MacBook Pro (Retina, 13-inch, Late 2012)<br>MacBook Pro (Retina, 13-inch, Early 2013) | `MacBookPro10,2` | ^^ | 
-| MacBook Pro (Retina, 13-inch, Late 2013)<br>MacBook Pro (Retina, 13-inch, Mid 2014) | `MacBookPro11,1` | ^^ | 
-| MacBook Pro (Retina, 15-inch, Late 2013)<br>MacBook Pro (Retina, 15-inch, Mid 2014) | `MacBookPro11,2`<br>`MacBookPro11,3` | ^^ | 
-| MacBook Pro (Retina, 15-inch, Mid 2015) | `MacBookPro11,4`<br>`MacBookPro11,5` | ^^ | 
-| MacBook Pro (Retina, 13-inch, Early 2015) | `MacBookPro12,1` | ^^ | 
-| MacBook Pro (13-inch, 2016, 2 Thunderbolt 3 ports) | `MacBookPro13,1` | ^^ | 
-| MacBook Pro (13-inch, 2016, 4 Thunderbolt 3 ports) | `MacBookPro13,2` | ^^ | 
-| MacBook Pro (15-inch, 2016) | `MacBookPro13,3` | ^^ | 
-| MacBook Pro (13-inch, 2017, 2 Thunderbolt 3 ports) | `MacBookPro14,1` | - Supported by Apple | 
-| MacBook Pro (13-inch, 2017, 4 Thunderbolt 3 ports) | `MacBookPro14,2` | ^^ | 
-| MacBook Pro (15-inch, 2017) | `MacBookPro14,3` | ^^ | 
-| MacBook Pro (13-inch, 2018, 4 Thunderbolt 3 ports)<br>MacBook Pro (13-inch, 2019, 4 Thunderbolt 3 ports) | `MacBookPro15,2` | ^^ | 
-| MacBook Pro (15-inch, 2018)<br>MacBook Pro (15-inch, 2019) | `MacBookPro15,1` | ^^ | 
-| MacBook Pro (13-inch, 2019, 2 Thunderbolt 3 ports) | `MacBookPro15,4` | ^^ | 
-| MacBook Pro (16-inch, 2019) | `MacBookPro16,1`<br>`MacBookPro16,4` | ^^ | 
-| MacBook Pro (13-inch, 2020, 4 Thunderbolt 3 ports) | `MacBookPro16,2` | ^^ | 
-| MacBook Pro (13-inch, 2020, 2 Thunderbolt 3 ports) | `MacBookPro16,3` | ^^ | 
+| MacBook Pro (15-inch, Late 2008) | `MacBookPro5,1` | ^^ |
+| MacBook Pro (17-inch, Early 2009)<br>MacBook Pro (17-inch, Mid 2009) | `MacBookPro5,2` | ^^ |
+| MacBook Pro (15-inch, Mid 2009) | `MacBookPro5,3` | ^^ |
+| MacBook Pro (13-inch, Mid 2009) | `MacBookPro5,5` | ^^ |
+| MacBook Pro (17-inch, Mid 2010) | `MacBookPro6,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108) |
+| MacBook Pro (15-inch, Mid 2010) | `MacBookPro6,2` | ^^ |
+| MacBook Pro (13-inch, Mid 2010) | `MacBookPro7,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021) |
+| MacBook Pro (13-inch, Early 2011)<br>MacBook Pro (13-inch, Late 2011) | `MacBookPro8,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108) |
+| MacBook Pro (15-inch, Early 2011)<br>MacBook Pro (15-inch, Late 2011) | `MacBookPro8,2` | ^^ |
+| MacBook Pro (17-inch, Early 2011)<br> | `MacBookPro8,3` | ^^ |
+| MacBook Pro (15-inch, Mid 2012) | `MacBookPro9,1` | - [Legacy Metal (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1008) |
+| MacBook Pro (13-inch, Mid 2012) | `MacBookPro9,2` | ^^ |
+| MacBook Pro (Retina, 15-inch, Mid 2012)<br>MacBook Pro (Retina, 15-inch, Early 2013) | `MacBookPro10,1` | ^^ |
+| MacBook Pro (Retina, 13-inch, Late 2012)<br>MacBook Pro (Retina, 13-inch, Early 2013) | `MacBookPro10,2` | ^^ |
+| MacBook Pro (Retina, 13-inch, Late 2013)<br>MacBook Pro (Retina, 13-inch, Mid 2014) | `MacBookPro11,1` | ^^ |
+| MacBook Pro (Retina, 15-inch, Late 2013)<br>MacBook Pro (Retina, 15-inch, Mid 2014) | `MacBookPro11,2`<br>`MacBookPro11,3` | ^^ |
+| MacBook Pro (Retina, 15-inch, Mid 2015) | `MacBookPro11,4`<br>`MacBookPro11,5` | ^^ |
+| MacBook Pro (Retina, 13-inch, Early 2015) | `MacBookPro12,1` | ^^ |
+| MacBook Pro (13-inch, 2016, 2 Thunderbolt 3 ports) | `MacBookPro13,1` | ^^ |
+| MacBook Pro (13-inch, 2016, 4 Thunderbolt 3 ports) | `MacBookPro13,2` | ^^ |
+| MacBook Pro (15-inch, 2016) | `MacBookPro13,3` | ^^ |
+| MacBook Pro (13-inch, 2017, 2 Thunderbolt 3 ports) | `MacBookPro14,1` | - Supported by OpenCore Legacy Patcher |
+| MacBook Pro (13-inch, 2017, 4 Thunderbolt 3 ports) | `MacBookPro14,2` | ^^ |
+| MacBook Pro (15-inch, 2017) | `MacBookPro14,3` | - [Legacy Metal (macOS 14+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1008) |
+| MacBook Pro (13-inch, 2018, 4 Thunderbolt 3 ports)<br>MacBook Pro (13-inch, 2019, 4 Thunderbolt 3 ports) | `MacBookPro15,2` | - Supported by Apple |
+| MacBook Pro (15-inch, 2018)<br>MacBook Pro (15-inch, 2019) | `MacBookPro15,1` | ^^ |
+| MacBook Pro (13-inch, 2019, 2 Thunderbolt 3 ports) | `MacBookPro15,4` | ^^ |
+| MacBook Pro (16-inch, 2019) | `MacBookPro16,1`<br>`MacBookPro16,4` | ^^ |
+| MacBook Pro (13-inch, 2020, 4 Thunderbolt 3 ports) | `MacBookPro16,2` | ^^ |
+| MacBook Pro (13-inch, 2020, 2 Thunderbolt 3 ports) | `MacBookPro16,3` | ^^ |

 ### Mac mini

 | Model Name | Identifier | Tagged Issues |
-| :--- | :--- | :--- | 
-| Mac mini (Early 2009) | `Macmini3,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021) | 
-| Mac mini (Mid 2010) | `Macmini4,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108) | 
-| Mac mini (Mid 2011) | `Macmini5,1`<br>`Macmini5,2`<br>`Macmini5,3` | ^^ | 
-| Mac mini (Late 2012) | `Macmini6,1`<br>`Macmini6,2` | - [Legacy Metal (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1008) | 
-| Mac mini (Late 2014) | `Macmini7,1` | ^^ | 
-| Mac mini (Late 2018) | `Macmini8,1` | - Supported by Apple | 
+| :--- | :--- | :--- |
+| Mac mini (Early 2009) | `Macmini3,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021) |
+| Mac mini (Mid 2010) | `Macmini4,1` | ^^ |
+| Mac mini (Mid 2011) | `Macmini5,1`<br>`Macmini5,2`<br>`Macmini5,3` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108) |
+| Mac mini (Late 2012) | `Macmini6,1`<br>`Macmini6,2` | - [Legacy Metal (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1008) |
+| Mac mini (Late 2014) | `Macmini7,1` | ^^ |
+| Mac mini (Late 2018) | `Macmini8,1` | - Supported by Apple |

 ### iMac
 | Model Name | Identifier | Tagged Issues |
-| :--- | :--- | :--- | 
+| :--- | :--- | :--- |
 | iMac (20-inch, Mid 2007)<br>iMac (24-inch, Mid 2007) | `iMac7,1` | - [Requires SSE4.1 CPU](https://lowendmac.com/2018/penryn-t9300-9500-cpu-upgrades-for-the-2007-imac/)<br>- [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021)<br>- Remove stock Bluetooth to prevent panics |
 | iMac (20-inch, Early 2008)<br>iMac (24-inch, Early 2008) | `iMac8,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021) |
 | iMac (20-inch, Early 2009)<br>iMac (24-inch, Early 2009)<br>iMac (20-inch, Mid 2009) | `iMac9,1` | - [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021)<br>- [Recommend upgrading to Metal GPU](https://forums.macrumors.com/threads/2011-imac-graphics-card-upgrade.1596614/?post=17425857#post-17425857) |
@@ -122,10 +122,10 @@ The patcher is designed to target **macOS Big Sur 11.x to macOS Ventura 13.x**.
 | iMac (21.5-inch, Late 2015) | `iMac16,1` | ^^ |
 | iMac (Retina 4K, 21.5-inch, Late 2015) | `iMac16,2` | ^^ |
 | iMac (Retina 5K, 27-inch, Late 2015) | `iMac17,1` | ^^ |
-| iMac (21.5-inch, 2017) | `iMac18,1` | - Supported by Apple |
+| iMac (21.5-inch, 2017) | `iMac18,1` | - Supported by OpenCore Legacy Patcher |
 | iMac (Retina 4K, 21.5-inch, 2017) | `iMac18,2` | ^^ |
 | iMac (Retina 5K, 27-inch, 2017) | `iMac18,3` | ^^ |
-| iMac (Retina 5K, 27-inch, 2019) | `iMac19,1` | ^^ |
+| iMac (Retina 5K, 27-inch, 2019) | `iMac19,1` | - Supported by Apple |
 | iMac (Retina 4K, 21.5-inch, 2019) | `iMac19,2` | ^^ |
 | iMac (Retina 5K, 27-inch, 2020) | `iMac20,1`<br>`iMac20,2` | ^^ |
 | iMac Pro (2017) | `iMacPro1,1` | ^^ |
@@ -133,9 +133,9 @@ The patcher is designed to target **macOS Big Sur 11.x to macOS Ventura 13.x**.
 ### Mac Pro

 | Model Name | Identifier | Tagged Issues |
-| :--- | :--- | :--- | 
-| Mac Pro (Early 2008) | `MacPro3,1` | - Recommend upgrade to Metal GPU<br>- [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021)<br>- Remove stock Bluetooth to prevent panics |
-| Mac Pro (Early 2009) | `MacPro4,1` | - Recommend upgrade to Metal GPU<br>- [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021) |
+| :--- | :--- | :--- |
+| Mac Pro (Early 2008) | `MacPro3,1` | -  [Recommend upgrade to Metal GPU](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1008)<br>- [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021)<br>- Remove stock Bluetooth to prevent panics |
+| Mac Pro (Early 2009) | `MacPro4,1` | - [Recommend upgrade to Metal GPU](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1008)<br>- [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021) |
 | Mac Pro (Mid 2010)<br>Mac Pro (Mid 2012) | `MacPro5,1` | ^^ |
 | Mac Pro (Late 2013) | `MacPro6,1` | - [Legacy Metal (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1008) |
 | Mac Pro (2019) | `MacPro7,1` | - Supported by Apple |
@@ -143,8 +143,8 @@ The patcher is designed to target **macOS Big Sur 11.x to macOS Ventura 13.x**.
 ### Xserve

 | Model Name | Identifier | Tagged Issues |
-| :--- | :--- | :--- | 
-| Xserve (Early 2008) | `Xserve2,1` | - Recommend upgrade to Metal GPU<br>- [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021) 
+| :--- | :--- | :--- |
+| Xserve (Early 2008) | `Xserve2,1` | - Recommend upgrade to Metal GPU<br>- [non-Metal GPU (macOS 11+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)<br>- [USB 1.1 (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021)
 | Xserve (Early 2009) | `Xserve3,1` | ^^ |

 # Once you've verified your hardware is supported, head to [Download and build macOS Installers](./INSTALLER.md)
--- a/docs/POST-INSTALL.md
+++ b/docs/POST-INSTALL.md
@@ -44,6 +44,14 @@ If you're unsure whether you should enable SIP, leave it as-is. Systems where yo

 ## Applying Post Install Volume Patches

+:::warning 
+
+If you need to use Migration Assistant to bring over data to your new macOS install, it is **highly recommended** to avoid restoring from inside Setup Assistant and waiting to install root patches until after the transfer is complete. If root patches were automatically installed, you can use the options available in the OCLP app to remove them. 
+
+Using Migration Assistant while patches are installed can lead to an unbootable system, requiring a reinstall of macOS.
+
+:::
+
 Post Install Volume Patches, sometimes also called root patches, are patches that have to be installed to disk for some older Macs to gain back functionality.

 OCLP will automatically root patch your system during a first time install **if the USB install media was created within OCLP.** Users will also be prompted to install these patches after macOS updates or whenever patches are not detected on the system. We recommend rebuilding OpenCore with the latest version of OCLP to take advantage of these new features.
@@ -60,11 +68,12 @@ Users can also see whether applicable patches have been installed, date and vers

 If you're using OCLP v0.4.3 or earlier, or need to run the patcher manually, you can do so with the app. There is no harm in trying to run the Patcher, as without compatible hardware, nothing will be done. You can see below on whether your hardware needs root volume patching or not.

+There is also an option to remove root patches, which may be required in some situations, such as switching GPUs in Mac Pros or using Migration Assistant.
+
 | Listing Patches | Patching Finished |
 | :--- | :--- |
 | ![](../images/OCLP-GUI-Root-Patch.png) | ![](../images/OCLP-GUI-Root-Patch-Finished.png) |

-
 :::warning

 With macOS Ventura and Macs with AMD Legacy GCN GPUs (ie. Metal), Root Patching requires a network connection to grab Apple's Kernel Debug Kit to start root patching. If your system is unable to connect to the internet, you can manually download a KDK from Apple's site:
--- a/docs/README.md
+++ b/docs/README.md
@@ -10,8 +10,8 @@ meta:
  content: Experience macOS just like before

 features:
- title: Built with security in mind
-  details: Supporting System Integrity Protection(SIP), FileVault 2, .im4m Secure Boot and Vaulting. For many machines, you're just as secure as a supported Mac.
+# - title: Built with security in mind
+#   details: Supporting System Integrity Protection(SIP), FileVault 2, .im4m Secure Boot and Vaulting. We make an effort to ensure your system is as secure as possible.
 - title: Native OTA updates
  details: Install updates the moment they come out, with native System Preferences support, just like a supported Mac.
 - title: Zero firmware patching
@@ -22,5 +22,5 @@ features:
  details: Unlock Sidecar, AirPlay to Mac, Night Shift, and Universal Control, even on natively supported models!
 - title: A helpful community
  details: Whether it's getting started or learning the specifics, you can always find answers with our amazing community of tinkerers, developers, and dreamers.
-footer: Copyright © Dortania 2020-2022
+footer: Copyright © Dortania 2020-2024
 ---
--- a/docs/SONOMA-DROP.md
+++ b/docs/SONOMA-DROP.md
@@ -1,12 +1,12 @@
 ![](../images/sonoma.png)

-*Well here we are again, it's always such a pleasure~* 
+*Well here we are again, it's always such a pleasure~*

-Apple has yet again dropped a bunch of models, continuing their journey on discontinuing Intel Macs. With the release of OpenCore Legacy Patcher v1.0.0, early support for macOS Sonoma has been implemented.
+Apple has yet again dropped a bunch of models, continuing their journey on discontinuing Intel Macs. With the release of OpenCore Legacy Patcher 1.0.0, early support for macOS Sonoma has been implemented.

 ## Versioning

-With v1.0.0, we'll be switching to a proper major, minor and bug fix system ([Semantic Versioning](https://semver.org/)). This means the coming release will be version 1.0.0, and future releases plan to follow this scheme:
+With 1.0.0, we'll be switching to a proper major, minor and bug fix system ([Semantic Versioning](https://semver.org/)). This means the coming release will be version 1.0.0, and future releases plan to follow this scheme:

 - First digit: Major changes, including new OS support, API changes, and significant patch set changes, etc
 - Second digit: Minor changes, including incoming OS update fixes, minor patch set changes, etc
@@ -17,7 +17,7 @@ With v1.0.0, we'll be switching to a proper major, minor and bug fix system ([Se

 * MacBook10,1:       MacBook (Retina, 12-inch, 2017)
 * MacBookPro14,1:    MacBook Pro (13-inch, 2017, Two Thunderbolt 3 ports)
-* MacBookPro14,2:    MacBook Pro (13-inch, 2017, Four Thunderbolt 3 Ports) 
+* MacBookPro14,2:    MacBook Pro (13-inch, 2017, Four Thunderbolt 3 Ports)
 * MacBookPro14,3:    MacBook Pro (15-inch, 2017)
 * iMac18,1:          iMac (21.5-inch, 2017)
 * iMac18,2:          iMac (Retina 4K, 21.5-inch, 2017)
@@ -25,17 +25,26 @@ With v1.0.0, we'll be switching to a proper major, minor and bug fix system ([Se

 ## Current status

-OpenCore Legacy Patcher v1.0.0 will support Sonoma for all models normally supported by the Patcher, however some challenges remain. You can find information about them below.
+OpenCore Legacy Patcher 1.0.0 will support Sonoma for all models normally supported by the Patcher, however some challenges remain. You can find information about them below.

 ## Issues

-* [T1 Security chip](t1-security-chip)
+* [Bluetooth](#bluetooth)
+* [T1 Security chip](#t1-security-chip)
 * [USB 1.1 (OHCI/UHCI) Support](#usb-11-ohciuhci-support)
 * [Graphics support and issues](#graphics-support-and-issues)


+### Bluetooth
+
+Sometimes Bluetooth may not work after boot on pre-2012 models. Running NVRAM reset can alleviate it.
+
+Dual boots may also bring the issue back even after the reset.
+
 ### T1 Security chip

+::: details Support for the T1 Security chip (Resolved in 1.1.0 and newer)
+
 Sonoma has removed support for T1 chips found in most 2016 and 2017 Macs. Therefore on these systems, the following will not function:

 * Enable or disable FileVault
@@ -43,17 +52,17 @@ Sonoma has removed support for T1 chips found in most 2016 and 2017 Macs. Theref
 * Add fingerprints (if upgrading, existing fingerprints will be deleted)
 * Add cards to Apple Pay

-:::warning
-Additionally, due to Sonoma no longer caring about T1, erasing the entire drive will remove the T1 firmware and it won't be reinstalled.
+[More information here](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1103)
+
 :::

-No known solution to resolve supporting, a significant amount of time will be required to understand how both the T1 stack works, as well as where the core issue lies for support.
-
-[More information here](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1103)
+::: warning
+Note that erasing the entire drive will remove the T1 firmware and it won't be reinstalled.
+:::

 ### USB 1.1 (OHCI/UHCI) Support

-For Penryn systems, pre-2013 Mac Pros and Xserve, USB 1.1 support was outright removed in macOS Ventura and naturally this continues in Sonoma. 
+For Penryn systems, pre-2013 Mac Pros and Xserve, USB 1.1 support was outright removed in macOS Ventura and naturally this continues in Sonoma.
 While USB 1.1 may seem unimportant, it handles many important devices on your system. These include:

 * Keyboard and Trackpad for laptops
@@ -67,7 +76,7 @@ With OpenCore Legacy Patcher v0.6.0+, basic support has been implemented via Roo
 ::: warning The following systems rely on USB 1.1

 * iMac10,x and older
-* Macmini3,1 and older
+* Macmini4,1 and older
 * MacBook7,1 and older
 * MacBookAir3,1 and older
 * MacPro5,1 and older
@@ -79,6 +88,6 @@ With OpenCore Legacy Patcher v0.6.0+, basic support has been implemented via Roo
 ### Graphics support and issues
 This build includes both Legacy Metal and non-Metal patches for macOS Sonoma. Refer to the following links for more information about Legacy Metal and non-Metal support and their respective issues.

-* [Legacy Metal](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1008) 
+* [Legacy Metal](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1008)
 * [Non-Metal](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)

--- a/docs/TESTED.md
+++ b/docs/TESTED.md
@@ -1,144 +0,0 @@
-# Tested Models on OpenCore Legacy Patcher
-
-To aid users in troubleshooting, we've compiled a list of users who've reported success with OpenCore Legacy Patcher as well as the version used. This should aid users in verifying whether issues with the patcher are regression-related with newer versions.
-
-::: details MacBook
-
-| SMBIOS | Tested | Tester | Model | Version | Comment |
-| :--- | :--- | :--- | :--- | :--- | :--- |
-| MacBook4,1 | <span style="color:#30BCD5"> YES </span> | Mami | Stock | Unknown | Couldn't install due to broken USB support |
-| MacBook5,1 | ^^ | air.man | ^^ | 0.0.19 | N/A |
-| MacBook5,2 | ^^ | Finder352 | ^^ | ^^ | ^^ |
-| MacBook6,1 | ^^ | Finder352 | ^^ | ^^ | ^^ |
-| MacBook7,1 | ^^ | MykolaG | ^^ | ^^ | ^^ |
-| ^^ | ^^ | Jazzzny | ^^ | ^^ | ^^ |
-| ^^ | ^^ | AlexSakha67 | ^^ | 0.0.20 | ^^ |
-| MacBook8,1 | <span style="color:red"> NO </span> | N/A | N/A | N/A | ^^ |
-
-:::
-
-::: details MacBook Air
-
-| SMBIOS | Tested | Tester | Model | Version | Comment |
-| :--- | :--- | :--- | :--- | :--- | :--- |
-| MacBookAir2,1 | <span style="color:#30BCD5"> YES </span> | Bruno | Stock | 0.4.5 | Slow to the point of being unusable. |
-| MacBookAir3,1 | ^^ | uvesten | Stock | 0.3.3 | N/A |
-| MacBookAir3,2 | ^^ | houser42 | ^^ | Unknown | ^^ |
-| MacBookAir4,1 | <span style="color:red"> NO </span> | N/A | N/A | N/A | ^^ |
-| MacBookAir4,2 | <span style="color:#30BCD5"> YES </span> | bdwilson1907 | Stock | 0.3.1 | Intermittent keyboard backlight |
-| MacBookAir5,1 | ^^ | Ausdauersportler | ^^ | 0.0.9 | N/A |
-| ^^ | ^^ | webg3 | ^^ | Unknown | ^^ |
-| MacBookAir5,2 | ^^ | Bab-droid | ^^ | 0.0.19 | ^^ |
-| ^^ | ^^ | K-Hobert | ^^ | Unknown | ^^ |
-| ^^ | ^^ | cboukouv | ^^ | 0.0.21 | ^^ |
-| MacBookAir6,1 | <span style="color:red"> NO </span> | N/A | N/A | N/A | N/A |
-| MacBookAir6,2 | ^^ | ^^ | ^^ | ^^ | ^^ |
-
-:::
-
-::: details MacBook Pro
-
-| SMBIOS | Tested | Tester | Model | Version | Comment |
-| :--- | :--- | :--- | :--- | :--- | :--- |
-| MacBookPro4,1 | <span style="color:#30BCD5"> YES </span> | cboukouv | Stock | 0.0.19 | N/A |
-| MacBookPro5,1 | ^^ | GURU_Jasho#5736 | ^^ | 0.0.21 | ^^ |
-| MacBookPro5,2 | ^^ | hvds | ^^ | ^^ | ^^ |
-| MacBookPro5,3 | ^^ | kommtzeitkonrad | ^^ | 0.0.22 | ^^ |
-| MacBookPro5,4 | <span style="color:red"> NO </span> | N/A | N/A | N/A | ^^ |
-| MacBookPro5,5 | <span style="color:#30BCD5"> YES </span> | ASentientHedgehog | Stock | - | ^^ |
-| ^^ | ^^ | ParaDoX1994 | Stock | 0.4.5 | Camera/Bluetooth not working (connector broken) |
-| MacBookPro6,1 | <span style="color:red"> NO </span> | N/A | N/A | N/A | N/A |
-| MacBookPro6,2 | <span style="color:#30BCD5"> YES </span> | Jakeluke | Stock | Unknown | dGPU broken |
-| MacBookPro7,1 | ^^ | fussel132 | ^^ | 0.1.2 | N/A
-| ^^ | ^^ | casey1234 | Upgraded | 0.3.3 | Upgraded SSD |
-| MacBookPro8,1 | <span style="color:#30BCD5"> YES </span> | AvaQueen | Stock | 0.0.19 | N/A |
-| MacBookPro8,1 | ^^ | charly-black | Upgraded | 0.3.1 | Upgraded BCM94331PCIEBT4CAX |
-| MacBookPro8,2 | ^^ | air.man | Stock | 0.0.22 | dGPU disabled |
-| ^^ | ^^ | cboukouv | ^^ | 0.0.19 | N/A |
-| MacBookPro8,3 | ^^ | lulujyc | ^^  | 0.1.4 | dGPU disabled |
-| MacBookPro9,1 | <span style="color:#30BCD5"> YES </span>| jbdamiano | Stock | 0.0.19 | N/A |
-| ^^ | ^^ | dennes544 | ^^ | ^^ | ^^ |
-| ^^ | ^^ | cgrazy | ^^ | ^^ | ^^ |
-| ^^ | ^^ | LIPA85 | ^^ | ^^ | ^^ |
-| MacBookPro9,2 | <span style="color:#30BCD5"> YES </span> | alexx17xx | ^^ | ^^ | ^^ |
-| ^^ | ^^ | Arvxistanx | ^^ | ^^ | ^^ |
-| ^^ | ^^ | CyberDroid1 | ^^ | 0.0.16 | ^^ |
-| ^^ | ^^ | woefi | Upgraded | 0.0.13 | Upgraded BCM94331CAX |
-| ^^ | ^^ | whgmkeller | Stock | 0.0.11 | N/A |
-| ^^ | ^^ | vinaypundith | Unknown | 0.0.7 | ^^ |
-| ^^ | ^^ | casey1234 | Upgraded | 0.3.3 | Upgraded RAM and SSD |
-| ^^ | ^^ | crystall1nedev | Upgraded | 0.4.4 | ^^ |
-| MacBookPro10,1 | <span style="color:#30BCD5"> YES </span> | traviswparker | Stock | 0.0.14 | N/A |
-| ^^ | ^^ | il-rollino | Upgraded | 0.0.21 | Upgraded BCM94360CSAX |
-| MacBookPro10,2 | ^^ | akidone | ^^ | 0.3.0 | ^^ |
-| MacBookPro11,1 | <span style="color:#30BCD5"> YES </span> | ParaDoX1994 | Stock | 0.4.4 | N/A |
-| MacBookPro11,2 | ^^ | casey1234 | ^^ | 0.3.3 | ^^ |
-| MacBookPro11,3 | <span style="color:red"> NO </span> | N/A | N/A | N/A | N/A |
-:::
-
-::: details Mac mini
-
-| SMBIOS | Tested | Tester | Model | Version | Comment |
-| :--- | :--- | :--- | :--- | :--- | :--- |
-| Macmini3,1 | <span style="color:#30BCD5"> YES </span> | ASentientHedgehog | Stock | N/A | N/A |
-| Macmini4,1 | <span style="color:#30BCD5"> YES </span> | Towster15#6369 | ^^ | 0.4.4 | Does not have internal SATA cable, booted and installed to SSD over USB 2.0 instead |
-| ^^ | ^^ | MykolaG | ^^ | 0.4.5 | SD card reader possibly broken. |
-| Macmini5,1 | <span style="color:#30BCD5"> YES </span> | MykolaG | ^^ | 0.4.5 | N/A |
-| Macmini5,2 | ^^ | charly-black | ^^ | 0.3.1 | ^^ |
-| ^^ | ^^ | MykolaG | ^^ | 0.4.5 | SD card reader possibly broken. |
-| Macmini5,3 | <span style="color:red"> NO </span> | N/A |  N/A | N/A | N/A |
-| Macmini6,1 | <span style="color:#30BCD5"> YES </span> | cicofz | Stock | 0.0.21 | ^^ |
-| ^^ | ^^ | Stig124 | ^^ | 0.0.19 | ^^ |
-| ^^ | ^^ | mwidjaya | ^^ |0.0.18 | ^^ |
-| ^^| ^^ | MykolaG | ^^ | 0.4.5 | ^^ |
-| Macmini6,2 | ^^  | Shelbs | ^^ | 0.0.16 | ^^ |
-| Macmini7,1 | <span style="color:#30BCD5"> YES </span> | MykolaG | ^^ | 0.4.5 | ^^ |
-| Macmini8,1 | ^^ | ^^ | ^^ | 0.4.5 | ^^ |
-:::
-
-::: details iMac
-
-| SMBIOS | Tested | Tester | Model | Version | Comment |
-| :--- | :--- | :--- | :--- | :--- | :--- |
-| iMac7,1 | <span style="color:#30BCD5"> YES </span> | lulujyc | Upgraded | 0.3.1 | Upgraded with BCM94352HMB <br><br> The USB 1.1 controller is unstable on Big Sur+, using USB hubs (forcing USB 2.0) can fix unrecognized keyboard/ mouse. |
-| iMac8,1 | <span style="color:#30BCD5"> YES </span> | EduCovas | Stock | 0.0.21 | N/A |
-| iMac9,1 | <span style="color:#30BCD5"> YES </span> | Allanrfox | ^^ | ^^ | ^^ |
-| ^^ | ^^ | Jakeluke | ^^ | ^^ | ^^ |
-| iMac10,1 | <span style="color:#30BCD5"> YES </span> | Ausdauersportler | Upgraded | Unknown | Upgraded with WX4150 |
-| iMac11,1 | ^^ | internetzel | ^^ | ^^ | Upgraded RX580 mobile |
-| iMac11,2 | ^^ | MykolaG | Stock | 0.0.21 | N/A |
-| ^^ | ^^ | iMac-iPad | ^^ | ^^ | ^^ |
-| ^^ | ^^ | vinaypundith | Unknown | 0.0.19 | ^^ |
-| iMac11,3 | ^^ | Ausdauersportler | Upgraded  | 0.0.21 | Upgraded with Polaris GPU and BCM943602CDP |
-| iMac12,1 | <span style="color:#30BCD5"> YES </span> | shnockdu | ^^ | ^^ | Upgraded with Kepler GPU |
-| ^^ | ^^ | StephN999 | ^^ | ^^ | Upgraded with WX4150 GPU and BCM94360CD |
-| iMac12,2 | ^^ | Ausdauersportler | ^^ | ^^ | Upgraded with Polaris GPU and BCM943602CDP |
-| iMac13,1 | <span style="color:#30BCD5"> YES </span> | alexx17xx | Stock | 0.0.19 | N/A |
-| iMac13,2 | ^^ | Alain13 | ^^ | ^^ | ^^ |
-| ^^ | ^^ | algernonpule | ^^ | ^^ | ^^ |
-| iMac13,3 | <span style="color:red"> NO </span> | N/A | N/A | N/A | ^^ |
-| iMac14,1 | <span style="color:#30BCD5"> YES </span> | woefi | Upgraded | 0.0.21 | Upgraded NVMe |
-| ^^ | ^^ | mikeboss | Stock | 0.0.19 | N/A |
-| iMac14,2 | ^^ | OKonnel | ^^ | 0.0.22 | ^^ |
-| ^^ | ^^ | mibaxx | ^^ | 0.0.21 | ^^ |
-| iMac14,3 | ^^ | StupeFied | ^^ | 0.4.5 | ^^ |
-| iMac15,1 | <span style="color:#30BCD5"> YES </span> | JakubMazur | Upgraded | 0.4.1 | Upgraded RAM, Radeon R9 M295X and Quad-Core Intel Core i7 |
-:::
-
-::: details Mac Pro
-
-| SMBIOS | Tested | Tester | Model | Version | Comment |
-| :--- | :--- | :--- | :--- | :--- | :--- |
-| MacPro3,1 | <span style="color:#30BCD5"> YES </span> | MykolaG | Upgraded | 0.1.6 | Upgraded RX 470 and BCM94360CD.<br/>Stock Bluetooth card removed. |
-| ^^ | ^^ | christiann | ^^ | 0.0.21 | Upgraded RX 560 and BCM94322.<br/>Stock Bluetooth card removed. |
-| ^^ | ^^ | gw463 | ^^ | 0.0.22 | Upgraded GTX 680 and BCM94360 |
-| ^^ | ^^ | AlexSakha67 | ^^ | 0.0.20 | Upgraded R9 280 |
-| ^^ | ^^ | nekton1 | ^^ | ^^ | Upgraded GTX 680 |
-| ^^ | ^^ | Pri-est | Unknown | 0.0.9 | N/A |
-| ^^ | ^^ | vinaypundith | Upgraded | 0.0.6 | Upgraded with GTX 680 and BCM94360CD. |
-| ^^ | ^^ | ParaDoX1994 | ^^ | 0.4.4 | Upgraded with HD 7950.<br/>Stock Bluetooth card removed. |
-| MacPro4,1 | <span style="color:#30BCD5"> YES </span> | vinaypundith | Unknown | 0.0.9 | N/A |
-| MacPro5,1 | ^^ | woefi | Upgraded | 0.0.21 | Upgraded with RX 580. |
-| ^^ | ^^ | Mabrouk Oscar | Unknown | ^^ | N/A |
-| ^^ | ^^ | astuffedtiger | Flashed | 0.0.18 | MacPro4,1 flashed to 5,1 |
-:::
--- a/docs/TROUBLESHOOTING.md
+++ b/docs/TROUBLESHOOTING.md
@@ -56,7 +56,7 @@ With OpenCore Legacy Patcher, we rely on Apple Secure Boot to ensure OS updates

 Boot into recovery by pressing space when your disk is selected on the OCLP bootpicker (if you have it hidden, hold ESC while starting up)

-* **Note:** If your disk name is something else than "Macintosh HD", make sure to change the path accordingly.
+* **Note:** If your disk name is something else than "Macintosh HD", make sure to change the path accordingly. You can figure out your disk name by typing `ls /Volumes`.

 Go into terminal and first mount the disk by typing
 ```sh
@@ -66,14 +66,13 @@ Then revert the snapshot
 ```sh
 bless --mount "/Volumes/Macintosh HD" --bootefi --last-sealed-snapshot
 ```
-After that, type the following
-```sh
-cd "/Volumes/Macintosh HD/Library/Extensions"
-```
-Then by typing `ls`, you should see bunch of .kexts. 
-* **Note:** If you only see .kexts starting with "HighPoint", you can ignore this and just restart the system. If other kexts are found, continue.
+Now we're going to clean the /Library/Extensions folder from offending kexts while keeping needed ones.

-Delete everything **except** for the ones that start with HighPoint, by using `rm -rf "kextname"`
+Run the following and **make sure to type it carefully**
+
+```sh
+cd "/Volumes/Macintosh HD/Library/Extensions" && ls | grep -v "HighPoint*\|SoftRAID*" | xargs rm -rf
+```

 Then restart and now your system should be restored to the unpatched snapshot and should be able to boot again.

--- a/docs/UNINSTALL.md
+++ b/docs/UNINSTALL.md
@@ -1,6 +1,6 @@
 # Uninstalling OpenCore

-To remove OpenCore:
+## Uninstalling the bootloader

 1. Remove OpenCore either from the USB or internal drive

@@ -13,6 +13,11 @@ To remove OpenCore:

 :::warning

-Note that after you remove OpenCore, your Mac will no longer boot and show the "prohibited" symbol. Be ready to install an natively-supported version of macOS before you uninstall OpenCore.
+Note that after you remove OpenCore, your Mac will no longer boot and show the "prohibited" symbol. Be ready to install a natively-supported version of macOS before you uninstall OpenCore.

-* This does not apply to native to native Macs just using OpenCore to achieve features like AirPlay to Mac and Sidecar, but it is still recomended to reinstall macOS, after removing OpenCore, if using SMBIOS spoofing to enable Univeral Control.
+* This does not apply to native Macs just using OpenCore to achieve features like AirPlay to Mac and Sidecar, but it is still recommended to reinstall macOS after removing OpenCore, if using SMBIOS spoofing to enable Universal Control and other features.
+:::
+
+## Uninstalling the application
+
+If you want to remove the application without reinstalling the OS, navigate to `/Library/Application Support/` and delete the Dortania folder.
--- a/docs/UNIVERSALCONTROL.md
+++ b/docs/UNIVERSALCONTROL.md
@@ -204,9 +204,41 @@ Before we continue, please keep in mind that SMBIOS Spoofing is an advanced feat

 Ventura has dropped more models which includes all of the blacklisted Macs in question, making the procedure slightly different. It is important to follow the guide for the version you're on, failing to do so is likely to cause boot issues.

+::: details macOS Sonoma
+
+Firstly run OpenCore Legacy Patcher. 
+
+Then go to **Settings** and **SMBIOS** tab, set SMBIOS Spoof Level to **Moderate**. Set SMBIOS Spoof Model **one listed next to your native model in the table for spoofed models below.**
+
+Notice that "Allow native models" and "Allow Native Spoofs" **are NOT** enabled unlike on Monterey, this is on purpose. They are no longer relevant on Sonoma and enabling them will cause boot issues.
+
+| Main Settings view | SMBIOS settings |
+| :--- | :--- |
+| ![](../images/ventura_uc1.png) | ![](../images/ventura_uc2.png) |
+
+
+
+::: details Table for spoofed models (click to expand)
+
+Spoofing to any model with native Sonoma support should work, but these are the earliest Macs natively supported by Sonoma and thus chosen for the sake of simplicity.
+
+**Reminder:** Macs that are not listed on this table work without spoofing, including systems that do not natively support Ventura as long as the other requirements are met, since they aren't blacklisted.
+
+
+| Mac by name | Native SMBIOS | Spoof SMBIOS |
+|-------------|---------------|--------------|
+| MacBook Air Early 2015 11" / 13" | MacBookAir7,x | MacBookAir8,1 |
+| MacBook Pro Early 2015 13" | MacBookPro12,x | MacBookPro15,2 |
+| MacBook Pro Mid 2015 15" | MacBookPro11,4 / 11,5 | MacBookPro15,2 |
+| iMac Late 2015 21" | iMac16,x | iMac19,2 |
+| Mac mini Late 2014  | Macmini7,x | MacMini8,1 |
+| Mac Pro Late 2013 | MacPro6,x | MacPro7,1 |
+
+:::
+
 ::: details macOS Ventura

-Firstly run the GUI version of OpenCore Legacy Patcher. 
+Firstly run OpenCore Legacy Patcher. 

 Then go to **Settings** and **SMBIOS** tab, set SMBIOS Spoof Level to **Moderate**. Set SMBIOS Spoof Model **one listed next to your native model in the table for spoofed models below.**

@@ -225,20 +257,20 @@ Spoofing to any model with native Ventura support should work, but these are the
 **Reminder:** Macs that are not listed on this table work without spoofing, including systems that do not natively support Ventura as long as the other requirements are met, since they aren't blacklisted.


-| Mac by name | Native SMBIOS | Spoof SMBIOS | Tested | Tested by |
-|-------------|---------------|--------------|--------|-----------|
-| MacBook Air Early 2015 11" / 13" | MacBookAir7,x | MacBookAir8,1 | <span style="color:red"> NO </span> | N/A |
-| MacBook Pro Early 2015 13" | MacBookPro12,x | MacBookPro14,1 | ^^ | ^^ |
-| MacBook Pro Mid 2015 15" | MacBookPro11,4 / 11,5 | MacBookPro14,3 | ^^ | ^^
-| iMac Late 2015 21" | iMac16,x | iMac18,2 | ^^ | ^^
-| Mac mini Late 2014  | Macmini7,x | MacMini8,1 | <span style="color:red"> NO </span> | N/A |
-| Mac Pro Late 2013 | MacPro6,x | MacPro7,1 | <span style="color:red"> NO </span> | N/A |
+| Mac by name | Native SMBIOS | Spoof SMBIOS |
+|-------------|---------------|--------------|
+| MacBook Air Early 2015 11" / 13" | MacBookAir7,x | MacBookAir8,1 |
+| MacBook Pro Early 2015 13" | MacBookPro12,x | MacBookPro14,1 |
+| MacBook Pro Mid 2015 15" | MacBookPro11,4 / 11,5 | MacBookPro14,3 |
+| iMac Late 2015 21" | iMac16,x | iMac18,2 |
+| Mac mini Late 2014  | Macmini7,x | MacMini8,1 |
+| Mac Pro Late 2013 | MacPro6,x | MacPro7,1 |

 :::

 ::: details macOS Monterey

-Firstly, run the GUI version of OpenCore Legacy Patcher. Secondly, go to **Settings** then the **App** tab and tick **Allow native models**.
+Firstly, run OpenCore Legacy Patcher. Secondly, go to **Settings** then the **App** tab and tick **Allow native models**.

 [](../images/OCLP-App-Allow-Native-Models.png)

@@ -257,14 +289,14 @@ Any model after the list of officially blacklisted Macs should be supported, but
 **Reminder:** Macs that are not listed on this table work without spoofing, including systems that do not natively support Monterey, as long as the other requirements are met, since they aren't blacklisted.


-| Mac by name | Native SMBIOS | Spoof SMBIOS | Tested | Tested by |
-|-------------|---------------|--------------|--------|-----------|
-| MacBook Air Early 2015 11" / 13" | MacBookAir7,x | MacBookAir8,1 | <span style="color:#30BCD5"> YES </span> | Hzlph |
-| MacBook Pro Early 2015 13" | MacBookPro12,x | MacBookPro13,1 | ^^ | ^^ |
-| MacBook Pro Mid 2015 15" | MacBookPro11,4 / 11,5 | MacBookPro13,3 | ^^ | ^^
-| iMac Late 2015 21" | iMac16,x | iMac18,2 | ^^ | ^^
-| Mac mini Late 2014  | Macmini7,x | MacMini8,1 | <span style="color:red"> NO </span> | N/A |
-| Mac Pro Late 2013 | MacPro6,x | MacPro7,1 | <span style="color:#30BCD5"> YES </span> | Crystall1nedev |
+| Mac by name | Native SMBIOS | Spoof SMBIOS |
+|-------------|---------------|--------------|
+| MacBook Air Early 2015 11" / 13" | MacBookAir7,x | MacBookAir8,1 |
+| MacBook Pro Early 2015 13" | MacBookPro12,x | MacBookPro13,1 |
+| MacBook Pro Mid 2015 15" | MacBookPro11,4 / 11,5 | MacBookPro13,3 |
+| iMac Late 2015 21" | iMac16,x | iMac18,2 |
+| Mac mini Late 2014  | Macmini7,x | MacMini8,1 |
+| Mac Pro Late 2013 | MacPro6,x | MacPro7,1 |

 :::

--- a/docs/WINDOWS.md
+++ b/docs/WINDOWS.md
@@ -5,21 +5,20 @@ Many older Macs do not "officially" support UEFI Windows installations, leading

 ## Minimum Requirements

-This guide will focus on the installation of Windows 10 without using Boot Camp Assistant. Windows 11 should also work, but its quirks will not be covered.
+This guide will focus on the installation of modern Windows (10/11) without using Boot Camp Assistant.

 * Due to hardware and firmware limitations, UEFI Windows installations are only recommended on the following machines:

-  * 2015 MacBook or newer (MacBook8,x+)
-  * 2011 MacBook Air or newer (MacBookAir4,x+)
-  * 2011 MacBook Pro or newer (MacBookPro8,x+)
-  * 2011 Mac mini or newer (Macmini5,x+)
-  * 2009[^1] Mac Pro or newer (MacPro4,1+), upgraded GPU is preferred
-  * 2010 iMac or newer (iMac11,x+), upgraded GPU is preferred
-  * 2009[^2] Xserve (Xserve3,1), upgraded GPU is preferred
+  * 2015 MacBook or newer (`MacBook8,x`+)
+  * 2011 MacBook Air or newer (`MacBookAir4,x`+)
+  * 2011 MacBook Pro or newer (`MacBookPro8,x`+)
+  * 2011 Mac mini or newer (`Macmini5,x`+)
+  * 2009* Mac Pro or newer (`MacPro4,1`+), upgraded GPU is preferred
+  * 2010 iMac or newer (`iMac11,x`+), upgraded GPU is preferred
+  * 2009* Xserve (`Xserve3,1`), upgraded GPU is preferred


-[^1]: MacPro4,1 and MacPro5,1 systems experience issues with the Windows installer, follow the DISM installation section for instructions.
-[^2]: Theoretically supported, not tested. Follow DISM installation section
+*`MacPro4,1`, `MacPro5,1`, and `Xserve3,1` systems experience issues with the Windows installer, follow the DISM installation section for instructions.

 If your machine is not listed, UEFI Windows will likely still install, but you may face stability/driver issues.

@@ -87,18 +86,26 @@ The `rsync` command will take some time, so get some coffee and sit back. Once f

 ## Installation Process

-Once you reboot your machine, you should see a new boot option in the OCLP Bootpicker labelled as "EFI Boot". It may or may not have the Boot Camp icon.
+Once you reboot your machine, you should see a new boot option in the OCLP Bootpicker labelled as "EFI Boot" or "Windows". It may or may not have the Boot Camp icon.

 :::warning

-If you aren't booted into OCLP, you may see two boot options labelled "Windows" and "EFI Boot". Do not choose either of the options and boot into OCLP to continue.
+If you aren't booted into OCLP, you may see **two** boot options labelled "Windows" and "EFI Boot". Do not choose either of the options and boot into OCLP to continue.

 :::

+
+
 ### Installation: Microsoft Method

 Once booted into the Windows installer, proceed as you normally would on any Windows computer. If you see an error message containing “Windows could not prepare the computer to boot into the next phase of installation”, please follow the next portion of this guide (DISM Installation).

+::: details Installing Windows 11
+
+If you are installing Windows 11, you will need to [modify the Windows Setup](https://www.bleepingcomputer.com/news/microsoft/how-to-bypass-the-windows-11-tpm-20-requirement/) to allow installation on unsupported machines.
+
+:::
+
 ### Installation: DISM Deployment Method

 Once booted into the Windows installer, proceed as you normally would until you reach the "Where do you want to install Windows" disk formatting section.
@@ -132,7 +139,7 @@ Once `dism` finishes its thing, run `bcdboot E:\Windows`, substituting "E" for t

 ![](../images/DISM-7.png)

-Windows is now installed. It should be recognized as "EFI Boot" with a Boot Camp icon in the OCLP Bootpicker.
+Windows is now installed. It should be recognized as "EFI Boot" or "Windows" with a Boot Camp icon in the OCLP Bootpicker.

 :::warning

@@ -221,4 +228,8 @@ You can also open `Properties` on the file to change the compatibility to `Previ

 ### iMac12,x Bluescreen after driver installation

-Currently Intel's iGPU drivers for the HD 3000 series do not support UEFI booting in Windows. The recommended solution is to simply disable the iGPU: [iMac 12,1 Windows 10 Boot Loop – Fix Intel Graphics issue](https://zzq.org/?p=39)
+Intel's iGPU drivers for the HD 3000 series do not support UEFI booting in Windows. The recommended solution is to simply disable the iGPU: [iMac 12,1 Windows 10 Boot Loop – Fix Intel Graphics issue](https://zzq.org/?p=39)
+
+### NVIDIA Tesla Black Screen after driver installation
+
+The NVIDIA Tesla GPUs found in 2008-2010 Macs do not support UEFI booting in Windows. You cannot use UEFI Windows without low-level patching on these machines.
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
--- a/docs/package.json
+++ b/docs/package.json
@@ -33,19 +33,19 @@
   },
   "license": "CC-BY-NC-SA-4.0",
   "devDependencies": {
-      "@vuepress/plugin-back-to-top": "^1.7.1",
-      "markdown-it-multimd-table": "^4.0.3",
-      "markdown-link-check": "^3.8.5",
-      "markdownlint-cli": "^0.26.0",
-      "run-script-os": "^1.1.4",
-      "spellchecker-cli": "^4.4.0",
-      "vuepress": "^1.7.1",
+      "@vuepress/plugin-back-to-top": "^1.9.10",
+      "markdown-it-multimd-table": "^4.2.3",
+      "markdown-link-check": "^3.11.2",
+      "markdownlint-cli": "^0.37.0",
+      "run-script-os": "^1.1.6",
+      "spellchecker-cli": "^6.1.1",
+      "vuepress": "^1.9.10",
      "vuepress-plugin-medium-zoom": "^1.1.9",
      "vuepress-plugin-zooming": "^1.1.8",
-      "vuepress-theme-book": "0.0.5",
+      "vuepress-theme-book": "0.0.9",
      "vuepress-theme-dark-new": "^0.1.2",
-      "vuepress-theme-succinct": "^1.6.4",
-      "vuepress-theme-yuu": "^2.3.0"
+      "vuepress-theme-succinct": "^1.7.2",
+      "vuepress-theme-yuu": "^3.1.1"
   },
   "homepage": "https://dortania.github.io/OpenCore-Legacy-Patcher/"
 }
--- a/payloads/Config/config.plist
+++ b/payloads/Config/config.plist
@@ -284,6 +284,8 @@
 			<false/>
 			<key>EnableWriteUnprotector</key>
 			<false/>
+			<key>FixupAppleEfiImages</key>
+			<false/>
 			<key>ForceBooterSignature</key>
 			<true/>
 			<key>ForceExitBootServices</key>
@@ -887,7 +889,7 @@
 				<key>Enabled</key>
 				<false/>
 				<key>MaxKernel</key>
-				<string>22.99.99</string>
+				<string></string>
 				<key>MinKernel</key>
 				<string>18.0.0</string>
 				<key>BundlePath</key>
@@ -1377,7 +1379,7 @@
 				<key>ExecutablePath</key>
 				<string>Contents/MacOS/AppleUSBOHCI</string>
 				<key>MaxKernel</key>
-				<string></string>
+				<string>23.0.0</string>
 				<key>MinKernel</key>
 				<string>22.0.0</string>
 				<key>PlistPath</key>
@@ -1395,7 +1397,7 @@
 				<key>ExecutablePath</key>
 				<string>Contents/MacOS/AppleUSBOHCIPCI</string>
 				<key>MaxKernel</key>
-				<string></string>
+				<string>23.0.0</string>
 				<key>MinKernel</key>
 				<string>22.0.0</string>
 				<key>PlistPath</key>
@@ -1413,7 +1415,7 @@
 				<key>ExecutablePath</key>
 				<string>Contents/MacOS/AppleUSBUHCI</string>
 				<key>MaxKernel</key>
-				<string></string>
+				<string>23.0.0</string>
 				<key>MinKernel</key>
 				<string>22.0.0</string>
 				<key>PlistPath</key>
@@ -1431,7 +1433,7 @@
 				<key>ExecutablePath</key>
 				<string>Contents/MacOS/AppleUSBUHCIPCI</string>
 				<key>MaxKernel</key>
-				<string></string>
+				<string>23.0.0</string>
 				<key>MinKernel</key>
 				<string>22.0.0</string>
 				<key>PlistPath</key>
@@ -1707,6 +1709,24 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Comment</key>
+				<string>corecrypto - T1</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.0.0</string>
+				<key>BundlePath</key>
+				<string>corecrypto_T1.kext</string>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/corecrypto_T1</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
 			<dict>
 				<key>Arch</key>
 				<string>x86_64</string>
@@ -1725,6 +1745,24 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Comment</key>
+				<string>AppleCredentialManager - T1</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.4.0</string>
+				<key>BundlePath</key>
+				<string>AppleCredentialManager.kext</string>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleCredentialManager</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
 			<dict>
 				<key>Arch</key>
 				<string>x86_64</string>
@@ -1743,24 +1781,6 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
-			<dict>
-				<key>Arch</key>
-				<string>x86_64</string>
-				<key>Comment</key>
-				<string>AppleCredentialManager - T1</string>
-				<key>Enabled</key>
-				<false/>
-				<key>MaxKernel</key>
-				<string></string>
-				<key>MinKernel</key>
-				<string>23.0.0</string>
-				<key>BundlePath</key>
-				<string>AppleCredentialManager.kext</string>
-				<key>ExecutablePath</key>
-				<string>Contents/MacOS/AppleCredentialManager</string>
-				<key>PlistPath</key>
-				<string>Contents/Info.plist</string>
-			</dict>
 			<dict>
 				<key>Arch</key>
 				<string>x86_64</string>
@@ -1779,6 +1799,42 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Comment</key>
+				<string>AppleHSSPISupport - SPI Top Case Support</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.4.0</string>
+				<key>BundlePath</key>
+				<string>AppleHSSPISupport.kext</string>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleHSSPISupport</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Comment</key>
+				<string>AppleHSSPIHIDDriver - SPI Top Case Support</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.4.0</string>
+				<key>BundlePath</key>
+				<string>AppleHSSPIHIDDriver.kext</string>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleHSSPIHIDDriver</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
 		</array>
 		<key>Block</key>
 		<array>
@@ -1826,7 +1882,7 @@
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
-				<string>23.0.0</string>
+				<string>23.4.0</string>
 				<key>Strategy</key>
 				<string>Exclude</string>
 			</dict>
@@ -2360,8 +2416,8 @@
 			<true/>
 			<key>HideAuxiliary</key>
 			<true/>
-			<!-- <key>InstanceIdentifier</key>
-			<string></string> -->
+			<key>InstanceIdentifier</key>
+			<string></string>
 			<key>LauncherPath</key>
 			<string>Default</string>
 			<key>LauncherOption</key>
@@ -3066,8 +3122,8 @@
 			<integer>-1</integer>
 			<key>ResizeUsePciRbIo</key>
 			<false/>
-			<!-- <key>ShimRetainProtocol</key>
-			<false/> -->
+			<key>ShimRetainProtocol</key>
+			<false/>
 			<key>TscSyncTimeout</key>
 			<integer>0</integer>
 			<key>UnblockFsConnect</key>
--- a/payloads/InstallPackage/AutoPkg-Assets-Setup.pkgproj
+++ b/payloads/InstallPackage/AutoPkg-Assets-Setup.pkgproj
@@ -235,7 +235,7 @@
 											<key>GID</key>
 											<integer>0</integer>
 											<key>PATH</key>
-											<string>../com.dortania.opencore-legacy-patcher.auto-patch.plist</string>
+											<string>../Launch Services/com.dortania.opencore-legacy-patcher.auto-patch.plist</string>
 											<key>PATH_TYPE</key>
 											<integer>1</integer>
 											<key>PERMISSIONS</key>
--- a/payloads/Kexts/Acidanthera/AMFIPass-v1.4.0-RELEASE.zip
+++ b/payloads/Kexts/Acidanthera/AMFIPass-v1.4.0-RELEASE.zip
--- a/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.7-DEBUG.zip
+++ b/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.7-DEBUG.zip
--- a/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.7-RELEASE.zip
+++ b/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.7-RELEASE.zip
--- a/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.8-DEBUG.zip
+++ b/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.8-DEBUG.zip
--- a/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.8-RELEASE.zip
+++ b/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.8-RELEASE.zip
--- a/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.8-DEBUG.zip
+++ b/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.8-DEBUG.zip
--- a/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.8-RELEASE.zip
+++ b/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.8-RELEASE.zip
--- a/payloads/Kexts/Acidanthera/RestrictEvents-v1.1.3-DEBUG.zip
+++ b/payloads/Kexts/Acidanthera/RestrictEvents-v1.1.3-DEBUG.zip
--- a/payloads/Kexts/Acidanthera/RestrictEvents-v1.1.3-RELEASE.zip
+++ b/payloads/Kexts/Acidanthera/RestrictEvents-v1.1.3-RELEASE.zip
--- a/payloads/Kexts/Misc/AppleHSSPIHIDDriver-v1.0.0.zip
+++ b/payloads/Kexts/Misc/AppleHSSPIHIDDriver-v1.0.0.zip
--- a/payloads/Kexts/Misc/AppleHSSPISupport-v1.0.0.zip
+++ b/payloads/Kexts/Misc/AppleHSSPISupport-v1.0.0.zip
--- a/payloads/Kexts/Misc/AppleKeyStore-v1.0.0.zip
+++ b/payloads/Kexts/Misc/AppleKeyStore-v1.0.0.zip
--- a/payloads/Kexts/Misc/AppleKeyStore-v1.1.0.zip
+++ b/payloads/Kexts/Misc/AppleKeyStore-v1.1.0.zip
--- a/payloads/Kexts/Misc/AppleSSE-v1.0.0.zip
+++ b/payloads/Kexts/Misc/AppleSSE-v1.0.0.zip
--- a/payloads/Kexts/Misc/AppleSSE-v1.1.0.zip
+++ b/payloads/Kexts/Misc/AppleSSE-v1.1.0.zip
--- a/payloads/Kexts/Misc/corecrypto_T1-v1.0.1.zip
+++ b/payloads/Kexts/Misc/corecrypto_T1-v1.0.1.zip
--- a/payloads/Kexts/Update-Kexts.command
+++ b/payloads/Kexts/Update-Kexts.command
@@ -108,36 +108,36 @@ class GenerateKexts:
        with tempfile.TemporaryDirectory() as temp_dir:
            # Download source
            weg_source_zip = f"{temp_dir}/WhateverGreen-{self.weg_version}.zip"
-            subprocess.run(["curl", "-L", weg_source_url, "-o", weg_source_zip], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+            subprocess.run(["/usr/bin/curl", "--location", weg_source_url, "--output", weg_source_zip], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)

            # Unzip source
-            subprocess.run(["unzip", weg_source_zip, "-d", temp_dir], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+            subprocess.run(["/usr/bin/unzip", weg_source_zip, "-d", temp_dir], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)

            # Git clone MacKernelSDK into source
-            subprocess.run(["git", "clone", "https://github.com/acidanthera/MacKernelSDK", f"{temp_dir}/WhateverGreen-{self.weg_version}/MacKernelSDK"], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+            subprocess.run(["/usr/bin/git", "clone", "https://github.com/acidanthera/MacKernelSDK", f"{temp_dir}/WhateverGreen-{self.weg_version}/MacKernelSDK"], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)

            # Grab latest Lilu release, debug version
            lilu_zip = f"{temp_dir}/Lilu-{self.lilu_version}-DEBUG.zip"
-            subprocess.run(["curl", "-L", lilu_url, "-o", lilu_zip], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+            subprocess.run(["/usr/bin/curl", "--location", lilu_url, "--output", lilu_zip], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)

            # Unzip Lilu into WEG source
-            subprocess.run(["unzip", lilu_zip, "-d", f"{temp_dir}/WhateverGreen-{self.weg_version}"], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+            subprocess.run(["/usr/bin/unzip", lilu_zip, "-d", f"{temp_dir}/WhateverGreen-{self.weg_version}"], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)

            # Apply patch
            patch_path = Path("./Acidanthera/WhateverGreen-Navi-Backlight.patch").absolute()
-            subprocess.run(["git", "apply", patch_path], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, cwd=f"{temp_dir}/WhateverGreen-{self.weg_version}")
+            subprocess.run(["/usr/bin/git", "apply", patch_path], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, cwd=f"{temp_dir}/WhateverGreen-{self.weg_version}")

            # Build WEG
            for variant in ["Release", "Debug"]:
-                subprocess.run(["xcodebuild", "-configuration", variant], cwd=f"{temp_dir}/WhateverGreen-{self.weg_version}", check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                subprocess.run(["/usr/bin/xcodebuild", "-configuration", variant], cwd=f"{temp_dir}/WhateverGreen-{self.weg_version}", check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)


            # Zip Release
            for variant in ["RELEASE", "DEBUG"]:
                dst_path = Path(f"./Acidanthera/WhateverGreen-v{self.weg_version}-Navi-{variant}.zip").absolute()
-                subprocess.run(["zip", "-r", dst_path, "WhateverGreen.kext"], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, cwd=f"{temp_dir}/WhateverGreen-{self.weg_version}/build/{'Release' if variant == 'RELEASE' else 'Debug'}")
+                subprocess.run(["/usr/bin/zip", "-r", dst_path, "WhateverGreen.kext"], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, cwd=f"{temp_dir}/WhateverGreen-{self.weg_version}/build/{'Release' if variant == 'RELEASE' else 'Debug'}")
                if Path(f"./Acidanthera/WhateverGreen-v{self.weg_old}-Navi-{variant}.zip").exists():
-                    subprocess.run(["rm", f"./Acidanthera/WhateverGreen-v{self.weg_old}-Navi-{variant}.zip"], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                    subprocess.run(["/bin/rm", f"./Acidanthera/WhateverGreen-v{self.weg_old}-Navi-{variant}.zip"], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)

        self._update_constants_file("self.whatevergreen_navi_version", f"{self.weg_old}-Navi", f"{self.weg_version}-Navi")

@@ -212,14 +212,14 @@ class GenerateKexts:
                zip_name = f"{override_kext_zip_name}-v{remote_version}-{variant}.zip" if override_kext_zip_name else f"{kext_name}-v{remote_version}-{variant}.zip"

                if Path(f"./{kext_folder}/{zip_name.replace(f'v{remote_version}', f'v{local_version}')}").exists():
-                    subprocess.run(["rm", "-rf", f"./{kext_folder}/{zip_name.replace(f'v{remote_version}', f'v{local_version}')}"])
+                    subprocess.run(["/bin/rm", "-rf", f"./{kext_folder}/{zip_name.replace(f'v{remote_version}', f'v{local_version}')}"])
                self._download_file(asset["browser_download_url"], f"./{kext_folder}/{zip_name}", f"{kext_name}.kext")
                self._update_constants_file(KEXT_DICTIONARY[kext_folder][kext_name]["Constants Variable"], local_version, remote_version)

                if override_kext_zip_name:
                    # rename zip file
                    os.rename(f"./{kext_folder}/{zip_name}", f"./{kext_folder}/{kext_name}-v{remote_version}-{variant}.zip")
-                    subprocess.run(["rm", "-rf", f"./{kext_folder}/{kext_name}-v{local_version}-{variant}.zip"])
+                    subprocess.run(["/bin/rm", "-rf", f"./{kext_folder}/{kext_name}-v{local_version}-{variant}.zip"])


    def _get_local_version(self, kext_folder, kext_name, variant):
@@ -247,14 +247,14 @@ class GenerateKexts:
                f.write(download.content)

            # Unzip file
-            subprocess.run(["unzip", "-q", f"{temp_dir}/temp.zip", "-d", f"{temp_dir}"], check=True)
+            subprocess.run(["/usr/bin/unzip", "-q", f"{temp_dir}/temp.zip", "-d", f"{temp_dir}"], check=True)

            print(f"  Moving {file} to {file_path}...")
            # Zip file
-            subprocess.run(["zip", "-q", "-r", Path(file_path).name, file], cwd=f"{temp_dir}", check=True)
+            subprocess.run(["/usr/bin/zip", "-q", "-r", Path(file_path).name, file], cwd=f"{temp_dir}", check=True)

            # Move file
-            subprocess.run(["mv", f"{temp_dir}/{Path(file_path).name}", file_path], check=True)
+            subprocess.run(["/bin/mv", f"{temp_dir}/{Path(file_path).name}", file_path], check=True)


    def _update_constants_file(self, variable_name, old_version, new_version):
--- a/payloads/Kexts/Wifi/IO80211ElCap-v2.0.1.zip
+++ b/payloads/Kexts/Wifi/IO80211ElCap-v2.0.1.zip
--- a/payloads/Kexts/Wifi/IOSkywalkFamily-v1.0.0.zip
+++ b/payloads/Kexts/Wifi/IOSkywalkFamily-v1.0.0.zip
--- a/payloads/Kexts/Wifi/IOSkywalkFamily-v1.1.0.zip
+++ b/payloads/Kexts/Wifi/IOSkywalkFamily-v1.1.0.zip
--- a/payloads/Kexts/Wifi/corecaptureElCap-v1.0.2.zip
+++ b/payloads/Kexts/Wifi/corecaptureElCap-v1.0.2.zip
--- a/Services/com.dortania.opencore-legacy-patcher.auto-patch.plist
+++ b/Services/com.dortania.opencore-legacy-patcher.auto-patch.plist
@@ -14,4 +14,4 @@
 	<key>RunAtLoad</key>
 	<true/>
 </dict>
-</plist>
+</plist>
--- a/Services/com.dortania.opencore-legacy-patcher.macos-update.plist
+++ b/Services/com.dortania.opencore-legacy-patcher.macos-update.plist
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AssociatedBundleIdentifiers</key>
+	<string>com.dortania.opencore-legacy-patcher</string>
+	<key>Label</key>
+	<string>com.dortania.opencore-legacy-patcher.macos-update</string>
+	<key>ProgramArguments</key>
+	<array>
+		<string>/Library/Application Support/Dortania/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher</string>
+		<string>--prepare_for_update</string>
+	</array>
+	<key>WatchPaths</key>
+	<array>
+		<string>/System/Volumes/Update/Update.plist</string>
+	</array>
+</dict>
+</plist>
--- a/Services/com.dortania.opencore-legacy-patcher.os-caching.plist
+++ b/Services/com.dortania.opencore-legacy-patcher.os-caching.plist
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AssociatedBundleIdentifiers</key>
+	<string>com.dortania.opencore-legacy-patcher</string>
+	<key>Label</key>
+	<string>com.dortania.opencore-legacy-patcher.rsr-monitor</string>
+	<key>ProgramArguments</key>
+	<array>
+		<string>/Library/Application Support/Dortania/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher</string>
+		<string>--cache_os</string>
+	</array>
+	<key>WatchPaths</key>
+	<array>
+		<string>/System/Volumes/Update/Preflight.plist</string>
+	</array>
+</dict>
+</plist>
--- a/Services/com.dortania.opencore-legacy-patcher.rsr-monitor.plist
+++ b/Services/com.dortania.opencore-legacy-patcher.rsr-monitor.plist
--- a/payloads/OpenCore/OpenCore-DEBUG.zip
+++ b/payloads/OpenCore/OpenCore-DEBUG.zip
--- a/payloads/OpenCore/OpenCore-RELEASE.zip
+++ b/payloads/OpenCore/OpenCore-RELEASE.zip
--- a/payloads/OpenCore/Update-OpenCore.command
+++ b/payloads/OpenCore/Update-OpenCore.command
@@ -128,24 +128,24 @@ class GenerateOpenCore:
        for variant in BUILD_VARIANTS:
            print(f"Moving {variant} folder...")
            subprocess.run (
-                ["mv", f"{self.working_dir}/OpenCore-{variant}-ROOT/X64", f"{self.working_dir}/OpenCore-{variant}"],
+                ["/bin/mv", f"{self.working_dir}/OpenCore-{variant}-ROOT/X64", f"{self.working_dir}/OpenCore-{variant}"],
                stdout=subprocess.PIPE, stderr=subprocess.PIPE
            )
            if variant == "DEBUG":
                for utility in IMPORTANT_UTILITIES:
                    print(f"Moving {utility} from {variant} variant...")
                    subprocess.run (
-                        ["rm", "-rf", f"{self.working_dir}/{utility}"],
+                        ["/bin/rm", "-rf", f"{self.working_dir}/{utility}"],
                        stdout=subprocess.PIPE, stderr=subprocess.PIPE
                    )
                    subprocess.run (
-                        ["mv", f"{self.working_dir}/OpenCore-{variant}-ROOT/Utilities/{utility}/{utility}", f"{self.working_dir}/{utility}"],
+                        ["/bin/mv", f"{self.working_dir}/OpenCore-{variant}-ROOT/Utilities/{utility}/{utility}", f"{self.working_dir}/{utility}"],
                        stdout=subprocess.PIPE, stderr=subprocess.PIPE
                    )

            # Remove root folder
            subprocess.run (
-                ["rm", "-rf", f"{self.working_dir}/OpenCore-{variant}-ROOT"],
+                ["/bin/rm", "-rf", f"{self.working_dir}/OpenCore-{variant}-ROOT"],
                stdout=subprocess.PIPE, stderr=subprocess.PIPE
            )

@@ -153,12 +153,12 @@ class GenerateOpenCore:
        print("Removing zip files...")
        # remove debug_zip
        subprocess.run (
-            ["rm", "-rf", self.debug_zip],
+            ["/bin/rm", "-rf", self.debug_zip],
            stdout=subprocess.PIPE, stderr=subprocess.PIPE
        )
        # remove release_zip
        subprocess.run (
-            ["rm", "-rf", self.release_zip],
+            ["/bin/rm", "-rf", self.release_zip],
            stdout=subprocess.PIPE, stderr=subprocess.PIPE
        )

@@ -194,7 +194,7 @@ class GenerateOpenCore:
            if (self.working_dir / f"OpenCore-{variant}").exists():
                print(f"   Deleting old {variant} variant...")
                subprocess.run (
-                    ["rm", "-rf", f"{self.working_dir}/OpenCore-{variant}"],
+                    ["/bin/rm", "-rf", f"{self.working_dir}/OpenCore-{variant}"],
                    stdout=subprocess.PIPE, stderr=subprocess.PIPE
                )

@@ -212,7 +212,7 @@ class GenerateOpenCore:
        # Create S/L/C
        print("   Creating SLC folder")
        subprocess.run (
-            ["mkdir", "-p", f"{self.working_dir}/OpenCore-{variant}/System/Library/CoreServices"],
+            ["/bin/mkdir", "-p", f"{self.working_dir}/OpenCore-{variant}/System/Library/CoreServices"],
            stdout=subprocess.PIPE, stderr=subprocess.PIPE
        )

@@ -220,21 +220,21 @@ class GenerateOpenCore:
        print("   Relocating BOOT folder to SLC")
        for file in (self.working_dir / f"OpenCore-{variant}/EFI/BOOT").iterdir():
            subprocess.run (
-                ["mv", f"{file}", f"{self.working_dir}/OpenCore-{variant}/System/Library/CoreServices"],
+                ["/bin/mv", f"{file}", f"{self.working_dir}/OpenCore-{variant}/System/Library/CoreServices"],
                stdout=subprocess.PIPE, stderr=subprocess.PIPE
            )

        # Rename BOOTx64.efi to boot.efi
        print("   Renaming BOOTx64.efi to boot.efi")
        subprocess.run (
-            ["mv", f"{self.working_dir}/OpenCore-{variant}/System/Library/CoreServices/BOOTx64.efi", f"{self.working_dir}/OpenCore-{variant}/System/Library/CoreServices/boot.efi"],
+            ["/bin/mv", f"{self.working_dir}/OpenCore-{variant}/System/Library/CoreServices/BOOTx64.efi", f"{self.working_dir}/OpenCore-{variant}/System/Library/CoreServices/boot.efi"],
            stdout=subprocess.PIPE, stderr=subprocess.PIPE
        )

        # Delete BOOT folder
        print("   Deleting BOOT folder")
        subprocess.run (
-            ["rm", "-rf", f"{self.working_dir}/OpenCore-{variant}/EFI/BOOT"],
+            ["/bin/rm", "-rf", f"{self.working_dir}/OpenCore-{variant}/EFI/BOOT"],
            stdout=subprocess.PIPE, stderr=subprocess.PIPE
        )

@@ -244,7 +244,7 @@ class GenerateOpenCore:
            if Path(f"{self.working_dir}/OpenCore-{variant}/EFI/OC/Drivers/{driver}").exists():
                print(f"      Deleting {driver}")
                subprocess.run (
-                    ["rm", f"{self.working_dir}/OpenCore-{variant}/EFI/OC/Drivers/{driver}"],
+                    ["/bin/rm", f"{self.working_dir}/OpenCore-{variant}/EFI/OC/Drivers/{driver}"],
                    stdout=subprocess.PIPE, stderr=subprocess.PIPE
                )
            else:
@@ -256,7 +256,7 @@ class GenerateOpenCore:
            if Path(f"{self.working_dir}/OpenCore-{variant}/EFI/OC/Tools/{tool}").exists():
                print(f"      Deleting {tool}")
                subprocess.run (
-                    ["rm", f"{self.working_dir}/OpenCore-{variant}/EFI/OC/Tools/{tool}"],
+                    ["/bin/rm", f"{self.working_dir}/OpenCore-{variant}/EFI/OC/Tools/{tool}"],
                    stdout=subprocess.PIPE, stderr=subprocess.PIPE
                )
            else:
@@ -265,21 +265,21 @@ class GenerateOpenCore:
        # Rename OpenCore-<variant> to OpenCore-Build
        print("   Renaming OpenCore folder")
        subprocess.run (
-            ["mv", f"{self.working_dir}/OpenCore-{variant}", f"{self.working_dir}/OpenCore-Build"],
+            ["/bin/mv", f"{self.working_dir}/OpenCore-{variant}", f"{self.working_dir}/OpenCore-Build"],
            stdout=subprocess.PIPE, stderr=subprocess.PIPE
        )

        # Create OpenCore-<variant>.zip
        print("   Creating OpenCore.zip")
        subprocess.run (
-            ["ditto", "-c", "-k", "--sequesterRsrc", "--keepParent", f"{self.working_dir}/OpenCore-Build", f"{self.working_dir}/OpenCore-{variant}.zip"],
+            ["/usr/bin/ditto", "-c", "-k", "--sequesterRsrc", "--keepParent", f"{self.working_dir}/OpenCore-Build", f"{self.working_dir}/OpenCore-{variant}.zip"],
            stdout=subprocess.PIPE, stderr=subprocess.PIPE
        )

        # Delete OpenCore-Build
        print("   Deleting OpenCore-Build")
        subprocess.run (
-            ["rm", "-rf", f"{self.working_dir}/OpenCore-Build"],
+            ["/bin/rm", "-rf", f"{self.working_dir}/OpenCore-Build"],
            stdout=subprocess.PIPE, stderr=subprocess.PIPE
        )

--- a/payloads/OpenCore/macserial
+++ b/payloads/OpenCore/macserial
--- a/payloads/OpenCore/ocvalidate
+++ b/payloads/OpenCore/ocvalidate
--- a/payloads/Tools/CreateVault/RsaTool
+++ b/payloads/Tools/CreateVault/RsaTool
--- a/payloads/Tools/CreateVault/create_vault.sh
+++ b/payloads/Tools/CreateVault/create_vault.sh
@@ -4,8 +4,10 @@
 #
 #
 #  Created by Rodion Shingarev on 13.04.19.
+#  Modified by Jazzzny for OpenCore Legacy Patcher on 06.10.23.
 #
 OCPath="$1"
+UtilsPath="$PWD"

 if [ "${OCPath}" = "" ]; then
  echo "Usage ./create_vault.sh path/to/EFI/OC"
@@ -17,54 +19,75 @@ if [ ! -d "${OCPath}" ]; then
  exit 1
 fi

-if [ ! -x /usr/bin/find ] || [ ! -x /bin/rm ] || [ ! -x /usr/bin/sed ] || [ ! -x /usr/bin/xxd ]; then
+if [ ! -x /usr/bin/env ] || [ ! -x /usr/bin/find ] || [ ! -x /bin/rm ] || [ ! -x /usr/bin/sed ] || [ ! -x /usr/bin/awk ] || [ ! -x /usr/bin/sort ] || [ ! -x /usr/bin/xxd ]; then
  echo "Unix environment is broken!"
  exit 1
 fi

-if [ ! -x /usr/libexec/PlistBuddy ]; then
-  echo "PlistBuddy is missing!"
-  exit 1
-fi
-
-if [ ! -x /usr/bin/shasum ]; then
-  echo "shasum is missing!"
-  exit 1
-fi
-
 abort() {
  /bin/rm -rf vault.plist vault.sig /tmp/vault_hash
  echo "Fatal error: ${1}!"
  exit 1
 }

-echo "Chose ${OCPath} for hashing..."
+# plist output functions so we don't need PlistBuddy
+write_header() {
+  cat <<EOF > "$1"
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Files</key>
+	<dict>
+EOF
+}
+
+write_file_name_and_hash() {
+  {
+    echo -e "\t\t<key>${2}</key>"
+    echo -e "\t\t<data>"
+    echo -e -n "\t\t"
+    cat "$3"
+    echo -e "\t\t</data>"
+  } >> "$1"
+}
+
+write_footer() {
+  cat <<EOF >> "$1"
+	</dict>
+	<key>Version</key>
+	<integer>1</integer>
+</dict>
+</plist>
+EOF
+}

 cd "${OCPath}" || abort "Failed to reach ${OCPath}"
 /bin/rm -rf vault.plist vault.sig || abort "Failed to cleanup"
-/usr/libexec/PlistBuddy -c "Add Version integer 1" vault.plist || abort "Failed to set vault.plist version"

-echo "Hashing files in ${OCPath}..."
+echo "Hashing OpenCore configuration..."
+
+write_header vault.plist

 /usr/bin/find . -not -path '*/\.*' -type f \
  \( ! -iname ".*" \) \
  \( ! -iname "vault.*" \) \
-  \( ! -iname "OpenCore.efi" \) | while read -r fname; do
+  \( ! -iname "MemTest86.log" \) \
+  \( ! -iname "MemTest86-Report-*.html" \) \
+  \( ! -iname "OpenCore.efi" \) | env LC_COLLATE=POSIX /usr/bin/sort | while read -r fname; do
  fname="${fname#"./"}"
  wname="${fname//\//\\\\}"
-  shasum=$(/usr/bin/shasum -a 256 "${fname}") || abort "Failed to hash ${fname}"
-  sha=$(echo "$shasum" | /usr/bin/sed 's/^\([a-f0-9]\{64\}\).*/\1/') || abort "Illegit hashsum"
+  sha=$("${UtilsPath}"/openssl sha256 "${fname}" | /usr/bin/awk '{print $2}') || abort "Failed to hash ${fname}"
  if [ "${#sha}" != 64 ] || [ "$(echo "$sha"| /usr/bin/sed 's/^[a-f0-9]*$//')" ]; then
    abort "Got invalid hash: ${sha}!"
  fi

-  echo "${wname}: ${sha}"
-
-  echo "${sha}" | /usr/bin/xxd -r -p > /tmp/vault_hash || abort "Hashing failure"
-  /usr/libexec/PlistBuddy -c "Import Files:'${wname}' /tmp/vault_hash" vault.plist || abort "Failed to append vault.plist!"
+  echo "${sha}" | /usr/bin/xxd -r -p | "${UtilsPath}"/openssl base64 > /tmp/vault_hash || abort "Hashing failure"
+  write_file_name_and_hash vault.plist "${wname}" /tmp/vault_hash
 done

 /bin/rm -rf /tmp/vault_hash

-echo "All done!"
+write_footer vault.plist
+
 exit 0
--- a/payloads/Tools/CreateVault/openssl
+++ b/payloads/Tools/CreateVault/openssl
--- a/payloads/Tools/CreateVault/sign.command
+++ b/payloads/Tools/CreateVault/sign.command
@@ -1,16 +1,18 @@
 #!/bin/sh

+# Modified by Jazzzny for OpenCore Legacy Patcher on 06.10.23.
+
 abort() {
  echo "Fatal error: ${1}!"
  exit 1
 }

+# shellcheck disable=SC2317
 cleanup() {
-  echo "Cleaning up keys"
  rm -rf "${KeyPath}"
 }

-if [ ! -x /usr/bin/dirname ] || [ ! -x /bin/chmod ] || [ ! -x /bin/mkdir ] || [ ! -x /usr/bin/openssl ] || [ ! -x /bin/rm ] || [ ! -x /usr/bin/strings ] || [ ! -x /usr/bin/grep ] || [ ! -x /usr/bin/cut ] || [ ! -x /bin/dd ] || [ ! -x /usr/bin/uuidgen ] ; then
+if [ ! -x /usr/bin/dirname ] || [ ! -x /bin/chmod ] || [ ! -x /bin/mkdir ] || [ ! -x /bin/rm ] || [ ! -x /usr/bin/grep ] || [ ! -x /usr/bin/awk ] || [ ! -x /bin/dd ] || [ ! -x /usr/bin/uuidgen ] ; then
  abort "Unix environment is broken!"
 fi

@@ -22,10 +24,8 @@ if [ "$OCPath" = "" ]; then
  OCPath=../../EFI/OC
 fi

-KeyPath="/tmp/Keys-$(/usr/bin/uuidgen)"
+KeyPath="/tmp/$(/usr/bin/uuidgen)"
 OCBin="${OCPath}/OpenCore.efi"
-RootCA="${KeyPath}/ca.pem"
-PrivKey="${KeyPath}/privatekey.cer"
 PubKey="${KeyPath}/vault.pub"

 if [ ! -d "${OCPath}" ]; then
@@ -58,31 +58,14 @@ fi

 ./create_vault.sh "${OCPath}" || abort "create_vault.sh returns errors!"

-if [ ! -f "${RootCA}" ]; then
-  /usr/bin/openssl genrsa -out "${RootCA}" 2048 || abort "Failed to generate CA"
-  if [ -f "${PrivKey}" ]; then
-    echo "WARNING: Private key exists without CA"
-  fi
-fi
-
-/bin/rm -fP "${PrivKey}" || abort "Failed to remove ${PrivKey}"
-echo "Issuing a new private key..."
-/usr/bin/openssl req -new -x509 -key "${RootCA}" -out "${PrivKey}" -days 1825 -subj "/C=WO/L=127.0.0.1/O=Acidanthera/OU=Acidanthera OpenCore/CN=Greetings from Acidanthera and WWHC" || abort "Failed to issue private key!"
-
-/bin/rm -fP "${PubKey}" || abort "Failed to remove ${PubKey}"
-echo "Getting public key based off private key..."
-./RsaTool -cert "${PrivKey}" > "${PubKey}" || abort "Failed to get public key"
-
-echo "Signing ${OCBin}..."
+echo "Signing OpenCore..."
 ./RsaTool -sign "${OCPath}/vault.plist" "${OCPath}/vault.sig" "${PubKey}" || abort "Failed to patch ${PubKey}"
-
-echo "Bin-patching ${OCBin}..."
-off=$(($(/usr/bin/strings -a -t d "${OCBin}" | /usr/bin/grep "=BEGIN OC VAULT=" | /usr/bin/cut -f1 -d' ') + 16))
+off=$(($(./strings -a -t d "${OCBin}" | /usr/bin/grep "=BEGIN OC VAULT=" | /usr/bin/awk '{print $1}') + 16))
 if [ "${off}" -le 16 ]; then
  abort "${OCBin} is borked"
 fi

 /bin/dd of="${OCBin}" if="${PubKey}" bs=1 seek="${off}" count=528 conv=notrunc || abort "Failed to bin-patch ${OCBin}"

-echo "All done!"
+echo "Signing complete"
 exit 0
--- a/payloads/Tools/CreateVault/strings
+++ b/payloads/Tools/CreateVault/strings
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,4 +4,5 @@ wxpython
 pyinstaller
 packaging
 py_sip_xnu
-py-applescript
+py-applescript
+markdown2
--- a/resources/arguments.py
+++ b/resources/arguments.py
@@ -1,12 +1,17 @@
-import threading
+import sys
 import time
 import logging
-import sys
+import plistlib
+import threading
+import subprocess

-from resources import defaults, utilities, validation, constants
-from resources.sys_patch import sys_patch, sys_patch_auto
+from pathlib import Path
+
+from data import model_array, os_data
 from resources.build import build
-from data import model_array
+from resources.sys_patch import sys_patch, sys_patch_auto
+from resources import defaults, utilities, validation, constants
+from resources.wx_gui import gui_entry


 # Generic building args
@@ -41,6 +46,14 @@ class arguments:
            self._sys_unpatch_handler()
            return

+        if self.args.prepare_for_update:
+            self._prepare_for_update_handler()
+            return
+
+        if self.args.cache_os:
+            self._cache_os_handler()
+            return
+
        if self.args.auto_patch:
            self._sys_patch_auto_handler()
            return
@@ -88,6 +101,62 @@ class arguments:
        sys_patch_auto.AutomaticSysPatch(self.constants).start_auto_patch()


+    def _prepare_for_update_handler(self) -> None:
+        """
+        Prepare host for macOS update
+        """
+        logging.info("Preparing host for macOS update")
+
+        os_data = utilities.fetch_staged_update(variant="Update")
+        if os_data[0] is None:
+            logging.info("No update staged, skipping")
+            return
+
+        os_version = os_data[0]
+        os_build   = os_data[1]
+
+        logging.info(f"Preparing for update to {os_version} ({os_build})")
+
+        self._clean_le_handler()
+
+
+    def _cache_os_handler(self) -> None:
+        """
+        Fetch KDK for incoming OS
+        """
+        results = subprocess.run(["/bin/ps", "-ax"], stdout=subprocess.PIPE)
+        if results.stdout.decode("utf-8").count("OpenCore-Patcher --cache_os") > 1:
+            logging.info("Another instance of OS caching is running, exiting")
+            return
+
+        gui_entry.EntryPoint(self.constants).start(entry=gui_entry.SupportedEntryPoints.OS_CACHE)
+
+
+    def _clean_le_handler(self) -> None:
+        """
+        Clean /Library/Extensions of problematic kexts
+        Note macOS Ventura and older do this automatically
+        """
+
+        if self.constants.detected_os < os_data.os_data.sonoma:
+            return
+
+        logging.info("Cleaning /Library/Extensions")
+
+        for kext in Path("/Library/Extensions").glob("*.kext"):
+            if not Path(f"{kext}/Contents/Info.plist").exists():
+                continue
+            try:
+                kext_plist = plistlib.load(open(f"{kext}/Contents/Info.plist", "rb"))
+            except Exception as e:
+                logging.info(f"  - Failed to load plist for {kext.name}: {e}")
+                continue
+            if "GPUCompanionBundles" not in kext_plist:
+                continue
+            logging.info(f"  - Removing {kext.name}")
+            subprocess.run(["/bin/rm", "-rf", kext])
+
+
    def _build_handler(self) -> None:
        """
        Start config building process
--- a/resources/build/bluetooth.py
+++ b/resources/build/bluetooth.py
@@ -2,6 +2,7 @@
 # Copyright (C) 2020-2023, Dhinak G, Mykola Grymalyuk

 import logging
+import binascii

 from resources import constants, device_probe
 from resources.build import support
@@ -45,6 +46,9 @@ class BuildBluetooth:
            support.BuildSupport(self.model, self.constants, self.config).enable_kext("BlueToolFixup.kext", self.constants.bluetool_version, self.constants.bluetool_path)
            support.BuildSupport(self.model, self.constants, self.config).enable_kext("Bluetooth-Spoof.kext", self.constants.btspoof_version, self.constants.btspoof_path)
            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -btlfxallowanyaddr"
+            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["bluetoothInternalControllerInfo"] = binascii.unhexlify("0000000000000000000000000000")
+            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["bluetoothExternalDongleFailed"] = binascii.unhexlify("00")
+            self.config["NVRAM"]["Delete"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"] += ["bluetoothInternalControllerInfo", "bluetoothExternalDongleFailed"]
        elif self.computer.bluetooth_chipset == "BRCM20702 Hub":
            # BCM94331 can include either BCM2070 or BRCM20702 v1 Bluetooth chipsets
            # Note Monterey only natively supports BRCM20702 v2 (found with BCM94360)
@@ -75,4 +79,7 @@ class BuildBluetooth:
            support.BuildSupport(self.model, self.constants, self.config).enable_kext("BlueToolFixup.kext", self.constants.bluetool_version, self.constants.bluetool_path)
            if smbios_data.smbios_dictionary[self.model]["Bluetooth Model"] <= bluetooth_data.bluetooth_data.BRCM2070.value:
                self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -btlfxallowanyaddr"
+                self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["bluetoothInternalControllerInfo"] = binascii.unhexlify("0000000000000000000000000000")
+                self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["bluetoothExternalDongleFailed"] = binascii.unhexlify("00")
+                self.config["NVRAM"]["Delete"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"] += ["bluetoothInternalControllerInfo", "bluetoothExternalDongleFailed"]
                support.BuildSupport(self.model, self.constants, self.config).enable_kext("Bluetooth-Spoof.kext", self.constants.btspoof_version, self.constants.btspoof_path)
--- a/resources/build/build.py
+++ b/resources/build/build.py
@@ -65,8 +65,6 @@ class BuildOpenCore:
        ]:
            function(self.model, self.constants, self.config)

-        self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -lilubetaall"
-
        # Work-around ocvalidate
        if self.constants.validate is False:
            logging.info("- Adding bootmgfw.efi BlessOverride")
--- a/resources/build/firmware.py
+++ b/resources/build/firmware.py
@@ -215,12 +215,13 @@ class BuildFirmware:
        # CSM check
        # For model support, check for GUID in firmware and as well as Bootcamp Assistant's Info.plist ('PreUEFIModels' key)
        # Ref: https://github.com/acidanthera/OpenCorePkg/blob/0.9.5/Platform/OpenLegacyBoot/OpenLegacyBoot.c#L19
-        # if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.ivy_bridge.value and self.model != "MacPro6,1":
-        #     logging.info("- Enabling CSM support")
-        #     support.BuildSupport(self.model, self.constants, self.config).get_efi_binary_by_path("OpenLegacyBoot.efi", "UEFI", "Drivers")["Enabled"] = True
-        # else:
-        #     # Shipped alongside OpenCorePkg, so remove if unused
-        #     (self.constants.drivers_path / Path("OpenLegacyBoot.efi")).unlink()
+        if Path(self.constants.drivers_path / Path("OpenLegacyBoot.efi")).exists():
+            if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.ivy_bridge.value and self.model != "MacPro6,1":
+                logging.info("- Enabling CSM support")
+                support.BuildSupport(self.model, self.constants, self.config).get_efi_binary_by_path("OpenLegacyBoot.efi", "UEFI", "Drivers")["Enabled"] = True
+            else:
+                # Shipped alongside OpenCorePkg, so remove if unused
+                (self.constants.drivers_path / Path("OpenLegacyBoot.efi")).unlink()

    def _firmware_compatibility_handling(self) -> None:
        """
@@ -232,7 +233,7 @@ class BuildFirmware:
        # Patches IOPCIConfigurator.cpp's IOPCIIsHotplugPort to skip configRead16/32 calls
        # Credit to CaseySJ for original discovery:
        # - Patch: https://github.com/AMD-OSX/AMD_Vanilla/pull/196
-        # - Source: https://github.com/apple-oss-distributions/IOPCIFamily/blob/main/IOPCIConfigurator.cpp#L968-L1022
+        # - Source: https://github.com/apple-oss-distributions/IOPCIFamily/blob/IOPCIFamily-583.40.1/IOPCIConfigurator.cpp#L968-L1022
        #
        # Currently all pre-Sandy Bridge Macs lacking an iGPU benefit from this patch as well as MacPro6,1
        # Otherwise some graphics hardware will fail to wake, macOS will misreport hardware as ExpressCard-based,
@@ -247,7 +248,7 @@ class BuildFirmware:
            logging.info("- Adding PCI Bus Enumeration Patch")
            support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "CaseySJ - Fix PCI bus enumeration (Ventura)")["Enabled"] = True
            # Sonoma slightly adjusted this line specifically
-            # - https://github.com/apple-oss-distributions/IOPCIFamily/blob/main/IOPCIConfigurator.cpp#L1009
+            # - https://github.com/apple-oss-distributions/IOPCIFamily/blob/IOPCIFamily-583.40.1/IOPCIConfigurator.cpp#L1009
            support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Fix PCI bus enumeration (Sonoma)")["Enabled"] = True

        if self.constants.set_vmm_cpuid is True:
@@ -304,10 +305,10 @@ class BuildFirmware:
        whereas other drivers like ./qa_logger.efi is invoked via Device Path.
        """

-        if "5K Display" not in smbios_data.smbios_dictionary[self.model]:
+        if "Dual DisplayPort Display" not in smbios_data.smbios_dictionary[self.model]:
            return

-        logging.info("- Adding 5K Display Patch")
+        logging.info("- Adding 4K/5K Display Patch")
        # Set LauncherPath to '/boot.efi'
        # This is to ensure that only the Mac's firmware presents the boot option, but not OpenCore
        # https://github.com/acidanthera/OpenCorePkg/blob/0.7.6/Library/OcAppleBootPolicyLib/OcAppleBootPolicyLib.c#L50-L73
--- a/resources/build/misc.py
+++ b/resources/build/misc.py
@@ -43,6 +43,7 @@ class BuildMiscellaneous:
        self._debug_handling()
        self._cpu_friend_handling()
        self._general_oc_handling()
+        self._t1_handling()


    def _feature_unlock_handling(self) -> None:
@@ -179,9 +180,17 @@ class BuildMiscellaneous:

    def _topcase_handling(self) -> None:
        """
-        USB Top Case Handler
+        USB/SPI Top Case Handler
        """

+        # macOS 14.4 Beta 1 strips SPI-based top case support for Broadwell through Kaby Lake MacBooks (and MacBookAir6,x)
+        if self.model.startswith("MacBook") and self.model in smbios_data.smbios_dictionary:
+            if self.model.startswith("MacBookAir6") or (cpu_data.CPUGen.broadwell <= smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.kaby_lake):
+                logging.info("- Enabling SPI-based top case support")
+                support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleHSSPISupport.kext", self.constants.apple_spi_version, self.constants.apple_spi_path)
+                support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleHSSPIHIDDriver.kext", self.constants.apple_spi_hid_version, self.constants.apple_spi_hid_path)
+
+
        #On-device probing
        if not self.constants.custom_model and self.computer.internal_keyboard_type and self.computer.trackpad_type:

@@ -280,6 +289,12 @@ class BuildMiscellaneous:
        # - Ref: https://techcommunity.microsoft.com/t5/microsoft-usb-blog/reasons-to-avoid-companion-controllers/ba-p/270710
        #
        # To be paired for sys_patch_dict.py's 'Legacy USB 1.1' patchset
+        #
+        # Note: With macOS 14.1, injection of these kexts causes a panic.
+        #       To avoid this, a MaxKernel is configured with XNU 23.0.0 (macOS 14.0).
+        #       Additionally sys_patch.py stack will now patches the bins onto disk for 14.1+.
+        #       Reason for keeping the dual logic is due to potential conflicts of in-cache vs injection if we start
+        #       patching pre-14.1 hosts.
        if (
            smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.penryn.value or \
            self.model in ["MacPro4,1", "MacPro5,1", "Xserve3,1"]
@@ -335,11 +350,9 @@ class BuildMiscellaneous:
            logging.info(f"- Setting custom OpenCore picker timeout to {self.constants.oc_timeout} seconds")
            self.config["Misc"]["Boot"]["Timeout"] = self.constants.oc_timeout

-        if self.constants.vault is True and utilities.check_command_line_tools() is True:
+        if self.constants.vault is True:
            logging.info("- Setting Vault configuration")
            self.config["Misc"]["Security"]["Vault"] = "Secure"
-            support.BuildSupport(self.model, self.constants, self.config).get_efi_binary_by_path("OpenShell.efi", "Misc", "Tools")["Enabled"] = False
-

    def _t1_handling(self) -> None:
        """
@@ -351,9 +364,10 @@ class BuildMiscellaneous:
        logging.info("- Enabling T1 Security Chip support")

        support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Block"], "Identifier", "com.apple.driver.AppleSSE")["Enabled"] = True
-        support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Block"], "Identifier", "com.apple.driver.AppleCredentialManager")["Enabled"] = True
        support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Block"], "Identifier", "com.apple.driver.AppleKeyStore")["Enabled"] = True
+        support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Block"], "Identifier", "com.apple.driver.AppleCredentialManager")["Enabled"] = True

+        support.BuildSupport(self.model, self.constants, self.config).enable_kext("corecrypto_T1.kext", self.constants.t1_corecrypto_version, self.constants.t1_corecrypto_path)
        support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleSSE.kext", self.constants.t1_sse_version, self.constants.t1_sse_path)
-        support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleCredentialManager.kext", self.constants.t1_credential_version, self.constants.t1_credential_path)
-        support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleKeyStore.kext", self.constants.t1_key_store_version, self.constants.t1_key_store_path)
+        support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleKeyStore.kext", self.constants.t1_key_store_version, self.constants.t1_key_store_path)
+        support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleCredentialManager.kext", self.constants.t1_credential_version, self.constants.t1_credential_path)
--- a/resources/build/networking/wired.py
+++ b/resources/build/networking/wired.py
@@ -35,6 +35,7 @@ class BuildWiredNetworking:

        # Always enable due to chance of hot-plugging
        self._usb_ecm_dongles()
+        self._i210_handling()


    def _usb_ecm_dongles(self) -> None:
@@ -48,6 +49,21 @@ class BuildWiredNetworking:
        # - Kext: AppleUSBECM.kext
        support.BuildSupport(self.model, self.constants, self.config).enable_kext("ECM-Override.kext", self.constants.ecm_override_version, self.constants.ecm_override_path)

+
+    def _i210_handling(self) -> None:
+        """
+        PCIe i210 NIC Handling
+        """
+        # i210 NICs are broke in macOS 14 due to driver kit downgrades
+        # See ECM logic for why it's always enabled
+        if not self.model in smbios_data.smbios_dictionary:
+            return
+        support.BuildSupport(self.model, self.constants, self.config).enable_kext("CatalinaIntelI210Ethernet.kext", self.constants.i210_version, self.constants.i210_path)
+        # Ivy Bridge and newer natively support DriverKit, so set MinKernel to 23.0.0
+        if smbios_data.smbios_dictionary[self.model]["CPU Generation"] >= cpu_data.CPUGen.ivy_bridge.value:
+            support.BuildSupport(self.model, self.constants, self.config).get_kext_by_bundle_path("CatalinaIntelI210Ethernet.kext")["MinKernel"] = "23.0.0"
+
+
    def _on_model(self) -> None:
        """
        On-Model Hardware Detection Handling
--- a/resources/build/security.py
+++ b/resources/build/security.py
@@ -77,6 +77,6 @@ class BuildSecurity:
        if self.constants.secure_status is False:
            logging.info("- Disabling SecureBootModel")
            self.config["Misc"]["Security"]["SecureBootModel"] = "Disabled"
-            
+
        logging.info("- Enabling AMFIPass")
        support.BuildSupport(self.model, self.constants, self.config).enable_kext("AMFIPass.kext", self.constants.amfipass_version, self.constants.amfipass_path)
--- a/resources/build/smbios.py
+++ b/resources/build/smbios.py
@@ -288,7 +288,7 @@ class BuildSMBIOS:
        """

        if self.constants.custom_serial_number == "" or self.constants.custom_board_serial_number == "":
-            macserial_output = subprocess.run([self.constants.macserial_path] + f"-g -m {self.spoofed_model} -n 1".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            macserial_output = subprocess.run([self.constants.macserial_path, "--generate", "--model", self.spoofed_model, "--num", "1"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
            macserial_output = macserial_output.stdout.decode().strip().split(" | ")
            sn = macserial_output[0]
            mlb = macserial_output[1]
--- a/resources/build/support.py
+++ b/resources/build/support.py
@@ -108,17 +108,11 @@ class BuildSupport:
        if self.constants.vault is False:
            return

-        if utilities.check_command_line_tools() is False:
-            # sign.command checks for the existence of '/usr/bin/strings' however does not verify whether it's executable
-            # sign.command will continue to run and create an unbootable OpenCore.efi due to the missing strings binary
-            # macOS has dummy binaries that just reroute to the actual binaries after you install Xcode's Command Line Tools
-            logging.info("- Missing Command Line tools, skipping Vault for saftey reasons")
-            logging.info("- Install via 'xcode-select --install' and rerun OCLP if you wish to vault this config")
-            return
-
-        logging.info("- Vaulting EFI")
-        subprocess.run([str(self.constants.vault_path), f"{self.constants.oc_folder}/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-
+        logging.info("- Vaulting EFI\n=========================================")
+        popen = subprocess.Popen([str(self.constants.vault_path), f"{self.constants.oc_folder}/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)
+        for stdout_line in iter(popen.stdout.readline, ""):
+            logging.info(stdout_line.strip())
+        logging.info("=========================================")

    def validate_pathing(self) -> None:
        """
@@ -175,6 +169,27 @@ class BuildSupport:
                logging.info(f"- Found extra driver: {driver_file.name}")
                raise Exception(f"Found extra driver: {driver_file.name}")

+        self._validate_malformed_kexts(self.constants.opencore_release_folder / Path("EFI/OC/Kexts"))
+
+
+    def _validate_malformed_kexts(self, directory: str | Path) -> None:
+        """
+        Validate Info.plist and executable pathing for kexts
+        """
+        for kext_folder in Path(directory).glob("*.kext"):
+            if not Path(kext_folder / Path("Contents/Info.plist")).exists():
+                continue
+
+            kext_data = plistlib.load(Path(kext_folder / Path("Contents/Info.plist")).open("rb"))
+            if "CFBundleExecutable" in kext_data:
+                expected_executable = Path(kext_folder / Path("Contents/MacOS") / Path(kext_data["CFBundleExecutable"]))
+                if not expected_executable.exists():
+                    logging.info(f"- Missing executable for {kext_folder.name}: Contents/MacOS/{expected_executable.name}")
+                    raise Exception(f" - Missing executable for {kext_folder.name}: Contents/MacOS/{expected_executable.name}")
+
+            if Path(kext_folder / Path("Contents/PlugIns")).exists():
+                self._validate_malformed_kexts(kext_folder / Path("Contents/PlugIns"))
+

    def cleanup(self) -> None:
        """
--- a/resources/constants.py
+++ b/resources/constants.py
@@ -13,9 +13,9 @@ from data import os_data
 class Constants:
    def __init__(self) -> None:
        # Patcher Versioning
-        self.patcher_version:                 str = "1.0.1"  # OpenCore-Legacy-Patcher
-        self.patcher_support_pkg_version:     str = "1.3.3"  # PatcherSupportPkg
-        self.copyright_date:                  str = "Copyright © 2020-2023 Dortania"
+        self.patcher_version:                 str = "1.4.2"  # OpenCore-Legacy-Patcher
+        self.patcher_support_pkg_version:     str = "1.4.8"  # PatcherSupportPkg
+        self.copyright_date:                  str = "Copyright © 2020-2024 Dortania"
        self.patcher_name:                    str = "OpenCore Legacy Patcher"

        # URLs
@@ -28,7 +28,7 @@ class Constants:

        # OpenCore Versioning
        # https://github.com/acidanthera/OpenCorePkg
-        self.opencore_version: str = "0.9.3"
+        self.opencore_version: str = "0.9.7"

        # Kext Versioning
        ## Acidanthera
@@ -36,7 +36,7 @@ class Constants:
        self.lilu_version:               str = "1.6.7"  #      Lilu
        self.whatevergreen_version:      str = "1.6.6"  #      WhateverGreen
        self.whatevergreen_navi_version: str = "1.6.6-Navi"  # WhateverGreen (Navi Patch)
-        self.airportbcrmfixup_version:   str = "2.1.7"  #      AirPortBrcmFixup
+        self.airportbcrmfixup_version:   str = "2.1.8"  #      AirPortBrcmFixup
        self.nvmefix_version:            str = "1.1.1"  #      NVMeFix
        self.applealc_version:           str = "1.6.3"  #      AppleALC
        self.restrictevents_version:     str = "1.1.3"  #      RestrictEvents
@@ -67,17 +67,20 @@ class Constants:
        self.aicpupm_version:       str = "1.0.0"  #  AppleIntelCPUPowerManagement/Client
        self.s3x_nvme_version:      str = "1.0.0"  #  IONVMeFamily (14.0 Beta 1, S1X and S3X classes)
        self.apple_camera_version:  str = "1.0.0"  #  AppleCameraInterface (14.0 Beta 1)
-        self.t1_credential_version: str = "1.0.0"  #  AppleCredentialManager (13.5 - T1 support)
-        self.t1_sse_version:        str = "1.0.0"  #  AppleSSE (13.5 - T1 support)
-        self.t1_key_store_version:  str = "1.0.0"  #  AppleKeyStore (13.5 - T1 support)
+        self.t1_sse_version:        str = "1.1.0"  #  AppleSSE      (13.6 - T1 support)
+        self.t1_key_store_version:  str = "1.1.0"  #  AppleKeyStore (13.6 - T1 support)
+        self.t1_credential_version: str = "1.0.0"  #  AppleCredentialManager (13.6 - T1 support)
+        self.t1_corecrypto_version: str = "1.0.1"  #  corecrypto    (13.6 - T1 support)
+        self.apple_spi_version:     str = "1.0.0"  #  AppleHSSPISupport   (14.4 Beta 1)
+        self.apple_spi_hid_version: str = "1.0.0"  #  AppleHSSPIHIDDriver (14.4 Beta 1)

        ## Apple - Dortania Modified
        self.bcm570_version:           str = "1.0.2"  # CatalinaBCM5701Ethernet
        self.i210_version:             str = "1.0.0"  # CatalinaIntelI210Ethernet
-        self.corecaptureelcap_version: str = "1.0.1"  # corecaptureElCap
-        self.io80211elcap_version:     str = "2.0.0"  # IO80211ElCap
+        self.corecaptureelcap_version: str = "1.0.2"  # corecaptureElCap
+        self.io80211elcap_version:     str = "2.0.1"  # IO80211ElCap
        self.io80211legacy_version:    str = "1.0.0"  # IO80211FamilyLegacy (Ventura)
-        self.ioskywalk_version:        str = "1.0.0"  # IOSkywalkFamily (Ventura)
+        self.ioskywalk_version:        str = "1.1.0"  # IOSkywalkFamily (Ventura)
        self.bigsursdxc_version:       str = "1.0.0"  # BigSurSDXC
        self.monterey_ahci_version:    str = "1.0.0"  # CatalinaAHCI

@@ -94,7 +97,7 @@ class Constants:
        self.aspp_override_version:          str = "1.0.1"  # ACPI_SMC_PlatformPlugin Override
        self.ecm_override_version:           str = "1.0.0"  # AppleUSBECM Override
        self.rsrhelper_version:              str = "1.0.0"  # RSRHelper
-        self.amfipass_version:               str = "1.3.1"  # AMFIPass
+        self.amfipass_version:               str = "1.4.0"  # AMFIPass
        self.amfipass_compatibility_version: str = "1.2.1"  # Minimum AMFIPass version required

        ## Syncretic
@@ -279,14 +282,26 @@ class Constants:
    def plist_template(self):
        return self.payload_path / Path("Config/config.plist")

-    # Launch Agent
+    # Launch Services
+    @property
+    def launch_services_path(self):
+        return self.payload_path / Path("Launch Services")
+
    @property
    def auto_patch_launch_agent_path(self):
-        return self.payload_path / Path("com.dortania.opencore-legacy-patcher.auto-patch.plist")
+        return self.launch_services_path / Path("com.dortania.opencore-legacy-patcher.auto-patch.plist")

    @property
    def rsr_monitor_launch_daemon_path(self):
-        return self.payload_path / Path("com.dortania.opencore-legacy-patcher.rsr-monitor.plist")
+        return self.launch_services_path / Path("com.dortania.opencore-legacy-patcher.rsr-monitor.plist")
+
+    @property
+    def update_launch_daemon_path(self):
+        return self.launch_services_path / Path("com.dortania.opencore-legacy-patcher.macos-update.plist")
+
+    @property
+    def kdk_launch_daemon_path(self):
+        return self.launch_services_path / Path("com.dortania.opencore-legacy-patcher.os-caching.plist")

    # ACPI
    @property
@@ -447,6 +462,18 @@ class Constants:
    def t1_sse_path(self):
        return self.payload_kexts_path / Path(f"Misc/AppleSSE-v{self.t1_sse_version}.zip")

+    @property
+    def t1_corecrypto_path(self):
+        return self.payload_kexts_path / Path(f"Misc/corecrypto_T1-v{self.t1_corecrypto_version}.zip")
+
+    @property
+    def apple_spi_path(self):
+        return self.payload_kexts_path / Path(f"Misc/AppleHSSPISupport-v{self.apple_spi_version}.zip")
+
+    @property
+    def apple_spi_hid_path(self):
+        return self.payload_kexts_path / Path(f"Misc/AppleHSSPIHIDDriver-v{self.apple_spi_hid_version}.zip")
+
    @property
    def mousse_path(self):
        return self.payload_kexts_path / Path(f"SSE/AAAMouSSE-v{self.mousse_version}.zip")
@@ -703,6 +730,13 @@ class Constants:
        return self.payload_path / Path("Tools/RSRRepair")

    # Icons
+    @property
+    def icns_resource_path(self):
+        if self.launcher_script:
+            return self.payload_path / Path("Icon/AppIcons")
+        return Path(self.launcher_binary).parent.parent / Path("Resources")
+
+
    @property
    def app_icon_path(self):
        return self.payload_path / Path("OC-Patcher.icns")
@@ -725,23 +759,23 @@ class Constants:

    @property
    def icon_path_macos_generic(self):
-        return self.payload_path / Path("Icon/AppIcons/Generic.icns")
+        return self.icns_resource_path / Path("Generic.icns")

    @property
    def icon_path_macos_big_sur(self):
-        return self.payload_path / Path("Icon/AppIcons/BigSur.icns")
+        return self.icns_resource_path / Path("BigSur.icns")

    @property
    def icon_path_macos_monterey(self):
-        return self.payload_path / Path("Icon/AppIcons/Monterey.icns")
+        return self.icns_resource_path / Path("Monterey.icns")

    @property
    def icon_path_macos_ventura(self):
-        return self.payload_path / Path("Icon/AppIcons/Ventura.icns")
+        return self.icns_resource_path / Path("Ventura.icns")

    @property
    def icon_path_macos_sonoma(self):
-        return self.payload_path / Path("Icon/AppIcons/Sonoma.icns")
+        return self.icns_resource_path / Path("Sonoma.icns")

    @property
    def gui_path(self):
@@ -764,13 +798,6 @@ class Constants:
    def kdk_download_path(self):
        return self.payload_path / Path("KDK.dmg")

-    @property
-    def icns_resource_path(self):
-        if self.launcher_script:
-            return self.payload_path / Path("Icon/AppIcons")
-        return Path(self.launcher_binary).parent.parent / Path("Resources")
-
-
    @property
    def icons_path(self):
        return [
--- a/resources/defaults.py
+++ b/resources/defaults.py
@@ -329,9 +329,9 @@ class GenerateDefaults:

                for key in ["Moraea_BlurBeta"]:
                    # Enable BetaBlur if user hasn't disabled it
-                    is_key_enabled = subprocess.run(["defaults", "read", "-g", key], stdout=subprocess.PIPE).stdout.decode("utf-8").strip()
+                    is_key_enabled = subprocess.run(["/usr/bin/defaults", "read", "-globalDomain", key], stdout=subprocess.PIPE).stdout.decode("utf-8").strip()
                    if is_key_enabled not in ["false", "0"]:
-                        subprocess.run(["defaults", "write", "-g", key, "-bool", "true"])
+                        subprocess.run(["/usr/bin/defaults", "write", "-globalDomain", key, "-bool", "true"])

    def _check_amfipass_supported(self) -> None:
        """
--- a/resources/device_probe.py
+++ b/resources/device_probe.py
@@ -28,22 +28,24 @@ class CPU:

@dataclass
 class USBDevice:
-    vendor_id:    int
-    device_id:    int
-    device_class: int
-    device_speed: int
-    product_name: str
-    vendor_name:  Optional[str] = None
+    vendor_id:     int
+    device_id:     int
+    device_class:  int
+    device_speed:  int
+    product_name:  str
+    vendor_name:   Optional[str] = None
+    serial_number: Optional[str] = None

    @classmethod
    def from_ioregistry(cls, entry: ioreg.io_registry_entry_t):
        properties: dict = ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperties(entry, None, ioreg.kCFAllocatorDefault, ioreg.kNilOptions)[1])

-        vendor_id    = None
-        device_id    = None
-        device_class = None
-        device_speed = None
-        vendor_name  = None
+        vendor_id     = None
+        device_id     = None
+        device_class  = None
+        device_speed  = None
+        vendor_name   = None
+        serial_number = None
        product_name = "N/A"

        if "idVendor" in properties:
@@ -58,8 +60,10 @@ class USBDevice:
            vendor_name = properties["kUSBVendorString"].strip()
        if "USBSpeed" in properties:
            device_speed = properties["USBSpeed"]
+        if "kUSBSerialNumberString" in properties:
+            serial_number = properties["kUSBSerialNumberString"].strip()

-        return cls(vendor_id, device_id, device_class, device_speed, product_name, vendor_name)
+        return cls(vendor_id, device_id, device_class, device_speed, product_name, vendor_name, serial_number)


    def detect(self):
@@ -634,6 +638,7 @@ class Computer:
    ambient_light_sensor: Optional[bool] = False
    third_party_sata_ssd: Optional[bool] = False
    pcie_webcam: Optional[bool] = False
+    t1_chip: Optional[bool] = False
    secure_boot_model: Optional[str] = None
    secure_boot_policy: Optional[int] = None
    oclp_sys_version: Optional[str] = None
@@ -659,6 +664,7 @@ class Computer:
        computer.cpu_probe()
        computer.bluetooth_probe()
        computer.topcase_probe()
+        computer.t1_probe()
        computer.ambient_light_sensor_probe()
        computer.pcie_webcam_probe()
        computer.sata_disk_probe()
@@ -856,7 +862,7 @@ class Computer:
        # Reported model
        entry = next(ioreg.ioiterator_to_list(ioreg.IOServiceGetMatchingServices(ioreg.kIOMasterPortDefault, ioreg.IOServiceMatching("IOPlatformExpertDevice".encode()), None)[1]))
        self.reported_model = ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperty(entry, "model", ioreg.kCFAllocatorDefault, ioreg.kNilOptions)).strip(b"\0").decode()  # type: ignore
-        translated = subprocess.run("sysctl -in sysctl.proc_translated".split(), stdout=subprocess.PIPE).stdout.decode()
+        translated = subprocess.run(["/usr/sbin/sysctl", "-in", "sysctl.proc_translated"], stdout=subprocess.PIPE).stdout.decode()
        if translated:
            board = "target-type"
        else:
@@ -888,14 +894,14 @@ class Computer:

    def cpu_probe(self):
        self.cpu = CPU(
-            subprocess.run("sysctl machdep.cpu.brand_string".split(), stdout=subprocess.PIPE).stdout.decode().partition(": ")[2].strip(),
-            subprocess.run("sysctl machdep.cpu.features".split(), stdout=subprocess.PIPE).stdout.decode().partition(": ")[2].strip().split(" "),
+            subprocess.run(["/usr/sbin/sysctl", "machdep.cpu.brand_string"], stdout=subprocess.PIPE).stdout.decode().partition(": ")[2].strip(),
+            subprocess.run(["/usr/sbin/sysctl", "machdep.cpu.features"], stdout=subprocess.PIPE).stdout.decode().partition(": ")[2].strip().split(" "),
            self.cpu_get_leafs(),
        )

    def cpu_get_leafs(self):
        leafs = []
-        result = subprocess.run("sysctl machdep.cpu.leaf7_features".split(), stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
+        result = subprocess.run(["/usr/sbin/sysctl", "machdep.cpu.leaf7_features"], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
        if result.returncode == 0:
            return result.stdout.decode().partition(": ")[2].strip().split(" ")
        return leafs
@@ -936,10 +942,44 @@ class Computer:
            elif usb_device.device_id in usb_data.AppleIDs.AppleUSBMultiTouch:
                self.trackpad_type = "Modern"

+    def t1_probe(self):
+        if not self.usb_devices:
+            return
+
+        for usb_device in self.usb_devices:
+            if usb_device.vendor_id != 0x5ac:
+                continue
+            # Standard T1
+            if usb_device.device_id == 0x8600:
+                self.t1_chip = True
+                break
+            # T1 in DFU mode
+            # Note all Apple devices report the same device ID in DFU mode
+            if usb_device.device_id == 0x1281:
+                # Break down serial number into components
+                #   ex. "CPID:8002 CPRV:10 CPFM:03 SCEP:01 BDID:12 ECID:000E5C8E34600026 IBFL:3D"
+                # Is this overcomplicating T1 detection? Probably...
+                if usb_device.serial_number is None:
+                    continue
+                serial_number = usb_device.serial_number.split(" ")
+                # T1s come in 2 known flavours:
+                # - x619dev
+                #   - CPID: 0x8002
+                #   - BDID: 0x13
+                # - x619ap
+                #   - CPID: 0x8002
+                #   - BDID: 0x12
+                if "CPID:8002" not in serial_number:
+                    continue
+                if "BDID:13" not in serial_number and "BDID:12" not in serial_number:
+                    continue
+                self.t1_chip = True
+                break
+
    def sata_disk_probe(self):
        # Get all SATA Controllers/Disks from 'system_profiler SPSerialATADataType'
        # Determine whether SATA SSD is present and Apple-made
-        sp_sata_data = plistlib.loads(subprocess.run(f"system_profiler SPSerialATADataType -xml".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+        sp_sata_data = plistlib.loads(subprocess.run(["/usr/sbin/system_profiler", "SPSerialATADataType", "-xml"], stdout=subprocess.PIPE).stdout.decode().strip().encode())
        for root in sp_sata_data:
            for ahci_controller in root["_items"]:
                # Each AHCI controller will have its own entry
@@ -975,7 +1015,7 @@ class Computer:
                self.oclp_sys_signed = sys_plist["Custom Signature"]

    def check_rosetta(self):
-        result = subprocess.run("sysctl -in sysctl.proc_translated".split(), stdout=subprocess.PIPE).stdout.decode()
+        result = subprocess.run(["/usr/sbin/sysctl", "-in", "sysctl.proc_translated"], stdout=subprocess.PIPE).stdout.decode()
        if "1" in result:
            self.rosetta_active = True
        else:
--- a/resources/global_settings.py
+++ b/resources/global_settings.py
@@ -114,7 +114,7 @@ class GlobalEnviromentSettings:
            return

        # Set file permission to allow any user to write to log file
-        result = subprocess.run(["chmod", "777", self.global_settings_plist], capture_output=True)
+        result = subprocess.run(["/bin/chmod", "777", self.global_settings_plist], capture_output=True)
        if result.returncode != 0:
            logging.warning("Failed to fix settings file permissions:")
            if result.stderr:
--- a/resources/install.py
+++ b/resources/install.py
@@ -22,16 +22,16 @@ class tui_disk_installation:
        # TODO: AllDisksAndPartitions is not supported in Snow Leopard and older
        try:
            # High Sierra and newer
-            disks = plistlib.loads(subprocess.run("diskutil list -plist physical".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+            disks = plistlib.loads(subprocess.run(["/usr/sbin/diskutil", "list", "-plist", "physical"], stdout=subprocess.PIPE).stdout.decode().strip().encode())
        except ValueError:
            # Sierra and older
-            disks = plistlib.loads(subprocess.run("diskutil list -plist".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+            disks = plistlib.loads(subprocess.run(["/usr/sbin/diskutil", "list", "-plist"], stdout=subprocess.PIPE).stdout.decode().strip().encode())
        for disk in disks["AllDisksAndPartitions"]:
-            disk_info = plistlib.loads(subprocess.run(f"diskutil info -plist {disk['DeviceIdentifier']}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+            disk_info = plistlib.loads(subprocess.run(["/usr/sbin/diskutil", "info", "-plist", disk["DeviceIdentifier"]], stdout=subprocess.PIPE).stdout.decode().strip().encode())
            try:
                all_disks[disk["DeviceIdentifier"]] = {"identifier": disk_info["DeviceNode"], "name": disk_info["MediaName"], "size": disk_info["TotalSize"], "partitions": {}}
                for partition in disk["Partitions"]:
-                    partition_info = plistlib.loads(subprocess.run(f"diskutil info -plist {partition['DeviceIdentifier']}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+                    partition_info = plistlib.loads(subprocess.run(["/usr/sbin/diskutil", "info", "-plist", partition["DeviceIdentifier"]], stdout=subprocess.PIPE).stdout.decode().strip().encode())
                    all_disks[disk["DeviceIdentifier"]]["partitions"][partition["DeviceIdentifier"]] = {
                        "fs": partition_info.get("FilesystemType", partition_info["Content"]),
                        "type": partition_info["Content"],
@@ -102,15 +102,15 @@ class tui_disk_installation:
                    logging.info("Please disable Safe Mode and try again.")
                    return
        else:
-            result = subprocess.run(f"diskutil mount {full_disk_identifier}".split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            result = subprocess.run(["/usr/sbin/diskutil", "mount", full_disk_identifier], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
            if result.returncode != 0:
                logging.info("Mount failed")
                logging.info(result.stderr.decode())
                return

-        partition_info = plistlib.loads(subprocess.run(f"diskutil info -plist {full_disk_identifier}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+        partition_info = plistlib.loads(subprocess.run(["/usr/sbin/diskutil", "info", "-plist", full_disk_identifier], stdout=subprocess.PIPE).stdout.decode().strip().encode())
        parent_disk = partition_info["ParentWholeDisk"]
-        drive_host_info = plistlib.loads(subprocess.run(f"diskutil info -plist {parent_disk}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+        drive_host_info = plistlib.loads(subprocess.run(["/usr/sbin/diskutil", "info", "-plist", parent_disk], stdout=subprocess.PIPE).stdout.decode().strip().encode())
        sd_type = drive_host_info["MediaName"]
        try:
            ssd_type = drive_host_info["SolidState"]
@@ -125,49 +125,49 @@ class tui_disk_installation:

        if (mount_path / Path("EFI/OC")).exists():
            logging.info("Removing preexisting EFI/OC folder")
-            subprocess.run(["rm", "-rf", mount_path / Path("EFI/OC")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            subprocess.run(["/bin/rm", "-rf", mount_path / Path("EFI/OC")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)

        if (mount_path / Path("System")).exists():
            logging.info("Removing preexisting System folder")
-            subprocess.run(["rm", "-rf", mount_path / Path("System")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            subprocess.run(["/bin/rm", "-rf", mount_path / Path("System")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)

        if (mount_path / Path("boot.efi")).exists():
            logging.info("Removing preexisting boot.efi")
-            subprocess.run(["rm", mount_path / Path("boot.efi")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            subprocess.run(["/bin/rm", mount_path / Path("boot.efi")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)

        logging.info("Copying OpenCore onto EFI partition")
-        subprocess.run(["mkdir", "-p", mount_path / Path("EFI")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        subprocess.run(["cp", "-r", self.constants.opencore_release_folder / Path("EFI/OC"), mount_path / Path("EFI/OC")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        subprocess.run(["cp", "-r", self.constants.opencore_release_folder / Path("System"), mount_path / Path("System")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        subprocess.run(["/bin/mkdir", "-p", mount_path / Path("EFI")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        subprocess.run(["/bin/cp", "-r", self.constants.opencore_release_folder / Path("EFI/OC"), mount_path / Path("EFI/OC")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        subprocess.run(["/bin/cp", "-r", self.constants.opencore_release_folder / Path("System"), mount_path / Path("System")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)

        if Path(self.constants.opencore_release_folder / Path("boot.efi")).exists():
-            subprocess.run(["cp", self.constants.opencore_release_folder / Path("boot.efi"), mount_path / Path("boot.efi")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            subprocess.run(["/bin/cp", self.constants.opencore_release_folder / Path("boot.efi"), mount_path / Path("boot.efi")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)

        if self.constants.boot_efi is True:
            logging.info("Converting Bootstrap to BOOTx64.efi")
            if (mount_path / Path("EFI/BOOT")).exists():
-                subprocess.run(["rm", "-rf", mount_path / Path("EFI/BOOT")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                subprocess.run(["/bin/rm", "-rf", mount_path / Path("EFI/BOOT")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
            Path(mount_path / Path("EFI/BOOT")).mkdir()
-            subprocess.run(["mv", mount_path / Path("System/Library/CoreServices/boot.efi"), mount_path / Path("EFI/BOOT/BOOTx64.efi")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            subprocess.run(["rm", "-rf", mount_path / Path("System")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            subprocess.run(["/bin/mv", mount_path / Path("System/Library/CoreServices/boot.efi"), mount_path / Path("EFI/BOOT/BOOTx64.efi")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            subprocess.run(["/bin/rm", "-rf", mount_path / Path("System")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)

        if self._determine_sd_card(sd_type) is True:
            logging.info("Adding SD Card icon")
-            subprocess.run(["cp", self.constants.icon_path_sd, mount_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            subprocess.run(["/bin/cp", self.constants.icon_path_sd, mount_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
        elif ssd_type is True:
            logging.info("Adding SSD icon")
-            subprocess.run(["cp", self.constants.icon_path_ssd, mount_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            subprocess.run(["/bin/cp", self.constants.icon_path_ssd, mount_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
        elif disk_type == "USB":
            logging.info("Adding External USB Drive icon")
-            subprocess.run(["cp", self.constants.icon_path_external, mount_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            subprocess.run(["/bin/cp", self.constants.icon_path_external, mount_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
        else:
            logging.info("Adding Internal Drive icon")
-            subprocess.run(["cp", self.constants.icon_path_internal, mount_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            subprocess.run(["/bin/cp", self.constants.icon_path_internal, mount_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)

        logging.info("Cleaning install location")
        if not self.constants.recovery_status:
            logging.info("Unmounting EFI partition")
-            subprocess.run(["diskutil", "umount", mount_path], stdout=subprocess.PIPE).stdout.decode().strip().encode()
+            subprocess.run(["/usr/sbin/diskutil", "umount", mount_path], stdout=subprocess.PIPE).stdout.decode().strip().encode()

        logging.info("OpenCore transfer complete")

--- a/resources/kdk_handler.py
+++ b/resources/kdk_handler.py
@@ -49,7 +49,12 @@ class KernelDebugKitObject:

    """

-    def __init__(self, global_constants: constants.Constants, host_build: str, host_version: str, ignore_installed: bool = False, passive: bool = False) -> None:
+    def __init__(self, global_constants: constants.Constants,
+                 host_build: str, host_version: str,
+                 ignore_installed: bool = False, passive: bool = False,
+                 check_backups_only: bool = False
+        ) -> None:
+
        self.constants: constants.Constants = global_constants

        self.host_build:   str = host_build    # ex. 20A5384c
@@ -57,7 +62,8 @@ class KernelDebugKitObject:

        self.passive: bool = passive  # Don't perform actions requiring elevated privileges

-        self.ignore_installed:      bool = ignore_installed  # If True, will ignore any installed KDKs and download the latest
+        self.ignore_installed:      bool = ignore_installed   # If True, will ignore any installed KDKs and download the latest
+        self.check_backups_only:    bool = check_backups_only # If True, will only check for KDK backups, not KDKs already installed
        self.kdk_already_installed: bool = False

        self.kdk_installed_path: str = ""
@@ -114,7 +120,7 @@ class KernelDebugKitObject:
            logging.info("Could not fetch KDK list")
            return None

-        KDK_ASSET_LIST = sorted(results.json(), key=lambda x: (packaging.version.parse(x["version"]), datetime.datetime.fromisoformat(x["date"])), reverse=True)
+        KDK_ASSET_LIST = results.json()

        return KDK_ASSET_LIST

@@ -328,7 +334,7 @@ class KernelDebugKitObject:
        kdk_build = kdk_plist_data["ProductBuildVersion"]

        # Check pkg receipts for this build, will give a canonical list if all files that should be present
-        result = subprocess.run(["pkgutil", "--files", f"com.apple.pkg.KDK.{kdk_build}"], capture_output=True)
+        result = subprocess.run(["/usr/sbin/pkgutil", "--files", f"com.apple.pkg.KDK.{kdk_build}"], capture_output=True)
        if result.returncode != 0:
            # If pkg receipt is missing, we'll fallback to legacy validation
            logging.info(f"pkg receipt missing for {kdk_path.name}, falling back to legacy validation")
@@ -400,18 +406,20 @@ class KernelDebugKitObject:
        if not Path(KDK_INSTALL_PATH).exists():
            return None

-        for kdk_folder in Path(KDK_INSTALL_PATH).iterdir():
-            if not kdk_folder.is_dir():
-                continue
-            if check_version:
-                if match not in kdk_folder.name:
-                    continue
-            else:
-                if not kdk_folder.name.endswith(f"{match}.kdk"):
+        # Installed KDKs only
+        if self.check_backups_only is False:
+            for kdk_folder in Path(KDK_INSTALL_PATH).iterdir():
+                if not kdk_folder.is_dir():
                    continue
+                if check_version:
+                    if match not in kdk_folder.name:
+                        continue
+                else:
+                    if not kdk_folder.name.endswith(f"{match}.kdk"):
+                        continue

-            if self._local_kdk_valid(kdk_folder):
-                return kdk_folder
+                if self._local_kdk_valid(kdk_folder):
+                    return kdk_folder

        # If we can't find a KDK, next check if there's a backup present
        # Check for KDK packages in the same directory as the KDK
@@ -460,7 +468,7 @@ class KernelDebugKitObject:
            logging.warning(f"KDK does not exist: {kdk_path}")
            return

-        rm_args = ["rm", "-rf" if Path(kdk_path).is_dir() else "-f", kdk_path]
+        rm_args = ["/bin/rm", "-rf" if Path(kdk_path).is_dir() else "-f", kdk_path]

        result = utilities.elevated(rm_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
        if result.returncode != 0:
@@ -530,7 +538,7 @@ class KernelDebugKitObject:
            return False

        # TODO: should we use the checksum from the API?
-        result = subprocess.run(["hdiutil", "verify", self.constants.kdk_download_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        result = subprocess.run(["/usr/bin/hdiutil", "verify", self.constants.kdk_download_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
        if result.returncode != 0:
            logging.info("Error: Kernel Debug Kit checksum verification failed!")
            logging.info(f"Output: {result.stderr.decode('utf-8')}")
@@ -587,7 +595,7 @@ class KernelDebugKitUtilities:
        return True


-    def install_kdk_dmg(self, kdk_path: Path) -> bool:
+    def install_kdk_dmg(self, kdk_path: Path, only_install_backup: bool = False) -> bool:
        """
        Installs provided KDK disk image

@@ -604,7 +612,7 @@ class KernelDebugKitUtilities:

        logging.info(f"Extracting downloaded KDK disk image")
        with tempfile.TemporaryDirectory() as mount_point:
-            result = subprocess.run(["hdiutil", "attach", kdk_path, "-mountpoint", mount_point, "-nobrowse"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            result = subprocess.run(["/usr/bin/hdiutil", "attach", kdk_path, "-mountpoint", mount_point, "-nobrowse"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
            if result.returncode != 0:
                logging.info("Failed to mount KDK:")
                logging.info(result.stdout.decode('utf-8'))
@@ -617,9 +625,11 @@ class KernelDebugKitUtilities:
                self._unmount_disk_image(mount_point)
                return False

-            if self.install_kdk_pkg(kdk_pkg_path) is False:
-                self._unmount_disk_image(mount_point)
-                return False
+
+            if only_install_backup is False:
+                if self.install_kdk_pkg(kdk_pkg_path) is False:
+                    self._unmount_disk_image(mount_point)
+                    return False

            self._create_backup(kdk_pkg_path, Path(f"{kdk_path.parent}/{KDK_INFO_PLIST}"))
            self._unmount_disk_image(mount_point)
@@ -634,7 +644,7 @@ class KernelDebugKitUtilities:
        Parameters:
            mount_point (Path): Path to mount point
        """
-        subprocess.run(["hdiutil", "detach", mount_point], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        subprocess.run(["/usr/bin/hdiutil", "detach", mount_point], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)


    def _create_backup(self, kdk_path: Path, kdk_info_plist: Path) -> None:
@@ -663,6 +673,9 @@ class KernelDebugKitUtilities:
            logging.warning("Cannot create KDK backup, not running as root")
            return

+        if not Path(KDK_INSTALL_PATH).exists():
+            subprocess.run(["/bin/mkdir", "-p", KDK_INSTALL_PATH], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+
        kdk_dst_name = f"KDK_{kdk_info_dict['version']}_{kdk_info_dict['build']}.pkg"
        kdk_dst_path = Path(f"{KDK_INSTALL_PATH}/{kdk_dst_name}")

@@ -671,7 +684,7 @@ class KernelDebugKitUtilities:
            logging.info("Backup already exists, skipping")
            return

-        result = utilities.elevated(["cp", "-R", kdk_path, kdk_dst_path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        result = utilities.elevated(["/bin/cp", "-R", kdk_path, kdk_dst_path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
        if result.returncode != 0:
            logging.info("Failed to create KDK backup:")
            logging.info(result.stdout.decode('utf-8'))
--- a/resources/logging_handler.py
+++ b/resources/logging_handler.py
@@ -61,7 +61,7 @@ class InitializeLoggingSupport:
        """

        base_path = Path("~/Library/Logs").expanduser()
-        if not base_path.exists():
+        if not base_path.exists() or str(base_path).startswith("/var/root/"):
            # Likely in an installer environment, store in /Users/Shared
            base_path = Path("/Users/Shared")
        else:
@@ -71,7 +71,7 @@ class InitializeLoggingSupport:
                try:
                    base_path.mkdir()
                except Exception as e:
-                    logging.error(f"Failed to create Dortania folder: {e}")
+                    print(f"Failed to create Dortania folder: {e}")
                    base_path = Path("/Users/Shared")

        self.log_filepath = Path(f"{base_path}/{self.log_filename}").expanduser()
@@ -130,7 +130,7 @@ class InitializeLoggingSupport:
        ]

        for path in paths:
-            result = subprocess.run(["chmod", "777", path], capture_output=True)
+            result = subprocess.run(["/bin/chmod", "777", path], capture_output=True)
            if result.returncode != 0:
                logging.error(f"Failed to fix log file permissions")
                if result.stdout:
@@ -194,6 +194,7 @@ class InitializeLoggingSupport:
        logging.info('#' * str_len)

        logging.info("Log file set:")
+        logging.info(f"  {self.log_filepath}")
        # Display relative path to avoid disclosing user's username
        try:
            path = self.log_filepath.relative_to(Path.home())
@@ -250,7 +251,7 @@ class InitializeLoggingSupport:
                return

            if cant_log is True:
-                subprocess.run(["open", "--reveal", self.log_filepath])
+                subprocess.run(["/usr/bin/open", "--reveal", self.log_filepath])
                return

            threading.Thread(target=analytics_handler.Analytics(self.constants).send_crash_report, args=(self.log_filepath,)).start()
--- a/resources/macos_installer_handler.py
+++ b/resources/macos_installer_handler.py
@@ -108,10 +108,10 @@ class InstallerCreation():
        logging.info(f"Creating temporary directory at {ia_tmp}")
        # Delete all files in tmp_dir
        for file in Path(ia_tmp).glob("*"):
-            subprocess.run(["rm", "-rf", str(file)])
+            subprocess.run(["/bin/rm", "-rf", str(file)])

        # Copy installer to tmp (use CoW to avoid extra disk writes)
-        args = ["cp", "-cR", installer_path, ia_tmp]
+        args = ["/bin/cp", "-cR", installer_path, ia_tmp]
        if utilities.check_filesystem_type() != "apfs":
            # HFS+ disks do not support CoW
            args[1] = "-R"
@@ -179,13 +179,13 @@ fi
        # TODO: AllDisksAndPartitions is not supported in Snow Leopard and older
        try:
            # High Sierra and newer
-            disks = plistlib.loads(subprocess.run("diskutil list -plist physical".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+            disks = plistlib.loads(subprocess.run(["/usr/sbin/diskutil", "list", "-plist", "physical"], stdout=subprocess.PIPE).stdout.decode().strip().encode())
        except ValueError:
            # Sierra and older
-            disks = plistlib.loads(subprocess.run("diskutil list -plist".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+            disks = plistlib.loads(subprocess.run(["/usr/sbin/diskutil", "list", "-plist"], stdout=subprocess.PIPE).stdout.decode().strip().encode())

        for disk in disks["AllDisksAndPartitions"]:
-            disk_info = plistlib.loads(subprocess.run(f"diskutil info -plist {disk['DeviceIdentifier']}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+            disk_info = plistlib.loads(subprocess.run(["/usr/sbin/diskutil", "info", "-plist", disk["DeviceIdentifier"]], stdout=subprocess.PIPE).stdout.decode().strip().encode())
            try:
                all_disks[disk["DeviceIdentifier"]] = {"identifier": disk_info["DeviceNode"], "name": disk_info["MediaName"], "size": disk_info["TotalSize"], "removable": disk_info["Internal"], "partitions": {}}
            except KeyError:
@@ -407,7 +407,7 @@ class RemoteInstallerCatalog:
                })

        available_apps = {k: v for k, v in sorted(available_apps.items(), key=lambda x: x[1]['Version'])}
-        
+
        return available_apps


@@ -623,7 +623,7 @@ class LocalInstallerCatalog:

            output = subprocess.run(
                [
-                    "hdiutil", "attach", "-noverify", sharedsupport_path,
+                    "/usr/bin/hdiutil", "attach", "-noverify", sharedsupport_path,
                    "-mountpoint", tmpdir,
                    "-nobrowse",
                ],
@@ -644,6 +644,6 @@ class LocalInstallerCatalog:
                        detected_os = plist["Assets"][0]["OSVersion"]

            # Unmount SharedSupport.dmg
-            subprocess.run(["hdiutil", "detach", tmpdir], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            subprocess.run(["/usr/bin/hdiutil", "detach", tmpdir], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

        return (detected_build, detected_os)
--- a/resources/os_probe.py
+++ b/resources/os_probe.py
@@ -44,7 +44,7 @@ class OSProbe:
            str: OS version (ex. 12.0)
        """

-        result = subprocess.run(["sw_vers", "-productVersion"], stdout=subprocess.PIPE)
+        result = subprocess.run(["/usr/bin/sw_vers", "-productVersion"], stdout=subprocess.PIPE)
        if result.returncode != 0:
            raise RuntimeError("Failed to detect OS version")

--- a/resources/reroute_payloads.py
+++ b/resources/reroute_payloads.py
@@ -36,7 +36,7 @@ class RoutePayloadDiskImage:
            self._unmount_active_dmgs(unmount_all_active=False)
            output = subprocess.run(
                [
-                    "hdiutil", "attach", "-noverify", f"{self.constants.payload_path_dmg}",
+                    "/usr/bin/hdiutil", "attach", "-noverify", f"{self.constants.payload_path_dmg}",
                    "-mountpoint", Path(self.temp_dir.name / Path("payloads")),
                    "-nobrowse",
                    "-shadow", Path(self.temp_dir.name / Path("payloads_overlay")),
@@ -67,7 +67,7 @@ class RoutePayloadDiskImage:
            unmount_all_active (bool): If True, unmount all active DMGs, otherwise only unmount our own DMG
        """

-        dmg_info = subprocess.run(["hdiutil", "info", "-plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        dmg_info = subprocess.run(["/usr/bin/hdiutil", "info", "-plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
        dmg_info = plistlib.loads(dmg_info.stdout)


@@ -80,12 +80,12 @@ class RoutePayloadDiskImage:
                            if self.temp_dir.name in image["shadow-path"]:
                                logging.info(f"Unmounting personal {variant}")
                                subprocess.run(
-                                    ["hdiutil", "detach", image["system-entities"][0]["dev-entry"], "-force"],
+                                    ["/usr/bin/hdiutil", "detach", image["system-entities"][0]["dev-entry"], "-force"],
                                    stdout=subprocess.PIPE, stderr=subprocess.STDOUT
                                )
                    else:
                        logging.info(f"Unmounting {variant} at: {image['system-entities'][0]['dev-entry']}")
                        subprocess.run(
-                            ["hdiutil", "detach", image["system-entities"][0]["dev-entry"], "-force"],
+                            ["/usr/bin/hdiutil", "detach", image["system-entities"][0]["dev-entry"], "-force"],
                            stdout=subprocess.PIPE, stderr=subprocess.STDOUT
                        )
--- a/resources/sys_patch/sys_patch.py
+++ b/resources/sys_patch/sys_patch.py
@@ -209,7 +209,7 @@ class PatchSysVolume:
        if save_hid_cs is True and cs_path.exists():
            logging.info("- Backing up IOHIDEventDriver CodeSignature")
            # Note it's a folder, not a file
-            utilities.elevated(["cp", "-r", cs_path, f"{self.constants.payload_path}/IOHIDEventDriver_CodeSignature.bak"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            utilities.elevated(["/bin/cp", "-r", cs_path, f"{self.constants.payload_path}/IOHIDEventDriver_CodeSignature.bak"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

        logging.info(f"- Merging KDK with Root Volume: {kdk_path.name}")
        utilities.elevated(
@@ -230,9 +230,9 @@ class PatchSysVolume:
            logging.info("- Restoring IOHIDEventDriver CodeSignature")
            if not cs_path.exists():
                logging.info("  - CodeSignature folder missing, creating")
-                utilities.elevated(["mkdir", "-p", cs_path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-            utilities.elevated(["cp", "-r", f"{self.constants.payload_path}/IOHIDEventDriver_CodeSignature.bak", cs_path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-            utilities.elevated(["rm", "-rf", f"{self.constants.payload_path}/IOHIDEventDriver_CodeSignature.bak"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+                utilities.elevated(["/bin/mkdir", "-p", cs_path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            utilities.elevated(["/bin/cp", "-r", f"{self.constants.payload_path}/IOHIDEventDriver_CodeSignature.bak", cs_path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            utilities.elevated(["/bin/rm", "-rf", f"{self.constants.payload_path}/IOHIDEventDriver_CodeSignature.bak"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)


    def _unpatch_root_vol(self):
@@ -369,7 +369,7 @@ class PatchSysVolume:

        if self.skip_root_kmutil_requirement is True:
            # Force rebuild the Auxiliary KC
-            result = utilities.elevated(["killall", "syspolicyd", "kernelmanagerd"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            result = utilities.elevated(["/usr/bin/killall", "syspolicyd", "kernelmanagerd"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
            if result.returncode != 0:
                logging.info("- Unable to remove kernel extension policy files")
                logging.info(f"\nReason for Patch Failure ({result.returncode}):")
@@ -422,7 +422,7 @@ class PatchSysVolume:
        """
        if self.root_mount_path:
            logging.info("- Unmounting Root Volume (Don't worry if this fails)")
-            utilities.elevated(["diskutil", "unmount", self.root_mount_path], stdout=subprocess.PIPE).stdout.decode().strip().encode()
+            utilities.elevated(["/usr/sbin/diskutil", "unmount", self.root_mount_path], stdout=subprocess.PIPE).stdout.decode().strip().encode()
        else:
            logging.info("- Skipping Root Volume unmount")

@@ -457,11 +457,11 @@ class PatchSysVolume:

        if (Path(self.mount_application_support) / Path("SkyLightPlugins/")).exists():
            logging.info("- Found SkylightPlugins folder, removing old plugins")
-            utilities.process_status(utilities.elevated(["rm", "-Rf", f"{self.mount_application_support}/SkyLightPlugins"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
-            utilities.process_status(utilities.elevated(["mkdir", f"{self.mount_application_support}/SkyLightPlugins"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["/bin/rm", "-Rf", f"{self.mount_application_support}/SkyLightPlugins"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["/bin/mkdir", f"{self.mount_application_support}/SkyLightPlugins"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
        else:
            logging.info("- Creating SkylightPlugins folder")
-            utilities.process_status(utilities.elevated(["mkdir", "-p", f"{self.mount_application_support}/SkyLightPlugins/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["/bin/mkdir", "-p", f"{self.mount_application_support}/SkyLightPlugins/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))


    def _delete_nonmetal_enforcement(self) -> None:
@@ -471,10 +471,10 @@ class PatchSysVolume:
        """

        for arg in ["useMetal", "useIOP"]:
-            result = subprocess.run(["defaults", "read", "/Library/Preferences/com.apple.CoreDisplay", arg], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL).stdout.decode("utf-8").strip()
+            result = subprocess.run(["/usr/bin/defaults", "read", "/Library/Preferences/com.apple.CoreDisplay", arg], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL).stdout.decode("utf-8").strip()
            if result in ["0", "false", "1", "true"]:
                logging.info(f"- Removing non-Metal Enforcement Preference: {arg}")
-                utilities.elevated(["defaults", "delete", "/Library/Preferences/com.apple.CoreDisplay", arg])
+                utilities.elevated(["/usr/bin/defaults", "delete", "/Library/Preferences/com.apple.CoreDisplay", arg])


    def _clean_auxiliary_kc(self) -> None:
@@ -516,15 +516,15 @@ class PatchSysVolume:

        relocation_path = "/Library/Relocated Extensions"
        if not Path(relocation_path).exists():
-            utilities.elevated(["mkdir", relocation_path])
+            utilities.elevated(["/bin/mkdir", relocation_path])

        for file in Path("/Library/Extensions").glob("*.kext"):
            try:
                if datetime.fromtimestamp(file.stat().st_mtime) < datetime(2021, 10, 1):
                    logging.info(f"  - Relocating {file.name} kext to {relocation_path}")
                    if Path(relocation_path) / Path(file.name).exists():
-                        utilities.elevated(["rm", "-Rf", relocation_path / Path(file.name)])
-                    utilities.elevated(["mv", file, relocation_path])
+                        utilities.elevated(["/bin/rm", "-Rf", relocation_path / Path(file.name)])
+                    utilities.elevated(["/bin/mv", file, relocation_path])
            except:
                # Some users have the most cursed /L*/E* folders
                # ex. Symlinks pointing to symlinks pointing to dead files
@@ -545,8 +545,8 @@ class PatchSysVolume:
        if sys_patch_helpers.SysPatchHelpers(self.constants).generate_patchset_plist(patchset, file_name, self.kdk_path):
            logging.info("- Writing patchset information to Root Volume")
            if Path(destination_path_file).exists():
-                utilities.process_status(utilities.elevated(["rm", destination_path_file], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
-            utilities.process_status(utilities.elevated(["cp", f"{self.constants.payload_path}/{file_name}", destination_path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+                utilities.process_status(utilities.elevated(["/bin/rm", destination_path_file], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["/bin/cp", f"{self.constants.payload_path}/{file_name}", destination_path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))


    def _add_auxkc_support(self, install_file: str, source_folder_path: str, install_patch_directory: str, destination_folder_path: str) -> str:
@@ -648,7 +648,10 @@ class PatchSysVolume:
            self._execute_patchset(sys_patch_generate.GenerateRootPatchSets(self.computer.real_model, self.constants, self.hardware_details).patchset)

        if self.constants.wxpython_variant is True and self.constants.detected_os >= os_data.os_data.big_sur:
-            sys_patch_auto.AutomaticSysPatch(self.constants).install_auto_patcher_launch_agent()
+            needs_daemon = False
+            if self.constants.detected_os >= os_data.os_data.ventura and self.skip_root_kmutil_requirement is False:
+                needs_daemon = True
+            sys_patch_auto.AutomaticSysPatch(self.constants).install_auto_patcher_launch_agent(kdk_caching_needed=needs_daemon)

        self._rebuild_root_volume()

@@ -665,12 +668,16 @@ class PatchSysVolume:
        self._preflight_checks(required_patches, source_files_path)
        for patch in required_patches:
            logging.info("- Installing Patchset: " + patch)
-            if "Remove" in required_patches[patch]:
-                for remove_patch_directory in required_patches[patch]["Remove"]:
-                    logging.info("- Remove Files at: " + remove_patch_directory)
-                    for remove_patch_file in required_patches[patch]["Remove"][remove_patch_directory]:
-                        destination_folder_path = str(self.mount_location) + remove_patch_directory
-                        self._remove_file(destination_folder_path, remove_patch_file)
+            for method_remove in ["Remove", "Remove Non-Root"]:
+                if method_remove in required_patches[patch]:
+                    for remove_patch_directory in required_patches[patch][method_remove]:
+                        logging.info("- Remove Files at: " + remove_patch_directory)
+                        for remove_patch_file in required_patches[patch][method_remove][remove_patch_directory]:
+                            if method_remove == "Remove":
+                                destination_folder_path = str(self.mount_location) + remove_patch_directory
+                            else:
+                                destination_folder_path = str(self.mount_location_data) + remove_patch_directory
+                            self._remove_file(destination_folder_path, remove_patch_file)


            for method_install in ["Install", "Install Non-Root"]:
@@ -712,8 +719,6 @@ class PatchSysVolume:
                        utilities.process_status(subprocess.run(process, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True))
        if any(x in required_patches for x in ["AMD Legacy GCN", "AMD Legacy Polaris", "AMD Legacy Vega"]):
            sys_patch_helpers.SysPatchHelpers(self.constants).disable_window_server_caching()
-        if any(x in required_patches for x in ["Intel Ivy Bridge", "Intel Haswell"]):
-            sys_patch_helpers.SysPatchHelpers(self.constants).remove_news_widgets()
        if "Metal 3802 Common Extended" in required_patches:
            sys_patch_helpers.SysPatchHelpers(self.constants).patch_gpu_compiler_libraries(mount_point=self.mount_location)

@@ -787,19 +792,19 @@ class PatchSysVolume:
            # Applicable for .kext, .app, .plugin, .bundle, all of which are directories
            if Path(destination_folder + "/" + file_name).exists():
                logging.info(f"  - Found existing {file_name}, overwriting...")
-                utilities.process_status(utilities.elevated(["rm", "-R", f"{destination_folder}/{file_name}"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+                utilities.process_status(utilities.elevated(["/bin/rm", "-R", f"{destination_folder}/{file_name}"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
            else:
                logging.info(f"  - Installing: {file_name}")
-            utilities.process_status(utilities.elevated(["cp", "-R", f"{source_folder}/{file_name}", destination_folder], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["/bin/cp", "-R", f"{source_folder}/{file_name}", destination_folder], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
            self._fix_permissions(destination_folder + "/" + file_name)
        else:
            # Assume it's an individual file, replace as normal
            if Path(destination_folder + "/" + file_name).exists():
                logging.info(f"  - Found existing {file_name}, overwriting...")
-                utilities.process_status(utilities.elevated(["rm", f"{destination_folder}/{file_name}"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+                utilities.process_status(utilities.elevated(["/bin/rm", f"{destination_folder}/{file_name}"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
            else:
                logging.info(f"  - Installing: {file_name}")
-            utilities.process_status(utilities.elevated(["cp", f"{source_folder}/{file_name}", destination_folder], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["/bin/cp", f"{source_folder}/{file_name}", destination_folder], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
            self._fix_permissions(destination_folder + "/" + file_name)


@@ -815,9 +820,9 @@ class PatchSysVolume:
        if Path(destination_folder + "/" + file_name).exists():
            logging.info(f"  - Removing: {file_name}")
            if Path(destination_folder + "/" + file_name).is_dir():
-                utilities.process_status(utilities.elevated(["rm", "-R", f"{destination_folder}/{file_name}"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+                utilities.process_status(utilities.elevated(["/bin/rm", "-R", f"{destination_folder}/{file_name}"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
            else:
-                utilities.process_status(utilities.elevated(["rm", f"{destination_folder}/{file_name}"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+                utilities.process_status(utilities.elevated(["/bin/rm", f"{destination_folder}/{file_name}"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))


    def _fix_permissions(self, destination_file: Path) -> None:
@@ -852,7 +857,7 @@ class PatchSysVolume:

            output = subprocess.run(
                [
-                    "hdiutil", "attach", "-noverify", f"{self.constants.payload_local_binaries_root_path_dmg}",
+                    "/usr/bin/hdiutil", "attach", "-noverify", f"{self.constants.payload_local_binaries_root_path_dmg}",
                    "-mountpoint", Path(self.constants.payload_path / Path("Universal-Binaries")),
                    "-nobrowse",
                    "-shadow", Path(self.constants.payload_path / Path("Universal-Binaries_overlay")),
@@ -885,7 +890,7 @@ class PatchSysVolume:

                        result = subprocess.run(
                            [
-                                "hdiutil", "attach", "-noverify", f"{self.constants.overlay_psp_path_dmg}",
+                                "/usr/bin/hdiutil", "attach", "-noverify", f"{self.constants.overlay_psp_path_dmg}",
                                "-mountpoint", Path(self.constants.payload_path / Path("DortaniaInternal")),
                                "-nobrowse",
                                "-passphrase", password
@@ -896,7 +901,7 @@ class PatchSysVolume:
                            logging.info("- Mounted DortaniaInternal resources")
                            result = subprocess.run(
                                [
-                                    "ditto", f"{self.constants.payload_path / Path('DortaniaInternal')}", f"{self.constants.payload_path / Path('Universal-Binaries')}"
+                                    "/usr/bin/ditto", f"{self.constants.payload_path / Path('DortaniaInternal')}", f"{self.constants.payload_path / Path('Universal-Binaries')}"
                                ],
                                stdout=subprocess.PIPE, stderr=subprocess.STDOUT
                            )
--- a/resources/sys_patch/sys_patch_auto.py
+++ b/resources/sys_patch/sys_patch_auto.py
@@ -1,17 +1,23 @@
 # Copyright (C) 2022, Mykola Grymalyuk
+# Copyright (c) 2023 Jazzzny

 import wx
+import wx.html2
+import requests
+import markdown2
 import logging
 import plistlib
 import subprocess
 import webbrowser
+import hashlib

 from pathlib import Path


 from resources import utilities, updates, global_settings, network_handler, constants
 from resources.sys_patch import sys_patch_detect
-from resources.wx_gui import gui_entry
+from resources.wx_gui import gui_entry, gui_support
+from data import css_data


 class AutomaticSysPatch:
@@ -51,19 +57,77 @@ class AutomaticSysPatch:
            logging.info(f"- Found new version: {version}")

            app = wx.App()
-            frame = wx.Frame(None, -1, "OpenCore Legacy Patcher")
-            dialog = wx.MessageDialog(
-                parent=frame,
-                message=f"Current Version: {self.constants.patcher_version}{' (Nightly)' if not self.constants.commit_info[0].startswith('refs/tags') else ''}\nNew version: {version}\nWould you like to update?",
-                caption="Update Available for OpenCore Legacy Patcher!",
-                style=wx.YES_NO | wx.CANCEL | wx.ICON_QUESTION
-            )
-            dialog.SetYesNoCancelLabels("Download and install", "View on Github", "Ignore")
-            response = dialog.ShowModal()
-            if response == wx.ID_YES:
-                gui_entry.EntryPoint(self.constants).start(entry=gui_entry.SupportedEntryPoints.UPDATE_APP)
-            elif response == wx.ID_NO:
+            mainframe = wx.Frame(None, -1, "OpenCore Legacy Patcher")
+
+            ID_GITHUB = wx.NewId()
+            ID_UPDATE = wx.NewId()
+
+            url = "https://api.github.com/repos/dortania/OpenCore-Legacy-Patcher/releases/latest"
+            response = requests.get(url).json()
+            try:
+                changelog = response["body"].split("## Asset Information")[0]
+            except: #if user constantly checks for updates, github will rate limit them
+                changelog = """## Unable to fetch changelog
+
+Please check the Github page for more information about this release."""
+
+            html_markdown = markdown2.markdown(changelog, extras=["tables"])
+            html_css = css_data.updater_css
+            frame = wx.Dialog(None, -1, title="", size=(650, 500))
+            frame.SetMinSize((650, 500))
+            frame.SetWindowStyle(wx.STAY_ON_TOP)
+            panel = wx.Panel(frame)
+            sizer = wx.BoxSizer(wx.VERTICAL)
+            sizer.AddSpacer(10)
+            self.title_text = wx.StaticText(panel, label="A new version of OpenCore Legacy Patcher is available!")
+            self.description = wx.StaticText(panel, label=f"OpenCore Legacy Patcher {version} is now available - You have {self.constants.patcher_version}{' (Nightly)' if not self.constants.commit_info[0].startswith('refs/tags') else ''}. Would you like to update?")
+            self.title_text.SetFont(gui_support.font_factory(19, wx.FONTWEIGHT_BOLD))
+            self.description.SetFont(gui_support.font_factory(13, wx.FONTWEIGHT_NORMAL))
+            self.web_view = wx.html2.WebView.New(panel, style=wx.BORDER_SUNKEN)
+            html_code = f'''
+<html>
+    <head>
+        <style>
+            {html_css}
+        </style>
+    </head>
+    <body class="markdown-body">
+        {html_markdown.replace("<a href=", "<a target='_blank' href=")}
+    </body>
+</html>
+'''
+            self.web_view.SetPage(html_code, "")
+            self.web_view.Bind(wx.html2.EVT_WEBVIEW_NEWWINDOW, self._onWebviewNav)
+            self.web_view.EnableContextMenu(False)
+            self.close_button = wx.Button(panel, label="Ignore")
+            self.close_button.Bind(wx.EVT_BUTTON, lambda event: frame.EndModal(wx.ID_CANCEL))
+            self.view_button = wx.Button(panel, ID_GITHUB, label="View on GitHub")
+            self.view_button.Bind(wx.EVT_BUTTON, lambda event: frame.EndModal(ID_GITHUB))
+            self.install_button = wx.Button(panel, label="Download and Install")
+            self.install_button.Bind(wx.EVT_BUTTON, lambda event: frame.EndModal(ID_UPDATE))
+            self.install_button.SetDefault()
+
+            buttonsizer = wx.BoxSizer(wx.HORIZONTAL)
+            buttonsizer.Add(self.close_button, 0, wx.ALIGN_CENTRE | wx.RIGHT, 5)
+            buttonsizer.Add(self.view_button, 0, wx.ALIGN_CENTRE | wx.LEFT|wx.RIGHT, 5)
+            buttonsizer.Add(self.install_button, 0, wx.ALIGN_CENTRE | wx.LEFT, 5)
+            sizer = wx.BoxSizer(wx.VERTICAL)
+            sizer.Add(self.title_text, 0, wx.ALIGN_CENTRE | wx.TOP, 20)
+            sizer.Add(self.description, 0, wx.ALIGN_CENTRE | wx.BOTTOM, 20)
+            sizer.Add(self.web_view, 1, wx.EXPAND | wx.LEFT|wx.RIGHT, 10)
+            sizer.Add(buttonsizer, 0, wx.ALIGN_RIGHT | wx.ALL, 20)
+            panel.SetSizer(sizer)
+            frame.Centre()
+
+            result = frame.ShowModal()
+
+
+            if result == ID_GITHUB:
                webbrowser.open(dict["Github Link"])
+            elif result == ID_UPDATE:
+                gui_entry.EntryPoint(self.constants).start(entry=gui_entry.SupportedEntryPoints.UPDATE_APP)
+
+
            return

        if utilities.check_seal() is True:
@@ -94,7 +158,7 @@ class AutomaticSysPatch:
                    warning_str = f"""\n\nWARNING: We're unable to verify whether there are any new releases of OpenCore Legacy Patcher on Github. Be aware that you may be using an outdated version for this OS. If you're unsure, verify on Github that OpenCore Legacy Patcher {self.constants.patcher_version} is the latest official release"""

                args = [
-                    "osascript",
+                    "/usr/bin/osascript",
                    "-e",
                    f"""display dialog "OpenCore Legacy Patcher has detected you're running without Root Patches, and would like to install them.\n\nmacOS wipes all root patches during OS installs and updates, so they need to be reinstalled.\n\nFollowing Patches have been detected for your system: \n{patch_string}\nWould you like to apply these patches?{warning_str}" """
                    f'with icon POSIX file "{self.constants.app_icon_path}"',
@@ -106,7 +170,7 @@ class AutomaticSysPatch:
                )
                if output.returncode == 0:
                    args = [
-                        "osascript",
+                        "/usr/bin/osascript",
                        "-e",
                        f'''do shell script "{args_string}"'''
                        f' with prompt "OpenCore Legacy Patcher would like to patch your root volume"'
@@ -127,6 +191,9 @@ class AutomaticSysPatch:
        if self._determine_if_versions_match():
            self._determine_if_boot_matches()

+    def _onWebviewNav(self, event):
+        url = event.GetURL()
+        webbrowser.open(url)

    def _determine_if_versions_match(self):
        """
@@ -159,7 +226,7 @@ class AutomaticSysPatch:
            return True

        args = [
-            "osascript",
+            "/usr/bin/osascript",
            "-e",
            f"""display dialog "OpenCore Legacy Patcher has detected that you are booting {'a different' if self.constants.special_build else 'an outdated'} OpenCore build\n- Booted: {self.constants.computer.oclp_version}\n- Installed: {self.constants.patcher_version}\n\nWould you like to update the OpenCore bootloader?" """
            f'with icon POSIX file "{self.constants.app_icon_path}"',
@@ -225,7 +292,7 @@ class AutomaticSysPatch:
        # Check if OpenCore is on a USB drive
        logging.info("- Boot Drive does not match macOS drive, checking if OpenCore is on a USB drive")

-        disk_info = plistlib.loads(subprocess.run(["diskutil", "info", "-plist", root_disk], stdout=subprocess.PIPE).stdout)
+        disk_info = plistlib.loads(subprocess.run(["/usr/sbin/diskutil", "info", "-plist", root_disk], stdout=subprocess.PIPE).stdout)
        try:
            if disk_info["Ejectable"] is False:
                logging.info("- Boot Disk is not removable, skipping prompt")
@@ -234,7 +301,7 @@ class AutomaticSysPatch:
            logging.info("- Boot Disk is ejectable, prompting user to install to internal")

            args = [
-                "osascript",
+                "/usr/bin/osascript",
                "-e",
                f"""display dialog "OpenCore Legacy Patcher has detected that you are booting OpenCore from an USB or External drive.\n\nIf you would like to boot your Mac normally without a USB drive plugged in, you can install OpenCore to the internal hard drive.\n\nWould you like to launch OpenCore Legacy Patcher and install to disk?" """
                f'with icon POSIX file "{self.constants.app_icon_path}"',
@@ -253,7 +320,7 @@ class AutomaticSysPatch:
            logging.info("- Unable to determine if boot disk is removable, skipping prompt")


-    def install_auto_patcher_launch_agent(self):
+    def install_auto_patcher_launch_agent(self, kdk_caching_needed: bool = False):
        """
        Install the Auto Patcher Launch Agent

@@ -268,8 +335,34 @@ class AutomaticSysPatch:
            logging.info("- Skipping Auto Patcher Launch Agent, not supported when running from source")
            return

+        services = {
+            self.constants.auto_patch_launch_agent_path:        "/Library/LaunchAgents/com.dortania.opencore-legacy-patcher.auto-patch.plist",
+            self.constants.update_launch_daemon_path:           "/Library/LaunchDaemons/com.dortania.opencore-legacy-patcher.macos-update.plist",
+            **({ self.constants.rsr_monitor_launch_daemon_path: "/Library/LaunchDaemons/com.dortania.opencore-legacy-patcher.rsr-monitor.plist" } if self._create_rsr_monitor_daemon() else {}),
+            **({ self.constants.kdk_launch_daemon_path:         "/Library/LaunchDaemons/com.dortania.opencore-legacy-patcher.os-caching.plist" } if kdk_caching_needed is True else {} ),
+        }
+
+        for service in services:
+            name = Path(service).name
+            logging.info(f"- Installing {name}")
+            if Path(services[service]).exists():
+                if hashlib.sha256(open(service, "rb").read()).hexdigest() == hashlib.sha256(open(services[service], "rb").read()).hexdigest():
+                    logging.info(f"  - {name} checksums match, skipping")
+                    continue
+                logging.info(f"  - Existing service found, removing")
+                utilities.process_status(utilities.elevated(["/bin/rm", services[service]], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            # Create parent directories
+            if not Path(services[service]).parent.exists():
+                logging.info(f"  - Creating {Path(services[service]).parent} directory")
+                utilities.process_status(utilities.elevated(["/bin/mkdir", "-p", Path(services[service]).parent], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["/bin/cp", service, services[service]], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+
+            # Set the permissions on the service
+            utilities.process_status(utilities.elevated(["chmod", "644", services[service]], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["chown", "root:wheel", services[service]], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+
        if self.constants.launcher_binary.startswith("/Library/Application Support/Dortania/"):
-            logging.info("- Skipping Auto Patcher Launch Agent, already installed")
+            logging.info("- Skipping Patcher Install, already installed")
            return

        # Verify our binary isn't located in '/Library/Application Support/Dortania/'
@@ -278,64 +371,33 @@ class AutomaticSysPatch:

        if not Path("Library/Application Support/Dortania").exists():
            logging.info("- Creating /Library/Application Support/Dortania/")
-            utilities.process_status(utilities.elevated(["mkdir", "-p", "/Library/Application Support/Dortania"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["/bin/mkdir", "-p", "/Library/Application Support/Dortania"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))

        logging.info("- Copying OpenCore Patcher to /Library/Application Support/Dortania/")
        if Path("/Library/Application Support/Dortania/OpenCore-Patcher.app").exists():
            logging.info("- Deleting existing OpenCore-Patcher")
-            utilities.process_status(utilities.elevated(["rm", "-R", "/Library/Application Support/Dortania/OpenCore-Patcher.app"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["/bin/rm", "-R", "/Library/Application Support/Dortania/OpenCore-Patcher.app"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))

        # Strip everything after OpenCore-Patcher.app
        path = str(self.constants.launcher_binary).split("/Contents/MacOS/OpenCore-Patcher")[0]
        logging.info(f"- Copying {path} to /Library/Application Support/Dortania/")
-        utilities.process_status(utilities.elevated(["ditto", path, "/Library/Application Support/Dortania/OpenCore-Patcher.app"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+        utilities.process_status(utilities.elevated(["/usr/bin/ditto", path, "/Library/Application Support/Dortania/OpenCore-Patcher.app"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))

        if not Path("/Library/Application Support/Dortania/OpenCore-Patcher.app").exists():
            # Sometimes the binary the user launches may have a suffix (ie. OpenCore-Patcher 3.app)
            # We'll want to rename it to OpenCore-Patcher.app
            path = path.split("/")[-1]
            logging.info(f"- Renaming {path} to OpenCore-Patcher.app")
-            utilities.process_status(utilities.elevated(["mv", f"/Library/Application Support/Dortania/{path}", "/Library/Application Support/Dortania/OpenCore-Patcher.app"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["/bin/mv", f"/Library/Application Support/Dortania/{path}", "/Library/Application Support/Dortania/OpenCore-Patcher.app"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))

-        subprocess.run(["xattr", "-cr", "/Library/Application Support/Dortania/OpenCore-Patcher.app"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-        # Copy over our launch agent
-        logging.info("- Copying auto-patch.plist Launch Agent to /Library/LaunchAgents/")
-        if Path("/Library/LaunchAgents/com.dortania.opencore-legacy-patcher.auto-patch.plist").exists():
-            logging.info("- Deleting existing auto-patch.plist")
-            utilities.process_status(utilities.elevated(["rm", "/Library/LaunchAgents/com.dortania.opencore-legacy-patcher.auto-patch.plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
-        if not Path("/Library/LaunchAgents/").exists():
-            logging.info("- Creating /Library/LaunchAgents/")
-            utilities.process_status(utilities.elevated(["mkdir", "-p", "/Library/LaunchAgents/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
-        utilities.process_status(utilities.elevated(["cp", self.constants.auto_patch_launch_agent_path, "/Library/LaunchAgents/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
-
-        # Set the permissions on the com.dortania.opencore-legacy-patcher.auto-patch.plist
-        logging.info("- Setting permissions on auto-patch.plist")
-        utilities.process_status(utilities.elevated(["chmod", "644", "/Library/LaunchAgents/com.dortania.opencore-legacy-patcher.auto-patch.plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
-        utilities.process_status(utilities.elevated(["chown", "root:wheel", "/Library/LaunchAgents/com.dortania.opencore-legacy-patcher.auto-patch.plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
-
-        # Copy over our launch daemon
-        if self._create_rsr_monitor_daemon() is True:
-            logging.info("- Copying rsr-monitor.plist Launch Daemon to /Library/LaunchDaemons/")
-            if Path("/Library/LaunchDaemons/com.dortania.opencore-legacy-patcher.rsr-monitor.plist").exists():
-                logging.info("- Deleting existing rsr-monitor.plist")
-                utilities.process_status(utilities.elevated(["rm", "/Library/LaunchDaemons/com.dortania.opencore-legacy-patcher.rsr-monitor.plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
-            if not Path("/Library/LaunchDaemons/").exists():
-                logging.info("- Creating /Library/LaunchDaemons/")
-                utilities.process_status(utilities.elevated(["mkdir", "-p", "/Library/LaunchDaemons/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
-            utilities.process_status(utilities.elevated(["cp", self.constants.rsr_monitor_launch_daemon_path, "/Library/LaunchDaemons/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
-
-            # Set the permissions on the com.dortania.opencore-legacy-patcher.rsr-monitor.plist
-            logging.info("- Setting permissions on rsr-monitor.plist")
-            utilities.process_status(utilities.elevated(["chmod", "644", "/Library/LaunchDaemons/com.dortania.opencore-legacy-patcher.rsr-monitor.plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
-            utilities.process_status(utilities.elevated(["chown", "root:wheel", "/Library/LaunchDaemons/com.dortania.opencore-legacy-patcher.rsr-monitor.plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+        subprocess.run(["/usr/bin/xattr", "-cr", "/Library/Application Support/Dortania/OpenCore-Patcher.app"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)

        # Making app alias
        # Simply an easy way for users to notice the app
        # If there's already an alias or exiting app, skip
        if not Path("/Applications/OpenCore-Patcher.app").exists():
            logging.info("- Making app alias")
-            utilities.process_status(utilities.elevated(["ln", "-s", "/Library/Application Support/Dortania/OpenCore-Patcher.app", "/Applications/OpenCore-Patcher.app"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["/bin/ln", "-s", "/Library/Application Support/Dortania/OpenCore-Patcher.app", "/Applications/OpenCore-Patcher.app"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))


    def _create_rsr_monitor_daemon(self) -> bool:
@@ -370,7 +432,7 @@ class AutomaticSysPatch:
        # Load the RSRMonitor plist
        rsr_monitor_plist = plistlib.load(open(self.constants.rsr_monitor_launch_daemon_path, "rb"))

-        arguments = ["rm", "-Rfv"]
+        arguments = ["/bin/rm", "-Rfv"]
        arguments += [f"/Library/Extensions/{kext}" for kext in kexts]

        # Add the arguments to the RSRMonitor plist
--- a/resources/sys_patch/sys_patch_detect.py
+++ b/resources/sys_patch/sys_patch_detect.py
@@ -20,10 +20,27 @@ class DetectRootPatch:
    Library for querying root volume patches applicable for booted system
    """

-    def __init__(self, model: str, global_constants: constants.Constants):
+    def __init__(self, model: str, global_constants: constants.Constants,
+                 os_major: int = None, os_minor: int = None,
+                 os_build: str = None, os_version: str = None
+        ) -> None:
+
        self.model: str = model

        self.constants: constants.Constants = global_constants
+        if os_major is None:
+            os_major = self.constants.detected_os
+        if os_minor is None:
+            os_minor = self.constants.detected_os_minor
+        if os_build is None:
+            os_build = self.constants.detected_os_build
+        if os_version is None:
+            os_version = self.constants.detected_os_version
+
+        self.os_major:   int = os_major
+        self.os_minor:   int = os_minor
+        self.os_build:   str = os_build
+        self.os_version: str = os_version

        self.computer = self.constants.computer

@@ -53,6 +70,7 @@ class DetectRootPatch:
        self.legacy_keyboard_backlight = False
        self.legacy_uhci_ohci          = False
        self.legacy_pcie_webcam        = False
+        self.legacy_t1_chip            = False

        # Patch Requirements
        self.amfi_must_disable   = False
@@ -88,7 +106,7 @@ class DetectRootPatch:
            if gpu.class_code and gpu.class_code != 0xFFFFFFFF:
                logging.info(f"Found GPU ({i}): {utilities.friendly_hex(gpu.vendor_id)}:{utilities.friendly_hex(gpu.device_id)}")
                if gpu.arch in [device_probe.NVIDIA.Archs.Tesla] and self.constants.force_nv_web is False:
-                    if self.constants.detected_os > non_metal_os:
+                    if self.os_major > non_metal_os:
                        self.nvidia_tesla = True
                        self.amfi_must_disable = True
                        if os_data.os_data.ventura in self.constants.legacy_accel_support:
@@ -96,24 +114,24 @@ class DetectRootPatch:
                        self.legacy_keyboard_backlight = self._check_legacy_keyboard_backlight()
                        self.requires_root_kc = True
                elif gpu.arch == device_probe.NVIDIA.Archs.Kepler and self.constants.force_nv_web is False:
-                    if self.constants.detected_os > os_data.os_data.big_sur:
+                    if self.os_major > os_data.os_data.big_sur:
                        # Kepler drivers were dropped with Beta 7
                        # 12.0 Beta 5: 21.0.0 - 21A5304g
                        # 12.0 Beta 6: 21.1.0 - 21A5506j
                        # 12.0 Beta 7: 21.1.0 - 21A5522h
                        if (
-                            self.constants.detected_os >= os_data.os_data.ventura or
+                            self.os_major >= os_data.os_data.ventura or
                            (
-                                "21A5506j" not in self.constants.detected_os_build and
-                                self.constants.detected_os == os_data.os_data.monterey and
-                                self.constants.detected_os_minor > 0
+                                "21A5506j" not in self.os_build and
+                                self.os_major == os_data.os_data.monterey and
+                                self.os_minor > 0
                            )
                        ):
                            self.kepler_gpu = True
                            self.supports_metal = True
-                            if self.constants.detected_os >= os_data.os_data.ventura:
+                            if self.os_major >= os_data.os_data.ventura:
                                self.amfi_must_disable = True
-                                if (self.constants.detected_os == os_data.os_data.ventura and self.constants.detected_os_minor >= 4) or self.constants.detected_os > os_data.os_data.ventura:
+                                if (self.os_major == os_data.os_data.ventura and self.os_minor >= 4) or self.os_major > os_data.os_data.ventura:
                                    self.amfi_shim_bins = True
                elif gpu.arch in [
                    device_probe.NVIDIA.Archs.Fermi,
@@ -121,7 +139,7 @@ class DetectRootPatch:
                    device_probe.NVIDIA.Archs.Maxwell,
                    device_probe.NVIDIA.Archs.Pascal,
                ]:
-                    if self.constants.detected_os > os_data.os_data.mojave:
+                    if self.os_major > os_data.os_data.mojave:
                        self.nvidia_web = True
                        self.amfi_must_disable = True
                        if os_data.os_data.ventura in self.constants.legacy_accel_support:
@@ -129,14 +147,14 @@ class DetectRootPatch:
                        self.needs_nv_web_checks = True
                        self.requires_root_kc = True
                elif gpu.arch == device_probe.AMD.Archs.TeraScale_1:
-                    if self.constants.detected_os > non_metal_os:
+                    if self.os_major > non_metal_os:
                        self.amd_ts1 = True
                        self.amfi_must_disable = True
                        if os_data.os_data.ventura in self.constants.legacy_accel_support:
                            self.amfi_shim_bins = True
                        self.requires_root_kc = True
                elif gpu.arch == device_probe.AMD.Archs.TeraScale_2:
-                    if self.constants.detected_os > non_metal_os:
+                    if self.os_major > non_metal_os:
                        self.amd_ts2 = True
                        self.amfi_must_disable = True
                        if os_data.os_data.ventura in self.constants.legacy_accel_support:
@@ -148,7 +166,7 @@ class DetectRootPatch:
                    device_probe.AMD.Archs.Legacy_GCN_9000,
                    device_probe.AMD.Archs.Polaris,
                ]:
-                    if self.constants.detected_os > os_data.os_data.monterey:
+                    if self.os_major > os_data.os_data.monterey:
                        if self.constants.computer.rosetta_active is True:
                            continue

@@ -170,7 +188,7 @@ class DetectRootPatch:
                                if self.model == "MacBookPro13,3":
                                    self.legacy_gcn = True
                                elif self.model == "MacBookPro14,3":
-                                    if self.constants.detected_os < os_data.os_data.sonoma:
+                                    if self.os_major < os_data.os_data.sonoma:
                                        continue
                                    self.legacy_gcn_v2 = True
                        else:
@@ -179,7 +197,7 @@ class DetectRootPatch:
                        self.requires_root_kc = True
                        self.amfi_must_disable = True
                elif gpu.arch == device_probe.AMD.Archs.Vega:
-                     if self.constants.detected_os > os_data.os_data.monterey:
+                     if self.os_major > os_data.os_data.monterey:
                        if "AVX2" in self.constants.computer.cpu.leafs:
                            continue

@@ -188,7 +206,7 @@ class DetectRootPatch:
                        self.requires_root_kc = True
                        self.amfi_must_disable = True
                elif gpu.arch == device_probe.Intel.Archs.Iron_Lake:
-                    if self.constants.detected_os > non_metal_os:
+                    if self.os_major > non_metal_os:
                        self.iron_gpu = True
                        self.amfi_must_disable = True
                        if os_data.os_data.ventura in self.constants.legacy_accel_support:
@@ -196,7 +214,7 @@ class DetectRootPatch:
                        self.legacy_keyboard_backlight = self._check_legacy_keyboard_backlight()
                        self.requires_root_kc = True
                elif gpu.arch == device_probe.Intel.Archs.Sandy_Bridge:
-                    if self.constants.detected_os > non_metal_os:
+                    if self.os_major > non_metal_os:
                        self.sandy_gpu = True
                        self.amfi_must_disable = True
                        if os_data.os_data.ventura in self.constants.legacy_accel_support:
@@ -204,33 +222,31 @@ class DetectRootPatch:
                        self.legacy_keyboard_backlight = self._check_legacy_keyboard_backlight()
                        self.requires_root_kc = True
                elif gpu.arch == device_probe.Intel.Archs.Ivy_Bridge:
-                    if self.constants.detected_os > os_data.os_data.big_sur:
+                    if self.os_major > os_data.os_data.big_sur:
                        self.ivy_gpu = True
-                        if self.constants.detected_os >= os_data.os_data.ventura:
+                        if self.os_major >= os_data.os_data.ventura:
                            self.amfi_must_disable = True
-                            if (self.constants.detected_os == os_data.os_data.ventura and self.constants.detected_os_minor >= 4) or self.constants.detected_os > os_data.os_data.ventura:
+                            if (self.os_major == os_data.os_data.ventura and self.os_minor >= 4) or self.os_major > os_data.os_data.ventura:
                                self.amfi_shim_bins = True
                        self.supports_metal = True
                elif gpu.arch == device_probe.Intel.Archs.Haswell:
-                    if self.constants.detected_os > os_data.os_data.monterey:
+                    if self.os_major > os_data.os_data.monterey:
                        self.haswell_gpu = True
                        self.amfi_must_disable = True
-                        if (self.constants.detected_os == os_data.os_data.ventura and self.constants.detected_os_minor >= 4) or self.constants.detected_os > os_data.os_data.ventura:
+                        if (self.os_major == os_data.os_data.ventura and self.os_minor >= 4) or self.os_major > os_data.os_data.ventura:
                            self.amfi_shim_bins = True
                        self.supports_metal = True
                elif gpu.arch == device_probe.Intel.Archs.Broadwell:
-                    if self.constants.detected_os > os_data.os_data.monterey:
+                    if self.os_major > os_data.os_data.monterey:
                        self.broadwell_gpu = True
                        self.amfi_must_disable = True
                        self.supports_metal = True
                elif gpu.arch == device_probe.Intel.Archs.Skylake:
-                    if self.constants.detected_os > os_data.os_data.monterey:
+                    if self.os_major > os_data.os_data.monterey:
                        self.skylake_gpu = True
                        self.amfi_must_disable = True
                        self.supports_metal = True

-
-
        if self.supports_metal is True:
            # Avoid patching Metal and non-Metal GPUs if both present, prioritize Metal GPU
            # Main concerns are for iMac12,x with Sandy iGPU and Kepler dGPU
@@ -250,7 +266,7 @@ class DetectRootPatch:
            self.legacy_polaris = False
            self.legacy_vega = False

-        if self.constants.detected_os <= os_data.os_data.monterey:
+        if self.os_major <= os_data.os_data.monterey:
            # Always assume Root KC requirement on Monterey and older
            self.requires_root_kc = True
        else:
@@ -271,7 +287,7 @@ class DetectRootPatch:
        """

        # Increase OS check if modern wifi is detected
-        if self.constants.detected_os < (os_data.os_data.ventura if self.legacy_wifi is True else os_data.os_data.sonoma):
+        if self.os_major < (os_data.os_data.ventura if self.legacy_wifi is True else os_data.os_data.sonoma):
            return
        if self.legacy_wifi is False and self.modern_wifi is False:
            return
@@ -312,7 +328,7 @@ class DetectRootPatch:
        self.legacy_keyboard_backlight = False

        # Currently all graphics patches require a KDK
-        if self.constants.detected_os >= os_data.os_data.sonoma:
+        if self.os_major >= os_data.os_data.sonoma:
            self.kepler_gpu     = False
            self.ivy_gpu        = False
            self.haswell_gpu    = False
@@ -441,7 +457,7 @@ class DetectRootPatch:
        """
        min_os = os_data.os_data.big_sur
        max_os = os_data.os_data.sonoma
-        if self.constants.detected_os < min_os or self.constants.detected_os > max_os:
+        if self.os_major < min_os or self.os_major > max_os:
            return False
        return True

@@ -454,7 +470,7 @@ class DetectRootPatch:
            bool: True if installed, False otherwise
        """

-        return kdk_handler.KernelDebugKitObject(self.constants, self.constants.detected_os_build, self.constants.detected_os_version, passive=True).kdk_already_installed
+        return kdk_handler.KernelDebugKitObject(self.constants, self.os_build, self.os_version, passive=True).kdk_already_installed


    def _check_sip(self):
@@ -465,14 +481,14 @@ class DetectRootPatch:
            tuple: (list, str, str) of SIP values, SIP hex, SIP error message
        """

-        if self.constants.detected_os > os_data.os_data.catalina:
+        if self.os_major > os_data.os_data.catalina:
            if self.nvidia_web is True:
                sip = sip_data.system_integrity_protection.root_patch_sip_big_sur_3rd_part_kexts
                sip_hex = "0xA03"
                sip_value = (
                    f"For Hackintoshes, please set csr-active-config to '030A0000' ({sip_hex})\nFor non-OpenCore Macs, please run 'csrutil disable' and \n'csrutil authenticated-root disable' in RecoveryOS"
                )
-            elif self.constants.detected_os >= os_data.os_data.ventura:
+            elif self.os_major >= os_data.os_data.ventura:
                sip = sip_data.system_integrity_protection.root_patch_sip_ventura
                sip_hex = "0x803"
                sip_value = (
@@ -499,7 +515,7 @@ class DetectRootPatch:
            bool: True if UHCI/OHCI patches required, False otherwise
        """

-        if self.constants.detected_os < os_data.os_data.ventura:
+        if self.os_major < os_data.os_data.ventura:
            return False

        # If we're on a hackintosh, check for UHCI/OHCI controllers
@@ -538,33 +554,37 @@ class DetectRootPatch:

        self.has_network = network_handler.NetworkUtilities().verify_network_connection()

-        if self.constants.detected_os >= os_data.os_data.sonoma:
+        if self.os_major >= os_data.os_data.sonoma:
            self.legacy_pcie_webcam = self.constants.computer.pcie_webcam
+            self.legacy_t1_chip = self.constants.computer.t1_chip
+
+            if self.legacy_t1_chip is True:
+                self.amfi_must_disable = True

        if self._check_uhci_ohci() is True:
            self.legacy_uhci_ohci = True
            self.requires_root_kc = True

        if self.model in model_array.LegacyBrightness:
-            if self.constants.detected_os > os_data.os_data.catalina:
+            if self.os_major > os_data.os_data.catalina:
                self.brightness_legacy = True

        if self.model in ["iMac7,1", "iMac8,1"] or (self.model in model_array.LegacyAudio and utilities.check_kext_loaded("as.vit9696.AppleALC") is False):
            # Special hack for systems with botched GOPs
            # TL;DR: No Boot Screen breaks Lilu, therefore breaking audio
-            if self.constants.detected_os > os_data.os_data.catalina:
+            if self.os_major > os_data.os_data.catalina:
                self.legacy_audio = True

        if (
            isinstance(self.constants.computer.wifi, device_probe.Broadcom)
            and self.constants.computer.wifi.chipset in [device_probe.Broadcom.Chipsets.AirPortBrcm4331, device_probe.Broadcom.Chipsets.AirPortBrcm43224]
        ) or (isinstance(self.constants.computer.wifi, device_probe.Atheros) and self.constants.computer.wifi.chipset == device_probe.Atheros.Chipsets.AirPortAtheros40):
-            if self.constants.detected_os > os_data.os_data.big_sur:
+            if self.os_major > os_data.os_data.big_sur:
                self.legacy_wifi = True
-                if self.constants.detected_os >= os_data.os_data.ventura:
+                if self.os_major >= os_data.os_data.ventura:
                    # Due to extracted frameworks for IO80211.framework and co, check library validation
                    self.amfi_must_disable = True
-                    if self.constants.detected_os > os_data.os_data.ventura:
+                    if self.os_major > os_data.os_data.ventura:
                        self.amfi_shim_bins = True

        if (
@@ -575,7 +595,7 @@ class DetectRootPatch:
                # We don't officially support this chipset, however we'll throw a bone to hackintosh users
                device_probe.Broadcom.Chipsets.AirPortBrcmNICThirdParty,
            ]):
-            if self.constants.detected_os > os_data.os_data.ventura:
+            if self.os_major > os_data.os_data.ventura:
                self.modern_wifi = True
                self.amfi_shim_bins = True

@@ -585,7 +605,7 @@ class DetectRootPatch:
            # Same method is also used for demuxed machines
            # Note that MacBookPro5,x machines are extremely unstable with this patch set, so disabled until investigated further
            # Ref: https://github.com/dortania/OpenCore-Legacy-Patcher/files/7360909/KP-b10-030.txt
-            if self.constants.detected_os > os_data.os_data.high_sierra:
+            if self.os_major > os_data.os_data.high_sierra:
                if self.model in ["MacBookPro8,2", "MacBookPro8,3"]:
                    # Ref: https://doslabelectronics.com/Demux.html
                    if self._detect_demux() is True:
@@ -622,9 +642,10 @@ class DetectRootPatch:
            "Miscellaneous: Legacy Keyboard Backlight":    self.legacy_keyboard_backlight,
            "Miscellaneous: Legacy USB 1.1":               self.legacy_uhci_ohci,
            "Miscellaneous: PCIe FaceTime Camera":         self.legacy_pcie_webcam,
+            "Miscellaneous: T1 Security Chip":             self.legacy_t1_chip,
            "Settings: Requires AMFI exemption":           self.amfi_must_disable,
            "Settings: Supports Auxiliary Cache":          not self.requires_root_kc,
-            "Settings: Kernel Debug Kit missing":          self.missing_kdk if self.constants.detected_os >= os_data.os_data.ventura.value else False,
+            "Settings: Kernel Debug Kit missing":          self.missing_kdk if self.os_major >= os_data.os_data.ventura.value else False,
            "Validation: Patching Possible":               self.verify_patch_allowed(),
            "Validation: Unpatching Possible":             self._verify_unpatch_allowed(),
            f"Validation: Unsupported Host OS":            self.unsupported_os,
@@ -638,7 +659,7 @@ class DetectRootPatch:
            "Validation: Force OpenGL property missing":   self.missing_nv_web_opengl  if self.nvidia_web is True else False,
            "Validation: Force compat property missing":   self.missing_nv_compat      if self.nvidia_web is True else False,
            "Validation: nvda_drv(_vrl) variable missing": self.missing_nv_web_nvram   if self.nvidia_web is True else False,
-            "Validation: Network Connection Required":     (not self.has_network) if (self.requires_root_kc and self.missing_kdk and self.constants.detected_os >= os_data.os_data.ventura.value) else False,
+            "Validation: Network Connection Required":     (not self.has_network) if (self.requires_root_kc and self.missing_kdk and self.os_major >= os_data.os_data.ventura.value) else False,
        }

        return self.root_patch_dict
@@ -655,7 +676,7 @@ class DetectRootPatch:
        if self.amfi_must_disable is False:
            return amfi_detect.AmfiConfigDetectLevel.NO_CHECK

-        if self.constants.detected_os < os_data.os_data.big_sur:
+        if self.os_major < os_data.os_data.big_sur:
            return amfi_detect.AmfiConfigDetectLevel.NO_CHECK

        amfipass_version = utilities.check_kext_loaded("com.dhinakg.AMFIPass")
@@ -664,7 +685,7 @@ class DetectRootPatch:
                # If AMFIPass is loaded, our binaries will work
                return amfi_detect.AmfiConfigDetectLevel.NO_CHECK

-        if self.constants.detected_os >= os_data.os_data.ventura:
+        if self.os_major >= os_data.os_data.ventura:
            if self.amfi_shim_bins is True:
                # Currently we require AMFI outright disabled
                # in Ventura to work with shim'd binaries
@@ -688,7 +709,7 @@ class DetectRootPatch:
        sip = sip_dict[0]
        sip_value = sip_dict[1]

-        self.sip_enabled, self.sbm_enabled, self.fv_enabled, self.dosdude_patched = utilities.patching_status(sip, self.constants.detected_os)
+        self.sip_enabled, self.sbm_enabled, self.fv_enabled, self.dosdude_patched = utilities.patching_status(sip, self.os_major)
        self.amfi_enabled = not amfi_detect.AmfiConfigurationDetection().check_config(self._get_amfi_level_needed())

        self.unsupported_os = not self._check_os_compat()
@@ -742,7 +763,7 @@ class DetectRootPatch:
                    logging.info("\nCannot patch! WhateverGreen.kext missing")
                    logging.info("Please ensure WhateverGreen.kext is installed")

-            if (not self.has_network) if (self.requires_root_kc and self.missing_kdk and self.constants.detected_os >= os_data.os_data.ventura.value) else False:
+            if (not self.has_network) if (self.requires_root_kc and self.missing_kdk and self.os_major >= os_data.os_data.ventura.value) else False:
                logging.info("\nCannot patch! Network Connection Required")
                logging.info("Please ensure you have an active internet connection")

@@ -765,7 +786,7 @@ class DetectRootPatch:
                self.missing_whatever_green if self.nvidia_web is True  else False,

                # KDK specific
-                (not self.has_network) if (self.requires_root_kc and self.missing_kdk and self.constants.detected_os >= os_data.os_data.ventura.value) else False
+                (not self.has_network) if (self.requires_root_kc and self.missing_kdk and self.os_major >= os_data.os_data.ventura.value) else False
            ]
        ):
            return False
--- a/resources/sys_patch/sys_patch_generate.py
+++ b/resources/sys_patch/sys_patch_generate.py
@@ -35,7 +35,7 @@ class GenerateRootPatchSets:
            dict: Dictionary of patches to be applied from sys_patch_dict.py
        """

-        all_hardware_patchset: dict = sys_patch_dict.SystemPatchDictionary(self.constants.detected_os, self.constants.detected_os_minor, self.constants.legacy_accel_support).patchset_dict
+        all_hardware_patchset: dict = sys_patch_dict.SystemPatchDictionary(self.constants.detected_os, self.constants.detected_os_minor, self.constants.legacy_accel_support, self.constants.detected_os_version).patchset_dict
        required_patches:      dict = {}

        utilities.cls()
@@ -176,10 +176,14 @@ class GenerateRootPatchSets:

        if self.hardware_details["Miscellaneous: Legacy USB 1.1"] is True:
            required_patches.update({"Legacy USB 1.1": all_hardware_patchset["Miscellaneous"]["Legacy USB 1.1"]})
+            required_patches.update({"Legacy USB 1.1 Extended": all_hardware_patchset["Miscellaneous"]["Legacy USB 1.1 Extended"]})

        if self.hardware_details["Miscellaneous: PCIe FaceTime Camera"] is True:
            required_patches.update({"PCIe FaceTime Camera": all_hardware_patchset["Miscellaneous"]["PCIe FaceTime Camera"]})

+        if self.hardware_details["Miscellaneous: T1 Security Chip"] is True:
+            required_patches.update({"T1 Security Chip": all_hardware_patchset["Miscellaneous"]["T1 Security Chip"]})
+
        if required_patches:
            host_os_float = float(f"{self.constants.detected_os}.{self.constants.detected_os_minor}")

--- a/resources/sys_patch/sys_patch_helpers.py
+++ b/resources/sys_patch/sys_patch_helpers.py
@@ -185,7 +185,7 @@ class SysPatchHelpers:
        if did_find:
            with open(file_path, "wb") as f:
                plistlib.dump(data, f, sort_keys=False)
-            subprocess.run(["killall", "NotificationCenter"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            subprocess.run(["/usr/bin/killall", "NotificationCenter"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)


    def install_rsr_repair_binary(self):
@@ -235,23 +235,30 @@ class SysPatchHelpers:
            - lib (entire directory)

        Note: With macOS Sonoma, 32023 compiler is used instead and so this patch is not needed
+              until macOS 14.2 Beta 2 with version '32023.26'.

        Parameters:
            mount_point: The mount point of the target volume
        """
-
-        if self.constants.detected_os != os_data.os_data.ventura:
-            return
-        if self.constants.detected_os_minor < 4:
+        if os_data.os_data.sonoma < self.constants.detected_os < os_data.os_data.ventura:
            return

-        LIBRARY_DIR = f"{mount_point}/System/Library/PrivateFrameworks/GPUCompiler.framework/Versions/31001/Libraries/lib/clang"
-        GPU_VERSION = "31001.669"
+        if self.constants.detected_os == os_data.os_data.ventura:
+            if self.constants.detected_os_minor < 4: # 13.3
+                return
+            BASE_VERSION = "31001"
+            GPU_VERSION = f"{BASE_VERSION}.669"
+        elif self.constants.detected_os == os_data.os_data.sonoma:
+            if self.constants.detected_os_minor < 2: # 14.2 Beta 2
+                return
+            BASE_VERSION = "32023"
+            GPU_VERSION = f"{BASE_VERSION}.26"

+        LIBRARY_DIR = f"{mount_point}/System/Library/PrivateFrameworks/GPUCompiler.framework/Versions/{BASE_VERSION}/Libraries/lib/clang"
        DEST_DIR = f"{LIBRARY_DIR}/{GPU_VERSION}"

        if not Path(DEST_DIR).exists():
-            return
+            raise Exception(f"Failed to find GPUCompiler libraries at {DEST_DIR}")

        for file in Path(LIBRARY_DIR).iterdir():
            if file.is_file():
@@ -260,13 +267,13 @@ class SysPatchHelpers:
                continue

            # Partial match as each OS can increment the version
-            if not file.name.startswith("31001."):
+            if not file.name.startswith(f"{BASE_VERSION}."):
                continue

            logging.info(f"Merging GPUCompiler.framework libraries to match binary")

            src_dir = f"{LIBRARY_DIR}/{file.name}"
            if not Path(f"{DEST_DIR}/lib").exists():
-                utilities.process_status(utilities.elevated(["cp", "-cR", f"{src_dir}/lib", f"{DEST_DIR}/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+                utilities.process_status(utilities.elevated(["/bin/cp", "-cR", f"{src_dir}/lib", f"{DEST_DIR}/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))

            break
--- a/resources/utilities.py
+++ b/resources/utilities.py
@@ -60,8 +60,8 @@ def seconds_to_readable_time(seconds) -> str:
    seconds = int(seconds)
    time = ""

-    if seconds == 0:
-        return "0m "
+    if 0 <= seconds < 60:
+        return "Less than a minute "
    if seconds < 0:
        return "Indeterminate time "

@@ -108,13 +108,14 @@ def check_recovery():


 def get_disk_path():
-    root_partition_info = plistlib.loads(subprocess.run("diskutil info -plist /".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+    root_partition_info = plistlib.loads(subprocess.run(["/usr/sbin/diskutil", "info", "-plist", "/"], stdout=subprocess.PIPE).stdout.decode().strip().encode())
    root_mount_path = root_partition_info["DeviceIdentifier"]
    root_mount_path = root_mount_path[:-2] if root_mount_path.count("s") > 1 else root_mount_path
    return root_mount_path

+
 def check_if_root_is_apfs_snapshot():
-    root_partition_info = plistlib.loads(subprocess.run("diskutil info -plist /".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+    root_partition_info = plistlib.loads(subprocess.run(["/usr/sbin/diskutil", "info", "-plist", "/"], stdout=subprocess.PIPE).stdout.decode().strip().encode())
    try:
        is_snapshotted = root_partition_info["APFSSnapshot"]
    except KeyError:
@@ -124,7 +125,7 @@ def check_if_root_is_apfs_snapshot():

 def check_seal():
    # 'Snapshot Sealed' property is only listed on booted snapshots
-    sealed = subprocess.run(["diskutil", "apfs", "list"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    sealed = subprocess.run(["/usr/sbin/diskutil", "apfs", "list"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
    if "Snapshot Sealed:           Yes" in sealed.stdout.decode():
        return True
    else:
@@ -132,7 +133,7 @@ def check_seal():

 def check_filesystem_type():
    # Expected to return 'apfs' or 'hfs'
-    filesystem_type = plistlib.loads(subprocess.run(["diskutil", "info", "-plist", "/"], stdout=subprocess.PIPE).stdout.decode().strip().encode())
+    filesystem_type = plistlib.loads(subprocess.run(["/usr/sbin/diskutil", "info", "-plist", "/"], stdout=subprocess.PIPE).stdout.decode().strip().encode())
    return filesystem_type["FilesystemType"]


@@ -186,10 +187,10 @@ def check_kext_loaded(bundle_id: str) -> str:
    # no UUID for kextstat
    pattern = re.compile(re.escape(bundle_id) + r"\s+\((?P<version>.+)\)")

-    args = ["kextstat", "-l", "-b", bundle_id]
+    args = ["/usr/sbin/kextstat", "-list-only", "-bundle-id", bundle_id]

    if Path("/usr/bin/kmutil").exists():
-        args = ["kmutil", "showloaded", "--list-only", "--variant-suffix", "release", "--optional-identifier", bundle_id]
+        args = ["/usr/bin/kmutil", "showloaded", "--list-only", "--variant-suffix", "release", "--optional-identifier", bundle_id]

    kext_loaded = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
    if kext_loaded.returncode != 0:
@@ -213,7 +214,7 @@ def check_oclp_boot():
 def check_monterey_wifi():
    IO80211ElCap = "com.apple.iokit.IO80211ElCap"
    CoreCaptureElCap = "com.apple.driver.corecaptureElCap"
-    loaded_kexts: str = subprocess.run("kextcache".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
+    loaded_kexts: str = subprocess.run(["/usr/sbin/kextcache"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
    if IO80211ElCap in loaded_kexts and CoreCaptureElCap in loaded_kexts:
        return True
    else:
@@ -307,7 +308,7 @@ def patching_status(os_sip, os):

    if os > os_data.os_data.catalina and not check_filevault_skip():
        # Assume non-OCLP Macs do not have our APFS seal patch
-        fv_status: str = subprocess.run("fdesetup status".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
+        fv_status: str = subprocess.run(["/usr/bin/fdesetup", "status"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
        if "FileVault is Off" in fv_status:
            fv_enabled = False
    else:
@@ -340,8 +341,7 @@ def cls():

 def check_command_line_tools():
    # Determine whether Command Line Tools exist
-    # xcode-select -p
-    xcode_select = subprocess.run("xcode-select -p".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    xcode_select = subprocess.run(["/usr/bin/xcode-select", "--print-path"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
    if xcode_select.returncode == 0:
        return True
    else:
@@ -420,7 +420,7 @@ def find_apfs_physical_volume(device):
    disk_list = None
    physical_disks = []
    try:
-        disk_list = plistlib.loads(subprocess.run(["diskutil", "info", "-plist", device], stdout=subprocess.PIPE).stdout)
+        disk_list = plistlib.loads(subprocess.run(["/usr/sbin/diskutil", "info", "-plist", device], stdout=subprocess.PIPE).stdout)
    except TypeError:
        pass

@@ -465,7 +465,7 @@ def find_disk_off_uuid(uuid):
    # Find disk by UUID
    disk_list = None
    try:
-        disk_list = plistlib.loads(subprocess.run(["diskutil", "info", "-plist", uuid], stdout=subprocess.PIPE).stdout)
+        disk_list = plistlib.loads(subprocess.run(["/usr/sbin/diskutil", "info", "-plist", uuid], stdout=subprocess.PIPE).stdout)
    except TypeError:
        pass
    if disk_list:
@@ -492,12 +492,12 @@ def get_free_space(disk=None):
    return free

 def grab_mount_point_from_disk(disk):
-    data = plistlib.loads(subprocess.run(f"diskutil info -plist {disk}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+    data = plistlib.loads(subprocess.run(["/usr/sbin/diskutil", "info", "-plist", disk], stdout=subprocess.PIPE).stdout.decode().strip().encode())
    return data["MountPoint"]

 def monitor_disk_output(disk):
    # Returns MB written on drive
-    output = subprocess.check_output(["iostat", "-Id", disk])
+    output = subprocess.check_output(["/usr/sbin/iostat", "-Id", disk])
    output = output.decode("utf-8")
    #  Grab second last entry (last is \n)
    output = output.split(" ")
@@ -509,7 +509,7 @@ def get_preboot_uuid() -> str:
    """
    Get the UUID of the Preboot volume
    """
-    args = ["ioreg", "-a", "-n", "chosen", "-p", "IODeviceTree", "-r"]
+    args = ["/usr/sbin/ioreg", "-a", "-n", "chosen", "-p", "IODeviceTree", "-r"]
    output = plistlib.loads(subprocess.run(args, stdout=subprocess.PIPE).stdout)
    return output[0]["apfs-preboot-uuid"].strip(b"\0").decode()

@@ -533,13 +533,13 @@ def block_os_updaters():
            if bad_process in current_process:
                if pid != "":
                    logging.info(f"Killing Process: {pid} - {current_process.split('/')[-1]}")
-                    subprocess.run(["kill", "-9", pid])
+                    subprocess.run(["/bin/kill", "-9", pid])
                    break

 def check_boot_mode():
    # Check whether we're in Safe Mode or not
    try:
-        sys_plist = plistlib.loads(subprocess.run(["system_profiler", "SPSoftwareDataType"], stdout=subprocess.PIPE).stdout)
+        sys_plist = plistlib.loads(subprocess.run(["/usr/sbin/system_profiler", "SPSoftwareDataType"], stdout=subprocess.PIPE).stdout)
        return sys_plist[0]["_items"][0]["boot_mode"]
    except (KeyError, TypeError, plistlib.InvalidFileException):
        return None
@@ -550,7 +550,34 @@ def elevated(*args, **kwargs) -> subprocess.CompletedProcess:
    if os.getuid() == 0 or check_cli_args() is not None:
        return subprocess.run(*args, **kwargs)
    else:
-        return subprocess.run(["sudo"] + [args[0][0]] + args[0][1:], **kwargs)
+        return subprocess.run(["/usr/bin/sudo"] + [args[0][0]] + args[0][1:], **kwargs)
+
+
+def fetch_staged_update(variant: str = "Update") -> (str, str):
+    """
+    Check for staged macOS update
+    Supported variants:
+    - Preflight
+    - Update
+    """
+
+    os_build   = None
+    os_version = None
+
+    update_config = f"/System/Volumes/Update/{variant}.plist"
+    if not Path(update_config).exists():
+        return (None, None)
+    try:
+        update_staged = plistlib.load(open(update_config, "rb"))
+    except:
+        return (None, None)
+    if "update-asset-attributes" not in update_staged:
+        return (None, None)
+
+    os_build   = update_staged["update-asset-attributes"]["Build"]
+    os_version = update_staged["update-asset-attributes"]["OSVersion"]
+
+    return os_version, os_build


 def check_cli_args():
@@ -580,6 +607,8 @@ def check_cli_args():
    # sys_patch args
    parser.add_argument("--patch_sys_vol", help="Patches root volume", action="store_true", required=False)
    parser.add_argument("--unpatch_sys_vol", help="Unpatches root volume, EXPERIMENTAL", action="store_true", required=False)
+    parser.add_argument("--prepare_for_update", help="Prepares host for macOS update, ex. clean /Library/Extensions", action="store_true", required=False)
+    parser.add_argument("--cache_os", help="Caches patcher files (ex. KDKs) for incoming OS in Preflight.plist", action="store_true", required=False)

    # validation args
    parser.add_argument("--validate", help="Runs Validation Tests for CI", action="store_true", required=False)
@@ -591,7 +620,15 @@ def check_cli_args():
    parser.add_argument("--update_installed", help="Prompt user to finish updating via GUI", action="store_true", required=False)

    args = parser.parse_args()
-    if not (args.build or args.patch_sys_vol or args.unpatch_sys_vol or args.validate or args.auto_patch):
+    if not (
+        args.build or
+        args.patch_sys_vol or
+        args.unpatch_sys_vol or
+        args.validate or
+        args.auto_patch or
+        args.prepare_for_update or
+        args.cache_os
+    ):
        return None
    else:
        return args
--- a/resources/validation.py
+++ b/resources/validation.py
@@ -15,8 +15,10 @@ class PatcherValidation:
    Primarily for Continuous Integration
    """

-    def __init__(self, global_constants: constants.Constants) -> None:
+    def __init__(self, global_constants: constants.Constants, verify_unused_files: bool = False) -> None:
        self.constants: constants.Constants = global_constants
+        self.verify_unused_files = verify_unused_files
+        self.active_patchset_files = []

        self.constants.validate = True

@@ -102,7 +104,7 @@ class PatcherValidation:
            minor_kernel (int): Minor kernel version
        """

-        patchset = sys_patch_dict.SystemPatchDictionary(major_kernel, minor_kernel, self.constants.legacy_accel_support).patchset_dict
+        patchset = sys_patch_dict.SystemPatchDictionary(major_kernel, minor_kernel, self.constants.legacy_accel_support, self.constants.detected_os_version).patchset_dict
        host_os_float = float(f"{major_kernel}.{minor_kernel}")

        for patch_subject in patchset:
@@ -119,6 +121,8 @@ class PatcherValidation:
                                if not Path(source_file).exists():
                                    logging.info(f"File not found: {source_file}")
                                    raise Exception(f"Failed to find {source_file}")
+                                if self.verify_unused_files is True:
+                                    self.active_patchset_files.append(source_file)

        logging.info(f"Validating against Darwin {major_kernel}.{minor_kernel}")
        if not sys_patch_helpers.SysPatchHelpers(self.constants).generate_patchset_plist(patchset, f"OpenCore-Legacy-Patcher-{major_kernel}.{minor_kernel}.plist", None):
@@ -141,9 +145,33 @@ class PatcherValidation:
                raise Exception("Failed to download Universal-Binaries.dmg")

        logging.info("Validating Root Patch File integrity")
+
+        if Path(self.constants.payload_path / Path("Universal-Binaries_overlay")).exists():
+            subprocess.run(
+                [
+                    "/bin/rm", "-f", Path(self.constants.payload_path / Path("Universal-Binaries_overlay"))
+                ],
+                stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+            )
+        if Path(self.constants.payload_path / Path("Universal-Binaries")).exists():
+            output = subprocess.run(
+                [
+                    "/usr/bin/hdiutil", "detach", Path(self.constants.payload_path / Path("Universal-Binaries")),
+                    "-force"
+                ],
+                stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+            )
+
+            if output.returncode != 0:
+                logging.info("Failed to unmount Universal-Binaries.dmg")
+                logging.info(f"Output: {output.stdout.decode()}")
+                logging.info(f"Return Code: {output.returncode}")
+
+                raise Exception("Failed to unmount Universal-Binaries.dmg")
+
        output = subprocess.run(
            [
-                "hdiutil", "attach", "-noverify", f"{self.constants.payload_local_binaries_root_path_dmg}",
+                "/usr/bin/hdiutil", "attach", "-noverify", f"{self.constants.payload_local_binaries_root_path_dmg}",
                "-mountpoint", Path(self.constants.payload_path / Path("Universal-Binaries")),
                "-nobrowse",
                "-shadow", Path(self.constants.payload_path / Path("Universal-Binaries_overlay")),
@@ -165,14 +193,18 @@ class PatcherValidation:
        for supported_os in [os_data.os_data.big_sur, os_data.os_data.monterey, os_data.os_data.ventura, os_data.os_data.sonoma]:
            for i in range(0, 10):
                self._validate_root_patch_files(supported_os, i)
+
        logging.info("Validating SNB Board ID patcher")
        self.constants.computer.reported_board_id = "Mac-7BA5B2DFE22DDD8C"
        sys_patch_helpers.SysPatchHelpers(self.constants).snb_board_id_patch(self.constants.payload_local_binaries_root_path)

+        if self.verify_unused_files is True:
+            self._find_unused_files()
+
        # unmount the dmg
        output = subprocess.run(
            [
-                "hdiutil", "detach", Path(self.constants.payload_path / Path("Universal-Binaries")),
+                "/usr/bin/hdiutil", "detach", Path(self.constants.payload_path / Path("Universal-Binaries")),
                "-force"
            ],
            stdout=subprocess.PIPE, stderr=subprocess.STDOUT
@@ -187,12 +219,56 @@ class PatcherValidation:

        subprocess.run(
            [
-                "rm", "-f", Path(self.constants.payload_path / Path("Universal-Binaries_overlay"))
+                "/bin/rm", "-f", Path(self.constants.payload_path / Path("Universal-Binaries_overlay"))
            ],
            stdout=subprocess.PIPE, stderr=subprocess.STDOUT
        )


+    def _find_unused_files(self) -> None:
+        """
+        Find PatcherSupportPkg files that are unused by the patcher
+
+        Note this function is extremely slow, so only manually run when needed
+        """
+        if self.active_patchset_files == []:
+            return
+
+        unused_files = []
+
+        for file in Path(self.constants.payload_local_binaries_root_path).rglob("*"):
+            if file.is_dir():
+                continue
+
+            relative_path = Path(file).relative_to(self.constants.payload_local_binaries_root_path)
+
+            if relative_path.name == ".DS_Store":
+                continue
+
+            if str(relative_path) in [".fseventsd/fseventsd-uuid", ".signed"]:
+                continue
+
+            is_used = False
+            for used_file in self.active_patchset_files:
+                used_relative_path = Path(used_file).relative_to(self.constants.payload_local_binaries_root_path)
+                if str(relative_path) in str(used_relative_path):
+                    is_used = True
+                    break
+                if str(used_relative_path) in str(relative_path):
+                    is_used = True
+                    break
+
+            if is_used:
+                continue
+
+            unused_files.append(relative_path)
+
+        if len(unused_files) > 0:
+            logging.info("Unused files found:")
+            for file in unused_files:
+                logging.info(f"  {file}")
+
+
    def _validate_configs(self) -> None:
        """
        Validates build modules
@@ -222,4 +298,4 @@ class PatcherValidation:
        self._build_prebuilt()
        self._build_dumps()

-        subprocess.run(["rm", "-rf", self.constants.build_path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        subprocess.run(["/bin/rm", "-rf", self.constants.build_path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
--- a/resources/wx_gui/gui_cache_os_update.py
+++ b/resources/wx_gui/gui_cache_os_update.py
@@ -0,0 +1,191 @@
+"""
+UI to display to users before a macOS update is applied
+Primarily for caching updates required for incoming OS (ex. KDKs)
+"""
+
+import wx
+import sys
+import time
+import logging
+import threading
+
+from pathlib import Path
+
+from resources import constants, kdk_handler, utilities
+from resources.wx_gui import gui_support, gui_download
+
+
+class OSUpdateFrame(wx.Frame):
+    """
+    Create a modal frame for displaying information to the user before an update is applied
+    """
+    def __init__(self, parent: wx.Frame, title: str, global_constants: constants.Constants, screen_location: tuple = None):
+        logging.info("Initializing Prepare Update Frame")
+
+        if parent:
+            self.frame = parent
+        else:
+            super().__init__(parent, title=title, size=(360, 140), style=wx.DEFAULT_FRAME_STYLE ^ wx.RESIZE_BORDER ^ wx.MAXIMIZE_BOX)
+            self.frame = self
+            self.frame.Centre()
+
+        self.title = title
+        self.constants: constants.Constants = global_constants
+
+        os_data = utilities.fetch_staged_update(variant="Preflight")
+        if os_data[0] is None:
+            logging.info("No staged update found")
+            self._exit()
+        logging.info(f"Staged update found: {os_data[0]} ({os_data[1]})")
+        self.os_data = os_data
+
+        self._generate_ui()
+
+        self.kdk_obj: kdk_handler.KernelDebugKitObject = None
+        def _kdk_thread_spawn():
+            self.kdk_obj = kdk_handler.KernelDebugKitObject(self.constants, self.os_data[1], self.os_data[0], passive=True, check_backups_only=True)
+
+        kdk_thread = threading.Thread(target=_kdk_thread_spawn)
+        kdk_thread.start()
+
+        while kdk_thread.is_alive():
+            wx.Yield()
+
+        if self.kdk_obj.success is False:
+            self._exit()
+
+        kdk_download_obj = self.kdk_obj.retrieve_download()
+        if not kdk_download_obj:
+            # KDK is already downloaded
+            # Return false since we didn't display anything
+            self._exit()
+
+        self.kdk_download_obj = kdk_download_obj
+
+        self.frame.Show()
+
+        self.did_cancel = -1
+        self._notifyUser()
+
+        # Allow 10 seconds for the user to cancel the download
+        # If nothing, continue
+        for i in range(0, 10):
+            if self.did_cancel == 1:
+                self._exit()
+            if self.did_cancel == -1:
+                time.sleep(1)
+
+        gui_download.DownloadFrame(
+            self,
+            title=self.title,
+            global_constants=self.constants,
+            download_obj=kdk_download_obj,
+            item_name=f"KDK Build {self.kdk_obj.kdk_url_build}"
+        )
+        if kdk_download_obj.download_complete is False:
+            self._exit()
+
+        logging.info("KDK download complete, validating with hdiutil")
+        self.kdk_checksum_result = False
+        def _validate_kdk_checksum_thread():
+            self.kdk_checksum_result = self.kdk_obj.validate_kdk_checksum()
+
+        kdk_checksum_thread = threading.Thread(target=_validate_kdk_checksum_thread)
+        kdk_checksum_thread.start()
+
+        while kdk_checksum_thread.is_alive():
+            wx.Yield()
+
+        if self.kdk_checksum_result is False:
+            logging.error("KDK checksum validation failed")
+            logging.error(self.kdk_obj.error_msg)
+            self._exit()
+
+        logging.info("KDK checksum validation passed")
+
+        logging.info("Mounting KDK")
+        if not Path(self.constants.kdk_download_path).exists():
+            logging.error("KDK download path does not exist")
+            self._exit()
+
+        self.kdk_install_result = False
+        def _install_kdk_thread():
+            self.kdk_install_result = kdk_handler.KernelDebugKitUtilities().install_kdk_dmg(self.constants.kdk_download_path, only_install_backup=True)
+
+        kdk_install_thread = threading.Thread(target=_install_kdk_thread)
+        kdk_install_thread.start()
+
+        while kdk_install_thread.is_alive():
+            wx.Yield()
+
+        if self.kdk_install_result is False:
+            logging.info("Failed to install KDK")
+            self._exit()
+
+        logging.info("KDK installed successfully")
+        self._exit()
+
+
+    def _generate_ui(self) -> None:
+        """
+        Display frame
+
+
+        Title: OpenCore Legacy Patcher is preparing to update your system
+        Body:  Please wait while we prepare your system for the update.
+               This may take a few minutes.
+        """
+
+        header = wx.StaticText(self.frame, label="Preparing for macOS Software Update", pos=(-1,5))
+        header.SetFont(gui_support.font_factory(19, wx.FONTWEIGHT_BOLD))
+        header.Centre(wx.HORIZONTAL)
+
+        # list OS
+        label = wx.StaticText(self.frame, label=f"macOS {self.os_data[0]} ({self.os_data[1]})", pos=(-1, 35))
+        label.SetFont(gui_support.font_factory(13, wx.FONTWEIGHT_NORMAL))
+        label.Centre(wx.HORIZONTAL)
+
+        # this may take a few minutes
+        label = wx.StaticText(self.frame, label="This may take a few minutes.", pos=(-1, 55))
+        label.SetFont(gui_support.font_factory(13, wx.FONTWEIGHT_NORMAL))
+        label.Centre(wx.HORIZONTAL)
+
+        # Add a progress bar
+        self.progress_bar = wx.Gauge(self.frame, range=100, pos=(10, 75), size=(340, 20))
+        self.progress_bar.SetValue(0)
+        self.progress_bar.Pulse()
+
+        # Set frame size below progress bar
+        self.frame.SetSize((360, 140))
+
+
+    def _notifyUser(self) -> None:
+        """
+        Notify user of what OCLP is doing
+        Note will be spawned through wx.CallAfter
+        """
+        threading.Thread(target=self._notifyUserThread).start()
+
+
+    def _notifyUserThread(self) -> None:
+        """
+        Notify user of what OCLP is doing
+        """
+        message=f"OpenCore Legacy Patcher has detected that a macOS update is being downloaded:\n{self.os_data[0]} ({self.os_data[1]})\n\nThe patcher needs to prepare the system for the update, and will download any additional resources it may need post-update.\n\nThis may take a few minutes, the patcher will exit when it is done."
+        # Yes/No for caching
+        dlg = wx.MessageDialog(self.frame, message=message, caption="OpenCore Legacy Patcher", style=wx.YES_NO | wx.ICON_INFORMATION)
+        dlg.SetYesNoLabels("&Ok", "&Cancel")
+        result = dlg.ShowModal()
+        if result == wx.ID_NO:
+            logging.info("User cancelled OS caching")
+            self.kdk_download_obj.stop()
+            self.did_cancel = 1
+        else:
+            self.did_cancel = 0
+
+    def _exit(self):
+        """
+        Exit the frame
+        """
+        self.frame.Close()
+        sys.exit()
--- a/resources/wx_gui/gui_download.py
+++ b/resources/wx_gui/gui_download.py
@@ -50,7 +50,7 @@ class DownloadFrame(wx.Frame):
        title_label.SetFont(gui_support.font_factory(19, wx.FONTWEIGHT_BOLD))
        title_label.Centre(wx.HORIZONTAL)

-        progress_bar = wx.Gauge(frame, range=100, pos=(-1, title_label.GetPosition()[1] + title_label.GetSize()[1] + 5), size=(300, 20))
+        progress_bar = wx.Gauge(frame, range=100, pos=(-1, title_label.GetPosition()[1] + title_label.GetSize()[1] + 5), size=(300, 20), style=wx.GA_SMOOTH|wx.GA_PROGRESS)
        progress_bar.Centre(wx.HORIZONTAL)

        label_amount = wx.StaticText(frame, label="Preparing download", pos=(-1, progress_bar.GetPosition()[1] + progress_bar.GetSize()[1]))
@@ -68,7 +68,9 @@ class DownloadFrame(wx.Frame):
        self.download_obj.download()
        while self.download_obj.is_active():
            
-            percentage: int = self.download_obj.get_percent()
+            percentage: int = round(self.download_obj.get_percent())
+            if percentage == 0:
+                percentage = 1

            if percentage == -1:
                amount_str = f"{utilities.human_fmt(self.download_obj.downloaded_file_size)} downloaded ({utilities.human_fmt(self.download_obj.get_speed())}/s)"
--- a/resources/wx_gui/gui_entry.py
+++ b/resources/wx_gui/gui_entry.py
@@ -6,6 +6,7 @@ import logging

 from resources import constants
 from resources.wx_gui import (
+    gui_cache_os_update,
    gui_main_menu,
    gui_build,
    gui_install_oc,
@@ -24,6 +25,7 @@ class SupportedEntryPoints:
    INSTALL_OC = gui_install_oc.InstallOCFrame
    SYS_PATCH  = gui_sys_patch_start.SysPatchStartFrame
    UPDATE_APP = gui_update.UpdateFrame
+    OS_CACHE   = gui_cache_os_update.OSUpdateFrame


 class EntryPoint:
@@ -58,7 +60,7 @@ class EntryPoint:

        self.frame: wx.Frame = entry(
            None,
-            title=f"{self.constants.patcher_name} ({self.constants.patcher_version})",
+            title=f"{self.constants.patcher_name} {self.constants.patcher_version}{' (Nightly)' if not self.constants.commit_info[0].startswith('refs/tags') else ''}",
            global_constants=self.constants,
            screen_location=None,
            **({"patches": patches} if "--gui_patch" in sys.argv or "--gui_unpatch" in sys.argv else {})
--- a/resources/wx_gui/gui_macos_installer_flash.py
+++ b/resources/wx_gui/gui_macos_installer_flash.py
@@ -428,8 +428,8 @@ class macOSInstallerFlashFrame(wx.Frame):
        if not str(path).endswith(".zip"):
            return
        if Path(self.constants.installer_pkg_path).exists():
-            subprocess.run(["rm", self.constants.installer_pkg_path])
-        subprocess.run(["ditto", "-V", "-x", "-k", "--sequesterRsrc", "--rsrc", self.constants.installer_pkg_zip_path, self.constants.payload_path])
+            subprocess.run(["/bin/rm", self.constants.installer_pkg_path])
+        subprocess.run(["/usr/bin/ditto", "-V", "-x", "-k", "--sequesterRsrc", "--rsrc", self.constants.installer_pkg_zip_path, self.constants.payload_path])


    def _install_installer_pkg(self, disk):
@@ -448,8 +448,8 @@ class macOSInstallerFlashFrame(wx.Frame):
            logging.info("Installer unsupported, requires Big Sur or newer")
            return

-        subprocess.run(["mkdir", "-p", f"{path}/Library/Packages/"])
-        subprocess.run(["cp", "-r", self.constants.installer_pkg_path, f"{path}/Library/Packages/"])
+        subprocess.run(["/bin/mkdir", "-p", f"{path}/Library/Packages/"])
+        subprocess.run(["/bin/cp", "-r", self.constants.installer_pkg_path, f"{path}/Library/Packages/"])

        self._kdk_chainload(os_version["ProductBuildVersion"], os_version["ProductVersion"], Path(path + "/Library/Packages/"))

@@ -512,17 +512,17 @@ class macOSInstallerFlashFrame(wx.Frame):
        # Now that we have a KDK, extract it to get the pkg
        with tempfile.TemporaryDirectory() as mount_point:
            logging.info("Mounting KDK")
-            result = subprocess.run(["hdiutil", "attach", kdk_dmg_path, "-mountpoint", mount_point, "-nobrowse"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            result = subprocess.run(["/usr/bin/hdiutil", "attach", kdk_dmg_path, "-mountpoint", mount_point, "-nobrowse"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
            if result.returncode != 0:
                logging.info("Failed to mount KDK")
                logging.info(result.stdout.decode("utf-8"))
                return

            logging.info("Copying KDK")
-            subprocess.run(["cp", "-r", f"{mount_point}/KernelDebugKit.pkg", kdk_pkg_path])
+            subprocess.run(["/bin/cp", "-r", f"{mount_point}/KernelDebugKit.pkg", kdk_pkg_path])

            logging.info("Unmounting KDK")
-            result = subprocess.run(["hdiutil", "detach", mount_point], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            result = subprocess.run(["/usr/bin/hdiutil", "detach", mount_point], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
            if result.returncode != 0:
                logging.info("Failed to unmount KDK")
                logging.info(result.stdout.decode("utf-8"))
@@ -545,7 +545,7 @@ class macOSInstallerFlashFrame(wx.Frame):
                logging.error(f"Failed to find {dmg_path}")
                error_message = f"Failed to find {dmg_path}"
                return error_message
-            result = subprocess.run(["hdiutil", "verify", dmg_path],stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            result = subprocess.run(["/usr/bin/hdiutil", "verify", dmg_path],stdout=subprocess.PIPE, stderr=subprocess.PIPE)
            if result.returncode != 0:
                if result.stdout:
                    logging.error(result.stdout.decode("utf-8"))
--- a/resources/wx_gui/gui_main_menu.py
+++ b/resources/wx_gui/gui_main_menu.py
@@ -1,5 +1,10 @@
 # Generate GUI for main menu
+# Portions of this file Copyright (c) 2023 Jazzzny
+
 import wx
+import wx.html2
+import markdown2
+import requests
 import sys
 import logging
 import threading
@@ -22,7 +27,7 @@ from resources import (
    global_settings,
    updates
 )
-from data import os_data
+from data import os_data, css_data


 class MainFrame(wx.Frame):
@@ -65,7 +70,7 @@ class MainFrame(wx.Frame):
        """

        # Title label: OpenCore Legacy Patcher v{X.Y.Z}
-        title_label = wx.StaticText(self, label=f"OpenCore Legacy Patcher {'' if self.constants.special_build else 'v'}{self.constants.patcher_version}", pos=(-1, 10))
+        title_label = wx.StaticText(self, label=f"OpenCore Legacy Patcher {'' if self.constants.special_build else ''}{self.constants.patcher_version}{' (Nightly)' if not self.constants.commit_info[0].startswith('refs/tags') else ''}", pos=(-1, 10))
        title_label.SetFont(gui_support.font_factory(19, wx.FONTWEIGHT_BOLD))
        title_label.Centre(wx.HORIZONTAL)

@@ -256,13 +261,13 @@ class MainFrame(wx.Frame):
        if Path("/Applications/OpenCore-Patcher.app").exists() and Path("/Applications/OpenCore-Patcher.app").is_symlink() is False:
            logging.info("Found user-installed app in /Applications, replacing with symlink")
            # Delete app
-            result = subprocess.run(["rm", "-rf", "/Applications/OpenCore-Patcher.app"], capture_output=True)
+            result = subprocess.run(["/bin/rm", "-rf", "/Applications/OpenCore-Patcher.app"], capture_output=True)
            if result.returncode != 0:
                logging.info("Failed to delete app from /Applications")
                return

            # Create symlink
-            result = subprocess.run(["ln", "-s", "/Library/Application Support/Dortania/OpenCore-Patcher.app", "/Applications/OpenCore-Patcher.app"], capture_output=True)
+            result = subprocess.run(["/bin/ln", "-s", "/Library/Application Support/Dortania/OpenCore-Patcher.app", "/Applications/OpenCore-Patcher.app"], capture_output=True)
            if result.returncode != 0:
                logging.info("Failed to create symlink to /Applications")
                return
@@ -285,20 +290,8 @@ class MainFrame(wx.Frame):

        version = dict["Version"]
        logging.info(f"New version: {version}")
-        dialog = wx.MessageDialog(
-            parent=self,
-            message=f"Current Version: {self.constants.patcher_version}{' (Nightly)' if not self.constants.commit_info[0].startswith('refs/tags') else ''}\nNew version: {version}\nWould you like to update?",
-            caption="Update Available for OpenCore Legacy Patcher!",
-            style=wx.YES_NO | wx.CANCEL | wx.ICON_QUESTION
-        )
-        dialog.SetYesNoCancelLabels("Download and install", "Ignore", "View on Github")
-        response = dialog.ShowModal()
-
-        if response == wx.ID_YES:
-            wx.CallAfter(self.on_update, dict["Link"], version)
-        elif response == wx.ID_CANCEL:
-            webbrowser.open(dict["Github Link"])

+        wx.CallAfter(self.on_update, dict["Link"], version, dict["Github Link"])

    def on_build_and_install(self, event: wx.Event = None):
        self.Hide()
@@ -345,12 +338,85 @@ class MainFrame(wx.Frame):
            screen_location=self.GetPosition()
        )

-    def on_update(self, oclp_url: str, oclp_version: str):
-        gui_update.UpdateFrame(
+    def on_update(self, oclp_url: str, oclp_version: str, oclp_github_url: str):
+
+        ID_GITHUB = wx.NewId()
+        ID_UPDATE = wx.NewId()
+
+        url = "https://api.github.com/repos/dortania/OpenCore-Legacy-Patcher/releases/latest"
+        response = requests.get(url).json()
+        try:
+            changelog = response["body"].split("## Asset Information")[0]
+        except: #if user constantly checks for updates, github will rate limit them
+            changelog = """## Unable to fetch changelog
+
+Please check the Github page for more information about this release."""
+
+        html_markdown = markdown2.markdown(changelog, extras=["tables"])
+        html_css = css_data.updater_css
+        frame = wx.Dialog(None, -1, title="", size=(650, 500))
+        frame.SetMinSize((650, 500))
+        frame.SetWindowStyle(wx.STAY_ON_TOP)
+        panel = wx.Panel(frame)
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.AddSpacer(10)
+        self.title_text = wx.StaticText(panel, label="A new version of OpenCore Legacy Patcher is available!")
+        self.description = wx.StaticText(panel, label=f"OpenCore Legacy Patcher {oclp_version} is now available - You have {self.constants.patcher_version}{' (Nightly)' if not self.constants.commit_info[0].startswith('refs/tags') else ''}. Would you like to update?")
+        self.title_text.SetFont(gui_support.font_factory(19, wx.FONTWEIGHT_BOLD))
+        self.description.SetFont(gui_support.font_factory(13, wx.FONTWEIGHT_NORMAL))
+        self.web_view = wx.html2.WebView.New(panel, style=wx.BORDER_SUNKEN)
+        html_code = f'''
+<html>
+    <head>
+        <style>
+            {html_css}
+        </style>
+    </head>
+    <body class="markdown-body">
+        {html_markdown.replace("<a href=", "<a target='_blank' href=")}
+    </body>
+</html>
+'''
+        self.web_view.SetPage(html_code, "")
+        self.web_view.Bind(wx.html2.EVT_WEBVIEW_NEWWINDOW, self._onWebviewNav)
+        self.web_view.EnableContextMenu(False)
+        self.close_button = wx.Button(panel, label="Dismiss")
+        self.close_button.Bind(wx.EVT_BUTTON, lambda event: frame.EndModal(wx.ID_CANCEL))
+        self.view_button = wx.Button(panel, ID_GITHUB, label="View on GitHub")
+        self.view_button.Bind(wx.EVT_BUTTON, lambda event: frame.EndModal(ID_GITHUB))
+        self.install_button = wx.Button(panel, label="Download and Install")
+        self.install_button.Bind(wx.EVT_BUTTON, lambda event: frame.EndModal(ID_UPDATE))
+        self.install_button.SetDefault()
+
+        buttonsizer = wx.BoxSizer(wx.HORIZONTAL)
+        buttonsizer.Add(self.close_button, 0, wx.ALIGN_CENTRE | wx.RIGHT, 5)
+        buttonsizer.Add(self.view_button, 0, wx.ALIGN_CENTRE | wx.LEFT|wx.RIGHT, 5)
+        buttonsizer.Add(self.install_button, 0, wx.ALIGN_CENTRE | wx.LEFT, 5)
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(self.title_text, 0, wx.ALIGN_CENTRE | wx.TOP, 20)
+        sizer.Add(self.description, 0, wx.ALIGN_CENTRE | wx.BOTTOM, 20)
+        sizer.Add(self.web_view, 1, wx.EXPAND | wx.LEFT|wx.RIGHT, 10)
+        sizer.Add(buttonsizer, 0, wx.ALIGN_RIGHT | wx.ALL, 20)
+        panel.SetSizer(sizer)
+        frame.Centre()
+
+        result = frame.ShowModal()
+
+
+        if result == ID_GITHUB:
+            webbrowser.open(oclp_github_url)
+        elif result == ID_UPDATE:
+            gui_update.UpdateFrame(
            parent=self,
            title=self.title,
            global_constants=self.constants,
            screen_location=self.GetPosition(),
            url=oclp_url,
            version_label=oclp_version
-        )
+        )
+
+        frame.Destroy()
+
+    def _onWebviewNav(self, event):
+        url = event.GetURL()
+        webbrowser.open(url)
--- a/resources/wx_gui/gui_settings.py
+++ b/resources/wx_gui/gui_settings.py
@@ -277,16 +277,16 @@ class SettingsFrame(wx.Frame):
                "wrap_around 2": {
                    "type": "wrap_around",
                },
-                "APFS Trim": {
+                "OpenCore Vaulting": {
                    "type": "checkbox",
-                    "value": self.constants.apfs_trim_timeout,
-                    "variable": "apfs_trim_timeout",
+                    "value": self.constants.vault,
+                    "variable": "vault",
                    "description": [
-                        "Recommended for all users, however faulty",
-                        "SSDs may benefit from disabling this.",
+                        "Digitally sign OpenCore to prevent",
+                        "tampering or corruption."
                    ],
-
                },
+
                "Show OpenCore Boot Picker": {
                    "type": "checkbox",
                    "value": self.constants.showpicker,
@@ -443,6 +443,16 @@ class SettingsFrame(wx.Frame):
                    ],
                    "condition": not bool(self.constants.computer.third_party_sata_ssd is False and not self.constants.custom_model)
                },
+                "APFS Trim": {
+                    "type": "checkbox",
+                    "value": self.constants.apfs_trim_timeout,
+                    "variable": "apfs_trim_timeout",
+                    "description": [
+                        "Recommended for all users, however faulty",
+                        "SSDs may benefit from disabling this.",
+                    ],
+
+                },
            },
            "Advanced": {
                "Miscellaneous": {
@@ -675,6 +685,7 @@ class SettingsFrame(wx.Frame):
                        "By default this is disabled due to",
                        "common GPU failures on these models.",
                    ],
+                    "override_function": self._update_global_settings,
                    "condition": not bool(self.constants.computer.real_model not in ["MacBookPro8,2", "MacBookPro8,3"])
                },
                "wrap_around 1": {
@@ -745,6 +756,16 @@ class SettingsFrame(wx.Frame):
                    "override_function": self._update_system_defaults,
                    "condition": gui_support.CheckProperties(self.constants).host_is_non_metal(general_check=True)
                },
+                "Disable Color Widgets Enforcement": {
+                    "type": "checkbox",
+                    "value": self._get_system_settings("Moraea_ColorWidgetDisabled"),
+                    "variable": "Moraea_ColorWidgetDisabled",
+                    "description": [
+                        "Control Color Desktop Widgets Enforcement.",
+                    ],
+                    "override_function": self._update_system_defaults,
+                    "condition": gui_support.CheckProperties(self.constants).host_is_non_metal(general_check=True)
+                },
            },
            "App": {
                "General": {
@@ -836,6 +857,7 @@ class SettingsFrame(wx.Frame):
                        "Export constants.py values to a txt file.",
                    ],
                },
+
                "Developer Root Volume Patching": {
                    "type": "title",
                },
@@ -1088,7 +1110,7 @@ Hardware Information:
            value_type = "-bool"

        logging.info(f"Updating System Defaults: {variable} = {value} ({value_type})")
-        subprocess.run(["defaults", "write", "-g", variable, value_type, str(value)])
+        subprocess.run(["/usr/bin/defaults", "write", "-globalDomain", variable, value_type, str(value)])


    def _find_parent_for_key(self, key: str) -> str:
@@ -1130,7 +1152,7 @@ Hardware Information:
        if dlg.ShowModal() != wx.ID_YES:
            return

-        macserial_output = subprocess.run([self.constants.macserial_path] + f"-g -m {self.constants.custom_model or self.constants.computer.real_model} -n 1".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        macserial_output = subprocess.run([self.constants.macserial_path, "--generate", "--model", self.constants.custom_model or self.constants.computer.real_model, "--num", "1"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
        macserial_output = macserial_output.stdout.decode().strip().split(" | ")
        if len(macserial_output) == 2:
            self.custom_serial_number_textbox.SetValue(macserial_output[0])
@@ -1234,7 +1256,7 @@ Hardware Information:


    def _get_system_settings(self, variable) -> bool:
-        result = subprocess.run(["defaults", "read", "-g", variable], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        result = subprocess.run(["/usr/bin/defaults", "read", "-globalDomain", variable], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
        if result.returncode == 0:
            try:
                return bool(int(result.stdout.decode().strip()))
@@ -1294,7 +1316,7 @@ Hardware Information:

    def on_test_exception(self, event: wx.Event) -> None:
        raise Exception("Test Exception")
-    
+
    def on_mount_root_vol(self, event: wx.Event) -> None:
        if os.geteuid() != 0:
            wx.MessageDialog(self.parent, "Please relaunch as Root to mount the Root Volume", "Error", wx.OK | wx.ICON_ERROR).ShowModal()
--- a/resources/wx_gui/gui_support.py
+++ b/resources/wx_gui/gui_support.py
@@ -64,7 +64,7 @@ class GenerateMenubar:

        self.frame.Bind(wx.EVT_MENU, lambda event: gui_about.AboutFrame(self.constants), aboutItem)
        self.frame.Bind(wx.EVT_MENU, lambda event: RelaunchApplicationAsRoot(self.frame, self.constants).relaunch(None), relaunchItem)
-        self.frame.Bind(wx.EVT_MENU, lambda event: subprocess.run(["open", "-R", self.constants.log_filepath]), revealLogItem)
+        self.frame.Bind(wx.EVT_MENU, lambda event: subprocess.run(["/usr/bin/open", "--reveal", self.constants.log_filepath]), revealLogItem)

        if os.geteuid() == 0:
            relaunchItem.Enable(False)
@@ -329,7 +329,7 @@ class RelaunchApplicationAsRoot:

        # Relaunch as root
        args = [
-            "osascript",
+            "/usr/bin/osascript",
            "-e",
            f'''do shell script "{program_arguments}"'''
            ' with prompt "OpenCore Legacy Patcher needs administrator privileges to relaunch as admin."'
--- a/resources/wx_gui/gui_sys_patch_start.py
+++ b/resources/wx_gui/gui_sys_patch_start.py
@@ -318,7 +318,7 @@ class SysPatchStartFrame(wx.Frame):
        if answer == wx.ID_YES:
            output =subprocess.run(
                [
-                    "osascript", "-e",
+                    "/usr/bin/osascript", "-e",
                    'tell app "System Preferences" to activate',
                    "-e", 'tell app "System Preferences" to reveal anchor "General" of pane id "com.apple.preference.security"',
                ],
@@ -327,7 +327,7 @@ class SysPatchStartFrame(wx.Frame):
            )
            if output.returncode != 0:
                # Some form of fallback if unaccelerated state errors out
-                subprocess.run(["open", "-a", "System Preferences"])
+                subprocess.run(["/usr/bin/open", "-a", "System Preferences"])
            time.sleep(5)
            sys.exit(0)

--- a/resources/wx_gui/gui_update.py
+++ b/resources/wx_gui/gui_update.py
@@ -184,13 +184,13 @@ class UpdateFrame(wx.Frame):
        """
        logging.info("Extracting update")
        if Path(self.application_path).exists():
-            subprocess.run(["rm", "-rf", str(self.application_path)])
+            subprocess.run(["/bin/rm", "-rf", str(self.application_path)])

        # Some hell spawn at Github decided to double zip our Github Actions artifacts
        # So we need to unzip it twice
        for i in range(2):
            result = subprocess.run(
-                ["ditto", "-xk", str(self.constants.payload_path / "OpenCore-Patcher-GUI.app.zip"), str(self.constants.payload_path)], capture_output=True
+                ["/usr/bin/ditto", "-xk", str(self.constants.payload_path / "OpenCore-Patcher-GUI.app.zip"), str(self.constants.payload_path)], capture_output=True
            )
            if result.returncode != 0:
                logging.error(f"Failed to extract update. Error: {result.stderr.decode('utf-8')}")
Author	SHA1	Message	Date
Mykola Grymalyuk	e494906f22	sys_patch_dict.py: Fix comparison	2024-03-10 17:06:07 -06:00
Mykola Grymalyuk	cdb40d8201	Sync PatcherSupportPkg	2024-03-10 14:14:38 -06:00
neon ball	b42eb6e395	Small fix	2024-03-10 21:10:10 +02:00
neon ball	20bb0cd6d8	Fix typos and stuff	2024-03-10 21:07:51 +02:00
Mykola Grymalyuk	c6688ea922	Increment build	2024-03-10 12:01:23 -06:00
neon ball	0e490e5ae9	Switch kext removal command Command cleans /Library/Extensions with a one shot instead of having to do it one by one per kext.	2024-03-08 20:18:59 +02:00
Mykola Grymalyuk	e58a671136	bluetooth.py: Fix GUID and delete variables	2024-03-07 17:57:11 -07:00
Mykola Grymalyuk	5d142fd19f	bluetooth.py: Publish Controller and Dongle NVRAM variables	2024-03-07 17:28:30 -07:00
Mykola Grymalyuk	f55598dac8	misc.py: Resolve SPI support for MacBookAir6,x	2024-03-07 17:00:52 -07:00
Mykola Grymalyuk	321cc8dd68	Increment build	2024-03-07 14:27:56 -07:00
Jazzzny	9070f5af8d	Update implementation for updater (#1126 ) * Update implementation for updater * Update changelog	2024-03-07 16:16:53 -05:00
Mykola Grymalyuk	a8c080042a	misc.py: Adjust AppleHSSPI model range	2024-02-20 13:13:21 -07:00
Eduardo Covas	5788e067b3	Resolve 14.4 T1 support	2024-02-13 11:41:23 -03:00
Mykola Grymalyuk	90d7e9715d	Sync CHANGELOG	2024-02-11 19:59:03 -07:00
Mykola Grymalyuk	f8a3d5716c	Add support for macOS 14.4	2024-02-11 14:23:05 -07:00
Mykola Grymalyuk	82084c84e3	validation.py: Add optional support for checking unused PatcherSupportPkg files	2024-02-11 13:58:37 -07:00
Mykola Grymalyuk	f29c629165	misc.py: Add SPI top case patches	2024-01-30 16:14:09 -07:00
Dhinak G	54b3e17d93	kdk_handler.py: Fix KDK matching Use sort order from API	2024-01-18 21:22:07 -05:00
Mykola Grymalyuk	2bc843dd2f	Adjust copyright label	2024-01-01 11:00:08 -07:00
Dhinak G	55eeec790f	Docs: Drop security point on homepage With Sonoma everything needs patches.	2023-12-31 17:23:28 -05:00
Mykola Grymalyuk	8db6c5607d	Sync OpenCorePkg	2023-12-30 19:12:58 -07:00
Mykola Grymalyuk	2df8dc9caf	Merge pull request #1121 from dortania/subprocess-cleanup Refactor subprocess usage	2023-12-30 14:13:39 -07:00
Mykola Grymalyuk	99f48b1e87	Sync CHANGELOG	2023-12-30 14:13:23 -07:00
Mykola Grymalyuk	0dfcf03c0c	Use full path and arguments for subprocess	2023-12-30 13:49:59 -07:00
Mykola Grymalyuk	b46e55d3f6	Clean up macserial invocation	2023-12-30 13:14:47 -07:00
Mykola Grymalyuk	62fd543623	Avoid .split() usage for subprocess	2023-12-30 13:14:20 -07:00
Mykola Grymalyuk	ec46221c30	Build-Binary.command: Remove unused import	2023-12-30 12:46:35 -07:00
Mykola Grymalyuk	e57247a233	OpenCore-Patcher-GUI.spec: Add type hinting for PyInstaller classes	2023-12-30 12:44:28 -07:00
Mykola Grymalyuk	6aa0ab2161	Increment build	2023-12-30 12:32:43 -07:00
Mykola Grymalyuk	f1210def89	sys_patch: Expand 32023 patching for 14.2 Beta 2+	2023-11-26 13:03:18 -07:00
Mykola Grymalyuk	03842d4e77	paylods: Resolve malformed CFBundleExecutable property	2023-11-26 11:11:41 -07:00
Mykola Grymalyuk	34676702f4	Merge pull request #1119 from fricklerhandwerk/fix-typos fricklerhandwerk: fix typos	2023-11-18 11:00:58 -07:00
fricklerhandwerk	352d917a7d	fix typos	2023-11-16 19:21:49 +01:00
Mykola Grymalyuk	f1b47f6a78	Increment build	2023-11-10 18:43:21 -07:00
neon ball	15d58966f6	Update DONATE.md	2023-11-10 22:24:26 +02:00
neon ball	49cb9ccb66	Reword DONATE.md	2023-11-10 19:45:10 +02:00
Mykola Grymalyuk	6841fa6f0a	Adjust versioning to 1.2.1 Release coming shortly to handle Launch Agent regression	2023-11-09 09:38:03 -07:00
Mykola Grymalyuk	5e77d7dba1	Launch Services: Remove faulty log file Launch Agents normally can’t write to `/var/log`, thus resulting in the agent failing to load.	2023-11-09 09:36:07 -07:00
Mykola Grymalyuk	fbedb6f0d2	gui_settings.py: Resolve TS2 toggle not holding	2023-11-08 11:41:29 -07:00
Mykola Grymalyuk	974a560cde	Increment build	2023-11-06 11:02:10 -07:00
Mykola Grymalyuk	5db862d38b	gui_cache: Use new `check_backups_only` property	2023-11-06 09:23:29 -07:00
Mykola Grymalyuk	139f94aae1	kdk_handler.py: Add optional `check_backups_only` property Reduces false positives for Patcher’s `—cache_os` property, where an installed KDK would match against an expected backup	2023-11-06 09:22:47 -07:00
Mykola Grymalyuk	432736eb98	Sync OpenCorePkg	2023-11-06 09:03:55 -07:00
neon ball	6e40a80650	Fix Mac mini model	2023-11-05 14:19:14 +02:00
Eduardo Covas	21e1b73a4e	Sync changelog	2023-11-04 19:31:51 -03:00
neon ball	d9676afe43	Fix Mac mini model	2023-11-04 20:27:01 +02:00
Jazzzny	525c7c3173	Migrate to font_factory (#1118 )	2023-11-02 20:10:44 -04:00
Eduardo Covas	51ef3fe719	Sync PatcherSupportPkg	2023-11-02 15:21:32 -03:00
Mykola Grymalyuk	c6f5ceacfd	os_update.py: Skip 10s wait if user approved immediately	2023-11-01 21:59:39 -06:00
Mykola Grymalyuk	55801e80bd	Add support for KDK caching	2023-11-01 21:55:29 -06:00
Mykola Grymalyuk	4196a7b5f2	Paylods: Move launch service files	2023-11-01 19:43:46 -06:00
Mykola Grymalyuk	f0d6faab9a	sys_patch_detect.py: Allow optional OS overrides For detecting patches for an incoming OS	2023-11-01 13:36:31 -06:00
Mykola Grymalyuk	6b00caf883	firmware.py: Add handling for iMac18,2 4K display	2023-11-01 07:27:01 -06:00
Mykola Grymalyuk	d98a653082	Merge branch 'main' of https://github.com/dortania/OpenCore-Legacy-Patcher	2023-11-01 07:25:19 -06:00
Mykola Grymalyuk	6d026290ac	constants.py: Load icons from relative resources Resolves issues with icons failing to load on macOS download UI	2023-11-01 07:18:06 -06:00
Eduardo Covas	39e58b3927	Sync PatcherSupportPkg	2023-10-31 21:35:38 -03:00
neon ball	8cfc33e704	Update UNINSTALL.md	2023-10-30 01:10:14 +02:00
neon ball	2b1beff6dc	Update UNINSTALL.md	2023-10-30 01:06:41 +02:00
neon ball	d23e483542	Update UNINSTALL.md	2023-10-30 00:59:22 +02:00
Mykola Grymalyuk	d57a758c73	kdk_handler.py: Add support for optional backup without installation	2023-10-26 10:02:19 -06:00
Mykola Grymalyuk	16b2f1ff55	Move LA/LD order	2023-10-25 21:53:05 -06:00
Mykola Grymalyuk	ba0a676ca0	Add new daemon for update handling Currently developed to handle bug in macOS Sonoma that fails to clear problamatic kernel extensions in /Library/Extensions which could result in update failures from 14.0 to 14.1	2023-10-25 21:33:34 -06:00
neon ball	2ff132cb04	Small command and wording change	2023-10-26 01:13:57 +03:00
Eduardo Covas	613748488c	Resolve non-Metal Photos app crash	2023-10-24 14:11:26 -03:00
Jazzzny	f23c9268f9	Readme update (#1115 ) * Update DOCS * Update README	2023-10-24 08:15:05 -04:00
Mykola Grymalyuk	7160f34a85	device_probe.py: Add handling for T1s in DFU mode	2023-10-23 18:00:58 -06:00
Jazzzny	6767f58047	Update DOCS (#1114 )	2023-10-23 18:41:25 -04:00
Mykola Grymalyuk	1e781dccb3	Merge pull request #1113 from Jazzzny/readme-update Update UI to take nightlies into account	2023-10-23 14:57:21 -06:00
Jazzzny	7e7a5d0f35	Remove temp change	2023-10-23 14:24:27 -04:00
Jazzzny	f91c817fce	Fix crash when rate limited, nightly naming chng.	2023-10-23 14:22:42 -04:00
Jazzzny	173f77cc31	Follow semver	2023-10-23 13:41:03 -04:00
Jazzzny	94f870ef5b	Merge branch 'dortania:main' into readme-update	2023-10-23 13:37:18 -04:00
Mykola Grymalyuk	1641e2522b	Increment build	2023-10-23 11:33:39 -06:00
Mykola Grymalyuk	60f403d4b4	Remove NVMeFix.kext MaxKernel Sonoma support resolved with NVMeFix v1.1.1	2023-10-23 10:40:11 -06:00
Jazzzny	a8a6e609f4	Update WINDOWS.md (#1112 ) * Update WINDOWS.md * Fix change	2023-10-22 13:51:27 -04:00
Jazzzny	de7d024c8f	Fix change	2023-10-22 13:49:30 -04:00
Jazzzny	253b8b40a0	Update WINDOWS.md	2023-10-22 13:48:05 -04:00
Mykola Grymalyuk	331d5c7b49	Remove ParavirtualizedGraphics.framework downgrade Determined to be ineffective for 3802-based GPUs	2023-10-21 10:06:55 -06:00
Mykola Grymalyuk	edbfa951c8	Merge pull request #1110 from dortania/vault_2 Security - Enable vaulting by default	2023-10-21 10:02:46 -06:00
neon ball	3f828d0d69	Merge pull request #1111 from crystall1nedev/migration-assistant Add note about Migration Assistant	2023-10-21 19:01:49 +03:00
neon ball	e6a33ed26b	Merge branch 'main' into migration-assistant	2023-10-21 19:00:57 +03:00
Mykola Grymalyuk	59e9ddfe3e	Merge branch 'main' into vault_2	2023-10-21 09:59:57 -06:00
Mykola Grymalyuk	c27998a881	Merge pull request #1105 from Jazzzny/readme-update GUI - Refresh update menu	2023-10-21 09:57:52 -06:00
Mykola Grymalyuk	faa6b1e770	Merge branch 'main' into readme-update	2023-10-21 09:55:39 -06:00
neon ball	c8b02a8e28	Update config.js	2023-10-21 18:49:29 +03:00
neon ball	03713c3f7b	Delete docs/TESTED.md Removing due to being out of date constantly and no longer really relevant.	2023-10-21 18:48:21 +03:00
Eva Isabella Luna	64cab85704	Add note about Migration Assistant	2023-10-19 00:14:02 -04:00
neon ball	957dd4b9ff	Add Bluetooth workaround	2023-10-18 19:09:05 +03:00
Mykola Grymalyuk	d83f8ee381	Sync PatcherSupportPkg	2023-10-15 18:06:41 -06:00
Mykola Grymalyuk	14e5772b44	security.py: Clean whitespace	2023-10-15 18:03:51 -06:00
neon ball	23ee732078	Change model, remove tested/tested by	2023-10-15 23:01:03 +03:00
Mykola Grymalyuk	457615a161	Sync PatcherSupportPkg	2023-10-15 13:47:01 -06:00
Mykola Grymalyuk	2ec63ce006	utilities.py: Fix formatting for less than a minute	2023-10-15 00:37:40 -06:00
Mykola Grymalyuk	7c23220416	sys_patch_dict.py: Adjust pathing	2023-10-14 23:34:27 -06:00
Mykola Grymalyuk	1aee2e5dfa	sys_patch: Add T1 support	2023-10-14 22:32:00 -06:00
Mykola Grymalyuk	760db35d15	sys_patch: Resolve PCIe Camera on 14.1	2023-10-14 21:55:29 -06:00
Mykola Grymalyuk	af57596559	sys_patch: Add OHCI/UHCI downgrade	2023-10-14 20:35:17 -06:00
Mykola Grymalyuk	51954d3b6a	firmware.py: Add path check for OpenLegacyBoot.efi	2023-10-14 19:15:26 -06:00
neon ball	9e485a5997	Add link to Metal GPU issue for supported models	2023-10-12 22:03:26 +03:00
neon ball	379eb56eb5	Add Sonoma UC models These are not tested, so YMMV.	2023-10-08 14:04:04 +03:00
Jazzzny	a483e713ae	remove file	2023-10-07 17:29:53 -04:00
Jazzzny	0877d4b4be	i	2023-10-07 17:29:29 -04:00
Jazzzny	b5a876ffd7	push	2023-10-07 17:27:03 -04:00
Eduardo Covas	5924ab507c	Resolve Paravirtualized Graphics support for 3802 GPUs on macOS Sonoma	2023-10-07 09:31:04 -03:00
Jazzzny	f4a8cbbea9	changelog eta	2023-10-06 20:52:26 -04:00
neon ball	86ce62a7d6	Fix repetition of same word	2023-10-07 03:49:31 +03:00
Mykola Grymalyuk	8aace2d2c9	Merge branch 'main' of https://github.com/dortania/OpenCore-Legacy-Patcher # Conflicts: # CHANGELOG.md # resources/constants.py	2023-10-06 16:44:37 -06:00
Mykola Grymalyuk	815eb8f270	firmware.py: Tag links for historical tracking	2023-10-06 16:39:20 -06:00
Jazzzny	c7471fc64b	Update CHANGELOG	2023-10-06 18:08:09 -04:00
Jazzzny	f968a493b9	Add new vaulting implementation	2023-10-06 16:09:44 -04:00
Jazzzny	5e61f0c61f	Add universal vaulting files	2023-10-06 15:53:08 -04:00
Eduardo Covas	38188a5ccb	Sync PatcherSupportPkg	2023-10-06 14:16:26 -03:00
Eduardo Covas	ba88b5be82	Increment build	2023-10-06 14:01:19 -03:00
Mykola Grymalyuk	a41bbb8267	Merge branch 'main' of https://github.com/dortania/OpenCore-Legacy-Patcher	2023-10-06 09:44:30 -06:00
Eva Isabella Luna	2c428aa3dd	Update MODELS.md for Sonoma (#1108 ) * Sonoma models.md * Other small thing * Resolve incorrect Legacy Metal entries --------- Co-authored-by: Michael McAuliff <michaeltechse@gmail.com> Co-authored-by: Michael <68412795+TheMasterOfMike@users.noreply.github.com>	2023-10-06 00:23:08 -04:00
Jazzzny	4429b5cb4b	Changes	2023-10-04 18:01:05 -04:00
Jazzzny	526594a90d	Fix up	2023-10-04 17:12:51 -04:00
Jazzzny	04a2e55d24	Merge branch 'main' into readme-update	2023-10-04 16:28:35 -04:00
neon ball	7aff1794c6	Fix v2	2023-10-04 22:53:59 +03:00
neon ball	e8f8f1bd93	Fix wording	2023-10-04 22:49:24 +03:00
Mykola Grymalyuk	cba33c1e82	Sync Kexts	2023-10-03 15:49:12 -06:00
Mykola Grymalyuk	a26120a376	Increment build	2023-10-03 15:47:16 -06:00
neon ball	9982d43d5a	Add "ls /Volumes"	2023-10-03 23:53:17 +03:00
Jazzzny	8a287e7cc2	Merge branch 'dortania:main' into readme-update	2023-10-02 17:19:15 -04:00
Jazzzny	3bf92c3587	Remove logging	2023-09-29 17:54:28 -04:00
Jazzzny	ce0928ba38	Changes	2023-09-29 17:51:51 -04:00
Jazzzny	25f5ea2457	Adjust requirements.txt	2023-09-28 22:03:03 -04:00
Jazzzny	0ba93a8a2b	Merge branch 'dortania:main' into readme-update	2023-09-28 21:32:11 -04:00
Jazzzny	3e0c329e53	Add main menu portion	2023-09-28 21:31:55 -04:00