Adjust versioning to 1.2.1

Release coming shortly to handle Launch Agent regression
Launch Services: Remove faulty log file
2026-04-15 13:18:56 +10:00 · 2023-11-09 09:38:03 -07:00 · 2023-11-09 09:36:07 -07:00 · 2023-11-08 11:41:29 -07:00 · 2023-11-06 11:02:10 -07:00 · 2023-11-06 09:23:29 -07:00
209 changed files with 5166 additions and 1967 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+open_collective: opencore-legacy-patcher
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -12,7 +12,6 @@ body:
      label: Machine Model
      description: What model was being patched?
      options:
-        - MacBook4,1
        - MacBook5,1
        - MacBook5,2
        - MacBook6,1
--- a/.github/workflows/build-app-wxpython.yml
+++ b/.github/workflows/build-app-wxpython.yml
@@ -28,7 +28,7 @@ jobs:
      - uses: actions/checkout@v3

      - name: Build Binary
-        run: /Library/Frameworks/Python.framework/Versions/3.10/bin/python3 Build-Binary.command --reset_binaries --branch "${{ env.branch }}" --commit "${{ env.commiturl }}" --commit_date "${{ env.commitdate }}" --key "${{ env.ANALYTICS_KEY }}" --site "${{ env.ANALYTICS_SITE }}"
+        run: /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 Build-Binary.command --reset_binaries --branch "${{ env.branch }}" --commit "${{ env.commiturl }}" --commit_date "${{ env.commitdate }}" --key "${{ env.ANALYTICS_KEY }}" --site "${{ env.ANALYTICS_SITE }}"

      # - name: Import Certificate
      #   if: (!security find-certificate -c "${{ env.MAC_CODESIGN_IDENTITY }}")
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -14,4 +14,4 @@ jobs:
    steps:
      - uses: actions/checkout@v3
      - name: Validate
-        run: /Library/Frameworks/Python.framework/Versions/3.10/bin/python3 OpenCore-Patcher-GUI.command --validate
+        run: /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 OpenCore-Patcher-GUI.command --validate
--- a/.gitignore
+++ b/.gitignore
@@ -30,10 +30,12 @@ __pycache__/
 /payloads/OpenCore-Legacy-Patcher
 /payloads/InstallAssistant.pkg.integrityDataV1
 /payloads.dmg
+/Universal-Binaries.dmg
 /payloads/OpenCore-Legacy-Patcher-*.plist
 /payloads/KDK.dmg
 *.log
 /Universal-Binaries.dmg
 /payloads/KDKInfo.plist
 /payloads/update.sh
-/payloads/OpenCore-Patcher.app
+/payloads/OpenCore-Patcher.app
+/.x86_64_venv
--- a/Build-Binary.command
+++ b/Build-Binary.command
@@ -3,14 +3,15 @@
 # Generate stand alone application for OpenCore-Patcher
 # Copyright (C) 2022-2023 - Mykola Grymalyuk

-from pathlib import Path
+import os
+import sys
 import time
 import argparse
-import os
-import subprocess
 import plistlib
-import time
-import sys
+import platform
+import subprocess
+
+from pathlib import Path

 from resources import constants

@@ -20,7 +21,7 @@ class CreateBinary:
    Library for creating OpenCore-Patcher application

    This script's main purpose is to handle the following:
-       - Download external dependancies (ex. PatcherSupportPkg)
+       - Download external dependencies (ex. PatcherSupportPkg)
       - Convert payloads directory into DMG
       - Build Binary via Pyinstaller
       - Patch 'LC_VERSION_MIN_MACOSX' to OS X 10.10
@@ -30,11 +31,12 @@ class CreateBinary:

    def __init__(self):
        start = time.time()
-        print("Starting build script")
+        self._set_cwd()

+        print("Starting build script")
        self.args = self._parse_arguments()

-        self._set_cwd()
+        print(f"Current Working Directory:\n- {os.getcwd()}")

        self._preflight_processes()
        self._build_binary()
@@ -48,7 +50,6 @@ class CreateBinary:
        """

        os.chdir(Path(__file__).resolve().parent)
-        print(f"Current Working Directory:\n- {os.getcwd()}")


    def _parse_arguments(self):
@@ -235,11 +236,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",
@@ -275,7 +275,10 @@ class CreateBinary:
        for resource in required_resources:
            if Path(f"./{resource}").exists():
                if self.args.reset_binaries:
-                    print(f"- Removing old {resource}")
+                    print(f"  - Removing old {resource}")
+                    # Just to be safe
+                    assert resource, "Resource cannot be empty"
+                    assert resource not in ("/", "."), "Resource cannot be root"
                    rm_output = subprocess.run(
                        ["rm", "-rf", f"./{resource}"],
                        stdout=subprocess.PIPE, stderr=subprocess.PIPE
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,169 @@
 # OpenCore Legacy Patcher changelog

+## 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:
+  - Resolve unresponsive Catalyst buttons
+  - Resolve window unfocusing issues
+  - Resolve menu bar fonts not changing color automatically with Beta Menu Bar enabled
+  - Improve Lock Screen clock transparency
+- Prevent random WiFiAgent crashes
+- 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 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
+- Workaround 13.3+ Kernel Panic on AMD GCN GPUs playing DRM content
+- Add new macOS Installer download menu (Jazzzny)
+- Refresh download UI (Jazzzny)
+- Add support for Universal 2 distribution (x86_64 and ARM64)
+  - Drops Rosetta requirement on Apple Silicon Macs
+  - Note building from source will require Python 3.11 or newer and up-to-date Python modules
+- Update font handling code, fixing font issues on Yosemite and El Capitan
+- Resolve incorrect RELEASE usage of OpenCore binaries when DEBUG enabled
+- Add RenderBox.framework patch for 3802-based Intel GPUs on macOS 13.3 and newer
+  - Works around Weather and Widget freezing
+  - Applicable for Intel Ivy Bridge and Haswell iGPUs
+- Add macOS Sonoma support to PatcherSupportPkg validation in CI
+- Implement basic support for macOS Sonoma:
+  - Supports same range of hardware as Ventura, in addition to:
+    - iMac18,x
+    - MacBook10,1
+    - MacBookPro14,x
+      - [T1 chip currently unsupported in Sonoma](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1103)
+  - Resolved issues:
+    - Graphics Acceleration support for 3802 and non-Metal GPUs
+    - UI corruption on 31001 GPUs
+    - Wireless Networking for BCM94360, 4360, 4350, 4331 and 43224
+    - USB ethernet support for adapters based on ECM protocol (ex. Realtek)
+    - dGPU support for MacBookPro14,3
+    - S1X/S3X NVMe Drive Support
+    - PCIe-based FaceTime Camera support
+    - Bluetooth support by switching to dynamic VMM spoofing
+- Increment Binaries:
+  - OpenCorePkg 0.9.3 - release
+  - Lilu 1.6.7 - release
+  - WhateverGreen 1.6.6 - release
+  - RestrictEvents 1.1.3 - (rolling - 4f233dd)
+  - FeatureUnlock 1.1.5 - release
+  - DebugEnhancer 1.0.8 - release
+  - 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
+  - Upgrade Python modules:
+    - requests - 2.31.0
+    - pyobjc - 9.2
+    - wxpython - 4.2.1
+    - pyinstaller - 5.13.2
+    - packaging - 23.1
+
+## 0.6.8
+- Update non-Metal Binaries:
+  - Improve experimental Menubar implementation stability
+  - Implement reduce transparency Menubar
+  - Resolve Color Profile support and Black Box rendering issues on HD 3000 Macs
+    - Drops ColorSync downgrade configuration option
+    - Resolves macOS 13.5 booting on HD 3000 Macs
+- Resolve app not updating in `/Applications` after an update
+  - Work-around users manually copying app to `/Applications` instead of allowing Root Volume Patcher to create a proper alias
+- Add configuration for mediaanalysisd usage
+  - For systems that are the primary iCloud Photo Library host, mediaanalysisd may be unstable on large amounts of unprocessed faces
+  - Applicable to 3802-based GPUs (ie. Intel Ivy Bridge and Haswell iGPUs, Nvidia Kepler dGPUs)
+- Remove MacBook4,1 references
+  - Machine was never properly supported by OCLP
+- Restore support for Aquantia Aqtion 10GBe Ethernet for Pre-VT-d systems on 12.3 and newer
+  - i.e. MacPro5,1 with AQC107 expansion card running macOS Ventura/Monterey 12.6.x
+  - Thanks [@jazzzny](https://github.com/jazzzny)
+- Resolve AMD Vega support on pre-AVX2 Macs in macOS Ventura
+  - Originally caused by regression from 0.6.2
+- Disable non-Metal's Menubar 2 configuration
+  - Can be manually re-enabled, however application will try to disable to prevent issues
+- Remove AppleGVA downgrade on Intel Skylake iGPUs
+- Implement AMFIPass system
+  - Removes need for disabling Library Validation and AMFI outright on all applicable systems
+- Backend Changes:
+  - device_probe.py:
+    - Add USB device parsing via `IOUSBDevice` class
+    - Streamline Bluetooth device detection
+    - Add Probing for Top Case hardware (Jazzzny)
+      - Improves handling for altered hardware scenarios (i.e. MacBookPro4,1 with MacBookPro3,1 topcase)
+  - utilities.py:
+    - Fix indexing error on Device Paths (thx [@Ausdauersportler](https://github.com/Ausdauersportler))
+- Increment Binaries:
+- PatcherSupportPkg 1.2.2 - release
+
 ## 0.6.7
 - Resolve partition buttons overlapping in Install OpenCore UI
  - ex. "EFI" and additional FAT32 partitions on a single drive
 - Re-enable mediaanalysisd on Ventura
-  - Allows for Live Text support on systems with3802 GPUs
+  - Allows for Live Text support on systems with 3802 GPUs
    - ie. Intel Ivy Bridge and Haswell, Nvidia Kepler
  - Previously disabled due to high instability in Photos with Face Scanning, now resolved
 - Work-around crashing after patching with MenuBar2 implementation enabled
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -8,7 +8,7 @@ Redistribution and use in source and binary forms, with or without modification,
 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 3. All advertising materials mentioning features or use of this software must display the following acknowledgement:
-This product includes software developed by the organization.
-4. Neither the name of the copyright holder nor the names the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+This product includes software developed by Dortania and OpenCore Legacy Patcher contributors.
+4. Neither the name of OpenCore Legacy Patcher, nor the names of Dortania, Dhinak G, or Mykola Grymalyuk may be used to endorse or promote products derived from this software without specific prior written permission.

-THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY DHINAK G AND MYKOLA GRYMALYUK "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DHINAK G NOR MYKOLA GRYMALYUK BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/OpenCore-Patcher-GUI.spec
+++ b/OpenCore-Patcher-GUI.spec
@@ -1,15 +1,23 @@
 # -*- mode: python ; coding: utf-8 -*-

-import sys, os, time, subprocess
+import sys, os, time, subprocess, pathlib
 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():
+   datas.append(('DortaniaInternalResources.dmg', '.'))
+

 a = Analysis(['OpenCore-Patcher-GUI.command'],
             pathex=[],
             binaries=[],
-             datas=[('payloads.dmg', '.'), ('Universal-Binaries.dmg', '.')],
+             datas=datas,
             hiddenimports=[],
             hookspath=[],
             hooksconfig={},
@@ -33,7 +41,7 @@ exe = EXE(pyz,
          upx=True,
          console=False,
          disable_windowed_traceback=False,
-          target_arch=None,
+          target_arch="universal2",
          codesign_identity=None,
          entitlements_file=None )
 coll = COLLECT(exe,
--- 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)

@@ -93,6 +93,14 @@ To run the project from source, see here: [Build and run from source](./SOURCE.m
  * [FixPCIeLinkrate](https://github.com/joevt/joevtApps)
 * [Jazzzny](https://github.com/Jazzzny)
  * Research and various contributions to the project
+  * UEFI Legacy XHCI research and development
+  * NVIDIA OpenCL research and development
+  * `MacBook5,2` research and development
+    * LegacyKeyboardInjector
+  * 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/cpu_data.py
+++ b/data/cpu_data.py
@@ -1,24 +1,21 @@
 import enum


-class cpu_data(enum.IntEnum):
-    pentium_4 = 0
-    yonah = 1
-    conroe = 2
-    penryn = 3
-    nehalem = 4  # (Westmere included)
-    sandy_bridge = 5  #     2000
-    ivy_bridge = 6  #       3000
-    haswell = 7  #       4000
-    broadwell = 8  #       5000
-    skylake = 9  #       6000
-    kaby_lake = 10  #       7000
-    coffee_lake = 11  #     8000
-    comet_lake = 12  #       9000
-    ice_lake = 13  #        10000
+class CPUGen(enum.IntEnum):
+    pentium_4     = 0
+    yonah         = 1
+    conroe        = 2
+    penryn        = 3
+    nehalem       = 4    # (Westmere included)
+    sandy_bridge  = 5    # 2000
+    ivy_bridge    = 6    # 3000
+    haswell       = 7    # 4000
+    broadwell     = 8    # 5000
+    skylake       = 9    # 6000
+    kaby_lake     = 10   # 7000
+    coffee_lake   = 11   # 8000/9000
+    comet_lake    = 12   # 10000
+    ice_lake      = 13   # 10000

-    apple_dtk = 112  # A12
-    apple_m1 = 114  # A14
-    apple_m1_pro = 115
-    apple_m1_max = 116
-    apple_m1_ultra = 117
+    apple_dtk     = 100  # A12
+    apple_silicon = 101  # A14 and newer (not tracked beyond this point)
--- a/data/model_array.py
+++ b/data/model_array.py
@@ -2,13 +2,13 @@
 # Copyright (C) 2020-2022, Dhinak G, Mykola Grymalyuk
 SupportedSMBIOS = [
    # MacBook
-    "MacBook4,1",
    "MacBook5,1",
    "MacBook5,2",
    "MacBook6,1",
    "MacBook7,1",
    "MacBook8,1",
    "MacBook9,1",
+    "MacBook10,1",
    # MacBook Air
    "MacBookAir2,1",
    "MacBookAir3,1",
@@ -47,6 +47,9 @@ SupportedSMBIOS = [
    "MacBookPro13,1",
    "MacBookPro13,2",
    "MacBookPro13,3",
+    "MacBookPro14,1",
+    "MacBookPro14,2",
+    "MacBookPro14,3",
    # Mac Mini
    "Macmini3,1",
    "Macmini4,1",
@@ -77,6 +80,9 @@ SupportedSMBIOS = [
    "iMac16,1",
    "iMac16,2",
    "iMac17,1",
+    "iMac18,1",
+    "iMac18,2",
+    "iMac18,3",
    # Mac Pro
    "MacPro3,1",
    "MacPro4,1",
@@ -90,7 +96,6 @@ SupportedSMBIOS = [
 # Audio

 LegacyAudio = [
-    "MacBook4,1",
    "MacBook5,1",
    "MacBook5,2",
    "MacBook6,1",
@@ -175,7 +180,6 @@ ModernGPU = [
 ]

 LegacyGPU = [
-    "MacBook4,1",  # GMA X3100
    "MacBook5,1",  # Nvidia 9000
    "MacBook5,2",  # Nvidia 9000
    "MacBook6,1",  # Nvidia 9000
@@ -252,7 +256,7 @@ MacPro = ["MacPro3,1", "MacPro4,1", "MacPro5,1", "Xserve2,1", "Xserve3,1", "Dort
 # MXM iMac
 MXMiMac = ["iMac11,1", "iMac11,2", "iMac11,3", "iMac10,1", "iMac12,1", "iMac12,2", "Dortania1,1"]

-NoAGPMSupport = ["MacBook4,1", "MacBookPro4,1", "iMac7,1", "iMac8,1", "MacPro3,1", "Xserve2,1", "Dortania1,1"]
+NoAGPMSupport = ["MacBookPro4,1", "iMac7,1", "iMac8,1", "MacPro3,1", "Xserve2,1", "Dortania1,1"]

 AGDPSupport = [
    "MacBookPro9,1",
@@ -277,7 +281,6 @@ AGDPSupport = [
 ]

 Missing_USB_Map = [
-    "MacBook4,1",
    "MacBook5,1",
    "MacBook5,2",
    "MacBook6,1",
--- a/data/os_data.py
+++ b/data/os_data.py
@@ -23,6 +23,7 @@ class os_data(enum.IntEnum):
    big_sur =       20
    monterey =      21
    ventura =       22
+    sonoma =        23
    max_os =        99


--- a/data/pci_data.py
+++ b/data/pci_data.py
@@ -411,6 +411,7 @@ class nvidia_ids:
    kepler_ids = [
        # GK104
        0x1180,  # GK104 [GTX 680]
+        0x1182,  # GK104 [GTX 760 Ti]
        0x1183,  # GK104 [GTX 660 Ti]
        0x1184,  # GK104 [GTX 770]
        0x1185,  # GK104 [GTX 660]
@@ -418,88 +419,136 @@ class nvidia_ids:
        0x1187,  # GK104 [GTX 760]
        0x1188,  # GK104 [GTX 690]
        0x1189,  # GK104 [GTX 670]
+        0x118a,  # GK104GL [GRID K520]
+        0x118b,  # GK104GL [GRID K2 GeForce USM]
+        0x118c,  # GK104 [GRID K2 NVS USM]
+        0x118d,  # GK104GL [GRID K200 vGPU]
        0x118E,  # GK104 [GTX 760 OEM]
        0x118F,  # GK104GL [Tesla K10]
-        0x1198,  # GTX 880M
-        0x1199,  # GK104 [GTX 870M]
-        0x119A,  # GTX 860M
+        0x1191,  # GK104 [GTX 760 Rev. 2]
+        0x1193,	 # GK104 [GTX 760 Ti OEM]
+        0x1194,  # GK104GL [Tesla K8]
+        0x1195,  # GK104 [GTX 660 Rev. 2]
+        0x1198,  # GK104M [GTX 880M]
+        0x1199,  # GK104M [GTX 870M]
+        0x119A,  # GK104M [GTX 860M]
        0x119D,  # GK104M [GTX 775M Mac Edition]
-        0x119E,  # GTX 780M
+        0x119E,  # GK104M [GTX 780M Mac Edition]
        0x119F,  # GK104 [GTX 780M]
        0x11A0,  # GK104 [GTX 680M]
        0x11A1,  # GK104 [GTX 670MX]
-        0x11A2,  # GK104 [GTX 675MX]
+        0x11A2,  # GK104 [GTX 675MX Mac Edition]
        0x11A3,  # GK104 [GTX 680MX]
        0x11A7,  # GK104 [GTX 675MX]
-        0x11A9,  # GTX 870M
+        0x11A8,  # GK104GLM [Quadro K5100M]
+        0x11A9,  # GK104M [GTX 870M]
+        0x11AF,  # GK104GLM [GRID IceCube]
+        0x11B0,  # GK104GL [GRID K240Q / K260Q vGPU]
+        0x11B1,  # GK104GL [GRID K2 Tesla USM]
        0x11B4,  # GK104GL [Quadro K4200]
-        0x11B6,  # Quadro K3100M
-        0x11B7,  # Quadro K4100M
-        0x11B8,  # Quadro K5100M
-        0x11BA,  # GK104 [K5000]
-        0x11BC,  # GK104 [K5000M]
-        0x11BD,  # GK104 [K4000M]
-        0x11BE,  # GK104 [K3000M]
+        0x11B6,  # GK104GLM [Quadro K3100M]
+        0x11B7,  # GK104GLM [Quadro K4100M]
+        0x11B8,  # GK104GLM [Quadro K5100M]
+        0x11B9,  # GK104GLM
+        0x11BA,  # GK104GL [Quadro K5000]
+        0x11BC,  # GK104GLM [Quadro K5000M]
+        0x11BD,  # GK104GLM [Quadro K4000M]
+        0x11BE,  # GK104GLM [Quadro K3000M]
        0x11BF,  # GK104 [GRID K2]
        # GK106
        0x11C0,  # GK106 [GTX 660]
        0x11C2,  # GK106 [GTX 650 Ti BOOST]
+        0x11c3,  # GK106 [GTX 650 Ti OEM]
+        0x11c4,  # GK106 [GTX 645 OEM]
+        0x11c5,  # GK106 [GT 740]
        0x11C6,  # GK106 [GTX 650 Ti]
+        0x11C7,  # GK106 [GTX 750 Ti]
+        0x11C8,  # GK106 [GTX 650 OEM]
        0x11E0,  # GK106 [GTX 770M]
-        0x11E1,  # GTX 765M
-        0x11E2,  # GTX 765M
-        0x11FA,  # GK106 [K4000]
-        0x11FC,  # Quadro K2100M
+        0x11CB,  # GK106 [GT 740]
+        0x11E0,  # GK106M [GTX 770M]
+        0x11E1,  # GK106M [GTX 765M]
+        0x11E2,  # GK106M [GTX 765M]
+        0x11E3,  # GK106M [GTX 760M]
+        0x11E7,  # GK106M
+        0x11FA,  # GK106GL [Quadro K4000]
+        0x11FC,  # GL106GLM [Quadro K2100M]
        # GK107
        0x0FC0,  # GK107 [GT 640]
        0x0FC1,  # GK107 [GT 640]
        0x0FC2,  # GK107 [GT 630]
+        0x0FC5,  # GK107 [GT 1030]
        0x0FC6,  # GK107 [GTX 650]
        0x0FC8,  # GK107 [GT 740]
+        0x0FC9,  # GK107 [GT 730]
        0x0FCD,  # GK107M [GT 755M]
+        0x0FCE,  # GK107M [GT 640M LE]
        0x0FD1,  # GK107 [GT 650M]
        0x0FD2,  # GK107 [GT 640M]
        0x0FD3,  # GK107 [GT 640M LE]
        0x0FD4,  # GK107 [GTX 660M]
        0x0FD5,  # GK107 [GT 650M]
+        0x0FD6,  # GK107M
        0x0FD8,  # GK107 [GT 640M]
        0x0FD9,  # GK107 [GT 645M]
-        0x0FDF,  # GK107M [ GT 740M]
+        0x0FDB,  # GK107M
+        0x0FDF,  # GK107M [GT 740M]
        0x0FE0,  # GK107 [GTX 660M]
        0x0FE1,  # GK107M [GT 730M]
+        0x0FE2,  # GK107M [GT 745M]
        0x0FE3,  # GK107M [GT 745M]
        0x0FE4,  # GK107M [GT 750M]
+        0x0FE5,  # GK107 [GeForce K340 USM]
+        0x0FE6,  # GK107 [GRID K1 NVS USM]
+        0x0FE7,  # GK107GL [GRID K100 vGPU]
+        0x0FE8,  # GK107M [N14P-GS]
        0x0FE9,  # GK107 [GT 750M Mac Edition]
        0x0FEA,  # GK107M [GT 755M Mac Edition]
+        0x0FEC,  # GK107M [710A]
        0x0FEE,  # GK107M [810M]
+        0x0FED,  # GK107M [820M]
+        0x0FEF,  # GK107GL [GRID K340]
+        0x0FF1,  # GK107 [NVS 1000]
        0x0FF2,  # GK107GL [GRID K1]
        0x0FF3,  # GK107GL [Quadro K420]
-        0x0FF6,  # Quadro K1100M
+        0x0FF5,  # GK107GL [GRID K1 Tesla USM]
+        0x0FF6,  # GK107GLM [Quadro K1100M]
+        0x0FF7,  # GK107GL [GRID K140Q vGPU]
+        0x0FF8,  # GK107GLM [Quadro K500M]
        0x0FF9,  # GK107 [K2000D]
        0x0FFA,  # GK107 [K600]
        0x0FFB,  # GK107 [K2000M]
        0x0FFC,  # GK107 [K1000M]
        0x0FFD,  # GK107 [NVS 510]
-        0x0FFE,  # GK107 [K2000]
-        0x0FFF,  # GK107 [410]
+        0x0FFE,  # GK107 [Quadro K2000]
+        0x0FFF,  # GK107 [Quadro 410]
        # GK110
        0x1001,  # GK110B [GTX TITAN Z]
        0x1003,  # GK110 [GTX Titan LE]
        0x1004,  # GK110 [GTX 780]
        0x1005,  # GK110 [GTX Titan]
        0x1007,  # GK110 [GTX 780 Rev. 2]
+        0x1008,  # GK110 [GTX 780 Ti 6GB]
        0x100A,  # GK110B [GTX 780 Ti]
        0x100C,  # GK110B [GTX TITAN Black]
-        0x101F,  # GK110 [TEslA K20]
-        0x1020,  # GK110 [TEslA K2]
-        0x1021,  # GK110 [TEslA K2m]
-        0x1022,  # GK110 [TEslA K20C]
+        0x101E,  # GK110GL [Tesla K20X]
+        0x101F,  # GK110GL [Tesla K20]
+        0x1020,  # GK110GL [Tesla K20X]
+        0x1021,  # GK110GL [Tesla K20Xm]
+        0x1022,  # GK110GL [Tesla K20C]
        0x1023,  # GK110BGL [Tesla K40m]
-        0x1024,  # GK180GL [Tesla K40c]
-        0x1026,  # GK110 [TEslA K20s]
-        0x1028,  # GK110 [TEslA K20m]
-        0x102D,  # GK210GL [Tesla K80]
+        0x1026,  # GK110GL [Tesla K20s]
+        0x1027,  # GK110BGL [Tesla K40st]
+        0x1028,  # GK110GL [Tesla K20m]
+        0x1029,  # GK110BGL [Tesla K40s]
+        0x102A,  # GK110BGL [Tesla K40t]
+        0x102E,  # GK110BGL [Tesla K40d]
+        0x102F,  # GK110BGL [Tesla Stella Solo]
+        0x103A,  # GK110GL [Quadro K6000]
        0x103C,  # GK110GL [Quadro K5200]
+        0x103F,  # GK110BGL [Tesla Stella SXM]
+        # GK180
+        0x1024,  # GK180GL [Tesla K40c]
        # GK208
        0x1280,  # GK208 [GT 635]
        0x1281,  # GK208 [GT 710]
@@ -509,7 +558,9 @@ class nvidia_ids:
        0x1287,  # GK208B [GT 730]
        0x1288,  # GK208B [GT 720]
        0x1289,  # GK208 [GT 710]
+        0x128A,  # GK208B
        0x128B,  # GK208B [GT 710]
+        0x128C,  # GK208B
        0x1290,  # GK208 [GT 730M]
        0x1291,  # GK208 [GT 735M]
        0x1292,  # GK208 [GT 740M]
@@ -520,8 +571,11 @@ class nvidia_ids:
        0x1298,  # GK208M [GT 720M]
        0x1299,  # GK208BM [920M]
        0x129A,  # GK208BM [910M]
+        0x12A0,  # GK208
        0x12B9,  # GK208 [K610M]
        0x12BA,  # GK208 [K510M]
+        # GK210
+        0x102D,  # GK210GL [Tesla K80]
    ]


@@ -540,21 +594,23 @@ class nvidia_ids:
        0x137a,	# GM108GLM [Quadro K620M / Quadro M500M]
        0x137b,	# GM108GLM [Quadro M520 Mobile]
        0x137d,	# GM108M [GeForce 940A]
+        0x174d, # GM108M [GeForce MX130]
+        0x174e, # GM108M [GeForce MX110]

-        0x1380,	# GM107 [GeForce GTX 750 Ti]
-        0x1381,	# GM107 [GeForce GTX 750]
-        0x1382,	# GM107 [GeForce GTX 745]
+        0x1380,	# GM107 [GTX 750 Ti]
+        0x1381,	# GM107 [GTX 750]
+        0x1382,	# GM107 [GTX 745]
        0x1389,	# GM107GL [GRID M30]
        0x1390,	# GM107M [GeForce 845M]
-        0x1391,	# GM107M [GeForce GTX 850M]
-        0x1392,	# GM107M [GeForce GTX 860M]
+        0x1391,	# GM107M [GTX 850M]
+        0x1392,	# GM107M [GTX 860M]
        0x1393,	# GM107M [GeForce 840M]
        0x1398,	# GM107M [GeForce 845M]
        0x1399,	# GM107M [GeForce 945M]
-        0x139a,	# GM107M [GeForce GTX 950M]
-        0x139b,	# GM107M [GeForce GTX 960M]
+        0x139a,	# GM107M [GTX 950M]
+        0x139b,	# GM107M [GTX 960M]
        0x139c,	# GM107M [GeForce 940M]
-        0x139d,	# GM107M [GeForce GTX 750 Ti]
+        0x139d,	# GM107M [GTX 750 Ti]
        0x13b0,	# GM107GLM [Quadro M2000M]
        0x13b1,	# GM107GLM [Quadro M1000M]
        0x13b2,	# GM107GLM [Quadro M600M]
@@ -566,16 +622,24 @@ class nvidia_ids:
        0x13bb,	# GM107GL [Quadro K620]
        0x13bc,	# GM107GL [Quadro K1200]
        0x13bd,	# GM107GL [Tesla M10]
+        0x1789, # GM107GL [GRID M3-3020]
+        0x179c, # GM107 [GeForce 940MX]

-        0x13c0,	# GM204 [GeForce GTX 980]
+        0x17c2, # GM200 [GTX TITAN X]
+        0x17c8, # GM200 [GTX 980 Ti]
+        0x17f0,	# GM200GL [Quadro M6000]
+        0x17f1, # GM200GL [Quadro M6000 24GB]
+        0x17fd, # GM200GL [Tesla M40]
+
+        0x13c0,	# GM204 [GTX 980]
        0x13c1,	# GM204
-        0x13c2,	# GM204 [GeForce GTX 970]
+        0x13c2,	# GM204 [GTX 970]
        0x13c3,	# GM204
-        0x13d7,	# GM204M [GeForce GTX 980M]
-        0x13d8,	# GM204M [GeForce GTX 970M]
-        0x13d9,	# GM204M [GeForce GTX 965M]
-        0x13da,	# GM204M [GeForce GTX 980 Mobile]
-        0x13e7,	# GM204GL [GeForce GTX 980 Engineering Sample]
+        0x13d7,	# GM204M [GTX 980M]
+        0x13d8,	# GM204M [GTX 970M]
+        0x13d9,	# GM204M [GTX 965M]
+        0x13da,	# GM204M [GTX 980 Mobile]
+        0x13e7,	# GM204GL [GTX 980 Engineering Sample]
        0x13f0,	# GM204GL [Quadro M5000]
        0x13f1,	# GM204GL [Quadro M4000]
        0x13f2,	# GM204GL [Tesla M60]
@@ -585,18 +649,21 @@ class nvidia_ids:
        0x13fa,	# GM204GLM [Quadro M3000M]
        0x13fb,	# GM204GLM [Quadro M5500]

-        0x1401,	# GM206 [GeForce GTX 960]
-        0x1402,	# GM206 [GeForce GTX 950]
-        0x1404,	# GM206 [GeForce GTX 960 FAKE]
-        0x1406,	# GM206 [GeForce GTX 960 OEM]
-        0x1407,	# GM206 [GeForce GTX 750 v2]
-        0x1427,	# GM206M [GeForce GTX 965M]
+        0x1401,	# GM206 [GTX 960]
+        0x1402,	# GM206 [GTX 950]
+        0x1404,	# GM206 [GTX 960 FAKE]
+        0x1406,	# GM206 [GTX 960 OEM]
+        0x1407,	# GM206 [GTX 750 v2]
+        0x1427,	# GM206M [GTX 965M]
        0x1430,	# GM206GL [Quadro M2000]
        0x1431,	# GM206GL [Tesla M4]
        0x1436,	# GM206GLM [Quadro M2200 Mobile]
    ]

    pascal_ids = [
+        0x1725,
+        0x172e,
+        0x172f,
        0x15f0,	# GP100GL [Quadro GP100]
        0x15f1,	# GP100GL
        0x15f7,	# GP100GL [Tesla P100 PCIe 12GB]
@@ -604,10 +671,10 @@ class nvidia_ids:
        0x15f9,	# GP100GL [Tesla P100 SXM2 16GB]

        0x1b00,	# GP102 [TITAN X]
-        0x1b01,	# GP102 [GeForce GTX 1080 Ti 10GB]
+        0x1b01,	# GP102 [GTX 1080 Ti 10GB]
        0x1b02,	# GP102 [TITAN Xp]
        0x1b04,	# GP102
-        0x1b06,	# GP102 [GeForce GTX 1080 Ti]
+        0x1b06,	# GP102 [GTX 1080 Ti]
        0x1b07,	# GP102 [P102-100]
        0x1b30,	# GP102GL [Quadro P6000]
        0x1b38,	# GP102GL [Tesla P40]
@@ -615,18 +682,18 @@ class nvidia_ids:
        0x1b70,	# GP102GL
        0x1b78,	# GP102GL

-        0x1b80,	# GP104 [GeForce GTX 1080]
-        0x1b81,	# GP104 [GeForce GTX 1070]
-        0x1b82,	# GP104 [GeForce GTX 1070 Ti]
-        0x1b83,	# GP104 [GeForce GTX 1060 6GB]
-        0x1b84,	# GP104 [GeForce GTX 1060 3GB]
+        0x1b80,	# GP104 [GTX 1080]
+        0x1b81,	# GP104 [GTX 1070]
+        0x1b82,	# GP104 [GTX 1070 Ti]
+        0x1b83,	# GP104 [GTX 1060 6GB]
+        0x1b84,	# GP104 [GTX 1060 3GB]
        0x1b87,	# GP104 [P104-100]
-        0x1ba0,	# GP104M [GeForce GTX 1080 Mobile]
-        0x1ba1,	# GP104M [GeForce GTX 1070 Mobile]
-        0x1ba2,	# GP104M [GeForce GTX 1070 Mobile]
+        0x1ba0,	# GP104M [GTX 1080 Mobile]
+        0x1ba1,	# GP104M [GTX 1070 Mobile]
+        0x1ba2,	# GP104M [GTX 1070 Mobile]
        0x1ba9,	# GP104M
        0x1baa,	# GP104M
-        0x1bad,	# GP104 [GeForce GTX 1070 Engineering Sample]
+        0x1bad,	# GP104 [GTX 1070 Engineering Sample]
        0x1bb0,	# GP104GL [Quadro P5000]
        0x1bb1,	# GP104GL [Quadro P4000]
        0x1bb3,	# GP104GL [Tesla P4]
@@ -638,42 +705,42 @@ class nvidia_ids:
        0x1bb9,	# GP104GLM [Quadro P4200 Mobile]
        0x1bbb,	# GP104GLM [Quadro P3200 Mobile]
        0x1bc7,	# GP104 [P104-101]
-        0x1be0,	# GP104BM [GeForce GTX 1080 Mobile]
-        0x1be1,	# GP104BM [GeForce GTX 1070 Mobile]
+        0x1be0,	# GP104BM [GTX 1080 Mobile]
+        0x1be1,	# GP104BM [GTX 1070 Mobile]

        0x1c00,	# GP106
        0x1c01,	# GP106
-        0x1c02,	# GP106 [GeForce GTX 1060 3GB]
-        0x1c03,	# GP106 [GeForce GTX 1060 6GB]
-        0x1c04,	# GP106 [GeForce GTX 1060 5GB]
-        0x1c06,	# GP106 [GeForce GTX 1060 6GB Rev. 2]
+        0x1c02,	# GP106 [GTX 1060 3GB]
+        0x1c03,	# GP106 [GTX 1060 6GB]
+        0x1c04,	# GP106 [GTX 1060 5GB]
+        0x1c06,	# GP106 [GTX 1060 6GB Rev. 2]
        0x1c07,	# GP106 [P106-100]
        0x1c09,	# GP106 [P106-090]
-        0x1c20,	# GP106M [GeForce GTX 1060 Mobile]
-        0x1c21,	# GP106M [GeForce GTX 1050 Ti Mobile]
-        0x1c22,	# GP106M [GeForce GTX 1050 Mobile]
-        0x1c23,	# GP106M [GeForce GTX 1060 Mobile Rev. 2]
+        0x1c20,	# GP106M [GTX 1060 Mobile]
+        0x1c21,	# GP106M [GTX 1050 Ti Mobile]
+        0x1c22,	# GP106M [GTX 1050 Mobile]
+        0x1c23,	# GP106M [GTX 1060 Mobile Rev. 2]
        0x1c2d,	# GP106M
        0x1c30,	# GP106GL [Quadro P2000]
        0x1c31,	# GP106GL [Quadro P2200]
        0x1c35,	# GP106M [Quadro P2000 Mobile]
        0x1c36,	# GP106 [P106M]
-        0x1c60,	# GP106BM [GeForce GTX 1060 Mobile 6GB]
-        0x1c61,	# GP106BM [GeForce GTX 1050 Ti Mobile]
-        0x1c62,	# GP106BM [GeForce GTX 1050 Mobile]
+        0x1c60,	# GP106BM [GTX 1060 Mobile 6GB]
+        0x1c61,	# GP106BM [GTX 1050 Ti Mobile]
+        0x1c62,	# GP106BM [GTX 1050 Mobile]
        0x1c70,	# GP106GL

        0x1c80,
-        0x1c81,	# GP107 [GeForce GTX 1050]
-        0x1c82,	# GP107 [GeForce GTX 1050 Ti]
-        0x1c83,	# GP107 [GeForce GTX 1050 3GB]
-        0x1c8c,	# GP107M [GeForce GTX 1050 Ti Mobile]
-        0x1c8d,	# GP107M [GeForce GTX 1050 Mobile]
+        0x1c81,	# GP107 [GTX 1050]
+        0x1c82,	# GP107 [GTX 1050 Ti]
+        0x1c83,	# GP107 [GTX 1050 3GB]
+        0x1c8c,	# GP107M [GTX 1050 Ti Mobile]
+        0x1c8d,	# GP107M [GTX 1050 Mobile]
        0x1c8e,	# GP107M
-        0x1c8f,	# GP107M [GeForce GTX 1050 Ti Max-Q]
+        0x1c8f,	# GP107M [GTX 1050 Ti Max-Q]
        0x1c90,	# GP107M [GeForce MX150]
-        0x1c91,	# GP107M [GeForce GTX 1050 3 GB Max-Q]
-        0x1c92,	# GP107M [GeForce GTX 1050 Mobile]
+        0x1c91,	# GP107M [GTX 1050 3 GB Max-Q]
+        0x1c92,	# GP107M [GTX 1050 Mobile]
        0x1c94,	# GP107M [GeForce MX350]
        0x1c96,	# GP107M [GeForce MX350]
        0x1ca7,	# GP107GL
@@ -687,8 +754,8 @@ class nvidia_ids:
        0x1cbb,	# GP107GLM [Quadro P1000 Mobile]
        0x1cbc,	# GP107GLM [Quadro P600 Mobile]
        0x1cbd,	# GP107GLM [Quadro P620]
-        0x1ccc,	# GP107BM [GeForce GTX 1050 Ti Mobile]
-        0x1ccd,	# GP107BM [GeForce GTX 1050 Mobile]
+        0x1ccc,	# GP107BM [GTX 1050 Ti Mobile]
+        0x1ccd,	# GP107BM [GTX 1050 Mobile]
        0x1cfa,	# GP107GL [Quadro P2000]
        0x1cfb,	# GP107GL [Quadro P1000]

@@ -1104,6 +1171,13 @@ class broadcom_ids:
        0x43A0,  # BCM4360
    ]

+    # Not natively supported, but supported by AirportBrcmFixup
+    AirPortBrcmNICThirdParty = [
+        0x4357,  # BCM43225
+        0x43B1,  # BCM4352
+        0x43B2,  # BCM4352 (2.4 GHz)
+    ]
+
    AirPortBrcm4360 = [
        # AirPortBrcm4360 IDs (removed duplicates for 4360 class cards)
        0x4331,  # BCM94331
@@ -1155,6 +1229,8 @@ class aquantia_ids:
        0x92B1,  # AQC107
        0x00C0,  # AQC113
        0x04C0,  # AQC113
+        0x94C0,  # AQC113
+        0x93C0,  # AQC113
    ]


--- a/data/smbios_data.py
+++ b/data/smbios_data.py
--- a/data/sys_patch_dict.py
+++ b/data/sys_patch_dict.py
@@ -13,7 +13,7 @@ class SystemPatchDictionary():


    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 +30,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)
@@ -66,6 +69,8 @@ class SystemPatchDictionary():
        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._generate_sys_patch_dict()

@@ -102,9 +107,10 @@ class SystemPatchDictionary():
                        "/System/Library/PrivateFrameworks": {
                            "GPUSupport.framework": "10.14.3",
                            "SkyLight.framework":  f"10.14.6-{self.os_major}",
+                            **({"FaceCore.framework":  f"13.5"} if self.os_major >= os_data.os_data.sonoma else {}),
                        },
                        "/System/Applications": {
-                            **({ "Photo Booth.app": "11.7.6"} if self.os_major >= os_data.os_data.monterey else {}),
+                            **({ "Photo Booth.app": "11.7.9"} if self.os_major >= os_data.os_data.monterey else {}),
                        },
                    },
                    "Remove": {
@@ -147,8 +153,9 @@ class SystemPatchDictionary():
                        **({"defaults write /Library/Preferences/.GlobalPreferences.plist ShowDate -int 1": True } if self.os_float >= self.macOS_12_4 else {}),
                        "defaults write /Library/Preferences/.GlobalPreferences.plist InternalDebugUseGPUProcessForCanvasRenderingEnabled -bool false": True,
                        "defaults write /Library/Preferences/.GlobalPreferences.plist WebKitExperimentalUseGPUProcessForCanvasRenderingEnabled -bool false": True,
-                        # MenuBar2 breaks macOS if enabled before patching
-                        "defaults write /Library/Preferences/.GlobalPreferences.plist Amy.MenuBar2Beta -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": {
@@ -230,10 +237,9 @@ class SystemPatchDictionary():
                    },
                },

-                "Non-Metal ColorSync Workaround": {
-                    # HD3000 Macs have issues with certain ColorProfiles
-                    # This downgrade allows for proper UI rendering,
-                    # however limited to Ventura due to regression with Big Sur and Monterey
+                "Revert Non-Metal ColorSync Workaround": {
+                    # Old patch for ColorSync in Ventura on HD3000s
+                    # Proper solution has been integrated into QuartzCore
                    "Display Name": "",
                    "OS Support": {
                        "Minimum OS Support": {
@@ -241,14 +247,15 @@ class SystemPatchDictionary():
                            "OS Minor": 0
                        },
                        "Maximum OS Support": {
-                            "OS Major": self.non_metal_os_support[-1],
+                            "OS Major": os_data.os_data.ventura,
                            "OS Minor": 99
                        },
                    },
-                    "Install": {
-                        "/System/Library/Frameworks": {
-                            "ColorSync.framework": f"10.15.7-{self.os_major}",
-                        },
+                    "Remove": {
+                        "/System/Library/Frameworks/ColorSync.framework/Versions/A": [
+                            "ColorSync",
+                            "ColorSyncOld.dylib",
+                        ],
                    },
                },

@@ -346,7 +353,7 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/System/Library/Frameworks": {
-                            "Metal.framework": "12.5-3802",
+                            "Metal.framework": f"12.5-3802-{self.os_major}",
                        },
                        "/System/Library/PrivateFrameworks": {
                            "MTLCompiler.framework": "12.5-3802",
@@ -374,11 +381,13 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/System/Library/Frameworks": {
-                            "Metal.framework": "13.2.1",
+                            "Metal.framework": f"13.2.1-{self.os_major}",
+                            **({  "CoreImage.framework": "14.0 Beta 3" } if self.os_major >= os_data.os_data.sonoma else {}),
                        },
                        "/System/Library/PrivateFrameworks": {
-                            "MTLCompiler.framework": "13.2.1",
-                            "GPUCompiler.framework": "13.2.1",
+                            **({  "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",
                        },
                    },
                },
@@ -569,14 +578,14 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/System/Library/Extensions": {
-                            "GeForce.kext":            "12.0 Beta 6",
+                            "GeForce.kext":            "12.0 Beta 6" if self.os_major < os_data.os_data.sonoma else "12.0 Beta 6-23",
                            "NVDAGF100Hal.kext":       "12.0 Beta 6",
                            "NVDAGK100Hal.kext":       "12.0 Beta 6",
                            "NVDAResman.kext":         "12.0 Beta 6",
                            "NVDAStartup.kext":        "12.0 Beta 6",
                            "GeForceAIRPlugin.bundle": "11.0 Beta 3",
                            "GeForceGLDriver.bundle":  "11.0 Beta 3",
-                            "GeForceMTLDriver.bundle": "11.0 Beta 3" if self.os_major <= os_data.os_data.monterey else f"11.0 Beta 3-{self.os_major}",
+                            "GeForceMTLDriver.bundle": "11.0 Beta 3" if self.os_major <= os_data.os_data.monterey else f"11.0 Beta 3-22",
                            "GeForceVADriver.bundle":  "12.0 Beta 6",
                        },
                        "/System/Library/Frameworks": {
@@ -766,9 +775,9 @@ class SystemPatchDictionary():
                            "AMD9000Controller.kext":        "12.5",
                            "AMD9500Controller.kext":        "12.5",
                            "AMD10000Controller.kext":       "12.5",
-                            "AMDRadeonX4000.kext":           "12.5",
+                            "AMDRadeonX4000.kext":           "12.5" if self.os_major < os_data.os_data.sonoma else "12.5-23",
                            "AMDRadeonX4000HWServices.kext": "12.5",
-                            "AMDFramebuffer.kext":           "12.5",
+                            "AMDFramebuffer.kext":           "12.5" if self.os_float < self.macOS_13_3 else "12.5-GCN",
                            "AMDSupport.kext":               "12.5",

                            "AMDRadeonVADriver.bundle":      "12.5",
@@ -779,6 +788,40 @@ class SystemPatchDictionary():
                        },
                    },
                },
+
+                # For MacBookPro14,3 (and other AMD dGPUs that no longer function in Sonoma)
+                # iMac18,2/3 still function with the generic framebuffer, however if issues arise
+                # we'll downgrade them as well.
+                "AMD Legacy GCN v2": {
+                    "Display Name": "Graphics: AMD Legacy GCN (2017)",
+                    "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/Extensions": {
+                            "AMD9500Controller.kext":        "13.5.2",
+                            "AMD10000Controller.kext":       "13.5.2",
+                            "AMDRadeonX4000.kext":           "13.5.2",
+                            "AMDRadeonX4000HWServices.kext": "13.5.2",
+                            "AMDFramebuffer.kext":           "13.5.2",
+                            "AMDSupport.kext":               "13.5.2",
+
+                            "AMDRadeonVADriver.bundle":      "13.5.2",
+                            "AMDRadeonVADriver2.bundle":     "13.5.2",
+                            "AMDRadeonX4000GLDriver.bundle": "13.5.2",
+                            "AMDMTLBronzeDriver.bundle":     "13.5.2",
+                            "AMDShared.bundle":              "13.5.2",
+                        },
+                    },
+                },
+
                # Used only for AMD Polaris with host lacking AVX2.0
                # Note missing framebuffers are not restored (ex. 'ATY,Berbice')
                "AMD Legacy Polaris": {
@@ -795,7 +838,7 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/System/Library/Extensions": {
-                            "AMDRadeonX4000.kext":           "12.5",
+                            "AMDRadeonX4000.kext":           "12.5" if self.os_major < os_data.os_data.sonoma else "12.5-23",
                            "AMDRadeonX4000HWServices.kext": "12.5",

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

                            "AMDRadeonVADriver2.bundle":      "12.5",
                            "AMDRadeonX5000GLDriver.bundle":  "12.5",
@@ -912,10 +954,10 @@ class SystemPatchDictionary():
                    "Install": {
                        "/System/Library/Extensions": {
                            "AppleIntelHD4000GraphicsGLDriver.bundle":  "11.0 Beta 6",
-                            "AppleIntelHD4000GraphicsMTLDriver.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",
-                            "AppleIntelHD4000Graphics.kext":            "11.4",
+                            "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",
                            "AppleIntelIVBVA.bundle":                   "11.4",
                            "AppleIntelGraphicsShared.bundle":          "11.4", # libIGIL-Metal.dylib pulled from 11.0 Beta 6
                        },
@@ -935,8 +977,8 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/System/Library/Extensions": {
-                            "AppleIntelFramebufferAzul.kext":           "12.5",
-                            "AppleIntelHD5000Graphics.kext":            "12.5",
+                            "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",
                            "AppleIntelHD5000GraphicsGLDriver.bundle":  "12.5",
                            "AppleIntelHD5000GraphicsMTLDriver.bundle": "12.5",
                            "AppleIntelHD5000GraphicsVADriver.bundle":  "12.5",
@@ -959,10 +1001,10 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/System/Library/Extensions": {
-                            "AppleIntelBDWGraphics.kext":            "12.5",
-                            "AppleIntelBDWGraphicsFramebuffer.kext": "12.5",
+                            "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",
                            "AppleIntelBDWGraphicsGLDriver.bundle":  "12.5",
-                            "AppleIntelBDWGraphicsMTLDriver.bundle": "12.5",
+                            "AppleIntelBDWGraphicsMTLDriver.bundle": "12.5" if self.os_major < os_data.os_data.ventura else "12.5-22",
                            "AppleIntelBDWGraphicsVADriver.bundle":  "12.5",
                            "AppleIntelBDWGraphicsVAME.bundle":      "12.5",
                            "AppleIntelGraphicsShared.bundle":       "12.5",
@@ -983,8 +1025,8 @@ class SystemPatchDictionary():
                    },
                    "Install": {
                        "/System/Library/Extensions": {
-                            "AppleIntelSKLGraphics.kext":            "12.5",
-                            "AppleIntelSKLGraphicsFramebuffer.kext": "12.5",
+                            "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",
                            "AppleIntelSKLGraphicsGLDriver.bundle":  "12.5",
                            "AppleIntelSKLGraphicsMTLDriver.bundle": "12.5",
                            "AppleIntelSKLGraphicsVADriver.bundle":  "12.5",
@@ -1087,6 +1129,8 @@ class SystemPatchDictionary():
                    "Install": {
                        "/usr/libexec": {
                            "wps": "12.6.2",
+                            "wifip2pd":       "12.6.2",
+                            "wifianalyticsd": "13.5",
                        },
                        "/System/Library/Frameworks": {
                            "CoreWLAN.framework": "12.6.2",
@@ -1094,9 +1138,45 @@ class SystemPatchDictionary():
                        "/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 {}),
                        },
                    },
-                }
+                },
+                # May lord have mercy on our souls
+                # Applicable for BCM943324, BCM94331, BCM94360, BCM943602
+                "Modern Wireless": {
+                    "Display Name": "Networking: Modern Wireless",
+                    "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": {
+                        "/usr/libexec": {
+                            "airportd":       "13.5",
+                            "wifianalyticsd": "13.5",
+                            "wifip2pd":       "13.5",
+                        },
+                        "/System/Library/Frameworks": {
+                            "CoreWLAN.framework": "13.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",
+                        },
+                    },
+                },
            },
            "Brightness": {
                "Legacy Backlight Control": {
@@ -1188,6 +1268,102 @@ class SystemPatchDictionary():
                            "IOUSBHostFamily.kext": "12.6.2",
                        },
                    },
-                }
+                },
+                # 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": {
+                        "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/CoreMediaIO.framework/Versions/A/Resources": {
+                            "AppleCamera.plugin":  "14.0 Beta 1"
+                        },
+                        "/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/data/usb_data.py
+++ b/data/usb_data.py
@@ -0,0 +1,111 @@
+class AppleIDs:
+    # All top case devices use Vendor ID 05ac
+    Modern_AppleUSBTCKeyboard = [
+        0x223, 
+        0x224,
+        0x225,
+        0x230,
+        0x231,
+        0x232,
+        0x236,
+        0x237,
+        0x238,
+        0x23f,
+        0x240,
+        0x241,
+        0x242,
+        0x243,
+        0x244,
+        0x245,
+        0x246,
+        0x247,
+        0x249,
+        0x24a,
+        0x24b,
+        0x259,
+        0x25a,
+        0x25b,
+        0x262,
+        0x263,
+        0x264,
+        0x24c,
+        0x24d,
+        0x24e,
+        0x252,
+        0x253,
+        0x254
+    ]
+
+    Legacy_AppleUSBTCKeyboard = [
+        0x20e,
+        0x20f,
+        0x210,
+        0x214,
+        0x215,
+        0x216,
+        0x20d,
+        0x218,
+        0x219,
+        0x21a,
+        0x21b,
+        0x21c,
+        0x229,
+        0x22a,
+        0x22b
+    ]
+    
+    AppleUSBTrackpad = [
+        0x20e,
+        0x20f,
+        0x210,
+        0x30a,
+        0x30b,
+        0x214,
+        0x215,
+        0x216,
+        0x217,
+        0x218,
+        0x219,
+        0x21a,
+        0x21b,
+        0x21c,
+        0x229,
+        0x22a,
+        0x22b
+    ]
+
+    AppleUSBMultiTouch = [
+        0x223, 
+        0x224,
+        0x225,
+        0x230,
+        0x231,
+        0x232,
+        0x236,
+        0x237,
+        0x238,
+        0x23f,
+        0x240,
+        0x241,
+        0x242,
+        0x243,
+        0x244,
+        0x245,
+        0x246,
+        0x247,
+        0x249,
+        0x24a,
+        0x24b,
+        0x259,
+        0x25a,
+        0x25b,
+        0x262,
+        0x263,
+        0x264,
+        0x24c,
+        0x24d,
+        0x24e,
+        0x252,
+        0x253,
+        0x254
+    ]
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -93,6 +93,15 @@ module.exports = {

        },
        {
+            title: 'macOS Sonoma',
+            collapsable: false,
+            sidebarDepth: 1,
+            children: [
+				['SONOMA-DROP', 'macOS Sonoma Support'],
+            ]
+        },
+		  
+	{
            title: 'macOS Ventura',
            collapsable: false,
            sidebarDepth: 1,
@@ -140,7 +149,6 @@ module.exports = {
            sidebarDepth: 1,
            children: [
 				'ISSUES-HOLD',
-				'TESTED',
 				'TERMS',
 				'HOW',
 				'PATCHEXPLAIN',
--- a/docs/ACCEL.md
+++ b/docs/ACCEL.md
@@ -27,16 +27,18 @@ Metal is Apple's in-house graphics API that acts as a replacement for OpenGL/Ope

 | Graphics Vendor | Architecture | Series | Supports Metal |
 | :--- | :--- | :--- | :--- |
-| ATI | TeraScale 1 | HD2000 - HD4000 | <span style="color:red">No</span> |
-| ^^ | TeraScale 2 | HD5000 - HD6000 | ^^ |
-| AMD | GCN (and newer) | HD7000+ | <span style="color:green">Yes</span> |
-| NVIDIA | Tesla | 8000GT - GT300 |  <span style="color:red">No</span> |
-| ^^ | Fermi | GT400 - GT500 | ^^ |
-| ^^ | Kepler | GT600 - GT700 | <span style="color:green">Yes</span> |
-| Intel | GMA | GMA900 - GMA3000 | <span style="color:red">No</span> |
+| ATI | TeraScale 1 | HD 2XXX - HD 4XXX | <span style="color:red">No</span> |
+| ^^ | TeraScale 2 | HD 5XXX - HD 6XXX | ^^ |
+| AMD | GCN (and newer) | HD 7XXX+ | <span style="color:green">Yes</span> |
+| NVIDIA | Tesla | 8XXX - 3XX | <span style="color:red">No</span> |
+| ^^ | Fermi | 4XX - 5XX | ^^ |
+| ^^ | Kepler | 6XX - 7XX | <span style="color:green">Yes</span> |
+| ^^ | Maxwell | 8XX - 9XX | <span style="color:red">No (on 10.14 and newer)</span> |
+| ^^ | Pascal | 10XX | ^^ |
+| Intel | GMA | GMA 900 - GMA X3000 | <span style="color:red">No</span> |
 | ^^ | Iron Lake | HD series | ^^ |
-| ^^ | Sandy Bridge | HD3000 | ^^ |
-| ^^ | Ivy Bridge (and newer) | HD4000 | <span style="color:green">Yes</span> |
+| ^^ | Sandy Bridge | HD 3000 | ^^ |
+| ^^ | Ivy Bridge (and newer) | HD 4000 | <span style="color:green">Yes</span> |

 :::

@@ -62,12 +64,15 @@ Currently Zoom relies partially on Metal and so needs a small binary patch. Dosd
 * [Zoom Non-Metal Fix](http://dosdude1.com/catalina/zoomnonmetal-new.command.zip)

 ## Unable to grant special permissions to apps (ie. Camera Access to Zoom)
+Currently for Ventura 13.3 and newer, due to new patches required, permissions are yet again broken. Use TCCPlus in the Workaround dropdown to work around the issue.

-With version 0.2.5, this issue should be full resolved
+This issue is fully resolved for 13.2.1 and lower starting from 0.2.5.

-::: details 0.2.4 and older Work-Around
+::: 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](https://github.com/jslegendre/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 entires in System Preferences. To work around this, we recommend users install tccplus to manage permissions.
+
+[Download TCCPlus](https://github.com/jslegendre/tccplus)

 Example usage with Discord and microphone permissions:

--- a/docs/DONATE.md
+++ b/docs/DONATE.md
@@ -15,24 +15,4 @@ Additionally, hardware info dumps are greatly beneficial for us to determine wha
  * `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 contact us at the following email:
-
-* khronokernel@icloud.com
-
-Current hardware we own:
-
-| Model | CPU | GPU | Owner | Notes |
-| :--- | :--- | :--- | :--- | :--- |
-| MacBook5,1 | Penryn | 9400M | Mykola | N/A |
-| MacBook7,1 | Penryn | GT320M | Dhinak | N/A |
-| MacBook7,1 | Penryn | GT320M | Mykola | N/A |
-| MacBookPro5,3 | Penryn | 9400M + 9600M | Dhinak | Display's partially broken |
-| MacBookPro8,2 | Sandy Bridge | HD3000 | Mykola | Dead dGPU |
-| MacPro3,1 | Penryn | GTX 680 | Dhinak | N/A |
-| Macmini4,1 | Penryn | GT320M | Dhinak | N/A |
-
-Dead Hardware:
-| Model | CPU | GPU | Owner | Notes |
-| :--- | :--- | :--- | :--- | :--- |
-| MacPro3,1 | Penryn | HD5770, RX570, GT710 | Mykola | No longer powers on |
-| MacPro4,1 | Westmere | HD7950 | Mykola | Dead Northbridge on CPU Tray |
+If you have any legacy hardware you're willing to donate or want to buy us hardware, please reach out on our Discord server.
--- a/docs/LICENSE.md
+++ b/docs/LICENSE.md
@@ -18,6 +18,8 @@ This patcher is made of multiple external applications from different people and
  * [telemetrap](https://forums.macrumors.com/threads/mp3-1-others-sse-4-2-emulation-to-enable-amd-metal-driver.2206682/post-28447707) - Syncretic
  * [SurPlus](https://github.com/reenigneorcim/SurPlus) - Syncretic
  * [VMM Patch Set](https://github.com/dortania/OpenCore-Legacy-Patcher/blob/4a8f61a01da72b38a4b2250386cc4b497a31a839/payloads/Config/config.plist#L1222-L1281) - parrotgeek1
+  * AMFIPass - Dhinak G
  * Apple Binaries - Apple Inc.
+  * All other patches - respective authors

-Remaining files within OpenCore Legacy Patcher are distributed under BSD-4-Clause license.
+The remaining files within the OpenCore Legacy Patcher repository are distributed under the [BSD 4-Clause license](https://github.com/dortania/OpenCore-Legacy-Patcher/blob/main/LICENSE.txt).
--- a/docs/MODELS.md
+++ b/docs/MODELS.md
@@ -1,13 +1,10 @@
 # Supported Models
+Any Intel-based Mac listed below can install and make use of OpenCore Legacy Patcher. To check your hardware model, open System Information and look for the `Model Identifier` key.
+* This applies even if Apple supports the model natively.
+* OpenCore Legacy Patcher does not support PowerPC- or Apple Silicon-based Macs.
+* If your model is not listed below, it is not supported by this patcher.

-Any hardware supporting SSE4.1 CPU and 64-Bit firmware work on this patcher. To check your hardware model, run the following command on the applicable machine in the terminal:
-
-```bash
-system_profiler SPHardwareDataType | grep 'Model Identifier'
-```
-
-The below table will list all supported and unsupported functions of the patcher currently:
-
+The below tables can be used to reference issues with a particular model, and see which OS would work best on your machine.
 * [MacBook](#macbook)
 * [MacBook Air](#macbook-air)
 * [MacBook Pro](#macbook-pro)
@@ -16,146 +13,138 @@ The below table will list all supported and unsupported functions of the patcher
 * [Mac Pro](#mac-pro)
 * [Xserve](#xserve)

-Regarding OS support, see below:
+::: 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 installers for macOS Ventura and later.

-| Support Entry | Supported OSes | Description | Comment |
-| :--- | :--- | :--- | :--- |
-| HostOS | macOS 10.10 - macOS 13 | Refers to OSes where running OpenCore-Patcher.app are supported | Supports 10.7+ if [Python 3.9 or higher](https://www.python.org/downloads/) is manually installed, simply run the `OpenCore-Patcher-GUI.command` located in the repo |
-| TargetOS | macOS 11 - macOS 13 | Refers to OSes that can be patched to run with OpenCore | May support 10.4 and newer (in a potentially broken state). No support provided. |
+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.
+:::

-* macOS Ventura installer creation requires 10.11 or later

 ### MacBook

-| SMBIOS | Year | Supported | Comment |
-| :--- | :--- | :--- | :--- |
-| MacBook1,1 | Mid-2006 | <span style="color:red"> NO </span>  | 32-Bit CPU limitation |
-| MacBook2,1 | Late 2006 | ^^ | 32-Bit Firmware limitation |
-| MacBook3,1 | Late 2007 | ^^ | ^^ |
-| MacBook4,1 | Early 2008 | ^^ | - No GPU Acceleration in Mavericks and newer<br/>- No Keyboard and Trackpad<br/>- No USB |
-| MacBook5,1 | Late 2008 | <span style="color:#30BCD5"> YES </span> | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/> - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021))|
-| MacBook5,2 | Early 2009 | ^^ | ^^ |
-| MacBook6,1 | Late 2009 | ^^ | ^^ |
-| MacBook7,1 | Mid-2010 | ^^ | ^^ |
-| MacBook8,1 | Mid-2015 | ^^ | <span style="color:green"> Everything is supported</span> |
-| MacBook9,1 | Early 2016 | ^^ | ^^ |
+| 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

-| SMBIOS | Year | Supported | Comment |
-| :--- | :--- | :--- | :--- |
-| MacBookAir1,1 | Early 2008 | <span style="color:red"> NO </span> | Requires SSE4.1 CPU |
-| MacBookAir2,1 | Late 2008 | <span style="color:#30BCD5"> YES </span> | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/> - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021))|
-| MacBookAir3,1 | Late 2010 | ^^ | ^^ |
-| MacBookAir3,2 | ^^ | ^^ | ^^ |
-| MacBookAir4,1 | Mid-2011 | ^^ | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))|
-| MacBookAir4,2 | ^^ | ^^ | ^^ |
-| MacBookAir5,1 | Mid-2012 | ^^ | <span style="color:green"> Everything is supported</span> |
-| MacBookAir5,2 | ^^ | ^^ | ^^ |
-| MacBookAir6,1 | Mid-2013, Early 2014 | ^^ | ^^ |
-| MacBookAir6,2 | ^^ | ^^ | ^^ |
-| MacBookAir7,1 | Early-2015, 2017 | ^^ | ^^ |
-| MacBookAir7,2 | ^^ | ^^ | ^^ |
+| 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 (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 Pro

-| SMBIOS | Year | Supported | Comment |
-| :--- | :--- | :--- | :--- |
-| MacBookPro1,1 | Early 2006 | <span style="color:red"> NO </span>  | 32-Bit CPU limitation |
-| MacBookPro1,2 | ^^ | ^^ | ^^ |
-| MacBookPro2,1 | Late 2006 | ^^ | 32-Bit Firmware limitation |
-| MacBookPro2,2 | Late 2006 | ^^ | ^^ |
-| MacBookPro3,1 | Mid-2007 | ^^ | Requires SSE4.1 CPU |
-| MacBookPro4,1 | Early 2008 | <span style="color:#30BCD5"> YES </span> | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/> - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021))|
-| MacBookPro5,1 | Late 2008 | ^^ | ^^ |
-| MacBookPro5,2 | Early 2009 | ^^ | ^^ |
-| MacBookPro5,3 | Mid-2009 | ^^ | ^^ |
-| MacBookPro5,4 | ^^ | ^^ | ^^ |
-| MacBookPro5,5 | ^^ | ^^ | ^^ |
-| MacBookPro6,1 | Mid-2010 | ^^ | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))|
-| MacBookPro6,2 | ^^ | ^^ | ^^ |
-| MacBookPro7,1 | ^^ | ^^ | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/> - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021))|
-| MacBookPro8,1 | Early 2011 | ^^ | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))|
-| MacBookPro8,2 | ^^ | ^^ | ^^ |
-| MacBookPro8,3 | ^^ | ^^ | ^^ |
-| MacBookPro9,1 | Mid-2012 | ^^ | <span style="color:green"> Everything is supported</span> |
-| MacBookPro9,2 | ^^ | ^^ | ^^ |
-| MacBookPro10,1 | Mid-2012, Early 2013 | ^^ | ^^ |
-| MacBookPro10,2 | Late 2012, Early 2013 | ^^ | ^^ |
-| MacBookPro11,1 | Late 2013, Mid-2014 | ^^ | ^^ |
-| MacBookPro11,2 | ^^ | ^^ | ^^ |
-| MacBookPro11,3 | ^^ | ^^ | ^^ |
-| MacBookPro11,4 | Mid 2015 | ^^ | ^^ |
-| MacBookPro11,5 | ^^ | ^^ | ^^ |
-| MacBookPro12,1 | Early 2015 | ^^ | ^^ |
-| MacBookPro13,1 | Late 2016 | ^^ | ^^ |
-| MacBookPro13,2 | ^^ | ^^ | ^^ |
-| MacBookPro13,3 | ^^ | ^^ | ^^ |
+| 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 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

-| SMBIOS | Year | Supported | Comment |
-| :--- | :--- | :--- | :--- |
-| Macmini1,1 | Early 2006 | <span style="color:red"> NO </span> | 32-Bit CPU limitation |
-| Macmini2,1 | Mid-2007 | ^^ | 32-Bit Firmware limitation |
-| Macmini3,1 | Early 2009 | <span style="color:#30BCD5"> YES </span> | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/> - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021))|
-| Macmini4,1 | Mid-2010 | ^^ | ^^ |
-| Macmini5,1 | Mid-2011 | ^^ | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))|
-| Macmini5,2 | ^^ | ^^ | ^^ |
-| Macmini5,3 | ^^ | ^^ | ^^ |
-| Macmini6,1 | Late 2012 | ^^ | <span style="color:green"> Everything is supported</span> |
-| Macmini6,2 | ^^ | ^^ | ^^ |
-| Macmini7,1 | Mid-2014 | ^^ | ^^ |
+| 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` | ^^ |
+| 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
-
-| SMBIOS | Year | Supported | Comment |
-| :--- | :--- | :--- | :--- |
-| iMac4,1 | Early 2006 | <span style="color:red"> NO </span> | 32-Bit CPU limitation |
-| iMac4,2 | Mid-2006 | ^^ | ^^ |
-| iMac5,1 | Late 2006 | ^^ | 32-Bit Firmware limitation |
-| iMac5,2 | ^^ | ^^ | ^^ |
-| iMac6,1 | ^^ | ^^ | ^^ |
-| iMac7,1 | Mid-2007 | <span style="color:#30BCD5"> YES </span> | - Requires an [SSE4.1 CPU Upgrade](https://lowendmac.com/2018/penryn-t9300-9500-cpu-upgrades-for-the-2007-imac/)<br/>- GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- Stock Bluetooth 2.0 card non-functional<br/> - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021))|
-| iMac8,1 | Early 2008 | ^^ | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/> - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021))|
-| iMac9,1 | Early 2009 | ^^ | ^^ |
-| iMac10,1 | Late 2009 | ^^ | - GPU is socketed, [recommend upgrading to Metal GPU](https://forums.macrumors.com/threads/2011-imac-graphics-card-upgrade.1596614/?post=17425857#post-17425857) <br/>- GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)) <br/> - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021))|
-| iMac11,1 | ^^ | ^^ | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))|
-| iMac11,2 | Mid-2010 | ^^ | ^^ |
-| iMac11,3 | ^^ | ^^ | ^^ |
-| iMac12,1 | Mid-2011 | ^^ | ^^ |
-| iMac12,2 | ^^ | ^^ | ^^ |
-| iMac13,1 | Late 2012 | ^^ | <span style="color:green"> Everything is supported</span> |
-| iMac13,2 | ^^ | ^^ | ^^ |
-| iMac13,3 | ^^ | ^^ | ^^ |
-| iMac14,1 | Late 2013 | ^^ | ^^ |
-| iMac14,2 | ^^ | ^^ | ^^ |
-| iMac14,3 | ^^ | ^^ | ^^ |
-| iMac14,4 | Mid-2014 | ^^ | ^^ |
-| iMac15,1 | Late 2014, Mid-2015 | ^^ | ^^ |
-| iMac16,1 | Late 2014, Mid-2015 | ^^ | ^^ |
-| iMac16,2 | Late 2014, Mid-2015 | ^^ | ^^ |
-| iMac17,1 | Late 2015, Early-2016 | ^^ | ^^ |
-
-* For iMac10,1 through iMac12,x, we highly recommend users upgrade the GPU to a Metal supported model. See here for more information: [iMac late 2009 to mid-2011 Graphics Card Upgrade Guide](https://forums.macrumors.com/threads/2011-imac-graphics-card-upgrade.1596614/?post=17425857#post-17425857)
+| 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) |
+| iMac (21.5-inch, Late 2009)<br>iMac (27-inch, Late 2009)| `iMac10,1` | ^^ |
+| iMac (27-inch, Late 2009) | `iMac11,1` | ^^ |
+| iMac (21.5-inch, Mid 2010) | `iMac11,2` | ^^ |
+| iMac (27-inch, Mid 2010) | `iMac11,3` | ^^ |
+| iMac (21.5-inch, Mid 2011)<br>iMac (21.5-inch, Late 2011) | `iMac12,1` | ^^ |
+| iMac (27-inch, Mid 2011) | `iMac12,2` | ^^ |
+| iMac (21.5-inch, Late 2012) | `iMac13,1` | - [Legacy Metal (macOS 13+)](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1008) |
+| iMac (27-inch, Late 2012) | `iMac13,2` | ^^ |
+| iMac (21.5-inch, Early 2013) | `iMac13,3` | ^^ |
+| iMac (21.5-inch, Late 2013) | `iMac14,1` | ^^ |
+| iMac (27-inch, Late 2013) | `iMac14,2`<br>`iMac14,3` | ^^ |
+| iMac (21.5-inch, Mid 2014) | `iMac14,4` | ^^ |
+| iMac (Retina 5K, 27-inch, Late 2014)<br>iMac (Retina 5K, 27-inch, Mid 2015) | `iMac15,1` | ^^ |
+| 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 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` | - 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` | ^^ |

 ### Mac Pro

-| SMBIOS | Year | Supported | Comment |
-| :--- | :--- | :--- | :--- |
-| MacPro1,1 | Mid-2006 | <span style="color:red"> NO </span> | 32-Bit Firmware limitation |
-| MacPro2,1 | Mid-2007 | ^^ | ^^ |
-| MacPro3,1 | Early 2008 | <span style="color:#30BCD5"> YES </span> | - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021)) <br/>- Potential boot issues with stock Bluetooth card, recommend removing to avoid kernel panics |
-| MacPro4,1 | Early 2009 | ^^ | - Everything is supported as long as GPU is Metal capable <br/> - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021))|
-| MacPro5,1 | Mid-2010, Mid-2012 | ^^ | ^^ |
-| MacPro6,1 | Late 2013 | ^^ | - CPU Power Management currently unsupported<br/> - No DRM support |
+| Model Name | Identifier | Tagged Issues |
+| :--- | :--- | :--- |
+| 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 |

 ### Xserve

-| SMBIOS | Year | Supported | Comment |
-| :--- | :--- | :--- | :--- |
-| Xserve1,1 | Mid-2006 | <span style="color:red"> NO </span> | 32-Bit Firmware limitation |
-| Xserve2,1 | Early 2008 | <span style="color:#30BCD5"> YES </span> | - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021))|
-| Xserve3,1 | Early 2009 | ^^ | ^^ |
+| 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 2009) | `Xserve3,1` | ^^ |

 # Once you've verified your hardware is supported, head to [Download and build macOS Installers](./INSTALLER.md)
--- a/docs/PATCHEXPLAIN.md
+++ b/docs/PATCHEXPLAIN.md
@@ -149,7 +149,7 @@ Below is a rundown of the main logic that OpenCore Legacy Patcher uses to gain n
 * GopPassThrough
  * Reason: Used for proper output on machines with UGA firmware but GOP GPU
  * Logic: Provide GOP protocol instances on top of UGA protocol instances
-  * Models: MacPro3,1, MacBook4,1 iMac7,1-8,1
+  * Models: MacPro3,1, iMac7,1-8,1

 :::

@@ -299,7 +299,7 @@ Below is an explanation of what Kexts OpenCore Legacy Patcher will inject into m
 * SimpleMSR 
  * Reason: Disables BD PROCHOT to prevent firmware throttling on Nehalem+ MacBooks
 * LegacyKeyboardInjector
-  * Reason: Fixes function keys on MacBook4,1/MacBook5,2
+  * Reason: Fixes function keys on MacBook5,2


 :::
--- 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
@@ -17,7 +17,7 @@ features:
 - title: Zero firmware patching
  details: Using the capabilities of the OpenCore boot manager, our protocol upgrades are done in memory and are never permanent.
 - title: Supporting more hardware
-  details: New life is breathed into your decade-old graphics card or WiFi and bluetooth chipsets.
+  details: New life is breathed into your decade-old graphics card, WiFi, and Bluetooth chipsets. Even your upgraded hardware receives benefits by unlocking exciting features like Hardware Acceleration, AirDrop, Apple Watch Unlock, Sidecar, and much more!
 - title: The newest features
  details: Unlock Sidecar, AirPlay to Mac, Night Shift, and Universal Control, even on natively supported models!
 - title: A helpful community
--- a/docs/SONOMA-DROP.md
+++ b/docs/SONOMA-DROP.md
@@ -0,0 +1,93 @@
+![](../images/sonoma.png)
+
+*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 1.0.0, early support for macOS Sonoma has been implemented.
+
+## Versioning
+
+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
+- Third digit: Bug fixes, primarily hot fixes either due to a regression in prior release or resolving issues in already released OS updates
+
+
+## Newly dropped hardware
+
+* 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,3:    MacBook Pro (15-inch, 2017)
+* iMac18,1:          iMac (21.5-inch, 2017)
+* iMac18,2:          iMac (Retina 4K, 21.5-inch, 2017)
+* iMac18,3:          iMac (Retina 5K, 27-inch, 2017)
+
+## Current status
+
+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
+
+* [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
+* Open the Password Settings window
+* Add fingerprints (if upgrading, existing fingerprints will be deleted)
+* Add cards to Apple Pay
+
+[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.
+While USB 1.1 may seem unimportant, it handles many important devices on your system. These include:
+
+* Keyboard and Trackpad for laptops
+* IR Receivers
+* Bluetooth
+
+With OpenCore Legacy Patcher v0.6.0+, basic support has been implemented via Root Volume patching. However due to this, users will need to use a USB hub for installation and post-OS updates when patches are cleaned:
+
+![](../images/usb11-chart.png)
+
+::: warning The following systems rely on USB 1.1
+
+* iMac10,x and older
+* Macmini4,1 and older
+* MacBook7,1 and older
+* MacBookAir3,1 and older
+* MacPro5,1 and older
+* Xserve 3,1 and older
+:::
+
+[More information here](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021)
+
+### 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)
+* [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
@@ -3,12 +3,12 @@
 Here are some common errors that users may experience while using this patcher:

 * [OpenCore Legacy Patcher not launching](#opencore-legacy-patcher-not-launching)
-* [Stuck on `This version of Mac OS X is not supported on this platform`](#stuck-on-this-version-of-mac-os-x-is-not-supported-on-this-platform)
+* [Stuck on `This version of Mac OS X is not supported on this platform` or (🚫) Prohibited Symbol](#stuck-on-this-version-of-mac-os-x-is-not-supported-on-this-platform-or-(🚫)-prohibited-symbol)
 * [Cannot boot macOS without the USB](#cannot-boot-macos-without-the-usb)
 * [Infinite Recovery OS Booting](#infinite-recovery-os-reboot)
+* [Stuck on boot after root patching](#stuck-on-boot-after-root-patching)
 * [Reboot when entering Hibernation (`Sleep Wake Failure`)](#reboot-when-entering-hibernation-sleep-wake-failure)
-* [Booting with a non-flashed GPU](#booting-with-a-non-flashed-gpu)
-* [How to Boot Big Sur Recovery](#how-to-boot-big-sur-recovery)
+* [How to Boot Recovery through OpenCore Legacy Patcher](#how-to-boot-recovery-through-opencore-legacy-patcher)
 * [Stuck on "Your Mac needs a firmware update"](#stuck-on-your-mac-needs-a-firmware-update)
 * [No Brightness Control](#no-brightness-control)
 * [Cannot connect Wi-Fi on Monterey with legacy cards](#cannot-connect-Wi-Fi-on-Monterey-with-legacy-cards)
@@ -30,15 +30,19 @@ If the application won't launch (e.g. icon will bounce in the Dock), try launchi
 /Applications/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher
 ```

-## Stuck on `This version of Mac OS X is not supported on this platform`
+## Stuck on `This version of Mac OS X is not supported on this platform` or (🚫) Prohibited Symbol

 This means macOS has detected an SMBIOS it does not support. To resolve this, ensure you're booting OpenCore **before** the macOS installer in the boot picker. Reminder that the option will be called `EFI Boot`.

 Once you've booted OpenCore at least once, your hardware should now auto-boot it until either an NVRAM reset occurs, or you remove the drive with OpenCore installed.

+However, if the 🚫 Symbol only appears after the boot process has already started (the bootscreen appears/verbose boot starts), it could mean that your USB drive has failed to pass macOS' integrity checks. To resolve this, create a new installer using a different USB drive (preferably of a different model.)
+
 ## Cannot boot macOS without the USB

-By default, the OpenCore Patcher won't install OpenCore onto the internal drive itself during installs. Instead, you'll need to either [manually transfer](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html) OpenCore to the internal drive's EFI or run this patcher's Option 2 again and select your internal drive.
+By default, the OpenCore Patcher won't install OpenCore onto the internal drive itself during installs. 
+
+After installing macOS, OpenCore Legacy Patcher should automatically prompt you to install OpenCore onto the internal drive. However, if it doesn't show the prompt, you'll need to either [manually transfer](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html) OpenCore to the internal drive's EFI or Build and Install again and select your internal drive.

 Reminder that once this is done, you'll need to select OpenCore in the boot picker again for your hardware to remember this entry and auto boot from then on.

@@ -48,6 +52,32 @@ With OpenCore Legacy Patcher, we rely on Apple Secure Boot to ensure OS updates

 * Note: Machines with modified root volumes will also result in an infinite recovery loop until integrity is restored.

+## Stuck on boot after root patching
+
+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. You can figure out your disk name by typing `ls /Volumes`.
+
+Go into terminal and first mount the disk by typing
+```sh
+mount -uw "/Volumes/Macintosh HD"
+```
+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" && ls
+```
+You should now see bunch of .kexts. If you only see .kexts starting with "HighPoint" and "SoftRAID", you can ignore this and just restart the system. If other kexts are found, continue.
+
+Delete everything **except** for the ones that start with HighPoint and SoftRAID, by using `rm -rf "kextname"`
+
+Then restart and now your system should be restored to the unpatched snapshot and should be able to boot again.
+
+
+
 ## Reboot when entering Hibernation (`Sleep Wake Failure`)

 [Known issue on some models](https://github.com/dortania/Opencore-Legacy-Patcher/issues/72), a temporary fix is to disable Hibernation by executing the following command in the terminal:
@@ -56,21 +86,7 @@ With OpenCore Legacy Patcher, we rely on Apple Secure Boot to ensure OS updates
 sudo pmset -a hibernatemode 0
 ```

-## Booting with a non-flashed GPU
-
-For Mac Pro, Xserve and iMac users with non-flashed GPUs, you can still easily boot OpenCore and view the entire boot process. To do so, make sure SIP is disabled (to allow NVRAM write access) and run the following:
-
-```sh
-sudo bless --verbose --file /Volumes/VOLNAME/EFI/OC/OpenCore.efi --folder /Volumes/VOLNAME/EFI/OC --setBoot
-```
-
-* Note 1: You will need to replace `VOLNAME` with the Volume name of your USB or hard drive with OpenCore.
-* Note 2: Once done, you can re-enable SIP.
-* Note 3: The EFI partition OpenCore was installed on must be mounted. If it's unmounted, simply rerun "Install OpenCore to drive."
-
-Once you boot OpenCore for the first time, LauncherOption will install itself as the top boot priority, making OpenCore always launch. Combined with `RequestBootVar`, all boot options must go through OpenCore, ensuring seamless usage even with OS installation and updates.
-
-## How to Boot Big Sur Recovery
+## How to Boot Recovery through OpenCore Legacy Patcher

 By default, the patcher will try to hide extra boot options such as recovery from the user. To make them appear, simply press the `Spacebar` key while inside OpenCore's Picker to list all boot options.

@@ -175,7 +191,7 @@ Applicable models include:

 | Family      | Year                 | Model                         | Notes                                            |
 | :---------- | :--------------------| :---------------------------- | :----------------------------------------------- |
-| MacBook     | Mid 2010 and older   | MacBook4,1 - MacBook7,1       |                                                  |
+| MacBook     | Mid 2010 and older   | MacBook5,1 - MacBook7,1       |                                                  |
 | MacBook Air | Late 2010 and older  | MacBookAir2,1 - MacBookAir3,x |                                                  |
 | MacBook Pro | Mid 2010 and older   | MacBookPro4,1 - MacBookPro7,x | Excludes Mid 2010 15" and 17" (MacBookPro6,x)    |
 | iMac        | Late 2009 and older  | iMac7,1 - iMac10,x            | Excludes Core i5/7 27" late 2009 iMac (iMac11,1) |
@@ -183,4 +199,4 @@ Applicable models include:
 | Mac Pro     | Mid 2010 and older   | MacPro3,1 - MacPro5,1         |                                                  |


-![](../images/usb11-chart.png)
+![](../images/usb11-chart.png)
--- 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

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

 2. [Reset NVRAM](https://support.apple.com/HT204063)

-Note that if you are on Big Sur when you remove the EFI folder, your Mac will no longer boot and show the "prohibited" symbol. Be ready to install an older version of macOS before you uninstall 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.
+
+* 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 Univeral Control.
+:::
+
+## 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
@@ -51,8 +51,7 @@ Note: For AirPort upgrades, only the best/newest cards are listed.

 |   SMBIOS   | WiFi/BT version | UC OOB  | Comment |
 |------------|-----------------|------------|---------|
-| MacBook4,1 | Wi-Fi 4 / BT 2.0 EDR |  <span style="color:red"> NO </span> | Replace stock AirPort card with an mPCIE + USB Connector Adapter board with a BCM94360CS2 card  |
-| MacBook5,1 | ^^ |  ^^ | <span style="color:red"> Use a Broadcom USB Bluetooth 4.0+ Dongle </span> |
+| MacBook5,1 | Wi-Fi 4 / BT 2.0 EDR |  <span style="color:red"> NO </span> | Use a Broadcom USB Bluetooth 4.0+ Dongle </span> |
 | MacBook5,2 | WiFi 4 / BT 2.1 EDR  | ^^ | Replace stock AirPort card with an mPCIE + USB Connector Adapter board with a BCM94360CS2 card  |
 | MacBook6,1 | ^^ | ^^ | Replace stock AirPort card with a BCM94331PCIEBT4CAX/BCM94331PCIEBT4 card |
 | MacBook7,1 | ^^ | ^^ | ^^ |
@@ -205,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.**

@@ -226,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)

@@ -258,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/VENTURA-DROP.md
+++ b/docs/VENTURA-DROP.md
@@ -127,7 +127,7 @@ The following GPUs are applicable:
 The following machines shipped stock with an unsupported GPU:

 * iMac7,1 - iMac12,x
-* MacBook4,1 - MacBook7,1
+* MacBook5,1 - MacBook7,1
 * MacBookAir2,1 - MacBookAir4,x
 * MacBookPro4,1 - MacBookPro8,x
 * Macmini3,1 - Macmini5,x
--- 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/images/BOOTCAMP-1.png
+++ b/images/BOOTCAMP-1.png
--- a/images/BOOTCAMP-2.png
+++ b/images/BOOTCAMP-2.png
--- a/images/OCLP-App-Allow-Native-Models.png
+++ b/images/OCLP-App-Allow-Native-Models.png
--- a/images/OCLP-GUI-Build-Finished.png
+++ b/images/OCLP-GUI-Build-Finished.png
--- a/images/OCLP-GUI-Build-Start.png
+++ b/images/OCLP-GUI-Build-Start.png
--- a/images/OCLP-GUI-Create-Installer-Menu.png
+++ b/images/OCLP-GUI-Create-Installer-Menu.png
--- a/images/OCLP-GUI-EFI-Finished-Install.png
+++ b/images/OCLP-GUI-EFI-Finished-Install.png
--- a/images/OCLP-GUI-EFI-Select-Disk.png
+++ b/images/OCLP-GUI-EFI-Select-Disk.png
--- a/images/OCLP-GUI-EFI-Select-Partition.png
+++ b/images/OCLP-GUI-EFI-Select-Partition.png
--- a/images/OCLP-GUI-Installer-Download-Catalog.png
+++ b/images/OCLP-GUI-Installer-Download-Catalog.png
--- a/images/OCLP-GUI-Installer-Download-Listed-Products.png
+++ b/images/OCLP-GUI-Installer-Download-Listed-Products.png
--- a/images/OCLP-GUI-Root-Patch-Status.png
+++ b/images/OCLP-GUI-Root-Patch-Status.png
--- a/images/OCLP-GUI-Root-Patch.png
+++ b/images/OCLP-GUI-Root-Patch.png
--- a/images/OCLP-GUI-SMBIOS-Minimal.png
+++ b/images/OCLP-GUI-SMBIOS-Minimal.png
--- a/images/OCLP-GUI-Settings-Beta-Blur.png
+++ b/images/OCLP-GUI-Settings-Beta-Blur.png
--- a/images/OCLP-GUI-Settings-SIP-Disabled.png
+++ b/images/OCLP-GUI-Settings-SIP-Disabled.png
--- a/images/OCLP-GUI-Settings-SIP-Enabled.png
+++ b/images/OCLP-GUI-Settings-SIP-Enabled.png
--- a/images/OCLP-GUI-Settings-SIP-Root-Patch.png
+++ b/images/OCLP-GUI-Settings-SIP-Root-Patch.png
--- a/images/OCLP-GUI-Settings-ShowPicker.png
+++ b/images/OCLP-GUI-Settings-ShowPicker.png
--- a/images/OCLP-GUI-root-patch-update.png
+++ b/images/OCLP-GUI-root-patch-update.png
--- a/images/OCLP-SMBIOS-Allow-Native-Spoof.png
+++ b/images/OCLP-SMBIOS-Allow-Native-Spoof.png
--- a/images/OCLP-TUI-Root-Patch-List.png
+++ b/images/OCLP-TUI-Root-Patch-List.png
--- a/images/OCLP-TUI-Root-Patch-Option.png
+++ b/images/OCLP-TUI-Root-Patch-Option.png
--- a/images/OCLP-TUI-Settings.png
+++ b/images/OCLP-TUI-Settings.png
--- a/images/OCLP-allow-native-models.png
+++ b/images/OCLP-allow-native-models.png
--- a/images/OCLP-smbios-settings.png
+++ b/images/OCLP-smbios-settings.png
--- a/images/build-efi.png
+++ b/images/build-efi.png
--- a/images/createinstallmedia.png
+++ b/images/createinstallmedia.png
--- a/images/disk-efi.png
+++ b/images/disk-efi.png
--- a/images/disk-start.png
+++ b/images/disk-start.png
--- a/images/efi-boot.png
+++ b/images/efi-boot.png
--- a/images/first-run.png
+++ b/images/first-run.png
--- a/images/format-usb.png
+++ b/images/format-usb.png
--- a/images/graphics-download.png
+++ b/images/graphics-download.png
--- a/images/munki-dmg.png
+++ b/images/munki-dmg.png
--- a/images/munki-done-2.png
+++ b/images/munki-done-2.png
--- a/images/munki-process.png
+++ b/images/munki-process.png
--- a/images/munki.png
+++ b/images/munki.png
--- a/images/oc-boot.png
+++ b/images/oc-boot.png
--- a/images/oc-windows-done.png
+++ b/images/oc-windows-done.png
--- a/images/oc-windows.png
+++ b/images/oc-windows.png
--- a/images/ocdebugimage.png
+++ b/images/ocdebugimage.png
--- a/images/oclp-stuck-firstreboot.png
+++ b/images/oclp-stuck-firstreboot.png
--- a/images/oclp-version.png
+++ b/images/oclp-version.png
--- a/images/sonoma.png
+++ b/images/sonoma.png
--- a/images/usb11-chart.png
+++ b/images/usb11-chart.png
--- a/images/ventura_uc1.png
+++ b/images/ventura_uc1.png
--- a/images/ventura_uc2.png
+++ b/images/ventura_uc2.png
--- 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>
@@ -429,42 +431,6 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
-			<dict>
-				<key>Arch</key>
-				<string>x86_64</string>
-				<key>Comment</key>
-				<string>Broadcom Wifi Patch</string>
-				<key>Enabled</key>
-				<false/>
-				<key>MaxKernel</key>
-				<string></string>
-				<key>MinKernel</key>
-				<string>12.0.0</string>
-				<key>BundlePath</key>
-				<string>AirportBrcmFixup.kext</string>
-				<key>ExecutablePath</key>
-				<string>Contents/MacOS/AirportBrcmFixup</string>
-				<key>PlistPath</key>
-				<string>Contents/Info.plist</string>
-			</dict>
-			<dict>
-				<key>Arch</key>
-				<string>x86_64</string>
-				<key>Comment</key>
-				<string>4331 Wifi Patch</string>
-				<key>Enabled</key>
-				<false/>
-				<key>MaxKernel</key>
-				<string></string>
-				<key>MinKernel</key>
-				<string>20.0.0</string>
-				<key>BundlePath</key>
-				<string>AirportBrcmFixup.kext/Contents/PlugIns/AirPortBrcmNIC_Injector.kext</string>
-				<key>ExecutablePath</key>
-				<string></string>
-				<key>PlistPath</key>
-				<string>Contents/Info.plist</string>
-			</dict>
 			<dict>
 				<key>Arch</key>
 				<string>x86_64</string>
@@ -1413,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>
@@ -1431,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>
@@ -1449,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>
@@ -1467,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>
@@ -1581,9 +1547,326 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>IOSkywalkFamily.kext</string>
+				<key>Comment</key>
+				<string>IOSkywalkFamily</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/IOSkywalkFamily</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>IO80211FamilyLegacy.kext</string>
+				<key>Comment</key>
+				<string>IO80211FamilyLegacy</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/IO80211FamilyLegacy</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>IO80211FamilyLegacy.kext/Contents/PlugIns/AirPortBrcmNIC.kext</string>
+				<key>Comment</key>
+				<string>AirPortBrcmNIC</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AirPortBrcmNIC</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Comment</key>
+				<string>Broadcom Wifi Patch</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>12.0.0</string>
+				<key>BundlePath</key>
+				<string>AirportBrcmFixup.kext</string>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AirportBrcmFixup</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Comment</key>
+				<string>4331 Wifi Patch</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>20.0.0</string>
+				<key>BundlePath</key>
+				<string>AirportBrcmFixup.kext/Contents/PlugIns/AirPortBrcmNIC_Injector.kext</string>
+				<key>ExecutablePath</key>
+				<string></string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>IOS3XeFamily.kext</string>
+				<key>Comment</key>
+				<string>Restore S1X/S3X drive support for 14.0 Beta 2 and newer</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/IOS3XeFamily</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Comment</key>
+				<string>Aquantia Ethernet Patch</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>21.4.0</string>
+				<key>BundlePath</key>
+				<string>AppleEthernetAbuantiaAqtion.kext</string>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleEthernetAbuantiaAqtion</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Comment</key>
+				<string>PCIe Camera</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.0.0</string>
+				<key>BundlePath</key>
+				<string>AppleCameraInterface.kext</string>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleCameraInterface</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Comment</key>
+				<string>AMFIPass</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>20.0.0</string>
+				<key>BundlePath</key>
+				<string>AMFIPass.kext</string>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AMFIPass</string>
+				<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>
+				<key>Comment</key>
+				<string>AppleSSE - T1</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.0.0</string>
+				<key>BundlePath</key>
+				<string>AppleSSE.kext</string>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleSSE</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Comment</key>
+				<string>AppleKeyStore - T1</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.0.0</string>
+				<key>BundlePath</key>
+				<string>AppleKeyStore.kext</string>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleKeyStore</string>
+				<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>
+				<key>Comment</key>
+				<string>USB Ethernet - ECM</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.0.0</string>
+				<key>BundlePath</key>
+				<string>ECM-Override.kext</string>
+				<key>ExecutablePath</key>
+				<string></string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
 		</array>
 		<key>Block</key>
-		<array/>
+		<array>
+			<dict>
+				<key>Arch</key>
+				<string>Any</string>
+				<key>Comment</key>
+				<string>Allow IOSkywalk Downgrade</string>
+				<key>Enabled</key>
+				<false/>
+				<key>Identifier</key>
+				<string>com.apple.iokit.IOSkywalkFamily</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.0.0</string>
+				<key>Strategy</key>
+				<string>Exclude</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>Any</string>
+				<key>Comment</key>
+				<string>Allow AppleSSE Downgrade</string>
+				<key>Enabled</key>
+				<false/>
+				<key>Identifier</key>
+				<string>com.apple.driver.AppleSSE</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.0.0</string>
+				<key>Strategy</key>
+				<string>Exclude</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>Any</string>
+				<key>Comment</key>
+				<string>Allow AppleCredentialManager Downgrade</string>
+				<key>Enabled</key>
+				<false/>
+				<key>Identifier</key>
+				<string>com.apple.driver.AppleCredentialManager</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.0.0</string>
+				<key>Strategy</key>
+				<string>Exclude</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>Any</string>
+				<key>Comment</key>
+				<string>Allow AppleKeyStore Downgrade</string>
+				<key>Enabled</key>
+				<false/>
+				<key>Identifier</key>
+				<string>com.apple.driver.AppleKeyStore</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.0.0</string>
+				<key>Strategy</key>
+				<string>Exclude</string>
+			</dict>
+		</array>
 		<key>Emulate</key>
 		<dict>
 			<key>DummyPowerManagement</key>
@@ -1967,7 +2250,7 @@
 				<key>Base</key>
 				<string>__ZN17IOPCIConfigurator18IOPCIIsHotplugPortEP16IOPCIConfigEntry</string>
 				<key>Comment</key>
-				<string>CaseySJ - Fix PCI bus enumeration</string>
+				<string>CaseySJ - Fix PCI bus enumeration (Ventura)</string>
 				<key>Count</key>
 				<integer>1</integer>
 				<key>Enabled</key>
@@ -1981,7 +2264,7 @@
 				<key>Mask</key>
 				<data></data>
 				<key>MaxKernel</key>
-				<string></string>
+				<string>22.99.99</string>
 				<key>MinKernel</key>
 				<string>22.0.0</string>
 				<key>Replace</key>
@@ -1991,6 +2274,36 @@
 				<key>Skip</key>
 				<integer>0</integer>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Base</key>
+				<string>__ZN17IOPCIConfigurator18IOPCIIsHotplugPortEP16IOPCIConfigEntry</string>
+				<key>Comment</key>
+				<string>Fix PCI bus enumeration (Sonoma)</string>
+				<key>Count</key>
+				<integer>1</integer>
+				<key>Enabled</key>
+				<false/>
+				<key>Find</key>
+				<data>RYTkdUs=</data>
+				<key>Identifier</key>
+				<string>com.apple.iokit.IOPCIFamily</string>
+				<key>Limit</key>
+				<integer>0</integer>
+				<key>Mask</key>
+				<data></data>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>23.0.0</string>
+				<key>Replace</key>
+				<data>RYTk60s=</data>
+				<key>ReplaceMask</key>
+				<data></data>
+				<key>Skip</key>
+				<integer>0</integer>
+			</dict>
 		</array>
 		<key>Quirks</key>
 		<dict>
@@ -2067,6 +2380,8 @@
 			<true/>
 			<key>HideAuxiliary</key>
 			<true/>
+			<key>InstanceIdentifier</key>
+			<string></string>
 			<key>LauncherPath</key>
 			<string>Default</string>
 			<key>LauncherOption</key>
@@ -2583,6 +2898,18 @@
 				<key>LoadEarly</key>
 				<false/>
 			</dict>
+			<dict>
+				<key>Comment</key>
+				<string></string>
+				<key>Path</key>
+				<string>OpenLegacyBoot.efi</string>
+				<key>Enabled</key>
+				<false/>
+				<key>Arguments</key>
+				<string></string>
+				<key>LoadEarly</key>
+				<false/>
+			</dict>
 			<dict>
 				<key>Comment</key>
 				<string></string>
@@ -2655,6 +2982,8 @@
 		<dict>
 			<key>ClearScreenOnModeSwitch</key>
 			<false/>
+			<key>ConsoleFont</key>
+			<string></string>
 			<key>ConsoleMode</key>
 			<string></string>
 			<key>DirectGopRendering</key>
@@ -2724,6 +3053,8 @@
 			<false/>
 			<key>OSInfo</key>
 			<false/>
+			<key>PciIo</key>
+			<false/>
 			<key>UnicodeCollation</key>
 			<false/>
 		</dict>
@@ -2755,6 +3086,8 @@
 			<integer>-1</integer>
 			<key>ResizeUsePciRbIo</key>
 			<false/>
+			<key>ShimRetainProtocol</key>
+			<false/>
 			<key>TscSyncTimeout</key>
 			<integer>0</integer>
 			<key>UnblockFsConnect</key>
--- a/payloads/Icon/AppIcons/BigSur.icns
+++ b/payloads/Icon/AppIcons/BigSur.icns
--- a/payloads/Icon/AppIcons/Generic.icns
+++ b/payloads/Icon/AppIcons/Generic.icns
--- a/payloads/Icon/AppIcons/Monterey.icns
+++ b/payloads/Icon/AppIcons/Monterey.icns
--- a/payloads/Icon/AppIcons/Sonoma.icns
+++ b/payloads/Icon/AppIcons/Sonoma.icns
--- a/payloads/Icon/AppIcons/Ventura.icns
+++ b/payloads/Icon/AppIcons/Ventura.icns
--- a/payloads/Icon/Resources.zip
+++ b/payloads/Icon/Resources.zip
--- 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.3.1-RELEASE.zip
+++ b/payloads/Kexts/Acidanthera/AMFIPass-v1.3.1-RELEASE.zip
--- 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/AutoPkgInstaller-v1.0.2-DEBUG.zip
+++ b/payloads/Kexts/Acidanthera/AutoPkgInstaller-v1.0.2-DEBUG.zip
--- a/payloads/Kexts/Acidanthera/AutoPkgInstaller-v1.0.2-RELEASE.zip
+++ b/payloads/Kexts/Acidanthera/AutoPkgInstaller-v1.0.2-RELEASE.zip
--- a/payloads/Kexts/Acidanthera/AutoPkgInstaller-v1.0.3-DEBUG.zip
+++ b/payloads/Kexts/Acidanthera/AutoPkgInstaller-v1.0.3-DEBUG.zip
--- a/payloads/Kexts/Acidanthera/AutoPkgInstaller-v1.0.3-RELEASE.zip
+++ b/payloads/Kexts/Acidanthera/AutoPkgInstaller-v1.0.3-RELEASE.zip
--- a/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.6-DEBUG.zip
+++ b/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.6-DEBUG.zip
--- a/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.6-RELEASE.zip
+++ b/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.6-RELEASE.zip
--- a/Show More
+++ b/Show More